diff --git a/root/target/linux/bcm27xx/patches-5.15/0098-config-Add-default-configs.patch b/root/target/linux/bcm27xx/patches-5.15/0098-config-Add-default-configs.patch
deleted file mode 100644
index bad882a8..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0098-config-Add-default-configs.patch
+++ /dev/null
@@ -1,7269 +0,0 @@
-From 2d76f6720baf3f9a99e22670ee2c3155cb1dd56a Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Mon, 13 Apr 2015 17:16:29 +0100
-Subject: [PATCH 098/634] config: Add default configs
-
----
- arch/arm/configs/bcm2709_defconfig   | 1445 +++++++++++++++++++++++++
- arch/arm/configs/bcm2711_defconfig   | 1484 +++++++++++++++++++++++++
- arch/arm/configs/bcmrpi_defconfig    | 1458 +++++++++++++++++++++++++
- arch/arm64/configs/bcm2711_defconfig | 1492 ++++++++++++++++++++++++++
- arch/arm64/configs/bcmrpi3_defconfig | 1339 +++++++++++++++++++++++
- 5 files changed, 7218 insertions(+)
- create mode 100644 arch/arm/configs/bcm2709_defconfig
- create mode 100644 arch/arm/configs/bcm2711_defconfig
- create mode 100644 arch/arm/configs/bcmrpi_defconfig
- create mode 100644 arch/arm64/configs/bcm2711_defconfig
- create mode 100644 arch/arm64/configs/bcmrpi3_defconfig
-
-diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-new file mode 100644
-index 000000000000..c791261d7827
---- /dev/null
-+++ b/arch/arm/configs/bcm2709_defconfig
-@@ -0,0 +1,1445 @@
-+CONFIG_LOCALVERSION="-v7"
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SYSVIPC=y
-+CONFIG_POSIX_MQUEUE=y
-+CONFIG_GENERIC_IRQ_DEBUGFS=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_BPF_SYSCALL=y
-+CONFIG_PREEMPT_VOLUNTARY=y
-+CONFIG_BSD_PROCESS_ACCT=y
-+CONFIG_BSD_PROCESS_ACCT_V3=y
-+CONFIG_TASKSTATS=y
-+CONFIG_TASK_DELAY_ACCT=y
-+CONFIG_TASK_XACCT=y
-+CONFIG_TASK_IO_ACCOUNTING=y
-+CONFIG_IKCONFIG=m
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_MEMCG=y
-+CONFIG_BLK_CGROUP=y
-+CONFIG_CFS_BANDWIDTH=y
-+CONFIG_CGROUP_PIDS=y
-+CONFIG_CGROUP_FREEZER=y
-+CONFIG_CPUSETS=y
-+CONFIG_CGROUP_DEVICE=y
-+CONFIG_CGROUP_CPUACCT=y
-+CONFIG_CGROUP_PERF=y
-+CONFIG_CGROUP_BPF=y
-+CONFIG_NAMESPACES=y
-+CONFIG_USER_NS=y
-+CONFIG_SCHED_AUTOGROUP=y
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_EMBEDDED=y
-+# CONFIG_COMPAT_BRK is not set
-+CONFIG_PROFILING=y
-+CONFIG_ARCH_BCM=y
-+CONFIG_ARCH_BCM2835=y
-+# CONFIG_CACHE_L2X0 is not set
-+CONFIG_SMP=y
-+CONFIG_VMSPLIT_2G=y
-+# CONFIG_CPU_SW_DOMAIN_PAN is not set
-+CONFIG_UACCESS_WITH_MEMCPY=y
-+# CONFIG_ATAGS is not set
-+CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
-+CONFIG_CPU_FREQ=y
-+CONFIG_CPU_FREQ_STAT=y
-+CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y
-+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-+CONFIG_CPU_FREQ_GOV_USERSPACE=y
-+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-+CONFIG_CPUFREQ_DT=y
-+CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
-+CONFIG_VFP=y
-+CONFIG_NEON=y
-+CONFIG_KERNEL_MODE_NEON=y
-+# CONFIG_SUSPEND is not set
-+CONFIG_RASPBERRYPI_FIRMWARE=y
-+CONFIG_CRYPTO_SHA1_ARM_NEON=m
-+CONFIG_CRYPTO_AES_ARM=m
-+CONFIG_CRYPTO_AES_ARM_BS=m
-+CONFIG_JUMP_LABEL=y
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODVERSIONS=y
-+CONFIG_MODULE_SRCVERSION_ALL=y
-+CONFIG_PARTITION_ADVANCED=y
-+CONFIG_MAC_PARTITION=y
-+CONFIG_BINFMT_MISC=m
-+CONFIG_CLEANCACHE=y
-+CONFIG_FRONTSWAP=y
-+CONFIG_CMA=y
-+CONFIG_ZSWAP=y
-+CONFIG_Z3FOLD=m
-+CONFIG_ZSMALLOC=m
-+CONFIG_NET=y
-+CONFIG_PACKET=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM_USER=y
-+CONFIG_NET_KEY=m
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+CONFIG_IP_ROUTE_MULTIPATH=y
-+CONFIG_IP_ROUTE_VERBOSE=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_RARP=y
-+CONFIG_NET_IPIP=m
-+CONFIG_NET_IPGRE_DEMUX=m
-+CONFIG_NET_IPGRE=m
-+CONFIG_IP_MROUTE=y
-+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-+CONFIG_IP_PIMSM_V1=y
-+CONFIG_IP_PIMSM_V2=y
-+CONFIG_NET_IPVTI=m
-+CONFIG_NET_FOU=m
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_DIAG=m
-+CONFIG_TCP_CONG_ADVANCED=y
-+CONFIG_TCP_CONG_BBR=m
-+CONFIG_IPV6=m
-+CONFIG_IPV6_ROUTER_PREF=y
-+CONFIG_IPV6_ROUTE_INFO=y
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_ESP_OFFLOAD=m
-+CONFIG_INET6_IPCOMP=m
-+CONFIG_IPV6_ILA=m
-+CONFIG_IPV6_VTI=m
-+CONFIG_IPV6_SIT_6RD=y
-+CONFIG_IPV6_GRE=m
-+CONFIG_IPV6_MULTIPLE_TABLES=y
-+CONFIG_IPV6_SUBTREES=y
-+CONFIG_IPV6_MROUTE=y
-+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-+CONFIG_IPV6_PIMSM_V2=y
-+CONFIG_NETFILTER=y
-+CONFIG_BRIDGE_NETFILTER=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CONNTRACK_ZONES=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CONNTRACK_TIMESTAMP=y
-+CONFIG_NF_CONNTRACK_AMANDA=m
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_SNMP=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+CONFIG_NF_TABLES=m
-+CONFIG_NF_TABLES_INET=y
-+CONFIG_NF_TABLES_NETDEV=y
-+CONFIG_NFT_NUMGEN=m
-+CONFIG_NFT_CT=m
-+CONFIG_NFT_FLOW_OFFLOAD=m
-+CONFIG_NFT_COUNTER=m
-+CONFIG_NFT_CONNLIMIT=m
-+CONFIG_NFT_LOG=m
-+CONFIG_NFT_LIMIT=m
-+CONFIG_NFT_MASQ=m
-+CONFIG_NFT_REDIR=m
-+CONFIG_NFT_NAT=m
-+CONFIG_NFT_TUNNEL=m
-+CONFIG_NFT_OBJREF=m
-+CONFIG_NFT_QUEUE=m
-+CONFIG_NFT_QUOTA=m
-+CONFIG_NFT_REJECT=m
-+CONFIG_NFT_COMPAT=m
-+CONFIG_NFT_HASH=m
-+CONFIG_NFT_FIB_INET=m
-+CONFIG_NFT_SOCKET=m
-+CONFIG_NFT_OSF=m
-+CONFIG_NFT_TPROXY=m
-+CONFIG_NFT_DUP_NETDEV=m
-+CONFIG_NFT_FWD_NETDEV=m
-+CONFIG_NFT_FIB_NETDEV=m
-+CONFIG_NF_FLOW_TABLE_INET=m
-+CONFIG_NF_FLOW_TABLE=m
-+CONFIG_NETFILTER_XT_SET=m
-+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_HMARK=m
-+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-+CONFIG_NETFILTER_XT_TARGET_LED=m
-+CONFIG_NETFILTER_XT_TARGET_LOG=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-+CONFIG_NETFILTER_XT_TARGET_TEE=m
-+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-+CONFIG_NETFILTER_XT_TARGET_TRACE=m
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_BPF=m
-+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_CPU=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-+CONFIG_NETFILTER_XT_MATCH_IPVS=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-+CONFIG_NETFILTER_XT_MATCH_OSF=m
-+CONFIG_NETFILTER_XT_MATCH_OWNER=m
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_RECENT=m
-+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+CONFIG_NETFILTER_XT_MATCH_TIME=m
-+CONFIG_NETFILTER_XT_MATCH_U32=m
-+CONFIG_IP_SET=m
-+CONFIG_IP_SET_BITMAP_IP=m
-+CONFIG_IP_SET_BITMAP_IPMAC=m
-+CONFIG_IP_SET_BITMAP_PORT=m
-+CONFIG_IP_SET_HASH_IP=m
-+CONFIG_IP_SET_HASH_IPPORT=m
-+CONFIG_IP_SET_HASH_IPPORTIP=m
-+CONFIG_IP_SET_HASH_IPPORTNET=m
-+CONFIG_IP_SET_HASH_NET=m
-+CONFIG_IP_SET_HASH_NETPORT=m
-+CONFIG_IP_SET_HASH_NETIFACE=m
-+CONFIG_IP_SET_LIST_SET=m
-+CONFIG_IP_VS=m
-+CONFIG_IP_VS_PROTO_TCP=y
-+CONFIG_IP_VS_PROTO_UDP=y
-+CONFIG_IP_VS_PROTO_ESP=y
-+CONFIG_IP_VS_PROTO_AH=y
-+CONFIG_IP_VS_PROTO_SCTP=y
-+CONFIG_IP_VS_RR=m
-+CONFIG_IP_VS_WRR=m
-+CONFIG_IP_VS_LC=m
-+CONFIG_IP_VS_WLC=m
-+CONFIG_IP_VS_LBLC=m
-+CONFIG_IP_VS_LBLCR=m
-+CONFIG_IP_VS_DH=m
-+CONFIG_IP_VS_SH=m
-+CONFIG_IP_VS_SED=m
-+CONFIG_IP_VS_NQ=m
-+CONFIG_IP_VS_FTP=m
-+CONFIG_IP_VS_PE_SIP=m
-+CONFIG_NFT_DUP_IPV4=m
-+CONFIG_NFT_FIB_IPV4=m
-+CONFIG_NF_TABLES_ARP=y
-+CONFIG_NF_FLOW_TABLE_IPV4=m
-+CONFIG_NF_LOG_ARP=m
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_RPFILTER=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_NAT=m
-+CONFIG_IP_NF_TARGET_MASQUERADE=m
-+CONFIG_IP_NF_TARGET_NETMAP=m
-+CONFIG_IP_NF_TARGET_REDIRECT=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_RAW=m
-+CONFIG_IP_NF_ARPTABLES=m
-+CONFIG_IP_NF_ARPFILTER=m
-+CONFIG_IP_NF_ARP_MANGLE=m
-+CONFIG_NFT_DUP_IPV6=m
-+CONFIG_NFT_FIB_IPV6=m
-+CONFIG_NF_FLOW_TABLE_IPV6=m
-+CONFIG_IP6_NF_IPTABLES=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_MATCH_FRAG=m
-+CONFIG_IP6_NF_MATCH_OPTS=m
-+CONFIG_IP6_NF_MATCH_HL=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_RPFILTER=m
-+CONFIG_IP6_NF_MATCH_RT=m
-+CONFIG_IP6_NF_MATCH_SRH=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_TARGET_SYNPROXY=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_RAW=m
-+CONFIG_IP6_NF_SECURITY=m
-+CONFIG_IP6_NF_NAT=m
-+CONFIG_IP6_NF_TARGET_MASQUERADE=m
-+CONFIG_IP6_NF_TARGET_NPT=m
-+CONFIG_NF_TABLES_BRIDGE=m
-+CONFIG_NFT_BRIDGE_REJECT=m
-+CONFIG_BRIDGE_NF_EBTABLES=m
-+CONFIG_BRIDGE_EBT_BROUTE=m
-+CONFIG_BRIDGE_EBT_T_FILTER=m
-+CONFIG_BRIDGE_EBT_T_NAT=m
-+CONFIG_BRIDGE_EBT_802_3=m
-+CONFIG_BRIDGE_EBT_AMONG=m
-+CONFIG_BRIDGE_EBT_ARP=m
-+CONFIG_BRIDGE_EBT_IP=m
-+CONFIG_BRIDGE_EBT_IP6=m
-+CONFIG_BRIDGE_EBT_LIMIT=m
-+CONFIG_BRIDGE_EBT_MARK=m
-+CONFIG_BRIDGE_EBT_PKTTYPE=m
-+CONFIG_BRIDGE_EBT_STP=m
-+CONFIG_BRIDGE_EBT_VLAN=m
-+CONFIG_BRIDGE_EBT_ARPREPLY=m
-+CONFIG_BRIDGE_EBT_DNAT=m
-+CONFIG_BRIDGE_EBT_MARK_T=m
-+CONFIG_BRIDGE_EBT_REDIRECT=m
-+CONFIG_BRIDGE_EBT_SNAT=m
-+CONFIG_BRIDGE_EBT_LOG=m
-+CONFIG_BRIDGE_EBT_NFLOG=m
-+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-+CONFIG_ATM=m
-+CONFIG_L2TP=m
-+CONFIG_L2TP_V3=y
-+CONFIG_L2TP_IP=m
-+CONFIG_L2TP_ETH=m
-+CONFIG_BRIDGE=m
-+CONFIG_VLAN_8021Q=m
-+CONFIG_VLAN_8021Q_GVRP=y
-+CONFIG_ATALK=m
-+CONFIG_6LOWPAN=m
-+CONFIG_IEEE802154=m
-+CONFIG_IEEE802154_6LOWPAN=m
-+CONFIG_MAC802154=m
-+CONFIG_NET_SCHED=y
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_ATM=m
-+CONFIG_NET_SCH_PRIO=m
-+CONFIG_NET_SCH_MULTIQ=m
-+CONFIG_NET_SCH_RED=m
-+CONFIG_NET_SCH_SFB=m
-+CONFIG_NET_SCH_SFQ=m
-+CONFIG_NET_SCH_TEQL=m
-+CONFIG_NET_SCH_TBF=m
-+CONFIG_NET_SCH_GRED=m
-+CONFIG_NET_SCH_DSMARK=m
-+CONFIG_NET_SCH_NETEM=m
-+CONFIG_NET_SCH_DRR=m
-+CONFIG_NET_SCH_MQPRIO=m
-+CONFIG_NET_SCH_CHOKE=m
-+CONFIG_NET_SCH_QFQ=m
-+CONFIG_NET_SCH_CODEL=m
-+CONFIG_NET_SCH_FQ_CODEL=m
-+CONFIG_NET_SCH_CAKE=m
-+CONFIG_NET_SCH_FQ=m
-+CONFIG_NET_SCH_HHF=m
-+CONFIG_NET_SCH_PIE=m
-+CONFIG_NET_SCH_INGRESS=m
-+CONFIG_NET_SCH_PLUG=m
-+CONFIG_NET_CLS_BASIC=m
-+CONFIG_NET_CLS_TCINDEX=m
-+CONFIG_NET_CLS_ROUTE4=m
-+CONFIG_NET_CLS_FW=m
-+CONFIG_NET_CLS_U32=m
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+CONFIG_NET_CLS_FLOW=m
-+CONFIG_NET_CLS_CGROUP=m
-+CONFIG_NET_EMATCH=y
-+CONFIG_NET_EMATCH_CMP=m
-+CONFIG_NET_EMATCH_NBYTE=m
-+CONFIG_NET_EMATCH_U32=m
-+CONFIG_NET_EMATCH_META=m
-+CONFIG_NET_EMATCH_TEXT=m
-+CONFIG_NET_EMATCH_IPSET=m
-+CONFIG_NET_CLS_ACT=y
-+CONFIG_NET_ACT_POLICE=m
-+CONFIG_NET_ACT_GACT=m
-+CONFIG_GACT_PROB=y
-+CONFIG_NET_ACT_MIRRED=m
-+CONFIG_NET_ACT_IPT=m
-+CONFIG_NET_ACT_NAT=m
-+CONFIG_NET_ACT_PEDIT=m
-+CONFIG_NET_ACT_SIMP=m
-+CONFIG_NET_ACT_SKBEDIT=m
-+CONFIG_NET_ACT_CSUM=m
-+CONFIG_BATMAN_ADV=m
-+CONFIG_OPENVSWITCH=m
-+CONFIG_CGROUP_NET_PRIO=y
-+CONFIG_NET_PKTGEN=m
-+CONFIG_HAMRADIO=y
-+CONFIG_AX25=m
-+CONFIG_NETROM=m
-+CONFIG_ROSE=m
-+CONFIG_MKISS=m
-+CONFIG_6PACK=m
-+CONFIG_BPQETHER=m
-+CONFIG_BAYCOM_SER_FDX=m
-+CONFIG_BAYCOM_SER_HDX=m
-+CONFIG_YAM=m
-+CONFIG_CAN=m
-+CONFIG_CAN_J1939=m
-+CONFIG_CAN_ISOTP=m
-+CONFIG_CAN_VCAN=m
-+CONFIG_CAN_SLCAN=m
-+CONFIG_CAN_MCP251X=m
-+CONFIG_CAN_MCP251XFD=m
-+CONFIG_CAN_EMS_USB=m
-+CONFIG_CAN_GS_USB=m
-+CONFIG_BT=m
-+CONFIG_BT_RFCOMM=m
-+CONFIG_BT_RFCOMM_TTY=y
-+CONFIG_BT_BNEP=m
-+CONFIG_BT_BNEP_MC_FILTER=y
-+CONFIG_BT_BNEP_PROTO_FILTER=y
-+CONFIG_BT_HIDP=m
-+CONFIG_BT_6LOWPAN=m
-+CONFIG_BT_HCIBTUSB=m
-+CONFIG_BT_HCIUART=m
-+CONFIG_BT_HCIUART_3WIRE=y
-+CONFIG_BT_HCIUART_BCM=y
-+CONFIG_BT_HCIBCM203X=m
-+CONFIG_BT_HCIBPA10X=m
-+CONFIG_BT_HCIBFUSB=m
-+CONFIG_BT_HCIVHCI=m
-+CONFIG_BT_MRVL=m
-+CONFIG_BT_MRVL_SDIO=m
-+CONFIG_BT_ATH3K=m
-+CONFIG_CFG80211=m
-+CONFIG_CFG80211_WEXT=y
-+CONFIG_MAC80211=m
-+CONFIG_MAC80211_MESH=y
-+CONFIG_RFKILL=m
-+CONFIG_RFKILL_INPUT=y
-+CONFIG_NET_9P=m
-+CONFIG_NFC=m
-+CONFIG_UEVENT_HELPER=y
-+CONFIG_DEVTMPFS=y
-+CONFIG_DEVTMPFS_MOUNT=y
-+CONFIG_MTD=m
-+CONFIG_MTD_BLOCK=m
-+CONFIG_MTD_BLOCK2MTD=m
-+CONFIG_MTD_SPI_NOR=m
-+CONFIG_MTD_UBI=m
-+CONFIG_OF_CONFIGFS=y
-+CONFIG_ZRAM=m
-+CONFIG_BLK_DEV_LOOP=y
-+CONFIG_BLK_DEV_CRYPTOLOOP=m
-+CONFIG_BLK_DEV_DRBD=m
-+CONFIG_BLK_DEV_NBD=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_CDROM_PKTCDVD=m
-+CONFIG_ATA_OVER_ETH=m
-+CONFIG_EEPROM_AT24=m
-+CONFIG_TI_ST=m
-+CONFIG_SCSI=y
-+# CONFIG_SCSI_PROC_FS is not set
-+CONFIG_BLK_DEV_SD=y
-+CONFIG_CHR_DEV_ST=m
-+CONFIG_BLK_DEV_SR=m
-+CONFIG_CHR_DEV_SG=m
-+CONFIG_SCSI_ISCSI_ATTRS=y
-+CONFIG_ISCSI_TCP=m
-+CONFIG_ISCSI_BOOT_SYSFS=m
-+CONFIG_MD=y
-+CONFIG_MD_LINEAR=m
-+CONFIG_BLK_DEV_DM=m
-+CONFIG_DM_CRYPT=m
-+CONFIG_DM_SNAPSHOT=m
-+CONFIG_DM_THIN_PROVISIONING=m
-+CONFIG_DM_CACHE=m
-+CONFIG_DM_MIRROR=m
-+CONFIG_DM_LOG_USERSPACE=m
-+CONFIG_DM_RAID=m
-+CONFIG_DM_ZERO=m
-+CONFIG_DM_DELAY=m
-+CONFIG_NETDEVICES=y
-+CONFIG_BONDING=m
-+CONFIG_DUMMY=m
-+CONFIG_WIREGUARD=m
-+CONFIG_IFB=m
-+CONFIG_MACVLAN=m
-+CONFIG_IPVLAN=m
-+CONFIG_VXLAN=m
-+CONFIG_NETCONSOLE=m
-+CONFIG_TUN=m
-+CONFIG_VETH=m
-+CONFIG_NET_VRF=m
-+CONFIG_ENC28J60=m
-+CONFIG_QCA7000_SPI=m
-+CONFIG_QCA7000_UART=m
-+CONFIG_WIZNET_W5100=m
-+CONFIG_WIZNET_W5100_SPI=m
-+CONFIG_MDIO_BITBANG=m
-+CONFIG_PPP=m
-+CONFIG_PPP_BSDCOMP=m
-+CONFIG_PPP_DEFLATE=m
-+CONFIG_PPP_FILTER=y
-+CONFIG_PPP_MPPE=m
-+CONFIG_PPP_MULTILINK=y
-+CONFIG_PPPOATM=m
-+CONFIG_PPPOE=m
-+CONFIG_PPPOL2TP=m
-+CONFIG_PPP_ASYNC=m
-+CONFIG_PPP_SYNC_TTY=m
-+CONFIG_SLIP=m
-+CONFIG_SLIP_COMPRESSED=y
-+CONFIG_SLIP_SMART=y
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_RTL8152=m
-+CONFIG_USB_LAN78XX=y
-+CONFIG_USB_USBNET=y
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_AX88179_178A=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_CDC_EEM=m
-+CONFIG_USB_NET_CDC_NCM=m
-+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-+CONFIG_USB_NET_CDC_MBIM=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_SR9700=m
-+CONFIG_USB_NET_SR9800=m
-+CONFIG_USB_NET_SMSC75XX=m
-+CONFIG_USB_NET_SMSC95XX=y
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+CONFIG_USB_NET_CX82310_ETH=m
-+CONFIG_USB_NET_KALMIA=m
-+CONFIG_USB_NET_QMI_WWAN=m
-+CONFIG_USB_HSO=m
-+CONFIG_USB_NET_INT51X1=m
-+CONFIG_USB_IPHETH=m
-+CONFIG_USB_SIERRA_NET=m
-+CONFIG_USB_VL600=m
-+CONFIG_USB_NET_AQC111=m
-+CONFIG_ATH9K=m
-+CONFIG_ATH9K_HTC=m
-+CONFIG_CARL9170=m
-+CONFIG_ATH6KL=m
-+CONFIG_ATH6KL_USB=m
-+CONFIG_AR5523=m
-+CONFIG_AT76C50X_USB=m
-+CONFIG_B43=m
-+# CONFIG_B43_PHY_N is not set
-+CONFIG_B43LEGACY=m
-+CONFIG_BRCMFMAC=m
-+CONFIG_BRCMFMAC_USB=y
-+CONFIG_BRCMDBG=y
-+CONFIG_HOSTAP=m
-+CONFIG_P54_COMMON=m
-+CONFIG_P54_USB=m
-+CONFIG_LIBERTAS=m
-+CONFIG_LIBERTAS_USB=m
-+CONFIG_LIBERTAS_SDIO=m
-+CONFIG_LIBERTAS_THINFIRM=m
-+CONFIG_LIBERTAS_THINFIRM_USB=m
-+CONFIG_MWIFIEX=m
-+CONFIG_MWIFIEX_SDIO=m
-+CONFIG_MT7601U=m
-+CONFIG_MT76x0U=m
-+CONFIG_MT76x2U=m
-+CONFIG_RT2X00=m
-+CONFIG_RT2500USB=m
-+CONFIG_RT73USB=m
-+CONFIG_RT2800USB=m
-+CONFIG_RT2800USB_RT3573=y
-+CONFIG_RT2800USB_RT53XX=y
-+CONFIG_RT2800USB_RT55XX=y
-+CONFIG_RT2800USB_UNKNOWN=y
-+CONFIG_RTL8187=m
-+CONFIG_RTL8192CU=m
-+CONFIG_RTL8XXXU=m
-+CONFIG_USB_ZD1201=m
-+CONFIG_ZD1211RW=m
-+CONFIG_MAC80211_HWSIM=m
-+CONFIG_USB_NET_RNDIS_WLAN=m
-+CONFIG_IEEE802154_AT86RF230=m
-+CONFIG_IEEE802154_MRF24J40=m
-+CONFIG_IEEE802154_CC2520=m
-+CONFIG_INPUT_MOUSEDEV=y
-+CONFIG_INPUT_JOYDEV=m
-+CONFIG_INPUT_EVDEV=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_MATRIX=m
-+CONFIG_KEYBOARD_CAP11XX=m
-+# CONFIG_INPUT_MOUSE is not set
-+CONFIG_INPUT_JOYSTICK=y
-+CONFIG_JOYSTICK_IFORCE=m
-+CONFIG_JOYSTICK_IFORCE_USB=m
-+CONFIG_JOYSTICK_XPAD=m
-+CONFIG_JOYSTICK_XPAD_FF=y
-+CONFIG_JOYSTICK_XPAD_LEDS=y
-+CONFIG_JOYSTICK_PSXPAD_SPI=m
-+CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
-+CONFIG_JOYSTICK_RPISENSE=m
-+CONFIG_INPUT_TOUCHSCREEN=y
-+CONFIG_TOUCHSCREEN_ADS7846=m
-+CONFIG_TOUCHSCREEN_EGALAX=m
-+CONFIG_TOUCHSCREEN_EXC3000=m
-+CONFIG_TOUCHSCREEN_GOODIX=m
-+CONFIG_TOUCHSCREEN_ILI210X=m
-+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-+CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
-+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-+CONFIG_TOUCHSCREEN_STMPE=m
-+CONFIG_INPUT_MISC=y
-+CONFIG_INPUT_AD714X=m
-+CONFIG_INPUT_ATI_REMOTE2=m
-+CONFIG_INPUT_KEYSPAN_REMOTE=m
-+CONFIG_INPUT_POWERMATE=m
-+CONFIG_INPUT_YEALINK=m
-+CONFIG_INPUT_CM109=m
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-+CONFIG_INPUT_ADXL34X=m
-+CONFIG_INPUT_CMA3000=m
-+CONFIG_SERIO=m
-+CONFIG_SERIO_RAW=m
-+CONFIG_GAMEPORT=m
-+CONFIG_GAMEPORT_NS558=m
-+CONFIG_GAMEPORT_L4=m
-+CONFIG_BRCM_CHAR_DRIVERS=y
-+CONFIG_BCM_VCIO=y
-+CONFIG_BCM2835_DEVGPIOMEM=y
-+# CONFIG_LEGACY_PTYS is not set
-+CONFIG_SERIAL_8250=y
-+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_DMA is not set
-+CONFIG_SERIAL_8250_NR_UARTS=1
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=0
-+CONFIG_SERIAL_8250_EXTENDED=y
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+CONFIG_SERIAL_8250_BCM2835AUX=y
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_SERIAL_AMBA_PL011=y
-+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-+CONFIG_SERIAL_SC16IS7XX=m
-+CONFIG_SERIAL_SC16IS7XX_SPI=y
-+CONFIG_SERIAL_DEV_BUS=y
-+CONFIG_TTY_PRINTK=y
-+CONFIG_HW_RANDOM=y
-+CONFIG_TCG_TPM=m
-+CONFIG_TCG_TIS_SPI=m
-+CONFIG_RANDOM_TRUST_BOOTLOADER=y
-+CONFIG_I2C=y
-+CONFIG_I2C_CHARDEV=m
-+CONFIG_I2C_MUX_GPMUX=m
-+CONFIG_I2C_MUX_PCA954x=m
-+CONFIG_I2C_MUX_PINCTRL=m
-+CONFIG_I2C_BCM2708=m
-+CONFIG_I2C_BCM2835=m
-+# CONFIG_I2C_BRCMSTB is not set
-+CONFIG_I2C_GPIO=m
-+CONFIG_I2C_ROBOTFUZZ_OSIF=m
-+CONFIG_I2C_TINY_USB=m
-+CONFIG_SPI=y
-+CONFIG_SPI_BCM2835=m
-+CONFIG_SPI_BCM2835AUX=m
-+CONFIG_SPI_GPIO=m
-+CONFIG_SPI_SPIDEV=m
-+CONFIG_SPI_SLAVE=y
-+CONFIG_PPS_CLIENT_LDISC=m
-+CONFIG_PPS_CLIENT_GPIO=m
-+CONFIG_PINCTRL_MCP23S08=m
-+CONFIG_GPIO_SYSFS=y
-+CONFIG_GPIO_BCM_VIRT=y
-+CONFIG_GPIO_PCA953X=m
-+CONFIG_GPIO_PCA953X_IRQ=y
-+CONFIG_GPIO_PCF857X=m
-+CONFIG_GPIO_ARIZONA=m
-+CONFIG_GPIO_FSM=m
-+CONFIG_GPIO_STMPE=y
-+CONFIG_GPIO_MOCKUP=m
-+CONFIG_W1=m
-+CONFIG_W1_MASTER_DS2490=m
-+CONFIG_W1_MASTER_DS2482=m
-+CONFIG_W1_MASTER_DS1WM=m
-+CONFIG_W1_MASTER_GPIO=m
-+CONFIG_W1_SLAVE_THERM=m
-+CONFIG_W1_SLAVE_SMEM=m
-+CONFIG_W1_SLAVE_DS2408=m
-+CONFIG_W1_SLAVE_DS2413=m
-+CONFIG_W1_SLAVE_DS2406=m
-+CONFIG_W1_SLAVE_DS2423=m
-+CONFIG_W1_SLAVE_DS2431=m
-+CONFIG_W1_SLAVE_DS2433=m
-+CONFIG_W1_SLAVE_DS2438=m
-+CONFIG_W1_SLAVE_DS2780=m
-+CONFIG_W1_SLAVE_DS2781=m
-+CONFIG_W1_SLAVE_DS28E04=m
-+CONFIG_W1_SLAVE_DS28E17=m
-+CONFIG_POWER_RESET=y
-+CONFIG_POWER_RESET_GPIO=y
-+CONFIG_RPI_POE_POWER=m
-+CONFIG_BATTERY_DS2760=m
-+CONFIG_BATTERY_MAX17040=m
-+CONFIG_BATTERY_GAUGE_LTC2941=m
-+CONFIG_SENSORS_DS1621=m
-+CONFIG_SENSORS_GPIO_FAN=m
-+CONFIG_SENSORS_IIO_HWMON=m
-+CONFIG_SENSORS_JC42=m
-+CONFIG_SENSORS_LM75=m
-+CONFIG_SENSORS_PWM_FAN=m
-+CONFIG_SENSORS_RASPBERRYPI_HWMON=m
-+CONFIG_SENSORS_SHT21=m
-+CONFIG_SENSORS_SHT3x=m
-+CONFIG_SENSORS_SHTC1=m
-+CONFIG_SENSORS_INA2XX=m
-+CONFIG_SENSORS_TMP102=m
-+CONFIG_THERMAL=y
-+CONFIG_BCM2835_THERMAL=y
-+CONFIG_WATCHDOG=y
-+CONFIG_GPIO_WATCHDOG=m
-+CONFIG_BCM2835_WDT=y
-+CONFIG_MFD_STMPE=y
-+CONFIG_STMPE_SPI=y
-+CONFIG_MFD_ARIZONA_I2C=m
-+CONFIG_MFD_ARIZONA_SPI=m
-+CONFIG_MFD_WM5102=y
-+CONFIG_REGULATOR=y
-+CONFIG_REGULATOR_FIXED_VOLTAGE=m
-+CONFIG_REGULATOR_ARIZONA_LDO1=m
-+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
-+CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m
-+CONFIG_RC_CORE=y
-+CONFIG_LIRC=y
-+CONFIG_BPF_LIRC_MODE2=y
-+CONFIG_RC_DECODERS=y
-+CONFIG_IR_NEC_DECODER=m
-+CONFIG_IR_RC5_DECODER=m
-+CONFIG_IR_RC6_DECODER=m
-+CONFIG_IR_JVC_DECODER=m
-+CONFIG_IR_SONY_DECODER=m
-+CONFIG_IR_SANYO_DECODER=m
-+CONFIG_IR_SHARP_DECODER=m
-+CONFIG_IR_MCE_KBD_DECODER=m
-+CONFIG_IR_XMP_DECODER=m
-+CONFIG_IR_IMON_DECODER=m
-+CONFIG_RC_DEVICES=y
-+CONFIG_RC_ATI_REMOTE=m
-+CONFIG_IR_IMON=m
-+CONFIG_IR_MCEUSB=m
-+CONFIG_IR_REDRAT3=m
-+CONFIG_IR_STREAMZAP=m
-+CONFIG_IR_IGUANA=m
-+CONFIG_IR_TTUSBIR=m
-+CONFIG_RC_LOOPBACK=m
-+CONFIG_IR_GPIO_CIR=m
-+CONFIG_IR_GPIO_TX=m
-+CONFIG_IR_PWM_TX=m
-+CONFIG_MEDIA_CEC_RC=y
-+CONFIG_MEDIA_SUPPORT=m
-+CONFIG_MEDIA_USB_SUPPORT=y
-+CONFIG_USB_VIDEO_CLASS=m
-+CONFIG_USB_PWC=m
-+CONFIG_VIDEO_CPIA2=m
-+CONFIG_USB_ZR364XX=m
-+CONFIG_USB_STKWEBCAM=m
-+CONFIG_USB_S2255=m
-+CONFIG_VIDEO_USBTV=m
-+CONFIG_VIDEO_PVRUSB2=m
-+CONFIG_VIDEO_HDPVR=m
-+CONFIG_VIDEO_STK1160_COMMON=m
-+CONFIG_VIDEO_GO7007=m
-+CONFIG_VIDEO_GO7007_USB=m
-+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-+CONFIG_VIDEO_AU0828=m
-+CONFIG_VIDEO_AU0828_RC=y
-+CONFIG_VIDEO_CX231XX=m
-+CONFIG_VIDEO_CX231XX_ALSA=m
-+CONFIG_VIDEO_CX231XX_DVB=m
-+CONFIG_VIDEO_TM6000=m
-+CONFIG_VIDEO_TM6000_ALSA=m
-+CONFIG_VIDEO_TM6000_DVB=m
-+CONFIG_DVB_USB=m
-+CONFIG_DVB_USB_A800=m
-+CONFIG_DVB_USB_DIBUSB_MB=m
-+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-+CONFIG_DVB_USB_DIBUSB_MC=m
-+CONFIG_DVB_USB_DIB0700=m
-+CONFIG_DVB_USB_UMT_010=m
-+CONFIG_DVB_USB_CXUSB=m
-+CONFIG_DVB_USB_M920X=m
-+CONFIG_DVB_USB_DIGITV=m
-+CONFIG_DVB_USB_VP7045=m
-+CONFIG_DVB_USB_VP702X=m
-+CONFIG_DVB_USB_GP8PSK=m
-+CONFIG_DVB_USB_NOVA_T_USB2=m
-+CONFIG_DVB_USB_TTUSB2=m
-+CONFIG_DVB_USB_DTT200U=m
-+CONFIG_DVB_USB_OPERA1=m
-+CONFIG_DVB_USB_AF9005=m
-+CONFIG_DVB_USB_AF9005_REMOTE=m
-+CONFIG_DVB_USB_PCTV452E=m
-+CONFIG_DVB_USB_DW2102=m
-+CONFIG_DVB_USB_CINERGY_T2=m
-+CONFIG_DVB_USB_DTV5100=m
-+CONFIG_DVB_USB_AZ6027=m
-+CONFIG_DVB_USB_TECHNISAT_USB2=m
-+CONFIG_DVB_USB_V2=m
-+CONFIG_DVB_USB_AF9015=m
-+CONFIG_DVB_USB_AF9035=m
-+CONFIG_DVB_USB_ANYSEE=m
-+CONFIG_DVB_USB_AU6610=m
-+CONFIG_DVB_USB_AZ6007=m
-+CONFIG_DVB_USB_CE6230=m
-+CONFIG_DVB_USB_EC168=m
-+CONFIG_DVB_USB_GL861=m
-+CONFIG_DVB_USB_LME2510=m
-+CONFIG_DVB_USB_MXL111SF=m
-+CONFIG_DVB_USB_RTL28XXU=m
-+CONFIG_DVB_USB_DVBSKY=m
-+CONFIG_SMS_USB_DRV=m
-+CONFIG_DVB_B2C2_FLEXCOP_USB=m
-+CONFIG_DVB_AS102=m
-+CONFIG_VIDEO_EM28XX=m
-+CONFIG_VIDEO_EM28XX_V4L2=m
-+CONFIG_VIDEO_EM28XX_ALSA=m
-+CONFIG_VIDEO_EM28XX_DVB=m
-+CONFIG_RADIO_SI470X=m
-+CONFIG_USB_SI470X=m
-+CONFIG_I2C_SI470X=m
-+CONFIG_RADIO_SI4713=m
-+CONFIG_I2C_SI4713=m
-+CONFIG_USB_MR800=m
-+CONFIG_USB_DSBR=m
-+CONFIG_RADIO_SHARK=m
-+CONFIG_RADIO_SHARK2=m
-+CONFIG_USB_KEENE=m
-+CONFIG_USB_MA901=m
-+CONFIG_RADIO_TEA5764=m
-+CONFIG_RADIO_SAA7706H=m
-+CONFIG_RADIO_TEF6862=m
-+CONFIG_RADIO_WL1273=m
-+CONFIG_RADIO_WL128X=m
-+CONFIG_V4L_PLATFORM_DRIVERS=y
-+CONFIG_VIDEO_BCM2835_UNICAM=m
-+CONFIG_VIDEO_UDA1342=m
-+CONFIG_VIDEO_SONY_BTF_MPX=m
-+CONFIG_VIDEO_ADV7180=m
-+CONFIG_VIDEO_TC358743=m
-+CONFIG_VIDEO_TVP5150=m
-+CONFIG_VIDEO_TW2804=m
-+CONFIG_VIDEO_TW9903=m
-+CONFIG_VIDEO_TW9906=m
-+CONFIG_VIDEO_IMX219=m
-+CONFIG_VIDEO_IMX290=m
-+CONFIG_VIDEO_IMX477=m
-+CONFIG_VIDEO_OV5647=m
-+CONFIG_VIDEO_OV7251=m
-+CONFIG_VIDEO_OV7640=m
-+CONFIG_VIDEO_OV9281=m
-+CONFIG_VIDEO_IRS1125=m
-+CONFIG_VIDEO_MT9V011=m
-+CONFIG_DRM=m
-+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-+CONFIG_DRM_UDL=m
-+CONFIG_DRM_PANEL_SIMPLE=m
-+CONFIG_DRM_PANEL_JDI_LT070ME05000=m
-+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
-+CONFIG_DRM_DISPLAY_CONNECTOR=m
-+CONFIG_DRM_SIMPLE_BRIDGE=m
-+CONFIG_DRM_TOSHIBA_TC358762=m
-+CONFIG_DRM_VC4=m
-+CONFIG_DRM_VC4_HDMI_CEC=y
-+CONFIG_TINYDRM_ILI9225=m
-+CONFIG_TINYDRM_ILI9341=m
-+CONFIG_TINYDRM_MI0283QT=m
-+CONFIG_TINYDRM_REPAPER=m
-+CONFIG_TINYDRM_ST7586=m
-+CONFIG_TINYDRM_ST7735R=m
-+CONFIG_DRM_GUD=m
-+CONFIG_FB=y
-+CONFIG_FB_BCM2708=y
-+CONFIG_FB_UDL=m
-+CONFIG_FB_SIMPLE=y
-+CONFIG_FB_SSD1307=m
-+CONFIG_FB_RPISENSE=m
-+CONFIG_BACKLIGHT_RPI=m
-+CONFIG_BACKLIGHT_GPIO=m
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-+CONFIG_LOGO=y
-+# CONFIG_LOGO_LINUX_MONO is not set
-+# CONFIG_LOGO_LINUX_VGA16 is not set
-+CONFIG_SOUND=y
-+CONFIG_SND=m
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_HRTIMER=m
-+CONFIG_SND_SEQUENCER=m
-+CONFIG_SND_SEQ_DUMMY=m
-+CONFIG_SND_DUMMY=m
-+CONFIG_SND_ALOOP=m
-+CONFIG_SND_VIRMIDI=m
-+CONFIG_SND_MTPAV=m
-+CONFIG_SND_SERIAL_U16550=m
-+CONFIG_SND_MPU401=m
-+CONFIG_SND_USB_AUDIO=m
-+CONFIG_SND_USB_UA101=m
-+CONFIG_SND_USB_CAIAQ=m
-+CONFIG_SND_USB_CAIAQ_INPUT=y
-+CONFIG_SND_USB_6FIRE=m
-+CONFIG_SND_USB_HIFACE=m
-+CONFIG_SND_USB_TONEPORT=m
-+CONFIG_SND_SOC=m
-+CONFIG_SND_BCM2835_SOC_I2S=m
-+CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC=m
-+CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
-+CONFIG_SND_BCM2708_SOC_PIFI_40=m
-+CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m
-+CONFIG_SND_BCM2708_SOC_RPI_DAC=m
-+CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
-+CONFIG_SND_BCM2708_SOC_JUSTBOOM_BOTH=m
-+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m
-+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m
-+CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m
-+CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
-+CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m
-+CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m
-+CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m
-+CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m
-+CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m
-+CONFIG_SND_AUDIOINJECTOR_ISOLATED_SOUNDCARD=m
-+CONFIG_SND_AUDIOSENSE_PI=m
-+CONFIG_SND_DIGIDAC1_SOUNDCARD=m
-+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m
-+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
-+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
-+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m
-+CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m
-+CONFIG_SND_BCM2708_SOC_ALLO_BOSS2_DAC=m
-+CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m
-+CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m
-+CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
-+CONFIG_SND_PISOUND=m
-+CONFIG_SND_SOC_AD193X_SPI=m
-+CONFIG_SND_SOC_AD193X_I2C=m
-+CONFIG_SND_SOC_ADAU1701=m
-+CONFIG_SND_SOC_ADAU7002=m
-+CONFIG_SND_SOC_AK4554=m
-+CONFIG_SND_SOC_CS4265=m
-+CONFIG_SND_SOC_ICS43432=m
-+CONFIG_SND_SOC_MA120X0P=m
-+CONFIG_SND_SOC_MAX98357A=m
-+CONFIG_SND_SOC_SPDIF=m
-+CONFIG_SND_SOC_WM8804_I2C=m
-+CONFIG_SND_SOC_WM8960=m
-+CONFIG_SND_SIMPLE_CARD=m
-+CONFIG_HID_BATTERY_STRENGTH=y
-+CONFIG_HIDRAW=y
-+CONFIG_UHID=m
-+CONFIG_HID_A4TECH=m
-+CONFIG_HID_ACRUX=m
-+CONFIG_HID_APPLE=m
-+CONFIG_HID_ASUS=m
-+CONFIG_HID_BELKIN=m
-+CONFIG_HID_BETOP_FF=m
-+CONFIG_HID_BIGBEN_FF=m
-+CONFIG_HID_CHERRY=m
-+CONFIG_HID_CHICONY=m
-+CONFIG_HID_CYPRESS=m
-+CONFIG_HID_DRAGONRISE=m
-+CONFIG_HID_EMS_FF=m
-+CONFIG_HID_ELECOM=m
-+CONFIG_HID_ELO=m
-+CONFIG_HID_EZKEY=m
-+CONFIG_HID_GEMBIRD=m
-+CONFIG_HID_HOLTEK=m
-+CONFIG_HID_KEYTOUCH=m
-+CONFIG_HID_KYE=m
-+CONFIG_HID_UCLOGIC=m
-+CONFIG_HID_WALTOP=m
-+CONFIG_HID_GYRATION=m
-+CONFIG_HID_TWINHAN=m
-+CONFIG_HID_KENSINGTON=m
-+CONFIG_HID_LCPOWER=m
-+CONFIG_HID_LOGITECH=m
-+CONFIG_HID_LOGITECH_DJ=m
-+CONFIG_LOGITECH_FF=y
-+CONFIG_LOGIRUMBLEPAD2_FF=y
-+CONFIG_LOGIG940_FF=y
-+CONFIG_HID_MAGICMOUSE=m
-+CONFIG_HID_MICROSOFT=m
-+CONFIG_HID_MONTEREY=m
-+CONFIG_HID_MULTITOUCH=m
-+CONFIG_HID_NTRIG=m
-+CONFIG_HID_ORTEK=m
-+CONFIG_HID_PANTHERLORD=m
-+CONFIG_HID_PETALYNX=m
-+CONFIG_HID_PICOLCD=m
-+CONFIG_HID_ROCCAT=m
-+CONFIG_HID_SAMSUNG=m
-+CONFIG_HID_SONY=m
-+CONFIG_SONY_FF=y
-+CONFIG_HID_SPEEDLINK=m
-+CONFIG_HID_STEAM=m
-+CONFIG_HID_SUNPLUS=m
-+CONFIG_HID_GREENASIA=m
-+CONFIG_HID_SMARTJOYPLUS=m
-+CONFIG_HID_TOPSEED=m
-+CONFIG_HID_THINGM=m
-+CONFIG_HID_THRUSTMASTER=m
-+CONFIG_HID_WACOM=m
-+CONFIG_HID_WIIMOTE=m
-+CONFIG_HID_XINMO=m
-+CONFIG_HID_ZEROPLUS=m
-+CONFIG_HID_ZYDACRON=m
-+CONFIG_HID_PID=y
-+CONFIG_USB_HIDDEV=y
-+CONFIG_USB=y
-+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-+CONFIG_USB_MON=m
-+CONFIG_USB_DWCOTG=y
-+CONFIG_USB_PRINTER=m
-+CONFIG_USB_TMC=m
-+CONFIG_USB_STORAGE=y
-+CONFIG_USB_STORAGE_REALTEK=m
-+CONFIG_USB_STORAGE_DATAFAB=m
-+CONFIG_USB_STORAGE_FREECOM=m
-+CONFIG_USB_STORAGE_ISD200=m
-+CONFIG_USB_STORAGE_USBAT=m
-+CONFIG_USB_STORAGE_SDDR09=m
-+CONFIG_USB_STORAGE_SDDR55=m
-+CONFIG_USB_STORAGE_JUMPSHOT=m
-+CONFIG_USB_STORAGE_ALAUDA=m
-+CONFIG_USB_STORAGE_ONETOUCH=m
-+CONFIG_USB_STORAGE_KARMA=m
-+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-+CONFIG_USB_STORAGE_ENE_UB6250=m
-+CONFIG_USB_UAS=m
-+CONFIG_USB_MDC800=m
-+CONFIG_USB_MICROTEK=m
-+CONFIG_USBIP_CORE=m
-+CONFIG_USBIP_VHCI_HCD=m
-+CONFIG_USBIP_HOST=m
-+CONFIG_USBIP_VUDC=m
-+CONFIG_USB_DWC2=m
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+CONFIG_USB_SERIAL_CH341=m
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP210X=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_VISOR=m
-+CONFIG_USB_SERIAL_IPAQ=m
-+CONFIG_USB_SERIAL_IR=m
-+CONFIG_USB_SERIAL_EDGEPORT=m
-+CONFIG_USB_SERIAL_EDGEPORT_TI=m
-+CONFIG_USB_SERIAL_F81232=m
-+CONFIG_USB_SERIAL_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=m
-+CONFIG_USB_SERIAL_IUU=m
-+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-+CONFIG_USB_SERIAL_KEYSPAN=m
-+CONFIG_USB_SERIAL_KLSI=m
-+CONFIG_USB_SERIAL_KOBIL_SCT=m
-+CONFIG_USB_SERIAL_MCT_U232=m
-+CONFIG_USB_SERIAL_METRO=m
-+CONFIG_USB_SERIAL_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+CONFIG_USB_SERIAL_OTI6858=m
-+CONFIG_USB_SERIAL_QCAUX=m
-+CONFIG_USB_SERIAL_QUALCOMM=m
-+CONFIG_USB_SERIAL_SPCP8X5=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_SYMBOL=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+CONFIG_USB_SERIAL_OPTICON=m
-+CONFIG_USB_SERIAL_XSENS_MT=m
-+CONFIG_USB_SERIAL_WISHBONE=m
-+CONFIG_USB_SERIAL_SSU100=m
-+CONFIG_USB_SERIAL_QT2=m
-+CONFIG_USB_SERIAL_DEBUG=m
-+CONFIG_USB_EMI62=m
-+CONFIG_USB_EMI26=m
-+CONFIG_USB_ADUTUX=m
-+CONFIG_USB_SEVSEG=m
-+CONFIG_USB_LEGOTOWER=m
-+CONFIG_USB_LCD=m
-+CONFIG_USB_CYPRESS_CY7C63=m
-+CONFIG_USB_CYTHERM=m
-+CONFIG_USB_IDMOUSE=m
-+CONFIG_USB_FTDI_ELAN=m
-+CONFIG_USB_APPLEDISPLAY=m
-+CONFIG_USB_LD=m
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+CONFIG_USB_TEST=m
-+CONFIG_USB_ISIGHTFW=m
-+CONFIG_USB_YUREX=m
-+CONFIG_USB_ATM=m
-+CONFIG_USB_SPEEDTOUCH=m
-+CONFIG_USB_CXACRU=m
-+CONFIG_USB_UEAGLEATM=m
-+CONFIG_USB_XUSBATM=m
-+CONFIG_NOP_USB_XCEIV=y
-+CONFIG_USB_GADGET=y
-+CONFIG_USB_ZERO=m
-+CONFIG_USB_AUDIO=m
-+CONFIG_USB_ETH=m
-+CONFIG_USB_GADGETFS=m
-+CONFIG_USB_MASS_STORAGE=m
-+CONFIG_USB_G_SERIAL=m
-+CONFIG_USB_MIDI_GADGET=m
-+CONFIG_USB_G_PRINTER=m
-+CONFIG_USB_CDC_COMPOSITE=m
-+CONFIG_USB_G_ACM_MS=m
-+CONFIG_USB_G_MULTI=m
-+CONFIG_USB_G_HID=m
-+CONFIG_USB_G_WEBCAM=m
-+CONFIG_MMC=y
-+CONFIG_MMC_BLOCK_MINORS=32
-+CONFIG_MMC_BCM2835_MMC=y
-+CONFIG_MMC_BCM2835_DMA=y
-+CONFIG_MMC_BCM2835_SDHOST=y
-+CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_PLTFM=y
-+CONFIG_MMC_SPI=m
-+CONFIG_LEDS_CLASS=y
-+CONFIG_LEDS_PCA9532=m
-+CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_PCA955X=m
-+CONFIG_LEDS_PCA963X=m
-+CONFIG_LEDS_IS31FL32XX=m
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+CONFIG_LEDS_TRIGGER_ONESHOT=y
-+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-+CONFIG_LEDS_TRIGGER_CPU=y
-+CONFIG_LEDS_TRIGGER_GPIO=y
-+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-+CONFIG_LEDS_TRIGGER_TRANSIENT=m
-+CONFIG_LEDS_TRIGGER_CAMERA=m
-+CONFIG_LEDS_TRIGGER_INPUT=y
-+CONFIG_LEDS_TRIGGER_PANIC=y
-+CONFIG_LEDS_TRIGGER_NETDEV=m
-+CONFIG_LEDS_TRIGGER_ACTPWR=y
-+CONFIG_ACCESSIBILITY=y
-+CONFIG_SPEAKUP=m
-+CONFIG_SPEAKUP_SYNTH_SOFT=m
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_DRV_ABX80X=m
-+CONFIG_RTC_DRV_DS1307=m
-+CONFIG_RTC_DRV_DS1374=m
-+CONFIG_RTC_DRV_DS1672=m
-+CONFIG_RTC_DRV_MAX6900=m
-+CONFIG_RTC_DRV_RS5C372=m
-+CONFIG_RTC_DRV_ISL1208=m
-+CONFIG_RTC_DRV_ISL12022=m
-+CONFIG_RTC_DRV_X1205=m
-+CONFIG_RTC_DRV_PCF8523=m
-+CONFIG_RTC_DRV_PCF85063=m
-+CONFIG_RTC_DRV_PCF85363=m
-+CONFIG_RTC_DRV_PCF8563=m
-+CONFIG_RTC_DRV_PCF8583=m
-+CONFIG_RTC_DRV_M41T80=m
-+CONFIG_RTC_DRV_BQ32K=m
-+CONFIG_RTC_DRV_S35390A=m
-+CONFIG_RTC_DRV_FM3130=m
-+CONFIG_RTC_DRV_RX8581=m
-+CONFIG_RTC_DRV_RX8025=m
-+CONFIG_RTC_DRV_EM3027=m
-+CONFIG_RTC_DRV_RV3028=m
-+CONFIG_RTC_DRV_SD3078=m
-+CONFIG_RTC_DRV_M41T93=m
-+CONFIG_RTC_DRV_M41T94=m
-+CONFIG_RTC_DRV_DS1302=m
-+CONFIG_RTC_DRV_DS1305=m
-+CONFIG_RTC_DRV_DS1390=m
-+CONFIG_RTC_DRV_R9701=m
-+CONFIG_RTC_DRV_RX4581=m
-+CONFIG_RTC_DRV_RS5C348=m
-+CONFIG_RTC_DRV_MAX6902=m
-+CONFIG_RTC_DRV_PCF2123=m
-+CONFIG_RTC_DRV_DS3232=m
-+CONFIG_RTC_DRV_PCF2127=m
-+CONFIG_RTC_DRV_RV3029C2=m
-+CONFIG_DMADEVICES=y
-+CONFIG_DMA_BCM2835=y
-+CONFIG_DMA_BCM2708=y
-+CONFIG_DMABUF_HEAPS=y
-+CONFIG_DMABUF_HEAPS_SYSTEM=y
-+CONFIG_DMABUF_HEAPS_CMA=y
-+CONFIG_AUXDISPLAY=y
-+CONFIG_HD44780=m
-+CONFIG_UIO=m
-+CONFIG_UIO_PDRV_GENIRQ=m
-+CONFIG_STAGING=y
-+CONFIG_PRISM2_USB=m
-+CONFIG_R8712U=m
-+CONFIG_R8188EU=m
-+CONFIG_VT6656=m
-+CONFIG_STAGING_MEDIA=y
-+CONFIG_FB_TFT=m
-+CONFIG_FB_TFT_AGM1264K_FL=m
-+CONFIG_FB_TFT_BD663474=m
-+CONFIG_FB_TFT_HX8340BN=m
-+CONFIG_FB_TFT_HX8347D=m
-+CONFIG_FB_TFT_HX8353D=m
-+CONFIG_FB_TFT_HX8357D=m
-+CONFIG_FB_TFT_ILI9163=m
-+CONFIG_FB_TFT_ILI9320=m
-+CONFIG_FB_TFT_ILI9325=m
-+CONFIG_FB_TFT_ILI9340=m
-+CONFIG_FB_TFT_ILI9341=m
-+CONFIG_FB_TFT_ILI9481=m
-+CONFIG_FB_TFT_ILI9486=m
-+CONFIG_FB_TFT_PCD8544=m
-+CONFIG_FB_TFT_RA8875=m
-+CONFIG_FB_TFT_S6D02A1=m
-+CONFIG_FB_TFT_S6D1121=m
-+CONFIG_FB_TFT_SH1106=m
-+CONFIG_FB_TFT_SSD1289=m
-+CONFIG_FB_TFT_SSD1306=m
-+CONFIG_FB_TFT_SSD1331=m
-+CONFIG_FB_TFT_SSD1351=m
-+CONFIG_FB_TFT_ST7735R=m
-+CONFIG_FB_TFT_ST7789V=m
-+CONFIG_FB_TFT_TINYLCD=m
-+CONFIG_FB_TFT_TLS8204=m
-+CONFIG_FB_TFT_UC1701=m
-+CONFIG_FB_TFT_UPD161704=m
-+CONFIG_FB_TFT_WATTEROTT=m
-+CONFIG_BCM2835_VCHIQ=y
-+CONFIG_SND_BCM2835=m
-+CONFIG_VIDEO_BCM2835=m
-+CONFIG_VIDEO_CODEC_BCM2835=m
-+CONFIG_VIDEO_ISP_BCM2835=m
-+CONFIG_CLK_RASPBERRYPI=y
-+CONFIG_MAILBOX=y
-+CONFIG_BCM2835_MBOX=y
-+# CONFIG_IOMMU_SUPPORT is not set
-+CONFIG_RASPBERRYPI_POWER=y
-+CONFIG_IIO=m
-+CONFIG_IIO_BUFFER_CB=m
-+CONFIG_MCP320X=m
-+CONFIG_MCP3422=m
-+CONFIG_TI_ADS1015=m
-+CONFIG_BME680=m
-+CONFIG_CCS811=m
-+CONFIG_SENSIRION_SGP30=m
-+CONFIG_SPS30_I2C=m
-+CONFIG_DHT11=m
-+CONFIG_HDC100X=m
-+CONFIG_HTU21=m
-+CONFIG_INV_MPU6050_I2C=m
-+CONFIG_APDS9960=m
-+CONFIG_BH1750=m
-+CONFIG_TSL4531=m
-+CONFIG_VEML6070=m
-+CONFIG_BMP280=m
-+CONFIG_MAXIM_THERMOCOUPLE=m
-+CONFIG_MAX31856=m
-+CONFIG_PWM_BCM2835=m
-+CONFIG_PWM_PCA9685=m
-+CONFIG_PWM_RASPBERRYPI_POE=m
-+CONFIG_RPI_AXIPERF=m
-+CONFIG_EXT4_FS=y
-+CONFIG_EXT4_FS_POSIX_ACL=y
-+CONFIG_EXT4_FS_SECURITY=y
-+CONFIG_REISERFS_FS=m
-+CONFIG_REISERFS_FS_XATTR=y
-+CONFIG_REISERFS_FS_POSIX_ACL=y
-+CONFIG_REISERFS_FS_SECURITY=y
-+CONFIG_JFS_FS=m
-+CONFIG_JFS_POSIX_ACL=y
-+CONFIG_JFS_SECURITY=y
-+CONFIG_JFS_STATISTICS=y
-+CONFIG_XFS_FS=m
-+CONFIG_XFS_QUOTA=y
-+CONFIG_XFS_POSIX_ACL=y
-+CONFIG_XFS_RT=y
-+CONFIG_GFS2_FS=m
-+CONFIG_OCFS2_FS=m
-+CONFIG_BTRFS_FS=m
-+CONFIG_BTRFS_FS_POSIX_ACL=y
-+CONFIG_NILFS2_FS=m
-+CONFIG_F2FS_FS=y
-+CONFIG_FS_ENCRYPTION=y
-+CONFIG_FANOTIFY=y
-+CONFIG_QFMT_V1=m
-+CONFIG_QFMT_V2=m
-+CONFIG_AUTOFS4_FS=y
-+CONFIG_FUSE_FS=m
-+CONFIG_CUSE=m
-+CONFIG_OVERLAY_FS=m
-+CONFIG_FSCACHE=y
-+CONFIG_FSCACHE_STATS=y
-+CONFIG_CACHEFILES=y
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+CONFIG_ZISOFS=y
-+CONFIG_UDF_FS=m
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
-+CONFIG_EXFAT_FS=m
-+CONFIG_NTFS_FS=m
-+CONFIG_NTFS_RW=y
-+CONFIG_TMPFS=y
-+CONFIG_TMPFS_POSIX_ACL=y
-+CONFIG_ECRYPT_FS=m
-+CONFIG_HFS_FS=m
-+CONFIG_HFSPLUS_FS=m
-+CONFIG_JFFS2_FS=m
-+CONFIG_JFFS2_SUMMARY=y
-+CONFIG_UBIFS_FS=m
-+CONFIG_SQUASHFS=m
-+CONFIG_SQUASHFS_XATTR=y
-+CONFIG_SQUASHFS_LZO=y
-+CONFIG_SQUASHFS_XZ=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3_ACL=y
-+CONFIG_NFS_V4=y
-+CONFIG_NFS_SWAP=y
-+CONFIG_NFS_V4_1=y
-+CONFIG_NFS_V4_2=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_NFS_FSCACHE=y
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V3_ACL=y
-+CONFIG_NFSD_V4=y
-+CONFIG_CIFS=m
-+CONFIG_CIFS_UPCALL=y
-+CONFIG_CIFS_XATTR=y
-+CONFIG_CIFS_DFS_UPCALL=y
-+CONFIG_CIFS_FSCACHE=y
-+CONFIG_9P_FS=m
-+CONFIG_9P_FS_POSIX_ACL=y
-+CONFIG_NLS_DEFAULT="utf8"
-+CONFIG_NLS_CODEPAGE_437=y
-+CONFIG_NLS_CODEPAGE_737=m
-+CONFIG_NLS_CODEPAGE_775=m
-+CONFIG_NLS_CODEPAGE_850=m
-+CONFIG_NLS_CODEPAGE_852=m
-+CONFIG_NLS_CODEPAGE_855=m
-+CONFIG_NLS_CODEPAGE_857=m
-+CONFIG_NLS_CODEPAGE_860=m
-+CONFIG_NLS_CODEPAGE_861=m
-+CONFIG_NLS_CODEPAGE_862=m
-+CONFIG_NLS_CODEPAGE_863=m
-+CONFIG_NLS_CODEPAGE_864=m
-+CONFIG_NLS_CODEPAGE_865=m
-+CONFIG_NLS_CODEPAGE_866=m
-+CONFIG_NLS_CODEPAGE_869=m
-+CONFIG_NLS_CODEPAGE_936=m
-+CONFIG_NLS_CODEPAGE_950=m
-+CONFIG_NLS_CODEPAGE_932=m
-+CONFIG_NLS_CODEPAGE_949=m
-+CONFIG_NLS_CODEPAGE_874=m
-+CONFIG_NLS_ISO8859_8=m
-+CONFIG_NLS_CODEPAGE_1250=m
-+CONFIG_NLS_CODEPAGE_1251=m
-+CONFIG_NLS_ASCII=y
-+CONFIG_NLS_ISO8859_1=m
-+CONFIG_NLS_ISO8859_2=m
-+CONFIG_NLS_ISO8859_3=m
-+CONFIG_NLS_ISO8859_4=m
-+CONFIG_NLS_ISO8859_5=m
-+CONFIG_NLS_ISO8859_6=m
-+CONFIG_NLS_ISO8859_7=m
-+CONFIG_NLS_ISO8859_9=m
-+CONFIG_NLS_ISO8859_13=m
-+CONFIG_NLS_ISO8859_14=m
-+CONFIG_NLS_ISO8859_15=m
-+CONFIG_NLS_KOI8_R=m
-+CONFIG_NLS_KOI8_U=m
-+CONFIG_DLM=m
-+CONFIG_SECURITY=y
-+CONFIG_SECURITY_APPARMOR=y
-+CONFIG_LSM=""
-+CONFIG_CRYPTO_USER=m
-+CONFIG_CRYPTO_CHACHA20POLY1305=m
-+CONFIG_CRYPTO_ADIANTUM=m
-+CONFIG_CRYPTO_XCBC=m
-+CONFIG_CRYPTO_WP512=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_LZ4=m
-+CONFIG_CRYPTO_USER_API_HASH=m
-+CONFIG_CRYPTO_USER_API_SKCIPHER=m
-+CONFIG_CRYPTO_USER_API_RNG=m
-+CONFIG_CRYPTO_USER_API_AEAD=m
-+# CONFIG_CRYPTO_HW is not set
-+CONFIG_CRC_ITU_T=y
-+CONFIG_LIBCRC32C=y
-+CONFIG_DMA_CMA=y
-+CONFIG_CMA_SIZE_MBYTES=5
-+CONFIG_PRINTK_TIME=y
-+CONFIG_BOOT_PRINTK_DELAY=y
-+CONFIG_KGDB=y
-+CONFIG_KGDB_KDB=y
-+CONFIG_KDB_KEYBOARD=y
-+CONFIG_DEBUG_MEMORY_INIT=y
-+CONFIG_DETECT_HUNG_TASK=y
-+# CONFIG_RCU_TRACE is not set
-+CONFIG_LATENCYTOP=y
-+CONFIG_FUNCTION_PROFILER=y
-+CONFIG_STACK_TRACER=y
-+CONFIG_IRQSOFF_TRACER=y
-+CONFIG_SCHED_TRACER=y
-+CONFIG_BLK_DEV_IO_TRACE=y
-+# CONFIG_UPROBE_EVENTS is not set
-diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-new file mode 100644
-index 000000000000..219f2ac0bbee
---- /dev/null
-+++ b/arch/arm/configs/bcm2711_defconfig
-@@ -0,0 +1,1484 @@
-+CONFIG_LOCALVERSION="-v7l"
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SYSVIPC=y
-+CONFIG_POSIX_MQUEUE=y
-+CONFIG_GENERIC_IRQ_DEBUGFS=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_BPF_SYSCALL=y
-+CONFIG_PREEMPT_VOLUNTARY=y
-+CONFIG_BSD_PROCESS_ACCT=y
-+CONFIG_BSD_PROCESS_ACCT_V3=y
-+CONFIG_TASKSTATS=y
-+CONFIG_TASK_DELAY_ACCT=y
-+CONFIG_TASK_XACCT=y
-+CONFIG_TASK_IO_ACCOUNTING=y
-+CONFIG_IKCONFIG=m
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_MEMCG=y
-+CONFIG_BLK_CGROUP=y
-+CONFIG_CFS_BANDWIDTH=y
-+CONFIG_CGROUP_PIDS=y
-+CONFIG_CGROUP_FREEZER=y
-+CONFIG_CPUSETS=y
-+CONFIG_CGROUP_DEVICE=y
-+CONFIG_CGROUP_CPUACCT=y
-+CONFIG_CGROUP_PERF=y
-+CONFIG_CGROUP_BPF=y
-+CONFIG_NAMESPACES=y
-+CONFIG_USER_NS=y
-+CONFIG_SCHED_AUTOGROUP=y
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_EMBEDDED=y
-+# CONFIG_COMPAT_BRK is not set
-+CONFIG_PROFILING=y
-+CONFIG_ARCH_BCM=y
-+CONFIG_ARCH_BCM2835=y
-+CONFIG_ARM_LPAE=y
-+# CONFIG_CACHE_L2X0 is not set
-+CONFIG_SMP=y
-+CONFIG_HIGHMEM=y
-+CONFIG_UACCESS_WITH_MEMCPY=y
-+# CONFIG_ATAGS is not set
-+CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
-+CONFIG_CPU_FREQ=y
-+CONFIG_CPU_FREQ_STAT=y
-+CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y
-+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-+CONFIG_CPU_FREQ_GOV_USERSPACE=y
-+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-+CONFIG_CPUFREQ_DT=y
-+CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
-+CONFIG_VFP=y
-+CONFIG_NEON=y
-+CONFIG_KERNEL_MODE_NEON=y
-+# CONFIG_SUSPEND is not set
-+CONFIG_RASPBERRYPI_FIRMWARE=y
-+CONFIG_CRYPTO_SHA1_ARM_NEON=m
-+CONFIG_CRYPTO_AES_ARM=m
-+CONFIG_CRYPTO_AES_ARM_BS=m
-+CONFIG_JUMP_LABEL=y
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODVERSIONS=y
-+CONFIG_MODULE_SRCVERSION_ALL=y
-+CONFIG_BLK_DEV_THROTTLING=y
-+CONFIG_PARTITION_ADVANCED=y
-+CONFIG_MAC_PARTITION=y
-+CONFIG_BINFMT_MISC=m
-+CONFIG_CLEANCACHE=y
-+CONFIG_FRONTSWAP=y
-+CONFIG_CMA=y
-+CONFIG_ZSWAP=y
-+CONFIG_Z3FOLD=m
-+CONFIG_ZSMALLOC=m
-+CONFIG_NET=y
-+CONFIG_PACKET=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM_USER=y
-+CONFIG_NET_KEY=m
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+CONFIG_IP_ROUTE_MULTIPATH=y
-+CONFIG_IP_ROUTE_VERBOSE=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_RARP=y
-+CONFIG_NET_IPIP=m
-+CONFIG_NET_IPGRE_DEMUX=m
-+CONFIG_NET_IPGRE=m
-+CONFIG_IP_MROUTE=y
-+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-+CONFIG_IP_PIMSM_V1=y
-+CONFIG_IP_PIMSM_V2=y
-+CONFIG_NET_IPVTI=m
-+CONFIG_NET_FOU=m
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_DIAG=m
-+CONFIG_TCP_CONG_ADVANCED=y
-+CONFIG_TCP_CONG_BBR=m
-+CONFIG_IPV6=m
-+CONFIG_IPV6_ROUTER_PREF=y
-+CONFIG_IPV6_ROUTE_INFO=y
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_ESP_OFFLOAD=m
-+CONFIG_INET6_IPCOMP=m
-+CONFIG_IPV6_ILA=m
-+CONFIG_IPV6_VTI=m
-+CONFIG_IPV6_SIT_6RD=y
-+CONFIG_IPV6_GRE=m
-+CONFIG_IPV6_MULTIPLE_TABLES=y
-+CONFIG_IPV6_SUBTREES=y
-+CONFIG_IPV6_MROUTE=y
-+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-+CONFIG_IPV6_PIMSM_V2=y
-+CONFIG_NETFILTER=y
-+CONFIG_BRIDGE_NETFILTER=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CONNTRACK_ZONES=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CONNTRACK_TIMESTAMP=y
-+CONFIG_NF_CONNTRACK_AMANDA=m
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_SNMP=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+CONFIG_NF_TABLES=m
-+CONFIG_NF_TABLES_INET=y
-+CONFIG_NF_TABLES_NETDEV=y
-+CONFIG_NFT_NUMGEN=m
-+CONFIG_NFT_CT=m
-+CONFIG_NFT_FLOW_OFFLOAD=m
-+CONFIG_NFT_COUNTER=m
-+CONFIG_NFT_CONNLIMIT=m
-+CONFIG_NFT_LOG=m
-+CONFIG_NFT_LIMIT=m
-+CONFIG_NFT_MASQ=m
-+CONFIG_NFT_REDIR=m
-+CONFIG_NFT_NAT=m
-+CONFIG_NFT_TUNNEL=m
-+CONFIG_NFT_OBJREF=m
-+CONFIG_NFT_QUEUE=m
-+CONFIG_NFT_QUOTA=m
-+CONFIG_NFT_REJECT=m
-+CONFIG_NFT_COMPAT=m
-+CONFIG_NFT_HASH=m
-+CONFIG_NFT_FIB_INET=m
-+CONFIG_NFT_SOCKET=m
-+CONFIG_NFT_OSF=m
-+CONFIG_NFT_TPROXY=m
-+CONFIG_NFT_DUP_NETDEV=m
-+CONFIG_NFT_FWD_NETDEV=m
-+CONFIG_NFT_FIB_NETDEV=m
-+CONFIG_NF_FLOW_TABLE_INET=m
-+CONFIG_NF_FLOW_TABLE=m
-+CONFIG_NETFILTER_XT_SET=m
-+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_HMARK=m
-+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-+CONFIG_NETFILTER_XT_TARGET_LED=m
-+CONFIG_NETFILTER_XT_TARGET_LOG=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-+CONFIG_NETFILTER_XT_TARGET_TEE=m
-+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-+CONFIG_NETFILTER_XT_TARGET_TRACE=m
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_BPF=m
-+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_CPU=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-+CONFIG_NETFILTER_XT_MATCH_IPVS=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-+CONFIG_NETFILTER_XT_MATCH_OSF=m
-+CONFIG_NETFILTER_XT_MATCH_OWNER=m
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_RECENT=m
-+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+CONFIG_NETFILTER_XT_MATCH_TIME=m
-+CONFIG_NETFILTER_XT_MATCH_U32=m
-+CONFIG_IP_SET=m
-+CONFIG_IP_SET_BITMAP_IP=m
-+CONFIG_IP_SET_BITMAP_IPMAC=m
-+CONFIG_IP_SET_BITMAP_PORT=m
-+CONFIG_IP_SET_HASH_IP=m
-+CONFIG_IP_SET_HASH_IPPORT=m
-+CONFIG_IP_SET_HASH_IPPORTIP=m
-+CONFIG_IP_SET_HASH_IPPORTNET=m
-+CONFIG_IP_SET_HASH_NET=m
-+CONFIG_IP_SET_HASH_NETPORT=m
-+CONFIG_IP_SET_HASH_NETIFACE=m
-+CONFIG_IP_SET_LIST_SET=m
-+CONFIG_IP_VS=m
-+CONFIG_IP_VS_PROTO_TCP=y
-+CONFIG_IP_VS_PROTO_UDP=y
-+CONFIG_IP_VS_PROTO_ESP=y
-+CONFIG_IP_VS_PROTO_AH=y
-+CONFIG_IP_VS_PROTO_SCTP=y
-+CONFIG_IP_VS_RR=m
-+CONFIG_IP_VS_WRR=m
-+CONFIG_IP_VS_LC=m
-+CONFIG_IP_VS_WLC=m
-+CONFIG_IP_VS_LBLC=m
-+CONFIG_IP_VS_LBLCR=m
-+CONFIG_IP_VS_DH=m
-+CONFIG_IP_VS_SH=m
-+CONFIG_IP_VS_SED=m
-+CONFIG_IP_VS_NQ=m
-+CONFIG_IP_VS_FTP=m
-+CONFIG_IP_VS_PE_SIP=m
-+CONFIG_NFT_DUP_IPV4=m
-+CONFIG_NFT_FIB_IPV4=m
-+CONFIG_NF_TABLES_ARP=y
-+CONFIG_NF_FLOW_TABLE_IPV4=m
-+CONFIG_NF_LOG_ARP=m
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_RPFILTER=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_NAT=m
-+CONFIG_IP_NF_TARGET_MASQUERADE=m
-+CONFIG_IP_NF_TARGET_NETMAP=m
-+CONFIG_IP_NF_TARGET_REDIRECT=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_RAW=m
-+CONFIG_IP_NF_ARPTABLES=m
-+CONFIG_IP_NF_ARPFILTER=m
-+CONFIG_IP_NF_ARP_MANGLE=m
-+CONFIG_NFT_DUP_IPV6=m
-+CONFIG_NFT_FIB_IPV6=m
-+CONFIG_NF_FLOW_TABLE_IPV6=m
-+CONFIG_IP6_NF_IPTABLES=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_MATCH_FRAG=m
-+CONFIG_IP6_NF_MATCH_OPTS=m
-+CONFIG_IP6_NF_MATCH_HL=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_RPFILTER=m
-+CONFIG_IP6_NF_MATCH_RT=m
-+CONFIG_IP6_NF_MATCH_SRH=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_TARGET_SYNPROXY=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_RAW=m
-+CONFIG_IP6_NF_SECURITY=m
-+CONFIG_IP6_NF_NAT=m
-+CONFIG_IP6_NF_TARGET_MASQUERADE=m
-+CONFIG_IP6_NF_TARGET_NPT=m
-+CONFIG_NF_TABLES_BRIDGE=m
-+CONFIG_NFT_BRIDGE_REJECT=m
-+CONFIG_BRIDGE_NF_EBTABLES=m
-+CONFIG_BRIDGE_EBT_BROUTE=m
-+CONFIG_BRIDGE_EBT_T_FILTER=m
-+CONFIG_BRIDGE_EBT_T_NAT=m
-+CONFIG_BRIDGE_EBT_802_3=m
-+CONFIG_BRIDGE_EBT_AMONG=m
-+CONFIG_BRIDGE_EBT_ARP=m
-+CONFIG_BRIDGE_EBT_IP=m
-+CONFIG_BRIDGE_EBT_IP6=m
-+CONFIG_BRIDGE_EBT_LIMIT=m
-+CONFIG_BRIDGE_EBT_MARK=m
-+CONFIG_BRIDGE_EBT_PKTTYPE=m
-+CONFIG_BRIDGE_EBT_STP=m
-+CONFIG_BRIDGE_EBT_VLAN=m
-+CONFIG_BRIDGE_EBT_ARPREPLY=m
-+CONFIG_BRIDGE_EBT_DNAT=m
-+CONFIG_BRIDGE_EBT_MARK_T=m
-+CONFIG_BRIDGE_EBT_REDIRECT=m
-+CONFIG_BRIDGE_EBT_SNAT=m
-+CONFIG_BRIDGE_EBT_LOG=m
-+CONFIG_BRIDGE_EBT_NFLOG=m
-+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-+CONFIG_ATM=m
-+CONFIG_L2TP=m
-+CONFIG_L2TP_V3=y
-+CONFIG_L2TP_IP=m
-+CONFIG_L2TP_ETH=m
-+CONFIG_BRIDGE=m
-+CONFIG_VLAN_8021Q=m
-+CONFIG_VLAN_8021Q_GVRP=y
-+CONFIG_ATALK=m
-+CONFIG_6LOWPAN=m
-+CONFIG_IEEE802154=m
-+CONFIG_IEEE802154_6LOWPAN=m
-+CONFIG_MAC802154=m
-+CONFIG_NET_SCHED=y
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_ATM=m
-+CONFIG_NET_SCH_PRIO=m
-+CONFIG_NET_SCH_MULTIQ=m
-+CONFIG_NET_SCH_RED=m
-+CONFIG_NET_SCH_SFB=m
-+CONFIG_NET_SCH_SFQ=m
-+CONFIG_NET_SCH_TEQL=m
-+CONFIG_NET_SCH_TBF=m
-+CONFIG_NET_SCH_GRED=m
-+CONFIG_NET_SCH_DSMARK=m
-+CONFIG_NET_SCH_NETEM=m
-+CONFIG_NET_SCH_DRR=m
-+CONFIG_NET_SCH_MQPRIO=m
-+CONFIG_NET_SCH_CHOKE=m
-+CONFIG_NET_SCH_QFQ=m
-+CONFIG_NET_SCH_CODEL=m
-+CONFIG_NET_SCH_FQ_CODEL=m
-+CONFIG_NET_SCH_CAKE=m
-+CONFIG_NET_SCH_FQ=m
-+CONFIG_NET_SCH_HHF=m
-+CONFIG_NET_SCH_PIE=m
-+CONFIG_NET_SCH_INGRESS=m
-+CONFIG_NET_SCH_PLUG=m
-+CONFIG_NET_CLS_BASIC=m
-+CONFIG_NET_CLS_TCINDEX=m
-+CONFIG_NET_CLS_ROUTE4=m
-+CONFIG_NET_CLS_FW=m
-+CONFIG_NET_CLS_U32=m
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+CONFIG_NET_CLS_FLOW=m
-+CONFIG_NET_CLS_CGROUP=m
-+CONFIG_NET_EMATCH=y
-+CONFIG_NET_EMATCH_CMP=m
-+CONFIG_NET_EMATCH_NBYTE=m
-+CONFIG_NET_EMATCH_U32=m
-+CONFIG_NET_EMATCH_META=m
-+CONFIG_NET_EMATCH_TEXT=m
-+CONFIG_NET_EMATCH_IPSET=m
-+CONFIG_NET_CLS_ACT=y
-+CONFIG_NET_ACT_POLICE=m
-+CONFIG_NET_ACT_GACT=m
-+CONFIG_GACT_PROB=y
-+CONFIG_NET_ACT_MIRRED=m
-+CONFIG_NET_ACT_IPT=m
-+CONFIG_NET_ACT_NAT=m
-+CONFIG_NET_ACT_PEDIT=m
-+CONFIG_NET_ACT_SIMP=m
-+CONFIG_NET_ACT_SKBEDIT=m
-+CONFIG_NET_ACT_CSUM=m
-+CONFIG_BATMAN_ADV=m
-+CONFIG_OPENVSWITCH=m
-+CONFIG_CGROUP_NET_PRIO=y
-+CONFIG_NET_PKTGEN=m
-+CONFIG_HAMRADIO=y
-+CONFIG_AX25=m
-+CONFIG_NETROM=m
-+CONFIG_ROSE=m
-+CONFIG_MKISS=m
-+CONFIG_6PACK=m
-+CONFIG_BPQETHER=m
-+CONFIG_BAYCOM_SER_FDX=m
-+CONFIG_BAYCOM_SER_HDX=m
-+CONFIG_YAM=m
-+CONFIG_CAN=m
-+CONFIG_CAN_J1939=m
-+CONFIG_CAN_ISOTP=m
-+CONFIG_CAN_VCAN=m
-+CONFIG_CAN_SLCAN=m
-+CONFIG_CAN_MCP251X=m
-+CONFIG_CAN_MCP251XFD=m
-+CONFIG_CAN_EMS_USB=m
-+CONFIG_CAN_GS_USB=m
-+CONFIG_BT=m
-+CONFIG_BT_RFCOMM=m
-+CONFIG_BT_RFCOMM_TTY=y
-+CONFIG_BT_BNEP=m
-+CONFIG_BT_BNEP_MC_FILTER=y
-+CONFIG_BT_BNEP_PROTO_FILTER=y
-+CONFIG_BT_HIDP=m
-+CONFIG_BT_6LOWPAN=m
-+CONFIG_BT_HCIBTUSB=m
-+CONFIG_BT_HCIUART=m
-+CONFIG_BT_HCIUART_3WIRE=y
-+CONFIG_BT_HCIUART_BCM=y
-+CONFIG_BT_HCIBCM203X=m
-+CONFIG_BT_HCIBPA10X=m
-+CONFIG_BT_HCIBFUSB=m
-+CONFIG_BT_HCIVHCI=m
-+CONFIG_BT_MRVL=m
-+CONFIG_BT_MRVL_SDIO=m
-+CONFIG_BT_ATH3K=m
-+CONFIG_CFG80211=m
-+CONFIG_CFG80211_WEXT=y
-+CONFIG_MAC80211=m
-+CONFIG_MAC80211_MESH=y
-+CONFIG_RFKILL=m
-+CONFIG_RFKILL_INPUT=y
-+CONFIG_NET_9P=m
-+CONFIG_NFC=m
-+CONFIG_PCI=y
-+CONFIG_PCIEPORTBUS=y
-+# CONFIG_PCIEASPM is not set
-+CONFIG_PCI_MSI=y
-+CONFIG_PCIE_BRCMSTB=y
-+CONFIG_UEVENT_HELPER=y
-+CONFIG_DEVTMPFS=y
-+CONFIG_DEVTMPFS_MOUNT=y
-+CONFIG_MTD=m
-+CONFIG_MTD_BLOCK=m
-+CONFIG_MTD_BLOCK2MTD=m
-+CONFIG_MTD_SPI_NOR=m
-+CONFIG_MTD_UBI=m
-+CONFIG_OF_CONFIGFS=y
-+CONFIG_ZRAM=m
-+CONFIG_BLK_DEV_LOOP=y
-+CONFIG_BLK_DEV_CRYPTOLOOP=m
-+CONFIG_BLK_DEV_DRBD=m
-+CONFIG_BLK_DEV_NBD=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_CDROM_PKTCDVD=m
-+CONFIG_ATA_OVER_ETH=m
-+CONFIG_BLK_DEV_NVME=y
-+CONFIG_EEPROM_AT24=m
-+CONFIG_TI_ST=m
-+CONFIG_SCSI=y
-+# CONFIG_SCSI_PROC_FS is not set
-+CONFIG_BLK_DEV_SD=y
-+CONFIG_CHR_DEV_ST=m
-+CONFIG_BLK_DEV_SR=m
-+CONFIG_CHR_DEV_SG=m
-+CONFIG_SCSI_ISCSI_ATTRS=y
-+CONFIG_ISCSI_TCP=m
-+CONFIG_ISCSI_BOOT_SYSFS=m
-+CONFIG_ATA=m
-+CONFIG_SATA_AHCI=m
-+CONFIG_SATA_MV=m
-+CONFIG_MD=y
-+CONFIG_MD_LINEAR=m
-+CONFIG_BLK_DEV_DM=m
-+CONFIG_DM_CRYPT=m
-+CONFIG_DM_SNAPSHOT=m
-+CONFIG_DM_THIN_PROVISIONING=m
-+CONFIG_DM_CACHE=m
-+CONFIG_DM_MIRROR=m
-+CONFIG_DM_LOG_USERSPACE=m
-+CONFIG_DM_RAID=m
-+CONFIG_DM_ZERO=m
-+CONFIG_DM_DELAY=m
-+CONFIG_NETDEVICES=y
-+CONFIG_BONDING=m
-+CONFIG_DUMMY=m
-+CONFIG_WIREGUARD=m
-+CONFIG_IFB=m
-+CONFIG_MACVLAN=m
-+CONFIG_IPVLAN=m
-+CONFIG_VXLAN=m
-+CONFIG_NETCONSOLE=m
-+CONFIG_TUN=m
-+CONFIG_VETH=m
-+CONFIG_NET_VRF=m
-+CONFIG_BCMGENET=y
-+CONFIG_ENC28J60=m
-+CONFIG_QCA7000_SPI=m
-+CONFIG_QCA7000_UART=m
-+CONFIG_WIZNET_W5100=m
-+CONFIG_WIZNET_W5100_SPI=m
-+CONFIG_MICREL_PHY=y
-+CONFIG_MDIO_BITBANG=m
-+CONFIG_PPP=m
-+CONFIG_PPP_BSDCOMP=m
-+CONFIG_PPP_DEFLATE=m
-+CONFIG_PPP_FILTER=y
-+CONFIG_PPP_MPPE=m
-+CONFIG_PPP_MULTILINK=y
-+CONFIG_PPPOATM=m
-+CONFIG_PPPOE=m
-+CONFIG_PPPOL2TP=m
-+CONFIG_PPP_ASYNC=m
-+CONFIG_PPP_SYNC_TTY=m
-+CONFIG_SLIP=m
-+CONFIG_SLIP_COMPRESSED=y
-+CONFIG_SLIP_SMART=y
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_RTL8152=y
-+CONFIG_USB_LAN78XX=y
-+CONFIG_USB_USBNET=y
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_AX88179_178A=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_CDC_EEM=m
-+CONFIG_USB_NET_CDC_NCM=m
-+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-+CONFIG_USB_NET_CDC_MBIM=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_SR9700=m
-+CONFIG_USB_NET_SR9800=m
-+CONFIG_USB_NET_SMSC75XX=m
-+CONFIG_USB_NET_SMSC95XX=y
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+CONFIG_USB_NET_CX82310_ETH=m
-+CONFIG_USB_NET_KALMIA=m
-+CONFIG_USB_NET_QMI_WWAN=m
-+CONFIG_USB_HSO=m
-+CONFIG_USB_NET_INT51X1=m
-+CONFIG_USB_IPHETH=m
-+CONFIG_USB_SIERRA_NET=m
-+CONFIG_USB_VL600=m
-+CONFIG_USB_NET_AQC111=m
-+CONFIG_ATH9K=m
-+CONFIG_ATH9K_HTC=m
-+CONFIG_CARL9170=m
-+CONFIG_ATH6KL=m
-+CONFIG_ATH6KL_USB=m
-+CONFIG_AR5523=m
-+CONFIG_AT76C50X_USB=m
-+CONFIG_B43=m
-+# CONFIG_B43_PHY_N is not set
-+CONFIG_B43LEGACY=m
-+CONFIG_BRCMFMAC=m
-+CONFIG_BRCMFMAC_USB=y
-+CONFIG_BRCMDBG=y
-+CONFIG_HOSTAP=m
-+CONFIG_P54_COMMON=m
-+CONFIG_P54_USB=m
-+CONFIG_LIBERTAS=m
-+CONFIG_LIBERTAS_USB=m
-+CONFIG_LIBERTAS_SDIO=m
-+CONFIG_LIBERTAS_THINFIRM=m
-+CONFIG_LIBERTAS_THINFIRM_USB=m
-+CONFIG_MWIFIEX=m
-+CONFIG_MWIFIEX_SDIO=m
-+CONFIG_MT7601U=m
-+CONFIG_MT76x0U=m
-+CONFIG_MT76x2U=m
-+CONFIG_RT2X00=m
-+CONFIG_RT2500USB=m
-+CONFIG_RT73USB=m
-+CONFIG_RT2800USB=m
-+CONFIG_RT2800USB_RT3573=y
-+CONFIG_RT2800USB_RT53XX=y
-+CONFIG_RT2800USB_RT55XX=y
-+CONFIG_RT2800USB_UNKNOWN=y
-+CONFIG_RTL8187=m
-+CONFIG_RTL8192CU=m
-+CONFIG_RTL8XXXU=m
-+CONFIG_USB_ZD1201=m
-+CONFIG_ZD1211RW=m
-+CONFIG_MAC80211_HWSIM=m
-+CONFIG_USB_NET_RNDIS_WLAN=m
-+CONFIG_IEEE802154_AT86RF230=m
-+CONFIG_IEEE802154_MRF24J40=m
-+CONFIG_IEEE802154_CC2520=m
-+CONFIG_INPUT_MOUSEDEV=y
-+CONFIG_INPUT_JOYDEV=m
-+CONFIG_INPUT_EVDEV=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_MATRIX=m
-+CONFIG_KEYBOARD_CAP11XX=m
-+# CONFIG_INPUT_MOUSE is not set
-+CONFIG_INPUT_JOYSTICK=y
-+CONFIG_JOYSTICK_IFORCE=m
-+CONFIG_JOYSTICK_IFORCE_USB=m
-+CONFIG_JOYSTICK_XPAD=m
-+CONFIG_JOYSTICK_XPAD_FF=y
-+CONFIG_JOYSTICK_XPAD_LEDS=y
-+CONFIG_JOYSTICK_PSXPAD_SPI=m
-+CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
-+CONFIG_JOYSTICK_RPISENSE=m
-+CONFIG_INPUT_TOUCHSCREEN=y
-+CONFIG_TOUCHSCREEN_ADS7846=m
-+CONFIG_TOUCHSCREEN_EGALAX=m
-+CONFIG_TOUCHSCREEN_EXC3000=m
-+CONFIG_TOUCHSCREEN_GOODIX=m
-+CONFIG_TOUCHSCREEN_ILI210X=m
-+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-+CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
-+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-+CONFIG_TOUCHSCREEN_STMPE=m
-+CONFIG_INPUT_MISC=y
-+CONFIG_INPUT_AD714X=m
-+CONFIG_INPUT_ATI_REMOTE2=m
-+CONFIG_INPUT_KEYSPAN_REMOTE=m
-+CONFIG_INPUT_POWERMATE=m
-+CONFIG_INPUT_YEALINK=m
-+CONFIG_INPUT_CM109=m
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-+CONFIG_INPUT_ADXL34X=m
-+CONFIG_INPUT_CMA3000=m
-+CONFIG_SERIO=m
-+CONFIG_SERIO_RAW=m
-+CONFIG_GAMEPORT=m
-+CONFIG_GAMEPORT_NS558=m
-+CONFIG_GAMEPORT_L4=m
-+CONFIG_BRCM_CHAR_DRIVERS=y
-+CONFIG_BCM_VCIO=y
-+CONFIG_BCM2835_DEVGPIOMEM=y
-+CONFIG_RPIVID_MEM=m
-+# CONFIG_LEGACY_PTYS is not set
-+CONFIG_SERIAL_8250=y
-+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_DMA is not set
-+CONFIG_SERIAL_8250_NR_UARTS=1
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=0
-+CONFIG_SERIAL_8250_EXTENDED=y
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+CONFIG_SERIAL_8250_BCM2835AUX=y
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_SERIAL_AMBA_PL011=y
-+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-+CONFIG_SERIAL_SC16IS7XX=m
-+CONFIG_SERIAL_SC16IS7XX_SPI=y
-+CONFIG_SERIAL_DEV_BUS=y
-+CONFIG_TTY_PRINTK=y
-+CONFIG_HW_RANDOM=y
-+CONFIG_TCG_TPM=m
-+CONFIG_TCG_TIS_SPI=m
-+CONFIG_RANDOM_TRUST_BOOTLOADER=y
-+CONFIG_I2C=y
-+CONFIG_I2C_CHARDEV=m
-+CONFIG_I2C_MUX_GPMUX=m
-+CONFIG_I2C_MUX_PCA954x=m
-+CONFIG_I2C_MUX_PINCTRL=m
-+CONFIG_I2C_BCM2708=m
-+CONFIG_I2C_BCM2835=m
-+CONFIG_I2C_BRCMSTB=m
-+CONFIG_I2C_GPIO=m
-+CONFIG_I2C_ROBOTFUZZ_OSIF=m
-+CONFIG_I2C_TINY_USB=m
-+CONFIG_SPI=y
-+CONFIG_SPI_BCM2835=m
-+CONFIG_SPI_BCM2835AUX=m
-+CONFIG_SPI_GPIO=m
-+CONFIG_SPI_SPIDEV=m
-+CONFIG_SPI_SLAVE=y
-+CONFIG_PPS_CLIENT_LDISC=m
-+CONFIG_PPS_CLIENT_GPIO=m
-+CONFIG_PINCTRL_MCP23S08=m
-+CONFIG_GPIO_SYSFS=y
-+CONFIG_GPIO_BCM_VIRT=y
-+CONFIG_GPIO_PCA953X=m
-+CONFIG_GPIO_PCA953X_IRQ=y
-+CONFIG_GPIO_PCF857X=m
-+CONFIG_GPIO_ARIZONA=m
-+CONFIG_GPIO_FSM=m
-+CONFIG_GPIO_STMPE=y
-+CONFIG_GPIO_MOCKUP=m
-+CONFIG_W1=m
-+CONFIG_W1_MASTER_DS2490=m
-+CONFIG_W1_MASTER_DS2482=m
-+CONFIG_W1_MASTER_DS1WM=m
-+CONFIG_W1_MASTER_GPIO=m
-+CONFIG_W1_SLAVE_THERM=m
-+CONFIG_W1_SLAVE_SMEM=m
-+CONFIG_W1_SLAVE_DS2408=m
-+CONFIG_W1_SLAVE_DS2413=m
-+CONFIG_W1_SLAVE_DS2406=m
-+CONFIG_W1_SLAVE_DS2423=m
-+CONFIG_W1_SLAVE_DS2431=m
-+CONFIG_W1_SLAVE_DS2433=m
-+CONFIG_W1_SLAVE_DS2438=m
-+CONFIG_W1_SLAVE_DS2780=m
-+CONFIG_W1_SLAVE_DS2781=m
-+CONFIG_W1_SLAVE_DS28E04=m
-+CONFIG_W1_SLAVE_DS28E17=m
-+CONFIG_POWER_RESET=y
-+CONFIG_POWER_RESET_GPIO=y
-+CONFIG_RPI_POE_POWER=m
-+CONFIG_BATTERY_DS2760=m
-+CONFIG_BATTERY_MAX17040=m
-+CONFIG_BATTERY_GAUGE_LTC2941=m
-+CONFIG_SENSORS_DS1621=m
-+CONFIG_SENSORS_GPIO_FAN=m
-+CONFIG_SENSORS_IIO_HWMON=m
-+CONFIG_SENSORS_JC42=m
-+CONFIG_SENSORS_LM75=m
-+CONFIG_SENSORS_PWM_FAN=m
-+CONFIG_SENSORS_RASPBERRYPI_HWMON=m
-+CONFIG_SENSORS_SHT21=m
-+CONFIG_SENSORS_SHT3x=m
-+CONFIG_SENSORS_SHTC1=m
-+CONFIG_SENSORS_INA2XX=m
-+CONFIG_SENSORS_TMP102=m
-+CONFIG_THERMAL=y
-+CONFIG_BCM2711_THERMAL=y
-+CONFIG_WATCHDOG=y
-+CONFIG_GPIO_WATCHDOG=m
-+CONFIG_BCM2835_WDT=y
-+CONFIG_MFD_STMPE=y
-+CONFIG_STMPE_SPI=y
-+CONFIG_MFD_ARIZONA_I2C=m
-+CONFIG_MFD_ARIZONA_SPI=m
-+CONFIG_MFD_WM5102=y
-+CONFIG_REGULATOR=y
-+CONFIG_REGULATOR_FIXED_VOLTAGE=y
-+CONFIG_REGULATOR_ARIZONA_LDO1=m
-+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
-+CONFIG_REGULATOR_GPIO=y
-+CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m
-+CONFIG_RC_CORE=y
-+CONFIG_LIRC=y
-+CONFIG_BPF_LIRC_MODE2=y
-+CONFIG_RC_DECODERS=y
-+CONFIG_IR_NEC_DECODER=m
-+CONFIG_IR_RC5_DECODER=m
-+CONFIG_IR_RC6_DECODER=m
-+CONFIG_IR_JVC_DECODER=m
-+CONFIG_IR_SONY_DECODER=m
-+CONFIG_IR_SANYO_DECODER=m
-+CONFIG_IR_SHARP_DECODER=m
-+CONFIG_IR_MCE_KBD_DECODER=m
-+CONFIG_IR_XMP_DECODER=m
-+CONFIG_IR_IMON_DECODER=m
-+CONFIG_RC_DEVICES=y
-+CONFIG_RC_ATI_REMOTE=m
-+CONFIG_IR_IMON=m
-+CONFIG_IR_MCEUSB=m
-+CONFIG_IR_REDRAT3=m
-+CONFIG_IR_STREAMZAP=m
-+CONFIG_IR_IGUANA=m
-+CONFIG_IR_TTUSBIR=m
-+CONFIG_RC_LOOPBACK=m
-+CONFIG_IR_GPIO_CIR=m
-+CONFIG_IR_GPIO_TX=m
-+CONFIG_IR_PWM_TX=m
-+CONFIG_MEDIA_CEC_RC=y
-+CONFIG_MEDIA_SUPPORT=m
-+CONFIG_MEDIA_USB_SUPPORT=y
-+CONFIG_USB_VIDEO_CLASS=m
-+CONFIG_USB_PWC=m
-+CONFIG_VIDEO_CPIA2=m
-+CONFIG_USB_ZR364XX=m
-+CONFIG_USB_STKWEBCAM=m
-+CONFIG_USB_S2255=m
-+CONFIG_VIDEO_USBTV=m
-+CONFIG_VIDEO_PVRUSB2=m
-+CONFIG_VIDEO_HDPVR=m
-+CONFIG_VIDEO_STK1160_COMMON=m
-+CONFIG_VIDEO_GO7007=m
-+CONFIG_VIDEO_GO7007_USB=m
-+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-+CONFIG_VIDEO_AU0828=m
-+CONFIG_VIDEO_AU0828_RC=y
-+CONFIG_VIDEO_CX231XX=m
-+CONFIG_VIDEO_CX231XX_ALSA=m
-+CONFIG_VIDEO_CX231XX_DVB=m
-+CONFIG_VIDEO_TM6000=m
-+CONFIG_VIDEO_TM6000_ALSA=m
-+CONFIG_VIDEO_TM6000_DVB=m
-+CONFIG_DVB_USB=m
-+CONFIG_DVB_USB_A800=m
-+CONFIG_DVB_USB_DIBUSB_MB=m
-+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-+CONFIG_DVB_USB_DIBUSB_MC=m
-+CONFIG_DVB_USB_DIB0700=m
-+CONFIG_DVB_USB_UMT_010=m
-+CONFIG_DVB_USB_CXUSB=m
-+CONFIG_DVB_USB_M920X=m
-+CONFIG_DVB_USB_DIGITV=m
-+CONFIG_DVB_USB_VP7045=m
-+CONFIG_DVB_USB_VP702X=m
-+CONFIG_DVB_USB_GP8PSK=m
-+CONFIG_DVB_USB_NOVA_T_USB2=m
-+CONFIG_DVB_USB_TTUSB2=m
-+CONFIG_DVB_USB_DTT200U=m
-+CONFIG_DVB_USB_OPERA1=m
-+CONFIG_DVB_USB_AF9005=m
-+CONFIG_DVB_USB_AF9005_REMOTE=m
-+CONFIG_DVB_USB_PCTV452E=m
-+CONFIG_DVB_USB_DW2102=m
-+CONFIG_DVB_USB_CINERGY_T2=m
-+CONFIG_DVB_USB_DTV5100=m
-+CONFIG_DVB_USB_AZ6027=m
-+CONFIG_DVB_USB_TECHNISAT_USB2=m
-+CONFIG_DVB_USB_V2=m
-+CONFIG_DVB_USB_AF9015=m
-+CONFIG_DVB_USB_AF9035=m
-+CONFIG_DVB_USB_ANYSEE=m
-+CONFIG_DVB_USB_AU6610=m
-+CONFIG_DVB_USB_AZ6007=m
-+CONFIG_DVB_USB_CE6230=m
-+CONFIG_DVB_USB_EC168=m
-+CONFIG_DVB_USB_GL861=m
-+CONFIG_DVB_USB_LME2510=m
-+CONFIG_DVB_USB_MXL111SF=m
-+CONFIG_DVB_USB_RTL28XXU=m
-+CONFIG_DVB_USB_DVBSKY=m
-+CONFIG_SMS_USB_DRV=m
-+CONFIG_DVB_B2C2_FLEXCOP_USB=m
-+CONFIG_DVB_AS102=m
-+CONFIG_VIDEO_EM28XX=m
-+CONFIG_VIDEO_EM28XX_V4L2=m
-+CONFIG_VIDEO_EM28XX_ALSA=m
-+CONFIG_VIDEO_EM28XX_DVB=m
-+CONFIG_RADIO_SI470X=m
-+CONFIG_USB_SI470X=m
-+CONFIG_I2C_SI470X=m
-+CONFIG_RADIO_SI4713=m
-+CONFIG_I2C_SI4713=m
-+CONFIG_USB_MR800=m
-+CONFIG_USB_DSBR=m
-+CONFIG_RADIO_SHARK=m
-+CONFIG_RADIO_SHARK2=m
-+CONFIG_USB_KEENE=m
-+CONFIG_USB_MA901=m
-+CONFIG_RADIO_TEA5764=m
-+CONFIG_RADIO_SAA7706H=m
-+CONFIG_RADIO_TEF6862=m
-+CONFIG_RADIO_WL1273=m
-+CONFIG_RADIO_WL128X=m
-+CONFIG_V4L_PLATFORM_DRIVERS=y
-+CONFIG_VIDEO_BCM2835_UNICAM=m
-+CONFIG_VIDEO_UDA1342=m
-+CONFIG_VIDEO_SONY_BTF_MPX=m
-+CONFIG_VIDEO_ADV7180=m
-+CONFIG_VIDEO_TC358743=m
-+CONFIG_VIDEO_TVP5150=m
-+CONFIG_VIDEO_TW2804=m
-+CONFIG_VIDEO_TW9903=m
-+CONFIG_VIDEO_TW9906=m
-+CONFIG_VIDEO_IMX219=m
-+CONFIG_VIDEO_IMX290=m
-+CONFIG_VIDEO_IMX477=m
-+CONFIG_VIDEO_OV5647=m
-+CONFIG_VIDEO_OV7251=m
-+CONFIG_VIDEO_OV7640=m
-+CONFIG_VIDEO_OV9281=m
-+CONFIG_VIDEO_IRS1125=m
-+CONFIG_VIDEO_MT9V011=m
-+CONFIG_DRM=m
-+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-+CONFIG_DRM_UDL=m
-+CONFIG_DRM_PANEL_SIMPLE=m
-+CONFIG_DRM_PANEL_JDI_LT070ME05000=m
-+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
-+CONFIG_DRM_DISPLAY_CONNECTOR=m
-+CONFIG_DRM_SIMPLE_BRIDGE=m
-+CONFIG_DRM_TOSHIBA_TC358762=m
-+CONFIG_DRM_V3D=m
-+CONFIG_DRM_VC4=m
-+CONFIG_DRM_VC4_HDMI_CEC=y
-+CONFIG_TINYDRM_ILI9225=m
-+CONFIG_TINYDRM_ILI9341=m
-+CONFIG_TINYDRM_MI0283QT=m
-+CONFIG_TINYDRM_REPAPER=m
-+CONFIG_TINYDRM_ST7586=m
-+CONFIG_TINYDRM_ST7735R=m
-+CONFIG_DRM_GUD=m
-+CONFIG_FB=y
-+CONFIG_FB_BCM2708=y
-+CONFIG_FB_UDL=m
-+CONFIG_FB_SIMPLE=y
-+CONFIG_FB_SSD1307=m
-+CONFIG_FB_RPISENSE=m
-+CONFIG_BACKLIGHT_RPI=m
-+CONFIG_BACKLIGHT_GPIO=m
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-+CONFIG_LOGO=y
-+# CONFIG_LOGO_LINUX_MONO is not set
-+# CONFIG_LOGO_LINUX_VGA16 is not set
-+CONFIG_SOUND=y
-+CONFIG_SND=m
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_HRTIMER=m
-+CONFIG_SND_SEQUENCER=m
-+CONFIG_SND_SEQ_DUMMY=m
-+CONFIG_SND_DUMMY=m
-+CONFIG_SND_ALOOP=m
-+CONFIG_SND_VIRMIDI=m
-+CONFIG_SND_MTPAV=m
-+CONFIG_SND_SERIAL_U16550=m
-+CONFIG_SND_MPU401=m
-+CONFIG_SND_USB_AUDIO=m
-+CONFIG_SND_USB_UA101=m
-+CONFIG_SND_USB_CAIAQ=m
-+CONFIG_SND_USB_CAIAQ_INPUT=y
-+CONFIG_SND_USB_6FIRE=m
-+CONFIG_SND_USB_HIFACE=m
-+CONFIG_SND_USB_TONEPORT=m
-+CONFIG_SND_SOC=m
-+CONFIG_SND_BCM2835_SOC_I2S=m
-+CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC=m
-+CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
-+CONFIG_SND_BCM2708_SOC_PIFI_40=m
-+CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m
-+CONFIG_SND_BCM2708_SOC_RPI_DAC=m
-+CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
-+CONFIG_SND_BCM2708_SOC_JUSTBOOM_BOTH=m
-+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m
-+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m
-+CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m
-+CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
-+CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m
-+CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m
-+CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m
-+CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m
-+CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m
-+CONFIG_SND_AUDIOINJECTOR_ISOLATED_SOUNDCARD=m
-+CONFIG_SND_AUDIOSENSE_PI=m
-+CONFIG_SND_DIGIDAC1_SOUNDCARD=m
-+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m
-+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
-+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
-+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m
-+CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m
-+CONFIG_SND_BCM2708_SOC_ALLO_BOSS2_DAC=m
-+CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m
-+CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m
-+CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
-+CONFIG_SND_PISOUND=m
-+CONFIG_SND_SOC_AD193X_SPI=m
-+CONFIG_SND_SOC_AD193X_I2C=m
-+CONFIG_SND_SOC_ADAU1701=m
-+CONFIG_SND_SOC_ADAU7002=m
-+CONFIG_SND_SOC_AK4554=m
-+CONFIG_SND_SOC_CS4265=m
-+CONFIG_SND_SOC_ICS43432=m
-+CONFIG_SND_SOC_MA120X0P=m
-+CONFIG_SND_SOC_MAX98357A=m
-+CONFIG_SND_SOC_SPDIF=m
-+CONFIG_SND_SOC_WM8804_I2C=m
-+CONFIG_SND_SOC_WM8960=m
-+CONFIG_SND_SIMPLE_CARD=m
-+CONFIG_HID_BATTERY_STRENGTH=y
-+CONFIG_HIDRAW=y
-+CONFIG_UHID=m
-+CONFIG_HID_A4TECH=m
-+CONFIG_HID_ACRUX=m
-+CONFIG_HID_APPLE=m
-+CONFIG_HID_ASUS=m
-+CONFIG_HID_BELKIN=m
-+CONFIG_HID_BETOP_FF=m
-+CONFIG_HID_BIGBEN_FF=m
-+CONFIG_HID_CHERRY=m
-+CONFIG_HID_CHICONY=m
-+CONFIG_HID_CYPRESS=m
-+CONFIG_HID_DRAGONRISE=m
-+CONFIG_HID_EMS_FF=m
-+CONFIG_HID_ELECOM=m
-+CONFIG_HID_ELO=m
-+CONFIG_HID_EZKEY=m
-+CONFIG_HID_GEMBIRD=m
-+CONFIG_HID_HOLTEK=m
-+CONFIG_HID_KEYTOUCH=m
-+CONFIG_HID_KYE=m
-+CONFIG_HID_UCLOGIC=m
-+CONFIG_HID_WALTOP=m
-+CONFIG_HID_GYRATION=m
-+CONFIG_HID_TWINHAN=m
-+CONFIG_HID_KENSINGTON=m
-+CONFIG_HID_LCPOWER=m
-+CONFIG_HID_LOGITECH=m
-+CONFIG_HID_LOGITECH_DJ=m
-+CONFIG_LOGITECH_FF=y
-+CONFIG_LOGIRUMBLEPAD2_FF=y
-+CONFIG_LOGIG940_FF=y
-+CONFIG_HID_MAGICMOUSE=m
-+CONFIG_HID_MICROSOFT=m
-+CONFIG_HID_MONTEREY=m
-+CONFIG_HID_MULTITOUCH=m
-+CONFIG_HID_NTRIG=m
-+CONFIG_HID_ORTEK=m
-+CONFIG_HID_PANTHERLORD=m
-+CONFIG_HID_PETALYNX=m
-+CONFIG_HID_PICOLCD=m
-+CONFIG_HID_ROCCAT=m
-+CONFIG_HID_SAMSUNG=m
-+CONFIG_HID_SONY=m
-+CONFIG_SONY_FF=y
-+CONFIG_HID_SPEEDLINK=m
-+CONFIG_HID_STEAM=m
-+CONFIG_HID_SUNPLUS=m
-+CONFIG_HID_GREENASIA=m
-+CONFIG_HID_SMARTJOYPLUS=m
-+CONFIG_HID_TOPSEED=m
-+CONFIG_HID_THINGM=m
-+CONFIG_HID_THRUSTMASTER=m
-+CONFIG_HID_WACOM=m
-+CONFIG_HID_WIIMOTE=m
-+CONFIG_HID_XINMO=m
-+CONFIG_HID_ZEROPLUS=m
-+CONFIG_HID_ZYDACRON=m
-+CONFIG_HID_PID=y
-+CONFIG_USB_HIDDEV=y
-+CONFIG_USB=y
-+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-+CONFIG_USB_MON=m
-+CONFIG_USB_XHCI_HCD=y
-+CONFIG_USB_XHCI_PLATFORM=y
-+CONFIG_USB_DWCOTG=y
-+CONFIG_USB_PRINTER=m
-+CONFIG_USB_TMC=m
-+CONFIG_USB_STORAGE=y
-+CONFIG_USB_STORAGE_REALTEK=m
-+CONFIG_USB_STORAGE_DATAFAB=m
-+CONFIG_USB_STORAGE_FREECOM=m
-+CONFIG_USB_STORAGE_ISD200=m
-+CONFIG_USB_STORAGE_USBAT=m
-+CONFIG_USB_STORAGE_SDDR09=m
-+CONFIG_USB_STORAGE_SDDR55=m
-+CONFIG_USB_STORAGE_JUMPSHOT=m
-+CONFIG_USB_STORAGE_ALAUDA=m
-+CONFIG_USB_STORAGE_ONETOUCH=m
-+CONFIG_USB_STORAGE_KARMA=m
-+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-+CONFIG_USB_STORAGE_ENE_UB6250=m
-+CONFIG_USB_UAS=y
-+CONFIG_USB_MDC800=m
-+CONFIG_USB_MICROTEK=m
-+CONFIG_USBIP_CORE=m
-+CONFIG_USBIP_VHCI_HCD=m
-+CONFIG_USBIP_HOST=m
-+CONFIG_USBIP_VUDC=m
-+CONFIG_USB_DWC2=m
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+CONFIG_USB_SERIAL_CH341=m
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP210X=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_VISOR=m
-+CONFIG_USB_SERIAL_IPAQ=m
-+CONFIG_USB_SERIAL_IR=m
-+CONFIG_USB_SERIAL_EDGEPORT=m
-+CONFIG_USB_SERIAL_EDGEPORT_TI=m
-+CONFIG_USB_SERIAL_F81232=m
-+CONFIG_USB_SERIAL_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=m
-+CONFIG_USB_SERIAL_IUU=m
-+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-+CONFIG_USB_SERIAL_KEYSPAN=m
-+CONFIG_USB_SERIAL_KLSI=m
-+CONFIG_USB_SERIAL_KOBIL_SCT=m
-+CONFIG_USB_SERIAL_MCT_U232=m
-+CONFIG_USB_SERIAL_METRO=m
-+CONFIG_USB_SERIAL_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+CONFIG_USB_SERIAL_OTI6858=m
-+CONFIG_USB_SERIAL_QCAUX=m
-+CONFIG_USB_SERIAL_QUALCOMM=m
-+CONFIG_USB_SERIAL_SPCP8X5=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_SYMBOL=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+CONFIG_USB_SERIAL_OPTICON=m
-+CONFIG_USB_SERIAL_XSENS_MT=m
-+CONFIG_USB_SERIAL_WISHBONE=m
-+CONFIG_USB_SERIAL_SSU100=m
-+CONFIG_USB_SERIAL_QT2=m
-+CONFIG_USB_SERIAL_DEBUG=m
-+CONFIG_USB_EMI62=m
-+CONFIG_USB_EMI26=m
-+CONFIG_USB_ADUTUX=m
-+CONFIG_USB_SEVSEG=m
-+CONFIG_USB_LEGOTOWER=m
-+CONFIG_USB_LCD=m
-+CONFIG_USB_CYPRESS_CY7C63=m
-+CONFIG_USB_CYTHERM=m
-+CONFIG_USB_IDMOUSE=m
-+CONFIG_USB_FTDI_ELAN=m
-+CONFIG_USB_APPLEDISPLAY=m
-+CONFIG_USB_LD=m
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+CONFIG_USB_TEST=m
-+CONFIG_USB_ISIGHTFW=m
-+CONFIG_USB_YUREX=m
-+CONFIG_USB_ATM=m
-+CONFIG_USB_SPEEDTOUCH=m
-+CONFIG_USB_CXACRU=m
-+CONFIG_USB_UEAGLEATM=m
-+CONFIG_USB_XUSBATM=m
-+CONFIG_NOP_USB_XCEIV=y
-+CONFIG_USB_GADGET=y
-+CONFIG_USB_CONFIGFS=m
-+CONFIG_USB_CONFIGFS_SERIAL=y
-+CONFIG_USB_CONFIGFS_ACM=y
-+CONFIG_USB_CONFIGFS_OBEX=y
-+CONFIG_USB_CONFIGFS_NCM=y
-+CONFIG_USB_CONFIGFS_ECM=y
-+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
-+CONFIG_USB_CONFIGFS_RNDIS=y
-+CONFIG_USB_CONFIGFS_EEM=y
-+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-+CONFIG_USB_CONFIGFS_F_LB_SS=y
-+CONFIG_USB_CONFIGFS_F_FS=y
-+CONFIG_USB_CONFIGFS_F_UAC1=y
-+CONFIG_USB_CONFIGFS_F_UAC2=y
-+CONFIG_USB_CONFIGFS_F_MIDI=y
-+CONFIG_USB_CONFIGFS_F_HID=y
-+CONFIG_USB_CONFIGFS_F_UVC=y
-+CONFIG_USB_CONFIGFS_F_PRINTER=y
-+CONFIG_USB_ZERO=m
-+CONFIG_USB_AUDIO=m
-+CONFIG_USB_ETH=m
-+CONFIG_USB_GADGETFS=m
-+CONFIG_USB_MASS_STORAGE=m
-+CONFIG_USB_G_SERIAL=m
-+CONFIG_USB_MIDI_GADGET=m
-+CONFIG_USB_G_PRINTER=m
-+CONFIG_USB_CDC_COMPOSITE=m
-+CONFIG_USB_G_ACM_MS=m
-+CONFIG_USB_G_MULTI=m
-+CONFIG_USB_G_HID=m
-+CONFIG_USB_G_WEBCAM=m
-+CONFIG_MMC=y
-+CONFIG_MMC_BLOCK_MINORS=32
-+CONFIG_MMC_BCM2835_MMC=y
-+CONFIG_MMC_BCM2835_DMA=y
-+CONFIG_MMC_BCM2835_SDHOST=y
-+CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_PLTFM=y
-+CONFIG_MMC_SDHCI_IPROC=y
-+CONFIG_MMC_SPI=m
-+CONFIG_LEDS_CLASS=y
-+CONFIG_LEDS_PCA9532=m
-+CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_PCA955X=m
-+CONFIG_LEDS_PCA963X=m
-+CONFIG_LEDS_IS31FL32XX=m
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+CONFIG_LEDS_TRIGGER_ONESHOT=y
-+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-+CONFIG_LEDS_TRIGGER_CPU=y
-+CONFIG_LEDS_TRIGGER_GPIO=y
-+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-+CONFIG_LEDS_TRIGGER_TRANSIENT=m
-+CONFIG_LEDS_TRIGGER_CAMERA=m
-+CONFIG_LEDS_TRIGGER_INPUT=y
-+CONFIG_LEDS_TRIGGER_PANIC=y
-+CONFIG_LEDS_TRIGGER_NETDEV=m
-+CONFIG_LEDS_TRIGGER_ACTPWR=y
-+CONFIG_ACCESSIBILITY=y
-+CONFIG_SPEAKUP=m
-+CONFIG_SPEAKUP_SYNTH_SOFT=m
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_DRV_ABX80X=m
-+CONFIG_RTC_DRV_DS1307=m
-+CONFIG_RTC_DRV_DS1374=m
-+CONFIG_RTC_DRV_DS1672=m
-+CONFIG_RTC_DRV_MAX6900=m
-+CONFIG_RTC_DRV_RS5C372=m
-+CONFIG_RTC_DRV_ISL1208=m
-+CONFIG_RTC_DRV_ISL12022=m
-+CONFIG_RTC_DRV_X1205=m
-+CONFIG_RTC_DRV_PCF8523=m
-+CONFIG_RTC_DRV_PCF85063=m
-+CONFIG_RTC_DRV_PCF85363=m
-+CONFIG_RTC_DRV_PCF8563=m
-+CONFIG_RTC_DRV_PCF8583=m
-+CONFIG_RTC_DRV_M41T80=m
-+CONFIG_RTC_DRV_BQ32K=m
-+CONFIG_RTC_DRV_S35390A=m
-+CONFIG_RTC_DRV_FM3130=m
-+CONFIG_RTC_DRV_RX8581=m
-+CONFIG_RTC_DRV_RX8025=m
-+CONFIG_RTC_DRV_EM3027=m
-+CONFIG_RTC_DRV_RV3028=m
-+CONFIG_RTC_DRV_SD3078=m
-+CONFIG_RTC_DRV_M41T93=m
-+CONFIG_RTC_DRV_M41T94=m
-+CONFIG_RTC_DRV_DS1302=m
-+CONFIG_RTC_DRV_DS1305=m
-+CONFIG_RTC_DRV_DS1390=m
-+CONFIG_RTC_DRV_R9701=m
-+CONFIG_RTC_DRV_RX4581=m
-+CONFIG_RTC_DRV_RS5C348=m
-+CONFIG_RTC_DRV_MAX6902=m
-+CONFIG_RTC_DRV_PCF2123=m
-+CONFIG_RTC_DRV_DS3232=m
-+CONFIG_RTC_DRV_PCF2127=m
-+CONFIG_RTC_DRV_RV3029C2=m
-+CONFIG_DMADEVICES=y
-+CONFIG_DMA_BCM2835=y
-+CONFIG_DMA_BCM2708=y
-+CONFIG_DMABUF_HEAPS=y
-+CONFIG_DMABUF_HEAPS_SYSTEM=y
-+CONFIG_DMABUF_HEAPS_CMA=y
-+CONFIG_AUXDISPLAY=y
-+CONFIG_HD44780=m
-+CONFIG_UIO=m
-+CONFIG_UIO_PDRV_GENIRQ=m
-+CONFIG_STAGING=y
-+CONFIG_PRISM2_USB=m
-+CONFIG_R8712U=m
-+CONFIG_R8188EU=m
-+CONFIG_VT6656=m
-+CONFIG_STAGING_MEDIA=y
-+CONFIG_VIDEO_RPIVID=m
-+CONFIG_FB_TFT=m
-+CONFIG_FB_TFT_AGM1264K_FL=m
-+CONFIG_FB_TFT_BD663474=m
-+CONFIG_FB_TFT_HX8340BN=m
-+CONFIG_FB_TFT_HX8347D=m
-+CONFIG_FB_TFT_HX8353D=m
-+CONFIG_FB_TFT_HX8357D=m
-+CONFIG_FB_TFT_ILI9163=m
-+CONFIG_FB_TFT_ILI9320=m
-+CONFIG_FB_TFT_ILI9325=m
-+CONFIG_FB_TFT_ILI9340=m
-+CONFIG_FB_TFT_ILI9341=m
-+CONFIG_FB_TFT_ILI9481=m
-+CONFIG_FB_TFT_ILI9486=m
-+CONFIG_FB_TFT_PCD8544=m
-+CONFIG_FB_TFT_RA8875=m
-+CONFIG_FB_TFT_S6D02A1=m
-+CONFIG_FB_TFT_S6D1121=m
-+CONFIG_FB_TFT_SH1106=m
-+CONFIG_FB_TFT_SSD1289=m
-+CONFIG_FB_TFT_SSD1306=m
-+CONFIG_FB_TFT_SSD1331=m
-+CONFIG_FB_TFT_SSD1351=m
-+CONFIG_FB_TFT_ST7735R=m
-+CONFIG_FB_TFT_ST7789V=m
-+CONFIG_FB_TFT_TINYLCD=m
-+CONFIG_FB_TFT_TLS8204=m
-+CONFIG_FB_TFT_UC1701=m
-+CONFIG_FB_TFT_UPD161704=m
-+CONFIG_FB_TFT_WATTEROTT=m
-+CONFIG_BCM2835_VCHIQ=y
-+CONFIG_SND_BCM2835=m
-+CONFIG_VIDEO_BCM2835=m
-+CONFIG_VIDEO_CODEC_BCM2835=m
-+CONFIG_VIDEO_ISP_BCM2835=m
-+CONFIG_CLK_RASPBERRYPI=y
-+CONFIG_MAILBOX=y
-+CONFIG_BCM2835_MBOX=y
-+# CONFIG_IOMMU_SUPPORT is not set
-+CONFIG_RASPBERRYPI_POWER=y
-+CONFIG_IIO=m
-+CONFIG_IIO_BUFFER_CB=m
-+CONFIG_MCP320X=m
-+CONFIG_MCP3422=m
-+CONFIG_TI_ADS1015=m
-+CONFIG_BME680=m
-+CONFIG_CCS811=m
-+CONFIG_SENSIRION_SGP30=m
-+CONFIG_SPS30_I2C=m
-+CONFIG_DHT11=m
-+CONFIG_HDC100X=m
-+CONFIG_HTU21=m
-+CONFIG_INV_MPU6050_I2C=m
-+CONFIG_APDS9960=m
-+CONFIG_BH1750=m
-+CONFIG_TSL4531=m
-+CONFIG_VEML6070=m
-+CONFIG_BMP280=m
-+CONFIG_MAXIM_THERMOCOUPLE=m
-+CONFIG_MAX31856=m
-+CONFIG_PWM_BCM2835=m
-+CONFIG_PWM_PCA9685=m
-+CONFIG_PWM_RASPBERRYPI_POE=m
-+CONFIG_RPI_AXIPERF=m
-+CONFIG_NVMEM_RMEM=m
-+CONFIG_EXT4_FS=y
-+CONFIG_EXT4_FS_POSIX_ACL=y
-+CONFIG_EXT4_FS_SECURITY=y
-+CONFIG_REISERFS_FS=m
-+CONFIG_REISERFS_FS_XATTR=y
-+CONFIG_REISERFS_FS_POSIX_ACL=y
-+CONFIG_REISERFS_FS_SECURITY=y
-+CONFIG_JFS_FS=m
-+CONFIG_JFS_POSIX_ACL=y
-+CONFIG_JFS_SECURITY=y
-+CONFIG_JFS_STATISTICS=y
-+CONFIG_XFS_FS=m
-+CONFIG_XFS_QUOTA=y
-+CONFIG_XFS_POSIX_ACL=y
-+CONFIG_XFS_RT=y
-+CONFIG_GFS2_FS=m
-+CONFIG_OCFS2_FS=m
-+CONFIG_BTRFS_FS=m
-+CONFIG_BTRFS_FS_POSIX_ACL=y
-+CONFIG_NILFS2_FS=m
-+CONFIG_F2FS_FS=y
-+CONFIG_FS_ENCRYPTION=y
-+CONFIG_FANOTIFY=y
-+CONFIG_QFMT_V1=m
-+CONFIG_QFMT_V2=m
-+CONFIG_AUTOFS4_FS=y
-+CONFIG_FUSE_FS=m
-+CONFIG_CUSE=m
-+CONFIG_OVERLAY_FS=m
-+CONFIG_FSCACHE=y
-+CONFIG_FSCACHE_STATS=y
-+CONFIG_CACHEFILES=y
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+CONFIG_ZISOFS=y
-+CONFIG_UDF_FS=m
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
-+CONFIG_EXFAT_FS=m
-+CONFIG_NTFS_FS=m
-+CONFIG_NTFS_RW=y
-+CONFIG_TMPFS=y
-+CONFIG_TMPFS_POSIX_ACL=y
-+CONFIG_ECRYPT_FS=m
-+CONFIG_HFS_FS=m
-+CONFIG_HFSPLUS_FS=m
-+CONFIG_JFFS2_FS=m
-+CONFIG_JFFS2_SUMMARY=y
-+CONFIG_UBIFS_FS=m
-+CONFIG_SQUASHFS=m
-+CONFIG_SQUASHFS_XATTR=y
-+CONFIG_SQUASHFS_LZO=y
-+CONFIG_SQUASHFS_XZ=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3_ACL=y
-+CONFIG_NFS_V4=y
-+CONFIG_NFS_SWAP=y
-+CONFIG_NFS_V4_1=y
-+CONFIG_NFS_V4_2=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_NFS_FSCACHE=y
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V3_ACL=y
-+CONFIG_NFSD_V4=y
-+CONFIG_CIFS=m
-+CONFIG_CIFS_UPCALL=y
-+CONFIG_CIFS_XATTR=y
-+CONFIG_CIFS_POSIX=y
-+CONFIG_CIFS_DFS_UPCALL=y
-+CONFIG_CIFS_FSCACHE=y
-+CONFIG_9P_FS=m
-+CONFIG_9P_FS_POSIX_ACL=y
-+CONFIG_NLS_DEFAULT="utf8"
-+CONFIG_NLS_CODEPAGE_437=y
-+CONFIG_NLS_CODEPAGE_737=m
-+CONFIG_NLS_CODEPAGE_775=m
-+CONFIG_NLS_CODEPAGE_850=m
-+CONFIG_NLS_CODEPAGE_852=m
-+CONFIG_NLS_CODEPAGE_855=m
-+CONFIG_NLS_CODEPAGE_857=m
-+CONFIG_NLS_CODEPAGE_860=m
-+CONFIG_NLS_CODEPAGE_861=m
-+CONFIG_NLS_CODEPAGE_862=m
-+CONFIG_NLS_CODEPAGE_863=m
-+CONFIG_NLS_CODEPAGE_864=m
-+CONFIG_NLS_CODEPAGE_865=m
-+CONFIG_NLS_CODEPAGE_866=m
-+CONFIG_NLS_CODEPAGE_869=m
-+CONFIG_NLS_CODEPAGE_936=m
-+CONFIG_NLS_CODEPAGE_950=m
-+CONFIG_NLS_CODEPAGE_932=m
-+CONFIG_NLS_CODEPAGE_949=m
-+CONFIG_NLS_CODEPAGE_874=m
-+CONFIG_NLS_ISO8859_8=m
-+CONFIG_NLS_CODEPAGE_1250=m
-+CONFIG_NLS_CODEPAGE_1251=m
-+CONFIG_NLS_ASCII=y
-+CONFIG_NLS_ISO8859_1=m
-+CONFIG_NLS_ISO8859_2=m
-+CONFIG_NLS_ISO8859_3=m
-+CONFIG_NLS_ISO8859_4=m
-+CONFIG_NLS_ISO8859_5=m
-+CONFIG_NLS_ISO8859_6=m
-+CONFIG_NLS_ISO8859_7=m
-+CONFIG_NLS_ISO8859_9=m
-+CONFIG_NLS_ISO8859_13=m
-+CONFIG_NLS_ISO8859_14=m
-+CONFIG_NLS_ISO8859_15=m
-+CONFIG_NLS_KOI8_R=m
-+CONFIG_NLS_KOI8_U=m
-+CONFIG_DLM=m
-+CONFIG_SECURITY=y
-+CONFIG_SECURITY_APPARMOR=y
-+CONFIG_LSM=""
-+CONFIG_CRYPTO_USER=m
-+CONFIG_CRYPTO_CHACHA20POLY1305=m
-+CONFIG_CRYPTO_ADIANTUM=m
-+CONFIG_CRYPTO_XCBC=m
-+CONFIG_CRYPTO_WP512=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_LZ4=m
-+CONFIG_CRYPTO_USER_API_HASH=m
-+CONFIG_CRYPTO_USER_API_SKCIPHER=m
-+CONFIG_CRYPTO_USER_API_RNG=m
-+CONFIG_CRYPTO_USER_API_AEAD=m
-+# CONFIG_CRYPTO_HW is not set
-+CONFIG_CRC_ITU_T=y
-+CONFIG_LIBCRC32C=y
-+CONFIG_DMA_CMA=y
-+CONFIG_CMA_SIZE_MBYTES=5
-+CONFIG_PRINTK_TIME=y
-+CONFIG_BOOT_PRINTK_DELAY=y
-+CONFIG_KGDB=y
-+CONFIG_KGDB_KDB=y
-+CONFIG_KDB_KEYBOARD=y
-+CONFIG_DEBUG_MEMORY_INIT=y
-+CONFIG_DETECT_HUNG_TASK=y
-+# CONFIG_RCU_TRACE is not set
-+CONFIG_LATENCYTOP=y
-+CONFIG_FUNCTION_PROFILER=y
-+CONFIG_STACK_TRACER=y
-+CONFIG_IRQSOFF_TRACER=y
-+CONFIG_SCHED_TRACER=y
-+CONFIG_BLK_DEV_IO_TRACE=y
-+# CONFIG_UPROBE_EVENTS is not set
-diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-new file mode 100644
-index 000000000000..18540a4f9cd7
---- /dev/null
-+++ b/arch/arm/configs/bcmrpi_defconfig
-@@ -0,0 +1,1458 @@
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SYSVIPC=y
-+CONFIG_POSIX_MQUEUE=y
-+CONFIG_GENERIC_IRQ_DEBUGFS=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_BPF_SYSCALL=y
-+CONFIG_PREEMPT_VOLUNTARY=y
-+CONFIG_BSD_PROCESS_ACCT=y
-+CONFIG_BSD_PROCESS_ACCT_V3=y
-+CONFIG_TASKSTATS=y
-+CONFIG_TASK_DELAY_ACCT=y
-+CONFIG_TASK_XACCT=y
-+CONFIG_TASK_IO_ACCOUNTING=y
-+CONFIG_IKCONFIG=m
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_MEMCG=y
-+CONFIG_BLK_CGROUP=y
-+CONFIG_CFS_BANDWIDTH=y
-+CONFIG_CGROUP_PIDS=y
-+CONFIG_CGROUP_FREEZER=y
-+CONFIG_CGROUP_DEVICE=y
-+CONFIG_CGROUP_CPUACCT=y
-+CONFIG_CGROUP_PERF=y
-+CONFIG_CGROUP_BPF=y
-+CONFIG_NAMESPACES=y
-+CONFIG_USER_NS=y
-+CONFIG_SCHED_AUTOGROUP=y
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_EMBEDDED=y
-+# CONFIG_COMPAT_BRK is not set
-+CONFIG_PROFILING=y
-+CONFIG_ARCH_MULTI_V6=y
-+# CONFIG_ARCH_MULTI_V7 is not set
-+CONFIG_ARCH_BCM=y
-+CONFIG_ARCH_BCM2835=y
-+# CONFIG_CACHE_L2X0 is not set
-+# CONFIG_CPU_SW_DOMAIN_PAN is not set
-+CONFIG_UACCESS_WITH_MEMCPY=y
-+# CONFIG_ATAGS is not set
-+CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
-+CONFIG_CPU_FREQ=y
-+CONFIG_CPU_FREQ_STAT=y
-+CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y
-+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-+CONFIG_CPU_FREQ_GOV_USERSPACE=y
-+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-+CONFIG_CPUFREQ_DT=y
-+CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
-+CONFIG_VFP=y
-+# CONFIG_SUSPEND is not set
-+CONFIG_RASPBERRYPI_FIRMWARE=y
-+CONFIG_CRYPTO_SHA1_ARM=m
-+CONFIG_CRYPTO_AES_ARM=m
-+CONFIG_JUMP_LABEL=y
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODVERSIONS=y
-+CONFIG_MODULE_SRCVERSION_ALL=y
-+CONFIG_PARTITION_ADVANCED=y
-+CONFIG_MAC_PARTITION=y
-+CONFIG_BINFMT_MISC=m
-+CONFIG_CLEANCACHE=y
-+CONFIG_FRONTSWAP=y
-+CONFIG_CMA=y
-+CONFIG_ZSWAP=y
-+CONFIG_Z3FOLD=m
-+CONFIG_ZSMALLOC=m
-+CONFIG_NET=y
-+CONFIG_PACKET=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM_USER=y
-+CONFIG_NET_KEY=m
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+CONFIG_IP_ROUTE_MULTIPATH=y
-+CONFIG_IP_ROUTE_VERBOSE=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_RARP=y
-+CONFIG_NET_IPIP=m
-+CONFIG_NET_IPGRE_DEMUX=m
-+CONFIG_NET_IPGRE=m
-+CONFIG_IP_MROUTE=y
-+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-+CONFIG_IP_PIMSM_V1=y
-+CONFIG_IP_PIMSM_V2=y
-+CONFIG_NET_IPVTI=m
-+CONFIG_NET_FOU=m
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_DIAG=m
-+CONFIG_TCP_CONG_ADVANCED=y
-+CONFIG_TCP_CONG_BBR=m
-+CONFIG_IPV6=m
-+CONFIG_IPV6_ROUTER_PREF=y
-+CONFIG_IPV6_ROUTE_INFO=y
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_ESP_OFFLOAD=m
-+CONFIG_INET6_IPCOMP=m
-+CONFIG_IPV6_ILA=m
-+CONFIG_IPV6_VTI=m
-+CONFIG_IPV6_SIT_6RD=y
-+CONFIG_IPV6_GRE=m
-+CONFIG_IPV6_MULTIPLE_TABLES=y
-+CONFIG_IPV6_SUBTREES=y
-+CONFIG_IPV6_MROUTE=y
-+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-+CONFIG_IPV6_PIMSM_V2=y
-+CONFIG_NETFILTER=y
-+CONFIG_BRIDGE_NETFILTER=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CONNTRACK_ZONES=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CONNTRACK_TIMESTAMP=y
-+CONFIG_NF_CONNTRACK_AMANDA=m
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_SNMP=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+CONFIG_NF_TABLES=m
-+CONFIG_NF_TABLES_INET=y
-+CONFIG_NF_TABLES_NETDEV=y
-+CONFIG_NFT_NUMGEN=m
-+CONFIG_NFT_CT=m
-+CONFIG_NFT_FLOW_OFFLOAD=m
-+CONFIG_NFT_COUNTER=m
-+CONFIG_NFT_CONNLIMIT=m
-+CONFIG_NFT_LOG=m
-+CONFIG_NFT_LIMIT=m
-+CONFIG_NFT_MASQ=m
-+CONFIG_NFT_REDIR=m
-+CONFIG_NFT_NAT=m
-+CONFIG_NFT_TUNNEL=m
-+CONFIG_NFT_OBJREF=m
-+CONFIG_NFT_QUEUE=m
-+CONFIG_NFT_QUOTA=m
-+CONFIG_NFT_REJECT=m
-+CONFIG_NFT_COMPAT=m
-+CONFIG_NFT_HASH=m
-+CONFIG_NFT_FIB_INET=m
-+CONFIG_NFT_SOCKET=m
-+CONFIG_NFT_OSF=m
-+CONFIG_NFT_TPROXY=m
-+CONFIG_NFT_DUP_NETDEV=m
-+CONFIG_NFT_FWD_NETDEV=m
-+CONFIG_NFT_FIB_NETDEV=m
-+CONFIG_NF_FLOW_TABLE_INET=m
-+CONFIG_NF_FLOW_TABLE=m
-+CONFIG_NETFILTER_XT_SET=m
-+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_HMARK=m
-+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-+CONFIG_NETFILTER_XT_TARGET_LED=m
-+CONFIG_NETFILTER_XT_TARGET_LOG=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-+CONFIG_NETFILTER_XT_TARGET_TEE=m
-+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-+CONFIG_NETFILTER_XT_TARGET_TRACE=m
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_BPF=m
-+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_CPU=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-+CONFIG_NETFILTER_XT_MATCH_IPVS=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-+CONFIG_NETFILTER_XT_MATCH_OSF=m
-+CONFIG_NETFILTER_XT_MATCH_OWNER=m
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_RECENT=m
-+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+CONFIG_NETFILTER_XT_MATCH_TIME=m
-+CONFIG_NETFILTER_XT_MATCH_U32=m
-+CONFIG_IP_SET=m
-+CONFIG_IP_SET_BITMAP_IP=m
-+CONFIG_IP_SET_BITMAP_IPMAC=m
-+CONFIG_IP_SET_BITMAP_PORT=m
-+CONFIG_IP_SET_HASH_IP=m
-+CONFIG_IP_SET_HASH_IPPORT=m
-+CONFIG_IP_SET_HASH_IPPORTIP=m
-+CONFIG_IP_SET_HASH_IPPORTNET=m
-+CONFIG_IP_SET_HASH_NET=m
-+CONFIG_IP_SET_HASH_NETPORT=m
-+CONFIG_IP_SET_HASH_NETIFACE=m
-+CONFIG_IP_SET_LIST_SET=m
-+CONFIG_IP_VS=m
-+CONFIG_IP_VS_PROTO_TCP=y
-+CONFIG_IP_VS_PROTO_UDP=y
-+CONFIG_IP_VS_PROTO_ESP=y
-+CONFIG_IP_VS_PROTO_AH=y
-+CONFIG_IP_VS_PROTO_SCTP=y
-+CONFIG_IP_VS_RR=m
-+CONFIG_IP_VS_WRR=m
-+CONFIG_IP_VS_LC=m
-+CONFIG_IP_VS_WLC=m
-+CONFIG_IP_VS_LBLC=m
-+CONFIG_IP_VS_LBLCR=m
-+CONFIG_IP_VS_DH=m
-+CONFIG_IP_VS_SH=m
-+CONFIG_IP_VS_SED=m
-+CONFIG_IP_VS_NQ=m
-+CONFIG_IP_VS_FTP=m
-+CONFIG_IP_VS_PE_SIP=m
-+CONFIG_NFT_DUP_IPV4=m
-+CONFIG_NFT_FIB_IPV4=m
-+CONFIG_NF_TABLES_ARP=y
-+CONFIG_NF_FLOW_TABLE_IPV4=m
-+CONFIG_NF_LOG_ARP=m
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_RPFILTER=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_NAT=m
-+CONFIG_IP_NF_TARGET_MASQUERADE=m
-+CONFIG_IP_NF_TARGET_NETMAP=m
-+CONFIG_IP_NF_TARGET_REDIRECT=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_RAW=m
-+CONFIG_IP_NF_ARPTABLES=m
-+CONFIG_IP_NF_ARPFILTER=m
-+CONFIG_IP_NF_ARP_MANGLE=m
-+CONFIG_NFT_DUP_IPV6=m
-+CONFIG_NFT_FIB_IPV6=m
-+CONFIG_NF_FLOW_TABLE_IPV6=m
-+CONFIG_IP6_NF_IPTABLES=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_MATCH_FRAG=m
-+CONFIG_IP6_NF_MATCH_OPTS=m
-+CONFIG_IP6_NF_MATCH_HL=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_RPFILTER=m
-+CONFIG_IP6_NF_MATCH_RT=m
-+CONFIG_IP6_NF_MATCH_SRH=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_TARGET_SYNPROXY=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_RAW=m
-+CONFIG_IP6_NF_SECURITY=m
-+CONFIG_IP6_NF_NAT=m
-+CONFIG_IP6_NF_TARGET_MASQUERADE=m
-+CONFIG_IP6_NF_TARGET_NPT=m
-+CONFIG_NF_TABLES_BRIDGE=m
-+CONFIG_NFT_BRIDGE_REJECT=m
-+CONFIG_BRIDGE_NF_EBTABLES=m
-+CONFIG_BRIDGE_EBT_BROUTE=m
-+CONFIG_BRIDGE_EBT_T_FILTER=m
-+CONFIG_BRIDGE_EBT_T_NAT=m
-+CONFIG_BRIDGE_EBT_802_3=m
-+CONFIG_BRIDGE_EBT_AMONG=m
-+CONFIG_BRIDGE_EBT_ARP=m
-+CONFIG_BRIDGE_EBT_IP=m
-+CONFIG_BRIDGE_EBT_IP6=m
-+CONFIG_BRIDGE_EBT_LIMIT=m
-+CONFIG_BRIDGE_EBT_MARK=m
-+CONFIG_BRIDGE_EBT_PKTTYPE=m
-+CONFIG_BRIDGE_EBT_STP=m
-+CONFIG_BRIDGE_EBT_VLAN=m
-+CONFIG_BRIDGE_EBT_ARPREPLY=m
-+CONFIG_BRIDGE_EBT_DNAT=m
-+CONFIG_BRIDGE_EBT_MARK_T=m
-+CONFIG_BRIDGE_EBT_REDIRECT=m
-+CONFIG_BRIDGE_EBT_SNAT=m
-+CONFIG_BRIDGE_EBT_LOG=m
-+CONFIG_BRIDGE_EBT_NFLOG=m
-+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-+CONFIG_ATM=m
-+CONFIG_L2TP=m
-+CONFIG_L2TP_V3=y
-+CONFIG_L2TP_IP=m
-+CONFIG_L2TP_ETH=m
-+CONFIG_BRIDGE=m
-+CONFIG_VLAN_8021Q=m
-+CONFIG_VLAN_8021Q_GVRP=y
-+CONFIG_ATALK=m
-+CONFIG_6LOWPAN=m
-+CONFIG_IEEE802154=m
-+CONFIG_IEEE802154_6LOWPAN=m
-+CONFIG_MAC802154=m
-+CONFIG_NET_SCHED=y
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_ATM=m
-+CONFIG_NET_SCH_PRIO=m
-+CONFIG_NET_SCH_MULTIQ=m
-+CONFIG_NET_SCH_RED=m
-+CONFIG_NET_SCH_SFB=m
-+CONFIG_NET_SCH_SFQ=m
-+CONFIG_NET_SCH_TEQL=m
-+CONFIG_NET_SCH_TBF=m
-+CONFIG_NET_SCH_GRED=m
-+CONFIG_NET_SCH_DSMARK=m
-+CONFIG_NET_SCH_NETEM=m
-+CONFIG_NET_SCH_DRR=m
-+CONFIG_NET_SCH_MQPRIO=m
-+CONFIG_NET_SCH_CHOKE=m
-+CONFIG_NET_SCH_QFQ=m
-+CONFIG_NET_SCH_CODEL=m
-+CONFIG_NET_SCH_FQ_CODEL=m
-+CONFIG_NET_SCH_CAKE=m
-+CONFIG_NET_SCH_FQ=m
-+CONFIG_NET_SCH_HHF=m
-+CONFIG_NET_SCH_PIE=m
-+CONFIG_NET_SCH_INGRESS=m
-+CONFIG_NET_SCH_PLUG=m
-+CONFIG_NET_CLS_BASIC=m
-+CONFIG_NET_CLS_TCINDEX=m
-+CONFIG_NET_CLS_ROUTE4=m
-+CONFIG_NET_CLS_FW=m
-+CONFIG_NET_CLS_U32=m
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+CONFIG_NET_CLS_FLOW=m
-+CONFIG_NET_CLS_CGROUP=m
-+CONFIG_NET_EMATCH=y
-+CONFIG_NET_EMATCH_CMP=m
-+CONFIG_NET_EMATCH_NBYTE=m
-+CONFIG_NET_EMATCH_U32=m
-+CONFIG_NET_EMATCH_META=m
-+CONFIG_NET_EMATCH_TEXT=m
-+CONFIG_NET_EMATCH_IPSET=m
-+CONFIG_NET_CLS_ACT=y
-+CONFIG_NET_ACT_POLICE=m
-+CONFIG_NET_ACT_GACT=m
-+CONFIG_GACT_PROB=y
-+CONFIG_NET_ACT_MIRRED=m
-+CONFIG_NET_ACT_IPT=m
-+CONFIG_NET_ACT_NAT=m
-+CONFIG_NET_ACT_PEDIT=m
-+CONFIG_NET_ACT_SIMP=m
-+CONFIG_NET_ACT_SKBEDIT=m
-+CONFIG_NET_ACT_CSUM=m
-+CONFIG_BATMAN_ADV=m
-+CONFIG_OPENVSWITCH=m
-+CONFIG_CGROUP_NET_PRIO=y
-+CONFIG_NET_PKTGEN=m
-+CONFIG_HAMRADIO=y
-+CONFIG_AX25=m
-+CONFIG_NETROM=m
-+CONFIG_ROSE=m
-+CONFIG_MKISS=m
-+CONFIG_6PACK=m
-+CONFIG_BPQETHER=m
-+CONFIG_BAYCOM_SER_FDX=m
-+CONFIG_BAYCOM_SER_HDX=m
-+CONFIG_YAM=m
-+CONFIG_CAN=m
-+CONFIG_CAN_J1939=m
-+CONFIG_CAN_ISOTP=m
-+CONFIG_CAN_VCAN=m
-+CONFIG_CAN_SLCAN=m
-+CONFIG_CAN_MCP251X=m
-+CONFIG_CAN_MCP251XFD=m
-+CONFIG_CAN_EMS_USB=m
-+CONFIG_CAN_GS_USB=m
-+CONFIG_BT=m
-+CONFIG_BT_RFCOMM=m
-+CONFIG_BT_RFCOMM_TTY=y
-+CONFIG_BT_BNEP=m
-+CONFIG_BT_BNEP_MC_FILTER=y
-+CONFIG_BT_BNEP_PROTO_FILTER=y
-+CONFIG_BT_HIDP=m
-+CONFIG_BT_6LOWPAN=m
-+CONFIG_BT_HCIBTUSB=m
-+CONFIG_BT_HCIUART=m
-+CONFIG_BT_HCIUART_3WIRE=y
-+CONFIG_BT_HCIUART_BCM=y
-+CONFIG_BT_HCIBCM203X=m
-+CONFIG_BT_HCIBPA10X=m
-+CONFIG_BT_HCIBFUSB=m
-+CONFIG_BT_HCIVHCI=m
-+CONFIG_BT_MRVL=m
-+CONFIG_BT_MRVL_SDIO=m
-+CONFIG_BT_ATH3K=m
-+CONFIG_CFG80211=m
-+CONFIG_CFG80211_WEXT=y
-+CONFIG_MAC80211=m
-+CONFIG_MAC80211_MESH=y
-+CONFIG_RFKILL=m
-+CONFIG_RFKILL_INPUT=y
-+CONFIG_NET_9P=m
-+CONFIG_NFC=m
-+CONFIG_UEVENT_HELPER=y
-+CONFIG_DEVTMPFS=y
-+CONFIG_DEVTMPFS_MOUNT=y
-+CONFIG_MTD=m
-+CONFIG_MTD_BLOCK=m
-+CONFIG_MTD_BLOCK2MTD=m
-+CONFIG_MTD_SPI_NOR=m
-+CONFIG_MTD_UBI=m
-+CONFIG_OF_CONFIGFS=y
-+CONFIG_ZRAM=m
-+CONFIG_BLK_DEV_LOOP=y
-+CONFIG_BLK_DEV_CRYPTOLOOP=m
-+CONFIG_BLK_DEV_DRBD=m
-+CONFIG_BLK_DEV_NBD=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_CDROM_PKTCDVD=m
-+CONFIG_ATA_OVER_ETH=m
-+CONFIG_EEPROM_AT24=m
-+CONFIG_TI_ST=m
-+CONFIG_SCSI=y
-+# CONFIG_SCSI_PROC_FS is not set
-+CONFIG_BLK_DEV_SD=y
-+CONFIG_CHR_DEV_ST=m
-+CONFIG_BLK_DEV_SR=m
-+CONFIG_CHR_DEV_SG=m
-+CONFIG_SCSI_ISCSI_ATTRS=y
-+CONFIG_ISCSI_TCP=m
-+CONFIG_ISCSI_BOOT_SYSFS=m
-+CONFIG_MD=y
-+CONFIG_MD_LINEAR=m
-+CONFIG_BLK_DEV_DM=m
-+CONFIG_DM_CRYPT=m
-+CONFIG_DM_SNAPSHOT=m
-+CONFIG_DM_THIN_PROVISIONING=m
-+CONFIG_DM_CACHE=m
-+CONFIG_DM_MIRROR=m
-+CONFIG_DM_LOG_USERSPACE=m
-+CONFIG_DM_RAID=m
-+CONFIG_DM_ZERO=m
-+CONFIG_DM_DELAY=m
-+CONFIG_NETDEVICES=y
-+CONFIG_BONDING=m
-+CONFIG_DUMMY=m
-+CONFIG_WIREGUARD=m
-+CONFIG_IFB=m
-+CONFIG_MACVLAN=m
-+CONFIG_IPVLAN=m
-+CONFIG_VXLAN=m
-+CONFIG_NETCONSOLE=m
-+CONFIG_TUN=m
-+CONFIG_VETH=m
-+CONFIG_NET_VRF=m
-+CONFIG_ENC28J60=m
-+CONFIG_QCA7000_SPI=m
-+CONFIG_QCA7000_UART=m
-+CONFIG_WIZNET_W5100=m
-+CONFIG_WIZNET_W5100_SPI=m
-+CONFIG_MDIO_BITBANG=m
-+CONFIG_PPP=m
-+CONFIG_PPP_BSDCOMP=m
-+CONFIG_PPP_DEFLATE=m
-+CONFIG_PPP_FILTER=y
-+CONFIG_PPP_MPPE=m
-+CONFIG_PPP_MULTILINK=y
-+CONFIG_PPPOATM=m
-+CONFIG_PPPOE=m
-+CONFIG_PPPOL2TP=m
-+CONFIG_PPP_ASYNC=m
-+CONFIG_PPP_SYNC_TTY=m
-+CONFIG_SLIP=m
-+CONFIG_SLIP_COMPRESSED=y
-+CONFIG_SLIP_SMART=y
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_RTL8152=m
-+CONFIG_USB_LAN78XX=m
-+CONFIG_USB_USBNET=y
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_AX88179_178A=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_CDC_EEM=m
-+CONFIG_USB_NET_CDC_NCM=m
-+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-+CONFIG_USB_NET_CDC_MBIM=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_SR9700=m
-+CONFIG_USB_NET_SR9800=m
-+CONFIG_USB_NET_SMSC75XX=m
-+CONFIG_USB_NET_SMSC95XX=y
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+CONFIG_USB_NET_CX82310_ETH=m
-+CONFIG_USB_NET_KALMIA=m
-+CONFIG_USB_NET_QMI_WWAN=m
-+CONFIG_USB_HSO=m
-+CONFIG_USB_NET_INT51X1=m
-+CONFIG_USB_IPHETH=m
-+CONFIG_USB_SIERRA_NET=m
-+CONFIG_USB_VL600=m
-+CONFIG_USB_NET_AQC111=m
-+CONFIG_ATH9K=m
-+CONFIG_ATH9K_HTC=m
-+CONFIG_CARL9170=m
-+CONFIG_ATH6KL=m
-+CONFIG_ATH6KL_USB=m
-+CONFIG_AR5523=m
-+CONFIG_AT76C50X_USB=m
-+CONFIG_B43=m
-+# CONFIG_B43_PHY_N is not set
-+CONFIG_B43LEGACY=m
-+CONFIG_BRCMFMAC=m
-+CONFIG_BRCMFMAC_USB=y
-+CONFIG_BRCMDBG=y
-+CONFIG_HOSTAP=m
-+CONFIG_P54_COMMON=m
-+CONFIG_P54_USB=m
-+CONFIG_LIBERTAS=m
-+CONFIG_LIBERTAS_USB=m
-+CONFIG_LIBERTAS_SDIO=m
-+CONFIG_LIBERTAS_THINFIRM=m
-+CONFIG_LIBERTAS_THINFIRM_USB=m
-+CONFIG_MWIFIEX=m
-+CONFIG_MWIFIEX_SDIO=m
-+CONFIG_MT7601U=m
-+CONFIG_MT76x0U=m
-+CONFIG_MT76x2U=m
-+CONFIG_RT2X00=m
-+CONFIG_RT2500USB=m
-+CONFIG_RT73USB=m
-+CONFIG_RT2800USB=m
-+CONFIG_RT2800USB_RT3573=y
-+CONFIG_RT2800USB_RT53XX=y
-+CONFIG_RT2800USB_RT55XX=y
-+CONFIG_RT2800USB_UNKNOWN=y
-+CONFIG_RTL8187=m
-+CONFIG_RTL8192CU=m
-+CONFIG_RTL8XXXU=m
-+CONFIG_USB_ZD1201=m
-+CONFIG_ZD1211RW=m
-+CONFIG_MAC80211_HWSIM=m
-+CONFIG_USB_NET_RNDIS_WLAN=m
-+CONFIG_IEEE802154_AT86RF230=m
-+CONFIG_IEEE802154_MRF24J40=m
-+CONFIG_IEEE802154_CC2520=m
-+CONFIG_INPUT_MOUSEDEV=y
-+CONFIG_INPUT_JOYDEV=m
-+CONFIG_INPUT_EVDEV=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_MATRIX=m
-+CONFIG_KEYBOARD_CAP11XX=m
-+# CONFIG_INPUT_MOUSE is not set
-+CONFIG_INPUT_JOYSTICK=y
-+CONFIG_JOYSTICK_IFORCE=m
-+CONFIG_JOYSTICK_IFORCE_USB=m
-+CONFIG_JOYSTICK_XPAD=m
-+CONFIG_JOYSTICK_XPAD_FF=y
-+CONFIG_JOYSTICK_XPAD_LEDS=y
-+CONFIG_JOYSTICK_PSXPAD_SPI=m
-+CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
-+CONFIG_JOYSTICK_RPISENSE=m
-+CONFIG_INPUT_TOUCHSCREEN=y
-+CONFIG_TOUCHSCREEN_ADS7846=m
-+CONFIG_TOUCHSCREEN_EGALAX=m
-+CONFIG_TOUCHSCREEN_EXC3000=m
-+CONFIG_TOUCHSCREEN_GOODIX=m
-+CONFIG_TOUCHSCREEN_ILI210X=m
-+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-+CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
-+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-+CONFIG_TOUCHSCREEN_STMPE=m
-+CONFIG_INPUT_MISC=y
-+CONFIG_INPUT_AD714X=m
-+CONFIG_INPUT_ATI_REMOTE2=m
-+CONFIG_INPUT_KEYSPAN_REMOTE=m
-+CONFIG_INPUT_POWERMATE=m
-+CONFIG_INPUT_YEALINK=m
-+CONFIG_INPUT_CM109=m
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-+CONFIG_INPUT_ADXL34X=m
-+CONFIG_INPUT_CMA3000=m
-+CONFIG_SERIO=m
-+CONFIG_SERIO_RAW=m
-+CONFIG_GAMEPORT=m
-+CONFIG_GAMEPORT_NS558=m
-+CONFIG_GAMEPORT_L4=m
-+CONFIG_BRCM_CHAR_DRIVERS=y
-+CONFIG_BCM_VCIO=y
-+CONFIG_BCM2835_DEVGPIOMEM=y
-+# CONFIG_LEGACY_PTYS is not set
-+CONFIG_SERIAL_8250=y
-+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_DMA is not set
-+CONFIG_SERIAL_8250_NR_UARTS=1
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=0
-+CONFIG_SERIAL_8250_EXTENDED=y
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+CONFIG_SERIAL_8250_BCM2835AUX=y
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_SERIAL_AMBA_PL011=y
-+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-+CONFIG_SERIAL_SC16IS7XX=m
-+CONFIG_SERIAL_SC16IS7XX_SPI=y
-+CONFIG_SERIAL_DEV_BUS=y
-+CONFIG_TTY_PRINTK=y
-+CONFIG_HW_RANDOM=y
-+CONFIG_TCG_TPM=m
-+CONFIG_TCG_TIS_SPI=m
-+CONFIG_RANDOM_TRUST_BOOTLOADER=y
-+CONFIG_I2C=y
-+CONFIG_I2C_CHARDEV=m
-+CONFIG_I2C_MUX_GPMUX=m
-+CONFIG_I2C_MUX_PCA954x=m
-+CONFIG_I2C_MUX_PINCTRL=m
-+CONFIG_I2C_BCM2708=m
-+CONFIG_I2C_BCM2835=m
-+# CONFIG_I2C_BRCMSTB is not set
-+CONFIG_I2C_GPIO=m
-+CONFIG_I2C_ROBOTFUZZ_OSIF=m
-+CONFIG_I2C_TINY_USB=m
-+CONFIG_SPI=y
-+CONFIG_SPI_BCM2835=m
-+CONFIG_SPI_BCM2835AUX=m
-+CONFIG_SPI_GPIO=m
-+CONFIG_SPI_SPIDEV=m
-+CONFIG_SPI_SLAVE=y
-+CONFIG_PPS_CLIENT_LDISC=m
-+CONFIG_PPS_CLIENT_GPIO=m
-+CONFIG_PINCTRL_MCP23S08=m
-+CONFIG_GPIO_SYSFS=y
-+CONFIG_GPIO_PCA953X=m
-+CONFIG_GPIO_PCA953X_IRQ=y
-+CONFIG_GPIO_PCF857X=m
-+CONFIG_GPIO_ARIZONA=m
-+CONFIG_GPIO_FSM=m
-+CONFIG_GPIO_STMPE=y
-+CONFIG_GPIO_MOCKUP=m
-+CONFIG_W1=m
-+CONFIG_W1_MASTER_DS2490=m
-+CONFIG_W1_MASTER_DS2482=m
-+CONFIG_W1_MASTER_DS1WM=m
-+CONFIG_W1_MASTER_GPIO=m
-+CONFIG_W1_SLAVE_THERM=m
-+CONFIG_W1_SLAVE_SMEM=m
-+CONFIG_W1_SLAVE_DS2408=m
-+CONFIG_W1_SLAVE_DS2413=m
-+CONFIG_W1_SLAVE_DS2406=m
-+CONFIG_W1_SLAVE_DS2423=m
-+CONFIG_W1_SLAVE_DS2431=m
-+CONFIG_W1_SLAVE_DS2433=m
-+CONFIG_W1_SLAVE_DS2438=m
-+CONFIG_W1_SLAVE_DS2780=m
-+CONFIG_W1_SLAVE_DS2781=m
-+CONFIG_W1_SLAVE_DS28E04=m
-+CONFIG_W1_SLAVE_DS28E17=m
-+CONFIG_POWER_RESET=y
-+CONFIG_POWER_RESET_GPIO=y
-+CONFIG_RPI_POE_POWER=m
-+CONFIG_BATTERY_DS2760=m
-+CONFIG_BATTERY_MAX17040=m
-+CONFIG_BATTERY_GAUGE_LTC2941=m
-+CONFIG_SENSORS_DS1621=m
-+CONFIG_SENSORS_GPIO_FAN=m
-+CONFIG_SENSORS_IIO_HWMON=m
-+CONFIG_SENSORS_JC42=m
-+CONFIG_SENSORS_LM75=m
-+CONFIG_SENSORS_PWM_FAN=m
-+CONFIG_SENSORS_RASPBERRYPI_HWMON=m
-+CONFIG_SENSORS_SHT21=m
-+CONFIG_SENSORS_SHT3x=m
-+CONFIG_SENSORS_SHTC1=m
-+CONFIG_SENSORS_INA2XX=m
-+CONFIG_SENSORS_TMP102=m
-+CONFIG_THERMAL=y
-+CONFIG_BCM2835_THERMAL=y
-+CONFIG_WATCHDOG=y
-+CONFIG_GPIO_WATCHDOG=m
-+CONFIG_BCM2835_WDT=y
-+CONFIG_MFD_STMPE=y
-+CONFIG_STMPE_SPI=y
-+CONFIG_MFD_ARIZONA_I2C=m
-+CONFIG_MFD_ARIZONA_SPI=m
-+CONFIG_MFD_WM5102=y
-+CONFIG_REGULATOR=y
-+CONFIG_REGULATOR_FIXED_VOLTAGE=m
-+CONFIG_REGULATOR_ARIZONA_LDO1=m
-+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
-+CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m
-+CONFIG_RC_CORE=y
-+CONFIG_LIRC=y
-+CONFIG_BPF_LIRC_MODE2=y
-+CONFIG_RC_DECODERS=y
-+CONFIG_IR_NEC_DECODER=m
-+CONFIG_IR_RC5_DECODER=m
-+CONFIG_IR_RC6_DECODER=m
-+CONFIG_IR_JVC_DECODER=m
-+CONFIG_IR_SONY_DECODER=m
-+CONFIG_IR_SANYO_DECODER=m
-+CONFIG_IR_SHARP_DECODER=m
-+CONFIG_IR_MCE_KBD_DECODER=m
-+CONFIG_IR_XMP_DECODER=m
-+CONFIG_IR_IMON_DECODER=m
-+CONFIG_RC_DEVICES=y
-+CONFIG_RC_ATI_REMOTE=m
-+CONFIG_IR_IMON=m
-+CONFIG_IR_MCEUSB=m
-+CONFIG_IR_REDRAT3=m
-+CONFIG_IR_STREAMZAP=m
-+CONFIG_IR_IGUANA=m
-+CONFIG_IR_TTUSBIR=m
-+CONFIG_RC_LOOPBACK=m
-+CONFIG_IR_GPIO_CIR=m
-+CONFIG_IR_GPIO_TX=m
-+CONFIG_IR_PWM_TX=m
-+CONFIG_MEDIA_CEC_RC=y
-+CONFIG_MEDIA_SUPPORT=m
-+CONFIG_MEDIA_USB_SUPPORT=y
-+CONFIG_USB_VIDEO_CLASS=m
-+CONFIG_USB_PWC=m
-+CONFIG_VIDEO_CPIA2=m
-+CONFIG_USB_ZR364XX=m
-+CONFIG_USB_STKWEBCAM=m
-+CONFIG_USB_S2255=m
-+CONFIG_VIDEO_USBTV=m
-+CONFIG_VIDEO_PVRUSB2=m
-+CONFIG_VIDEO_HDPVR=m
-+CONFIG_VIDEO_STK1160_COMMON=m
-+CONFIG_VIDEO_GO7007=m
-+CONFIG_VIDEO_GO7007_USB=m
-+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-+CONFIG_VIDEO_AU0828=m
-+CONFIG_VIDEO_AU0828_RC=y
-+CONFIG_VIDEO_CX231XX=m
-+CONFIG_VIDEO_CX231XX_ALSA=m
-+CONFIG_VIDEO_CX231XX_DVB=m
-+CONFIG_VIDEO_TM6000=m
-+CONFIG_VIDEO_TM6000_ALSA=m
-+CONFIG_VIDEO_TM6000_DVB=m
-+CONFIG_DVB_USB=m
-+CONFIG_DVB_USB_A800=m
-+CONFIG_DVB_USB_DIBUSB_MB=m
-+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-+CONFIG_DVB_USB_DIBUSB_MC=m
-+CONFIG_DVB_USB_DIB0700=m
-+CONFIG_DVB_USB_UMT_010=m
-+CONFIG_DVB_USB_CXUSB=m
-+CONFIG_DVB_USB_M920X=m
-+CONFIG_DVB_USB_DIGITV=m
-+CONFIG_DVB_USB_VP7045=m
-+CONFIG_DVB_USB_VP702X=m
-+CONFIG_DVB_USB_GP8PSK=m
-+CONFIG_DVB_USB_NOVA_T_USB2=m
-+CONFIG_DVB_USB_TTUSB2=m
-+CONFIG_DVB_USB_DTT200U=m
-+CONFIG_DVB_USB_OPERA1=m
-+CONFIG_DVB_USB_AF9005=m
-+CONFIG_DVB_USB_AF9005_REMOTE=m
-+CONFIG_DVB_USB_PCTV452E=m
-+CONFIG_DVB_USB_DW2102=m
-+CONFIG_DVB_USB_CINERGY_T2=m
-+CONFIG_DVB_USB_DTV5100=m
-+CONFIG_DVB_USB_AZ6027=m
-+CONFIG_DVB_USB_TECHNISAT_USB2=m
-+CONFIG_DVB_USB_V2=m
-+CONFIG_DVB_USB_AF9015=m
-+CONFIG_DVB_USB_AF9035=m
-+CONFIG_DVB_USB_ANYSEE=m
-+CONFIG_DVB_USB_AU6610=m
-+CONFIG_DVB_USB_AZ6007=m
-+CONFIG_DVB_USB_CE6230=m
-+CONFIG_DVB_USB_EC168=m
-+CONFIG_DVB_USB_GL861=m
-+CONFIG_DVB_USB_LME2510=m
-+CONFIG_DVB_USB_MXL111SF=m
-+CONFIG_DVB_USB_RTL28XXU=m
-+CONFIG_DVB_USB_DVBSKY=m
-+CONFIG_SMS_USB_DRV=m
-+CONFIG_DVB_B2C2_FLEXCOP_USB=m
-+CONFIG_DVB_AS102=m
-+CONFIG_VIDEO_EM28XX=m
-+CONFIG_VIDEO_EM28XX_V4L2=m
-+CONFIG_VIDEO_EM28XX_ALSA=m
-+CONFIG_VIDEO_EM28XX_DVB=m
-+CONFIG_RADIO_SI470X=m
-+CONFIG_USB_SI470X=m
-+CONFIG_I2C_SI470X=m
-+CONFIG_RADIO_SI4713=m
-+CONFIG_I2C_SI4713=m
-+CONFIG_USB_MR800=m
-+CONFIG_USB_DSBR=m
-+CONFIG_RADIO_SHARK=m
-+CONFIG_RADIO_SHARK2=m
-+CONFIG_USB_KEENE=m
-+CONFIG_USB_MA901=m
-+CONFIG_RADIO_TEA5764=m
-+CONFIG_RADIO_SAA7706H=m
-+CONFIG_RADIO_TEF6862=m
-+CONFIG_RADIO_WL1273=m
-+CONFIG_RADIO_WL128X=m
-+CONFIG_V4L_PLATFORM_DRIVERS=y
-+CONFIG_VIDEO_BCM2835_UNICAM=m
-+CONFIG_VIDEO_UDA1342=m
-+CONFIG_VIDEO_SONY_BTF_MPX=m
-+CONFIG_VIDEO_ADV7180=m
-+CONFIG_VIDEO_TC358743=m
-+CONFIG_VIDEO_TVP5150=m
-+CONFIG_VIDEO_TW2804=m
-+CONFIG_VIDEO_TW9903=m
-+CONFIG_VIDEO_TW9906=m
-+CONFIG_VIDEO_IMX219=m
-+CONFIG_VIDEO_IMX290=m
-+CONFIG_VIDEO_IMX477=m
-+CONFIG_VIDEO_OV5647=m
-+CONFIG_VIDEO_OV7251=m
-+CONFIG_VIDEO_OV7640=m
-+CONFIG_VIDEO_OV9281=m
-+CONFIG_VIDEO_IRS1125=m
-+CONFIG_VIDEO_MT9V011=m
-+CONFIG_DRM=m
-+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-+CONFIG_DRM_UDL=m
-+CONFIG_DRM_PANEL_SIMPLE=m
-+CONFIG_DRM_PANEL_JDI_LT070ME05000=m
-+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
-+CONFIG_DRM_DISPLAY_CONNECTOR=m
-+CONFIG_DRM_SIMPLE_BRIDGE=m
-+CONFIG_DRM_TOSHIBA_TC358762=m
-+CONFIG_DRM_VC4=m
-+CONFIG_DRM_VC4_HDMI_CEC=y
-+CONFIG_TINYDRM_ILI9225=m
-+CONFIG_TINYDRM_ILI9341=m
-+CONFIG_TINYDRM_MI0283QT=m
-+CONFIG_TINYDRM_REPAPER=m
-+CONFIG_TINYDRM_ST7586=m
-+CONFIG_TINYDRM_ST7735R=m
-+CONFIG_DRM_GUD=m
-+CONFIG_FB=y
-+CONFIG_FB_BCM2708=y
-+CONFIG_FB_UDL=m
-+CONFIG_FB_SIMPLE=y
-+CONFIG_FB_SSD1307=m
-+CONFIG_FB_RPISENSE=m
-+CONFIG_BACKLIGHT_RPI=m
-+CONFIG_BACKLIGHT_GPIO=m
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-+CONFIG_LOGO=y
-+# CONFIG_LOGO_LINUX_MONO is not set
-+# CONFIG_LOGO_LINUX_VGA16 is not set
-+CONFIG_SOUND=y
-+CONFIG_SND=m
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_HRTIMER=m
-+CONFIG_SND_SEQUENCER=m
-+CONFIG_SND_SEQ_DUMMY=m
-+CONFIG_SND_DUMMY=m
-+CONFIG_SND_ALOOP=m
-+CONFIG_SND_VIRMIDI=m
-+CONFIG_SND_MTPAV=m
-+CONFIG_SND_SERIAL_U16550=m
-+CONFIG_SND_MPU401=m
-+CONFIG_SND_USB_AUDIO=m
-+CONFIG_SND_USB_UA101=m
-+CONFIG_SND_USB_CAIAQ=m
-+CONFIG_SND_USB_CAIAQ_INPUT=y
-+CONFIG_SND_USB_6FIRE=m
-+CONFIG_SND_USB_HIFACE=m
-+CONFIG_SND_USB_TONEPORT=m
-+CONFIG_SND_SOC=m
-+CONFIG_SND_BCM2835_SOC_I2S=m
-+CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC=m
-+CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
-+CONFIG_SND_BCM2708_SOC_PIFI_40=m
-+CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m
-+CONFIG_SND_BCM2708_SOC_RPI_DAC=m
-+CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
-+CONFIG_SND_BCM2708_SOC_JUSTBOOM_BOTH=m
-+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m
-+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m
-+CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m
-+CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
-+CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m
-+CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m
-+CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m
-+CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m
-+CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m
-+CONFIG_SND_AUDIOINJECTOR_ISOLATED_SOUNDCARD=m
-+CONFIG_SND_AUDIOSENSE_PI=m
-+CONFIG_SND_DIGIDAC1_SOUNDCARD=m
-+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m
-+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
-+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
-+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m
-+CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m
-+CONFIG_SND_BCM2708_SOC_ALLO_BOSS2_DAC=m
-+CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m
-+CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m
-+CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
-+CONFIG_SND_PISOUND=m
-+CONFIG_SND_SOC_AD193X_SPI=m
-+CONFIG_SND_SOC_AD193X_I2C=m
-+CONFIG_SND_SOC_ADAU1701=m
-+CONFIG_SND_SOC_ADAU7002=m
-+CONFIG_SND_SOC_AK4554=m
-+CONFIG_SND_SOC_CS4265=m
-+CONFIG_SND_SOC_ICS43432=m
-+CONFIG_SND_SOC_MA120X0P=m
-+CONFIG_SND_SOC_MAX98357A=m
-+CONFIG_SND_SOC_SPDIF=m
-+CONFIG_SND_SOC_WM8804_I2C=m
-+CONFIG_SND_SOC_WM8960=m
-+CONFIG_SND_SIMPLE_CARD=m
-+CONFIG_HID_BATTERY_STRENGTH=y
-+CONFIG_HIDRAW=y
-+CONFIG_UHID=m
-+CONFIG_HID_A4TECH=m
-+CONFIG_HID_ACRUX=m
-+CONFIG_HID_APPLE=m
-+CONFIG_HID_ASUS=m
-+CONFIG_HID_BELKIN=m
-+CONFIG_HID_BETOP_FF=m
-+CONFIG_HID_BIGBEN_FF=m
-+CONFIG_HID_CHERRY=m
-+CONFIG_HID_CHICONY=m
-+CONFIG_HID_CYPRESS=m
-+CONFIG_HID_DRAGONRISE=m
-+CONFIG_HID_EMS_FF=m
-+CONFIG_HID_ELECOM=m
-+CONFIG_HID_ELO=m
-+CONFIG_HID_EZKEY=m
-+CONFIG_HID_GEMBIRD=m
-+CONFIG_HID_HOLTEK=m
-+CONFIG_HID_KEYTOUCH=m
-+CONFIG_HID_KYE=m
-+CONFIG_HID_UCLOGIC=m
-+CONFIG_HID_WALTOP=m
-+CONFIG_HID_GYRATION=m
-+CONFIG_HID_TWINHAN=m
-+CONFIG_HID_KENSINGTON=m
-+CONFIG_HID_LCPOWER=m
-+CONFIG_HID_LOGITECH=m
-+CONFIG_HID_LOGITECH_DJ=m
-+CONFIG_LOGITECH_FF=y
-+CONFIG_LOGIRUMBLEPAD2_FF=y
-+CONFIG_LOGIG940_FF=y
-+CONFIG_HID_MAGICMOUSE=m
-+CONFIG_HID_MICROSOFT=m
-+CONFIG_HID_MONTEREY=m
-+CONFIG_HID_MULTITOUCH=m
-+CONFIG_HID_NTRIG=m
-+CONFIG_HID_ORTEK=m
-+CONFIG_HID_PANTHERLORD=m
-+CONFIG_HID_PETALYNX=m
-+CONFIG_HID_PICOLCD=m
-+CONFIG_HID_ROCCAT=m
-+CONFIG_HID_SAMSUNG=m
-+CONFIG_HID_SONY=m
-+CONFIG_SONY_FF=y
-+CONFIG_HID_SPEEDLINK=m
-+CONFIG_HID_STEAM=m
-+CONFIG_HID_SUNPLUS=m
-+CONFIG_HID_GREENASIA=m
-+CONFIG_HID_SMARTJOYPLUS=m
-+CONFIG_HID_TOPSEED=m
-+CONFIG_HID_THINGM=m
-+CONFIG_HID_THRUSTMASTER=m
-+CONFIG_HID_WACOM=m
-+CONFIG_HID_WIIMOTE=m
-+CONFIG_HID_XINMO=m
-+CONFIG_HID_ZEROPLUS=m
-+CONFIG_HID_ZYDACRON=m
-+CONFIG_HID_PID=y
-+CONFIG_USB_HIDDEV=y
-+CONFIG_USB=y
-+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-+CONFIG_USB_MON=m
-+CONFIG_USB_DWCOTG=y
-+CONFIG_USB_PRINTER=m
-+CONFIG_USB_TMC=m
-+CONFIG_USB_STORAGE=y
-+CONFIG_USB_STORAGE_REALTEK=m
-+CONFIG_USB_STORAGE_DATAFAB=m
-+CONFIG_USB_STORAGE_FREECOM=m
-+CONFIG_USB_STORAGE_ISD200=m
-+CONFIG_USB_STORAGE_USBAT=m
-+CONFIG_USB_STORAGE_SDDR09=m
-+CONFIG_USB_STORAGE_SDDR55=m
-+CONFIG_USB_STORAGE_JUMPSHOT=m
-+CONFIG_USB_STORAGE_ALAUDA=m
-+CONFIG_USB_STORAGE_ONETOUCH=m
-+CONFIG_USB_STORAGE_KARMA=m
-+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-+CONFIG_USB_STORAGE_ENE_UB6250=m
-+CONFIG_USB_UAS=m
-+CONFIG_USB_MDC800=m
-+CONFIG_USB_MICROTEK=m
-+CONFIG_USBIP_CORE=m
-+CONFIG_USBIP_VHCI_HCD=m
-+CONFIG_USBIP_HOST=m
-+CONFIG_USBIP_VUDC=m
-+CONFIG_USB_DWC2=m
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+CONFIG_USB_SERIAL_CH341=m
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP210X=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_VISOR=m
-+CONFIG_USB_SERIAL_IPAQ=m
-+CONFIG_USB_SERIAL_IR=m
-+CONFIG_USB_SERIAL_EDGEPORT=m
-+CONFIG_USB_SERIAL_EDGEPORT_TI=m
-+CONFIG_USB_SERIAL_F81232=m
-+CONFIG_USB_SERIAL_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=m
-+CONFIG_USB_SERIAL_IUU=m
-+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-+CONFIG_USB_SERIAL_KEYSPAN=m
-+CONFIG_USB_SERIAL_KLSI=m
-+CONFIG_USB_SERIAL_KOBIL_SCT=m
-+CONFIG_USB_SERIAL_MCT_U232=m
-+CONFIG_USB_SERIAL_METRO=m
-+CONFIG_USB_SERIAL_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+CONFIG_USB_SERIAL_OTI6858=m
-+CONFIG_USB_SERIAL_QCAUX=m
-+CONFIG_USB_SERIAL_QUALCOMM=m
-+CONFIG_USB_SERIAL_SPCP8X5=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_SYMBOL=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+CONFIG_USB_SERIAL_OPTICON=m
-+CONFIG_USB_SERIAL_XSENS_MT=m
-+CONFIG_USB_SERIAL_WISHBONE=m
-+CONFIG_USB_SERIAL_SSU100=m
-+CONFIG_USB_SERIAL_QT2=m
-+CONFIG_USB_SERIAL_DEBUG=m
-+CONFIG_USB_EMI62=m
-+CONFIG_USB_EMI26=m
-+CONFIG_USB_ADUTUX=m
-+CONFIG_USB_SEVSEG=m
-+CONFIG_USB_LEGOTOWER=m
-+CONFIG_USB_LCD=m
-+CONFIG_USB_CYPRESS_CY7C63=m
-+CONFIG_USB_CYTHERM=m
-+CONFIG_USB_IDMOUSE=m
-+CONFIG_USB_FTDI_ELAN=m
-+CONFIG_USB_APPLEDISPLAY=m
-+CONFIG_USB_LD=m
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+CONFIG_USB_TEST=m
-+CONFIG_USB_ISIGHTFW=m
-+CONFIG_USB_YUREX=m
-+CONFIG_USB_ATM=m
-+CONFIG_USB_SPEEDTOUCH=m
-+CONFIG_USB_CXACRU=m
-+CONFIG_USB_UEAGLEATM=m
-+CONFIG_USB_XUSBATM=m
-+CONFIG_NOP_USB_XCEIV=y
-+CONFIG_USB_GADGET=y
-+CONFIG_USB_CONFIGFS=m
-+CONFIG_USB_CONFIGFS_SERIAL=y
-+CONFIG_USB_CONFIGFS_ACM=y
-+CONFIG_USB_CONFIGFS_OBEX=y
-+CONFIG_USB_CONFIGFS_NCM=y
-+CONFIG_USB_CONFIGFS_ECM=y
-+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
-+CONFIG_USB_CONFIGFS_RNDIS=y
-+CONFIG_USB_CONFIGFS_EEM=y
-+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-+CONFIG_USB_CONFIGFS_F_LB_SS=y
-+CONFIG_USB_CONFIGFS_F_FS=y
-+CONFIG_USB_CONFIGFS_F_UAC1=y
-+CONFIG_USB_CONFIGFS_F_UAC2=y
-+CONFIG_USB_CONFIGFS_F_MIDI=y
-+CONFIG_USB_CONFIGFS_F_HID=y
-+CONFIG_USB_CONFIGFS_F_UVC=y
-+CONFIG_USB_CONFIGFS_F_PRINTER=y
-+CONFIG_USB_ZERO=m
-+CONFIG_USB_AUDIO=m
-+CONFIG_USB_ETH=m
-+CONFIG_USB_GADGETFS=m
-+CONFIG_USB_MASS_STORAGE=m
-+CONFIG_USB_G_SERIAL=m
-+CONFIG_USB_MIDI_GADGET=m
-+CONFIG_USB_G_PRINTER=m
-+CONFIG_USB_CDC_COMPOSITE=m
-+CONFIG_USB_G_ACM_MS=m
-+CONFIG_USB_G_MULTI=m
-+CONFIG_USB_G_HID=m
-+CONFIG_USB_G_WEBCAM=m
-+CONFIG_MMC=y
-+CONFIG_MMC_BLOCK_MINORS=32
-+CONFIG_MMC_BCM2835_MMC=y
-+CONFIG_MMC_BCM2835_DMA=y
-+CONFIG_MMC_BCM2835_SDHOST=y
-+CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_PLTFM=y
-+CONFIG_MMC_SPI=m
-+CONFIG_LEDS_CLASS=y
-+CONFIG_LEDS_PCA9532=m
-+CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_PCA955X=m
-+CONFIG_LEDS_PCA963X=m
-+CONFIG_LEDS_IS31FL32XX=m
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+CONFIG_LEDS_TRIGGER_ONESHOT=y
-+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-+CONFIG_LEDS_TRIGGER_CPU=y
-+CONFIG_LEDS_TRIGGER_GPIO=y
-+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-+CONFIG_LEDS_TRIGGER_TRANSIENT=m
-+CONFIG_LEDS_TRIGGER_CAMERA=m
-+CONFIG_LEDS_TRIGGER_INPUT=y
-+CONFIG_LEDS_TRIGGER_PANIC=y
-+CONFIG_LEDS_TRIGGER_NETDEV=m
-+CONFIG_LEDS_TRIGGER_ACTPWR=y
-+CONFIG_ACCESSIBILITY=y
-+CONFIG_SPEAKUP=m
-+CONFIG_SPEAKUP_SYNTH_SOFT=m
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_DRV_ABX80X=m
-+CONFIG_RTC_DRV_DS1307=m
-+CONFIG_RTC_DRV_DS1374=m
-+CONFIG_RTC_DRV_DS1672=m
-+CONFIG_RTC_DRV_MAX6900=m
-+CONFIG_RTC_DRV_RS5C372=m
-+CONFIG_RTC_DRV_ISL1208=m
-+CONFIG_RTC_DRV_ISL12022=m
-+CONFIG_RTC_DRV_X1205=m
-+CONFIG_RTC_DRV_PCF8523=m
-+CONFIG_RTC_DRV_PCF85063=m
-+CONFIG_RTC_DRV_PCF85363=m
-+CONFIG_RTC_DRV_PCF8563=m
-+CONFIG_RTC_DRV_PCF8583=m
-+CONFIG_RTC_DRV_M41T80=m
-+CONFIG_RTC_DRV_BQ32K=m
-+CONFIG_RTC_DRV_S35390A=m
-+CONFIG_RTC_DRV_FM3130=m
-+CONFIG_RTC_DRV_RX8581=m
-+CONFIG_RTC_DRV_RX8025=m
-+CONFIG_RTC_DRV_EM3027=m
-+CONFIG_RTC_DRV_RV3028=m
-+CONFIG_RTC_DRV_SD3078=m
-+CONFIG_RTC_DRV_M41T93=m
-+CONFIG_RTC_DRV_M41T94=m
-+CONFIG_RTC_DRV_DS1302=m
-+CONFIG_RTC_DRV_DS1305=m
-+CONFIG_RTC_DRV_DS1390=m
-+CONFIG_RTC_DRV_R9701=m
-+CONFIG_RTC_DRV_RX4581=m
-+CONFIG_RTC_DRV_RS5C348=m
-+CONFIG_RTC_DRV_MAX6902=m
-+CONFIG_RTC_DRV_PCF2123=m
-+CONFIG_RTC_DRV_DS3232=m
-+CONFIG_RTC_DRV_PCF2127=m
-+CONFIG_RTC_DRV_RV3029C2=m
-+CONFIG_DMADEVICES=y
-+CONFIG_DMA_BCM2835=y
-+CONFIG_DMA_BCM2708=y
-+CONFIG_DMABUF_HEAPS=y
-+CONFIG_DMABUF_HEAPS_SYSTEM=y
-+CONFIG_DMABUF_HEAPS_CMA=y
-+CONFIG_AUXDISPLAY=y
-+CONFIG_HD44780=m
-+CONFIG_UIO=m
-+CONFIG_UIO_PDRV_GENIRQ=m
-+CONFIG_STAGING=y
-+CONFIG_PRISM2_USB=m
-+CONFIG_R8712U=m
-+CONFIG_R8188EU=m
-+CONFIG_VT6656=m
-+CONFIG_STAGING_MEDIA=y
-+CONFIG_FB_TFT=m
-+CONFIG_FB_TFT_AGM1264K_FL=m
-+CONFIG_FB_TFT_BD663474=m
-+CONFIG_FB_TFT_HX8340BN=m
-+CONFIG_FB_TFT_HX8347D=m
-+CONFIG_FB_TFT_HX8353D=m
-+CONFIG_FB_TFT_HX8357D=m
-+CONFIG_FB_TFT_ILI9163=m
-+CONFIG_FB_TFT_ILI9320=m
-+CONFIG_FB_TFT_ILI9325=m
-+CONFIG_FB_TFT_ILI9340=m
-+CONFIG_FB_TFT_ILI9341=m
-+CONFIG_FB_TFT_ILI9481=m
-+CONFIG_FB_TFT_ILI9486=m
-+CONFIG_FB_TFT_PCD8544=m
-+CONFIG_FB_TFT_RA8875=m
-+CONFIG_FB_TFT_S6D02A1=m
-+CONFIG_FB_TFT_S6D1121=m
-+CONFIG_FB_TFT_SH1106=m
-+CONFIG_FB_TFT_SSD1289=m
-+CONFIG_FB_TFT_SSD1306=m
-+CONFIG_FB_TFT_SSD1331=m
-+CONFIG_FB_TFT_SSD1351=m
-+CONFIG_FB_TFT_ST7735R=m
-+CONFIG_FB_TFT_ST7789V=m
-+CONFIG_FB_TFT_TINYLCD=m
-+CONFIG_FB_TFT_TLS8204=m
-+CONFIG_FB_TFT_UC1701=m
-+CONFIG_FB_TFT_UPD161704=m
-+CONFIG_FB_TFT_WATTEROTT=m
-+CONFIG_BCM2835_VCHIQ=y
-+CONFIG_SND_BCM2835=m
-+CONFIG_VIDEO_BCM2835=m
-+CONFIG_VIDEO_CODEC_BCM2835=m
-+CONFIG_VIDEO_ISP_BCM2835=m
-+CONFIG_CLK_RASPBERRYPI=y
-+CONFIG_MAILBOX=y
-+CONFIG_BCM2835_MBOX=y
-+# CONFIG_IOMMU_SUPPORT is not set
-+CONFIG_RASPBERRYPI_POWER=y
-+CONFIG_IIO=m
-+CONFIG_IIO_BUFFER_CB=m
-+CONFIG_MCP320X=m
-+CONFIG_MCP3422=m
-+CONFIG_TI_ADS1015=m
-+CONFIG_BME680=m
-+CONFIG_CCS811=m
-+CONFIG_SENSIRION_SGP30=m
-+CONFIG_SPS30_I2C=m
-+CONFIG_DHT11=m
-+CONFIG_HDC100X=m
-+CONFIG_HTU21=m
-+CONFIG_INV_MPU6050_I2C=m
-+CONFIG_APDS9960=m
-+CONFIG_BH1750=m
-+CONFIG_TSL4531=m
-+CONFIG_VEML6070=m
-+CONFIG_BMP280=m
-+CONFIG_MAXIM_THERMOCOUPLE=m
-+CONFIG_MAX31856=m
-+CONFIG_PWM_BCM2835=m
-+CONFIG_PWM_PCA9685=m
-+CONFIG_PWM_RASPBERRYPI_POE=m
-+CONFIG_RPI_AXIPERF=m
-+CONFIG_EXT4_FS=y
-+CONFIG_EXT4_FS_POSIX_ACL=y
-+CONFIG_EXT4_FS_SECURITY=y
-+CONFIG_REISERFS_FS=m
-+CONFIG_REISERFS_FS_XATTR=y
-+CONFIG_REISERFS_FS_POSIX_ACL=y
-+CONFIG_REISERFS_FS_SECURITY=y
-+CONFIG_JFS_FS=m
-+CONFIG_JFS_POSIX_ACL=y
-+CONFIG_JFS_SECURITY=y
-+CONFIG_JFS_STATISTICS=y
-+CONFIG_XFS_FS=m
-+CONFIG_XFS_QUOTA=y
-+CONFIG_XFS_POSIX_ACL=y
-+CONFIG_XFS_RT=y
-+CONFIG_GFS2_FS=m
-+CONFIG_OCFS2_FS=m
-+CONFIG_BTRFS_FS=m
-+CONFIG_BTRFS_FS_POSIX_ACL=y
-+CONFIG_NILFS2_FS=m
-+CONFIG_F2FS_FS=y
-+CONFIG_FANOTIFY=y
-+CONFIG_QFMT_V1=m
-+CONFIG_QFMT_V2=m
-+CONFIG_AUTOFS4_FS=y
-+CONFIG_FUSE_FS=m
-+CONFIG_CUSE=m
-+CONFIG_OVERLAY_FS=m
-+CONFIG_FSCACHE=y
-+CONFIG_FSCACHE_STATS=y
-+CONFIG_CACHEFILES=y
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+CONFIG_ZISOFS=y
-+CONFIG_UDF_FS=m
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
-+CONFIG_EXFAT_FS=m
-+CONFIG_NTFS_FS=m
-+CONFIG_NTFS_RW=y
-+CONFIG_TMPFS=y
-+CONFIG_TMPFS_POSIX_ACL=y
-+CONFIG_ECRYPT_FS=m
-+CONFIG_HFS_FS=m
-+CONFIG_HFSPLUS_FS=m
-+CONFIG_JFFS2_FS=m
-+CONFIG_JFFS2_SUMMARY=y
-+CONFIG_UBIFS_FS=m
-+CONFIG_SQUASHFS=m
-+CONFIG_SQUASHFS_XATTR=y
-+CONFIG_SQUASHFS_LZO=y
-+CONFIG_SQUASHFS_XZ=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3_ACL=y
-+CONFIG_NFS_V4=y
-+CONFIG_NFS_SWAP=y
-+CONFIG_NFS_V4_1=y
-+CONFIG_NFS_V4_2=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_NFS_FSCACHE=y
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V3_ACL=y
-+CONFIG_NFSD_V4=y
-+CONFIG_CIFS=m
-+CONFIG_CIFS_UPCALL=y
-+CONFIG_CIFS_XATTR=y
-+CONFIG_CIFS_DFS_UPCALL=y
-+CONFIG_CIFS_FSCACHE=y
-+CONFIG_9P_FS=m
-+CONFIG_9P_FS_POSIX_ACL=y
-+CONFIG_NLS_DEFAULT="utf8"
-+CONFIG_NLS_CODEPAGE_437=y
-+CONFIG_NLS_CODEPAGE_737=m
-+CONFIG_NLS_CODEPAGE_775=m
-+CONFIG_NLS_CODEPAGE_850=m
-+CONFIG_NLS_CODEPAGE_852=m
-+CONFIG_NLS_CODEPAGE_855=m
-+CONFIG_NLS_CODEPAGE_857=m
-+CONFIG_NLS_CODEPAGE_860=m
-+CONFIG_NLS_CODEPAGE_861=m
-+CONFIG_NLS_CODEPAGE_862=m
-+CONFIG_NLS_CODEPAGE_863=m
-+CONFIG_NLS_CODEPAGE_864=m
-+CONFIG_NLS_CODEPAGE_865=m
-+CONFIG_NLS_CODEPAGE_866=m
-+CONFIG_NLS_CODEPAGE_869=m
-+CONFIG_NLS_CODEPAGE_936=m
-+CONFIG_NLS_CODEPAGE_950=m
-+CONFIG_NLS_CODEPAGE_932=m
-+CONFIG_NLS_CODEPAGE_949=m
-+CONFIG_NLS_CODEPAGE_874=m
-+CONFIG_NLS_ISO8859_8=m
-+CONFIG_NLS_CODEPAGE_1250=m
-+CONFIG_NLS_CODEPAGE_1251=m
-+CONFIG_NLS_ASCII=y
-+CONFIG_NLS_ISO8859_1=m
-+CONFIG_NLS_ISO8859_2=m
-+CONFIG_NLS_ISO8859_3=m
-+CONFIG_NLS_ISO8859_4=m
-+CONFIG_NLS_ISO8859_5=m
-+CONFIG_NLS_ISO8859_6=m
-+CONFIG_NLS_ISO8859_7=m
-+CONFIG_NLS_ISO8859_9=m
-+CONFIG_NLS_ISO8859_13=m
-+CONFIG_NLS_ISO8859_14=m
-+CONFIG_NLS_ISO8859_15=m
-+CONFIG_NLS_KOI8_R=m
-+CONFIG_NLS_KOI8_U=m
-+CONFIG_DLM=m
-+CONFIG_SECURITY=y
-+CONFIG_SECURITY_APPARMOR=y
-+CONFIG_LSM=""
-+CONFIG_CRYPTO_USER=m
-+CONFIG_CRYPTO_CRYPTD=m
-+CONFIG_CRYPTO_CHACHA20POLY1305=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_CTS=m
-+CONFIG_CRYPTO_XTS=m
-+CONFIG_CRYPTO_ADIANTUM=m
-+CONFIG_CRYPTO_XCBC=m
-+CONFIG_CRYPTO_WP512=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_LZ4=m
-+CONFIG_CRYPTO_USER_API_HASH=m
-+CONFIG_CRYPTO_USER_API_SKCIPHER=m
-+CONFIG_CRYPTO_USER_API_RNG=m
-+CONFIG_CRYPTO_USER_API_AEAD=m
-+# CONFIG_CRYPTO_HW is not set
-+CONFIG_CRC_ITU_T=y
-+CONFIG_LIBCRC32C=y
-+CONFIG_DMA_CMA=y
-+CONFIG_CMA_SIZE_MBYTES=5
-+CONFIG_PRINTK_TIME=y
-+CONFIG_BOOT_PRINTK_DELAY=y
-+CONFIG_KGDB=y
-+CONFIG_KGDB_KDB=y
-+CONFIG_KDB_KEYBOARD=y
-+CONFIG_DEBUG_MEMORY_INIT=y
-+CONFIG_DETECT_HUNG_TASK=y
-+CONFIG_LATENCYTOP=y
-+CONFIG_FUNCTION_PROFILER=y
-+CONFIG_STACK_TRACER=y
-+CONFIG_IRQSOFF_TRACER=y
-+CONFIG_SCHED_TRACER=y
-+CONFIG_BLK_DEV_IO_TRACE=y
-+# CONFIG_UPROBE_EVENTS is not set
-diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-new file mode 100644
-index 000000000000..bab586713394
---- /dev/null
-+++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -0,0 +1,1492 @@
-+CONFIG_LOCALVERSION="-v8"
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SYSVIPC=y
-+CONFIG_POSIX_MQUEUE=y
-+CONFIG_GENERIC_IRQ_DEBUGFS=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_BPF_SYSCALL=y
-+CONFIG_PREEMPT=y
-+CONFIG_BSD_PROCESS_ACCT=y
-+CONFIG_BSD_PROCESS_ACCT_V3=y
-+CONFIG_TASKSTATS=y
-+CONFIG_TASK_XACCT=y
-+CONFIG_TASK_IO_ACCOUNTING=y
-+CONFIG_IKCONFIG=m
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_MEMCG=y
-+CONFIG_BLK_CGROUP=y
-+CONFIG_CFS_BANDWIDTH=y
-+CONFIG_CGROUP_PIDS=y
-+CONFIG_CGROUP_FREEZER=y
-+CONFIG_CPUSETS=y
-+CONFIG_CGROUP_DEVICE=y
-+CONFIG_CGROUP_CPUACCT=y
-+CONFIG_CGROUP_PERF=y
-+CONFIG_CGROUP_BPF=y
-+CONFIG_NAMESPACES=y
-+CONFIG_USER_NS=y
-+CONFIG_SCHED_AUTOGROUP=y
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_EMBEDDED=y
-+# CONFIG_COMPAT_BRK is not set
-+CONFIG_PROFILING=y
-+CONFIG_ARCH_BCM2835=y
-+# CONFIG_CAVIUM_ERRATUM_22375 is not set
-+# CONFIG_CAVIUM_ERRATUM_23154 is not set
-+# CONFIG_CAVIUM_ERRATUM_27456 is not set
-+CONFIG_COMPAT=y
-+CONFIG_ARMV8_DEPRECATED=y
-+CONFIG_SWP_EMULATION=y
-+CONFIG_CP15_BARRIER_EMULATION=y
-+CONFIG_SETEND_EMULATION=y
-+CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
-+# CONFIG_SUSPEND is not set
-+CONFIG_CPU_IDLE=y
-+CONFIG_ARM_CPUIDLE=y
-+CONFIG_CPU_FREQ=y
-+CONFIG_CPU_FREQ_STAT=y
-+CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y
-+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-+CONFIG_CPU_FREQ_GOV_USERSPACE=y
-+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-+CONFIG_CPUFREQ_DT=y
-+CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
-+CONFIG_RASPBERRYPI_FIRMWARE=y
-+CONFIG_VIRTUALIZATION=y
-+CONFIG_KVM=y
-+CONFIG_CRYPTO_AES_ARM64_BS=m
-+CONFIG_JUMP_LABEL=y
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODVERSIONS=y
-+CONFIG_MODULE_SRCVERSION_ALL=y
-+CONFIG_BLK_DEV_THROTTLING=y
-+CONFIG_PARTITION_ADVANCED=y
-+CONFIG_MAC_PARTITION=y
-+CONFIG_BINFMT_MISC=m
-+CONFIG_CLEANCACHE=y
-+CONFIG_FRONTSWAP=y
-+CONFIG_CMA=y
-+CONFIG_ZSWAP=y
-+CONFIG_Z3FOLD=m
-+CONFIG_ZSMALLOC=m
-+CONFIG_NET=y
-+CONFIG_PACKET=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM_USER=y
-+CONFIG_NET_KEY=m
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+CONFIG_IP_ROUTE_MULTIPATH=y
-+CONFIG_IP_ROUTE_VERBOSE=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_RARP=y
-+CONFIG_NET_IPIP=m
-+CONFIG_NET_IPGRE_DEMUX=m
-+CONFIG_NET_IPGRE=m
-+CONFIG_IP_MROUTE=y
-+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-+CONFIG_IP_PIMSM_V1=y
-+CONFIG_IP_PIMSM_V2=y
-+CONFIG_NET_IPVTI=m
-+CONFIG_NET_FOU=m
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_DIAG=m
-+CONFIG_TCP_CONG_ADVANCED=y
-+CONFIG_TCP_CONG_BBR=m
-+CONFIG_IPV6=m
-+CONFIG_IPV6_ROUTER_PREF=y
-+CONFIG_IPV6_ROUTE_INFO=y
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_ESP_OFFLOAD=m
-+CONFIG_INET6_IPCOMP=m
-+CONFIG_IPV6_ILA=m
-+CONFIG_IPV6_VTI=m
-+CONFIG_IPV6_SIT_6RD=y
-+CONFIG_IPV6_GRE=m
-+CONFIG_IPV6_MULTIPLE_TABLES=y
-+CONFIG_IPV6_SUBTREES=y
-+CONFIG_IPV6_MROUTE=y
-+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-+CONFIG_IPV6_PIMSM_V2=y
-+CONFIG_NETFILTER=y
-+CONFIG_BRIDGE_NETFILTER=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CONNTRACK_ZONES=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CONNTRACK_TIMESTAMP=y
-+CONFIG_NF_CONNTRACK_AMANDA=m
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_SNMP=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+CONFIG_NF_TABLES=m
-+CONFIG_NF_TABLES_INET=y
-+CONFIG_NF_TABLES_NETDEV=y
-+CONFIG_NFT_NUMGEN=m
-+CONFIG_NFT_CT=m
-+CONFIG_NFT_FLOW_OFFLOAD=m
-+CONFIG_NFT_COUNTER=m
-+CONFIG_NFT_CONNLIMIT=m
-+CONFIG_NFT_LOG=m
-+CONFIG_NFT_LIMIT=m
-+CONFIG_NFT_MASQ=m
-+CONFIG_NFT_REDIR=m
-+CONFIG_NFT_NAT=m
-+CONFIG_NFT_TUNNEL=m
-+CONFIG_NFT_OBJREF=m
-+CONFIG_NFT_QUEUE=m
-+CONFIG_NFT_QUOTA=m
-+CONFIG_NFT_REJECT=m
-+CONFIG_NFT_COMPAT=m
-+CONFIG_NFT_HASH=m
-+CONFIG_NFT_FIB_INET=m
-+CONFIG_NFT_SOCKET=m
-+CONFIG_NFT_OSF=m
-+CONFIG_NFT_TPROXY=m
-+CONFIG_NFT_DUP_NETDEV=m
-+CONFIG_NFT_FWD_NETDEV=m
-+CONFIG_NFT_FIB_NETDEV=m
-+CONFIG_NF_FLOW_TABLE_INET=m
-+CONFIG_NF_FLOW_TABLE=m
-+CONFIG_NETFILTER_XT_SET=m
-+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_HMARK=m
-+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-+CONFIG_NETFILTER_XT_TARGET_LED=m
-+CONFIG_NETFILTER_XT_TARGET_LOG=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-+CONFIG_NETFILTER_XT_TARGET_TEE=m
-+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-+CONFIG_NETFILTER_XT_TARGET_TRACE=m
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_BPF=m
-+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_CPU=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-+CONFIG_NETFILTER_XT_MATCH_IPVS=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-+CONFIG_NETFILTER_XT_MATCH_OSF=m
-+CONFIG_NETFILTER_XT_MATCH_OWNER=m
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_RECENT=m
-+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+CONFIG_NETFILTER_XT_MATCH_TIME=m
-+CONFIG_NETFILTER_XT_MATCH_U32=m
-+CONFIG_IP_SET=m
-+CONFIG_IP_SET_BITMAP_IP=m
-+CONFIG_IP_SET_BITMAP_IPMAC=m
-+CONFIG_IP_SET_BITMAP_PORT=m
-+CONFIG_IP_SET_HASH_IP=m
-+CONFIG_IP_SET_HASH_IPPORT=m
-+CONFIG_IP_SET_HASH_IPPORTIP=m
-+CONFIG_IP_SET_HASH_IPPORTNET=m
-+CONFIG_IP_SET_HASH_NET=m
-+CONFIG_IP_SET_HASH_NETPORT=m
-+CONFIG_IP_SET_HASH_NETIFACE=m
-+CONFIG_IP_SET_LIST_SET=m
-+CONFIG_IP_VS=m
-+CONFIG_IP_VS_PROTO_TCP=y
-+CONFIG_IP_VS_PROTO_UDP=y
-+CONFIG_IP_VS_PROTO_ESP=y
-+CONFIG_IP_VS_PROTO_AH=y
-+CONFIG_IP_VS_PROTO_SCTP=y
-+CONFIG_IP_VS_RR=m
-+CONFIG_IP_VS_WRR=m
-+CONFIG_IP_VS_LC=m
-+CONFIG_IP_VS_WLC=m
-+CONFIG_IP_VS_LBLC=m
-+CONFIG_IP_VS_LBLCR=m
-+CONFIG_IP_VS_DH=m
-+CONFIG_IP_VS_SH=m
-+CONFIG_IP_VS_SED=m
-+CONFIG_IP_VS_NQ=m
-+CONFIG_IP_VS_FTP=m
-+CONFIG_IP_VS_PE_SIP=m
-+CONFIG_NFT_DUP_IPV4=m
-+CONFIG_NFT_FIB_IPV4=m
-+CONFIG_NF_TABLES_ARP=y
-+CONFIG_NF_FLOW_TABLE_IPV4=m
-+CONFIG_NF_LOG_ARP=m
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_RPFILTER=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_NAT=m
-+CONFIG_IP_NF_TARGET_MASQUERADE=m
-+CONFIG_IP_NF_TARGET_NETMAP=m
-+CONFIG_IP_NF_TARGET_REDIRECT=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_RAW=m
-+CONFIG_IP_NF_ARPTABLES=m
-+CONFIG_IP_NF_ARPFILTER=m
-+CONFIG_IP_NF_ARP_MANGLE=m
-+CONFIG_NFT_DUP_IPV6=m
-+CONFIG_NFT_FIB_IPV6=m
-+CONFIG_NF_FLOW_TABLE_IPV6=m
-+CONFIG_IP6_NF_IPTABLES=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_MATCH_FRAG=m
-+CONFIG_IP6_NF_MATCH_OPTS=m
-+CONFIG_IP6_NF_MATCH_HL=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_RPFILTER=m
-+CONFIG_IP6_NF_MATCH_RT=m
-+CONFIG_IP6_NF_MATCH_SRH=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_TARGET_SYNPROXY=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_RAW=m
-+CONFIG_IP6_NF_SECURITY=m
-+CONFIG_IP6_NF_NAT=m
-+CONFIG_IP6_NF_TARGET_MASQUERADE=m
-+CONFIG_IP6_NF_TARGET_NPT=m
-+CONFIG_NF_TABLES_BRIDGE=m
-+CONFIG_NFT_BRIDGE_REJECT=m
-+CONFIG_BRIDGE_NF_EBTABLES=m
-+CONFIG_BRIDGE_EBT_BROUTE=m
-+CONFIG_BRIDGE_EBT_T_FILTER=m
-+CONFIG_BRIDGE_EBT_T_NAT=m
-+CONFIG_BRIDGE_EBT_802_3=m
-+CONFIG_BRIDGE_EBT_AMONG=m
-+CONFIG_BRIDGE_EBT_ARP=m
-+CONFIG_BRIDGE_EBT_IP=m
-+CONFIG_BRIDGE_EBT_IP6=m
-+CONFIG_BRIDGE_EBT_LIMIT=m
-+CONFIG_BRIDGE_EBT_MARK=m
-+CONFIG_BRIDGE_EBT_PKTTYPE=m
-+CONFIG_BRIDGE_EBT_STP=m
-+CONFIG_BRIDGE_EBT_VLAN=m
-+CONFIG_BRIDGE_EBT_ARPREPLY=m
-+CONFIG_BRIDGE_EBT_DNAT=m
-+CONFIG_BRIDGE_EBT_MARK_T=m
-+CONFIG_BRIDGE_EBT_REDIRECT=m
-+CONFIG_BRIDGE_EBT_SNAT=m
-+CONFIG_BRIDGE_EBT_LOG=m
-+CONFIG_BRIDGE_EBT_NFLOG=m
-+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-+CONFIG_ATM=m
-+CONFIG_L2TP=m
-+CONFIG_L2TP_V3=y
-+CONFIG_L2TP_IP=m
-+CONFIG_L2TP_ETH=m
-+CONFIG_BRIDGE=m
-+CONFIG_VLAN_8021Q=m
-+CONFIG_VLAN_8021Q_GVRP=y
-+CONFIG_ATALK=m
-+CONFIG_6LOWPAN=m
-+CONFIG_IEEE802154=m
-+CONFIG_IEEE802154_6LOWPAN=m
-+CONFIG_MAC802154=m
-+CONFIG_NET_SCHED=y
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_ATM=m
-+CONFIG_NET_SCH_PRIO=m
-+CONFIG_NET_SCH_MULTIQ=m
-+CONFIG_NET_SCH_RED=m
-+CONFIG_NET_SCH_SFB=m
-+CONFIG_NET_SCH_SFQ=m
-+CONFIG_NET_SCH_TEQL=m
-+CONFIG_NET_SCH_TBF=m
-+CONFIG_NET_SCH_GRED=m
-+CONFIG_NET_SCH_DSMARK=m
-+CONFIG_NET_SCH_NETEM=m
-+CONFIG_NET_SCH_DRR=m
-+CONFIG_NET_SCH_MQPRIO=m
-+CONFIG_NET_SCH_CHOKE=m
-+CONFIG_NET_SCH_QFQ=m
-+CONFIG_NET_SCH_CODEL=m
-+CONFIG_NET_SCH_FQ_CODEL=m
-+CONFIG_NET_SCH_CAKE=m
-+CONFIG_NET_SCH_FQ=m
-+CONFIG_NET_SCH_HHF=m
-+CONFIG_NET_SCH_PIE=m
-+CONFIG_NET_SCH_INGRESS=m
-+CONFIG_NET_SCH_PLUG=m
-+CONFIG_NET_CLS_BASIC=m
-+CONFIG_NET_CLS_TCINDEX=m
-+CONFIG_NET_CLS_ROUTE4=m
-+CONFIG_NET_CLS_FW=m
-+CONFIG_NET_CLS_U32=m
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+CONFIG_NET_CLS_FLOW=m
-+CONFIG_NET_CLS_CGROUP=m
-+CONFIG_NET_EMATCH=y
-+CONFIG_NET_EMATCH_CMP=m
-+CONFIG_NET_EMATCH_NBYTE=m
-+CONFIG_NET_EMATCH_U32=m
-+CONFIG_NET_EMATCH_META=m
-+CONFIG_NET_EMATCH_TEXT=m
-+CONFIG_NET_EMATCH_IPSET=m
-+CONFIG_NET_CLS_ACT=y
-+CONFIG_NET_ACT_POLICE=m
-+CONFIG_NET_ACT_GACT=m
-+CONFIG_GACT_PROB=y
-+CONFIG_NET_ACT_MIRRED=m
-+CONFIG_NET_ACT_IPT=m
-+CONFIG_NET_ACT_NAT=m
-+CONFIG_NET_ACT_PEDIT=m
-+CONFIG_NET_ACT_SIMP=m
-+CONFIG_NET_ACT_SKBEDIT=m
-+CONFIG_NET_ACT_CSUM=m
-+CONFIG_BATMAN_ADV=m
-+CONFIG_OPENVSWITCH=m
-+CONFIG_CGROUP_NET_PRIO=y
-+CONFIG_NET_PKTGEN=m
-+CONFIG_HAMRADIO=y
-+CONFIG_AX25=m
-+CONFIG_NETROM=m
-+CONFIG_ROSE=m
-+CONFIG_MKISS=m
-+CONFIG_6PACK=m
-+CONFIG_BPQETHER=m
-+CONFIG_BAYCOM_SER_FDX=m
-+CONFIG_BAYCOM_SER_HDX=m
-+CONFIG_YAM=m
-+CONFIG_CAN=m
-+CONFIG_CAN_J1939=m
-+CONFIG_CAN_ISOTP=m
-+CONFIG_CAN_VCAN=m
-+CONFIG_CAN_SLCAN=m
-+CONFIG_CAN_MCP251X=m
-+CONFIG_CAN_MCP251XFD=m
-+CONFIG_CAN_EMS_USB=m
-+CONFIG_CAN_GS_USB=m
-+CONFIG_BT=m
-+CONFIG_BT_RFCOMM=m
-+CONFIG_BT_RFCOMM_TTY=y
-+CONFIG_BT_BNEP=m
-+CONFIG_BT_BNEP_MC_FILTER=y
-+CONFIG_BT_BNEP_PROTO_FILTER=y
-+CONFIG_BT_HIDP=m
-+CONFIG_BT_6LOWPAN=m
-+CONFIG_BT_HCIBTUSB=m
-+CONFIG_BT_HCIUART=m
-+CONFIG_BT_HCIUART_3WIRE=y
-+CONFIG_BT_HCIUART_BCM=y
-+CONFIG_BT_HCIBCM203X=m
-+CONFIG_BT_HCIBPA10X=m
-+CONFIG_BT_HCIBFUSB=m
-+CONFIG_BT_HCIVHCI=m
-+CONFIG_BT_MRVL=m
-+CONFIG_BT_MRVL_SDIO=m
-+CONFIG_BT_ATH3K=m
-+CONFIG_CFG80211=m
-+CONFIG_CFG80211_WEXT=y
-+CONFIG_MAC80211=m
-+CONFIG_MAC80211_MESH=y
-+CONFIG_RFKILL=m
-+CONFIG_RFKILL_INPUT=y
-+CONFIG_NET_9P=m
-+CONFIG_NFC=m
-+CONFIG_PCI=y
-+CONFIG_PCIE_BRCMSTB=y
-+CONFIG_UEVENT_HELPER=y
-+CONFIG_DEVTMPFS=y
-+CONFIG_DEVTMPFS_MOUNT=y
-+CONFIG_MTD=m
-+CONFIG_MTD_BLOCK=m
-+CONFIG_MTD_BLOCK2MTD=m
-+CONFIG_MTD_SPI_NOR=m
-+CONFIG_MTD_UBI=m
-+CONFIG_OF_CONFIGFS=y
-+CONFIG_ZRAM=m
-+CONFIG_BLK_DEV_LOOP=y
-+CONFIG_BLK_DEV_CRYPTOLOOP=m
-+CONFIG_BLK_DEV_DRBD=m
-+CONFIG_BLK_DEV_NBD=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_CDROM_PKTCDVD=m
-+CONFIG_ATA_OVER_ETH=m
-+CONFIG_BLK_DEV_NVME=y
-+CONFIG_EEPROM_AT24=m
-+CONFIG_TI_ST=m
-+CONFIG_SCSI=y
-+# CONFIG_SCSI_PROC_FS is not set
-+CONFIG_BLK_DEV_SD=y
-+CONFIG_CHR_DEV_ST=m
-+CONFIG_BLK_DEV_SR=m
-+CONFIG_CHR_DEV_SG=m
-+CONFIG_SCSI_ISCSI_ATTRS=y
-+CONFIG_ISCSI_TCP=m
-+CONFIG_ISCSI_BOOT_SYSFS=m
-+CONFIG_ATA=m
-+CONFIG_SATA_AHCI=m
-+CONFIG_SATA_MV=m
-+CONFIG_MD=y
-+CONFIG_MD_LINEAR=m
-+CONFIG_BLK_DEV_DM=m
-+CONFIG_DM_CRYPT=m
-+CONFIG_DM_SNAPSHOT=m
-+CONFIG_DM_THIN_PROVISIONING=m
-+CONFIG_DM_CACHE=m
-+CONFIG_DM_MIRROR=m
-+CONFIG_DM_LOG_USERSPACE=m
-+CONFIG_DM_RAID=m
-+CONFIG_DM_ZERO=m
-+CONFIG_DM_DELAY=m
-+CONFIG_NETDEVICES=y
-+CONFIG_BONDING=m
-+CONFIG_DUMMY=m
-+CONFIG_WIREGUARD=m
-+CONFIG_IFB=m
-+CONFIG_MACVLAN=m
-+CONFIG_MACVTAP=m
-+CONFIG_IPVLAN=m
-+CONFIG_VXLAN=m
-+CONFIG_NETCONSOLE=m
-+CONFIG_TUN=m
-+CONFIG_VETH=m
-+CONFIG_NET_VRF=m
-+CONFIG_BCMGENET=y
-+CONFIG_ENC28J60=m
-+CONFIG_QCA7000_SPI=m
-+CONFIG_QCA7000_UART=m
-+CONFIG_WIZNET_W5100=m
-+CONFIG_WIZNET_W5100_SPI=m
-+CONFIG_MICREL_PHY=y
-+CONFIG_MDIO_BITBANG=m
-+CONFIG_PPP=m
-+CONFIG_PPP_BSDCOMP=m
-+CONFIG_PPP_DEFLATE=m
-+CONFIG_PPP_FILTER=y
-+CONFIG_PPP_MPPE=m
-+CONFIG_PPP_MULTILINK=y
-+CONFIG_PPPOATM=m
-+CONFIG_PPPOE=m
-+CONFIG_PPPOL2TP=m
-+CONFIG_PPP_ASYNC=m
-+CONFIG_PPP_SYNC_TTY=m
-+CONFIG_SLIP=m
-+CONFIG_SLIP_COMPRESSED=y
-+CONFIG_SLIP_SMART=y
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_RTL8152=y
-+CONFIG_USB_LAN78XX=y
-+CONFIG_USB_USBNET=y
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_AX88179_178A=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_CDC_EEM=m
-+CONFIG_USB_NET_CDC_NCM=m
-+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-+CONFIG_USB_NET_CDC_MBIM=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_SR9700=m
-+CONFIG_USB_NET_SR9800=m
-+CONFIG_USB_NET_SMSC75XX=m
-+CONFIG_USB_NET_SMSC95XX=y
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+CONFIG_USB_NET_CX82310_ETH=m
-+CONFIG_USB_NET_KALMIA=m
-+CONFIG_USB_NET_QMI_WWAN=m
-+CONFIG_USB_HSO=m
-+CONFIG_USB_NET_INT51X1=m
-+CONFIG_USB_IPHETH=m
-+CONFIG_USB_SIERRA_NET=m
-+CONFIG_USB_VL600=m
-+CONFIG_USB_NET_AQC111=m
-+CONFIG_ATH9K=m
-+CONFIG_ATH9K_HTC=m
-+CONFIG_CARL9170=m
-+CONFIG_ATH6KL=m
-+CONFIG_ATH6KL_USB=m
-+CONFIG_AR5523=m
-+CONFIG_AT76C50X_USB=m
-+CONFIG_B43=m
-+# CONFIG_B43_PHY_N is not set
-+CONFIG_B43LEGACY=m
-+CONFIG_BRCMFMAC=m
-+CONFIG_BRCMFMAC_USB=y
-+CONFIG_BRCMDBG=y
-+CONFIG_HOSTAP=m
-+CONFIG_P54_COMMON=m
-+CONFIG_P54_USB=m
-+CONFIG_LIBERTAS=m
-+CONFIG_LIBERTAS_USB=m
-+CONFIG_LIBERTAS_SDIO=m
-+CONFIG_LIBERTAS_THINFIRM=m
-+CONFIG_LIBERTAS_THINFIRM_USB=m
-+CONFIG_MWIFIEX=m
-+CONFIG_MWIFIEX_SDIO=m
-+CONFIG_MT7601U=m
-+CONFIG_MT76x0U=m
-+CONFIG_MT76x2U=m
-+CONFIG_RT2X00=m
-+CONFIG_RT2500USB=m
-+CONFIG_RT73USB=m
-+CONFIG_RT2800USB=m
-+CONFIG_RT2800USB_RT3573=y
-+CONFIG_RT2800USB_RT53XX=y
-+CONFIG_RT2800USB_RT55XX=y
-+CONFIG_RT2800USB_UNKNOWN=y
-+CONFIG_RTL8187=m
-+CONFIG_RTL8192CU=m
-+CONFIG_RTL8XXXU=m
-+CONFIG_USB_ZD1201=m
-+CONFIG_ZD1211RW=m
-+CONFIG_MAC80211_HWSIM=m
-+CONFIG_USB_NET_RNDIS_WLAN=m
-+CONFIG_IEEE802154_AT86RF230=m
-+CONFIG_IEEE802154_MRF24J40=m
-+CONFIG_IEEE802154_CC2520=m
-+CONFIG_INPUT_MOUSEDEV=y
-+CONFIG_INPUT_JOYDEV=m
-+CONFIG_INPUT_EVDEV=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_MATRIX=m
-+CONFIG_KEYBOARD_CAP11XX=m
-+# CONFIG_INPUT_MOUSE is not set
-+CONFIG_INPUT_JOYSTICK=y
-+CONFIG_JOYSTICK_IFORCE=m
-+CONFIG_JOYSTICK_IFORCE_USB=m
-+CONFIG_JOYSTICK_XPAD=m
-+CONFIG_JOYSTICK_XPAD_FF=y
-+CONFIG_JOYSTICK_XPAD_LEDS=y
-+CONFIG_JOYSTICK_PSXPAD_SPI=m
-+CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
-+CONFIG_JOYSTICK_RPISENSE=m
-+CONFIG_INPUT_TOUCHSCREEN=y
-+CONFIG_TOUCHSCREEN_ADS7846=m
-+CONFIG_TOUCHSCREEN_EGALAX=m
-+CONFIG_TOUCHSCREEN_EXC3000=m
-+CONFIG_TOUCHSCREEN_GOODIX=m
-+CONFIG_TOUCHSCREEN_ILI210X=m
-+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-+CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
-+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-+CONFIG_TOUCHSCREEN_STMPE=m
-+CONFIG_INPUT_MISC=y
-+CONFIG_INPUT_AD714X=m
-+CONFIG_INPUT_ATI_REMOTE2=m
-+CONFIG_INPUT_KEYSPAN_REMOTE=m
-+CONFIG_INPUT_POWERMATE=m
-+CONFIG_INPUT_YEALINK=m
-+CONFIG_INPUT_CM109=m
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-+CONFIG_INPUT_ADXL34X=m
-+CONFIG_INPUT_CMA3000=m
-+CONFIG_SERIO=m
-+CONFIG_SERIO_RAW=m
-+CONFIG_GAMEPORT=m
-+CONFIG_GAMEPORT_NS558=m
-+CONFIG_GAMEPORT_L4=m
-+CONFIG_BRCM_CHAR_DRIVERS=y
-+CONFIG_BCM_VCIO=y
-+CONFIG_BCM2835_DEVGPIOMEM=y
-+CONFIG_RPIVID_MEM=m
-+# CONFIG_LEGACY_PTYS is not set
-+CONFIG_SERIAL_8250=y
-+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_DMA is not set
-+CONFIG_SERIAL_8250_NR_UARTS=1
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=0
-+CONFIG_SERIAL_8250_EXTENDED=y
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+CONFIG_SERIAL_8250_BCM2835AUX=y
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_SERIAL_AMBA_PL011=y
-+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-+CONFIG_SERIAL_SC16IS7XX=m
-+CONFIG_SERIAL_SC16IS7XX_SPI=y
-+CONFIG_SERIAL_DEV_BUS=y
-+CONFIG_TTY_PRINTK=y
-+CONFIG_HW_RANDOM=y
-+CONFIG_TCG_TPM=m
-+CONFIG_TCG_TIS_SPI=m
-+CONFIG_RANDOM_TRUST_BOOTLOADER=y
-+CONFIG_I2C=y
-+CONFIG_I2C_CHARDEV=m
-+CONFIG_I2C_MUX_GPMUX=m
-+CONFIG_I2C_MUX_PCA954x=m
-+CONFIG_I2C_MUX_PINCTRL=m
-+CONFIG_I2C_BCM2708=m
-+CONFIG_I2C_BCM2835=m
-+CONFIG_I2C_BRCMSTB=m
-+CONFIG_I2C_GPIO=m
-+CONFIG_I2C_ROBOTFUZZ_OSIF=m
-+CONFIG_I2C_TINY_USB=m
-+CONFIG_SPI=y
-+CONFIG_SPI_BCM2835=m
-+CONFIG_SPI_BCM2835AUX=m
-+CONFIG_SPI_GPIO=m
-+CONFIG_SPI_SPIDEV=m
-+CONFIG_SPI_SLAVE=y
-+CONFIG_PPS_CLIENT_LDISC=m
-+CONFIG_PPS_CLIENT_GPIO=m
-+CONFIG_PINCTRL_MCP23S08=m
-+CONFIG_GPIO_SYSFS=y
-+CONFIG_GPIO_BCM_VIRT=y
-+CONFIG_GPIO_PCA953X=m
-+CONFIG_GPIO_PCA953X_IRQ=y
-+CONFIG_GPIO_PCF857X=m
-+CONFIG_GPIO_ARIZONA=m
-+CONFIG_GPIO_FSM=m
-+CONFIG_GPIO_STMPE=y
-+CONFIG_GPIO_MOCKUP=m
-+CONFIG_W1=m
-+CONFIG_W1_MASTER_DS2490=m
-+CONFIG_W1_MASTER_DS2482=m
-+CONFIG_W1_MASTER_DS1WM=m
-+CONFIG_W1_MASTER_GPIO=m
-+CONFIG_W1_SLAVE_THERM=m
-+CONFIG_W1_SLAVE_SMEM=m
-+CONFIG_W1_SLAVE_DS2408=m
-+CONFIG_W1_SLAVE_DS2413=m
-+CONFIG_W1_SLAVE_DS2406=m
-+CONFIG_W1_SLAVE_DS2423=m
-+CONFIG_W1_SLAVE_DS2431=m
-+CONFIG_W1_SLAVE_DS2433=m
-+CONFIG_W1_SLAVE_DS2438=m
-+CONFIG_W1_SLAVE_DS2780=m
-+CONFIG_W1_SLAVE_DS2781=m
-+CONFIG_W1_SLAVE_DS28E04=m
-+CONFIG_W1_SLAVE_DS28E17=m
-+CONFIG_POWER_RESET_GPIO=y
-+CONFIG_RPI_POE_POWER=m
-+CONFIG_BATTERY_DS2760=m
-+CONFIG_BATTERY_MAX17040=m
-+CONFIG_BATTERY_GAUGE_LTC2941=m
-+CONFIG_SENSORS_DS1621=m
-+CONFIG_SENSORS_GPIO_FAN=m
-+CONFIG_SENSORS_IIO_HWMON=m
-+CONFIG_SENSORS_JC42=m
-+CONFIG_SENSORS_LM75=m
-+CONFIG_SENSORS_PWM_FAN=m
-+CONFIG_SENSORS_RASPBERRYPI_HWMON=m
-+CONFIG_SENSORS_SHT21=m
-+CONFIG_SENSORS_SHT3x=m
-+CONFIG_SENSORS_SHTC1=m
-+CONFIG_SENSORS_INA2XX=m
-+CONFIG_SENSORS_TMP102=m
-+CONFIG_THERMAL=y
-+CONFIG_BCM2711_THERMAL=y
-+CONFIG_BCM2835_THERMAL=y
-+CONFIG_WATCHDOG=y
-+CONFIG_GPIO_WATCHDOG=m
-+CONFIG_BCM2835_WDT=y
-+CONFIG_MFD_STMPE=y
-+CONFIG_STMPE_SPI=y
-+CONFIG_MFD_SYSCON=y
-+CONFIG_MFD_ARIZONA_I2C=m
-+CONFIG_MFD_ARIZONA_SPI=m
-+CONFIG_MFD_WM5102=y
-+CONFIG_REGULATOR=y
-+CONFIG_REGULATOR_FIXED_VOLTAGE=y
-+CONFIG_REGULATOR_ARIZONA_LDO1=m
-+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
-+CONFIG_REGULATOR_GPIO=y
-+CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m
-+CONFIG_RC_CORE=y
-+CONFIG_LIRC=y
-+CONFIG_BPF_LIRC_MODE2=y
-+CONFIG_RC_DECODERS=y
-+CONFIG_IR_NEC_DECODER=m
-+CONFIG_IR_RC5_DECODER=m
-+CONFIG_IR_RC6_DECODER=m
-+CONFIG_IR_JVC_DECODER=m
-+CONFIG_IR_SONY_DECODER=m
-+CONFIG_IR_SANYO_DECODER=m
-+CONFIG_IR_SHARP_DECODER=m
-+CONFIG_IR_MCE_KBD_DECODER=m
-+CONFIG_IR_XMP_DECODER=m
-+CONFIG_IR_IMON_DECODER=m
-+CONFIG_RC_DEVICES=y
-+CONFIG_RC_ATI_REMOTE=m
-+CONFIG_IR_IMON=m
-+CONFIG_IR_MCEUSB=m
-+CONFIG_IR_REDRAT3=m
-+CONFIG_IR_STREAMZAP=m
-+CONFIG_IR_IGUANA=m
-+CONFIG_IR_TTUSBIR=m
-+CONFIG_RC_LOOPBACK=m
-+CONFIG_IR_GPIO_CIR=m
-+CONFIG_IR_GPIO_TX=m
-+CONFIG_IR_PWM_TX=m
-+CONFIG_MEDIA_CEC_RC=y
-+CONFIG_MEDIA_SUPPORT=m
-+CONFIG_MEDIA_USB_SUPPORT=y
-+CONFIG_USB_VIDEO_CLASS=m
-+CONFIG_USB_PWC=m
-+CONFIG_VIDEO_CPIA2=m
-+CONFIG_USB_ZR364XX=m
-+CONFIG_USB_STKWEBCAM=m
-+CONFIG_USB_S2255=m
-+CONFIG_VIDEO_USBTV=m
-+CONFIG_VIDEO_PVRUSB2=m
-+CONFIG_VIDEO_HDPVR=m
-+CONFIG_VIDEO_STK1160_COMMON=m
-+CONFIG_VIDEO_GO7007=m
-+CONFIG_VIDEO_GO7007_USB=m
-+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-+CONFIG_VIDEO_AU0828=m
-+CONFIG_VIDEO_AU0828_RC=y
-+CONFIG_VIDEO_CX231XX=m
-+CONFIG_VIDEO_CX231XX_ALSA=m
-+CONFIG_VIDEO_CX231XX_DVB=m
-+CONFIG_VIDEO_TM6000=m
-+CONFIG_VIDEO_TM6000_ALSA=m
-+CONFIG_VIDEO_TM6000_DVB=m
-+CONFIG_DVB_USB=m
-+CONFIG_DVB_USB_A800=m
-+CONFIG_DVB_USB_DIBUSB_MB=m
-+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-+CONFIG_DVB_USB_DIBUSB_MC=m
-+CONFIG_DVB_USB_DIB0700=m
-+CONFIG_DVB_USB_UMT_010=m
-+CONFIG_DVB_USB_CXUSB=m
-+CONFIG_DVB_USB_M920X=m
-+CONFIG_DVB_USB_DIGITV=m
-+CONFIG_DVB_USB_VP7045=m
-+CONFIG_DVB_USB_VP702X=m
-+CONFIG_DVB_USB_GP8PSK=m
-+CONFIG_DVB_USB_NOVA_T_USB2=m
-+CONFIG_DVB_USB_TTUSB2=m
-+CONFIG_DVB_USB_DTT200U=m
-+CONFIG_DVB_USB_OPERA1=m
-+CONFIG_DVB_USB_AF9005=m
-+CONFIG_DVB_USB_AF9005_REMOTE=m
-+CONFIG_DVB_USB_PCTV452E=m
-+CONFIG_DVB_USB_DW2102=m
-+CONFIG_DVB_USB_CINERGY_T2=m
-+CONFIG_DVB_USB_DTV5100=m
-+CONFIG_DVB_USB_AZ6027=m
-+CONFIG_DVB_USB_TECHNISAT_USB2=m
-+CONFIG_DVB_USB_V2=m
-+CONFIG_DVB_USB_AF9015=m
-+CONFIG_DVB_USB_AF9035=m
-+CONFIG_DVB_USB_ANYSEE=m
-+CONFIG_DVB_USB_AU6610=m
-+CONFIG_DVB_USB_AZ6007=m
-+CONFIG_DVB_USB_CE6230=m
-+CONFIG_DVB_USB_EC168=m
-+CONFIG_DVB_USB_GL861=m
-+CONFIG_DVB_USB_LME2510=m
-+CONFIG_DVB_USB_MXL111SF=m
-+CONFIG_DVB_USB_RTL28XXU=m
-+CONFIG_DVB_USB_DVBSKY=m
-+CONFIG_SMS_USB_DRV=m
-+CONFIG_DVB_B2C2_FLEXCOP_USB=m
-+CONFIG_DVB_AS102=m
-+CONFIG_VIDEO_EM28XX=m
-+CONFIG_VIDEO_EM28XX_V4L2=m
-+CONFIG_VIDEO_EM28XX_ALSA=m
-+CONFIG_VIDEO_EM28XX_DVB=m
-+CONFIG_RADIO_SI470X=m
-+CONFIG_USB_SI470X=m
-+CONFIG_I2C_SI470X=m
-+CONFIG_RADIO_SI4713=m
-+CONFIG_I2C_SI4713=m
-+CONFIG_USB_MR800=m
-+CONFIG_USB_DSBR=m
-+CONFIG_RADIO_SHARK=m
-+CONFIG_RADIO_SHARK2=m
-+CONFIG_USB_KEENE=m
-+CONFIG_USB_MA901=m
-+CONFIG_RADIO_TEA5764=m
-+CONFIG_RADIO_SAA7706H=m
-+CONFIG_RADIO_TEF6862=m
-+CONFIG_RADIO_WL1273=m
-+CONFIG_RADIO_WL128X=m
-+CONFIG_V4L_PLATFORM_DRIVERS=y
-+CONFIG_VIDEO_BCM2835_UNICAM=m
-+CONFIG_V4L_TEST_DRIVERS=y
-+CONFIG_VIDEO_VIMC=m
-+CONFIG_VIDEO_VIVID=m
-+CONFIG_VIDEO_VIM2M=m
-+CONFIG_VIDEO_VICODEC=m
-+CONFIG_VIDEO_UDA1342=m
-+CONFIG_VIDEO_SONY_BTF_MPX=m
-+CONFIG_VIDEO_ADV7180=m
-+CONFIG_VIDEO_TC358743=m
-+CONFIG_VIDEO_TVP5150=m
-+CONFIG_VIDEO_TW2804=m
-+CONFIG_VIDEO_TW9903=m
-+CONFIG_VIDEO_TW9906=m
-+CONFIG_VIDEO_IMX219=m
-+CONFIG_VIDEO_IMX290=m
-+CONFIG_VIDEO_IMX477=m
-+CONFIG_VIDEO_OV5647=m
-+CONFIG_VIDEO_OV7251=m
-+CONFIG_VIDEO_OV7640=m
-+CONFIG_VIDEO_OV9281=m
-+CONFIG_VIDEO_IRS1125=m
-+CONFIG_VIDEO_MT9V011=m
-+CONFIG_DRM=m
-+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-+CONFIG_DRM_UDL=m
-+CONFIG_DRM_PANEL_SIMPLE=m
-+CONFIG_DRM_PANEL_JDI_LT070ME05000=m
-+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
-+CONFIG_DRM_DISPLAY_CONNECTOR=m
-+CONFIG_DRM_SIMPLE_BRIDGE=m
-+CONFIG_DRM_TOSHIBA_TC358762=m
-+CONFIG_DRM_V3D=m
-+CONFIG_DRM_VC4=m
-+CONFIG_DRM_VC4_HDMI_CEC=y
-+CONFIG_TINYDRM_ILI9225=m
-+CONFIG_TINYDRM_ILI9341=m
-+CONFIG_TINYDRM_MI0283QT=m
-+CONFIG_TINYDRM_REPAPER=m
-+CONFIG_TINYDRM_ST7586=m
-+CONFIG_TINYDRM_ST7735R=m
-+CONFIG_DRM_GUD=m
-+CONFIG_FB=y
-+CONFIG_FB_BCM2708=y
-+CONFIG_FB_UDL=m
-+CONFIG_FB_SIMPLE=y
-+CONFIG_FB_SSD1307=m
-+CONFIG_FB_RPISENSE=m
-+CONFIG_BACKLIGHT_RPI=m
-+CONFIG_BACKLIGHT_GPIO=m
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-+CONFIG_LOGO=y
-+# CONFIG_LOGO_LINUX_MONO is not set
-+# CONFIG_LOGO_LINUX_VGA16 is not set
-+CONFIG_SOUND=y
-+CONFIG_SND=m
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_HRTIMER=m
-+CONFIG_SND_SEQUENCER=m
-+CONFIG_SND_SEQ_DUMMY=m
-+CONFIG_SND_DUMMY=m
-+CONFIG_SND_ALOOP=m
-+CONFIG_SND_VIRMIDI=m
-+CONFIG_SND_MTPAV=m
-+CONFIG_SND_SERIAL_U16550=m
-+CONFIG_SND_MPU401=m
-+CONFIG_SND_USB_AUDIO=m
-+CONFIG_SND_USB_UA101=m
-+CONFIG_SND_USB_CAIAQ=m
-+CONFIG_SND_USB_CAIAQ_INPUT=y
-+CONFIG_SND_USB_6FIRE=m
-+CONFIG_SND_USB_HIFACE=m
-+CONFIG_SND_USB_TONEPORT=m
-+CONFIG_SND_SOC=m
-+CONFIG_SND_BCM2835_SOC_I2S=m
-+CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC=m
-+CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
-+CONFIG_SND_BCM2708_SOC_PIFI_40=m
-+CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m
-+CONFIG_SND_BCM2708_SOC_RPI_DAC=m
-+CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
-+CONFIG_SND_BCM2708_SOC_JUSTBOOM_BOTH=m
-+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m
-+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m
-+CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m
-+CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
-+CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m
-+CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m
-+CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m
-+CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m
-+CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m
-+CONFIG_SND_AUDIOINJECTOR_ISOLATED_SOUNDCARD=m
-+CONFIG_SND_AUDIOSENSE_PI=m
-+CONFIG_SND_DIGIDAC1_SOUNDCARD=m
-+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m
-+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
-+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
-+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=m
-+CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m
-+CONFIG_SND_BCM2708_SOC_ALLO_BOSS2_DAC=m
-+CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m
-+CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m
-+CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
-+CONFIG_SND_PISOUND=m
-+CONFIG_SND_SOC_AD193X_SPI=m
-+CONFIG_SND_SOC_AD193X_I2C=m
-+CONFIG_SND_SOC_ADAU1701=m
-+CONFIG_SND_SOC_ADAU7002=m
-+CONFIG_SND_SOC_AK4554=m
-+CONFIG_SND_SOC_CS4265=m
-+CONFIG_SND_SOC_ICS43432=m
-+CONFIG_SND_SOC_MA120X0P=m
-+CONFIG_SND_SOC_MAX98357A=m
-+CONFIG_SND_SOC_SPDIF=m
-+CONFIG_SND_SOC_WM8804_I2C=m
-+CONFIG_SND_SOC_WM8960=m
-+CONFIG_SND_SIMPLE_CARD=m
-+CONFIG_HID_BATTERY_STRENGTH=y
-+CONFIG_HIDRAW=y
-+CONFIG_UHID=m
-+CONFIG_HID_A4TECH=m
-+CONFIG_HID_ACRUX=m
-+CONFIG_HID_APPLE=m
-+CONFIG_HID_ASUS=m
-+CONFIG_HID_BELKIN=m
-+CONFIG_HID_BETOP_FF=m
-+CONFIG_HID_BIGBEN_FF=m
-+CONFIG_HID_CHERRY=m
-+CONFIG_HID_CHICONY=m
-+CONFIG_HID_CYPRESS=m
-+CONFIG_HID_DRAGONRISE=m
-+CONFIG_HID_EMS_FF=m
-+CONFIG_HID_ELECOM=m
-+CONFIG_HID_ELO=m
-+CONFIG_HID_EZKEY=m
-+CONFIG_HID_GEMBIRD=m
-+CONFIG_HID_HOLTEK=m
-+CONFIG_HID_KEYTOUCH=m
-+CONFIG_HID_KYE=m
-+CONFIG_HID_UCLOGIC=m
-+CONFIG_HID_WALTOP=m
-+CONFIG_HID_GYRATION=m
-+CONFIG_HID_TWINHAN=m
-+CONFIG_HID_KENSINGTON=m
-+CONFIG_HID_LCPOWER=m
-+CONFIG_HID_LOGITECH=m
-+CONFIG_HID_LOGITECH_DJ=m
-+CONFIG_LOGITECH_FF=y
-+CONFIG_LOGIRUMBLEPAD2_FF=y
-+CONFIG_LOGIG940_FF=y
-+CONFIG_HID_MAGICMOUSE=m
-+CONFIG_HID_MICROSOFT=m
-+CONFIG_HID_MONTEREY=m
-+CONFIG_HID_MULTITOUCH=m
-+CONFIG_HID_NTRIG=m
-+CONFIG_HID_ORTEK=m
-+CONFIG_HID_PANTHERLORD=m
-+CONFIG_HID_PETALYNX=m
-+CONFIG_HID_PICOLCD=m
-+CONFIG_HID_ROCCAT=m
-+CONFIG_HID_SAMSUNG=m
-+CONFIG_HID_SONY=m
-+CONFIG_SONY_FF=y
-+CONFIG_HID_SPEEDLINK=m
-+CONFIG_HID_STEAM=m
-+CONFIG_HID_SUNPLUS=m
-+CONFIG_HID_GREENASIA=m
-+CONFIG_HID_SMARTJOYPLUS=m
-+CONFIG_HID_TOPSEED=m
-+CONFIG_HID_THINGM=m
-+CONFIG_HID_THRUSTMASTER=m
-+CONFIG_HID_WACOM=m
-+CONFIG_HID_WIIMOTE=m
-+CONFIG_HID_XINMO=m
-+CONFIG_HID_ZEROPLUS=m
-+CONFIG_HID_ZYDACRON=m
-+CONFIG_HID_PID=y
-+CONFIG_USB_HIDDEV=y
-+CONFIG_USB=y
-+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-+CONFIG_USB_MON=m
-+CONFIG_USB_XHCI_HCD=y
-+CONFIG_USB_XHCI_PLATFORM=y
-+CONFIG_USB_DWCOTG=y
-+CONFIG_USB_PRINTER=m
-+CONFIG_USB_TMC=m
-+CONFIG_USB_STORAGE=y
-+CONFIG_USB_STORAGE_REALTEK=m
-+CONFIG_USB_STORAGE_DATAFAB=m
-+CONFIG_USB_STORAGE_FREECOM=m
-+CONFIG_USB_STORAGE_ISD200=m
-+CONFIG_USB_STORAGE_USBAT=m
-+CONFIG_USB_STORAGE_SDDR09=m
-+CONFIG_USB_STORAGE_SDDR55=m
-+CONFIG_USB_STORAGE_JUMPSHOT=m
-+CONFIG_USB_STORAGE_ALAUDA=m
-+CONFIG_USB_STORAGE_ONETOUCH=m
-+CONFIG_USB_STORAGE_KARMA=m
-+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-+CONFIG_USB_STORAGE_ENE_UB6250=m
-+CONFIG_USB_UAS=y
-+CONFIG_USB_MDC800=m
-+CONFIG_USB_MICROTEK=m
-+CONFIG_USBIP_CORE=m
-+CONFIG_USBIP_VHCI_HCD=m
-+CONFIG_USBIP_HOST=m
-+CONFIG_USBIP_VUDC=m
-+CONFIG_USB_DWC2=m
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+CONFIG_USB_SERIAL_CH341=m
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP210X=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_VISOR=m
-+CONFIG_USB_SERIAL_IPAQ=m
-+CONFIG_USB_SERIAL_IR=m
-+CONFIG_USB_SERIAL_EDGEPORT=m
-+CONFIG_USB_SERIAL_EDGEPORT_TI=m
-+CONFIG_USB_SERIAL_F81232=m
-+CONFIG_USB_SERIAL_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=m
-+CONFIG_USB_SERIAL_IUU=m
-+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-+CONFIG_USB_SERIAL_KEYSPAN=m
-+CONFIG_USB_SERIAL_KLSI=m
-+CONFIG_USB_SERIAL_KOBIL_SCT=m
-+CONFIG_USB_SERIAL_MCT_U232=m
-+CONFIG_USB_SERIAL_METRO=m
-+CONFIG_USB_SERIAL_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+CONFIG_USB_SERIAL_OTI6858=m
-+CONFIG_USB_SERIAL_QCAUX=m
-+CONFIG_USB_SERIAL_QUALCOMM=m
-+CONFIG_USB_SERIAL_SPCP8X5=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_SYMBOL=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+CONFIG_USB_SERIAL_OPTICON=m
-+CONFIG_USB_SERIAL_XSENS_MT=m
-+CONFIG_USB_SERIAL_WISHBONE=m
-+CONFIG_USB_SERIAL_SSU100=m
-+CONFIG_USB_SERIAL_QT2=m
-+CONFIG_USB_SERIAL_DEBUG=m
-+CONFIG_USB_EMI62=m
-+CONFIG_USB_EMI26=m
-+CONFIG_USB_ADUTUX=m
-+CONFIG_USB_SEVSEG=m
-+CONFIG_USB_LEGOTOWER=m
-+CONFIG_USB_LCD=m
-+CONFIG_USB_CYPRESS_CY7C63=m
-+CONFIG_USB_CYTHERM=m
-+CONFIG_USB_IDMOUSE=m
-+CONFIG_USB_FTDI_ELAN=m
-+CONFIG_USB_APPLEDISPLAY=m
-+CONFIG_USB_LD=m
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+CONFIG_USB_TEST=m
-+CONFIG_USB_ISIGHTFW=m
-+CONFIG_USB_YUREX=m
-+CONFIG_USB_ATM=m
-+CONFIG_USB_SPEEDTOUCH=m
-+CONFIG_USB_CXACRU=m
-+CONFIG_USB_UEAGLEATM=m
-+CONFIG_USB_XUSBATM=m
-+CONFIG_NOP_USB_XCEIV=y
-+CONFIG_USB_GADGET=y
-+CONFIG_USB_CONFIGFS=m
-+CONFIG_USB_CONFIGFS_SERIAL=y
-+CONFIG_USB_CONFIGFS_ACM=y
-+CONFIG_USB_CONFIGFS_OBEX=y
-+CONFIG_USB_CONFIGFS_NCM=y
-+CONFIG_USB_CONFIGFS_ECM=y
-+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
-+CONFIG_USB_CONFIGFS_RNDIS=y
-+CONFIG_USB_CONFIGFS_EEM=y
-+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-+CONFIG_USB_CONFIGFS_F_LB_SS=y
-+CONFIG_USB_CONFIGFS_F_FS=y
-+CONFIG_USB_CONFIGFS_F_UAC1=y
-+CONFIG_USB_CONFIGFS_F_UAC2=y
-+CONFIG_USB_CONFIGFS_F_MIDI=y
-+CONFIG_USB_CONFIGFS_F_HID=y
-+CONFIG_USB_CONFIGFS_F_UVC=y
-+CONFIG_USB_CONFIGFS_F_PRINTER=y
-+CONFIG_USB_ZERO=m
-+CONFIG_USB_AUDIO=m
-+CONFIG_USB_ETH=m
-+CONFIG_USB_GADGETFS=m
-+CONFIG_USB_MASS_STORAGE=m
-+CONFIG_USB_G_SERIAL=m
-+CONFIG_USB_MIDI_GADGET=m
-+CONFIG_USB_G_PRINTER=m
-+CONFIG_USB_CDC_COMPOSITE=m
-+CONFIG_USB_G_ACM_MS=m
-+CONFIG_USB_G_MULTI=m
-+CONFIG_USB_G_HID=m
-+CONFIG_USB_G_WEBCAM=m
-+CONFIG_MMC=y
-+CONFIG_MMC_BLOCK_MINORS=32
-+CONFIG_MMC_BCM2835_MMC=y
-+CONFIG_MMC_BCM2835_DMA=y
-+CONFIG_MMC_BCM2835_SDHOST=y
-+CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_PLTFM=y
-+CONFIG_MMC_SDHCI_IPROC=y
-+CONFIG_MMC_SPI=m
-+CONFIG_LEDS_CLASS=y
-+CONFIG_LEDS_PCA9532=m
-+CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_PCA955X=m
-+CONFIG_LEDS_PCA963X=m
-+CONFIG_LEDS_IS31FL32XX=m
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+CONFIG_LEDS_TRIGGER_ONESHOT=y
-+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-+CONFIG_LEDS_TRIGGER_CPU=y
-+CONFIG_LEDS_TRIGGER_GPIO=y
-+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-+CONFIG_LEDS_TRIGGER_TRANSIENT=m
-+CONFIG_LEDS_TRIGGER_CAMERA=m
-+CONFIG_LEDS_TRIGGER_INPUT=y
-+CONFIG_LEDS_TRIGGER_PANIC=y
-+CONFIG_LEDS_TRIGGER_NETDEV=m
-+CONFIG_LEDS_TRIGGER_ACTPWR=y
-+CONFIG_ACCESSIBILITY=y
-+CONFIG_SPEAKUP=m
-+CONFIG_SPEAKUP_SYNTH_SOFT=m
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_DRV_ABX80X=m
-+CONFIG_RTC_DRV_DS1307=m
-+CONFIG_RTC_DRV_DS1374=m
-+CONFIG_RTC_DRV_DS1672=m
-+CONFIG_RTC_DRV_MAX6900=m
-+CONFIG_RTC_DRV_RS5C372=m
-+CONFIG_RTC_DRV_ISL1208=m
-+CONFIG_RTC_DRV_ISL12022=m
-+CONFIG_RTC_DRV_X1205=m
-+CONFIG_RTC_DRV_PCF8523=m
-+CONFIG_RTC_DRV_PCF85063=m
-+CONFIG_RTC_DRV_PCF85363=m
-+CONFIG_RTC_DRV_PCF8563=m
-+CONFIG_RTC_DRV_PCF8583=m
-+CONFIG_RTC_DRV_M41T80=m
-+CONFIG_RTC_DRV_BQ32K=m
-+CONFIG_RTC_DRV_S35390A=m
-+CONFIG_RTC_DRV_FM3130=m
-+CONFIG_RTC_DRV_RX8581=m
-+CONFIG_RTC_DRV_RX8025=m
-+CONFIG_RTC_DRV_EM3027=m
-+CONFIG_RTC_DRV_RV3028=m
-+CONFIG_RTC_DRV_SD3078=m
-+CONFIG_RTC_DRV_M41T93=m
-+CONFIG_RTC_DRV_M41T94=m
-+CONFIG_RTC_DRV_DS1302=m
-+CONFIG_RTC_DRV_DS1305=m
-+CONFIG_RTC_DRV_DS1390=m
-+CONFIG_RTC_DRV_R9701=m
-+CONFIG_RTC_DRV_RX4581=m
-+CONFIG_RTC_DRV_RS5C348=m
-+CONFIG_RTC_DRV_MAX6902=m
-+CONFIG_RTC_DRV_PCF2123=m
-+CONFIG_RTC_DRV_DS3232=m
-+CONFIG_RTC_DRV_PCF2127=m
-+CONFIG_RTC_DRV_RV3029C2=m
-+CONFIG_DMADEVICES=y
-+CONFIG_DMA_BCM2835=y
-+CONFIG_DMA_BCM2708=y
-+CONFIG_DMABUF_HEAPS=y
-+CONFIG_DMABUF_HEAPS_SYSTEM=y
-+CONFIG_DMABUF_HEAPS_CMA=y
-+CONFIG_AUXDISPLAY=y
-+CONFIG_HD44780=m
-+CONFIG_UIO=m
-+CONFIG_UIO_PDRV_GENIRQ=m
-+CONFIG_VHOST_NET=m
-+CONFIG_VHOST_CROSS_ENDIAN_LEGACY=y
-+CONFIG_STAGING=y
-+CONFIG_PRISM2_USB=m
-+CONFIG_R8712U=m
-+CONFIG_R8188EU=m
-+CONFIG_VT6656=m
-+CONFIG_STAGING_MEDIA=y
-+CONFIG_VIDEO_RPIVID=m
-+CONFIG_ASHMEM=y
-+CONFIG_FB_TFT=m
-+CONFIG_FB_TFT_AGM1264K_FL=m
-+CONFIG_FB_TFT_BD663474=m
-+CONFIG_FB_TFT_HX8340BN=m
-+CONFIG_FB_TFT_HX8347D=m
-+CONFIG_FB_TFT_HX8353D=m
-+CONFIG_FB_TFT_HX8357D=m
-+CONFIG_FB_TFT_ILI9163=m
-+CONFIG_FB_TFT_ILI9320=m
-+CONFIG_FB_TFT_ILI9325=m
-+CONFIG_FB_TFT_ILI9340=m
-+CONFIG_FB_TFT_ILI9341=m
-+CONFIG_FB_TFT_ILI9481=m
-+CONFIG_FB_TFT_ILI9486=m
-+CONFIG_FB_TFT_PCD8544=m
-+CONFIG_FB_TFT_RA8875=m
-+CONFIG_FB_TFT_S6D02A1=m
-+CONFIG_FB_TFT_S6D1121=m
-+CONFIG_FB_TFT_SH1106=m
-+CONFIG_FB_TFT_SSD1289=m
-+CONFIG_FB_TFT_SSD1306=m
-+CONFIG_FB_TFT_SSD1331=m
-+CONFIG_FB_TFT_SSD1351=m
-+CONFIG_FB_TFT_ST7735R=m
-+CONFIG_FB_TFT_ST7789V=m
-+CONFIG_FB_TFT_TINYLCD=m
-+CONFIG_FB_TFT_TLS8204=m
-+CONFIG_FB_TFT_UC1701=m
-+CONFIG_FB_TFT_UPD161704=m
-+CONFIG_FB_TFT_WATTEROTT=m
-+CONFIG_BCM2835_VCHIQ=y
-+CONFIG_SND_BCM2835=m
-+CONFIG_VIDEO_BCM2835=m
-+CONFIG_VIDEO_CODEC_BCM2835=m
-+CONFIG_VIDEO_ISP_BCM2835=m
-+CONFIG_CLK_RASPBERRYPI=y
-+CONFIG_MAILBOX=y
-+CONFIG_BCM2835_MBOX=y
-+# CONFIG_IOMMU_SUPPORT is not set
-+CONFIG_RASPBERRYPI_POWER=y
-+CONFIG_IIO=m
-+CONFIG_IIO_BUFFER_CB=m
-+CONFIG_MCP320X=m
-+CONFIG_MCP3422=m
-+CONFIG_TI_ADS1015=m
-+CONFIG_BME680=m
-+CONFIG_CCS811=m
-+CONFIG_SENSIRION_SGP30=m
-+CONFIG_SPS30_I2C=m
-+CONFIG_DHT11=m
-+CONFIG_HDC100X=m
-+CONFIG_HTU21=m
-+CONFIG_INV_MPU6050_I2C=m
-+CONFIG_APDS9960=m
-+CONFIG_BH1750=m
-+CONFIG_TSL4531=m
-+CONFIG_VEML6070=m
-+CONFIG_BMP280=m
-+CONFIG_MAXIM_THERMOCOUPLE=m
-+CONFIG_MAX31856=m
-+CONFIG_PWM_BCM2835=m
-+CONFIG_PWM_PCA9685=m
-+CONFIG_PWM_RASPBERRYPI_POE=m
-+CONFIG_RPI_AXIPERF=m
-+CONFIG_ANDROID=y
-+CONFIG_ANDROID_BINDER_IPC=y
-+CONFIG_ANDROID_BINDERFS=y
-+CONFIG_NVMEM_RMEM=m
-+CONFIG_EXT4_FS=y
-+CONFIG_EXT4_FS_POSIX_ACL=y
-+CONFIG_EXT4_FS_SECURITY=y
-+CONFIG_REISERFS_FS=m
-+CONFIG_REISERFS_FS_XATTR=y
-+CONFIG_REISERFS_FS_POSIX_ACL=y
-+CONFIG_REISERFS_FS_SECURITY=y
-+CONFIG_JFS_FS=m
-+CONFIG_JFS_POSIX_ACL=y
-+CONFIG_JFS_SECURITY=y
-+CONFIG_JFS_STATISTICS=y
-+CONFIG_XFS_FS=m
-+CONFIG_XFS_QUOTA=y
-+CONFIG_XFS_POSIX_ACL=y
-+CONFIG_XFS_RT=y
-+CONFIG_GFS2_FS=m
-+CONFIG_OCFS2_FS=m
-+CONFIG_BTRFS_FS=m
-+CONFIG_BTRFS_FS_POSIX_ACL=y
-+CONFIG_NILFS2_FS=m
-+CONFIG_F2FS_FS=y
-+CONFIG_FS_ENCRYPTION=y
-+CONFIG_FANOTIFY=y
-+CONFIG_QFMT_V1=m
-+CONFIG_QFMT_V2=m
-+CONFIG_AUTOFS4_FS=y
-+CONFIG_FUSE_FS=m
-+CONFIG_CUSE=m
-+CONFIG_OVERLAY_FS=m
-+CONFIG_FSCACHE=y
-+CONFIG_FSCACHE_STATS=y
-+CONFIG_CACHEFILES=y
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+CONFIG_ZISOFS=y
-+CONFIG_UDF_FS=m
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
-+CONFIG_EXFAT_FS=m
-+CONFIG_NTFS_FS=m
-+CONFIG_NTFS_RW=y
-+CONFIG_TMPFS=y
-+CONFIG_TMPFS_POSIX_ACL=y
-+CONFIG_ECRYPT_FS=m
-+CONFIG_HFS_FS=m
-+CONFIG_HFSPLUS_FS=m
-+CONFIG_JFFS2_FS=m
-+CONFIG_JFFS2_SUMMARY=y
-+CONFIG_UBIFS_FS=m
-+CONFIG_SQUASHFS=m
-+CONFIG_SQUASHFS_XATTR=y
-+CONFIG_SQUASHFS_LZO=y
-+CONFIG_SQUASHFS_XZ=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3_ACL=y
-+CONFIG_NFS_V4=y
-+CONFIG_NFS_SWAP=y
-+CONFIG_NFS_V4_1=y
-+CONFIG_NFS_V4_2=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_NFS_FSCACHE=y
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V3_ACL=y
-+CONFIG_NFSD_V4=y
-+CONFIG_CIFS=m
-+CONFIG_CIFS_UPCALL=y
-+CONFIG_CIFS_XATTR=y
-+CONFIG_CIFS_POSIX=y
-+CONFIG_CIFS_DFS_UPCALL=y
-+CONFIG_CIFS_FSCACHE=y
-+CONFIG_9P_FS=m
-+CONFIG_9P_FS_POSIX_ACL=y
-+CONFIG_NLS_DEFAULT="utf8"
-+CONFIG_NLS_CODEPAGE_437=y
-+CONFIG_NLS_CODEPAGE_737=m
-+CONFIG_NLS_CODEPAGE_775=m
-+CONFIG_NLS_CODEPAGE_850=m
-+CONFIG_NLS_CODEPAGE_852=m
-+CONFIG_NLS_CODEPAGE_855=m
-+CONFIG_NLS_CODEPAGE_857=m
-+CONFIG_NLS_CODEPAGE_860=m
-+CONFIG_NLS_CODEPAGE_861=m
-+CONFIG_NLS_CODEPAGE_862=m
-+CONFIG_NLS_CODEPAGE_863=m
-+CONFIG_NLS_CODEPAGE_864=m
-+CONFIG_NLS_CODEPAGE_865=m
-+CONFIG_NLS_CODEPAGE_866=m
-+CONFIG_NLS_CODEPAGE_869=m
-+CONFIG_NLS_CODEPAGE_936=m
-+CONFIG_NLS_CODEPAGE_950=m
-+CONFIG_NLS_CODEPAGE_932=m
-+CONFIG_NLS_CODEPAGE_949=m
-+CONFIG_NLS_CODEPAGE_874=m
-+CONFIG_NLS_ISO8859_8=m
-+CONFIG_NLS_CODEPAGE_1250=m
-+CONFIG_NLS_CODEPAGE_1251=m
-+CONFIG_NLS_ASCII=y
-+CONFIG_NLS_ISO8859_1=m
-+CONFIG_NLS_ISO8859_2=m
-+CONFIG_NLS_ISO8859_3=m
-+CONFIG_NLS_ISO8859_4=m
-+CONFIG_NLS_ISO8859_5=m
-+CONFIG_NLS_ISO8859_6=m
-+CONFIG_NLS_ISO8859_7=m
-+CONFIG_NLS_ISO8859_9=m
-+CONFIG_NLS_ISO8859_13=m
-+CONFIG_NLS_ISO8859_14=m
-+CONFIG_NLS_ISO8859_15=m
-+CONFIG_NLS_KOI8_R=m
-+CONFIG_NLS_KOI8_U=m
-+CONFIG_DLM=m
-+CONFIG_SECURITY=y
-+CONFIG_SECURITY_APPARMOR=y
-+CONFIG_LSM=""
-+CONFIG_CRYPTO_USER=m
-+CONFIG_CRYPTO_CHACHA20POLY1305=m
-+CONFIG_CRYPTO_ADIANTUM=m
-+CONFIG_CRYPTO_XCBC=m
-+CONFIG_CRYPTO_WP512=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_LZ4=m
-+CONFIG_CRYPTO_USER_API_HASH=m
-+CONFIG_CRYPTO_USER_API_SKCIPHER=m
-+CONFIG_CRYPTO_USER_API_RNG=m
-+CONFIG_CRYPTO_USER_API_AEAD=m
-+# CONFIG_CRYPTO_HW is not set
-+CONFIG_CRC_ITU_T=y
-+CONFIG_LIBCRC32C=y
-+CONFIG_DMA_CMA=y
-+CONFIG_CMA_SIZE_MBYTES=5
-+CONFIG_PRINTK_TIME=y
-+CONFIG_BOOT_PRINTK_DELAY=y
-+CONFIG_KGDB=y
-+CONFIG_KGDB_KDB=y
-+CONFIG_KDB_KEYBOARD=y
-+CONFIG_DEBUG_MEMORY_INIT=y
-+CONFIG_DETECT_HUNG_TASK=y
-+CONFIG_LATENCYTOP=y
-+CONFIG_FUNCTION_PROFILER=y
-+CONFIG_STACK_TRACER=y
-+CONFIG_IRQSOFF_TRACER=y
-+CONFIG_SCHED_TRACER=y
-+CONFIG_BLK_DEV_IO_TRACE=y
-+# CONFIG_UPROBE_EVENTS is not set
-diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-new file mode 100644
-index 000000000000..235fecf9c903
---- /dev/null
-+++ b/arch/arm64/configs/bcmrpi3_defconfig
-@@ -0,0 +1,1339 @@
-+CONFIG_LOCALVERSION="-v8"
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SYSVIPC=y
-+CONFIG_POSIX_MQUEUE=y
-+CONFIG_NO_HZ=y
-+CONFIG_HIGH_RES_TIMERS=y
-+CONFIG_BPF_SYSCALL=y
-+CONFIG_PREEMPT=y
-+CONFIG_BSD_PROCESS_ACCT=y
-+CONFIG_BSD_PROCESS_ACCT_V3=y
-+CONFIG_TASKSTATS=y
-+CONFIG_TASK_DELAY_ACCT=y
-+CONFIG_TASK_XACCT=y
-+CONFIG_TASK_IO_ACCOUNTING=y
-+CONFIG_IKCONFIG=m
-+CONFIG_IKCONFIG_PROC=y
-+CONFIG_MEMCG=y
-+CONFIG_BLK_CGROUP=y
-+CONFIG_CFS_BANDWIDTH=y
-+CONFIG_CGROUP_PIDS=y
-+CONFIG_CGROUP_FREEZER=y
-+CONFIG_CPUSETS=y
-+CONFIG_CGROUP_DEVICE=y
-+CONFIG_CGROUP_CPUACCT=y
-+CONFIG_CGROUP_PERF=y
-+CONFIG_CGROUP_BPF=y
-+CONFIG_NAMESPACES=y
-+CONFIG_USER_NS=y
-+CONFIG_SCHED_AUTOGROUP=y
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_EMBEDDED=y
-+# CONFIG_COMPAT_BRK is not set
-+CONFIG_PROFILING=y
-+CONFIG_ARCH_BCM2835=y
-+# CONFIG_CAVIUM_ERRATUM_22375 is not set
-+# CONFIG_CAVIUM_ERRATUM_23154 is not set
-+# CONFIG_CAVIUM_ERRATUM_27456 is not set
-+CONFIG_SCHED_MC=y
-+CONFIG_NR_CPUS=4
-+CONFIG_HZ_1000=y
-+CONFIG_COMPAT=y
-+CONFIG_ARMV8_DEPRECATED=y
-+CONFIG_SWP_EMULATION=y
-+CONFIG_CP15_BARRIER_EMULATION=y
-+CONFIG_SETEND_EMULATION=y
-+CONFIG_RANDOMIZE_BASE=y
-+CONFIG_CMDLINE="console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
-+# CONFIG_SUSPEND is not set
-+CONFIG_CPU_IDLE=y
-+CONFIG_ARM_CPUIDLE=y
-+CONFIG_CPU_FREQ=y
-+CONFIG_CPU_FREQ_STAT=y
-+CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y
-+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-+CONFIG_CPU_FREQ_GOV_USERSPACE=y
-+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-+CONFIG_CPUFREQ_DT=y
-+CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
-+CONFIG_RASPBERRYPI_FIRMWARE=y
-+CONFIG_CRYPTO_AES_ARM64_BS=m
-+CONFIG_JUMP_LABEL=y
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODVERSIONS=y
-+CONFIG_MODULE_SRCVERSION_ALL=y
-+CONFIG_PARTITION_ADVANCED=y
-+CONFIG_MAC_PARTITION=y
-+CONFIG_BINFMT_MISC=y
-+CONFIG_CLEANCACHE=y
-+CONFIG_FRONTSWAP=y
-+CONFIG_CMA=y
-+CONFIG_ZSWAP=y
-+CONFIG_Z3FOLD=m
-+CONFIG_ZSMALLOC=m
-+CONFIG_NET=y
-+CONFIG_PACKET=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM_USER=y
-+CONFIG_NET_KEY=m
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+CONFIG_IP_ROUTE_MULTIPATH=y
-+CONFIG_IP_ROUTE_VERBOSE=y
-+CONFIG_IP_PNP=y
-+CONFIG_IP_PNP_DHCP=y
-+CONFIG_IP_PNP_RARP=y
-+CONFIG_NET_IPIP=m
-+CONFIG_NET_IPGRE_DEMUX=m
-+CONFIG_NET_IPGRE=m
-+CONFIG_IP_MROUTE=y
-+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
-+CONFIG_IP_PIMSM_V1=y
-+CONFIG_IP_PIMSM_V2=y
-+CONFIG_NET_FOU=m
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_DIAG=m
-+CONFIG_TCP_CONG_ADVANCED=y
-+CONFIG_TCP_CONG_BBR=m
-+CONFIG_IPV6=m
-+CONFIG_IPV6_ROUTER_PREF=y
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_ESP_OFFLOAD=m
-+CONFIG_INET6_IPCOMP=m
-+CONFIG_IPV6_ILA=m
-+CONFIG_IPV6_VTI=m
-+CONFIG_IPV6_GRE=m
-+CONFIG_IPV6_MULTIPLE_TABLES=y
-+CONFIG_IPV6_SUBTREES=y
-+CONFIG_IPV6_MROUTE=y
-+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
-+CONFIG_IPV6_PIMSM_V2=y
-+CONFIG_NETFILTER=y
-+CONFIG_BRIDGE_NETFILTER=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CONNTRACK_ZONES=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CONNTRACK_TIMESTAMP=y
-+CONFIG_NF_CONNTRACK_AMANDA=m
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_SNMP=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+CONFIG_NF_TABLES=m
-+CONFIG_NF_TABLES_INET=y
-+CONFIG_NF_TABLES_NETDEV=y
-+CONFIG_NFT_NUMGEN=m
-+CONFIG_NFT_CT=m
-+CONFIG_NFT_FLOW_OFFLOAD=m
-+CONFIG_NFT_COUNTER=m
-+CONFIG_NFT_CONNLIMIT=m
-+CONFIG_NFT_LOG=m
-+CONFIG_NFT_LIMIT=m
-+CONFIG_NFT_MASQ=m
-+CONFIG_NFT_REDIR=m
-+CONFIG_NFT_NAT=m
-+CONFIG_NFT_TUNNEL=m
-+CONFIG_NFT_OBJREF=m
-+CONFIG_NFT_QUEUE=m
-+CONFIG_NFT_QUOTA=m
-+CONFIG_NFT_REJECT=m
-+CONFIG_NFT_COMPAT=m
-+CONFIG_NFT_HASH=m
-+CONFIG_NFT_FIB_INET=m
-+CONFIG_NFT_SOCKET=m
-+CONFIG_NFT_OSF=m
-+CONFIG_NFT_TPROXY=m
-+CONFIG_NFT_DUP_NETDEV=m
-+CONFIG_NFT_FWD_NETDEV=m
-+CONFIG_NFT_FIB_NETDEV=m
-+CONFIG_NF_FLOW_TABLE_INET=m
-+CONFIG_NF_FLOW_TABLE=m
-+CONFIG_NETFILTER_XT_SET=m
-+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_HMARK=m
-+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-+CONFIG_NETFILTER_XT_TARGET_LED=m
-+CONFIG_NETFILTER_XT_TARGET_LOG=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-+CONFIG_NETFILTER_XT_TARGET_TEE=m
-+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-+CONFIG_NETFILTER_XT_TARGET_TRACE=m
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_BPF=m
-+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
-+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_CPU=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-+CONFIG_NETFILTER_XT_MATCH_IPVS=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
-+CONFIG_NETFILTER_XT_MATCH_OSF=m
-+CONFIG_NETFILTER_XT_MATCH_OWNER=m
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_RECENT=m
-+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+CONFIG_NETFILTER_XT_MATCH_TIME=m
-+CONFIG_NETFILTER_XT_MATCH_U32=m
-+CONFIG_IP_SET=m
-+CONFIG_IP_SET_BITMAP_IP=m
-+CONFIG_IP_SET_BITMAP_IPMAC=m
-+CONFIG_IP_SET_BITMAP_PORT=m
-+CONFIG_IP_SET_HASH_IP=m
-+CONFIG_IP_SET_HASH_IPPORT=m
-+CONFIG_IP_SET_HASH_IPPORTIP=m
-+CONFIG_IP_SET_HASH_IPPORTNET=m
-+CONFIG_IP_SET_HASH_NET=m
-+CONFIG_IP_SET_HASH_NETPORT=m
-+CONFIG_IP_SET_HASH_NETIFACE=m
-+CONFIG_IP_SET_LIST_SET=m
-+CONFIG_IP_VS=m
-+CONFIG_IP_VS_PROTO_TCP=y
-+CONFIG_IP_VS_PROTO_UDP=y
-+CONFIG_IP_VS_PROTO_ESP=y
-+CONFIG_IP_VS_PROTO_AH=y
-+CONFIG_IP_VS_PROTO_SCTP=y
-+CONFIG_IP_VS_RR=m
-+CONFIG_IP_VS_WRR=m
-+CONFIG_IP_VS_LC=m
-+CONFIG_IP_VS_WLC=m
-+CONFIG_IP_VS_LBLC=m
-+CONFIG_IP_VS_LBLCR=m
-+CONFIG_IP_VS_DH=m
-+CONFIG_IP_VS_SH=m
-+CONFIG_IP_VS_SED=m
-+CONFIG_IP_VS_NQ=m
-+CONFIG_IP_VS_FTP=m
-+CONFIG_IP_VS_PE_SIP=m
-+CONFIG_NFT_DUP_IPV4=m
-+CONFIG_NFT_FIB_IPV4=m
-+CONFIG_NF_TABLES_ARP=y
-+CONFIG_NF_FLOW_TABLE_IPV4=m
-+CONFIG_NF_LOG_ARP=m
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_RPFILTER=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_NAT=m
-+CONFIG_IP_NF_TARGET_MASQUERADE=m
-+CONFIG_IP_NF_TARGET_NETMAP=m
-+CONFIG_IP_NF_TARGET_REDIRECT=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_RAW=m
-+CONFIG_IP_NF_ARPTABLES=m
-+CONFIG_IP_NF_ARPFILTER=m
-+CONFIG_IP_NF_ARP_MANGLE=m
-+CONFIG_NFT_DUP_IPV6=m
-+CONFIG_NFT_FIB_IPV6=m
-+CONFIG_NF_FLOW_TABLE_IPV6=m
-+CONFIG_IP6_NF_IPTABLES=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_MATCH_FRAG=m
-+CONFIG_IP6_NF_MATCH_OPTS=m
-+CONFIG_IP6_NF_MATCH_HL=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_RPFILTER=m
-+CONFIG_IP6_NF_MATCH_RT=m
-+CONFIG_IP6_NF_MATCH_SRH=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_TARGET_SYNPROXY=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_RAW=m
-+CONFIG_IP6_NF_SECURITY=m
-+CONFIG_IP6_NF_NAT=m
-+CONFIG_IP6_NF_TARGET_MASQUERADE=m
-+CONFIG_IP6_NF_TARGET_NPT=m
-+CONFIG_NF_TABLES_BRIDGE=m
-+CONFIG_NFT_BRIDGE_REJECT=m
-+CONFIG_BRIDGE_NF_EBTABLES=m
-+CONFIG_BRIDGE_EBT_BROUTE=m
-+CONFIG_BRIDGE_EBT_T_FILTER=m
-+CONFIG_BRIDGE_EBT_T_NAT=m
-+CONFIG_BRIDGE_EBT_802_3=m
-+CONFIG_BRIDGE_EBT_AMONG=m
-+CONFIG_BRIDGE_EBT_ARP=m
-+CONFIG_BRIDGE_EBT_IP=m
-+CONFIG_BRIDGE_EBT_IP6=m
-+CONFIG_BRIDGE_EBT_LIMIT=m
-+CONFIG_BRIDGE_EBT_MARK=m
-+CONFIG_BRIDGE_EBT_PKTTYPE=m
-+CONFIG_BRIDGE_EBT_STP=m
-+CONFIG_BRIDGE_EBT_VLAN=m
-+CONFIG_BRIDGE_EBT_ARPREPLY=m
-+CONFIG_BRIDGE_EBT_DNAT=m
-+CONFIG_BRIDGE_EBT_MARK_T=m
-+CONFIG_BRIDGE_EBT_REDIRECT=m
-+CONFIG_BRIDGE_EBT_SNAT=m
-+CONFIG_BRIDGE_EBT_LOG=m
-+CONFIG_BRIDGE_EBT_NFLOG=m
-+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
-+CONFIG_ATM=m
-+CONFIG_L2TP=m
-+CONFIG_L2TP_V3=y
-+CONFIG_L2TP_IP=m
-+CONFIG_L2TP_ETH=m
-+CONFIG_BRIDGE=m
-+CONFIG_VLAN_8021Q=m
-+CONFIG_VLAN_8021Q_GVRP=y
-+CONFIG_ATALK=m
-+CONFIG_6LOWPAN=m
-+CONFIG_IEEE802154=m
-+CONFIG_IEEE802154_6LOWPAN=m
-+CONFIG_MAC802154=m
-+CONFIG_NET_SCHED=y
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_PRIO=m
-+CONFIG_NET_SCH_MULTIQ=m
-+CONFIG_NET_SCH_RED=m
-+CONFIG_NET_SCH_SFB=m
-+CONFIG_NET_SCH_SFQ=m
-+CONFIG_NET_SCH_TEQL=m
-+CONFIG_NET_SCH_TBF=m
-+CONFIG_NET_SCH_GRED=m
-+CONFIG_NET_SCH_DSMARK=m
-+CONFIG_NET_SCH_NETEM=m
-+CONFIG_NET_SCH_DRR=m
-+CONFIG_NET_SCH_MQPRIO=m
-+CONFIG_NET_SCH_CHOKE=m
-+CONFIG_NET_SCH_QFQ=m
-+CONFIG_NET_SCH_CODEL=m
-+CONFIG_NET_SCH_FQ_CODEL=m
-+CONFIG_NET_SCH_CAKE=m
-+CONFIG_NET_SCH_FQ=m
-+CONFIG_NET_SCH_INGRESS=m
-+CONFIG_NET_SCH_PLUG=m
-+CONFIG_NET_CLS_BASIC=m
-+CONFIG_NET_CLS_TCINDEX=m
-+CONFIG_NET_CLS_ROUTE4=m
-+CONFIG_NET_CLS_FW=m
-+CONFIG_NET_CLS_U32=m
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+CONFIG_NET_CLS_FLOW=m
-+CONFIG_NET_CLS_CGROUP=m
-+CONFIG_NET_EMATCH=y
-+CONFIG_NET_EMATCH_CMP=m
-+CONFIG_NET_EMATCH_NBYTE=m
-+CONFIG_NET_EMATCH_U32=m
-+CONFIG_NET_EMATCH_META=m
-+CONFIG_NET_EMATCH_TEXT=m
-+CONFIG_NET_EMATCH_IPSET=m
-+CONFIG_NET_CLS_ACT=y
-+CONFIG_NET_ACT_POLICE=m
-+CONFIG_NET_ACT_GACT=m
-+CONFIG_GACT_PROB=y
-+CONFIG_NET_ACT_MIRRED=m
-+CONFIG_NET_ACT_IPT=m
-+CONFIG_NET_ACT_NAT=m
-+CONFIG_NET_ACT_PEDIT=m
-+CONFIG_NET_ACT_SIMP=m
-+CONFIG_NET_ACT_SKBEDIT=m
-+CONFIG_NET_ACT_CSUM=m
-+CONFIG_BATMAN_ADV=m
-+CONFIG_OPENVSWITCH=m
-+CONFIG_CGROUP_NET_PRIO=y
-+CONFIG_NET_PKTGEN=m
-+CONFIG_HAMRADIO=y
-+CONFIG_AX25=m
-+CONFIG_NETROM=m
-+CONFIG_ROSE=m
-+CONFIG_MKISS=m
-+CONFIG_6PACK=m
-+CONFIG_BPQETHER=m
-+CONFIG_BAYCOM_SER_FDX=m
-+CONFIG_BAYCOM_SER_HDX=m
-+CONFIG_YAM=m
-+CONFIG_CAN=m
-+CONFIG_CAN_J1939=m
-+CONFIG_CAN_ISOTP=m
-+CONFIG_CAN_VCAN=m
-+CONFIG_CAN_MCP251X=m
-+CONFIG_CAN_MCP251XFD=m
-+CONFIG_CAN_EMS_USB=m
-+CONFIG_BT=m
-+CONFIG_BT_RFCOMM=m
-+CONFIG_BT_RFCOMM_TTY=y
-+CONFIG_BT_BNEP=m
-+CONFIG_BT_BNEP_MC_FILTER=y
-+CONFIG_BT_BNEP_PROTO_FILTER=y
-+CONFIG_BT_HIDP=m
-+CONFIG_BT_6LOWPAN=m
-+CONFIG_BT_HCIBTUSB=m
-+CONFIG_BT_HCIUART=m
-+CONFIG_BT_HCIUART_3WIRE=y
-+CONFIG_BT_HCIUART_BCM=y
-+CONFIG_BT_HCIBCM203X=m
-+CONFIG_BT_HCIBPA10X=m
-+CONFIG_BT_HCIBFUSB=m
-+CONFIG_BT_HCIVHCI=m
-+CONFIG_BT_MRVL=m
-+CONFIG_BT_MRVL_SDIO=m
-+CONFIG_BT_ATH3K=m
-+CONFIG_CFG80211=m
-+CONFIG_CFG80211_WEXT=y
-+CONFIG_MAC80211=m
-+CONFIG_MAC80211_MESH=y
-+CONFIG_RFKILL=m
-+CONFIG_RFKILL_INPUT=y
-+CONFIG_NET_9P=m
-+CONFIG_NFC=m
-+CONFIG_UEVENT_HELPER=y
-+CONFIG_DEVTMPFS=y
-+CONFIG_DEVTMPFS_MOUNT=y
-+CONFIG_MTD=m
-+CONFIG_MTD_BLOCK=m
-+CONFIG_MTD_UBI=m
-+CONFIG_OF_CONFIGFS=y
-+CONFIG_ZRAM=m
-+CONFIG_BLK_DEV_LOOP=y
-+CONFIG_BLK_DEV_CRYPTOLOOP=m
-+CONFIG_BLK_DEV_DRBD=m
-+CONFIG_BLK_DEV_NBD=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_CDROM_PKTCDVD=m
-+CONFIG_ATA_OVER_ETH=m
-+CONFIG_EEPROM_AT24=m
-+CONFIG_TI_ST=m
-+CONFIG_SCSI=y
-+# CONFIG_SCSI_PROC_FS is not set
-+CONFIG_BLK_DEV_SD=y
-+CONFIG_CHR_DEV_ST=m
-+CONFIG_BLK_DEV_SR=m
-+CONFIG_CHR_DEV_SG=m
-+CONFIG_SCSI_ISCSI_ATTRS=y
-+CONFIG_ISCSI_TCP=m
-+CONFIG_ISCSI_BOOT_SYSFS=m
-+CONFIG_MD=y
-+CONFIG_MD_LINEAR=m
-+CONFIG_BLK_DEV_DM=m
-+CONFIG_DM_CRYPT=m
-+CONFIG_DM_SNAPSHOT=m
-+CONFIG_DM_THIN_PROVISIONING=m
-+CONFIG_DM_CACHE=m
-+CONFIG_DM_MIRROR=m
-+CONFIG_DM_LOG_USERSPACE=m
-+CONFIG_DM_RAID=m
-+CONFIG_DM_ZERO=m
-+CONFIG_DM_DELAY=m
-+CONFIG_NETDEVICES=y
-+CONFIG_BONDING=m
-+CONFIG_DUMMY=m
-+CONFIG_WIREGUARD=m
-+CONFIG_IFB=m
-+CONFIG_MACVLAN=m
-+CONFIG_MACVTAP=m
-+CONFIG_IPVLAN=m
-+CONFIG_VXLAN=m
-+CONFIG_NETCONSOLE=m
-+CONFIG_TUN=m
-+CONFIG_VETH=m
-+CONFIG_NET_VRF=m
-+CONFIG_ENC28J60=m
-+CONFIG_QCA7000_SPI=m
-+CONFIG_QCA7000_UART=m
-+CONFIG_WIZNET_W5100=m
-+CONFIG_WIZNET_W5100_SPI=m
-+CONFIG_MDIO_BITBANG=m
-+CONFIG_PPP=m
-+CONFIG_PPP_BSDCOMP=m
-+CONFIG_PPP_DEFLATE=m
-+CONFIG_PPP_FILTER=y
-+CONFIG_PPP_MPPE=m
-+CONFIG_PPP_MULTILINK=y
-+CONFIG_PPPOATM=m
-+CONFIG_PPPOE=m
-+CONFIG_PPPOL2TP=m
-+CONFIG_PPP_ASYNC=m
-+CONFIG_PPP_SYNC_TTY=m
-+CONFIG_SLIP=m
-+CONFIG_SLIP_COMPRESSED=y
-+CONFIG_SLIP_SMART=y
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_RTL8152=m
-+CONFIG_USB_LAN78XX=y
-+CONFIG_USB_USBNET=y
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_AX88179_178A=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_CDC_EEM=m
-+CONFIG_USB_NET_CDC_NCM=m
-+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-+CONFIG_USB_NET_CDC_MBIM=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_SR9700=m
-+CONFIG_USB_NET_SR9800=m
-+CONFIG_USB_NET_SMSC75XX=m
-+CONFIG_USB_NET_SMSC95XX=y
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+CONFIG_USB_NET_CX82310_ETH=m
-+CONFIG_USB_NET_KALMIA=m
-+CONFIG_USB_NET_QMI_WWAN=m
-+CONFIG_USB_HSO=m
-+CONFIG_USB_NET_INT51X1=m
-+CONFIG_USB_IPHETH=m
-+CONFIG_USB_SIERRA_NET=m
-+CONFIG_USB_VL600=m
-+CONFIG_USB_NET_AQC111=m
-+CONFIG_ATH9K=m
-+CONFIG_ATH9K_HTC=m
-+CONFIG_CARL9170=m
-+CONFIG_ATH6KL=m
-+CONFIG_ATH6KL_USB=m
-+CONFIG_AR5523=m
-+CONFIG_AT76C50X_USB=m
-+CONFIG_B43=m
-+# CONFIG_B43_PHY_N is not set
-+CONFIG_B43LEGACY=m
-+CONFIG_BRCMFMAC=m
-+CONFIG_BRCMFMAC_USB=y
-+CONFIG_HOSTAP=m
-+CONFIG_P54_COMMON=m
-+CONFIG_P54_USB=m
-+CONFIG_LIBERTAS=m
-+CONFIG_LIBERTAS_USB=m
-+CONFIG_LIBERTAS_SDIO=m
-+CONFIG_LIBERTAS_THINFIRM=m
-+CONFIG_LIBERTAS_THINFIRM_USB=m
-+CONFIG_MWIFIEX=m
-+CONFIG_MWIFIEX_SDIO=m
-+CONFIG_MT7601U=m
-+CONFIG_MT76x0U=m
-+CONFIG_MT76x2U=m
-+CONFIG_RT2X00=m
-+CONFIG_RT2500USB=m
-+CONFIG_RT73USB=m
-+CONFIG_RT2800USB=m
-+CONFIG_RT2800USB_RT3573=y
-+CONFIG_RT2800USB_RT53XX=y
-+CONFIG_RT2800USB_RT55XX=y
-+CONFIG_RT2800USB_UNKNOWN=y
-+CONFIG_RTL8187=m
-+CONFIG_RTL8192CU=m
-+CONFIG_USB_ZD1201=m
-+CONFIG_ZD1211RW=m
-+CONFIG_MAC80211_HWSIM=m
-+CONFIG_USB_NET_RNDIS_WLAN=m
-+CONFIG_IEEE802154_AT86RF230=m
-+CONFIG_IEEE802154_MRF24J40=m
-+CONFIG_IEEE802154_CC2520=m
-+CONFIG_INPUT_JOYDEV=m
-+CONFIG_INPUT_EVDEV=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_MATRIX=m
-+CONFIG_KEYBOARD_CAP11XX=m
-+# CONFIG_INPUT_MOUSE is not set
-+CONFIG_INPUT_JOYSTICK=y
-+CONFIG_JOYSTICK_IFORCE=m
-+CONFIG_JOYSTICK_IFORCE_USB=m
-+CONFIG_JOYSTICK_XPAD=m
-+CONFIG_JOYSTICK_XPAD_FF=y
-+CONFIG_JOYSTICK_XPAD_LEDS=y
-+CONFIG_JOYSTICK_RPISENSE=m
-+CONFIG_INPUT_TOUCHSCREEN=y
-+CONFIG_TOUCHSCREEN_ADS7846=m
-+CONFIG_TOUCHSCREEN_EGALAX=m
-+CONFIG_TOUCHSCREEN_ILI210X=m
-+CONFIG_TOUCHSCREEN_EKTF2127=m
-+CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
-+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-+CONFIG_TOUCHSCREEN_STMPE=m
-+CONFIG_INPUT_MISC=y
-+CONFIG_INPUT_AD714X=m
-+CONFIG_INPUT_ATI_REMOTE2=m
-+CONFIG_INPUT_KEYSPAN_REMOTE=m
-+CONFIG_INPUT_POWERMATE=m
-+CONFIG_INPUT_YEALINK=m
-+CONFIG_INPUT_CM109=m
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-+CONFIG_INPUT_ADXL34X=m
-+CONFIG_INPUT_CMA3000=m
-+CONFIG_SERIO=m
-+CONFIG_SERIO_RAW=m
-+CONFIG_GAMEPORT=m
-+CONFIG_GAMEPORT_NS558=m
-+CONFIG_GAMEPORT_L4=m
-+CONFIG_BRCM_CHAR_DRIVERS=y
-+CONFIG_BCM_VCIO=y
-+CONFIG_BCM2835_DEVGPIOMEM=y
-+# CONFIG_BCM2835_SMI_DEV is not set
-+# CONFIG_LEGACY_PTYS is not set
-+CONFIG_SERIAL_8250=y
-+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-+CONFIG_SERIAL_8250_CONSOLE=y
-+# CONFIG_SERIAL_8250_DMA is not set
-+CONFIG_SERIAL_8250_NR_UARTS=1
-+CONFIG_SERIAL_8250_RUNTIME_UARTS=0
-+CONFIG_SERIAL_8250_EXTENDED=y
-+CONFIG_SERIAL_8250_SHARE_IRQ=y
-+CONFIG_SERIAL_8250_BCM2835AUX=y
-+CONFIG_SERIAL_OF_PLATFORM=y
-+CONFIG_SERIAL_AMBA_PL011=y
-+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-+CONFIG_SERIAL_SC16IS7XX=m
-+CONFIG_SERIAL_SC16IS7XX_SPI=y
-+CONFIG_SERIAL_DEV_BUS=y
-+CONFIG_TTY_PRINTK=y
-+CONFIG_HW_RANDOM=y
-+CONFIG_TCG_TPM=m
-+CONFIG_TCG_TIS_SPI=m
-+CONFIG_RANDOM_TRUST_BOOTLOADER=y
-+CONFIG_I2C=y
-+CONFIG_I2C_CHARDEV=m
-+CONFIG_I2C_MUX=m
-+CONFIG_I2C_MUX_GPMUX=m
-+CONFIG_I2C_MUX_PCA954x=m
-+CONFIG_I2C_MUX_PINCTRL=m
-+CONFIG_I2C_BCM2708=m
-+CONFIG_I2C_BCM2835=m
-+# CONFIG_I2C_BRCMSTB is not set
-+CONFIG_I2C_GPIO=m
-+CONFIG_SPI=y
-+CONFIG_SPI_BCM2835=m
-+CONFIG_SPI_BCM2835AUX=m
-+CONFIG_SPI_SPIDEV=y
-+CONFIG_PPS_CLIENT_LDISC=m
-+CONFIG_PPS_CLIENT_GPIO=m
-+CONFIG_GPIO_SYSFS=y
-+CONFIG_GPIO_BCM_VIRT=y
-+CONFIG_GPIO_PCA953X=m
-+CONFIG_GPIO_PCA953X_IRQ=y
-+CONFIG_GPIO_ARIZONA=m
-+CONFIG_GPIO_FSM=m
-+CONFIG_GPIO_STMPE=y
-+CONFIG_GPIO_MOCKUP=m
-+CONFIG_W1=m
-+CONFIG_W1_MASTER_DS2490=m
-+CONFIG_W1_MASTER_DS2482=m
-+CONFIG_W1_MASTER_DS1WM=m
-+CONFIG_W1_MASTER_GPIO=m
-+CONFIG_W1_SLAVE_THERM=m
-+CONFIG_W1_SLAVE_SMEM=m
-+CONFIG_W1_SLAVE_DS2408=m
-+CONFIG_W1_SLAVE_DS2413=m
-+CONFIG_W1_SLAVE_DS2406=m
-+CONFIG_W1_SLAVE_DS2423=m
-+CONFIG_W1_SLAVE_DS2431=m
-+CONFIG_W1_SLAVE_DS2433=m
-+CONFIG_W1_SLAVE_DS2780=m
-+CONFIG_W1_SLAVE_DS2781=m
-+CONFIG_W1_SLAVE_DS28E04=m
-+CONFIG_W1_SLAVE_DS28E17=m
-+CONFIG_POWER_RESET_GPIO=y
-+CONFIG_RPI_POE_POWER=m
-+CONFIG_BATTERY_DS2760=m
-+CONFIG_BATTERY_MAX17040=m
-+CONFIG_SENSORS_IIO_HWMON=m
-+CONFIG_SENSORS_LM75=m
-+CONFIG_SENSORS_PWM_FAN=m
-+CONFIG_SENSORS_RASPBERRYPI_HWMON=m
-+CONFIG_SENSORS_SHT21=m
-+CONFIG_SENSORS_SHTC1=m
-+CONFIG_SENSORS_INA2XX=m
-+CONFIG_THERMAL=y
-+CONFIG_BCM2835_THERMAL=y
-+CONFIG_WATCHDOG=y
-+CONFIG_BCM2835_WDT=y
-+CONFIG_MFD_STMPE=y
-+CONFIG_STMPE_SPI=y
-+CONFIG_MFD_ARIZONA_I2C=m
-+CONFIG_MFD_ARIZONA_SPI=m
-+CONFIG_MFD_WM5102=y
-+CONFIG_REGULATOR=y
-+CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m
-+CONFIG_RC_CORE=y
-+CONFIG_LIRC=y
-+CONFIG_BPF_LIRC_MODE2=y
-+CONFIG_RC_DECODERS=y
-+CONFIG_IR_NEC_DECODER=m
-+CONFIG_IR_RC5_DECODER=m
-+CONFIG_IR_RC6_DECODER=m
-+CONFIG_IR_JVC_DECODER=m
-+CONFIG_IR_SONY_DECODER=m
-+CONFIG_IR_SANYO_DECODER=m
-+CONFIG_IR_SHARP_DECODER=m
-+CONFIG_IR_MCE_KBD_DECODER=m
-+CONFIG_IR_XMP_DECODER=m
-+CONFIG_IR_IMON_DECODER=m
-+CONFIG_RC_DEVICES=y
-+CONFIG_RC_ATI_REMOTE=m
-+CONFIG_IR_IMON=m
-+CONFIG_IR_MCEUSB=m
-+CONFIG_IR_REDRAT3=m
-+CONFIG_IR_STREAMZAP=m
-+CONFIG_IR_IGUANA=m
-+CONFIG_IR_TTUSBIR=m
-+CONFIG_RC_LOOPBACK=m
-+CONFIG_IR_GPIO_CIR=m
-+CONFIG_IR_GPIO_TX=m
-+CONFIG_IR_PWM_TX=m
-+CONFIG_MEDIA_CEC_RC=y
-+CONFIG_MEDIA_SUPPORT=m
-+CONFIG_MEDIA_USB_SUPPORT=y
-+CONFIG_USB_VIDEO_CLASS=m
-+CONFIG_USB_PWC=m
-+CONFIG_VIDEO_CPIA2=m
-+CONFIG_USB_ZR364XX=m
-+CONFIG_USB_STKWEBCAM=m
-+CONFIG_USB_S2255=m
-+CONFIG_VIDEO_USBTV=m
-+CONFIG_VIDEO_PVRUSB2=m
-+CONFIG_VIDEO_HDPVR=m
-+CONFIG_VIDEO_STK1160_COMMON=m
-+CONFIG_VIDEO_GO7007=m
-+CONFIG_VIDEO_GO7007_USB=m
-+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
-+CONFIG_VIDEO_AU0828=m
-+CONFIG_DVB_USB_V2=m
-+CONFIG_DVB_USB_AF9035=m
-+CONFIG_DVB_USB_ANYSEE=m
-+CONFIG_DVB_USB_AU6610=m
-+CONFIG_DVB_USB_AZ6007=m
-+CONFIG_DVB_USB_CE6230=m
-+CONFIG_DVB_USB_EC168=m
-+CONFIG_DVB_USB_GL861=m
-+CONFIG_DVB_USB_MXL111SF=m
-+CONFIG_DVB_USB_DVBSKY=m
-+CONFIG_SMS_USB_DRV=m
-+CONFIG_DVB_B2C2_FLEXCOP_USB=m
-+CONFIG_DVB_AS102=m
-+CONFIG_VIDEO_EM28XX=m
-+CONFIG_VIDEO_EM28XX_V4L2=m
-+CONFIG_VIDEO_EM28XX_ALSA=m
-+CONFIG_VIDEO_EM28XX_DVB=m
-+CONFIG_RADIO_SI470X=m
-+CONFIG_USB_SI470X=m
-+CONFIG_I2C_SI470X=m
-+CONFIG_RADIO_SI4713=m
-+CONFIG_I2C_SI4713=m
-+CONFIG_USB_MR800=m
-+CONFIG_USB_DSBR=m
-+CONFIG_RADIO_SHARK=m
-+CONFIG_RADIO_SHARK2=m
-+CONFIG_USB_KEENE=m
-+CONFIG_USB_MA901=m
-+CONFIG_RADIO_TEA5764=m
-+CONFIG_RADIO_SAA7706H=m
-+CONFIG_RADIO_TEF6862=m
-+CONFIG_RADIO_WL1273=m
-+CONFIG_RADIO_WL128X=m
-+CONFIG_V4L_PLATFORM_DRIVERS=y
-+CONFIG_VIDEO_BCM2835_UNICAM=m
-+CONFIG_V4L_TEST_DRIVERS=y
-+CONFIG_VIDEO_VIMC=m
-+CONFIG_VIDEO_VIVID=m
-+CONFIG_VIDEO_VIM2M=m
-+CONFIG_VIDEO_VICODEC=m
-+CONFIG_VIDEO_UDA1342=m
-+CONFIG_VIDEO_SONY_BTF_MPX=m
-+CONFIG_VIDEO_ADV7180=m
-+CONFIG_VIDEO_TC358743=m
-+CONFIG_VIDEO_TVP5150=m
-+CONFIG_VIDEO_TW2804=m
-+CONFIG_VIDEO_TW9903=m
-+CONFIG_VIDEO_TW9906=m
-+CONFIG_VIDEO_IMX219=m
-+CONFIG_VIDEO_IMX290=m
-+CONFIG_VIDEO_IMX477=m
-+CONFIG_VIDEO_OV5647=m
-+CONFIG_VIDEO_OV7251=m
-+CONFIG_VIDEO_OV7640=m
-+CONFIG_VIDEO_OV9281=m
-+CONFIG_VIDEO_IRS1125=m
-+CONFIG_VIDEO_MT9V011=m
-+CONFIG_DRM=m
-+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-+CONFIG_DRM_UDL=m
-+CONFIG_DRM_PANEL_SIMPLE=m
-+CONFIG_DRM_PANEL_JDI_LT070ME05000=m
-+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
-+CONFIG_DRM_DISPLAY_CONNECTOR=m
-+CONFIG_DRM_SIMPLE_BRIDGE=m
-+CONFIG_DRM_TOSHIBA_TC358762=m
-+CONFIG_DRM_VC4=m
-+CONFIG_DRM_VC4_HDMI_CEC=y
-+CONFIG_DRM_GUD=m
-+CONFIG_FB=y
-+CONFIG_FB_BCM2708=y
-+CONFIG_FB_UDL=m
-+CONFIG_FB_SSD1307=m
-+CONFIG_FB_RPISENSE=m
-+CONFIG_BACKLIGHT_RPI=m
-+CONFIG_BACKLIGHT_GPIO=m
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+CONFIG_LOGO=y
-+# CONFIG_LOGO_LINUX_MONO is not set
-+# CONFIG_LOGO_LINUX_VGA16 is not set
-+CONFIG_SOUND=y
-+CONFIG_SND=m
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_HRTIMER=m
-+CONFIG_SND_SEQUENCER=m
-+CONFIG_SND_SEQ_DUMMY=m
-+CONFIG_SND_DUMMY=m
-+CONFIG_SND_ALOOP=m
-+CONFIG_SND_VIRMIDI=m
-+CONFIG_SND_MTPAV=m
-+CONFIG_SND_SERIAL_U16550=m
-+CONFIG_SND_MPU401=m
-+CONFIG_SND_USB_AUDIO=m
-+CONFIG_SND_USB_UA101=m
-+CONFIG_SND_USB_CAIAQ=m
-+CONFIG_SND_USB_CAIAQ_INPUT=y
-+CONFIG_SND_USB_6FIRE=m
-+CONFIG_SND_USB_TONEPORT=m
-+CONFIG_SND_SOC=m
-+CONFIG_SND_BCM2835_SOC_I2S=m
-+CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
-+CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
-+CONFIG_SND_BCM2708_SOC_PIFI_40=m
-+CONFIG_SND_BCM2708_SOC_RPI_DAC=m
-+CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
-+CONFIG_SND_BCM2708_SOC_JUSTBOOM_BOTH=m
-+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m
-+CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m
-+CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m
-+CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m
-+CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m
-+CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m
-+CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m
-+CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m
-+CONFIG_SND_AUDIOINJECTOR_ISOLATED_SOUNDCARD=m
-+CONFIG_SND_AUDIOSENSE_PI=m
-+CONFIG_SND_DIGIDAC1_SOUNDCARD=m
-+CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m
-+CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
-+CONFIG_SND_BCM2708_SOC_ALLO_BOSS2_DAC=m
-+CONFIG_SND_PISOUND=m
-+CONFIG_SND_SOC_AD193X_SPI=m
-+CONFIG_SND_SOC_AD193X_I2C=m
-+CONFIG_SND_SOC_ADAU1701=m
-+CONFIG_SND_SOC_AK4554=m
-+CONFIG_SND_SOC_CS4265=m
-+CONFIG_SND_SOC_ICS43432=m
-+CONFIG_SND_SOC_MA120X0P=m
-+CONFIG_SND_SOC_MAX98357A=m
-+CONFIG_SND_SOC_WM8804_I2C=m
-+CONFIG_SND_SOC_WM8960=m
-+CONFIG_SND_SIMPLE_CARD=m
-+CONFIG_HIDRAW=y
-+CONFIG_UHID=m
-+CONFIG_HID_A4TECH=m
-+CONFIG_HID_ACRUX=m
-+CONFIG_HID_APPLE=m
-+CONFIG_HID_BELKIN=m
-+CONFIG_HID_BETOP_FF=m
-+CONFIG_HID_CHERRY=m
-+CONFIG_HID_CHICONY=m
-+CONFIG_HID_CYPRESS=m
-+CONFIG_HID_DRAGONRISE=m
-+CONFIG_HID_EMS_FF=m
-+CONFIG_HID_ELECOM=m
-+CONFIG_HID_ELO=m
-+CONFIG_HID_EZKEY=m
-+CONFIG_HID_GEMBIRD=m
-+CONFIG_HID_HOLTEK=m
-+CONFIG_HID_KEYTOUCH=m
-+CONFIG_HID_KYE=m
-+CONFIG_HID_UCLOGIC=m
-+CONFIG_HID_WALTOP=m
-+CONFIG_HID_GYRATION=m
-+CONFIG_HID_TWINHAN=m
-+CONFIG_HID_KENSINGTON=m
-+CONFIG_HID_LCPOWER=m
-+CONFIG_HID_LOGITECH=m
-+CONFIG_HID_LOGITECH_DJ=m
-+CONFIG_LOGITECH_FF=y
-+CONFIG_LOGIRUMBLEPAD2_FF=y
-+CONFIG_LOGIG940_FF=y
-+CONFIG_HID_MAGICMOUSE=m
-+CONFIG_HID_MICROSOFT=m
-+CONFIG_HID_MONTEREY=m
-+CONFIG_HID_MULTITOUCH=m
-+CONFIG_HID_NTRIG=m
-+CONFIG_HID_ORTEK=m
-+CONFIG_HID_PANTHERLORD=m
-+CONFIG_HID_PETALYNX=m
-+CONFIG_HID_PICOLCD=m
-+CONFIG_HID_ROCCAT=m
-+CONFIG_HID_SAMSUNG=m
-+CONFIG_HID_SONY=m
-+CONFIG_HID_SPEEDLINK=m
-+CONFIG_HID_STEAM=m
-+CONFIG_HID_SUNPLUS=m
-+CONFIG_HID_GREENASIA=m
-+CONFIG_HID_SMARTJOYPLUS=m
-+CONFIG_HID_TOPSEED=m
-+CONFIG_HID_THINGM=m
-+CONFIG_HID_THRUSTMASTER=m
-+CONFIG_HID_WACOM=m
-+CONFIG_HID_WIIMOTE=m
-+CONFIG_HID_XINMO=m
-+CONFIG_HID_ZEROPLUS=m
-+CONFIG_HID_ZYDACRON=m
-+CONFIG_HID_PID=y
-+CONFIG_USB_HIDDEV=y
-+CONFIG_USB=y
-+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-+CONFIG_USB_MON=m
-+CONFIG_USB_DWCOTG=y
-+CONFIG_USB_PRINTER=m
-+CONFIG_USB_TMC=m
-+CONFIG_USB_STORAGE=y
-+CONFIG_USB_STORAGE_REALTEK=m
-+CONFIG_USB_STORAGE_DATAFAB=m
-+CONFIG_USB_STORAGE_FREECOM=m
-+CONFIG_USB_STORAGE_ISD200=m
-+CONFIG_USB_STORAGE_USBAT=m
-+CONFIG_USB_STORAGE_SDDR09=m
-+CONFIG_USB_STORAGE_SDDR55=m
-+CONFIG_USB_STORAGE_JUMPSHOT=m
-+CONFIG_USB_STORAGE_ALAUDA=m
-+CONFIG_USB_STORAGE_ONETOUCH=m
-+CONFIG_USB_STORAGE_KARMA=m
-+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-+CONFIG_USB_STORAGE_ENE_UB6250=m
-+CONFIG_USB_UAS=m
-+CONFIG_USB_MDC800=m
-+CONFIG_USB_MICROTEK=m
-+CONFIG_USBIP_CORE=m
-+CONFIG_USBIP_VHCI_HCD=m
-+CONFIG_USBIP_HOST=m
-+CONFIG_USB_DWC2=y
-+CONFIG_USB_DWC2_HOST=y
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+CONFIG_USB_SERIAL_CH341=m
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP210X=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_VISOR=m
-+CONFIG_USB_SERIAL_IPAQ=m
-+CONFIG_USB_SERIAL_IR=m
-+CONFIG_USB_SERIAL_EDGEPORT=m
-+CONFIG_USB_SERIAL_EDGEPORT_TI=m
-+CONFIG_USB_SERIAL_F81232=m
-+CONFIG_USB_SERIAL_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=m
-+CONFIG_USB_SERIAL_IUU=m
-+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-+CONFIG_USB_SERIAL_KEYSPAN=m
-+CONFIG_USB_SERIAL_KLSI=m
-+CONFIG_USB_SERIAL_KOBIL_SCT=m
-+CONFIG_USB_SERIAL_MCT_U232=m
-+CONFIG_USB_SERIAL_METRO=m
-+CONFIG_USB_SERIAL_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+CONFIG_USB_SERIAL_OTI6858=m
-+CONFIG_USB_SERIAL_QCAUX=m
-+CONFIG_USB_SERIAL_QUALCOMM=m
-+CONFIG_USB_SERIAL_SPCP8X5=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_SYMBOL=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+CONFIG_USB_SERIAL_OPTICON=m
-+CONFIG_USB_SERIAL_XSENS_MT=m
-+CONFIG_USB_SERIAL_WISHBONE=m
-+CONFIG_USB_SERIAL_SSU100=m
-+CONFIG_USB_SERIAL_QT2=m
-+CONFIG_USB_SERIAL_DEBUG=m
-+CONFIG_USB_EMI62=m
-+CONFIG_USB_EMI26=m
-+CONFIG_USB_ADUTUX=m
-+CONFIG_USB_SEVSEG=m
-+CONFIG_USB_LEGOTOWER=m
-+CONFIG_USB_LCD=m
-+CONFIG_USB_CYPRESS_CY7C63=m
-+CONFIG_USB_CYTHERM=m
-+CONFIG_USB_IDMOUSE=m
-+CONFIG_USB_FTDI_ELAN=m
-+CONFIG_USB_APPLEDISPLAY=m
-+CONFIG_USB_LD=m
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+CONFIG_USB_TEST=m
-+CONFIG_USB_ISIGHTFW=m
-+CONFIG_USB_YUREX=m
-+CONFIG_USB_ATM=m
-+CONFIG_USB_SPEEDTOUCH=m
-+CONFIG_USB_CXACRU=m
-+CONFIG_USB_UEAGLEATM=m
-+CONFIG_USB_XUSBATM=m
-+CONFIG_NOP_USB_XCEIV=y
-+CONFIG_USB_GADGET=y
-+CONFIG_MMC=y
-+CONFIG_MMC_BLOCK_MINORS=32
-+CONFIG_MMC_BCM2835_MMC=y
-+CONFIG_MMC_BCM2835_DMA=y
-+CONFIG_MMC_BCM2835_SDHOST=y
-+CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_PLTFM=y
-+CONFIG_MMC_SDHCI_IPROC=m
-+CONFIG_MMC_SPI=m
-+CONFIG_LEDS_CLASS=y
-+CONFIG_LEDS_PCA9532=m
-+CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_PCA955X=m
-+CONFIG_LEDS_PCA963X=m
-+CONFIG_LEDS_IS31FL32XX=m
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+CONFIG_LEDS_TRIGGER_ONESHOT=y
-+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-+CONFIG_LEDS_TRIGGER_CPU=y
-+CONFIG_LEDS_TRIGGER_GPIO=y
-+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-+CONFIG_LEDS_TRIGGER_TRANSIENT=m
-+CONFIG_LEDS_TRIGGER_CAMERA=m
-+CONFIG_LEDS_TRIGGER_INPUT=y
-+CONFIG_LEDS_TRIGGER_PANIC=y
-+CONFIG_LEDS_TRIGGER_NETDEV=m
-+CONFIG_LEDS_TRIGGER_ACTPWR=y
-+CONFIG_ACCESSIBILITY=y
-+CONFIG_SPEAKUP=m
-+CONFIG_SPEAKUP_SYNTH_SOFT=m
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_DRV_ABX80X=m
-+CONFIG_RTC_DRV_DS1307=m
-+CONFIG_RTC_DRV_DS1374=m
-+CONFIG_RTC_DRV_DS1672=m
-+CONFIG_RTC_DRV_MAX6900=m
-+CONFIG_RTC_DRV_RS5C372=m
-+CONFIG_RTC_DRV_ISL1208=m
-+CONFIG_RTC_DRV_ISL12022=m
-+CONFIG_RTC_DRV_X1205=m
-+CONFIG_RTC_DRV_PCF8523=m
-+CONFIG_RTC_DRV_PCF85063=m
-+CONFIG_RTC_DRV_PCF85363=m
-+CONFIG_RTC_DRV_PCF8563=m
-+CONFIG_RTC_DRV_PCF8583=m
-+CONFIG_RTC_DRV_M41T80=m
-+CONFIG_RTC_DRV_BQ32K=m
-+CONFIG_RTC_DRV_S35390A=m
-+CONFIG_RTC_DRV_FM3130=m
-+CONFIG_RTC_DRV_RX8581=m
-+CONFIG_RTC_DRV_RX8025=m
-+CONFIG_RTC_DRV_EM3027=m
-+CONFIG_RTC_DRV_RV3028=m
-+CONFIG_RTC_DRV_SD3078=m
-+CONFIG_RTC_DRV_M41T93=m
-+CONFIG_RTC_DRV_M41T94=m
-+CONFIG_RTC_DRV_DS1302=m
-+CONFIG_RTC_DRV_DS1305=m
-+CONFIG_RTC_DRV_DS1390=m
-+CONFIG_RTC_DRV_R9701=m
-+CONFIG_RTC_DRV_RX4581=m
-+CONFIG_RTC_DRV_RS5C348=m
-+CONFIG_RTC_DRV_MAX6902=m
-+CONFIG_RTC_DRV_PCF2123=m
-+CONFIG_RTC_DRV_DS3232=m
-+CONFIG_RTC_DRV_PCF2127=m
-+CONFIG_RTC_DRV_RV3029C2=m
-+CONFIG_DMADEVICES=y
-+CONFIG_DMA_BCM2835=y
-+CONFIG_DMA_BCM2708=y
-+CONFIG_DMABUF_HEAPS=y
-+CONFIG_DMABUF_HEAPS_SYSTEM=y
-+CONFIG_DMABUF_HEAPS_CMA=y
-+CONFIG_UIO=m
-+CONFIG_UIO_PDRV_GENIRQ=m
-+CONFIG_STAGING=y
-+CONFIG_PRISM2_USB=m
-+CONFIG_R8712U=m
-+CONFIG_R8188EU=m
-+CONFIG_VT6656=m
-+CONFIG_STAGING_MEDIA=y
-+CONFIG_ASHMEM=y
-+CONFIG_FB_TFT=m
-+CONFIG_FB_TFT_AGM1264K_FL=m
-+CONFIG_FB_TFT_BD663474=m
-+CONFIG_FB_TFT_HX8340BN=m
-+CONFIG_FB_TFT_HX8347D=m
-+CONFIG_FB_TFT_HX8353D=m
-+CONFIG_FB_TFT_HX8357D=m
-+CONFIG_FB_TFT_ILI9163=m
-+CONFIG_FB_TFT_ILI9320=m
-+CONFIG_FB_TFT_ILI9325=m
-+CONFIG_FB_TFT_ILI9340=m
-+CONFIG_FB_TFT_ILI9341=m
-+CONFIG_FB_TFT_ILI9481=m
-+CONFIG_FB_TFT_ILI9486=m
-+CONFIG_FB_TFT_PCD8544=m
-+CONFIG_FB_TFT_RA8875=m
-+CONFIG_FB_TFT_S6D02A1=m
-+CONFIG_FB_TFT_S6D1121=m
-+CONFIG_FB_TFT_SH1106=m
-+CONFIG_FB_TFT_SSD1289=m
-+CONFIG_FB_TFT_SSD1306=m
-+CONFIG_FB_TFT_SSD1331=m
-+CONFIG_FB_TFT_SSD1351=m
-+CONFIG_FB_TFT_ST7735R=m
-+CONFIG_FB_TFT_TINYLCD=m
-+CONFIG_FB_TFT_TLS8204=m
-+CONFIG_FB_TFT_UC1701=m
-+CONFIG_FB_TFT_UPD161704=m
-+CONFIG_FB_TFT_WATTEROTT=m
-+CONFIG_BCM2835_VCHIQ=y
-+CONFIG_SND_BCM2835=m
-+CONFIG_VIDEO_BCM2835=m
-+CONFIG_VIDEO_CODEC_BCM2835=m
-+CONFIG_VIDEO_ISP_BCM2835=m
-+CONFIG_CLK_RASPBERRYPI=y
-+CONFIG_MAILBOX=y
-+CONFIG_BCM2835_MBOX=y
-+# CONFIG_IOMMU_SUPPORT is not set
-+CONFIG_RASPBERRYPI_POWER=y
-+CONFIG_IIO=m
-+CONFIG_IIO_BUFFER_CB=m
-+CONFIG_MCP320X=m
-+CONFIG_MCP3422=m
-+CONFIG_BME680=m
-+CONFIG_CCS811=m
-+CONFIG_SENSIRION_SGP30=m
-+CONFIG_SPS30_I2C=m
-+CONFIG_DHT11=m
-+CONFIG_HTU21=m
-+CONFIG_APDS9960=m
-+CONFIG_BH1750=m
-+CONFIG_MAXIM_THERMOCOUPLE=m
-+CONFIG_MAX31856=m
-+CONFIG_PWM_BCM2835=m
-+CONFIG_PWM_PCA9685=m
-+CONFIG_PWM_RASPBERRYPI_POE=m
-+CONFIG_ANDROID=y
-+CONFIG_ANDROID_BINDER_IPC=y
-+CONFIG_ANDROID_BINDERFS=y
-+CONFIG_EXT4_FS=y
-+CONFIG_EXT4_FS_POSIX_ACL=y
-+CONFIG_EXT4_FS_SECURITY=y
-+CONFIG_REISERFS_FS=m
-+CONFIG_REISERFS_FS_XATTR=y
-+CONFIG_REISERFS_FS_POSIX_ACL=y
-+CONFIG_REISERFS_FS_SECURITY=y
-+CONFIG_JFS_FS=m
-+CONFIG_JFS_POSIX_ACL=y
-+CONFIG_JFS_SECURITY=y
-+CONFIG_JFS_STATISTICS=y
-+CONFIG_XFS_FS=m
-+CONFIG_XFS_QUOTA=y
-+CONFIG_XFS_POSIX_ACL=y
-+CONFIG_XFS_RT=y
-+CONFIG_GFS2_FS=m
-+CONFIG_OCFS2_FS=m
-+CONFIG_BTRFS_FS=m
-+CONFIG_BTRFS_FS_POSIX_ACL=y
-+CONFIG_NILFS2_FS=m
-+CONFIG_F2FS_FS=y
-+CONFIG_FS_ENCRYPTION=y
-+CONFIG_FANOTIFY=y
-+CONFIG_QFMT_V1=m
-+CONFIG_QFMT_V2=m
-+CONFIG_AUTOFS4_FS=y
-+CONFIG_FUSE_FS=m
-+CONFIG_CUSE=m
-+CONFIG_OVERLAY_FS=m
-+CONFIG_FSCACHE=y
-+CONFIG_FSCACHE_STATS=y
-+CONFIG_CACHEFILES=y
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+CONFIG_ZISOFS=y
-+CONFIG_UDF_FS=m
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
-+CONFIG_EXFAT_FS=m
-+CONFIG_NTFS_FS=m
-+CONFIG_NTFS_RW=y
-+CONFIG_TMPFS=y
-+CONFIG_TMPFS_POSIX_ACL=y
-+CONFIG_ECRYPT_FS=m
-+CONFIG_HFS_FS=m
-+CONFIG_HFSPLUS_FS=m
-+CONFIG_JFFS2_FS=m
-+CONFIG_JFFS2_SUMMARY=y
-+CONFIG_UBIFS_FS=m
-+CONFIG_SQUASHFS=m
-+CONFIG_SQUASHFS_XATTR=y
-+CONFIG_SQUASHFS_LZO=y
-+CONFIG_SQUASHFS_XZ=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3_ACL=y
-+CONFIG_NFS_V4=y
-+CONFIG_NFS_SWAP=y
-+CONFIG_NFS_V4_1=y
-+CONFIG_NFS_V4_2=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_NFS_FSCACHE=y
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V3_ACL=y
-+CONFIG_NFSD_V4=y
-+CONFIG_CIFS=m
-+CONFIG_CIFS_UPCALL=y
-+CONFIG_CIFS_XATTR=y
-+CONFIG_CIFS_DFS_UPCALL=y
-+CONFIG_CIFS_FSCACHE=y
-+CONFIG_9P_FS=m
-+CONFIG_9P_FS_POSIX_ACL=y
-+CONFIG_NLS_DEFAULT="utf8"
-+CONFIG_NLS_CODEPAGE_437=y
-+CONFIG_NLS_CODEPAGE_737=m
-+CONFIG_NLS_CODEPAGE_775=m
-+CONFIG_NLS_CODEPAGE_850=m
-+CONFIG_NLS_CODEPAGE_852=m
-+CONFIG_NLS_CODEPAGE_855=m
-+CONFIG_NLS_CODEPAGE_857=m
-+CONFIG_NLS_CODEPAGE_860=m
-+CONFIG_NLS_CODEPAGE_861=m
-+CONFIG_NLS_CODEPAGE_862=m
-+CONFIG_NLS_CODEPAGE_863=m
-+CONFIG_NLS_CODEPAGE_864=m
-+CONFIG_NLS_CODEPAGE_865=m
-+CONFIG_NLS_CODEPAGE_866=m
-+CONFIG_NLS_CODEPAGE_869=m
-+CONFIG_NLS_CODEPAGE_936=m
-+CONFIG_NLS_CODEPAGE_950=m
-+CONFIG_NLS_CODEPAGE_932=m
-+CONFIG_NLS_CODEPAGE_949=m
-+CONFIG_NLS_CODEPAGE_874=m
-+CONFIG_NLS_ISO8859_8=m
-+CONFIG_NLS_CODEPAGE_1250=m
-+CONFIG_NLS_CODEPAGE_1251=m
-+CONFIG_NLS_ASCII=y
-+CONFIG_NLS_ISO8859_1=m
-+CONFIG_NLS_ISO8859_2=m
-+CONFIG_NLS_ISO8859_3=m
-+CONFIG_NLS_ISO8859_4=m
-+CONFIG_NLS_ISO8859_5=m
-+CONFIG_NLS_ISO8859_6=m
-+CONFIG_NLS_ISO8859_7=m
-+CONFIG_NLS_ISO8859_9=m
-+CONFIG_NLS_ISO8859_13=m
-+CONFIG_NLS_ISO8859_14=m
-+CONFIG_NLS_ISO8859_15=m
-+CONFIG_NLS_KOI8_R=m
-+CONFIG_NLS_KOI8_U=m
-+CONFIG_DLM=m
-+CONFIG_SECURITY=y
-+CONFIG_SECURITY_APPARMOR=y
-+CONFIG_LSM=""
-+CONFIG_CRYPTO_USER=m
-+CONFIG_CRYPTO_CHACHA20POLY1305=m
-+CONFIG_CRYPTO_ADIANTUM=m
-+CONFIG_CRYPTO_XCBC=m
-+CONFIG_CRYPTO_WP512=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_LZ4=m
-+CONFIG_CRYPTO_USER_API_HASH=m
-+CONFIG_CRYPTO_USER_API_SKCIPHER=m
-+CONFIG_CRYPTO_USER_API_RNG=m
-+CONFIG_CRYPTO_USER_API_AEAD=m
-+CONFIG_CRC_ITU_T=y
-+CONFIG_LIBCRC32C=y
-+CONFIG_DMA_CMA=y
-+CONFIG_CMA_SIZE_MBYTES=5
-+CONFIG_PRINTK_TIME=y
-+CONFIG_BOOT_PRINTK_DELAY=y
-+CONFIG_KGDB=y
-+CONFIG_KGDB_KDB=y
-+CONFIG_KDB_KEYBOARD=y
-+CONFIG_DEBUG_MEMORY_INIT=y
-+CONFIG_DETECT_HUNG_TASK=y
-+CONFIG_LATENCYTOP=y
-+CONFIG_FUNCTION_PROFILER=y
-+CONFIG_STACK_TRACER=y
-+CONFIG_IRQSOFF_TRACER=y
-+CONFIG_SCHED_TRACER=y
-+CONFIG_BLK_DEV_IO_TRACE=y
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0249-brcmfmac-BCM43436-needs-dedicated-firmware.patch b/root/target/linux/bcm27xx/patches-5.15/0249-brcmfmac-BCM43436-needs-dedicated-firmware.patch
deleted file mode 100644
index 84e60164..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0249-brcmfmac-BCM43436-needs-dedicated-firmware.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d22b60b8219dae5e68c94902b288ebe541c07e73 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 19 May 2020 09:46:12 +0100
-Subject: [PATCH 249/634] brcmfmac: BCM43436 needs dedicated firmware
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-index 14b2cdafe378..60f4e689ef14 100644
---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-@@ -616,6 +616,7 @@ BRCMF_FW_DEF(4335, "brcmfmac4335-sdio");
- BRCMF_FW_DEF(43362, "brcmfmac43362-sdio");
- BRCMF_FW_DEF(4339, "brcmfmac4339-sdio");
- BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio");
-+BRCMF_FW_DEF(43436, "brcmfmac43436-sdio");
- /* Note the names are not postfixed with a1 for backward compatibility */
- BRCMF_FW_CLM_DEF(43430A1, "brcmfmac43430-sdio");
- BRCMF_FW_DEF(43430B0, "brcmfmac43430b0-sdio");
-@@ -650,6 +651,8 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
- 	BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),
- 	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0),
- 	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000002, 43430A1),
-+	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000004, 43436),
-+	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFA, 43430A1),
- 	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFC, 43430B0),
- 	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0x00000200, 43456),
- 	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455),
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0340-drm-atomic-Pass-the-full-state-to-CRTC-atomic-enable.patch b/root/target/linux/bcm27xx/patches-5.15/0340-drm-atomic-Pass-the-full-state-to-CRTC-atomic-enable.patch
deleted file mode 100644
index 9211174e..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0340-drm-atomic-Pass-the-full-state-to-CRTC-atomic-enable.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From 85e00aae3a83bd2141aa251648f6e0a7416097b0 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 8 Oct 2020 14:44:08 +0200
-Subject: [PATCH 340/634] drm/atomic: Pass the full state to CRTC atomic
- enable/disable
-
-Commit 351f950db4ab28c321a1bd4b92e4bb03e34c4703 upstream.
-
-If the CRTC driver ever needs to access the full DRM state, it can't do so
-at atomic_enable / atomic_disable time since drm_atomic_helper_swap_state
-will have cleared the pointer from the struct drm_crtc_state to the struct
-drm_atomic_state before calling those hooks.
-
-In order to allow that, let's pass the full DRM state to atomic_enable and
-atomic_disable. The conversion was done using the coccinelle script below,
-built tested on all the drivers and actually tested on vc4.
-
-virtual report
-
-@@
-struct drm_crtc_helper_funcs *FUNCS;
-identifier dev, state;
-identifier crtc, crtc_state;
-@@
-
- disable_outputs(struct drm_device *dev, struct drm_atomic_state *state)
- {
- 	<...
--	FUNCS->atomic_disable(crtc, crtc_state);
-+	FUNCS->atomic_disable(crtc, state);
- 	...>
- }
-
-@@
-struct drm_crtc_helper_funcs *FUNCS;
-identifier dev, state;
-identifier crtc, crtc_state;
-@@
-
- drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, struct drm_atomic_state *state)
- {
- 	<...
--	FUNCS->atomic_enable(crtc, crtc_state);
-+	FUNCS->atomic_enable(crtc, state);
- 	...>
- }
-
-@@
-identifier crtc, old_state;
-@@
-
- struct drm_crtc_helper_funcs {
-	...
--	void (*atomic_enable)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
-+	void (*atomic_enable)(struct drm_crtc *crtc, struct drm_atomic_state *state);
-	...
--	void (*atomic_disable)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
-+	void (*atomic_disable)(struct drm_crtc *crtc, struct drm_atomic_state *state);
-	...
-}
-
-@ crtc_atomic_func @
-identifier helpers;
-identifier func;
-@@
-
-(
-static struct drm_crtc_helper_funcs helpers = {
-	...,
-	.atomic_enable = func,
-	...,
-};
-|
-static struct drm_crtc_helper_funcs helpers = {
-	...,
-	.atomic_disable = func,
-	...,
-};
-)
-
-@ ignores_old_state @
-identifier crtc_atomic_func.func;
-identifier crtc, old_state;
-@@
-
-void func(struct drm_crtc *crtc,
-		struct drm_crtc_state *old_state)
-{
-	... when != old_state
-}
-
-@ adds_old_state depends on crtc_atomic_func && !ignores_old_state @
-identifier crtc_atomic_func.func;
-identifier crtc, old_state;
-@@
-
-void func(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
-{
-+	struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc);
-	...
-}
-
-@ depends on crtc_atomic_func @
-identifier crtc_atomic_func.func;
-expression E;
-type T;
-@@
-
-void func(...)
-{
-	...
--	T state = E;
-+	T crtc_state = E;
-	<+...
--	state
-+	crtc_state
-	...+>
-
-}
-
-@ depends on crtc_atomic_func @
-identifier crtc_atomic_func.func;
-type T;
-@@
-
-void func(...)
-{
-	...
--	T state;
-+	T crtc_state;
-	<+...
--	state
-+	crtc_state
-	...+>
-
-}
-
-@ depends on crtc_atomic_func @
-identifier crtc_atomic_func.func;
-identifier old_state;
-identifier crtc;
-@@
-
-void func(struct drm_crtc *crtc,
--	       struct drm_crtc_state *old_state
-+	       struct drm_atomic_state *state
-	       )
-		{ ... }
-
-@ include depends on adds_old_state @
-@@
-
- #include <drm/drm_atomic.h>
-
-@ no_include depends on !include && adds_old_state @
-@@
-
-+ #include <drm/drm_atomic.h>
-  #include <drm/...>
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
-Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-Link: https://patchwork.freedesktop.org/patch/msgid/845aa10ef171fc0ea060495efef142a0c13f7870.1602161031.git-series.maxime@cerno.tech
----
- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
-index 768012243b44..eff9dc6029c2 100644
---- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
-+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
-@@ -797,6 +797,8 @@ static void dpu_crtc_disable(struct drm_crtc *crtc,
- 									      crtc);
- 	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
- 	struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc->state);
-+	struct drm_crtc_state *old_crtc_state = drm_atomic_get_old_crtc_state(state,
-+									      crtc);
- 	struct drm_encoder *encoder;
- 	unsigned long flags;
- 	bool release_bandwidth = false;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0480-SQUASH-fbmem-Use-fallthrough-keyword.patch b/root/target/linux/bcm27xx/patches-5.15/0480-SQUASH-fbmem-Use-fallthrough-keyword.patch
deleted file mode 100644
index 4046ea07..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0480-SQUASH-fbmem-Use-fallthrough-keyword.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d2f01c176f70c7047340748ecab0ba3a92ab8060 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 27 Jul 2021 09:24:20 +0100
-Subject: [PATCH 480/634] SQUASH: fbmem: Use fallthrough keyword
-
-Avoid a compiler warning by using the "fallthrough" pseudo-keyword in
-place of the old "/* fall through */" comment convention.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/video/fbdev/core/fbmem.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
-index f9b620f6a074..13f3eca3049a 100644
---- a/drivers/video/fbdev/core/fbmem.c
-+++ b/drivers/video/fbdev/core/fbmem.c
-@@ -1201,7 +1201,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
- 			ret = fb_copyarea_user(info, &copy);
- 			break;
- 		}
--		/* fall through */
-+		fallthrough;
- 	default:
- 		lock_fb_info(info);
- 		fb = info->fbops;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0514-regulator-rpi-panel-Handle-I2C-errors-timing-to-the-.patch b/root/target/linux/bcm27xx/patches-5.15/0514-regulator-rpi-panel-Handle-I2C-errors-timing-to-the-.patch
deleted file mode 100644
index fd80880d..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0514-regulator-rpi-panel-Handle-I2C-errors-timing-to-the-.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 181abe23b615d7629365d94a2e956ca7e0e1fdc8 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 8 Sep 2021 14:56:03 +0100
-Subject: [PATCH 514/634] regulator: rpi-panel: Handle I2C errors/timing to the
- Atmel
-
-The Atmel is doing some things in the I2C ISR, during which
-period it will not respond to further commands. This is
-particularly true of the POWERON command.
-
-Increase delays appropriately, and retry should I2C errors be
-reported.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../regulator/rpi-panel-attiny-regulator.c    | 56 +++++++++++++++----
- 1 file changed, 46 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/regulator/rpi-panel-attiny-regulator.c b/drivers/regulator/rpi-panel-attiny-regulator.c
-index 370b9ae363dd..00fb69efcfa2 100644
---- a/drivers/regulator/rpi-panel-attiny-regulator.c
-+++ b/drivers/regulator/rpi-panel-attiny-regulator.c
-@@ -37,11 +37,24 @@ static const struct regmap_config attiny_regmap_config = {
- static int attiny_lcd_power_enable(struct regulator_dev *rdev)
- {
- 	unsigned int data;
-+	int ret, i;
- 
- 	regmap_write(rdev->regmap, REG_POWERON, 1);
-+	msleep(80);
-+
- 	/* Wait for nPWRDWN to go low to indicate poweron is done. */
--	regmap_read_poll_timeout(rdev->regmap, REG_PORTB, data,
--					data & BIT(0), 10, 1000000);
-+	for (i = 0; i < 20; i++) {
-+		ret = regmap_read(rdev->regmap, REG_PORTB, &data);
-+		if (!ret) {
-+			if (data & BIT(0))
-+				break;
-+		}
-+		usleep_range(10000, 12000);
-+	}
-+	usleep_range(10000, 12000);
-+
-+	if (ret)
-+		pr_err("%s: regmap_read_poll_timeout failed %d\n", __func__, ret);
- 
- 	/* Default to the same orientation as the closed source
- 	 * firmware used for the panel.  Runtime rotation
-@@ -57,23 +70,34 @@ static int attiny_lcd_power_disable(struct regulator_dev *rdev)
- {
- 	regmap_write(rdev->regmap, REG_PWM, 0);
- 	regmap_write(rdev->regmap, REG_POWERON, 0);
--	udelay(1);
-+	msleep(30);
- 	return 0;
- }
- 
- static int attiny_lcd_power_is_enabled(struct regulator_dev *rdev)
- {
- 	unsigned int data;
--	int ret;
-+	int ret, i;
- 
--	ret = regmap_read(rdev->regmap, REG_POWERON, &data);
-+	for (i = 0; i < 10; i++) {
-+		ret = regmap_read(rdev->regmap, REG_POWERON, &data);
-+		if (!ret)
-+			break;
-+		usleep_range(10000, 12000);
-+	}
- 	if (ret < 0)
- 		return ret;
- 
- 	if (!(data & BIT(0)))
- 		return 0;
- 
--	ret = regmap_read(rdev->regmap, REG_PORTB, &data);
-+	for (i = 0; i < 10; i++) {
-+		ret = regmap_read(rdev->regmap, REG_PORTB, &data);
-+		if (!ret)
-+			break;
-+		usleep_range(10000, 12000);
-+	}
-+
- 	if (ret < 0)
- 		return ret;
- 
-@@ -103,20 +127,32 @@ static int attiny_update_status(struct backlight_device *bl)
- {
- 	struct regmap *regmap = bl_get_data(bl);
- 	int brightness = bl->props.brightness;
-+	int ret, i;
- 
- 	if (bl->props.power != FB_BLANK_UNBLANK ||
- 	    bl->props.fb_blank != FB_BLANK_UNBLANK)
- 		brightness = 0;
- 
--	return regmap_write(regmap, REG_PWM, brightness);
-+	for (i = 0; i < 10; i++) {
-+		ret = regmap_write(regmap, REG_PWM, brightness);
-+		if (!ret)
-+			break;
-+	}
-+
-+	return ret;
- }
- 
- static int attiny_get_brightness(struct backlight_device *bl)
- {
- 	struct regmap *regmap = bl_get_data(bl);
--	int ret, brightness;
-+	int ret, brightness, i;
-+
-+	for (i = 0; i < 10; i++) {
-+		ret = regmap_read(regmap, REG_PWM, &brightness);
-+		if (!ret)
-+			break;
-+	}
- 
--	ret = regmap_read(regmap, REG_PWM, &brightness);
- 	if (ret)
- 		return ret;
- 
-@@ -166,7 +202,7 @@ static int attiny_i2c_probe(struct i2c_client *i2c,
- 	}
- 
- 	regmap_write(regmap, REG_POWERON, 0);
--	mdelay(1);
-+	msleep(30);
- 
- 	config.dev = &i2c->dev;
- 	config.regmap = regmap;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0531-configs-Add-CAN_PEAK_USB-m.patch b/root/target/linux/bcm27xx/patches-5.15/0531-configs-Add-CAN_PEAK_USB-m.patch
deleted file mode 100644
index 972e6703..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0531-configs-Add-CAN_PEAK_USB-m.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 55ca80e8dec9113305389535bdae3c7495e1c460 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 17 Sep 2021 15:18:51 +0100
-Subject: [PATCH 531/634] configs: Add CAN_PEAK_USB=m
-
-Add the driver for the PEAK Systems USB CAN interface.
-
-See: https://github.com/raspberrypi/linux/issues/4583
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/configs/bcm2709_defconfig   | 1 +
- arch/arm/configs/bcm2711_defconfig   | 1 +
- arch/arm/configs/bcmrpi_defconfig    | 1 +
- arch/arm64/configs/bcm2711_defconfig | 1 +
- arch/arm64/configs/bcmrpi3_defconfig | 1 +
- 5 files changed, 5 insertions(+)
-
-diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index c791261d7827..bbb951e55b19 100644
---- a/arch/arm/configs/bcm2709_defconfig
-+++ b/arch/arm/configs/bcm2709_defconfig
-@@ -415,6 +415,7 @@ CONFIG_CAN_MCP251X=m
- CONFIG_CAN_MCP251XFD=m
- CONFIG_CAN_EMS_USB=m
- CONFIG_CAN_GS_USB=m
-+CONFIG_CAN_PEAK_USB=m
- CONFIG_BT=m
- CONFIG_BT_RFCOMM=m
- CONFIG_BT_RFCOMM_TTY=y
-diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 219f2ac0bbee..89d4845f708f 100644
---- a/arch/arm/configs/bcm2711_defconfig
-+++ b/arch/arm/configs/bcm2711_defconfig
-@@ -416,6 +416,7 @@ CONFIG_CAN_MCP251X=m
- CONFIG_CAN_MCP251XFD=m
- CONFIG_CAN_EMS_USB=m
- CONFIG_CAN_GS_USB=m
-+CONFIG_CAN_PEAK_USB=m
- CONFIG_BT=m
- CONFIG_BT_RFCOMM=m
- CONFIG_BT_RFCOMM_TTY=y
-diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 18540a4f9cd7..7804862696c1 100644
---- a/arch/arm/configs/bcmrpi_defconfig
-+++ b/arch/arm/configs/bcmrpi_defconfig
-@@ -409,6 +409,7 @@ CONFIG_CAN_MCP251X=m
- CONFIG_CAN_MCP251XFD=m
- CONFIG_CAN_EMS_USB=m
- CONFIG_CAN_GS_USB=m
-+CONFIG_CAN_PEAK_USB=m
- CONFIG_BT=m
- CONFIG_BT_RFCOMM=m
- CONFIG_BT_RFCOMM_TTY=y
-diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index bab586713394..989aefe7a389 100644
---- a/arch/arm64/configs/bcm2711_defconfig
-+++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -415,6 +415,7 @@ CONFIG_CAN_MCP251X=m
- CONFIG_CAN_MCP251XFD=m
- CONFIG_CAN_EMS_USB=m
- CONFIG_CAN_GS_USB=m
-+CONFIG_CAN_PEAK_USB=m
- CONFIG_BT=m
- CONFIG_BT_RFCOMM=m
- CONFIG_BT_RFCOMM_TTY=y
-diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 235fecf9c903..6af6d68a8f38 100644
---- a/arch/arm64/configs/bcmrpi3_defconfig
-+++ b/arch/arm64/configs/bcmrpi3_defconfig
-@@ -408,6 +408,7 @@ CONFIG_CAN_VCAN=m
- CONFIG_CAN_MCP251X=m
- CONFIG_CAN_MCP251XFD=m
- CONFIG_CAN_EMS_USB=m
-+CONFIG_CAN_PEAK_USB=m
- CONFIG_BT=m
- CONFIG_BT_RFCOMM=m
- CONFIG_BT_RFCOMM_TTY=y
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0557-configs-Add-CONFIG_VIDEO_IMX519-m.patch b/root/target/linux/bcm27xx/patches-5.15/0557-configs-Add-CONFIG_VIDEO_IMX519-m.patch
deleted file mode 100644
index 8b4c2700..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0557-configs-Add-CONFIG_VIDEO_IMX519-m.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 114b83f158635171f718e86c1e1d48061a72e144 Mon Sep 17 00:00:00 2001
-From: Lee Jackson <info@arducam.com>
-Date: Thu, 26 Aug 2021 11:15:26 +0800
-Subject: [PATCH 557/634] configs: Add CONFIG_VIDEO_IMX519=m
-
-Include the driver module for the IMX519.
-
-Signed-off-by: Lee Jackson <info@arducam.com>
----
- arch/arm/configs/bcm2709_defconfig   | 1 +
- arch/arm/configs/bcm2711_defconfig   | 1 +
- arch/arm/configs/bcmrpi_defconfig    | 1 +
- arch/arm64/configs/bcm2711_defconfig | 1 +
- arch/arm64/configs/bcmrpi3_defconfig | 1 +
- 5 files changed, 5 insertions(+)
-
-diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index bbb951e55b19..39a79c6a0b52 100644
---- a/arch/arm/configs/bcm2709_defconfig
-+++ b/arch/arm/configs/bcm2709_defconfig
-@@ -868,6 +868,7 @@ CONFIG_VIDEO_TW9906=m
- CONFIG_VIDEO_IMX219=m
- CONFIG_VIDEO_IMX290=m
- CONFIG_VIDEO_IMX477=m
-+CONFIG_VIDEO_IMX519=m
- CONFIG_VIDEO_OV5647=m
- CONFIG_VIDEO_OV7251=m
- CONFIG_VIDEO_OV7640=m
-diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 89d4845f708f..2db662527444 100644
---- a/arch/arm/configs/bcm2711_defconfig
-+++ b/arch/arm/configs/bcm2711_defconfig
-@@ -882,6 +882,7 @@ CONFIG_VIDEO_TW9906=m
- CONFIG_VIDEO_IMX219=m
- CONFIG_VIDEO_IMX290=m
- CONFIG_VIDEO_IMX477=m
-+CONFIG_VIDEO_IMX519=m
- CONFIG_VIDEO_OV5647=m
- CONFIG_VIDEO_OV7251=m
- CONFIG_VIDEO_OV7640=m
-diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 7804862696c1..2f64a60e1e63 100644
---- a/arch/arm/configs/bcmrpi_defconfig
-+++ b/arch/arm/configs/bcmrpi_defconfig
-@@ -861,6 +861,7 @@ CONFIG_VIDEO_TW9906=m
- CONFIG_VIDEO_IMX219=m
- CONFIG_VIDEO_IMX290=m
- CONFIG_VIDEO_IMX477=m
-+CONFIG_VIDEO_IMX519=m
- CONFIG_VIDEO_OV5647=m
- CONFIG_VIDEO_OV7251=m
- CONFIG_VIDEO_OV7640=m
-diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 989aefe7a389..d1966d92664b 100644
---- a/arch/arm64/configs/bcm2711_defconfig
-+++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -885,6 +885,7 @@ CONFIG_VIDEO_TW9906=m
- CONFIG_VIDEO_IMX219=m
- CONFIG_VIDEO_IMX290=m
- CONFIG_VIDEO_IMX477=m
-+CONFIG_VIDEO_IMX519=m
- CONFIG_VIDEO_OV5647=m
- CONFIG_VIDEO_OV7251=m
- CONFIG_VIDEO_OV7640=m
-diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 6af6d68a8f38..6b0ca5314ab3 100644
---- a/arch/arm64/configs/bcmrpi3_defconfig
-+++ b/arch/arm64/configs/bcmrpi3_defconfig
-@@ -807,6 +807,7 @@ CONFIG_VIDEO_TW9906=m
- CONFIG_VIDEO_IMX219=m
- CONFIG_VIDEO_IMX290=m
- CONFIG_VIDEO_IMX477=m
-+CONFIG_VIDEO_IMX519=m
- CONFIG_VIDEO_OV5647=m
- CONFIG_VIDEO_OV7251=m
- CONFIG_VIDEO_OV7640=m
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0563-Add-module-for-8111h-chip-used-in-various-CM4-boards.patch b/root/target/linux/bcm27xx/patches-5.15/0563-Add-module-for-8111h-chip-used-in-various-CM4-boards.patch
deleted file mode 100644
index 0ad765fc..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0563-Add-module-for-8111h-chip-used-in-various-CM4-boards.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3b480e2bf556dc77cb25d5fb2d3f7b203d3d6e37 Mon Sep 17 00:00:00 2001
-From: Sten Spans <sten@sp5.nl>
-Date: Tue, 12 Oct 2021 20:10:00 +0200
-Subject: [PATCH 563/634] Add module for 8111h chip used in various CM4 boards
-
----
- arch/arm/configs/bcm2711_defconfig   | 1 +
- arch/arm64/configs/bcm2711_defconfig | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 2db662527444..c1d7afb36a2e 100644
---- a/arch/arm/configs/bcm2711_defconfig
-+++ b/arch/arm/configs/bcm2711_defconfig
-@@ -509,6 +509,7 @@ CONFIG_BCMGENET=y
- CONFIG_ENC28J60=m
- CONFIG_QCA7000_SPI=m
- CONFIG_QCA7000_UART=m
-+CONFIG_R8169=m
- CONFIG_WIZNET_W5100=m
- CONFIG_WIZNET_W5100_SPI=m
- CONFIG_MICREL_PHY=y
-diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index d1966d92664b..234e68865bff 100644
---- a/arch/arm64/configs/bcm2711_defconfig
-+++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -506,6 +506,7 @@ CONFIG_BCMGENET=y
- CONFIG_ENC28J60=m
- CONFIG_QCA7000_SPI=m
- CONFIG_QCA7000_UART=m
-+CONFIG_R8169=m
- CONFIG_WIZNET_W5100=m
- CONFIG_WIZNET_W5100_SPI=m
- CONFIG_MICREL_PHY=y
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0570-config-Enable-FSFS_FS_SECURITY.patch b/root/target/linux/bcm27xx/patches-5.15/0570-config-Enable-FSFS_FS_SECURITY.patch
deleted file mode 100644
index 35566ab6..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0570-config-Enable-FSFS_FS_SECURITY.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 0c4c7f1f2321ec48fc1c67da167907a861d48774 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 18 Oct 2021 16:39:11 +0100
-Subject: [PATCH 570/634] config: Enable FSFS_FS_SECURITY
-
-Add a negligible amount of core kernel code for capability-based
-access control on F2FS.
-
-See: https://github.com/raspberrypi/linux/issues/2778
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/configs/bcm2709_defconfig   | 1 +
- arch/arm/configs/bcm2711_defconfig   | 1 +
- arch/arm/configs/bcmrpi_defconfig    | 1 +
- arch/arm64/configs/bcm2711_defconfig | 1 +
- arch/arm64/configs/bcmrpi3_defconfig | 1 +
- 5 files changed, 5 insertions(+)
-
-diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 39a79c6a0b52..77553d32412e 100644
---- a/arch/arm/configs/bcm2709_defconfig
-+++ b/arch/arm/configs/bcm2709_defconfig
-@@ -1320,6 +1320,7 @@ CONFIG_BTRFS_FS=m
- CONFIG_BTRFS_FS_POSIX_ACL=y
- CONFIG_NILFS2_FS=m
- CONFIG_F2FS_FS=y
-+CONFIG_F2FS_FS_SECURITY=y
- CONFIG_FS_ENCRYPTION=y
- CONFIG_FANOTIFY=y
- CONFIG_QFMT_V1=m
-diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index c1d7afb36a2e..a15b3e0a02f6 100644
---- a/arch/arm/configs/bcm2711_defconfig
-+++ b/arch/arm/configs/bcm2711_defconfig
-@@ -1359,6 +1359,7 @@ CONFIG_BTRFS_FS=m
- CONFIG_BTRFS_FS_POSIX_ACL=y
- CONFIG_NILFS2_FS=m
- CONFIG_F2FS_FS=y
-+CONFIG_F2FS_FS_SECURITY=y
- CONFIG_FS_ENCRYPTION=y
- CONFIG_FANOTIFY=y
- CONFIG_QFMT_V1=m
-diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 2f64a60e1e63..f1a78aa3966c 100644
---- a/arch/arm/configs/bcmrpi_defconfig
-+++ b/arch/arm/configs/bcmrpi_defconfig
-@@ -1331,6 +1331,7 @@ CONFIG_BTRFS_FS=m
- CONFIG_BTRFS_FS_POSIX_ACL=y
- CONFIG_NILFS2_FS=m
- CONFIG_F2FS_FS=y
-+CONFIG_F2FS_FS_SECURITY=y
- CONFIG_FANOTIFY=y
- CONFIG_QFMT_V1=m
- CONFIG_QFMT_V2=m
-diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 234e68865bff..2a7e9aaf2b4d 100644
---- a/arch/arm64/configs/bcm2711_defconfig
-+++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -1368,6 +1368,7 @@ CONFIG_BTRFS_FS=m
- CONFIG_BTRFS_FS_POSIX_ACL=y
- CONFIG_NILFS2_FS=m
- CONFIG_F2FS_FS=y
-+CONFIG_F2FS_FS_SECURITY=y
- CONFIG_FS_ENCRYPTION=y
- CONFIG_FANOTIFY=y
- CONFIG_QFMT_V1=m
-diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 6b0ca5314ab3..f16857163068 100644
---- a/arch/arm64/configs/bcmrpi3_defconfig
-+++ b/arch/arm64/configs/bcmrpi3_defconfig
-@@ -1217,6 +1217,7 @@ CONFIG_BTRFS_FS=m
- CONFIG_BTRFS_FS_POSIX_ACL=y
- CONFIG_NILFS2_FS=m
- CONFIG_F2FS_FS=y
-+CONFIG_F2FS_FS_SECURITY=y
- CONFIG_FS_ENCRYPTION=y
- CONFIG_FANOTIFY=y
- CONFIG_QFMT_V1=m
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0572-Revert-drm-atomic-Pass-the-full-state-to-CRTC-atomic.patch b/root/target/linux/bcm27xx/patches-5.15/0572-Revert-drm-atomic-Pass-the-full-state-to-CRTC-atomic.patch
deleted file mode 100644
index ab671e8e..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0572-Revert-drm-atomic-Pass-the-full-state-to-CRTC-atomic.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 50a03c2090d1d6631a66764669ef1bd392dcb1fa Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Wed, 20 Oct 2021 16:47:09 +0100
-Subject: [PATCH 572/634] Revert "drm/atomic: Pass the full state to CRTC
- atomic enable/disable"
-
-This reverts commit a40d37ed7f14b152d098532802d2a676b76d145c.
----
- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
-index eff9dc6029c2..768012243b44 100644
---- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
-+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
-@@ -797,8 +797,6 @@ static void dpu_crtc_disable(struct drm_crtc *crtc,
- 									      crtc);
- 	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
- 	struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc->state);
--	struct drm_crtc_state *old_crtc_state = drm_atomic_get_old_crtc_state(state,
--									      crtc);
- 	struct drm_encoder *encoder;
- 	unsigned long flags;
- 	bool release_bandwidth = false;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0573-configs-Add-CONFIG_FB_SIMPLE-to-bcmrpi3_defconfig.patch b/root/target/linux/bcm27xx/patches-5.15/0573-configs-Add-CONFIG_FB_SIMPLE-to-bcmrpi3_defconfig.patch
deleted file mode 100644
index dcca9d6d..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0573-configs-Add-CONFIG_FB_SIMPLE-to-bcmrpi3_defconfig.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0474407795d611cea0108e7ef21190512a992353 Mon Sep 17 00:00:00 2001
-From: Erik Tagirov <tgsc2009@gmail.com>
-Date: Wed, 20 Oct 2021 09:51:26 +0200
-Subject: [PATCH 573/634] configs: Add CONFIG_FB_SIMPLE to bcmrpi3_defconfig
-
-See: https://github.com/raspberrypi/linux/pull/4640
-
-Signed-off-by: Erik Tagirov <erik@tagirov.ch>
----
- arch/arm64/configs/bcmrpi3_defconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index f16857163068..b252255397fa 100644
---- a/arch/arm64/configs/bcmrpi3_defconfig
-+++ b/arch/arm64/configs/bcmrpi3_defconfig
-@@ -829,6 +829,7 @@ CONFIG_DRM_GUD=m
- CONFIG_FB=y
- CONFIG_FB_BCM2708=y
- CONFIG_FB_UDL=m
-+CONFIG_FB_SIMPLE=y
- CONFIG_FB_SSD1307=m
- CONFIG_FB_RPISENSE=m
- CONFIG_BACKLIGHT_RPI=m
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0583-media-bcm2835-codec-Limit-video-callbacks.patch b/root/target/linux/bcm27xx/patches-5.15/0583-media-bcm2835-codec-Limit-video-callbacks.patch
deleted file mode 100644
index 06d9ea04..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0583-media-bcm2835-codec-Limit-video-callbacks.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e84199df6a504860f7e2b14008bee6f674f6f1c7 Mon Sep 17 00:00:00 2001
-From: John Cox <jc@kynesim.co.uk>
-Date: Fri, 22 Oct 2021 13:11:38 +0100
-Subject: [PATCH 583/634] media: bcm2835-codec: Limit video callbacks
-
-Limit the number of allowed video callbacks. This helps with limiting
-the size of the coded input FIFO which in turn helps to control latency.
-Choose -5 as the magic number as it translates to DPB+5 buffers which
-has been proven to be a good number in the past.
-
-Ideally coded buffers would not be returned to the user until they
-had been decoded into the DPB or been discarded as bad, but that grade
-of control is unavailable to us.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
----
- .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c      | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 6078d6e2ace0..e8452c82d088 100644
---- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -2510,6 +2510,14 @@ static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx)
- 					      MMAL_PARAMETER_VIDEO_STOP_ON_PAR_COLOUR_CHANGE,
- 					      &enable,
- 					      sizeof(enable));
-+
-+		enable = (unsigned int)-5;
-+		vchiq_mmal_port_parameter_set(dev->instance,
-+					      &ctx->component->control,
-+					      MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS,
-+					      &enable,
-+					      sizeof(enable));
-+
- 	} else if (dev->role == DEINTERLACE) {
- 		/* Select the default deinterlace algorithm. */
- 		int half_framerate = 0;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0605-Revert-brcmfmac-BCM43436-needs-dedicated-firmware.patch b/root/target/linux/bcm27xx/patches-5.15/0605-Revert-brcmfmac-BCM43436-needs-dedicated-firmware.patch
deleted file mode 100644
index 263d29b1..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0605-Revert-brcmfmac-BCM43436-needs-dedicated-firmware.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4e102e98bf30c8337b329a86cfceb6a97e397e91 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 2 Nov 2021 16:53:20 +0000
-Subject: [PATCH 605/634] Revert "brcmfmac: BCM43436 needs dedicated firmware"
-
-This reverts commit 0a2690fa8c3a0b356a0cf5fc63c2428264ead0e7.
----
- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-index fd1a09228f9a..6bcaa402a356 100644
---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-@@ -616,7 +616,6 @@ BRCMF_FW_DEF(4335, "brcmfmac4335-sdio");
- BRCMF_FW_DEF(43362, "brcmfmac43362-sdio");
- BRCMF_FW_DEF(4339, "brcmfmac4339-sdio");
- BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio");
--BRCMF_FW_DEF(43436, "brcmfmac43436-sdio");
- /* Note the names are not postfixed with a1 for backward compatibility */
- BRCMF_FW_CLM_DEF(43430A1, "brcmfmac43430-sdio");
- BRCMF_FW_DEF(43430B0, "brcmfmac43430b0-sdio");
-@@ -651,8 +650,6 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
- 	BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),
- 	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0),
- 	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000002, 43430A1),
--	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000004, 43436),
--	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFA, 43430A1),
- 	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFC, 43430B0),
- 	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0x00000200, 43456),
- 	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455),
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0617-configs-Regenerate-defconfigs.patch b/root/target/linux/bcm27xx/patches-5.15/0617-configs-Regenerate-defconfigs.patch
deleted file mode 100644
index a55989ab..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0617-configs-Regenerate-defconfigs.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From bc1237c403e9b95446a9c1da36d0ba83b5421aae Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 10 Nov 2021 09:48:50 +0000
-Subject: [PATCH 617/634] configs: Regenerate defconfigs
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/configs/bcm2709_defconfig   | 2 +-
- arch/arm/configs/bcm2711_defconfig   | 2 +-
- arch/arm/configs/bcmrpi_defconfig    | 2 +-
- arch/arm64/configs/bcm2711_defconfig | 2 +-
- arch/arm64/configs/bcmrpi3_defconfig | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 77553d32412e..b3b1cb8fec95 100644
---- a/arch/arm/configs/bcm2709_defconfig
-+++ b/arch/arm/configs/bcm2709_defconfig
-@@ -55,7 +55,6 @@ CONFIG_VFP=y
- CONFIG_NEON=y
- CONFIG_KERNEL_MODE_NEON=y
- # CONFIG_SUSPEND is not set
--CONFIG_RASPBERRYPI_FIRMWARE=y
- CONFIG_CRYPTO_SHA1_ARM_NEON=m
- CONFIG_CRYPTO_AES_ARM=m
- CONFIG_CRYPTO_AES_ARM_BS=m
-@@ -446,6 +445,7 @@ CONFIG_NFC=m
- CONFIG_UEVENT_HELPER=y
- CONFIG_DEVTMPFS=y
- CONFIG_DEVTMPFS_MOUNT=y
-+CONFIG_RASPBERRYPI_FIRMWARE=y
- CONFIG_MTD=m
- CONFIG_MTD_BLOCK=m
- CONFIG_MTD_BLOCK2MTD=m
-diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index a15b3e0a02f6..ee616a188ca4 100644
---- a/arch/arm/configs/bcm2711_defconfig
-+++ b/arch/arm/configs/bcm2711_defconfig
-@@ -55,7 +55,6 @@ CONFIG_VFP=y
- CONFIG_NEON=y
- CONFIG_KERNEL_MODE_NEON=y
- # CONFIG_SUSPEND is not set
--CONFIG_RASPBERRYPI_FIRMWARE=y
- CONFIG_CRYPTO_SHA1_ARM_NEON=m
- CONFIG_CRYPTO_AES_ARM=m
- CONFIG_CRYPTO_AES_ARM_BS=m
-@@ -452,6 +451,7 @@ CONFIG_PCIE_BRCMSTB=y
- CONFIG_UEVENT_HELPER=y
- CONFIG_DEVTMPFS=y
- CONFIG_DEVTMPFS_MOUNT=y
-+CONFIG_RASPBERRYPI_FIRMWARE=y
- CONFIG_MTD=m
- CONFIG_MTD_BLOCK=m
- CONFIG_MTD_BLOCK2MTD=m
-diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index f1a78aa3966c..ec5810249709 100644
---- a/arch/arm/configs/bcmrpi_defconfig
-+++ b/arch/arm/configs/bcmrpi_defconfig
-@@ -50,7 +50,6 @@ CONFIG_CPUFREQ_DT=y
- CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
- CONFIG_VFP=y
- # CONFIG_SUSPEND is not set
--CONFIG_RASPBERRYPI_FIRMWARE=y
- CONFIG_CRYPTO_SHA1_ARM=m
- CONFIG_CRYPTO_AES_ARM=m
- CONFIG_JUMP_LABEL=y
-@@ -440,6 +439,7 @@ CONFIG_NFC=m
- CONFIG_UEVENT_HELPER=y
- CONFIG_DEVTMPFS=y
- CONFIG_DEVTMPFS_MOUNT=y
-+CONFIG_RASPBERRYPI_FIRMWARE=y
- CONFIG_MTD=m
- CONFIG_MTD_BLOCK=m
- CONFIG_MTD_BLOCK2MTD=m
-diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 2a7e9aaf2b4d..56718edb5c54 100644
---- a/arch/arm64/configs/bcm2711_defconfig
-+++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -54,7 +54,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
- CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
- CONFIG_CPUFREQ_DT=y
- CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
--CONFIG_RASPBERRYPI_FIRMWARE=y
- CONFIG_VIRTUALIZATION=y
- CONFIG_KVM=y
- CONFIG_CRYPTO_AES_ARM64_BS=m
-@@ -448,6 +447,7 @@ CONFIG_PCIE_BRCMSTB=y
- CONFIG_UEVENT_HELPER=y
- CONFIG_DEVTMPFS=y
- CONFIG_DEVTMPFS_MOUNT=y
-+CONFIG_RASPBERRYPI_FIRMWARE=y
- CONFIG_MTD=m
- CONFIG_MTD_BLOCK=m
- CONFIG_MTD_BLOCK2MTD=m
-diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index b252255397fa..29d98dc91225 100644
---- a/arch/arm64/configs/bcmrpi3_defconfig
-+++ b/arch/arm64/configs/bcmrpi3_defconfig
-@@ -58,7 +58,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
- CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
- CONFIG_CPUFREQ_DT=y
- CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
--CONFIG_RASPBERRYPI_FIRMWARE=y
- CONFIG_CRYPTO_AES_ARM64_BS=m
- CONFIG_JUMP_LABEL=y
- CONFIG_MODULES=y
-@@ -439,6 +438,7 @@ CONFIG_NFC=m
- CONFIG_UEVENT_HELPER=y
- CONFIG_DEVTMPFS=y
- CONFIG_DEVTMPFS_MOUNT=y
-+CONFIG_RASPBERRYPI_FIRMWARE=y
- CONFIG_MTD=m
- CONFIG_MTD_BLOCK=m
- CONFIG_MTD_UBI=m
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0618-configs-Add-NTFS3-support.patch b/root/target/linux/bcm27xx/patches-5.15/0618-configs-Add-NTFS3-support.patch
deleted file mode 100644
index c1faf318..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0618-configs-Add-NTFS3-support.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 911f564b3e2abacd0398650c77566d425c735e2c Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 10 Nov 2021 09:52:22 +0000
-Subject: [PATCH 618/634] configs: Add NTFS3 support
-
-ntfs3 provides improved support for NTFS filesystems without the
-performance hit of a userspace FUSE filesystem.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/configs/bcm2709_defconfig   | 1 +
- arch/arm/configs/bcm2711_defconfig   | 1 +
- arch/arm/configs/bcmrpi_defconfig    | 1 +
- arch/arm64/configs/bcm2711_defconfig | 1 +
- arch/arm64/configs/bcmrpi3_defconfig | 1 +
- 5 files changed, 5 insertions(+)
-
-diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index b3b1cb8fec95..9b8c3c694f89 100644
---- a/arch/arm/configs/bcm2709_defconfig
-+++ b/arch/arm/configs/bcm2709_defconfig
-@@ -1342,6 +1342,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
- CONFIG_EXFAT_FS=m
- CONFIG_NTFS_FS=m
- CONFIG_NTFS_RW=y
-+CONFIG_NTFS3_FS=m
- CONFIG_TMPFS=y
- CONFIG_TMPFS_POSIX_ACL=y
- CONFIG_ECRYPT_FS=m
-diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index ee616a188ca4..a0bf8b4afc2e 100644
---- a/arch/arm/configs/bcm2711_defconfig
-+++ b/arch/arm/configs/bcm2711_defconfig
-@@ -1381,6 +1381,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
- CONFIG_EXFAT_FS=m
- CONFIG_NTFS_FS=m
- CONFIG_NTFS_RW=y
-+CONFIG_NTFS3_FS=m
- CONFIG_TMPFS=y
- CONFIG_TMPFS_POSIX_ACL=y
- CONFIG_ECRYPT_FS=m
-diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index ec5810249709..7ee5b836df89 100644
---- a/arch/arm/configs/bcmrpi_defconfig
-+++ b/arch/arm/configs/bcmrpi_defconfig
-@@ -1352,6 +1352,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
- CONFIG_EXFAT_FS=m
- CONFIG_NTFS_FS=m
- CONFIG_NTFS_RW=y
-+CONFIG_NTFS3_FS=m
- CONFIG_TMPFS=y
- CONFIG_TMPFS_POSIX_ACL=y
- CONFIG_ECRYPT_FS=m
-diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 56718edb5c54..3b4fb78dce75 100644
---- a/arch/arm64/configs/bcm2711_defconfig
-+++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -1390,6 +1390,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
- CONFIG_EXFAT_FS=m
- CONFIG_NTFS_FS=m
- CONFIG_NTFS_RW=y
-+CONFIG_NTFS3_FS=m
- CONFIG_TMPFS=y
- CONFIG_TMPFS_POSIX_ACL=y
- CONFIG_ECRYPT_FS=m
-diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 29d98dc91225..38fff49a5951 100644
---- a/arch/arm64/configs/bcmrpi3_defconfig
-+++ b/arch/arm64/configs/bcmrpi3_defconfig
-@@ -1240,6 +1240,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
- CONFIG_EXFAT_FS=m
- CONFIG_NTFS_FS=m
- CONFIG_NTFS_RW=y
-+CONFIG_NTFS3_FS=m
- CONFIG_TMPFS=y
- CONFIG_TMPFS_POSIX_ACL=y
- CONFIG_ECRYPT_FS=m
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0619-configs-Add-kernel-SMB3-server-support.patch b/root/target/linux/bcm27xx/patches-5.15/0619-configs-Add-kernel-SMB3-server-support.patch
deleted file mode 100644
index 2c8e8c35..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0619-configs-Add-kernel-SMB3-server-support.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From c7407e8aeeff18e65c8942e56474ad123bea19c3 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 10 Nov 2021 09:54:35 +0000
-Subject: [PATCH 619/634] configs: Add kernel SMB3 server support
-
-Enable the in-kernel (module) SMB3 server.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/configs/bcm2709_defconfig   | 1 +
- arch/arm/configs/bcm2711_defconfig   | 1 +
- arch/arm/configs/bcmrpi_defconfig    | 1 +
- arch/arm64/configs/bcm2711_defconfig | 1 +
- arch/arm64/configs/bcmrpi3_defconfig | 1 +
- 5 files changed, 5 insertions(+)
-
-diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 9b8c3c694f89..4da927bf5ef9 100644
---- a/arch/arm/configs/bcm2709_defconfig
-+++ b/arch/arm/configs/bcm2709_defconfig
-@@ -1371,6 +1371,7 @@ CONFIG_CIFS_UPCALL=y
- CONFIG_CIFS_XATTR=y
- CONFIG_CIFS_DFS_UPCALL=y
- CONFIG_CIFS_FSCACHE=y
-+CONFIG_SMB_SERVER=m
- CONFIG_9P_FS=m
- CONFIG_9P_FS_POSIX_ACL=y
- CONFIG_NLS_DEFAULT="utf8"
-diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index a0bf8b4afc2e..d4560a472500 100644
---- a/arch/arm/configs/bcm2711_defconfig
-+++ b/arch/arm/configs/bcm2711_defconfig
-@@ -1411,6 +1411,7 @@ CONFIG_CIFS_XATTR=y
- CONFIG_CIFS_POSIX=y
- CONFIG_CIFS_DFS_UPCALL=y
- CONFIG_CIFS_FSCACHE=y
-+CONFIG_SMB_SERVER=m
- CONFIG_9P_FS=m
- CONFIG_9P_FS_POSIX_ACL=y
- CONFIG_NLS_DEFAULT="utf8"
-diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 7ee5b836df89..2dd6629d7e61 100644
---- a/arch/arm/configs/bcmrpi_defconfig
-+++ b/arch/arm/configs/bcmrpi_defconfig
-@@ -1381,6 +1381,7 @@ CONFIG_CIFS_UPCALL=y
- CONFIG_CIFS_XATTR=y
- CONFIG_CIFS_DFS_UPCALL=y
- CONFIG_CIFS_FSCACHE=y
-+CONFIG_SMB_SERVER=m
- CONFIG_9P_FS=m
- CONFIG_9P_FS_POSIX_ACL=y
- CONFIG_NLS_DEFAULT="utf8"
-diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 3b4fb78dce75..e09fb606b4f1 100644
---- a/arch/arm64/configs/bcm2711_defconfig
-+++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -1420,6 +1420,7 @@ CONFIG_CIFS_XATTR=y
- CONFIG_CIFS_POSIX=y
- CONFIG_CIFS_DFS_UPCALL=y
- CONFIG_CIFS_FSCACHE=y
-+CONFIG_SMB_SERVER=m
- CONFIG_9P_FS=m
- CONFIG_9P_FS_POSIX_ACL=y
- CONFIG_NLS_DEFAULT="utf8"
-diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 38fff49a5951..82c996f54a8d 100644
---- a/arch/arm64/configs/bcmrpi3_defconfig
-+++ b/arch/arm64/configs/bcmrpi3_defconfig
-@@ -1269,6 +1269,7 @@ CONFIG_CIFS_UPCALL=y
- CONFIG_CIFS_XATTR=y
- CONFIG_CIFS_DFS_UPCALL=y
- CONFIG_CIFS_FSCACHE=y
-+CONFIG_SMB_SERVER=m
- CONFIG_9P_FS=m
- CONFIG_9P_FS_POSIX_ACL=y
- CONFIG_NLS_DEFAULT="utf8"
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0620-Revert-media-bcm2835-codec-Limit-video-callbacks.patch b/root/target/linux/bcm27xx/patches-5.15/0620-Revert-media-bcm2835-codec-Limit-video-callbacks.patch
deleted file mode 100644
index 5481f518..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0620-Revert-media-bcm2835-codec-Limit-video-callbacks.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 461a10651749985a42f7c77918977c50546ad700 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Tue, 9 Nov 2021 00:14:16 +0000
-Subject: [PATCH 620/634] Revert "media: bcm2835-codec: Limit video callbacks"
-
-This reverts commit f7abe646a35b6f873abc88c47be2651472793823.
----
- .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c      | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 351d693873ed..97c8afa0861e 100644
---- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -2505,14 +2505,6 @@ static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx)
- 					      MMAL_PARAMETER_VIDEO_STOP_ON_PAR_COLOUR_CHANGE,
- 					      &enable,
- 					      sizeof(enable));
--
--		enable = (unsigned int)-5;
--		vchiq_mmal_port_parameter_set(dev->instance,
--					      &ctx->component->control,
--					      MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS,
--					      &enable,
--					      sizeof(enable));
--
- 	} else if (dev->role == DEINTERLACE) {
- 		/* Select the default deinterlace algorithm. */
- 		int half_framerate = 0;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0621-config-Set-TCA8418-to-module.patch b/root/target/linux/bcm27xx/patches-5.15/0621-config-Set-TCA8418-to-module.patch
deleted file mode 100644
index cb1746f7..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0621-config-Set-TCA8418-to-module.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From c0eda3e991db19a5aa49f2b4aca7ebc3016abf02 Mon Sep 17 00:00:00 2001
-From: arturo182 <arturo182@tlen.pl>
-Date: Tue, 9 Nov 2021 16:21:56 +0100
-Subject: [PATCH 621/634] config: Set TCA8418 to module
-
-This chip is a popular way to add a matrix keyboard using I2C.
----
- arch/arm/configs/bcm2709_defconfig   | 1 +
- arch/arm/configs/bcm2711_defconfig   | 1 +
- arch/arm/configs/bcmrpi_defconfig    | 1 +
- arch/arm64/configs/bcm2711_defconfig | 1 +
- arch/arm64/configs/bcmrpi3_defconfig | 1 +
- 5 files changed, 5 insertions(+)
-
-diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 4da927bf5ef9..3f59b647b343 100644
---- a/arch/arm/configs/bcm2709_defconfig
-+++ b/arch/arm/configs/bcm2709_defconfig
-@@ -602,6 +602,7 @@ CONFIG_INPUT_JOYDEV=m
- CONFIG_INPUT_EVDEV=y
- # CONFIG_KEYBOARD_ATKBD is not set
- CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_TCA8418=m
- CONFIG_KEYBOARD_MATRIX=m
- CONFIG_KEYBOARD_CAP11XX=m
- # CONFIG_INPUT_MOUSE is not set
-diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index d4560a472500..63c41e541c54 100644
---- a/arch/arm/configs/bcm2711_defconfig
-+++ b/arch/arm/configs/bcm2711_defconfig
-@@ -615,6 +615,7 @@ CONFIG_INPUT_JOYDEV=m
- CONFIG_INPUT_EVDEV=y
- # CONFIG_KEYBOARD_ATKBD is not set
- CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_TCA8418=m
- CONFIG_KEYBOARD_MATRIX=m
- CONFIG_KEYBOARD_CAP11XX=m
- # CONFIG_INPUT_MOUSE is not set
-diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 2dd6629d7e61..50d5473c1c2d 100644
---- a/arch/arm/configs/bcmrpi_defconfig
-+++ b/arch/arm/configs/bcmrpi_defconfig
-@@ -596,6 +596,7 @@ CONFIG_INPUT_JOYDEV=m
- CONFIG_INPUT_EVDEV=y
- # CONFIG_KEYBOARD_ATKBD is not set
- CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_TCA8418=m
- CONFIG_KEYBOARD_MATRIX=m
- CONFIG_KEYBOARD_CAP11XX=m
- # CONFIG_INPUT_MOUSE is not set
-diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index e09fb606b4f1..3aca18f64f56 100644
---- a/arch/arm64/configs/bcm2711_defconfig
-+++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -612,6 +612,7 @@ CONFIG_INPUT_JOYDEV=m
- CONFIG_INPUT_EVDEV=y
- # CONFIG_KEYBOARD_ATKBD is not set
- CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_TCA8418=m
- CONFIG_KEYBOARD_MATRIX=m
- CONFIG_KEYBOARD_CAP11XX=m
- # CONFIG_INPUT_MOUSE is not set
-diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 82c996f54a8d..4e7296ad96c2 100644
---- a/arch/arm64/configs/bcmrpi3_defconfig
-+++ b/arch/arm64/configs/bcmrpi3_defconfig
-@@ -591,6 +591,7 @@ CONFIG_INPUT_JOYDEV=m
- CONFIG_INPUT_EVDEV=y
- # CONFIG_KEYBOARD_ATKBD is not set
- CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_TCA8418=m
- CONFIG_KEYBOARD_MATRIX=m
- CONFIG_KEYBOARD_CAP11XX=m
- # CONFIG_INPUT_MOUSE is not set
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0623-configs-Add-TCA6416-driver-module.patch b/root/target/linux/bcm27xx/patches-5.15/0623-configs-Add-TCA6416-driver-module.patch
deleted file mode 100644
index b1fdd2d5..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0623-configs-Add-TCA6416-driver-module.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 05a94dbdd59e69c36d21591e3459705b847a62b9 Mon Sep 17 00:00:00 2001
-From: VMsunghwan <jsh970307@daum.net>
-Date: Tue, 16 Nov 2021 03:24:36 +0900
-Subject: [PATCH 623/634] configs: Add TCA6416 driver module
-
-Add a matrix keyboard on I2C
-
-See: https://github.com/raspberrypi/linux/pull/4700
----
- arch/arm/configs/bcm2709_defconfig   | 1 +
- arch/arm/configs/bcm2711_defconfig   | 1 +
- arch/arm/configs/bcmrpi_defconfig    | 1 +
- arch/arm64/configs/bcm2711_defconfig | 1 +
- arch/arm64/configs/bcmrpi3_defconfig | 1 +
- 5 files changed, 5 insertions(+)
-
-diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 3f59b647b343..42fe6bd471b2 100644
---- a/arch/arm/configs/bcm2709_defconfig
-+++ b/arch/arm/configs/bcm2709_defconfig
-@@ -602,6 +602,7 @@ CONFIG_INPUT_JOYDEV=m
- CONFIG_INPUT_EVDEV=y
- # CONFIG_KEYBOARD_ATKBD is not set
- CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_TCA6416=m
- CONFIG_KEYBOARD_TCA8418=m
- CONFIG_KEYBOARD_MATRIX=m
- CONFIG_KEYBOARD_CAP11XX=m
-diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 63c41e541c54..bf5ff05815f0 100644
---- a/arch/arm/configs/bcm2711_defconfig
-+++ b/arch/arm/configs/bcm2711_defconfig
-@@ -615,6 +615,7 @@ CONFIG_INPUT_JOYDEV=m
- CONFIG_INPUT_EVDEV=y
- # CONFIG_KEYBOARD_ATKBD is not set
- CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_TCA6416=m
- CONFIG_KEYBOARD_TCA8418=m
- CONFIG_KEYBOARD_MATRIX=m
- CONFIG_KEYBOARD_CAP11XX=m
-diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 50d5473c1c2d..f1c54effdce2 100644
---- a/arch/arm/configs/bcmrpi_defconfig
-+++ b/arch/arm/configs/bcmrpi_defconfig
-@@ -596,6 +596,7 @@ CONFIG_INPUT_JOYDEV=m
- CONFIG_INPUT_EVDEV=y
- # CONFIG_KEYBOARD_ATKBD is not set
- CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_TCA6416=m
- CONFIG_KEYBOARD_TCA8418=m
- CONFIG_KEYBOARD_MATRIX=m
- CONFIG_KEYBOARD_CAP11XX=m
-diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 3aca18f64f56..cd77617fbcfb 100644
---- a/arch/arm64/configs/bcm2711_defconfig
-+++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -612,6 +612,7 @@ CONFIG_INPUT_JOYDEV=m
- CONFIG_INPUT_EVDEV=y
- # CONFIG_KEYBOARD_ATKBD is not set
- CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_TCA6416=m
- CONFIG_KEYBOARD_TCA8418=m
- CONFIG_KEYBOARD_MATRIX=m
- CONFIG_KEYBOARD_CAP11XX=m
-diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 4e7296ad96c2..5a8cc83a7386 100644
---- a/arch/arm64/configs/bcmrpi3_defconfig
-+++ b/arch/arm64/configs/bcmrpi3_defconfig
-@@ -591,6 +591,7 @@ CONFIG_INPUT_JOYDEV=m
- CONFIG_INPUT_EVDEV=y
- # CONFIG_KEYBOARD_ATKBD is not set
- CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_TCA6416=m
- CONFIG_KEYBOARD_TCA8418=m
- CONFIG_KEYBOARD_MATRIX=m
- CONFIG_KEYBOARD_CAP11XX=m
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0630-enable-several-virtual-devices-for-hosting-virtual-m.patch b/root/target/linux/bcm27xx/patches-5.15/0630-enable-several-virtual-devices-for-hosting-virtual-m.patch
deleted file mode 100644
index e1c7c8ed..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0630-enable-several-virtual-devices-for-hosting-virtual-m.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 203e924caade8c8baa6ff32ff91cdff7af9c949b Mon Sep 17 00:00:00 2001
-From: Sean McAvoy <seanmcavoy@gmail.com>
-Date: Fri, 19 Nov 2021 02:36:24 -0500
-Subject: [PATCH 630/634] enable several virtual devices for hosting virtual
- machines
-
----
- arch/arm64/configs/bcm2711_defconfig | 3 +++
- arch/arm64/configs/bcmrpi3_defconfig | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index cd77617fbcfb..a5c41d4bdc1e 100644
---- a/arch/arm64/configs/bcm2711_defconfig
-+++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -393,6 +393,7 @@ CONFIG_NET_ACT_SKBEDIT=m
- CONFIG_NET_ACT_CSUM=m
- CONFIG_BATMAN_ADV=m
- CONFIG_OPENVSWITCH=m
-+CONFIG_VSOCKETS=m
- CONFIG_CGROUP_NET_PRIO=y
- CONFIG_NET_PKTGEN=m
- CONFIG_HAMRADIO=y
-@@ -502,6 +503,7 @@ CONFIG_NETCONSOLE=m
- CONFIG_TUN=m
- CONFIG_VETH=m
- CONFIG_NET_VRF=m
-+CONFIG_VSOCKMON=m
- CONFIG_BCMGENET=y
- CONFIG_ENC28J60=m
- CONFIG_QCA7000_SPI=m
-@@ -1272,6 +1274,7 @@ CONFIG_HD44780=m
- CONFIG_UIO=m
- CONFIG_UIO_PDRV_GENIRQ=m
- CONFIG_VHOST_NET=m
-+CONFIG_VHOST_VSOCK=m
- CONFIG_VHOST_CROSS_ENDIAN_LEGACY=y
- CONFIG_STAGING=y
- CONFIG_PRISM2_USB=m
-diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 5a8cc83a7386..05f1eba91510 100644
---- a/arch/arm64/configs/bcmrpi3_defconfig
-+++ b/arch/arm64/configs/bcmrpi3_defconfig
-@@ -388,6 +388,7 @@ CONFIG_NET_ACT_SKBEDIT=m
- CONFIG_NET_ACT_CSUM=m
- CONFIG_BATMAN_ADV=m
- CONFIG_OPENVSWITCH=m
-+CONFIG_VSOCKETS=m
- CONFIG_CGROUP_NET_PRIO=y
- CONFIG_NET_PKTGEN=m
- CONFIG_HAMRADIO=y
-@@ -487,6 +488,7 @@ CONFIG_NETCONSOLE=m
- CONFIG_TUN=m
- CONFIG_VETH=m
- CONFIG_NET_VRF=m
-+CONFIG_VSOCKMON=m
- CONFIG_ENC28J60=m
- CONFIG_QCA7000_SPI=m
- CONFIG_QCA7000_UART=m
-@@ -1133,6 +1135,7 @@ CONFIG_DMABUF_HEAPS_SYSTEM=y
- CONFIG_DMABUF_HEAPS_CMA=y
- CONFIG_UIO=m
- CONFIG_UIO_PDRV_GENIRQ=m
-+CONFIG_VHOST_VSOCK=m
- CONFIG_STAGING=y
- CONFIG_PRISM2_USB=m
- CONFIG_R8712U=m
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0632-configs-add-CONFIG_HID_PLAYSTATION-m-and-CONFIG_PLAY.patch b/root/target/linux/bcm27xx/patches-5.15/0632-configs-add-CONFIG_HID_PLAYSTATION-m-and-CONFIG_PLAY.patch
deleted file mode 100644
index 0c3f950b..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0632-configs-add-CONFIG_HID_PLAYSTATION-m-and-CONFIG_PLAY.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 0360e2aa85e7fd2cc249b2aac178018d53f61a31 Mon Sep 17 00:00:00 2001
-From: Ilya Trukhanov <lahvuun@gmail.com>
-Date: Sat, 20 Nov 2021 16:26:36 +0200
-Subject: [PATCH 632/634] configs: add CONFIG_HID_PLAYSTATION=m and
- CONFIG_PLAYSTATION_FF=y
-
-Enables support for the PlayStation 5 'DualSense' controller and its
-force feedback.
-
-Also, Sony is planning to move PlayStation peripheral support from
-hid-sony into hid-playstation in the future:
-https://lore.kernel.org/all/20201219062336.72568-1-roderick@gaikai.com/
-
-This means that, potentially, in future kernel releases older
-PlayStation controllers may stop working without this option. As
-Raspberry Pis are a popular choice as emulation consoles, it is probably
-a good idea to enable this.
-
-Signed-off-by: Ilya Trukhanov <lahvuun@gmail.com>
----
- arch/arm/configs/bcm2709_defconfig   | 2 ++
- arch/arm/configs/bcm2711_defconfig   | 2 ++
- arch/arm/configs/bcmrpi_defconfig    | 2 ++
- arch/arm64/configs/bcm2711_defconfig | 2 ++
- arch/arm64/configs/bcmrpi3_defconfig | 2 ++
- 5 files changed, 10 insertions(+)
-
-diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 42fe6bd471b2..cd4148fcdc4b 100644
---- a/arch/arm/configs/bcm2709_defconfig
-+++ b/arch/arm/configs/bcm2709_defconfig
-@@ -1022,6 +1022,8 @@ CONFIG_HID_ORTEK=m
- CONFIG_HID_PANTHERLORD=m
- CONFIG_HID_PETALYNX=m
- CONFIG_HID_PICOLCD=m
-+CONFIG_HID_PLAYSTATION=m
-+CONFIG_PLAYSTATION_FF=y
- CONFIG_HID_ROCCAT=m
- CONFIG_HID_SAMSUNG=m
- CONFIG_HID_SONY=m
-diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index bf5ff05815f0..6cceda505484 100644
---- a/arch/arm/configs/bcm2711_defconfig
-+++ b/arch/arm/configs/bcm2711_defconfig
-@@ -1038,6 +1038,8 @@ CONFIG_HID_ORTEK=m
- CONFIG_HID_PANTHERLORD=m
- CONFIG_HID_PETALYNX=m
- CONFIG_HID_PICOLCD=m
-+CONFIG_HID_PLAYSTATION=m
-+CONFIG_PLAYSTATION_FF=y
- CONFIG_HID_ROCCAT=m
- CONFIG_HID_SAMSUNG=m
- CONFIG_HID_SONY=m
-diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index f1c54effdce2..f7d84b00778e 100644
---- a/arch/arm/configs/bcmrpi_defconfig
-+++ b/arch/arm/configs/bcmrpi_defconfig
-@@ -1015,6 +1015,8 @@ CONFIG_HID_ORTEK=m
- CONFIG_HID_PANTHERLORD=m
- CONFIG_HID_PETALYNX=m
- CONFIG_HID_PICOLCD=m
-+CONFIG_HID_PLAYSTATION=m
-+CONFIG_PLAYSTATION_FF=y
- CONFIG_HID_ROCCAT=m
- CONFIG_HID_SAMSUNG=m
- CONFIG_HID_SONY=m
-diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index a5c41d4bdc1e..00aa6d7ebb36 100644
---- a/arch/arm64/configs/bcm2711_defconfig
-+++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -1043,6 +1043,8 @@ CONFIG_HID_ORTEK=m
- CONFIG_HID_PANTHERLORD=m
- CONFIG_HID_PETALYNX=m
- CONFIG_HID_PICOLCD=m
-+CONFIG_HID_PLAYSTATION=m
-+CONFIG_PLAYSTATION_FF=y
- CONFIG_HID_ROCCAT=m
- CONFIG_HID_SAMSUNG=m
- CONFIG_HID_SONY=m
-diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 05f1eba91510..2a319d0550a2 100644
---- a/arch/arm64/configs/bcmrpi3_defconfig
-+++ b/arch/arm64/configs/bcmrpi3_defconfig
-@@ -941,6 +941,8 @@ CONFIG_HID_ORTEK=m
- CONFIG_HID_PANTHERLORD=m
- CONFIG_HID_PETALYNX=m
- CONFIG_HID_PICOLCD=m
-+CONFIG_HID_PLAYSTATION=m
-+CONFIG_PLAYSTATION_FF=y
- CONFIG_HID_ROCCAT=m
- CONFIG_HID_SAMSUNG=m
- CONFIG_HID_SONY=m
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0633-configs-add-LEDS_PWM-y.patch b/root/target/linux/bcm27xx/patches-5.15/0633-configs-add-LEDS_PWM-y.patch
deleted file mode 100644
index 226c2937..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0633-configs-add-LEDS_PWM-y.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 436be1a460d6fd67e8aaabcc33b1f6ac12eaf1d0 Mon Sep 17 00:00:00 2001
-From: Michael Heimpold <mhei@heimpold.de>
-Date: Thu, 4 Nov 2021 23:09:07 +0100
-Subject: [PATCH 633/634] configs: add LEDS_PWM=y
-
-Enable support for PWM driven LEDs.
-
-Signed-off-by: Michael Heimpold <mhei@heimpold.de>
----
- arch/arm/configs/bcm2709_defconfig   | 1 +
- arch/arm/configs/bcm2711_defconfig   | 1 +
- arch/arm/configs/bcmrpi_defconfig    | 1 +
- arch/arm64/configs/bcm2711_defconfig | 1 +
- arch/arm64/configs/bcmrpi3_defconfig | 1 +
- 5 files changed, 5 insertions(+)
-
-diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index cd4148fcdc4b..317b0018d6e2 100644
---- a/arch/arm/configs/bcm2709_defconfig
-+++ b/arch/arm/configs/bcm2709_defconfig
-@@ -1169,6 +1169,7 @@ CONFIG_LEDS_PCA9532=m
- CONFIG_LEDS_GPIO=y
- CONFIG_LEDS_PCA955X=m
- CONFIG_LEDS_PCA963X=m
-+CONFIG_LEDS_PWM=y
- CONFIG_LEDS_IS31FL32XX=m
- CONFIG_LEDS_TRIGGER_TIMER=y
- CONFIG_LEDS_TRIGGER_ONESHOT=y
-diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 6cceda505484..94d15dfe2793 100644
---- a/arch/arm/configs/bcm2711_defconfig
-+++ b/arch/arm/configs/bcm2711_defconfig
-@@ -1206,6 +1206,7 @@ CONFIG_LEDS_PCA9532=m
- CONFIG_LEDS_GPIO=y
- CONFIG_LEDS_PCA955X=m
- CONFIG_LEDS_PCA963X=m
-+CONFIG_LEDS_PWM=y
- CONFIG_LEDS_IS31FL32XX=m
- CONFIG_LEDS_TRIGGER_TIMER=y
- CONFIG_LEDS_TRIGGER_ONESHOT=y
-diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index f7d84b00778e..95a11f27dfad 100644
---- a/arch/arm/configs/bcmrpi_defconfig
-+++ b/arch/arm/configs/bcmrpi_defconfig
-@@ -1180,6 +1180,7 @@ CONFIG_LEDS_PCA9532=m
- CONFIG_LEDS_GPIO=y
- CONFIG_LEDS_PCA955X=m
- CONFIG_LEDS_PCA963X=m
-+CONFIG_LEDS_PWM=y
- CONFIG_LEDS_IS31FL32XX=m
- CONFIG_LEDS_TRIGGER_TIMER=y
- CONFIG_LEDS_TRIGGER_ONESHOT=y
-diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 00aa6d7ebb36..0fffa3b4f72b 100644
---- a/arch/arm64/configs/bcm2711_defconfig
-+++ b/arch/arm64/configs/bcm2711_defconfig
-@@ -1211,6 +1211,7 @@ CONFIG_LEDS_PCA9532=m
- CONFIG_LEDS_GPIO=y
- CONFIG_LEDS_PCA955X=m
- CONFIG_LEDS_PCA963X=m
-+CONFIG_LEDS_PWM=y
- CONFIG_LEDS_IS31FL32XX=m
- CONFIG_LEDS_TRIGGER_TIMER=y
- CONFIG_LEDS_TRIGGER_ONESHOT=y
-diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 2a319d0550a2..c4dff0b42461 100644
---- a/arch/arm64/configs/bcmrpi3_defconfig
-+++ b/arch/arm64/configs/bcmrpi3_defconfig
-@@ -1075,6 +1075,7 @@ CONFIG_LEDS_PCA9532=m
- CONFIG_LEDS_GPIO=y
- CONFIG_LEDS_PCA955X=m
- CONFIG_LEDS_PCA963X=m
-+CONFIG_LEDS_PWM=y
- CONFIG_LEDS_IS31FL32XX=m
- CONFIG_LEDS_TRIGGER_TIMER=y
- CONFIG_LEDS_TRIGGER_ONESHOT=y
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0634-configs-Add-USB-gadget-support-for-Zero-2-W.patch b/root/target/linux/bcm27xx/patches-5.15/0634-configs-Add-USB-gadget-support-for-Zero-2-W.patch
deleted file mode 100644
index 03a98982..00000000
--- a/root/target/linux/bcm27xx/patches-5.15/0634-configs-Add-USB-gadget-support-for-Zero-2-W.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e9c66cd367f00c9384ddc651567db7df48054115 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 22 Nov 2021 10:28:55 +0000
-Subject: [PATCH 634/634] configs: Add USB gadget support (for Zero 2 W)
-
-Bring the Pi 3 kernel in line with the Pi Zero and Pi 4 by enabling
-USB gadget support, which is useful on Zero 2 W.
-
-See: https://github.com/raspberrypi/firmware/issues/1654
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/configs/bcm2709_defconfig | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 317b0018d6e2..e844c6d60011 100644
---- a/arch/arm/configs/bcm2709_defconfig
-+++ b/arch/arm/configs/bcm2709_defconfig
-@@ -1143,6 +1143,24 @@ CONFIG_USB_UEAGLEATM=m
- CONFIG_USB_XUSBATM=m
- CONFIG_NOP_USB_XCEIV=y
- CONFIG_USB_GADGET=y
-+CONFIG_USB_CONFIGFS=m
-+CONFIG_USB_CONFIGFS_SERIAL=y
-+CONFIG_USB_CONFIGFS_ACM=y
-+CONFIG_USB_CONFIGFS_OBEX=y
-+CONFIG_USB_CONFIGFS_NCM=y
-+CONFIG_USB_CONFIGFS_ECM=y
-+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
-+CONFIG_USB_CONFIGFS_RNDIS=y
-+CONFIG_USB_CONFIGFS_EEM=y
-+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-+CONFIG_USB_CONFIGFS_F_LB_SS=y
-+CONFIG_USB_CONFIGFS_F_FS=y
-+CONFIG_USB_CONFIGFS_F_UAC1=y
-+CONFIG_USB_CONFIGFS_F_UAC2=y
-+CONFIG_USB_CONFIGFS_F_MIDI=y
-+CONFIG_USB_CONFIGFS_F_HID=y
-+CONFIG_USB_CONFIGFS_F_UVC=y
-+CONFIG_USB_CONFIGFS_F_PRINTER=y
- CONFIG_USB_ZERO=m
- CONFIG_USB_AUDIO=m
- CONFIG_USB_ETH=m
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0001-drm-vc4-hdmi-Split-the-CEC-disable-enable-functions-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0001-drm-vc4-hdmi-Split-the-CEC-disable-enable-functions-.patch
new file mode 100644
index 00000000..c1931a5d
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0001-drm-vc4-hdmi-Split-the-CEC-disable-enable-functions-.patch
@@ -0,0 +1,111 @@
+From f959ee9d0bfbcb747a74458e79157db37817d390 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Thu, 19 Aug 2021 15:59:29 +0200
+Subject: [PATCH 001/828] drm/vc4: hdmi: Split the CEC disable / enable
+ functions in two
+
+In order to ease further additions to the CEC enable and disable, let's
+split the function into two functions, one to enable and the other to
+disable.
+
+Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Link: https://patchwork.freedesktop.org/patch/msgid/20210819135931.895976-5-maxime@cerno.tech
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 75 ++++++++++++++++++++--------------
+ 1 file changed, 45 insertions(+), 30 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -1739,7 +1739,7 @@ static irqreturn_t vc4_cec_irq_handler(i
+ 	return ret;
+ }
+ 
+-static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable)
++static int vc4_hdmi_cec_enable(struct cec_adapter *adap)
+ {
+ 	struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap);
+ 	/* clock period in microseconds */
+@@ -1752,38 +1752,53 @@ static int vc4_hdmi_cec_adap_enable(stru
+ 	val |= ((4700 / usecs) << VC4_HDMI_CEC_CNT_TO_4700_US_SHIFT) |
+ 	       ((4500 / usecs) << VC4_HDMI_CEC_CNT_TO_4500_US_SHIFT);
+ 
+-	if (enable) {
+-		HDMI_WRITE(HDMI_CEC_CNTRL_5, val |
+-			   VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET);
+-		HDMI_WRITE(HDMI_CEC_CNTRL_5, val);
+-		HDMI_WRITE(HDMI_CEC_CNTRL_2,
+-			   ((1500 / usecs) << VC4_HDMI_CEC_CNT_TO_1500_US_SHIFT) |
+-			   ((1300 / usecs) << VC4_HDMI_CEC_CNT_TO_1300_US_SHIFT) |
+-			   ((800 / usecs) << VC4_HDMI_CEC_CNT_TO_800_US_SHIFT) |
+-			   ((600 / usecs) << VC4_HDMI_CEC_CNT_TO_600_US_SHIFT) |
+-			   ((400 / usecs) << VC4_HDMI_CEC_CNT_TO_400_US_SHIFT));
+-		HDMI_WRITE(HDMI_CEC_CNTRL_3,
+-			   ((2750 / usecs) << VC4_HDMI_CEC_CNT_TO_2750_US_SHIFT) |
+-			   ((2400 / usecs) << VC4_HDMI_CEC_CNT_TO_2400_US_SHIFT) |
+-			   ((2050 / usecs) << VC4_HDMI_CEC_CNT_TO_2050_US_SHIFT) |
+-			   ((1700 / usecs) << VC4_HDMI_CEC_CNT_TO_1700_US_SHIFT));
+-		HDMI_WRITE(HDMI_CEC_CNTRL_4,
+-			   ((4300 / usecs) << VC4_HDMI_CEC_CNT_TO_4300_US_SHIFT) |
+-			   ((3900 / usecs) << VC4_HDMI_CEC_CNT_TO_3900_US_SHIFT) |
+-			   ((3600 / usecs) << VC4_HDMI_CEC_CNT_TO_3600_US_SHIFT) |
+-			   ((3500 / usecs) << VC4_HDMI_CEC_CNT_TO_3500_US_SHIFT));
+-
+-		if (!vc4_hdmi->variant->external_irq_controller)
+-			HDMI_WRITE(HDMI_CEC_CPU_MASK_CLEAR, VC4_HDMI_CPU_CEC);
+-	} else {
+-		if (!vc4_hdmi->variant->external_irq_controller)
+-			HDMI_WRITE(HDMI_CEC_CPU_MASK_SET, VC4_HDMI_CPU_CEC);
+-		HDMI_WRITE(HDMI_CEC_CNTRL_5, val |
+-			   VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET);
+-	}
++	HDMI_WRITE(HDMI_CEC_CNTRL_5, val |
++		   VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET);
++	HDMI_WRITE(HDMI_CEC_CNTRL_5, val);
++	HDMI_WRITE(HDMI_CEC_CNTRL_2,
++		   ((1500 / usecs) << VC4_HDMI_CEC_CNT_TO_1500_US_SHIFT) |
++		   ((1300 / usecs) << VC4_HDMI_CEC_CNT_TO_1300_US_SHIFT) |
++		   ((800 / usecs) << VC4_HDMI_CEC_CNT_TO_800_US_SHIFT) |
++		   ((600 / usecs) << VC4_HDMI_CEC_CNT_TO_600_US_SHIFT) |
++		   ((400 / usecs) << VC4_HDMI_CEC_CNT_TO_400_US_SHIFT));
++	HDMI_WRITE(HDMI_CEC_CNTRL_3,
++		   ((2750 / usecs) << VC4_HDMI_CEC_CNT_TO_2750_US_SHIFT) |
++		   ((2400 / usecs) << VC4_HDMI_CEC_CNT_TO_2400_US_SHIFT) |
++		   ((2050 / usecs) << VC4_HDMI_CEC_CNT_TO_2050_US_SHIFT) |
++		   ((1700 / usecs) << VC4_HDMI_CEC_CNT_TO_1700_US_SHIFT));
++	HDMI_WRITE(HDMI_CEC_CNTRL_4,
++		   ((4300 / usecs) << VC4_HDMI_CEC_CNT_TO_4300_US_SHIFT) |
++		   ((3900 / usecs) << VC4_HDMI_CEC_CNT_TO_3900_US_SHIFT) |
++		   ((3600 / usecs) << VC4_HDMI_CEC_CNT_TO_3600_US_SHIFT) |
++		   ((3500 / usecs) << VC4_HDMI_CEC_CNT_TO_3500_US_SHIFT));
++
++	if (!vc4_hdmi->variant->external_irq_controller)
++		HDMI_WRITE(HDMI_CEC_CPU_MASK_CLEAR, VC4_HDMI_CPU_CEC);
++
+ 	return 0;
+ }
+ 
++static int vc4_hdmi_cec_disable(struct cec_adapter *adap)
++{
++	struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap);
++
++	if (!vc4_hdmi->variant->external_irq_controller)
++		HDMI_WRITE(HDMI_CEC_CPU_MASK_SET, VC4_HDMI_CPU_CEC);
++
++	HDMI_WRITE(HDMI_CEC_CNTRL_5, HDMI_READ(HDMI_CEC_CNTRL_5) |
++		   VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET);
++
++	return 0;
++}
++
++static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable)
++{
++	if (enable)
++		return vc4_hdmi_cec_enable(adap);
++	else
++		return vc4_hdmi_cec_disable(adap);
++}
++
+ static int vc4_hdmi_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr)
+ {
+ 	struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0002-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch b/root/target/linux/bcm27xx/patches-5.15/950-0002-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch
new file mode 100644
index 00000000..afeba636
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0002-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch
@@ -0,0 +1,51 @@
+From 055b225c463ec348ab2701047016cc5957693320 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Thu, 19 Aug 2021 15:59:30 +0200
+Subject: [PATCH 002/828] drm/vc4: hdmi: Make sure the device is powered with
+ CEC
+
+Similarly to what we encountered with the detect hook with DRM, nothing
+actually prevents any of the CEC callback from being run while the HDMI
+output is disabled.
+
+However, this is an issue since any register access to the controller
+when it's powered down will result in a silent hang.
+
+Let's make sure we run the runtime_pm hooks when the CEC adapter is
+opened and closed by the userspace to avoid that issue.
+
+Fixes: 15b4511a4af6 ("drm/vc4: add HDMI CEC support")
+Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Link: https://patchwork.freedesktop.org/patch/msgid/20210819135931.895976-6-maxime@cerno.tech
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -1744,8 +1744,14 @@ static int vc4_hdmi_cec_enable(struct ce
+ 	struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap);
+ 	/* clock period in microseconds */
+ 	const u32 usecs = 1000000 / CEC_CLOCK_FREQ;
+-	u32 val = HDMI_READ(HDMI_CEC_CNTRL_5);
++	u32 val;
++	int ret;
+ 
++	ret = pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev);
++	if (ret)
++		return ret;
++
++	val = HDMI_READ(HDMI_CEC_CNTRL_5);
+ 	val &= ~(VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET |
+ 		 VC4_HDMI_CEC_CNT_TO_4700_US_MASK |
+ 		 VC4_HDMI_CEC_CNT_TO_4500_US_MASK);
+@@ -1788,6 +1794,8 @@ static int vc4_hdmi_cec_disable(struct c
+ 	HDMI_WRITE(HDMI_CEC_CNTRL_5, HDMI_READ(HDMI_CEC_CNTRL_5) |
+ 		   VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET);
+ 
++	pm_runtime_put(&vc4_hdmi->pdev->dev);
++
+ 	return 0;
+ }
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0003-drm-vc4-hdmi-Warn-if-we-access-the-controller-while-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0003-drm-vc4-hdmi-Warn-if-we-access-the-controller-while-.patch
new file mode 100644
index 00000000..19fe2dba
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0003-drm-vc4-hdmi-Warn-if-we-access-the-controller-while-.patch
@@ -0,0 +1,49 @@
+From 7a70a2083deb61123fcdec66388e72405eb39a78 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Thu, 19 Aug 2021 15:59:31 +0200
+Subject: [PATCH 003/828] drm/vc4: hdmi: Warn if we access the controller while
+ disabled
+
+We've had many silent hangs where the kernel would look like it just
+stalled due to the access to one of the HDMI registers while the
+controller was disabled.
+
+Add a warning if we're about to do that so that it's at least not silent
+anymore.
+
+Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Link: https://patchwork.freedesktop.org/patch/msgid/20210819135931.895976-7-maxime@cerno.tech
+---
+ drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
+@@ -1,6 +1,8 @@
+ #ifndef _VC4_HDMI_REGS_H_
+ #define _VC4_HDMI_REGS_H_
+ 
++#include <linux/pm_runtime.h>
++
+ #include "vc4_hdmi.h"
+ 
+ #define VC4_HDMI_PACKET_STRIDE			0x24
+@@ -412,6 +414,8 @@ static inline u32 vc4_hdmi_read(struct v
+ 	const struct vc4_hdmi_variant *variant = hdmi->variant;
+ 	void __iomem *base;
+ 
++	WARN_ON(!pm_runtime_active(&hdmi->pdev->dev));
++
+ 	if (reg >= variant->num_registers) {
+ 		dev_warn(&hdmi->pdev->dev,
+ 			 "Invalid register ID %u\n", reg);
+@@ -438,6 +442,8 @@ static inline void vc4_hdmi_write(struct
+ 	const struct vc4_hdmi_variant *variant = hdmi->variant;
+ 	void __iomem *base;
+ 
++	WARN_ON(!pm_runtime_active(&hdmi->pdev->dev));
++
+ 	if (reg >= variant->num_registers) {
+ 		dev_warn(&hdmi->pdev->dev,
+ 			 "Invalid register ID %u\n", reg);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0004-drm-vc4-hdmi-Remove-the-DDC-probing-for-status-detec.patch b/root/target/linux/bcm27xx/patches-5.15/950-0004-drm-vc4-hdmi-Remove-the-DDC-probing-for-status-detec.patch
new file mode 100644
index 00000000..d44eccb4
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0004-drm-vc4-hdmi-Remove-the-DDC-probing-for-status-detec.patch
@@ -0,0 +1,47 @@
+From c1f62cb809b2b5a34bc9cfbf86288f53845c3639 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Mon, 25 Oct 2021 17:28:54 +0200
+Subject: [PATCH 004/828] drm/vc4: hdmi: Remove the DDC probing for status
+ detection
+
+Commit 9d44abbbb8d5 ("drm/vc4: Fall back to using an EDID probe in the
+absence of a GPIO.") added some code to read the EDID through DDC in the
+HDMI driver detect hook since the Pi3 had no HPD GPIO back then.
+However, commit b1b8f45b3130 ("ARM: dts: bcm2837: Add missing GPIOs of
+Expander") changed that a couple of years later.
+
+This causes an issue though since some TV (like the LG 55C8) when it
+comes out of standy will deassert the HPD line, but the EDID will
+remain readable.
+
+It causes an issues nn platforms without an HPD GPIO, like the Pi4,
+where the DDC probing will be our primary mean to detect a display, and
+thus we will never detect the HPD pulse. This was fine before since the
+pulse was small enough that we would never detect it, and we also didn't
+have anything (like the scrambler) that needed to be set up in the
+display.
+
+However, now that we have both, the display during the HPD pulse will
+clear its scrambler status, and since we won't detect the
+disconnect/reconnect cycle we will never enable the scrambler back.
+
+As our main reason for that DDC probing is gone, let's just remove it.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Link: https://lore.kernel.org/r/20211025152903.1088803-2-maxime@cerno.tech
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -175,8 +175,6 @@ vc4_hdmi_connector_detect(struct drm_con
+ 	if (vc4_hdmi->hpd_gpio &&
+ 	    gpiod_get_value_cansleep(vc4_hdmi->hpd_gpio)) {
+ 		connected = true;
+-	} else if (drm_probe_ddc(vc4_hdmi->ddc)) {
+-		connected = true;
+ 	} else if (HDMI_READ(HDMI_HOTPLUG) & VC4_HDMI_HOTPLUG_CONNECTED) {
+ 		connected = true;
+ 	}
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0005-drm-vc4-hdmi-Raise-the-maximum-clock-rate.patch b/root/target/linux/bcm27xx/patches-5.15/950-0005-drm-vc4-hdmi-Raise-the-maximum-clock-rate.patch
new file mode 100644
index 00000000..4a82d8ec
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0005-drm-vc4-hdmi-Raise-the-maximum-clock-rate.patch
@@ -0,0 +1,31 @@
+From 93e1f2ad3042e41c96031191f2bb6db2d0011e9c Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Mon, 25 Oct 2021 17:29:01 +0200
+Subject: [PATCH 005/828] drm/vc4: hdmi: Raise the maximum clock rate
+
+Now that we have the infrastructure in place, we can raise the maximum
+pixel rate we can reach for HDMI0 on the BCM2711.
+
+HDMI1 is left untouched since its pixelvalve has a smaller FIFO and
+would need a clock faster than what we can provide to support the same
+modes.
+
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Link: https://lore.kernel.org/r/20211025152903.1088803-9-maxime@cerno.tech
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -2377,7 +2377,7 @@ static const struct vc4_hdmi_variant bcm
+ 	.encoder_type		= VC4_ENCODER_TYPE_HDMI0,
+ 	.debugfs_name		= "hdmi0_regs",
+ 	.card_name		= "vc4-hdmi-0",
+-	.max_pixel_clock	= HDMI_14_MAX_TMDS_CLK,
++	.max_pixel_clock	= 600000000,
+ 	.registers		= vc5_hdmi_hdmi0_fields,
+ 	.num_registers		= ARRAY_SIZE(vc5_hdmi_hdmi0_fields),
+ 	.phy_lane_mapping	= {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0006-drm-vc4-hdmi-Fix-HPD-GPIO-detection.patch b/root/target/linux/bcm27xx/patches-5.15/950-0006-drm-vc4-hdmi-Fix-HPD-GPIO-detection.patch
new file mode 100644
index 00000000..037ee62f
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0006-drm-vc4-hdmi-Fix-HPD-GPIO-detection.patch
@@ -0,0 +1,40 @@
+From 67b3c9ae6cea0f3bba4447b1c0748eead5551b09 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Mon, 25 Oct 2021 17:28:55 +0200
+Subject: [PATCH 006/828] drm/vc4: hdmi: Fix HPD GPIO detection
+
+Prior to commit 6800234ceee0 ("drm/vc4: hdmi: Convert to gpiod"), in the
+detect hook, if we had an HPD GPIO we would only rely on it and return
+whatever state it was in.
+
+However, that commit changed that by mistake to only consider the case
+where we have a GPIO and it returns a logical high, and would fall back
+to the other methods otherwise.
+
+Since we can read the EDIDs when the HPD signal is low on some displays,
+we changed the detection status from disconnected to connected, and we
+would ignore an HPD pulse.
+
+Fixes: 6800234ceee0 ("drm/vc4: hdmi: Convert to gpiod")
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Link: https://lore.kernel.org/r/20211025152903.1088803-3-maxime@cerno.tech
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -172,9 +172,9 @@ vc4_hdmi_connector_detect(struct drm_con
+ 
+ 	WARN_ON(pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev));
+ 
+-	if (vc4_hdmi->hpd_gpio &&
+-	    gpiod_get_value_cansleep(vc4_hdmi->hpd_gpio)) {
+-		connected = true;
++	if (vc4_hdmi->hpd_gpio) {
++		if (gpiod_get_value_cansleep(vc4_hdmi->hpd_gpio))
++			connected = true;
+ 	} else if (HDMI_READ(HDMI_HOTPLUG) & VC4_HDMI_HOTPLUG_CONNECTED) {
+ 		connected = true;
+ 	}
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0007-drm-vc4-hdmi-Add-a-spinlock-to-protect-register-acce.patch b/root/target/linux/bcm27xx/patches-5.15/950-0007-drm-vc4-hdmi-Add-a-spinlock-to-protect-register-acce.patch
new file mode 100644
index 00000000..9d4a80c0
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0007-drm-vc4-hdmi-Add-a-spinlock-to-protect-register-acce.patch
@@ -0,0 +1,907 @@
+From 2420cd113b423d855a00fd587599955970bb9993 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Mon, 25 Oct 2021 16:11:08 +0200
+Subject: [PATCH 007/828] drm/vc4: hdmi: Add a spinlock to protect register
+ access
+
+The vc4 HDMI driver has multiple path shared between the CEC, ALSA and
+KMS frameworks, plus two interrupt handlers (CEC and hotplug) that will
+read and modify a number of registers.
+
+Even though not bug has been reported so far, it's definitely unsafe, so
+let's just add a spinlock to protect the register access of the HDMI
+controller.
+
+Link: https://lore.kernel.org/r/20211025141113.702757-5-maxime@cerno.tech
+Fixes: c8b75bca92cb ("drm/vc4: Add KMS support for Raspberry Pi.")
+Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c      | 202 ++++++++++++++++++++++++++--
+ drivers/gpu/drm/vc4/vc4_hdmi.h      |   5 +
+ drivers/gpu/drm/vc4/vc4_hdmi_phy.c  |  37 +++++
+ drivers/gpu/drm/vc4/vc4_hdmi_regs.h |   2 +
+ 4 files changed, 236 insertions(+), 10 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -118,6 +118,10 @@ static int vc4_hdmi_debugfs_regs(struct
+ 
+ static void vc4_hdmi_reset(struct vc4_hdmi *vc4_hdmi)
+ {
++	unsigned long flags;
++
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++
+ 	HDMI_WRITE(HDMI_M_CTL, VC4_HD_M_SW_RST);
+ 	udelay(1);
+ 	HDMI_WRITE(HDMI_M_CTL, 0);
+@@ -129,24 +133,36 @@ static void vc4_hdmi_reset(struct vc4_hd
+ 		   VC4_HDMI_SW_RESET_FORMAT_DETECT);
+ 
+ 	HDMI_WRITE(HDMI_SW_RESET_CONTROL, 0);
++
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+ static void vc5_hdmi_reset(struct vc4_hdmi *vc4_hdmi)
+ {
++	unsigned long flags;
++
+ 	reset_control_reset(vc4_hdmi->reset);
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++
+ 	HDMI_WRITE(HDMI_DVP_CTL, 0);
+ 
+ 	HDMI_WRITE(HDMI_CLOCK_STOP,
+ 		   HDMI_READ(HDMI_CLOCK_STOP) | VC4_DVP_HT_CLOCK_STOP_PIXEL);
++
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+ #ifdef CONFIG_DRM_VC4_HDMI_CEC
+ static void vc4_hdmi_cec_update_clk_div(struct vc4_hdmi *vc4_hdmi)
+ {
++	unsigned long cec_rate = clk_get_rate(vc4_hdmi->cec_clock);
++	unsigned long flags;
+ 	u16 clk_cnt;
+ 	u32 value;
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++
+ 	value = HDMI_READ(HDMI_CEC_CNTRL_1);
+ 	value &= ~VC4_HDMI_CEC_DIV_CLK_CNT_MASK;
+ 
+@@ -154,9 +170,11 @@ static void vc4_hdmi_cec_update_clk_div(
+ 	 * Set the clock divider: the hsm_clock rate and this divider
+ 	 * setting will give a 40 kHz CEC clock.
+ 	 */
+-	clk_cnt = clk_get_rate(vc4_hdmi->cec_clock) / CEC_CLOCK_FREQ;
++	clk_cnt = cec_rate / CEC_CLOCK_FREQ;
+ 	value |= clk_cnt << VC4_HDMI_CEC_DIV_CLK_CNT_SHIFT;
+ 	HDMI_WRITE(HDMI_CEC_CNTRL_1, value);
++
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ #else
+ static void vc4_hdmi_cec_update_clk_div(struct vc4_hdmi *vc4_hdmi) {}
+@@ -175,8 +193,16 @@ vc4_hdmi_connector_detect(struct drm_con
+ 	if (vc4_hdmi->hpd_gpio) {
+ 		if (gpiod_get_value_cansleep(vc4_hdmi->hpd_gpio))
+ 			connected = true;
+-	} else if (HDMI_READ(HDMI_HOTPLUG) & VC4_HDMI_HOTPLUG_CONNECTED) {
+-		connected = true;
++	} else {
++		unsigned long flags;
++		u32 hotplug;
++
++		spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++		hotplug = HDMI_READ(HDMI_HOTPLUG);
++		spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
++		if (hotplug & VC4_HDMI_HOTPLUG_CONNECTED)
++			connected = true;
+ 	}
+ 
+ 	if (connected) {
+@@ -370,9 +396,12 @@ static int vc4_hdmi_stop_packet(struct d
+ {
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
+ 	u32 packet_id = type - 0x80;
++	unsigned long flags;
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_RAM_PACKET_CONFIG,
+ 		   HDMI_READ(HDMI_RAM_PACKET_CONFIG) & ~BIT(packet_id));
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ 
+ 	if (!poll)
+ 		return 0;
+@@ -392,6 +421,7 @@ static void vc4_hdmi_write_infoframe(str
+ 	void __iomem *base = __vc4_hdmi_get_field_base(vc4_hdmi,
+ 						       ram_packet_start->reg);
+ 	uint8_t buffer[VC4_HDMI_PACKET_STRIDE];
++	unsigned long flags;
+ 	ssize_t len, i;
+ 	int ret;
+ 
+@@ -409,6 +439,8 @@ static void vc4_hdmi_write_infoframe(str
+ 		return;
+ 	}
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++
+ 	for (i = 0; i < len; i += 7) {
+ 		writel(buffer[i + 0] << 0 |
+ 		       buffer[i + 1] << 8 |
+@@ -426,6 +458,9 @@ static void vc4_hdmi_write_infoframe(str
+ 
+ 	HDMI_WRITE(HDMI_RAM_PACKET_CONFIG,
+ 		   HDMI_READ(HDMI_RAM_PACKET_CONFIG) | BIT(packet_id));
++
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
+ 	ret = wait_for((HDMI_READ(HDMI_RAM_PACKET_STATUS) &
+ 			BIT(packet_id)), 100);
+ 	if (ret)
+@@ -545,6 +580,7 @@ static void vc4_hdmi_enable_scrambling(s
+ {
+ 	struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
++	unsigned long flags;
+ 
+ 	if (!vc4_hdmi_supports_scrambling(encoder, mode))
+ 		return;
+@@ -555,8 +591,10 @@ static void vc4_hdmi_enable_scrambling(s
+ 	drm_scdc_set_high_tmds_clock_ratio(vc4_hdmi->ddc, true);
+ 	drm_scdc_set_scrambling(vc4_hdmi->ddc, true);
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_SCRAMBLER_CTL, HDMI_READ(HDMI_SCRAMBLER_CTL) |
+ 		   VC5_HDMI_SCRAMBLER_CTL_ENABLE);
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ 
+ 	queue_delayed_work(system_wq, &vc4_hdmi->scrambling_work,
+ 			   msecs_to_jiffies(SCRAMBLING_POLLING_DELAY_MS));
+@@ -566,6 +604,7 @@ static void vc4_hdmi_disable_scrambling(
+ {
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
+ 	struct drm_crtc *crtc = encoder->crtc;
++	unsigned long flags;
+ 
+ 	/*
+ 	 * At boot, encoder->crtc will be NULL. Since we don't know the
+@@ -581,8 +620,10 @@ static void vc4_hdmi_disable_scrambling(
+ 	if (delayed_work_pending(&vc4_hdmi->scrambling_work))
+ 		cancel_delayed_work_sync(&vc4_hdmi->scrambling_work);
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_SCRAMBLER_CTL, HDMI_READ(HDMI_SCRAMBLER_CTL) &
+ 		   ~VC5_HDMI_SCRAMBLER_CTL_ENABLE);
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ 
+ 	drm_scdc_set_scrambling(vc4_hdmi->ddc, false);
+ 	drm_scdc_set_high_tmds_clock_ratio(vc4_hdmi->ddc, false);
+@@ -608,15 +649,23 @@ static void vc4_hdmi_encoder_post_crtc_d
+ 					       struct drm_atomic_state *state)
+ {
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
++	unsigned long flags;
++
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 
+ 	HDMI_WRITE(HDMI_RAM_PACKET_CONFIG, 0);
+ 
+ 	HDMI_WRITE(HDMI_VID_CTL, HDMI_READ(HDMI_VID_CTL) | VC4_HD_VID_CTL_CLRRGB);
+ 
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
+ 	mdelay(1);
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_VID_CTL,
+ 		   HDMI_READ(HDMI_VID_CTL) & ~VC4_HD_VID_CTL_ENABLE);
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
+ 	vc4_hdmi_disable_scrambling(encoder);
+ }
+ 
+@@ -624,10 +673,13 @@ static void vc4_hdmi_encoder_post_crtc_p
+ 						 struct drm_atomic_state *state)
+ {
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
++	unsigned long flags;
+ 	int ret;
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_VID_CTL,
+ 		   HDMI_READ(HDMI_VID_CTL) | VC4_HD_VID_CTL_BLANKPIX);
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ 
+ 	if (vc4_hdmi->variant->phy_disable)
+ 		vc4_hdmi->variant->phy_disable(vc4_hdmi);
+@@ -646,8 +698,11 @@ static void vc4_hdmi_encoder_disable(str
+ 
+ static void vc4_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi, bool enable)
+ {
++	unsigned long flags;
+ 	u32 csc_ctl;
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++
+ 	csc_ctl = VC4_SET_FIELD(VC4_HD_CSC_CTL_ORDER_BGR,
+ 				VC4_HD_CSC_CTL_ORDER);
+ 
+@@ -677,14 +732,19 @@ static void vc4_hdmi_csc_setup(struct vc
+ 
+ 	/* The RGB order applies even when CSC is disabled. */
+ 	HDMI_WRITE(HDMI_CSC_CTL, csc_ctl);
++
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+ static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi, bool enable)
+ {
++	unsigned long flags;
+ 	u32 csc_ctl;
+ 
+ 	csc_ctl = 0x07;	/* RGB_CONVERT_MODE = custom matrix, || USE_RGB_TO_YCBCR */
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++
+ 	if (enable) {
+ 		/* CEA VICs other than #1 requre limited range RGB
+ 		 * output unless overridden by an AVI infoframe.
+@@ -716,6 +776,8 @@ static void vc5_hdmi_csc_setup(struct vc
+ 	}
+ 
+ 	HDMI_WRITE(HDMI_CSC_CTL, csc_ctl);
++
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+ static void vc4_hdmi_set_timings(struct vc4_hdmi *vc4_hdmi,
+@@ -739,6 +801,9 @@ static void vc4_hdmi_set_timings(struct
+ 					mode->crtc_vsync_end -
+ 					interlaced,
+ 					VC4_HDMI_VERTB_VBP));
++	unsigned long flags;
++
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 
+ 	HDMI_WRITE(HDMI_HORZA,
+ 		   (vsync_pos ? VC4_HDMI_HORZA_VPOS : 0) |
+@@ -762,6 +827,8 @@ static void vc4_hdmi_set_timings(struct
+ 
+ 	HDMI_WRITE(HDMI_VERTB0, vertb_even);
+ 	HDMI_WRITE(HDMI_VERTB1, vertb);
++
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+ static void vc5_hdmi_set_timings(struct vc4_hdmi *vc4_hdmi,
+@@ -785,10 +852,13 @@ static void vc5_hdmi_set_timings(struct
+ 					mode->crtc_vsync_end -
+ 					interlaced,
+ 					VC4_HDMI_VERTB_VBP));
++	unsigned long flags;
+ 	unsigned char gcp;
+ 	bool gcp_en;
+ 	u32 reg;
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++
+ 	HDMI_WRITE(HDMI_VEC_INTERFACE_XBAR, 0x354021);
+ 	HDMI_WRITE(HDMI_HORZA,
+ 		   (vsync_pos ? VC5_HDMI_HORZA_VPOS : 0) |
+@@ -847,13 +917,18 @@ static void vc5_hdmi_set_timings(struct
+ 	HDMI_WRITE(HDMI_GCP_CONFIG, reg);
+ 
+ 	HDMI_WRITE(HDMI_CLOCK_STOP, 0);
++
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+ static void vc4_hdmi_recenter_fifo(struct vc4_hdmi *vc4_hdmi)
+ {
++	unsigned long flags;
+ 	u32 drift;
+ 	int ret;
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++
+ 	drift = HDMI_READ(HDMI_FIFO_CTL);
+ 	drift &= VC4_HDMI_FIFO_VALID_WRITE_MASK;
+ 
+@@ -861,12 +936,20 @@ static void vc4_hdmi_recenter_fifo(struc
+ 		   drift & ~VC4_HDMI_FIFO_CTL_RECENTER);
+ 	HDMI_WRITE(HDMI_FIFO_CTL,
+ 		   drift | VC4_HDMI_FIFO_CTL_RECENTER);
++
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
+ 	usleep_range(1000, 1100);
++
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++
+ 	HDMI_WRITE(HDMI_FIFO_CTL,
+ 		   drift & ~VC4_HDMI_FIFO_CTL_RECENTER);
+ 	HDMI_WRITE(HDMI_FIFO_CTL,
+ 		   drift | VC4_HDMI_FIFO_CTL_RECENTER);
+ 
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
+ 	ret = wait_for(HDMI_READ(HDMI_FIFO_CTL) &
+ 		       VC4_HDMI_FIFO_CTL_RECENTER_DONE, 1);
+ 	WARN_ONCE(ret, "Timeout waiting for "
+@@ -900,6 +983,7 @@ static void vc4_hdmi_encoder_pre_crtc_co
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
+ 	unsigned long pixel_rate = vc4_conn_state->pixel_rate;
+ 	unsigned long bvb_rate, hsm_rate;
++	unsigned long flags;
+ 	int ret;
+ 
+ 	/*
+@@ -968,11 +1052,15 @@ static void vc4_hdmi_encoder_pre_crtc_co
+ 	if (vc4_hdmi->variant->phy_init)
+ 		vc4_hdmi->variant->phy_init(vc4_hdmi, vc4_conn_state);
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++
+ 	HDMI_WRITE(HDMI_SCHEDULER_CONTROL,
+ 		   HDMI_READ(HDMI_SCHEDULER_CONTROL) |
+ 		   VC4_HDMI_SCHEDULER_CONTROL_MANUAL_FORMAT |
+ 		   VC4_HDMI_SCHEDULER_CONTROL_IGNORE_VSYNC_PREDICTS);
+ 
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
+ 	if (vc4_hdmi->variant->set_timings)
+ 		vc4_hdmi->variant->set_timings(vc4_hdmi, conn_state, mode);
+ 
+@@ -992,6 +1080,7 @@ static void vc4_hdmi_encoder_pre_crtc_en
+ 	struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
+ 	struct vc4_hdmi_encoder *vc4_encoder = to_vc4_hdmi_encoder(encoder);
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
++	unsigned long flags;
+ 
+ 	if (vc4_encoder->hdmi_monitor &&
+ 	    drm_default_rgb_quant_range(mode) == HDMI_QUANTIZATION_RANGE_LIMITED) {
+@@ -1006,7 +1095,9 @@ static void vc4_hdmi_encoder_pre_crtc_en
+ 		vc4_encoder->limited_rgb_range = false;
+ 	}
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_FIFO_CTL, VC4_HDMI_FIFO_CTL_MASTER_SLAVE_N);
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+ static void vc4_hdmi_encoder_post_crtc_enable(struct drm_encoder *encoder,
+@@ -1017,8 +1108,11 @@ static void vc4_hdmi_encoder_post_crtc_e
+ 	struct vc4_hdmi_encoder *vc4_encoder = to_vc4_hdmi_encoder(encoder);
+ 	bool hsync_pos = mode->flags & DRM_MODE_FLAG_PHSYNC;
+ 	bool vsync_pos = mode->flags & DRM_MODE_FLAG_PVSYNC;
++	unsigned long flags;
+ 	int ret;
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++
+ 	HDMI_WRITE(HDMI_VID_CTL,
+ 		   VC4_HD_VID_CTL_ENABLE |
+ 		   VC4_HD_VID_CTL_CLRRGB |
+@@ -1035,6 +1129,8 @@ static void vc4_hdmi_encoder_post_crtc_e
+ 			   HDMI_READ(HDMI_SCHEDULER_CONTROL) |
+ 			   VC4_HDMI_SCHEDULER_CONTROL_MODE_HDMI);
+ 
++		spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
+ 		ret = wait_for(HDMI_READ(HDMI_SCHEDULER_CONTROL) &
+ 			       VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE, 1000);
+ 		WARN_ONCE(ret, "Timeout waiting for "
+@@ -1047,6 +1143,8 @@ static void vc4_hdmi_encoder_post_crtc_e
+ 			   HDMI_READ(HDMI_SCHEDULER_CONTROL) &
+ 			   ~VC4_HDMI_SCHEDULER_CONTROL_MODE_HDMI);
+ 
++		spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
+ 		ret = wait_for(!(HDMI_READ(HDMI_SCHEDULER_CONTROL) &
+ 				 VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE), 1000);
+ 		WARN_ONCE(ret, "Timeout waiting for "
+@@ -1054,6 +1152,8 @@ static void vc4_hdmi_encoder_post_crtc_e
+ 	}
+ 
+ 	if (vc4_encoder->hdmi_monitor) {
++		spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++
+ 		WARN_ON(!(HDMI_READ(HDMI_SCHEDULER_CONTROL) &
+ 			  VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE));
+ 		HDMI_WRITE(HDMI_SCHEDULER_CONTROL,
+@@ -1063,6 +1163,8 @@ static void vc4_hdmi_encoder_post_crtc_e
+ 		HDMI_WRITE(HDMI_RAM_PACKET_CONFIG,
+ 			   VC4_HDMI_RAM_PACKET_ENABLE);
+ 
++		spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
+ 		vc4_hdmi_set_infoframes(encoder);
+ 	}
+ 
+@@ -1186,6 +1288,7 @@ static void vc4_hdmi_audio_set_mai_clock
+ 					 unsigned int samplerate)
+ {
+ 	u32 hsm_clock = clk_get_rate(vc4_hdmi->audio_clock);
++	unsigned long flags;
+ 	unsigned long n, m;
+ 
+ 	rational_best_approximation(hsm_clock, samplerate,
+@@ -1195,9 +1298,11 @@ static void vc4_hdmi_audio_set_mai_clock
+ 				     VC4_HD_MAI_SMP_M_SHIFT) + 1,
+ 				    &n, &m);
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_MAI_SMP,
+ 		   VC4_SET_FIELD(n, VC4_HD_MAI_SMP_N) |
+ 		   VC4_SET_FIELD(m - 1, VC4_HD_MAI_SMP_M));
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+ static void vc4_hdmi_set_n_cts(struct vc4_hdmi *vc4_hdmi, unsigned int samplerate)
+@@ -1208,6 +1313,8 @@ static void vc4_hdmi_set_n_cts(struct vc
+ 	u32 n, cts;
+ 	u64 tmp;
+ 
++	lockdep_assert_held(&vc4_hdmi->hw_lock);
++
+ 	n = 128 * samplerate / 1000;
+ 	tmp = (u64)(mode->clock * 1000) * n;
+ 	do_div(tmp, 128 * samplerate);
+@@ -1237,6 +1344,7 @@ static int vc4_hdmi_audio_startup(struct
+ {
+ 	struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
+ 	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
++	unsigned long flags;
+ 
+ 	/*
+ 	 * If the HDMI encoder hasn't probed, or the encoder is
+@@ -1248,12 +1356,14 @@ static int vc4_hdmi_audio_startup(struct
+ 
+ 	vc4_hdmi->audio.streaming = true;
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_MAI_CTL,
+ 		   VC4_HD_MAI_CTL_RESET |
+ 		   VC4_HD_MAI_CTL_FLUSH |
+ 		   VC4_HD_MAI_CTL_DLATE |
+ 		   VC4_HD_MAI_CTL_ERRORE |
+ 		   VC4_HD_MAI_CTL_ERRORF);
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ 
+ 	if (vc4_hdmi->variant->phy_rng_enable)
+ 		vc4_hdmi->variant->phy_rng_enable(vc4_hdmi);
+@@ -1265,6 +1375,7 @@ static void vc4_hdmi_audio_reset(struct
+ {
+ 	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
+ 	struct device *dev = &vc4_hdmi->pdev->dev;
++	unsigned long flags;
+ 	int ret;
+ 
+ 	vc4_hdmi->audio.streaming = false;
+@@ -1272,20 +1383,29 @@ static void vc4_hdmi_audio_reset(struct
+ 	if (ret)
+ 		dev_err(dev, "Failed to stop audio infoframe: %d\n", ret);
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++
+ 	HDMI_WRITE(HDMI_MAI_CTL, VC4_HD_MAI_CTL_RESET);
+ 	HDMI_WRITE(HDMI_MAI_CTL, VC4_HD_MAI_CTL_ERRORF);
+ 	HDMI_WRITE(HDMI_MAI_CTL, VC4_HD_MAI_CTL_FLUSH);
++
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+ static void vc4_hdmi_audio_shutdown(struct device *dev, void *data)
+ {
+ 	struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
++	unsigned long flags;
++
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 
+ 	HDMI_WRITE(HDMI_MAI_CTL,
+ 		   VC4_HD_MAI_CTL_DLATE |
+ 		   VC4_HD_MAI_CTL_ERRORE |
+ 		   VC4_HD_MAI_CTL_ERRORF);
+ 
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
+ 	if (vc4_hdmi->variant->phy_rng_disable)
+ 		vc4_hdmi->variant->phy_rng_disable(vc4_hdmi);
+ 
+@@ -1340,6 +1460,7 @@ static int vc4_hdmi_audio_prepare(struct
+ 	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
+ 	unsigned int sample_rate = params->sample_rate;
+ 	unsigned int channels = params->channels;
++	unsigned long flags;
+ 	u32 audio_packet_config, channel_mask;
+ 	u32 channel_map;
+ 	u32 mai_audio_format;
+@@ -1348,14 +1469,15 @@ static int vc4_hdmi_audio_prepare(struct
+ 	dev_dbg(dev, "%s: %u Hz, %d bit, %d channels\n", __func__,
+ 		sample_rate, params->sample_width, channels);
+ 
++	vc4_hdmi_audio_set_mai_clock(vc4_hdmi, sample_rate);
++
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_MAI_CTL,
+ 		   VC4_SET_FIELD(channels, VC4_HD_MAI_CTL_CHNUM) |
+ 		   VC4_HD_MAI_CTL_WHOLSMP |
+ 		   VC4_HD_MAI_CTL_CHALIGN |
+ 		   VC4_HD_MAI_CTL_ENABLE);
+ 
+-	vc4_hdmi_audio_set_mai_clock(vc4_hdmi, sample_rate);
+-
+ 	mai_sample_rate = sample_rate_to_mai_fmt(sample_rate);
+ 	if (params->iec.status[0] & IEC958_AES0_NONAUDIO &&
+ 	    params->channels == 8)
+@@ -1393,8 +1515,11 @@ static int vc4_hdmi_audio_prepare(struct
+ 	channel_map = vc4_hdmi->variant->channel_map(vc4_hdmi, channel_mask);
+ 	HDMI_WRITE(HDMI_MAI_CHANNEL_MAP, channel_map);
+ 	HDMI_WRITE(HDMI_AUDIO_PACKET_CONFIG, audio_packet_config);
++
+ 	vc4_hdmi_set_n_cts(vc4_hdmi, sample_rate);
+ 
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
+ 	memcpy(&vc4_hdmi->audio.infoframe, &params->cea, sizeof(params->cea));
+ 	vc4_hdmi_set_audio_infoframe(encoder);
+ 
+@@ -1668,6 +1793,8 @@ static void vc4_cec_read_msg(struct vc4_
+ 	struct cec_msg *msg = &vc4_hdmi->cec_rx_msg;
+ 	unsigned int i;
+ 
++	lockdep_assert_held(&vc4_hdmi->hw_lock);
++
+ 	msg->len = 1 + ((cntrl1 & VC4_HDMI_CEC_REC_WRD_CNT_MASK) >>
+ 					VC4_HDMI_CEC_REC_WRD_CNT_SHIFT);
+ 
+@@ -1686,11 +1813,12 @@ static void vc4_cec_read_msg(struct vc4_
+ 	}
+ }
+ 
+-static irqreturn_t vc4_cec_irq_handler_tx_bare(int irq, void *priv)
++static irqreturn_t vc4_cec_irq_handler_tx_bare_locked(struct vc4_hdmi *vc4_hdmi)
+ {
+-	struct vc4_hdmi *vc4_hdmi = priv;
+ 	u32 cntrl1;
+ 
++	lockdep_assert_held(&vc4_hdmi->hw_lock);
++
+ 	cntrl1 = HDMI_READ(HDMI_CEC_CNTRL_1);
+ 	vc4_hdmi->cec_tx_ok = cntrl1 & VC4_HDMI_CEC_TX_STATUS_GOOD;
+ 	cntrl1 &= ~VC4_HDMI_CEC_START_XMIT_BEGIN;
+@@ -1699,11 +1827,24 @@ static irqreturn_t vc4_cec_irq_handler_t
+ 	return IRQ_WAKE_THREAD;
+ }
+ 
+-static irqreturn_t vc4_cec_irq_handler_rx_bare(int irq, void *priv)
++static irqreturn_t vc4_cec_irq_handler_tx_bare(int irq, void *priv)
+ {
+ 	struct vc4_hdmi *vc4_hdmi = priv;
++	irqreturn_t ret;
++
++	spin_lock(&vc4_hdmi->hw_lock);
++	ret = vc4_cec_irq_handler_tx_bare_locked(vc4_hdmi);
++	spin_unlock(&vc4_hdmi->hw_lock);
++
++	return ret;
++}
++
++static irqreturn_t vc4_cec_irq_handler_rx_bare_locked(struct vc4_hdmi *vc4_hdmi)
++{
+ 	u32 cntrl1;
+ 
++	lockdep_assert_held(&vc4_hdmi->hw_lock);
++
+ 	vc4_hdmi->cec_rx_msg.len = 0;
+ 	cntrl1 = HDMI_READ(HDMI_CEC_CNTRL_1);
+ 	vc4_cec_read_msg(vc4_hdmi, cntrl1);
+@@ -1716,6 +1857,18 @@ static irqreturn_t vc4_cec_irq_handler_r
+ 	return IRQ_WAKE_THREAD;
+ }
+ 
++static irqreturn_t vc4_cec_irq_handler_rx_bare(int irq, void *priv)
++{
++	struct vc4_hdmi *vc4_hdmi = priv;
++	irqreturn_t ret;
++
++	spin_lock(&vc4_hdmi->hw_lock);
++	ret = vc4_cec_irq_handler_rx_bare_locked(vc4_hdmi);
++	spin_unlock(&vc4_hdmi->hw_lock);
++
++	return ret;
++}
++
+ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv)
+ {
+ 	struct vc4_hdmi *vc4_hdmi = priv;
+@@ -1726,14 +1879,17 @@ static irqreturn_t vc4_cec_irq_handler(i
+ 	if (!(stat & VC4_HDMI_CPU_CEC))
+ 		return IRQ_NONE;
+ 
++	spin_lock(&vc4_hdmi->hw_lock);
+ 	cntrl5 = HDMI_READ(HDMI_CEC_CNTRL_5);
+ 	vc4_hdmi->cec_irq_was_rx = cntrl5 & VC4_HDMI_CEC_RX_CEC_INT;
+ 	if (vc4_hdmi->cec_irq_was_rx)
+-		ret = vc4_cec_irq_handler_rx_bare(irq, priv);
++		ret = vc4_cec_irq_handler_rx_bare_locked(vc4_hdmi);
+ 	else
+-		ret = vc4_cec_irq_handler_tx_bare(irq, priv);
++		ret = vc4_cec_irq_handler_tx_bare_locked(vc4_hdmi);
+ 
+ 	HDMI_WRITE(HDMI_CEC_CPU_CLEAR, VC4_HDMI_CPU_CEC);
++	spin_unlock(&vc4_hdmi->hw_lock);
++
+ 	return ret;
+ }
+ 
+@@ -1742,6 +1898,7 @@ static int vc4_hdmi_cec_enable(struct ce
+ 	struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap);
+ 	/* clock period in microseconds */
+ 	const u32 usecs = 1000000 / CEC_CLOCK_FREQ;
++	unsigned long flags;
+ 	u32 val;
+ 	int ret;
+ 
+@@ -1749,6 +1906,8 @@ static int vc4_hdmi_cec_enable(struct ce
+ 	if (ret)
+ 		return ret;
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++
+ 	val = HDMI_READ(HDMI_CEC_CNTRL_5);
+ 	val &= ~(VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET |
+ 		 VC4_HDMI_CEC_CNT_TO_4700_US_MASK |
+@@ -1779,12 +1938,17 @@ static int vc4_hdmi_cec_enable(struct ce
+ 	if (!vc4_hdmi->variant->external_irq_controller)
+ 		HDMI_WRITE(HDMI_CEC_CPU_MASK_CLEAR, VC4_HDMI_CPU_CEC);
+ 
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
+ 	return 0;
+ }
+ 
+ static int vc4_hdmi_cec_disable(struct cec_adapter *adap)
+ {
+ 	struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap);
++	unsigned long flags;
++
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 
+ 	if (!vc4_hdmi->variant->external_irq_controller)
+ 		HDMI_WRITE(HDMI_CEC_CPU_MASK_SET, VC4_HDMI_CPU_CEC);
+@@ -1792,6 +1956,8 @@ static int vc4_hdmi_cec_disable(struct c
+ 	HDMI_WRITE(HDMI_CEC_CNTRL_5, HDMI_READ(HDMI_CEC_CNTRL_5) |
+ 		   VC4_HDMI_CEC_TX_SW_RESET | VC4_HDMI_CEC_RX_SW_RESET);
+ 
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
+ 	pm_runtime_put(&vc4_hdmi->pdev->dev);
+ 
+ 	return 0;
+@@ -1808,10 +1974,14 @@ static int vc4_hdmi_cec_adap_enable(stru
+ static int vc4_hdmi_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr)
+ {
+ 	struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap);
++	unsigned long flags;
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_CEC_CNTRL_1,
+ 		   (HDMI_READ(HDMI_CEC_CNTRL_1) & ~VC4_HDMI_CEC_ADDR_MASK) |
+ 		   (log_addr & 0xf) << VC4_HDMI_CEC_ADDR_SHIFT);
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
+ 	return 0;
+ }
+ 
+@@ -1820,6 +1990,7 @@ static int vc4_hdmi_cec_adap_transmit(st
+ {
+ 	struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap);
+ 	struct drm_device *dev = vc4_hdmi->connector.dev;
++	unsigned long flags;
+ 	u32 val;
+ 	unsigned int i;
+ 
+@@ -1828,6 +1999,8 @@ static int vc4_hdmi_cec_adap_transmit(st
+ 		return -ENOMEM;
+ 	}
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++
+ 	for (i = 0; i < msg->len; i += 4)
+ 		HDMI_WRITE(HDMI_CEC_TX_DATA_1 + (i >> 2),
+ 			   (msg->msg[i]) |
+@@ -1843,6 +2016,9 @@ static int vc4_hdmi_cec_adap_transmit(st
+ 	val |= VC4_HDMI_CEC_START_XMIT_BEGIN;
+ 
+ 	HDMI_WRITE(HDMI_CEC_CNTRL_1, val);
++
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
+ 	return 0;
+ }
+ 
+@@ -1857,6 +2033,7 @@ static int vc4_hdmi_cec_init(struct vc4_
+ 	struct cec_connector_info conn_info;
+ 	struct platform_device *pdev = vc4_hdmi->pdev;
+ 	struct device *dev = &pdev->dev;
++	unsigned long flags;
+ 	u32 value;
+ 	int ret;
+ 
+@@ -1876,10 +2053,12 @@ static int vc4_hdmi_cec_init(struct vc4_
+ 	cec_fill_conn_info_from_drm(&conn_info, &vc4_hdmi->connector);
+ 	cec_s_conn_info(vc4_hdmi->cec_adap, &conn_info);
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	value = HDMI_READ(HDMI_CEC_CNTRL_1);
+ 	/* Set the logical address to Unregistered */
+ 	value |= VC4_HDMI_CEC_ADDR_MASK;
+ 	HDMI_WRITE(HDMI_CEC_CNTRL_1, value);
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ 
+ 	vc4_hdmi_cec_update_clk_div(vc4_hdmi);
+ 
+@@ -1898,7 +2077,9 @@ static int vc4_hdmi_cec_init(struct vc4_
+ 		if (ret)
+ 			goto err_remove_cec_rx_handler;
+ 	} else {
++		spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 		HDMI_WRITE(HDMI_CEC_CPU_MASK_SET, 0xffffffff);
++		spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ 
+ 		ret = request_threaded_irq(platform_get_irq(pdev, 0),
+ 					   vc4_cec_irq_handler,
+@@ -2168,6 +2349,7 @@ static int vc4_hdmi_bind(struct device *
+ 	vc4_hdmi = devm_kzalloc(dev, sizeof(*vc4_hdmi), GFP_KERNEL);
+ 	if (!vc4_hdmi)
+ 		return -ENOMEM;
++	spin_lock_init(&vc4_hdmi->hw_lock);
+ 	INIT_DELAYED_WORK(&vc4_hdmi->scrambling_work, vc4_hdmi_scrambling_wq);
+ 
+ 	dev_set_drvdata(dev, vc4_hdmi);
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
+@@ -179,6 +179,11 @@ struct vc4_hdmi {
+ 
+ 	struct debugfs_regset32 hdmi_regset;
+ 	struct debugfs_regset32 hd_regset;
++
++	/**
++	 * @hw_lock: Spinlock protecting device register access.
++	 */
++	spinlock_t hw_lock;
+ };
+ 
+ static inline struct vc4_hdmi *
+--- a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
+@@ -130,31 +130,49 @@
+ void vc4_hdmi_phy_init(struct vc4_hdmi *vc4_hdmi,
+ 		       struct vc4_hdmi_connector_state *conn_state)
+ {
++	unsigned long flags;
++
+ 	/* PHY should be in reset, like
+ 	 * vc4_hdmi_encoder_disable() does.
+ 	 */
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++
+ 	HDMI_WRITE(HDMI_TX_PHY_RESET_CTL, 0xf << 16);
+ 	HDMI_WRITE(HDMI_TX_PHY_RESET_CTL, 0);
++
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+ void vc4_hdmi_phy_disable(struct vc4_hdmi *vc4_hdmi)
+ {
++	unsigned long flags;
++
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_TX_PHY_RESET_CTL, 0xf << 16);
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+ void vc4_hdmi_phy_rng_enable(struct vc4_hdmi *vc4_hdmi)
+ {
++	unsigned long flags;
++
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_TX_PHY_CTL_0,
+ 		   HDMI_READ(HDMI_TX_PHY_CTL_0) &
+ 		   ~VC4_HDMI_TX_PHY_RNG_PWRDN);
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+ void vc4_hdmi_phy_rng_disable(struct vc4_hdmi *vc4_hdmi)
+ {
++	unsigned long flags;
++
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_TX_PHY_CTL_0,
+ 		   HDMI_READ(HDMI_TX_PHY_CTL_0) |
+ 		   VC4_HDMI_TX_PHY_RNG_PWRDN);
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+ static unsigned long long
+@@ -336,6 +354,8 @@ phy_get_channel_settings(enum vc4_hdmi_p
+ 
+ static void vc5_hdmi_reset_phy(struct vc4_hdmi *vc4_hdmi)
+ {
++	lockdep_assert_held(&vc4_hdmi->hw_lock);
++
+ 	HDMI_WRITE(HDMI_TX_PHY_RESET_CTL, 0x0f);
+ 	HDMI_WRITE(HDMI_TX_PHY_POWERDOWN_CTL, BIT(10));
+ }
+@@ -348,10 +368,13 @@ void vc5_hdmi_phy_init(struct vc4_hdmi *
+ 	unsigned long long pixel_freq = conn_state->pixel_rate;
+ 	unsigned long long vco_freq;
+ 	unsigned char word_sel;
++	unsigned long flags;
+ 	u8 vco_sel, vco_div;
+ 
+ 	vco_freq = phy_get_vco_freq(pixel_freq, &vco_sel, &vco_div);
+ 
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++
+ 	vc5_hdmi_reset_phy(vc4_hdmi);
+ 
+ 	HDMI_WRITE(HDMI_TX_PHY_POWERDOWN_CTL,
+@@ -501,23 +524,37 @@ void vc5_hdmi_phy_init(struct vc4_hdmi *
+ 		   HDMI_READ(HDMI_TX_PHY_RESET_CTL) |
+ 		   VC4_HDMI_TX_PHY_RESET_CTL_PLL_RESETB |
+ 		   VC4_HDMI_TX_PHY_RESET_CTL_PLLDIV_RESETB);
++
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+ void vc5_hdmi_phy_disable(struct vc4_hdmi *vc4_hdmi)
+ {
++	unsigned long flags;
++
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	vc5_hdmi_reset_phy(vc4_hdmi);
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+ void vc5_hdmi_phy_rng_enable(struct vc4_hdmi *vc4_hdmi)
+ {
++	unsigned long flags;
++
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_TX_PHY_POWERDOWN_CTL,
+ 		   HDMI_READ(HDMI_TX_PHY_POWERDOWN_CTL) &
+ 		   ~VC4_HDMI_TX_PHY_POWERDOWN_CTL_RNDGEN_PWRDN);
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+ void vc5_hdmi_phy_rng_disable(struct vc4_hdmi *vc4_hdmi)
+ {
++	unsigned long flags;
++
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_TX_PHY_POWERDOWN_CTL,
+ 		   HDMI_READ(HDMI_TX_PHY_POWERDOWN_CTL) |
+ 		   VC4_HDMI_TX_PHY_POWERDOWN_CTL_RNDGEN_PWRDN);
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+--- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
+@@ -442,6 +442,8 @@ static inline void vc4_hdmi_write(struct
+ 	const struct vc4_hdmi_variant *variant = hdmi->variant;
+ 	void __iomem *base;
+ 
++	lockdep_assert_held(&hdmi->hw_lock);
++
+ 	WARN_ON(!pm_runtime_active(&hdmi->pdev->dev));
+ 
+ 	if (reg >= variant->num_registers) {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0008-drm-vc4-hdmi-Use-a-mutex-to-prevent-concurrent-frame.patch b/root/target/linux/bcm27xx/patches-5.15/950-0008-drm-vc4-hdmi-Use-a-mutex-to-prevent-concurrent-frame.patch
new file mode 100644
index 00000000..3f820272
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0008-drm-vc4-hdmi-Use-a-mutex-to-prevent-concurrent-frame.patch
@@ -0,0 +1,444 @@
+From 0a307f1bd0ea3ee888d6fca239ae62a6fe2d39b2 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Mon, 25 Oct 2021 16:11:09 +0200
+Subject: [PATCH 008/828] drm/vc4: hdmi: Use a mutex to prevent concurrent
+ framework access
+
+The vc4 HDMI controller registers into the KMS, CEC and ALSA
+frameworks.
+
+However, no particular care is done to prevent the concurrent execution
+of different framework hooks from happening at the same time.
+
+In order to protect against that scenario, let's introduce a mutex that
+relevant ALSA and KMS hooks will need to take to prevent concurrent
+execution.
+
+CEC is left out at the moment though, since the .get_modes and .detect
+KMS hooks, when running cec_s_phys_addr_from_edid, can end up calling
+CEC's .adap_enable hook. This introduces some reentrancy that isn't easy
+to deal with properly.
+
+The CEC hooks also don't share much state with the rest of the driver:
+the registers are entirely separate, we don't share any variable, the
+only thing that can conflict is the CEC clock divider setup that can be
+affected by a mode set.
+
+However, after discussing it, it looks like CEC should be able to
+recover from this if it was to happen.
+
+Link: https://lore.kernel.org/r/20211025141113.702757-6-maxime@cerno.tech
+Fixes: bb7d78568814 ("drm/vc4: Add HDMI audio support")
+Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 118 +++++++++++++++++++++++++++++++--
+ drivers/gpu/drm/vc4/vc4_hdmi.h |  14 ++++
+ 2 files changed, 126 insertions(+), 6 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -188,6 +188,8 @@ vc4_hdmi_connector_detect(struct drm_con
+ 	struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector);
+ 	bool connected = false;
+ 
++	mutex_lock(&vc4_hdmi->mutex);
++
+ 	WARN_ON(pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev));
+ 
+ 	if (vc4_hdmi->hpd_gpio) {
+@@ -218,11 +220,13 @@ vc4_hdmi_connector_detect(struct drm_con
+ 
+ 		vc4_hdmi_enable_scrambling(&vc4_hdmi->encoder.base.base);
+ 		pm_runtime_put(&vc4_hdmi->pdev->dev);
++		mutex_unlock(&vc4_hdmi->mutex);
+ 		return connector_status_connected;
+ 	}
+ 
+ 	cec_phys_addr_invalidate(vc4_hdmi->cec_adap);
+ 	pm_runtime_put(&vc4_hdmi->pdev->dev);
++	mutex_unlock(&vc4_hdmi->mutex);
+ 	return connector_status_disconnected;
+ }
+ 
+@@ -239,10 +243,14 @@ static int vc4_hdmi_connector_get_modes(
+ 	int ret = 0;
+ 	struct edid *edid;
+ 
++	mutex_lock(&vc4_hdmi->mutex);
++
+ 	edid = drm_get_edid(connector, vc4_hdmi->ddc);
+ 	cec_s_phys_addr_from_edid(vc4_hdmi->cec_adap, edid);
+-	if (!edid)
+-		return -ENODEV;
++	if (!edid) {
++		ret = -ENODEV;
++		goto out;
++	}
+ 
+ 	vc4_encoder->hdmi_monitor = drm_detect_hdmi_monitor(edid);
+ 
+@@ -262,6 +270,9 @@ static int vc4_hdmi_connector_get_modes(
+ 		}
+ 	}
+ 
++out:
++	mutex_unlock(&vc4_hdmi->mutex);
++
+ 	return ret;
+ }
+ 
+@@ -478,6 +489,8 @@ static void vc4_hdmi_set_avi_infoframe(s
+ 	union hdmi_infoframe frame;
+ 	int ret;
+ 
++	lockdep_assert_held(&vc4_hdmi->mutex);
++
+ 	ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi,
+ 						       connector, mode);
+ 	if (ret < 0) {
+@@ -529,6 +542,8 @@ static void vc4_hdmi_set_hdr_infoframe(s
+ 	struct drm_connector_state *conn_state = connector->state;
+ 	union hdmi_infoframe frame;
+ 
++	lockdep_assert_held(&vc4_hdmi->mutex);
++
+ 	if (!vc4_hdmi->variant->supports_hdr)
+ 		return;
+ 
+@@ -545,6 +560,8 @@ static void vc4_hdmi_set_infoframes(stru
+ {
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
+ 
++	lockdep_assert_held(&vc4_hdmi->mutex);
++
+ 	vc4_hdmi_set_avi_infoframe(encoder);
+ 	vc4_hdmi_set_spd_infoframe(encoder);
+ 	/*
+@@ -564,6 +581,8 @@ static bool vc4_hdmi_supports_scrambling
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
+ 	struct drm_display_info *display = &vc4_hdmi->connector.display_info;
+ 
++	lockdep_assert_held(&vc4_hdmi->mutex);
++
+ 	if (!vc4_encoder->hdmi_monitor)
+ 		return false;
+ 
+@@ -582,6 +601,8 @@ static void vc4_hdmi_enable_scrambling(s
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
+ 	unsigned long flags;
+ 
++	lockdep_assert_held(&vc4_hdmi->mutex);
++
+ 	if (!vc4_hdmi_supports_scrambling(encoder, mode))
+ 		return;
+ 
+@@ -651,6 +672,8 @@ static void vc4_hdmi_encoder_post_crtc_d
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
+ 	unsigned long flags;
+ 
++	mutex_lock(&vc4_hdmi->mutex);
++
+ 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 
+ 	HDMI_WRITE(HDMI_RAM_PACKET_CONFIG, 0);
+@@ -667,6 +690,8 @@ static void vc4_hdmi_encoder_post_crtc_d
+ 	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ 
+ 	vc4_hdmi_disable_scrambling(encoder);
++
++	mutex_unlock(&vc4_hdmi->mutex);
+ }
+ 
+ static void vc4_hdmi_encoder_post_crtc_powerdown(struct drm_encoder *encoder,
+@@ -676,6 +701,8 @@ static void vc4_hdmi_encoder_post_crtc_p
+ 	unsigned long flags;
+ 	int ret;
+ 
++	mutex_lock(&vc4_hdmi->mutex);
++
+ 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_VID_CTL,
+ 		   HDMI_READ(HDMI_VID_CTL) | VC4_HD_VID_CTL_BLANKPIX);
+@@ -690,6 +717,8 @@ static void vc4_hdmi_encoder_post_crtc_p
+ 	ret = pm_runtime_put(&vc4_hdmi->pdev->dev);
+ 	if (ret < 0)
+ 		DRM_ERROR("Failed to release power domain: %d\n", ret);
++
++	mutex_unlock(&vc4_hdmi->mutex);
+ }
+ 
+ static void vc4_hdmi_encoder_disable(struct drm_encoder *encoder)
+@@ -986,6 +1015,8 @@ static void vc4_hdmi_encoder_pre_crtc_co
+ 	unsigned long flags;
+ 	int ret;
+ 
++	mutex_lock(&vc4_hdmi->mutex);
++
+ 	/*
+ 	 * As stated in RPi's vc4 firmware "HDMI state machine (HSM) clock must
+ 	 * be faster than pixel clock, infinitesimally faster, tested in
+@@ -1006,13 +1037,13 @@ static void vc4_hdmi_encoder_pre_crtc_co
+ 	ret = clk_set_min_rate(vc4_hdmi->hsm_clock, hsm_rate);
+ 	if (ret) {
+ 		DRM_ERROR("Failed to set HSM clock rate: %d\n", ret);
+-		return;
++		goto out;
+ 	}
+ 
+ 	ret = pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev);
+ 	if (ret < 0) {
+ 		DRM_ERROR("Failed to retain power domain: %d\n", ret);
+-		return;
++		goto out;
+ 	}
+ 
+ 	ret = clk_set_rate(vc4_hdmi->pixel_clock, pixel_rate);
+@@ -1064,13 +1095,16 @@ static void vc4_hdmi_encoder_pre_crtc_co
+ 	if (vc4_hdmi->variant->set_timings)
+ 		vc4_hdmi->variant->set_timings(vc4_hdmi, conn_state, mode);
+ 
++	mutex_unlock(&vc4_hdmi->mutex);
++
+ 	return;
+ 
+ err_disable_pixel_clock:
+ 	clk_disable_unprepare(vc4_hdmi->pixel_clock);
+ err_put_runtime_pm:
+ 	pm_runtime_put(&vc4_hdmi->pdev->dev);
+-
++out:
++	mutex_unlock(&vc4_hdmi->mutex);
+ 	return;
+ }
+ 
+@@ -1082,6 +1116,8 @@ static void vc4_hdmi_encoder_pre_crtc_en
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
+ 	unsigned long flags;
+ 
++	mutex_lock(&vc4_hdmi->mutex);
++
+ 	if (vc4_encoder->hdmi_monitor &&
+ 	    drm_default_rgb_quant_range(mode) == HDMI_QUANTIZATION_RANGE_LIMITED) {
+ 		if (vc4_hdmi->variant->csc_setup)
+@@ -1098,6 +1134,8 @@ static void vc4_hdmi_encoder_pre_crtc_en
+ 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_FIFO_CTL, VC4_HDMI_FIFO_CTL_MASTER_SLAVE_N);
+ 	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
++	mutex_unlock(&vc4_hdmi->mutex);
+ }
+ 
+ static void vc4_hdmi_encoder_post_crtc_enable(struct drm_encoder *encoder,
+@@ -1111,6 +1149,8 @@ static void vc4_hdmi_encoder_post_crtc_e
+ 	unsigned long flags;
+ 	int ret;
+ 
++	mutex_lock(&vc4_hdmi->mutex);
++
+ 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 
+ 	HDMI_WRITE(HDMI_VID_CTL,
+@@ -1170,6 +1210,8 @@ static void vc4_hdmi_encoder_post_crtc_e
+ 
+ 	vc4_hdmi_recenter_fifo(vc4_hdmi);
+ 	vc4_hdmi_enable_scrambling(encoder);
++
++	mutex_unlock(&vc4_hdmi->mutex);
+ }
+ 
+ static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder)
+@@ -1313,6 +1355,7 @@ static void vc4_hdmi_set_n_cts(struct vc
+ 	u32 n, cts;
+ 	u64 tmp;
+ 
++	lockdep_assert_held(&vc4_hdmi->mutex);
+ 	lockdep_assert_held(&vc4_hdmi->hw_lock);
+ 
+ 	n = 128 * samplerate / 1000;
+@@ -1346,13 +1389,17 @@ static int vc4_hdmi_audio_startup(struct
+ 	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
+ 	unsigned long flags;
+ 
++	mutex_lock(&vc4_hdmi->mutex);
++
+ 	/*
+ 	 * If the HDMI encoder hasn't probed, or the encoder is
+ 	 * currently in DVI mode, treat the codec dai as missing.
+ 	 */
+ 	if (!encoder->crtc || !(HDMI_READ(HDMI_RAM_PACKET_CONFIG) &
+-				VC4_HDMI_RAM_PACKET_ENABLE))
++				VC4_HDMI_RAM_PACKET_ENABLE)) {
++		mutex_unlock(&vc4_hdmi->mutex);
+ 		return -ENODEV;
++	}
+ 
+ 	vc4_hdmi->audio.streaming = true;
+ 
+@@ -1368,6 +1415,8 @@ static int vc4_hdmi_audio_startup(struct
+ 	if (vc4_hdmi->variant->phy_rng_enable)
+ 		vc4_hdmi->variant->phy_rng_enable(vc4_hdmi);
+ 
++	mutex_unlock(&vc4_hdmi->mutex);
++
+ 	return 0;
+ }
+ 
+@@ -1378,6 +1427,8 @@ static void vc4_hdmi_audio_reset(struct
+ 	unsigned long flags;
+ 	int ret;
+ 
++	lockdep_assert_held(&vc4_hdmi->mutex);
++
+ 	vc4_hdmi->audio.streaming = false;
+ 	ret = vc4_hdmi_stop_packet(encoder, HDMI_INFOFRAME_TYPE_AUDIO, false);
+ 	if (ret)
+@@ -1397,6 +1448,8 @@ static void vc4_hdmi_audio_shutdown(stru
+ 	struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
+ 	unsigned long flags;
+ 
++	mutex_lock(&vc4_hdmi->mutex);
++
+ 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 
+ 	HDMI_WRITE(HDMI_MAI_CTL,
+@@ -1411,6 +1464,8 @@ static void vc4_hdmi_audio_shutdown(stru
+ 
+ 	vc4_hdmi->audio.streaming = false;
+ 	vc4_hdmi_audio_reset(vc4_hdmi);
++
++	mutex_unlock(&vc4_hdmi->mutex);
+ }
+ 
+ static int sample_rate_to_mai_fmt(int samplerate)
+@@ -1469,6 +1524,8 @@ static int vc4_hdmi_audio_prepare(struct
+ 	dev_dbg(dev, "%s: %u Hz, %d bit, %d channels\n", __func__,
+ 		sample_rate, params->sample_width, channels);
+ 
++	mutex_lock(&vc4_hdmi->mutex);
++
+ 	vc4_hdmi_audio_set_mai_clock(vc4_hdmi, sample_rate);
+ 
+ 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+@@ -1523,6 +1580,8 @@ static int vc4_hdmi_audio_prepare(struct
+ 	memcpy(&vc4_hdmi->audio.infoframe, &params->cea, sizeof(params->cea));
+ 	vc4_hdmi_set_audio_infoframe(encoder);
+ 
++	mutex_unlock(&vc4_hdmi->mutex);
++
+ 	return 0;
+ }
+ 
+@@ -1565,7 +1624,9 @@ static int vc4_hdmi_audio_get_eld(struct
+ 	struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
+ 	struct drm_connector *connector = &vc4_hdmi->connector;
+ 
++	mutex_lock(&vc4_hdmi->mutex);
+ 	memcpy(buf, connector->eld, min(sizeof(connector->eld), len));
++	mutex_unlock(&vc4_hdmi->mutex);
+ 
+ 	return 0;
+ }
+@@ -1902,6 +1963,17 @@ static int vc4_hdmi_cec_enable(struct ce
+ 	u32 val;
+ 	int ret;
+ 
++	/*
++	 * NOTE: This function should really take vc4_hdmi->mutex, but doing so
++	 * results in a reentrancy since cec_s_phys_addr_from_edid() called in
++	 * .detect or .get_modes might call .adap_enable, which leads to this
++	 * function being called with that mutex held.
++	 *
++	 * Concurrency is not an issue for the moment since we don't share any
++	 * state with KMS, so we can ignore the lock for now, but we need to
++	 * keep it in mind if we were to change that assumption.
++	 */
++
+ 	ret = pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev);
+ 	if (ret)
+ 		return ret;
+@@ -1948,6 +2020,17 @@ static int vc4_hdmi_cec_disable(struct c
+ 	struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap);
+ 	unsigned long flags;
+ 
++	/*
++	 * NOTE: This function should really take vc4_hdmi->mutex, but doing so
++	 * results in a reentrancy since cec_s_phys_addr_from_edid() called in
++	 * .detect or .get_modes might call .adap_enable, which leads to this
++	 * function being called with that mutex held.
++	 *
++	 * Concurrency is not an issue for the moment since we don't share any
++	 * state with KMS, so we can ignore the lock for now, but we need to
++	 * keep it in mind if we were to change that assumption.
++	 */
++
+ 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 
+ 	if (!vc4_hdmi->variant->external_irq_controller)
+@@ -1976,6 +2059,17 @@ static int vc4_hdmi_cec_adap_log_addr(st
+ 	struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap);
+ 	unsigned long flags;
+ 
++	/*
++	 * NOTE: This function should really take vc4_hdmi->mutex, but doing so
++	 * results in a reentrancy since cec_s_phys_addr_from_edid() called in
++	 * .detect or .get_modes might call .adap_enable, which leads to this
++	 * function being called with that mutex held.
++	 *
++	 * Concurrency is not an issue for the moment since we don't share any
++	 * state with KMS, so we can ignore the lock for now, but we need to
++	 * keep it in mind if we were to change that assumption.
++	 */
++
+ 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_CEC_CNTRL_1,
+ 		   (HDMI_READ(HDMI_CEC_CNTRL_1) & ~VC4_HDMI_CEC_ADDR_MASK) |
+@@ -1994,6 +2088,17 @@ static int vc4_hdmi_cec_adap_transmit(st
+ 	u32 val;
+ 	unsigned int i;
+ 
++	/*
++	 * NOTE: This function should really take vc4_hdmi->mutex, but doing so
++	 * results in a reentrancy since cec_s_phys_addr_from_edid() called in
++	 * .detect or .get_modes might call .adap_enable, which leads to this
++	 * function being called with that mutex held.
++	 *
++	 * Concurrency is not an issue for the moment since we don't share any
++	 * state with KMS, so we can ignore the lock for now, but we need to
++	 * keep it in mind if we were to change that assumption.
++	 */
++
+ 	if (msg->len > 16) {
+ 		drm_err(dev, "Attempting to transmit too much data (%d)\n", msg->len);
+ 		return -ENOMEM;
+@@ -2349,6 +2454,7 @@ static int vc4_hdmi_bind(struct device *
+ 	vc4_hdmi = devm_kzalloc(dev, sizeof(*vc4_hdmi), GFP_KERNEL);
+ 	if (!vc4_hdmi)
+ 		return -ENOMEM;
++	mutex_init(&vc4_hdmi->mutex);
+ 	spin_lock_init(&vc4_hdmi->hw_lock);
+ 	INIT_DELAYED_WORK(&vc4_hdmi->scrambling_work, vc4_hdmi_scrambling_wq);
+ 
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
+@@ -184,6 +184,20 @@ struct vc4_hdmi {
+ 	 * @hw_lock: Spinlock protecting device register access.
+ 	 */
+ 	spinlock_t hw_lock;
++
++	/**
++	 * @mutex: Mutex protecting the driver access across multiple
++	 * frameworks (KMS, ALSA).
++	 *
++	 * NOTE: While supported, CEC has been left out since
++	 * cec_s_phys_addr_from_edid() might call .adap_enable and lead to a
++	 * reentrancy issue between .get_modes (or .detect) and .adap_enable.
++	 * Since we don't share any state between the CEC hooks and KMS', it's
++	 * not a big deal. The only trouble might come from updating the CEC
++	 * clock divider which might be affected by a modeset, but CEC should
++	 * be resilient to that.
++	 */
++	struct mutex mutex;
+ };
+ 
+ static inline struct vc4_hdmi *
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0009-drm-vc4-hdmi-Prevent-access-to-crtc-state-outside-of.patch b/root/target/linux/bcm27xx/patches-5.15/950-0009-drm-vc4-hdmi-Prevent-access-to-crtc-state-outside-of.patch
new file mode 100644
index 00000000..306d438f
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0009-drm-vc4-hdmi-Prevent-access-to-crtc-state-outside-of.patch
@@ -0,0 +1,161 @@
+From 77a18429c6eb06a7bacf858f77b2778dee318df9 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Tue, 19 Oct 2021 14:19:29 +0200
+Subject: [PATCH 009/828] drm/vc4: hdmi: Prevent access to crtc->state outside
+ of KMS
+
+Accessing the crtc->state pointer from outside the modesetting context
+is not allowed. We thus need to copy whatever we need from the KMS state
+to our structure in order to access it.
+
+However, in the vc4 HDMI driver we do use that pointer in the ALSA code
+path, and potentially in the hotplug interrupt handler path.
+
+These paths both need access to the CRTC adjusted mode in order for the
+proper dividers to be set for ALSA, and the scrambler state to be
+reinstated properly for hotplug.
+
+Let's copy this mode into our private encoder structure and reference it
+from there when needed. Since that part is shared between KMS and other
+paths, we need to protect it using our mutex.
+
+Link: https://lore.kernel.org/all/YWgteNaNeaS9uWDe@phenom.ffwll.local/
+Fixes: bb7d78568814 ("drm/vc4: Add HDMI audio support")
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 38 +++++++++++++++++++++++-----------
+ drivers/gpu/drm/vc4/vc4_hdmi.h |  6 ++++++
+ 2 files changed, 32 insertions(+), 12 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -484,8 +484,7 @@ static void vc4_hdmi_set_avi_infoframe(s
+ 	struct vc4_hdmi_encoder *vc4_encoder = to_vc4_hdmi_encoder(encoder);
+ 	struct drm_connector *connector = &vc4_hdmi->connector;
+ 	struct drm_connector_state *cstate = connector->state;
+-	struct drm_crtc *crtc = encoder->crtc;
+-	const struct drm_display_mode *mode = &crtc->state->adjusted_mode;
++	const struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode;
+ 	union hdmi_infoframe frame;
+ 	int ret;
+ 
+@@ -597,8 +596,8 @@ static bool vc4_hdmi_supports_scrambling
+ 
+ static void vc4_hdmi_enable_scrambling(struct drm_encoder *encoder)
+ {
+-	struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
++	struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode;
+ 	unsigned long flags;
+ 
+ 	lockdep_assert_held(&vc4_hdmi->mutex);
+@@ -624,18 +623,21 @@ static void vc4_hdmi_enable_scrambling(s
+ static void vc4_hdmi_disable_scrambling(struct drm_encoder *encoder)
+ {
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
++	struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode;
+ 	struct drm_crtc *crtc = encoder->crtc;
+ 	unsigned long flags;
+ 
++	lockdep_assert_held(&vc4_hdmi->mutex);
++
+ 	/*
+ 	 * At boot, encoder->crtc will be NULL. Since we don't know the
+ 	 * state of the scrambler and in order to avoid any
+ 	 * inconsistency, let's disable it all the time.
+ 	 */
+-	if (crtc && !vc4_hdmi_supports_scrambling(encoder, &crtc->mode))
++	if (crtc && !vc4_hdmi_supports_scrambling(encoder, mode))
+ 		return;
+ 
+-	if (crtc && !vc4_hdmi_mode_needs_scrambling(&crtc->mode))
++	if (crtc && !vc4_hdmi_mode_needs_scrambling(mode))
+ 		return;
+ 
+ 	if (delayed_work_pending(&vc4_hdmi->scrambling_work))
+@@ -1008,8 +1010,8 @@ static void vc4_hdmi_encoder_pre_crtc_co
+ 		vc4_hdmi_encoder_get_connector_state(encoder, state);
+ 	struct vc4_hdmi_connector_state *vc4_conn_state =
+ 		conn_state_to_vc4_hdmi_conn_state(conn_state);
+-	struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
++	struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode;
+ 	unsigned long pixel_rate = vc4_conn_state->pixel_rate;
+ 	unsigned long bvb_rate, hsm_rate;
+ 	unsigned long flags;
+@@ -1111,9 +1113,9 @@ out:
+ static void vc4_hdmi_encoder_pre_crtc_enable(struct drm_encoder *encoder,
+ 					     struct drm_atomic_state *state)
+ {
+-	struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
+-	struct vc4_hdmi_encoder *vc4_encoder = to_vc4_hdmi_encoder(encoder);
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
++	struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode;
++	struct vc4_hdmi_encoder *vc4_encoder = to_vc4_hdmi_encoder(encoder);
+ 	unsigned long flags;
+ 
+ 	mutex_lock(&vc4_hdmi->mutex);
+@@ -1141,8 +1143,8 @@ static void vc4_hdmi_encoder_pre_crtc_en
+ static void vc4_hdmi_encoder_post_crtc_enable(struct drm_encoder *encoder,
+ 					      struct drm_atomic_state *state)
+ {
+-	struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
++	struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode;
+ 	struct vc4_hdmi_encoder *vc4_encoder = to_vc4_hdmi_encoder(encoder);
+ 	bool hsync_pos = mode->flags & DRM_MODE_FLAG_PHSYNC;
+ 	bool vsync_pos = mode->flags & DRM_MODE_FLAG_PVSYNC;
+@@ -1218,6 +1220,19 @@ static void vc4_hdmi_encoder_enable(stru
+ {
+ }
+ 
++static void vc4_hdmi_encoder_atomic_mode_set(struct drm_encoder *encoder,
++					     struct drm_crtc_state *crtc_state,
++					     struct drm_connector_state *conn_state)
++{
++	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
++
++	mutex_lock(&vc4_hdmi->mutex);
++	memcpy(&vc4_hdmi->saved_adjusted_mode,
++	       &crtc_state->adjusted_mode,
++	       sizeof(vc4_hdmi->saved_adjusted_mode));
++	mutex_unlock(&vc4_hdmi->mutex);
++}
++
+ #define WIFI_2_4GHz_CH1_MIN_FREQ	2400000000ULL
+ #define WIFI_2_4GHz_CH1_MAX_FREQ	2422000000ULL
+ 
+@@ -1296,6 +1311,7 @@ vc4_hdmi_encoder_mode_valid(struct drm_e
+ 
+ static const struct drm_encoder_helper_funcs vc4_hdmi_encoder_helper_funcs = {
+ 	.atomic_check = vc4_hdmi_encoder_atomic_check,
++	.atomic_mode_set = vc4_hdmi_encoder_atomic_mode_set,
+ 	.mode_valid = vc4_hdmi_encoder_mode_valid,
+ 	.disable = vc4_hdmi_encoder_disable,
+ 	.enable = vc4_hdmi_encoder_enable,
+@@ -1349,9 +1365,7 @@ static void vc4_hdmi_audio_set_mai_clock
+ 
+ static void vc4_hdmi_set_n_cts(struct vc4_hdmi *vc4_hdmi, unsigned int samplerate)
+ {
+-	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
+-	struct drm_crtc *crtc = encoder->crtc;
+-	const struct drm_display_mode *mode = &crtc->state->adjusted_mode;
++	const struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode;
+ 	u32 n, cts;
+ 	u64 tmp;
+ 
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
+@@ -198,6 +198,12 @@ struct vc4_hdmi {
+ 	 * be resilient to that.
+ 	 */
+ 	struct mutex mutex;
++
++	/**
++	 * @saved_adjusted_mode: Copy of @drm_crtc_state.adjusted_mode
++	 * for use by ALSA hooks and interrupt handlers. Protected by @mutex.
++	 */
++	struct drm_display_mode saved_adjusted_mode;
+ };
+ 
+ static inline struct vc4_hdmi *
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0010-drm-vc4-hdmi-Check-the-device-state-in-prepare.patch b/root/target/linux/bcm27xx/patches-5.15/950-0010-drm-vc4-hdmi-Check-the-device-state-in-prepare.patch
new file mode 100644
index 00000000..c5ed7196
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0010-drm-vc4-hdmi-Check-the-device-state-in-prepare.patch
@@ -0,0 +1,77 @@
+From 4c60b81986b4e1dc80faa718a60dd9849dd4f4f7 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Fri, 24 Sep 2021 14:27:38 +0200
+Subject: [PATCH 010/828] drm/vc4: hdmi: Check the device state in prepare()
+
+Even though we already check that the encoder->crtc pointer is there
+during in startup(), which is part of the open() path in ASoC, nothing
+guarantees that our encoder state won't change between the time when we
+open the device and the time we prepare it.
+
+Move the sanity checks we do in startup() to a helper and call it from
+prepare().
+
+Fixes: 91e99e113929 ("drm/vc4: hdmi: Register HDMI codec")
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 35 +++++++++++++++++++++++++++-------
+ 1 file changed, 28 insertions(+), 7 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -1397,20 +1397,36 @@ static inline struct vc4_hdmi *dai_to_hd
+ 	return snd_soc_card_get_drvdata(card);
+ }
+ 
++static bool vc4_hdmi_audio_can_stream(struct vc4_hdmi *vc4_hdmi)
++{
++	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
++
++	lockdep_assert_held(&vc4_hdmi->mutex);
++
++	/*
++	 * The encoder doesn't have a CRTC until the first modeset.
++	 */
++	if (!encoder->crtc)
++		return false;
++
++	/*
++	 * If the encoder is currently in DVI mode, treat the codec DAI
++	 * as missing.
++	 */
++	if (!(HDMI_READ(HDMI_RAM_PACKET_CONFIG) & VC4_HDMI_RAM_PACKET_ENABLE))
++		return false;
++
++	return true;
++}
++
+ static int vc4_hdmi_audio_startup(struct device *dev, void *data)
+ {
+ 	struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
+-	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
+ 	unsigned long flags;
+ 
+ 	mutex_lock(&vc4_hdmi->mutex);
+ 
+-	/*
+-	 * If the HDMI encoder hasn't probed, or the encoder is
+-	 * currently in DVI mode, treat the codec dai as missing.
+-	 */
+-	if (!encoder->crtc || !(HDMI_READ(HDMI_RAM_PACKET_CONFIG) &
+-				VC4_HDMI_RAM_PACKET_ENABLE)) {
++	if (!vc4_hdmi_audio_can_stream(vc4_hdmi)) {
+ 		mutex_unlock(&vc4_hdmi->mutex);
+ 		return -ENODEV;
+ 	}
+@@ -1540,6 +1556,11 @@ static int vc4_hdmi_audio_prepare(struct
+ 
+ 	mutex_lock(&vc4_hdmi->mutex);
+ 
++	if (!vc4_hdmi_audio_can_stream(vc4_hdmi)) {
++		mutex_unlock(&vc4_hdmi->mutex);
++		return -EINVAL;
++	}
++
+ 	vc4_hdmi_audio_set_mai_clock(vc4_hdmi, sample_rate);
+ 
+ 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0011-drm-vc4-hdmi-Introduce-an-output_enabled-flag.patch b/root/target/linux/bcm27xx/patches-5.15/950-0011-drm-vc4-hdmi-Introduce-an-output_enabled-flag.patch
new file mode 100644
index 00000000..b4a0cb20
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0011-drm-vc4-hdmi-Introduce-an-output_enabled-flag.patch
@@ -0,0 +1,78 @@
+From cbc84143c02c3a42609ba37283f0f1ea23643ecc Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Tue, 19 Oct 2021 17:31:58 +0200
+Subject: [PATCH 011/828] drm/vc4: hdmi: Introduce an output_enabled flag
+
+We currently poke at encoder->crtc in the ALSA code path to determine
+whether the HDMI output is enabled or not, and thus whether we should
+allow the audio output.
+
+However, that pointer is deprecated and shouldn't really be used by
+atomic drivers anymore. Since we have the infrastructure in place now,
+let's just create a flag that we toggle to report whether the controller
+is currently enabled and use that instead of encoder->crtc in ALSA.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 16 ++++++++++++----
+ drivers/gpu/drm/vc4/vc4_hdmi.h |  6 ++++++
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -725,6 +725,11 @@ static void vc4_hdmi_encoder_post_crtc_p
+ 
+ static void vc4_hdmi_encoder_disable(struct drm_encoder *encoder)
+ {
++	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
++
++	mutex_lock(&vc4_hdmi->mutex);
++	vc4_hdmi->output_enabled = false;
++	mutex_unlock(&vc4_hdmi->mutex);
+ }
+ 
+ static void vc4_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi, bool enable)
+@@ -1218,6 +1223,11 @@ static void vc4_hdmi_encoder_post_crtc_e
+ 
+ static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder)
+ {
++	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
++
++	mutex_lock(&vc4_hdmi->mutex);
++	vc4_hdmi->output_enabled = true;
++	mutex_unlock(&vc4_hdmi->mutex);
+ }
+ 
+ static void vc4_hdmi_encoder_atomic_mode_set(struct drm_encoder *encoder,
+@@ -1399,14 +1409,12 @@ static inline struct vc4_hdmi *dai_to_hd
+ 
+ static bool vc4_hdmi_audio_can_stream(struct vc4_hdmi *vc4_hdmi)
+ {
+-	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
+-
+ 	lockdep_assert_held(&vc4_hdmi->mutex);
+ 
+ 	/*
+-	 * The encoder doesn't have a CRTC until the first modeset.
++	 * If the controller is disabled, prevent any ALSA output.
+ 	 */
+-	if (!encoder->crtc)
++	if (!vc4_hdmi->output_enabled)
+ 		return false;
+ 
+ 	/*
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
+@@ -204,6 +204,12 @@ struct vc4_hdmi {
+ 	 * for use by ALSA hooks and interrupt handlers. Protected by @mutex.
+ 	 */
+ 	struct drm_display_mode saved_adjusted_mode;
++
++	/**
++	 * @output_enabled: Is the HDMI controller currently active?
++	 * Protected by @mutex.
++	 */
++	bool output_enabled;
+ };
+ 
+ static inline struct vc4_hdmi *
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0012-drm-vc4-hdmi-Introduce-a-scdc_enabled-flag.patch b/root/target/linux/bcm27xx/patches-5.15/950-0012-drm-vc4-hdmi-Introduce-a-scdc_enabled-flag.patch
new file mode 100644
index 00000000..3a08a649
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0012-drm-vc4-hdmi-Introduce-a-scdc_enabled-flag.patch
@@ -0,0 +1,101 @@
+From 092de8a130a33a1bd181cf0d40b9137af4be9dcf Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Tue, 19 Oct 2021 19:13:46 +0200
+Subject: [PATCH 012/828] drm/vc4: hdmi: Introduce a scdc_enabled flag
+
+We currently rely on two functions, vc4_hdmi_supports_scrambling() and
+vc4_hdmi_mode_needs_scrambling() to determine if we should enable and
+disable the scrambler for any given mode.
+
+Since we might need to disable the controller at boot, we also always
+run vc4_hdmi_disable_scrambling() and thus call those functions without
+a mode yet, which in turns need to make some special casing in order for
+it to work.
+
+Instead of duplicating the check for whether or not we need to take care
+of the scrambler in both vc4_hdmi_enable_scrambling() and
+vc4_hdmi_disable_scrambling(), we can do that check only when we enable
+it and store whether or not it's been enabled in our private structure.
+
+We also need to initialize that flag at true to make sure we disable the
+scrambler at boot since we can't really know its state yet.
+
+This allows to simplify a bit that part of the driver, and removes one
+user of our copy of the CRTC adjusted mode outside of KMS (since
+vc4_hdmi_disable_scrambling() might be called from the hotplug interrupt
+handler).
+
+It also removes our last user of the legacy encoder->crtc pointer.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 22 ++++++++++++----------
+ drivers/gpu/drm/vc4/vc4_hdmi.h |  6 ++++++
+ 2 files changed, 18 insertions(+), 10 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -616,6 +616,8 @@ static void vc4_hdmi_enable_scrambling(s
+ 		   VC5_HDMI_SCRAMBLER_CTL_ENABLE);
+ 	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ 
++	vc4_hdmi->scdc_enabled = true;
++
+ 	queue_delayed_work(system_wq, &vc4_hdmi->scrambling_work,
+ 			   msecs_to_jiffies(SCRAMBLING_POLLING_DELAY_MS));
+ }
+@@ -623,22 +625,14 @@ static void vc4_hdmi_enable_scrambling(s
+ static void vc4_hdmi_disable_scrambling(struct drm_encoder *encoder)
+ {
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
+-	struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode;
+-	struct drm_crtc *crtc = encoder->crtc;
+ 	unsigned long flags;
+ 
+ 	lockdep_assert_held(&vc4_hdmi->mutex);
+ 
+-	/*
+-	 * At boot, encoder->crtc will be NULL. Since we don't know the
+-	 * state of the scrambler and in order to avoid any
+-	 * inconsistency, let's disable it all the time.
+-	 */
+-	if (crtc && !vc4_hdmi_supports_scrambling(encoder, mode))
++	if (!vc4_hdmi->scdc_enabled)
+ 		return;
+ 
+-	if (crtc && !vc4_hdmi_mode_needs_scrambling(mode))
+-		return;
++	vc4_hdmi->scdc_enabled = false;
+ 
+ 	if (delayed_work_pending(&vc4_hdmi->scrambling_work))
+ 		cancel_delayed_work_sync(&vc4_hdmi->scrambling_work);
+@@ -2512,6 +2506,14 @@ static int vc4_hdmi_bind(struct device *
+ 	vc4_hdmi->pdev = pdev;
+ 	vc4_hdmi->variant = variant;
+ 
++	/*
++	 * Since we don't know the state of the controller and its
++	 * display (if any), let's assume it's always enabled.
++	 * vc4_hdmi_disable_scrambling() will thus run at boot, make
++	 * sure it's disabled, and avoid any inconsistency.
++	 */
++	vc4_hdmi->scdc_enabled = true;
++
+ 	ret = variant->init_resources(vc4_hdmi);
+ 	if (ret)
+ 		return ret;
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
+@@ -210,6 +210,12 @@ struct vc4_hdmi {
+ 	 * Protected by @mutex.
+ 	 */
+ 	bool output_enabled;
++
++	/**
++	 * @scdc_enabled: Is the HDMI controller currently running with
++	 * the scrambler on? Protected by @mutex.
++	 */
++	bool scdc_enabled;
+ };
+ 
+ static inline struct vc4_hdmi *
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0013-drm-vc4-Make-vc4_crtc_get_encoder-public.patch b/root/target/linux/bcm27xx/patches-5.15/950-0013-drm-vc4-Make-vc4_crtc_get_encoder-public.patch
new file mode 100644
index 00000000..54a29475
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0013-drm-vc4-Make-vc4_crtc_get_encoder-public.patch
@@ -0,0 +1,45 @@
+From 7cfd43baeaf6f423ab7e4e291ae3b72f84f8fdbf Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Wed, 26 May 2021 16:07:01 +0200
+Subject: [PATCH 013/828] drm/vc4: Make vc4_crtc_get_encoder public
+
+We'll need that function in vc4_kms to compute the core clock rate
+requirements.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c | 8 ++++----
+ drivers/gpu/drm/vc4/vc4_drv.h  | 5 +++++
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -281,10 +281,10 @@ static u32 vc4_crtc_get_fifo_full_level_
+  * allows drivers to push pixels to more than one encoder from the
+  * same CRTC.
+  */
+-static struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
+-						struct drm_atomic_state *state,
+-						struct drm_connector_state *(*get_state)(struct drm_atomic_state *state,
+-											 struct drm_connector *connector))
++struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
++					 struct drm_atomic_state *state,
++					 struct drm_connector_state *(*get_state)(struct drm_atomic_state *state,
++										  struct drm_connector *connector))
+ {
+ 	struct drm_connector *connector;
+ 	struct drm_connector_list_iter conn_iter;
+--- a/drivers/gpu/drm/vc4/vc4_drv.h
++++ b/drivers/gpu/drm/vc4/vc4_drv.h
+@@ -544,6 +544,11 @@ vc4_crtc_to_vc4_pv_data(const struct vc4
+ 	return container_of(data, struct vc4_pv_data, base);
+ }
+ 
++struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
++					 struct drm_atomic_state *state,
++					 struct drm_connector_state *(*get_state)(struct drm_atomic_state *state,
++										  struct drm_connector *connector));
++
+ struct vc4_crtc_state {
+ 	struct drm_crtc_state base;
+ 	/* Dlist area for this CRTC configuration. */
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0014-drm-vc4-crtc-Add-encoder-to-vc4_crtc_config_pv-proto.patch b/root/target/linux/bcm27xx/patches-5.15/950-0014-drm-vc4-crtc-Add-encoder-to-vc4_crtc_config_pv-proto.patch
new file mode 100644
index 00000000..03e581eb
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0014-drm-vc4-crtc-Add-encoder-to-vc4_crtc_config_pv-proto.patch
@@ -0,0 +1,43 @@
+From 63d006c505f695b14d71324f6217b7031531b242 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Mon, 14 Jun 2021 15:27:24 +0200
+Subject: [PATCH 014/828] drm/vc4: crtc: Add encoder to vc4_crtc_config_pv
+ prototype
+
+vc4_crtc_config_pv() retrieves the encoder again, even though its only
+caller, vc4_crtc_atomic_enable(), already did.
+
+Pass the encoder pointer as an argument instead of going through all the
+connectors to retrieve it again.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -315,12 +315,11 @@ static void vc4_crtc_pixelvalve_reset(st
+ 	CRTC_WRITE(PV_CONTROL, CRTC_READ(PV_CONTROL) | PV_CONTROL_FIFO_CLR);
+ }
+ 
+-static void vc4_crtc_config_pv(struct drm_crtc *crtc, struct drm_atomic_state *state)
++static void vc4_crtc_config_pv(struct drm_crtc *crtc, struct drm_encoder *encoder,
++			       struct drm_atomic_state *state)
+ {
+ 	struct drm_device *dev = crtc->dev;
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
+-	struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc, state,
+-							   drm_atomic_get_new_connector_state);
+ 	struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder);
+ 	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
+ 	const struct vc4_pv_data *pv_data = vc4_crtc_to_vc4_pv_data(vc4_crtc);
+@@ -599,7 +598,7 @@ static void vc4_crtc_atomic_enable(struc
+ 	if (vc4_encoder->pre_crtc_configure)
+ 		vc4_encoder->pre_crtc_configure(encoder, state);
+ 
+-	vc4_crtc_config_pv(crtc, state);
++	vc4_crtc_config_pv(crtc, encoder, state);
+ 
+ 	CRTC_WRITE(PV_CONTROL, CRTC_READ(PV_CONTROL) | PV_CONTROL_EN);
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0015-drm-vc4-crtc-Rework-the-encoder-retrieval-code-again.patch b/root/target/linux/bcm27xx/patches-5.15/950-0015-drm-vc4-crtc-Rework-the-encoder-retrieval-code-again.patch
new file mode 100644
index 00000000..374d1ed8
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0015-drm-vc4-crtc-Rework-the-encoder-retrieval-code-again.patch
@@ -0,0 +1,96 @@
+From ef75a3ac2ee94f67f3d3d1d25f74200397b10d28 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Mon, 21 Jun 2021 16:07:22 +0200
+Subject: [PATCH 015/828] drm/vc4: crtc: Rework the encoder retrieval code
+ (again)
+
+It turns out the encoder retrieval code, in addition to being
+unnecessarily complicated, has a bug when only the planes and crtcs are
+affected by a given atomic commit.
+
+Indeed, in such a case, either drm_atomic_get_old_connector_state or
+drm_atomic_get_new_connector_state will return NULL and thus our encoder
+retrieval code will not match on anything.
+
+We can however simplify the code by using drm_for_each_encoder_mask, the
+drm_crtc_state storing the encoders a given CRTC is connected to
+directly and without relying on any other state.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c | 30 +++++++++---------------------
+ drivers/gpu/drm/vc4/vc4_drv.h  |  4 +---
+ 2 files changed, 10 insertions(+), 24 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -282,26 +282,14 @@ static u32 vc4_crtc_get_fifo_full_level_
+  * same CRTC.
+  */
+ struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
+-					 struct drm_atomic_state *state,
+-					 struct drm_connector_state *(*get_state)(struct drm_atomic_state *state,
+-										  struct drm_connector *connector))
++					 struct drm_crtc_state *state)
+ {
+-	struct drm_connector *connector;
+-	struct drm_connector_list_iter conn_iter;
++	struct drm_encoder *encoder;
+ 
+-	drm_connector_list_iter_begin(crtc->dev, &conn_iter);
+-	drm_for_each_connector_iter(connector, &conn_iter) {
+-		struct drm_connector_state *conn_state = get_state(state, connector);
+-
+-		if (!conn_state)
+-			continue;
+-
+-		if (conn_state->crtc == crtc) {
+-			drm_connector_list_iter_end(&conn_iter);
+-			return connector->encoder;
+-		}
+-	}
+-	drm_connector_list_iter_end(&conn_iter);
++	WARN_ON(hweight32(state->encoder_mask) > 1);
++
++	drm_for_each_encoder_mask(encoder, crtc->dev, state->encoder_mask)
++		return encoder;
+ 
+ 	return NULL;
+ }
+@@ -552,8 +540,7 @@ static void vc4_crtc_atomic_disable(stru
+ 	struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state,
+ 									 crtc);
+ 	struct vc4_crtc_state *old_vc4_state = to_vc4_crtc_state(old_state);
+-	struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc, state,
+-							   drm_atomic_get_old_connector_state);
++	struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc, old_state);
+ 	struct drm_device *dev = crtc->dev;
+ 
+ 	require_hvs_enabled(dev);
+@@ -580,10 +567,11 @@ static void vc4_crtc_atomic_disable(stru
+ static void vc4_crtc_atomic_enable(struct drm_crtc *crtc,
+ 				   struct drm_atomic_state *state)
+ {
++	struct drm_crtc_state *new_state = drm_atomic_get_new_crtc_state(state,
++									 crtc);
+ 	struct drm_device *dev = crtc->dev;
+ 	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
+-	struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc, state,
+-							   drm_atomic_get_new_connector_state);
++	struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc, new_state);
+ 	struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder);
+ 
+ 	require_hvs_enabled(dev);
+--- a/drivers/gpu/drm/vc4/vc4_drv.h
++++ b/drivers/gpu/drm/vc4/vc4_drv.h
+@@ -545,9 +545,7 @@ vc4_crtc_to_vc4_pv_data(const struct vc4
+ }
+ 
+ struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
+-					 struct drm_atomic_state *state,
+-					 struct drm_connector_state *(*get_state)(struct drm_atomic_state *state,
+-										  struct drm_connector *connector));
++					 struct drm_crtc_state *state);
+ 
+ struct vc4_crtc_state {
+ 	struct drm_crtc_state base;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0016-drm-vc4-crtc-Add-some-logging.patch b/root/target/linux/bcm27xx/patches-5.15/950-0016-drm-vc4-crtc-Add-some-logging.patch
new file mode 100644
index 00000000..dff621ee
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0016-drm-vc4-crtc-Add-some-logging.patch
@@ -0,0 +1,38 @@
+From d31a74ccec8679458908ed08573a8558e04c209f Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Mon, 21 Jun 2021 16:13:02 +0200
+Subject: [PATCH 016/828] drm/vc4: crtc: Add some logging
+
+The encoder retrieval code has been a source of bugs and glitches in the
+past and the crtc <-> encoder association been wrong in a number of
+different ways.
+
+Add some logging to quickly spot issues if they occur.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -543,6 +543,9 @@ static void vc4_crtc_atomic_disable(stru
+ 	struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc, old_state);
+ 	struct drm_device *dev = crtc->dev;
+ 
++	drm_dbg(dev, "Disabling CRTC %s (%u) connected to Encoder %s (%u)",
++		crtc->name, crtc->base.id, encoder->name, encoder->base.id);
++
+ 	require_hvs_enabled(dev);
+ 
+ 	/* Disable vblank irq handling before crtc is disabled. */
+@@ -574,6 +577,9 @@ static void vc4_crtc_atomic_enable(struc
+ 	struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc, new_state);
+ 	struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder);
+ 
++	drm_dbg(dev, "Enabling CRTC %s (%u) connected to Encoder %s (%u)",
++		crtc->name, crtc->base.id, encoder->name, encoder->base.id);
++
+ 	require_hvs_enabled(dev);
+ 
+ 	/* Enable vblank irq handling before crtc is started otherwise
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0017-drm-vc4-Leverage-the-load-tracker-on-the-BCM2711.patch b/root/target/linux/bcm27xx/patches-5.15/950-0017-drm-vc4-Leverage-the-load-tracker-on-the-BCM2711.patch
new file mode 100644
index 00000000..ba494bbb
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0017-drm-vc4-Leverage-the-load-tracker-on-the-BCM2711.patch
@@ -0,0 +1,123 @@
+From e03e29fe2bb7da723d52beedc56c9a6694ae5483 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Mon, 21 Jun 2021 17:19:22 +0200
+Subject: [PATCH 017/828] drm/vc4: Leverage the load tracker on the BCM2711
+
+The load tracker was initially designed to report and warn about a load
+too high for the HVS. To do so, it computes for each plane the impact
+it's going to have on the HVS, and will warn (if it's enabled) if we go
+over what the hardware can process.
+
+While the limits being used are a bit irrelevant to the BCM2711, the
+algorithm to compute the HVS load will be one component used in order to
+compute the core clock rate on the BCM2711.
+
+Let's remove the hooks to prevent the load tracker to do its
+computation, but since we don't have the same limits, don't check them
+against them, and prevent the debugfs file to enable it from being
+created.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_debugfs.c |  7 +++++--
+ drivers/gpu/drm/vc4/vc4_drv.h     |  3 ---
+ drivers/gpu/drm/vc4/vc4_kms.c     | 16 +++++-----------
+ drivers/gpu/drm/vc4/vc4_plane.c   |  5 -----
+ 4 files changed, 10 insertions(+), 21 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_debugfs.c
++++ b/drivers/gpu/drm/vc4/vc4_debugfs.c
+@@ -7,6 +7,7 @@
+ #include <linux/circ_buf.h>
+ #include <linux/ctype.h>
+ #include <linux/debugfs.h>
++#include <linux/platform_device.h>
+ 
+ #include "vc4_drv.h"
+ #include "vc4_regs.h"
+@@ -26,8 +27,10 @@ vc4_debugfs_init(struct drm_minor *minor
+ 	struct vc4_dev *vc4 = to_vc4_dev(minor->dev);
+ 	struct vc4_debugfs_info_entry *entry;
+ 
+-	debugfs_create_bool("hvs_load_tracker", S_IRUGO | S_IWUSR,
+-			    minor->debugfs_root, &vc4->load_tracker_enabled);
++	if (!of_device_is_compatible(vc4->hvs->pdev->dev.of_node,
++				     "brcm,bcm2711-vc5"))
++		debugfs_create_bool("hvs_load_tracker", S_IRUGO | S_IWUSR,
++				    minor->debugfs_root, &vc4->load_tracker_enabled);
+ 
+ 	list_for_each_entry(entry, &vc4->debugfs_list, link) {
+ 		drm_debugfs_create_files(&entry->info, 1,
+--- a/drivers/gpu/drm/vc4/vc4_drv.h
++++ b/drivers/gpu/drm/vc4/vc4_drv.h
+@@ -202,9 +202,6 @@ struct vc4_dev {
+ 
+ 	int power_refcount;
+ 
+-	/* Set to true when the load tracker is supported. */
+-	bool load_tracker_available;
+-
+ 	/* Set to true when the load tracker is active. */
+ 	bool load_tracker_enabled;
+ 
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -554,9 +554,6 @@ static int vc4_load_tracker_atomic_check
+ 	struct drm_plane *plane;
+ 	int i;
+ 
+-	if (!vc4->load_tracker_available)
+-		return 0;
+-
+ 	priv_state = drm_atomic_get_private_obj_state(state,
+ 						      &vc4->load_tracker);
+ 	if (IS_ERR(priv_state))
+@@ -631,9 +628,6 @@ static void vc4_load_tracker_obj_fini(st
+ {
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
+ 
+-	if (!vc4->load_tracker_available)
+-		return;
+-
+ 	drm_atomic_private_obj_fini(&vc4->load_tracker);
+ }
+ 
+@@ -641,9 +635,6 @@ static int vc4_load_tracker_obj_init(str
+ {
+ 	struct vc4_load_tracker_state *load_state;
+ 
+-	if (!vc4->load_tracker_available)
+-		return 0;
+-
+ 	load_state = kzalloc(sizeof(*load_state), GFP_KERNEL);
+ 	if (!load_state)
+ 		return -ENOMEM;
+@@ -865,9 +856,12 @@ int vc4_kms_load(struct drm_device *dev)
+ 					      "brcm,bcm2711-vc5");
+ 	int ret;
+ 
++	/*
++	 * The limits enforced by the load tracker aren't relevant for
++	 * the BCM2711, but the load tracker computations are used for
++	 * the core clock rate calculation.
++	 */
+ 	if (!is_vc5) {
+-		vc4->load_tracker_available = true;
+-
+ 		/* Start with the load tracker enabled. Can be
+ 		 * disabled through the debugfs load_tracker file.
+ 		 */
+--- a/drivers/gpu/drm/vc4/vc4_plane.c
++++ b/drivers/gpu/drm/vc4/vc4_plane.c
+@@ -529,11 +529,6 @@ static void vc4_plane_calc_load(struct d
+ 	struct vc4_plane_state *vc4_state;
+ 	struct drm_crtc_state *crtc_state;
+ 	unsigned int vscale_factor;
+-	struct vc4_dev *vc4;
+-
+-	vc4 = to_vc4_dev(state->plane->dev);
+-	if (!vc4->load_tracker_available)
+-		return;
+ 
+ 	vc4_state = to_vc4_plane_state(state);
+ 	crtc_state = drm_atomic_get_existing_crtc_state(state->state,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0018-drm-vc4-Increase-the-core-clock-based-on-HVS-load.patch b/root/target/linux/bcm27xx/patches-5.15/950-0018-drm-vc4-Increase-the-core-clock-based-on-HVS-load.patch
new file mode 100644
index 00000000..0766e461
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0018-drm-vc4-Increase-the-core-clock-based-on-HVS-load.patch
@@ -0,0 +1,242 @@
+From 7c9fbfef03953f5e079d1c02897aaf3c514f12ad Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Wed, 26 May 2021 16:13:02 +0200
+Subject: [PATCH 018/828] drm/vc4: Increase the core clock based on HVS load
+
+Depending on a given HVS output (HVS to PixelValves) and input (planes
+attached to a channel) load, the HVS needs for the core clock to be
+raised above its boot time default.
+
+Failing to do so will result in a vblank timeout and a stalled display
+pipeline.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c |  15 +++++
+ drivers/gpu/drm/vc4/vc4_drv.h  |   2 +
+ drivers/gpu/drm/vc4/vc4_kms.c  | 112 ++++++++++++++++++++++++++++++---
+ 3 files changed, 119 insertions(+), 10 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -661,12 +661,27 @@ static int vc4_crtc_atomic_check(struct
+ 	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state);
+ 	struct drm_connector *conn;
+ 	struct drm_connector_state *conn_state;
++	struct drm_encoder *encoder;
+ 	int ret, i;
+ 
+ 	ret = vc4_hvs_atomic_check(crtc, state);
+ 	if (ret)
+ 		return ret;
+ 
++	encoder = vc4_get_crtc_encoder(crtc, crtc_state);
++	if (encoder) {
++		const struct drm_display_mode *mode = &crtc_state->adjusted_mode;
++		struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder);
++
++		mode = &crtc_state->adjusted_mode;
++		if (vc4_encoder->type == VC4_ENCODER_TYPE_HDMI0) {
++			vc4_state->hvs_load = max(mode->clock * mode->hdisplay / mode->htotal + 1000,
++						  mode->clock * 9 / 10) * 1000;
++		} else {
++			vc4_state->hvs_load = mode->clock * 1000;
++		}
++	}
++
+ 	for_each_new_connector_in_state(state, conn, conn_state,
+ 					i) {
+ 		if (conn_state->crtc != crtc)
+--- a/drivers/gpu/drm/vc4/vc4_drv.h
++++ b/drivers/gpu/drm/vc4/vc4_drv.h
+@@ -558,6 +558,8 @@ struct vc4_crtc_state {
+ 		unsigned int bottom;
+ 	} margins;
+ 
++	unsigned long hvs_load;
++
+ 	/* Transitional state below, only valid during atomic commits */
+ 	bool update_muxing;
+ };
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -39,9 +39,11 @@ static struct vc4_ctm_state *to_vc4_ctm_
+ 
+ struct vc4_hvs_state {
+ 	struct drm_private_state base;
++	unsigned long core_clock_rate;
+ 
+ 	struct {
+ 		unsigned in_use: 1;
++		unsigned long fifo_load;
+ 		struct drm_crtc_commit *pending_commit;
+ 	} fifo_state[HVS_NUM_CHANNELS];
+ };
+@@ -339,11 +341,20 @@ static void vc4_atomic_commit_tail(struc
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
+ 	struct vc4_hvs *hvs = vc4->hvs;
+ 	struct drm_crtc_state *new_crtc_state;
++	struct vc4_hvs_state *new_hvs_state;
+ 	struct drm_crtc *crtc;
+ 	struct vc4_hvs_state *old_hvs_state;
+ 	unsigned int channel;
+ 	int i;
+ 
++	old_hvs_state = vc4_hvs_get_old_global_state(state);
++	if (WARN_ON(!old_hvs_state))
++		return;
++
++	new_hvs_state = vc4_hvs_get_new_global_state(state);
++	if (WARN_ON(!new_hvs_state))
++		return;
++
+ 	for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
+ 		struct vc4_crtc_state *vc4_crtc_state;
+ 
+@@ -354,10 +365,6 @@ static void vc4_atomic_commit_tail(struc
+ 		vc4_hvs_mask_underrun(dev, vc4_crtc_state->assigned_channel);
+ 	}
+ 
+-	old_hvs_state = vc4_hvs_get_old_global_state(state);
+-	if (IS_ERR(old_hvs_state))
+-		return;
+-
+ 	for (channel = 0; channel < HVS_NUM_CHANNELS; channel++) {
+ 		struct drm_crtc_commit *commit;
+ 		int ret;
+@@ -377,8 +384,13 @@ static void vc4_atomic_commit_tail(struc
+ 		old_hvs_state->fifo_state[channel].pending_commit = NULL;
+ 	}
+ 
+-	if (vc4->hvs->hvs5)
+-		clk_set_min_rate(hvs->core_clk, 500000000);
++	if (vc4->hvs->hvs5) {
++		unsigned long core_rate = max_t(unsigned long,
++						500000000,
++						new_hvs_state->core_clock_rate);
++
++		clk_set_min_rate(hvs->core_clk, core_rate);
++	}
+ 
+ 	drm_atomic_helper_commit_modeset_disables(dev, state);
+ 
+@@ -401,8 +413,12 @@ static void vc4_atomic_commit_tail(struc
+ 
+ 	drm_atomic_helper_cleanup_planes(dev, state);
+ 
+-	if (vc4->hvs->hvs5)
+-		clk_set_min_rate(hvs->core_clk, 0);
++	if (vc4->hvs->hvs5) {
++		drm_dbg(dev, "Running the core clock at %lu Hz\n",
++			new_hvs_state->core_clock_rate);
++
++		clk_set_min_rate(hvs->core_clk, new_hvs_state->core_clock_rate);
++	}
+ }
+ 
+ static int vc4_atomic_commit_setup(struct drm_atomic_state *state)
+@@ -659,11 +675,13 @@ vc4_hvs_channels_duplicate_state(struct
+ 
+ 	__drm_atomic_helper_private_obj_duplicate_state(obj, &state->base);
+ 
+-
+ 	for (i = 0; i < HVS_NUM_CHANNELS; i++) {
+ 		state->fifo_state[i].in_use = old_state->fifo_state[i].in_use;
++		state->fifo_state[i].fifo_load = old_state->fifo_state[i].fifo_load;
+ 	}
+ 
++	state->core_clock_rate = old_state->core_clock_rate;
++
+ 	return &state->base;
+ }
+ 
+@@ -819,6 +837,76 @@ static int vc4_pv_muxing_atomic_check(st
+ }
+ 
+ static int
++vc4_core_clock_atomic_check(struct drm_atomic_state *state)
++{
++	struct vc4_dev *vc4 = to_vc4_dev(state->dev);
++	struct drm_private_state *priv_state;
++	struct vc4_hvs_state *hvs_new_state;
++	struct vc4_load_tracker_state *load_state;
++	struct drm_crtc_state *old_crtc_state, *new_crtc_state;
++	struct drm_crtc *crtc;
++	unsigned int num_outputs;
++	unsigned long pixel_rate;
++	unsigned long cob_rate;
++	unsigned int i;
++
++	priv_state = drm_atomic_get_private_obj_state(state,
++						      &vc4->load_tracker);
++	if (IS_ERR(priv_state))
++		return PTR_ERR(priv_state);
++
++	load_state = to_vc4_load_tracker_state(priv_state);
++
++	hvs_new_state = vc4_hvs_get_global_state(state);
++	if (!hvs_new_state)
++		return -EINVAL;
++
++	for_each_oldnew_crtc_in_state(state, crtc,
++				      old_crtc_state,
++				      new_crtc_state,
++				      i) {
++		if (old_crtc_state->active) {
++			struct vc4_crtc_state *old_vc4_state =
++				to_vc4_crtc_state(old_crtc_state);
++			unsigned int channel = old_vc4_state->assigned_channel;
++
++			hvs_new_state->fifo_state[channel].fifo_load = 0;
++		}
++
++		if (new_crtc_state->active) {
++			struct vc4_crtc_state *new_vc4_state =
++				to_vc4_crtc_state(new_crtc_state);
++			unsigned int channel = new_vc4_state->assigned_channel;
++
++			hvs_new_state->fifo_state[channel].fifo_load =
++				new_vc4_state->hvs_load;
++		}
++	}
++
++	cob_rate = 0;
++	num_outputs = 0;
++	for (i = 0; i < HVS_NUM_CHANNELS; i++) {
++		if (!hvs_new_state->fifo_state[i].in_use)
++			continue;
++
++		num_outputs++;
++		cob_rate += hvs_new_state->fifo_state[i].fifo_load;
++	}
++
++	pixel_rate = load_state->hvs_load;
++	if (num_outputs > 1) {
++		pixel_rate = (pixel_rate * 40) / 100;
++	} else {
++		pixel_rate = (pixel_rate * 60) / 100;
++	}
++
++	hvs_new_state->core_clock_rate = max(cob_rate, pixel_rate);
++
++	return 0;
++}
++
++
++static int
+ vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state)
+ {
+ 	int ret;
+@@ -835,7 +923,11 @@ vc4_atomic_check(struct drm_device *dev,
+ 	if (ret)
+ 		return ret;
+ 
+-	return vc4_load_tracker_atomic_check(state);
++	ret = vc4_load_tracker_atomic_check(state);
++	if (ret)
++		return ret;
++
++	return vc4_core_clock_atomic_check(state);
+ }
+ 
+ static struct drm_mode_config_helper_funcs vc4_mode_config_helpers = {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0019-drm-vc4-select-PM.patch b/root/target/linux/bcm27xx/patches-5.15/950-0019-drm-vc4-select-PM.patch
new file mode 100644
index 00000000..14dc6b38
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0019-drm-vc4-select-PM.patch
@@ -0,0 +1,24 @@
+From 958592c4da73d5f35f6cb1d7994d526718eeb2fa Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Thu, 19 Aug 2021 15:53:03 +0200
+Subject: [PATCH 019/828] drm/vc4: select PM
+
+We already depend on runtime PM to get the power domains and clocks for
+most of the devices supported by the vc4 driver, so let's just select it
+to make sure it's there, and remove the ifdef.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/gpu/drm/vc4/Kconfig
++++ b/drivers/gpu/drm/vc4/Kconfig
+@@ -9,6 +9,7 @@ config DRM_VC4
+ 	select DRM_KMS_CMA_HELPER
+ 	select DRM_GEM_CMA_HELPER
+ 	select DRM_PANEL_BRIDGE
++	select PM
+ 	select SND_PCM
+ 	select SND_PCM_ELD
+ 	select SND_SOC_GENERIC_DMAENGINE_PCM
diff --git a/root/target/linux/bcm27xx/patches-5.15/0031-drm-probe-helper-Create-a-HPD-IRQ-event-helper-for-a.patch b/root/target/linux/bcm27xx/patches-5.15/950-0020-drm-probe-helper-Create-a-HPD-IRQ-event-helper-for-a.patch
similarity index 87%
rename from root/target/linux/bcm27xx/patches-5.15/0031-drm-probe-helper-Create-a-HPD-IRQ-event-helper-for-a.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0020-drm-probe-helper-Create-a-HPD-IRQ-event-helper-for-a.patch
index b85da959..1a619d5a 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0031-drm-probe-helper-Create-a-HPD-IRQ-event-helper-for-a.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0020-drm-probe-helper-Create-a-HPD-IRQ-event-helper-for-a.patch
@@ -1,7 +1,7 @@
-From 05bc2a114f7ee3caeb87377748bcf368d760b436 Mon Sep 17 00:00:00 2001
+From 435320b9d091bf1b42e65c2f36b16f9bebd0702d Mon Sep 17 00:00:00 2001
 From: Maxime Ripard <maxime@cerno.tech>
 Date: Thu, 19 Aug 2021 14:37:04 +0200
-Subject: [PATCH 031/634] drm/probe-helper: Create a HPD IRQ event helper for a
+Subject: [PATCH 020/828] drm/probe-helper: Create a HPD IRQ event helper for a
  single connector
 
 The drm_helper_hpd_irq_event() function is iterating over all the
@@ -23,25 +23,14 @@ Since both are suboptimal, let's create a helper that will only perform
 the status detection on a single connector.
 
 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
-
----
-
-Changes from v1:
-  - Rename the shared function
-  - Move the hotplug event notification out of the shared function
-  - Added missing locks
-  - Improve the documentation
-  - Switched to drm_dbg_kms
 ---
  drivers/gpu/drm/drm_probe_helper.c | 120 ++++++++++++++++++++---------
  include/drm/drm_probe_helper.h     |   1 +
  2 files changed, 86 insertions(+), 35 deletions(-)
 
-diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
-index 5606bca3caa8..fcf32ec0b0c8 100644
 --- a/drivers/gpu/drm/drm_probe_helper.c
 +++ b/drivers/gpu/drm/drm_probe_helper.c
-@@ -795,6 +795,86 @@ void drm_kms_helper_poll_fini(struct drm_device *dev)
+@@ -795,6 +795,86 @@ void drm_kms_helper_poll_fini(struct drm
  }
  EXPORT_SYMBOL(drm_kms_helper_poll_fini);
  
@@ -142,7 +131,7 @@ index 5606bca3caa8..fcf32ec0b0c8 100644
   *
   * This function must be called from process context with no mode
   * setting locks held.
-@@ -822,9 +903,7 @@ bool drm_helper_hpd_irq_event(struct drm_device *dev)
+@@ -822,9 +903,7 @@ bool drm_helper_hpd_irq_event(struct drm
  {
  	struct drm_connector *connector;
  	struct drm_connector_list_iter conn_iter;
@@ -152,7 +141,7 @@ index 5606bca3caa8..fcf32ec0b0c8 100644
  
  	if (!dev->mode_config.poll_enabled)
  		return false;
-@@ -832,37 +911,8 @@ bool drm_helper_hpd_irq_event(struct drm_device *dev)
+@@ -832,37 +911,8 @@ bool drm_helper_hpd_irq_event(struct drm
  	mutex_lock(&dev->mode_config.mutex);
  	drm_connector_list_iter_begin(dev, &conn_iter);
  	drm_for_each_connector_iter(connector, &conn_iter) {
@@ -191,11 +180,9 @@ index 5606bca3caa8..fcf32ec0b0c8 100644
  	}
  	drm_connector_list_iter_end(&conn_iter);
  	mutex_unlock(&dev->mode_config.mutex);
-diff --git a/include/drm/drm_probe_helper.h b/include/drm/drm_probe_helper.h
-index 8d3ed2834d34..04c57564c397 100644
 --- a/include/drm/drm_probe_helper.h
 +++ b/include/drm/drm_probe_helper.h
-@@ -18,6 +18,7 @@ int drm_helper_probe_detect(struct drm_connector *connector,
+@@ -18,6 +18,7 @@ int drm_helper_probe_detect(struct drm_c
  void drm_kms_helper_poll_init(struct drm_device *dev);
  void drm_kms_helper_poll_fini(struct drm_device *dev);
  bool drm_helper_hpd_irq_event(struct drm_device *dev);
@@ -203,6 +190,3 @@ index 8d3ed2834d34..04c57564c397 100644
  void drm_kms_helper_hotplug_event(struct drm_device *dev);
  
  void drm_kms_helper_poll_disable(struct drm_device *dev);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0021-drm-vc4-hdmi-Actually-check-for-the-connector-status.patch b/root/target/linux/bcm27xx/patches-5.15/950-0021-drm-vc4-hdmi-Actually-check-for-the-connector-status.patch
new file mode 100644
index 00000000..d76be354
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0021-drm-vc4-hdmi-Actually-check-for-the-connector-status.patch
@@ -0,0 +1,60 @@
+From b286ea771fae840609b0d5eeb25ef0a4518a2a4f Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Thu, 19 Aug 2021 13:50:12 +0200
+Subject: [PATCH 021/828] drm/vc4: hdmi: Actually check for the connector
+ status in hotplug
+
+The drm_helper_hpd_irq_event() documentation states that this function
+is "useful for drivers which can't or don't track hotplug interrupts for
+each connector." and that "Drivers which support hotplug interrupts for
+each connector individually and which have a more fine-grained detect
+logic should bypass this code and directly call
+drm_kms_helper_hotplug_event()". This is thus what we ended-up doing.
+
+However, what this actually means, and is further explained in the
+drm_kms_helper_hotplug_event() documentation, is that
+drm_kms_helper_hotplug_event() should be called by drivers that can
+track the connection status change, and if it has changed we should call
+that function.
+
+This underlying expectation we failed to provide is that the caller of
+drm_kms_helper_hotplug_event() should call drm_helper_probe_detect() to
+probe the new status of the connector.
+
+Since we didn't do it, it meant that even though we were sending the
+notification to user-space and the DRM clients that something changed we
+never probed or updated our internal connector status ourselves.
+
+This went mostly unnoticed since the detect callback usually doesn't
+have any side-effect. Also, if we were using the DRM fbdev emulation
+(which is a DRM client), or any user-space application that can deal
+with hotplug events, chances are they would react to the hotplug event
+by probing the connector status eventually.
+
+However, now that we have to enable the scrambler in detect() if it was
+enabled it has a side effect, and an application such as Kodi or
+modetest doesn't deal with hotplug events. This resulted with a black
+screen when Kodi or modetest was running when a screen was disconnected
+and then reconnected, or switched off and on.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -1792,10 +1792,11 @@ static void vc4_hdmi_audio_exit(struct v
+ static irqreturn_t vc4_hdmi_hpd_irq_thread(int irq, void *priv)
+ {
+ 	struct vc4_hdmi *vc4_hdmi = priv;
+-	struct drm_device *dev = vc4_hdmi->connector.dev;
++	struct drm_connector *connector = &vc4_hdmi->connector;
++	struct drm_device *dev = connector->dev;
+ 
+ 	if (dev && dev->registered)
+-		drm_kms_helper_hotplug_event(dev);
++		drm_connector_helper_hpd_irq_event(connector);
+ 
+ 	return IRQ_HANDLED;
+ }
diff --git a/root/target/linux/bcm27xx/patches-5.15/0437-firmware-raspberrypi-Add-RPI_FIRMWARE_NOTIFY_DISPLAY.patch b/root/target/linux/bcm27xx/patches-5.15/950-0022-firmware-raspberrypi-Add-RPI_FIRMWARE_NOTIFY_DISPLAY.patch
similarity index 59%
rename from root/target/linux/bcm27xx/patches-5.15/0437-firmware-raspberrypi-Add-RPI_FIRMWARE_NOTIFY_DISPLAY.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0022-firmware-raspberrypi-Add-RPI_FIRMWARE_NOTIFY_DISPLAY.patch
index 83f69ec0..1d1a489a 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0437-firmware-raspberrypi-Add-RPI_FIRMWARE_NOTIFY_DISPLAY.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0022-firmware-raspberrypi-Add-RPI_FIRMWARE_NOTIFY_DISPLAY.patch
@@ -1,30 +1,27 @@
-From 718bb5e770c3de0831c94944f384d00385ae7eb7 Mon Sep 17 00:00:00 2001
+From a0073d49aea8a21658a00c24439ca95f42baf3ee Mon Sep 17 00:00:00 2001
 From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 23 Jun 2021 11:53:46 +0200
-Subject: [PATCH 437/634] firmware: raspberrypi: Add
+Date: Wed, 15 Dec 2021 10:51:14 +0100
+Subject: [PATCH 022/828] firmware: raspberrypi: Add
  RPI_FIRMWARE_NOTIFY_DISPLAY_DONE
 
 The RPI_FIRMWARE_NOTIFY_DISPLAY_DONE firmware call allows to tell the
 firmware the kernel is in charge of the display now and the firmware can
 free whatever resources it was using.
 
+Acked-by: Nicolas Saenz Julienne <nsaenz@kernel.org>
 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Link: https://patchwork.freedesktop.org/patch/msgid/20211215095117.176435-2-maxime@cerno.tech
 ---
  include/soc/bcm2835/raspberrypi-firmware.h | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index 0eca333ad2be..ee361b90eb29 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
-@@ -95,6 +95,7 @@ enum rpi_firmware_property_tag {
+@@ -91,6 +91,7 @@ enum rpi_firmware_property_tag {
+ 	RPI_FIRMWARE_GET_POE_HAT_VAL =                        0x00030049,
+ 	RPI_FIRMWARE_SET_POE_HAT_VAL =                        0x00030050,
  	RPI_FIRMWARE_NOTIFY_XHCI_RESET =                      0x00030058,
- 	RPI_FIRMWARE_GET_REBOOT_FLAGS =                       0x00030064,
- 	RPI_FIRMWARE_SET_REBOOT_FLAGS =                       0x00038064,
 +	RPI_FIRMWARE_NOTIFY_DISPLAY_DONE =                    0x00030066,
  
  	/* Dispmanx TAGS */
  	RPI_FIRMWARE_FRAMEBUFFER_ALLOCATE =                   0x00040001,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0023-drm-vc4-Remove-conflicting-framebuffers-before-calli.patch b/root/target/linux/bcm27xx/patches-5.15/950-0023-drm-vc4-Remove-conflicting-framebuffers-before-calli.patch
new file mode 100644
index 00000000..786014a1
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0023-drm-vc4-Remove-conflicting-framebuffers-before-calli.patch
@@ -0,0 +1,39 @@
+From 5644237465a4d0bf53a37db34ebae894e9fc9aaf Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Wed, 15 Dec 2021 10:51:16 +0100
+Subject: [PATCH 023/828] drm/vc4: Remove conflicting framebuffers before
+ callind bind_all
+
+The bind hooks will modify their controller registers, so simplefb is
+going to be unusable anyway. Let's avoid any transient state where it
+could still be in the system but no longer functionnal.
+
+Acked-by: Nicolas Saenz Julienne <nsaenz@kernel.org>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Link: https://patchwork.freedesktop.org/patch/msgid/20211215095117.176435-4-maxime@cerno.tech
+---
+ drivers/gpu/drm/vc4/vc4_drv.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_drv.c
++++ b/drivers/gpu/drm/vc4/vc4_drv.c
+@@ -253,15 +253,15 @@ static int vc4_drm_bind(struct device *d
+ 	if (ret)
+ 		return ret;
+ 
+-	ret = component_bind_all(dev, drm);
++	ret = drm_aperture_remove_framebuffers(false, &vc4_drm_driver);
+ 	if (ret)
+ 		return ret;
+ 
+-	ret = vc4_plane_create_additional_planes(drm);
++	ret = component_bind_all(dev, drm);
+ 	if (ret)
+-		goto unbind_all;
++		return ret;
+ 
+-	ret = drm_aperture_remove_framebuffers(false, &vc4_drm_driver);
++	ret = vc4_plane_create_additional_planes(drm);
+ 	if (ret)
+ 		goto unbind_all;
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0024-drm-vc4-Notify-the-firmware-when-DRM-is-in-charge.patch b/root/target/linux/bcm27xx/patches-5.15/950-0024-drm-vc4-Notify-the-firmware-when-DRM-is-in-charge.patch
new file mode 100644
index 00000000..4a762a5c
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0024-drm-vc4-Notify-the-firmware-when-DRM-is-in-charge.patch
@@ -0,0 +1,69 @@
+From a52f674503e239ace32a2e831d42891682a86c89 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Wed, 15 Dec 2021 10:51:17 +0100
+Subject: [PATCH 024/828] drm/vc4: Notify the firmware when DRM is in charge
+
+Once the call to drm_fb_helper_remove_conflicting_framebuffers() has
+been made, simplefb has been unregistered and the KMS driver is entirely
+in charge of the display.
+
+Thus, we can notify the firmware it can free whatever resource it was
+using to maintain simplefb functional.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+Link: https://patchwork.freedesktop.org/patch/msgid/20211215095117.176435-5-maxime@cerno.tech
+---
+ drivers/gpu/drm/vc4/vc4_drv.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_drv.c
++++ b/drivers/gpu/drm/vc4/vc4_drv.c
+@@ -37,6 +37,8 @@
+ #include <drm/drm_fb_helper.h>
+ #include <drm/drm_vblank.h>
+ 
++#include <soc/bcm2835/raspberrypi-firmware.h>
++
+ #include "uapi/drm/vc4_drm.h"
+ 
+ #include "vc4_drv.h"
+@@ -217,6 +219,7 @@ static void vc4_match_add_drivers(struct
+ static int vc4_drm_bind(struct device *dev)
+ {
+ 	struct platform_device *pdev = to_platform_device(dev);
++	struct rpi_firmware *firmware = NULL;
+ 	struct drm_device *drm;
+ 	struct vc4_dev *vc4;
+ 	struct device_node *node;
+@@ -253,10 +256,29 @@ static int vc4_drm_bind(struct device *d
+ 	if (ret)
+ 		return ret;
+ 
++	node = of_find_compatible_node(NULL, NULL, "raspberrypi,bcm2835-firmware");
++	if (node) {
++		firmware = rpi_firmware_get(node);
++		of_node_put(node);
++
++		if (!firmware)
++			return -EPROBE_DEFER;
++	}
++
+ 	ret = drm_aperture_remove_framebuffers(false, &vc4_drm_driver);
+ 	if (ret)
+ 		return ret;
+ 
++	if (firmware) {
++		ret = rpi_firmware_property(firmware,
++					    RPI_FIRMWARE_NOTIFY_DISPLAY_DONE,
++					    NULL, 0);
++		if (ret)
++			drm_warn(drm, "Couldn't stop firmware display driver: %d\n", ret);
++
++		rpi_firmware_put(firmware);
++	}
++
+ 	ret = component_bind_all(dev, drm);
+ 	if (ret)
+ 		return ret;
diff --git a/root/target/linux/bcm27xx/patches-5.15/0033-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch b/root/target/linux/bcm27xx/patches-5.15/950-0025-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0033-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0025-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch
index 95a585b9..fb1b05d7 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0033-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0025-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch
@@ -1,7 +1,7 @@
-From 54c471a9b4588ba9bba0d9f3becb9ebcbf3f2c20 Mon Sep 17 00:00:00 2001
+From 47090ca3e20595483f323615502d929aaa83799f Mon Sep 17 00:00:00 2001
 From: Dan Pasanen <dan.pasanen@gmail.com>
 Date: Thu, 21 Sep 2017 09:55:42 -0500
-Subject: [PATCH 033/634] arm: partially revert
+Subject: [PATCH 025/828] arm: partially revert
  702b94bff3c50542a6e4ab9a4f4cef093262fe65
 
 * Re-expose some dmi APIs for use in VCSM
@@ -12,8 +12,6 @@ Subject: [PATCH 033/634] arm: partially revert
  arch/arm/mm/proc-syms.c           |  3 +++
  4 files changed, 28 insertions(+)
 
-diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
-index 5e56288e343b..d3672588ca84 100644
 --- a/arch/arm/include/asm/cacheflush.h
 +++ b/arch/arm/include/asm/cacheflush.h
 @@ -91,6 +91,21 @@
@@ -56,7 +54,7 @@ index 5e56288e343b..d3672588ca84 100644
  #define dmac_flush_range		cpu_cache.dma_flush_range
  
  #else
-@@ -156,6 +175,8 @@ extern void __cpuc_flush_dcache_area(void *, size_t);
+@@ -156,6 +175,8 @@ extern void __cpuc_flush_dcache_area(voi
   * is visible to DMA, or data written by DMA to system memory is
   * visible to the CPU.
   */
@@ -65,11 +63,9 @@ index 5e56288e343b..d3672588ca84 100644
  extern void dmac_flush_range(const void *, const void *);
  
  #endif
-diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h
-index 724f8dac1e5b..aa74173092dd 100644
 --- a/arch/arm/include/asm/glue-cache.h
 +++ b/arch/arm/include/asm/glue-cache.h
-@@ -155,6 +155,8 @@ static inline void nop_dma_unmap_area(const void *s, size_t l, int f) { }
+@@ -155,6 +155,8 @@ static inline void nop_dma_unmap_area(co
  #define __cpuc_coherent_user_range	__glue(_CACHE,_coherent_user_range)
  #define __cpuc_flush_dcache_area	__glue(_CACHE,_flush_kern_dcache_area)
  
@@ -78,8 +74,6 @@ index 724f8dac1e5b..aa74173092dd 100644
  #define dmac_flush_range		__glue(_CACHE,_dma_flush_range)
  #endif
  
-diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
-index d9f7dfe2a7ed..687d126d1c6c 100644
 --- a/arch/arm/mm/proc-macros.S
 +++ b/arch/arm/mm/proc-macros.S
 @@ -334,6 +334,8 @@ ENTRY(\name\()_cache_fns)
@@ -91,8 +85,6 @@ index d9f7dfe2a7ed..687d126d1c6c 100644
  	.long	\name\()_dma_flush_range
  	.size	\name\()_cache_fns, . - \name\()_cache_fns
  .endm
-diff --git a/arch/arm/mm/proc-syms.c b/arch/arm/mm/proc-syms.c
-index e21249548e9f..33e4a9b8f1ba 100644
 --- a/arch/arm/mm/proc-syms.c
 +++ b/arch/arm/mm/proc-syms.c
 @@ -27,6 +27,9 @@ EXPORT_SYMBOL(__cpuc_flush_user_all);
@@ -105,6 +97,3 @@ index e21249548e9f..33e4a9b8f1ba 100644
  #else
  EXPORT_SYMBOL(cpu_cache);
  #endif
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0034-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch b/root/target/linux/bcm27xx/patches-5.15/950-0026-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0034-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0026-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch
index cbc16e02..cfcffbec 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0034-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0026-Revert-rtc-pcf8523-properly-handle-oscillator-stop-b.patch
@@ -1,7 +1,7 @@
-From 7e6b77b2bba73652ea10978bba06cde6c7af6046 Mon Sep 17 00:00:00 2001
+From fac88fd5d60183089cfc11a875acbd47d0b00242 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Mon, 29 Oct 2018 14:45:45 +0000
-Subject: [PATCH 034/634] Revert "rtc: pcf8523: properly handle oscillator stop
+Subject: [PATCH 026/828] Revert "rtc: pcf8523: properly handle oscillator stop
  bit"
 
 This reverts commit ede44c908d44b166a5b6bd7caacd105c2ff5a70f.
@@ -13,11 +13,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/rtc/rtc-pcf8523.c | 24 ++++++++++++++++++++++--
  1 file changed, 22 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/rtc/rtc-pcf8523.c b/drivers/rtc/rtc-pcf8523.c
-index 8b6fb20774bf..ad2231f1faac 100644
 --- a/drivers/rtc/rtc-pcf8523.c
 +++ b/drivers/rtc/rtc-pcf8523.c
-@@ -242,8 +242,28 @@ static int pcf8523_rtc_read_time(struct device *dev, struct rtc_time *tm)
+@@ -242,8 +242,28 @@ static int pcf8523_rtc_read_time(struct
  	if (err < 0)
  		return err;
  
@@ -48,6 +46,3 @@ index 8b6fb20774bf..ad2231f1faac 100644
  
  	tm->tm_sec = bcd2bin(regs[0] & 0x7f);
  	tm->tm_min = bcd2bin(regs[1] & 0x7f);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0035-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch b/root/target/linux/bcm27xx/patches-5.15/950-0027-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0035-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0027-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch
index e0f92d7e..d653e627 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0035-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0027-Revert-staging-bcm2835-audio-Drop-DT-dependency.patch
@@ -1,15 +1,13 @@
-From e1aca9751c1ca2bb868435f32d985dc5622fb36f Mon Sep 17 00:00:00 2001
+From 8c4a8300ab9e004755f5708e1ca621f846a5b338 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 15 Mar 2019 21:11:10 +0000
-Subject: [PATCH 035/634] Revert "staging: bcm2835-audio: Drop DT dependency"
+Subject: [PATCH 027/828] Revert "staging: bcm2835-audio: Drop DT dependency"
 
 This reverts commit b7491a9fca2dc2535b9dc922550a37c5baae9d3d.
 ---
  .../vc04_services/bcm2835-audio/bcm2835.c     | 31 +++++++++++++------
  1 file changed, 22 insertions(+), 9 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-index c250fbef2fa3..b42917c25050 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 @@ -6,13 +6,13 @@
@@ -27,7 +25,7 @@ index c250fbef2fa3..b42917c25050 100644
  
  module_param(enable_hdmi, bool, 0444);
  MODULE_PARM_DESC(enable_hdmi, "Enables HDMI virtual audio device");
-@@ -21,8 +21,6 @@ MODULE_PARM_DESC(enable_headphones, "Enables Headphones virtual audio device");
+@@ -21,8 +21,6 @@ MODULE_PARM_DESC(enable_headphones, "Ena
  module_param(enable_compat_alsa, bool, 0444);
  MODULE_PARM_DESC(enable_compat_alsa,
  		 "Enables ALSA compatibility virtual audio device");
@@ -36,7 +34,7 @@ index c250fbef2fa3..b42917c25050 100644
  
  static void bcm2835_devm_free_vchi_ctx(struct device *dev, void *res)
  {
-@@ -296,19 +294,28 @@ static int snd_add_child_devices(struct device *device, u32 numchans)
+@@ -296,19 +294,28 @@ static int snd_add_child_devices(struct
  static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
  {
  	struct device *dev = &pdev->dev;
@@ -70,7 +68,7 @@ index c250fbef2fa3..b42917c25050 100644
  	if (err)
  		return err;
  
-@@ -330,6 +337,12 @@ static int snd_bcm2835_alsa_resume(struct platform_device *pdev)
+@@ -330,6 +337,12 @@ static int snd_bcm2835_alsa_resume(struc
  
  #endif
  
@@ -83,7 +81,7 @@ index c250fbef2fa3..b42917c25050 100644
  static struct platform_driver bcm2835_alsa_driver = {
  	.probe = snd_bcm2835_alsa_probe,
  #ifdef CONFIG_PM
-@@ -338,6 +351,7 @@ static struct platform_driver bcm2835_alsa_driver = {
+@@ -338,6 +351,7 @@ static struct platform_driver bcm2835_al
  #endif
  	.driver = {
  		.name = "bcm2835_audio",
@@ -91,11 +89,8 @@ index c250fbef2fa3..b42917c25050 100644
  	},
  };
  module_platform_driver(bcm2835_alsa_driver);
-@@ -345,4 +359,3 @@ module_platform_driver(bcm2835_alsa_driver);
+@@ -345,4 +359,3 @@ module_platform_driver(bcm2835_alsa_driv
  MODULE_AUTHOR("Dom Cobley");
  MODULE_DESCRIPTION("Alsa driver for BCM2835 chip");
  MODULE_LICENSE("GPL");
 -MODULE_ALIAS("platform:bcm2835_audio");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0036-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch b/root/target/linux/bcm27xx/patches-5.15/950-0028-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch
similarity index 63%
rename from root/target/linux/bcm27xx/patches-5.15/0036-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0028-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch
index 6af839d1..e0533a6e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0036-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0028-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch
@@ -1,7 +1,7 @@
-From 1913228233ca712bcf4a1798a14dae8d73a7812d Mon Sep 17 00:00:00 2001
+From bf681447fed1077d7caa01cd5a1303d764876371 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Mon, 20 Apr 2020 13:41:10 +0100
-Subject: [PATCH 036/634] Revert "spi: spidev: Fix CS polarity if GPIO
+Subject: [PATCH 028/828] Revert "spi: spidev: Fix CS polarity if GPIO
  descriptors are used"
 
 This reverts commit 83b2a8fe43bda0c11981ad6afa5dd0104d78be28.
@@ -9,11 +9,9 @@ This reverts commit 83b2a8fe43bda0c11981ad6afa5dd0104d78be28.
  drivers/spi/spidev.c | 5 -----
  1 file changed, 5 deletions(-)
 
-diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
-index 1bd73e322b7b..795bef1efcc6 100644
 --- a/drivers/spi/spidev.c
 +++ b/drivers/spi/spidev.c
-@@ -402,7 +402,6 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+@@ -402,7 +402,6 @@ spidev_ioctl(struct file *filp, unsigned
  		else
  			retval = get_user(tmp, (u32 __user *)arg);
  		if (retval == 0) {
@@ -21,7 +19,7 @@ index 1bd73e322b7b..795bef1efcc6 100644
  			u32	save = spi->mode;
  
  			if (tmp & ~SPI_MODE_MASK) {
-@@ -410,10 +409,6 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+@@ -410,10 +409,6 @@ spidev_ioctl(struct file *filp, unsigned
  				break;
  			}
  
@@ -32,6 +30,3 @@ index 1bd73e322b7b..795bef1efcc6 100644
  			tmp |= spi->mode & ~SPI_MODE_MASK;
  			spi->mode = (u16)tmp;
  			retval = spi_setup(spi);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0037-Revert-mailbox-avoid-timer-start-from-callback.patch b/root/target/linux/bcm27xx/patches-5.15/950-0029-Revert-mailbox-avoid-timer-start-from-callback.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0037-Revert-mailbox-avoid-timer-start-from-callback.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0029-Revert-mailbox-avoid-timer-start-from-callback.patch
index 5fa0063e..7de44045 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0037-Revert-mailbox-avoid-timer-start-from-callback.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0029-Revert-mailbox-avoid-timer-start-from-callback.patch
@@ -1,7 +1,7 @@
-From d5fdbbc0de13fa9a40f02e1efb2a141bed7d7c26 Mon Sep 17 00:00:00 2001
+From 67426427b88650b1e4ad874dc73b5332f92aebfd Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Tue, 3 Nov 2020 11:49:53 +0000
-Subject: [PATCH 037/634] Revert "mailbox: avoid timer start from callback"
+Subject: [PATCH 029/828] Revert "mailbox: avoid timer start from callback"
 
 This reverts commit c7dacf5b0f32957b24ef29df1207dc2cd8307743.
 
@@ -25,11 +25,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/mailbox/mailbox.c | 12 +++++-------
  1 file changed, 5 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
-index 3e7d4b20ab34..0b821a5b2db8 100644
 --- a/drivers/mailbox/mailbox.c
 +++ b/drivers/mailbox/mailbox.c
-@@ -82,12 +82,9 @@ static void msg_submit(struct mbox_chan *chan)
+@@ -82,12 +82,9 @@ static void msg_submit(struct mbox_chan
  exit:
  	spin_unlock_irqrestore(&chan->lock, flags);
  
@@ -45,7 +43,7 @@ index 3e7d4b20ab34..0b821a5b2db8 100644
  }
  
  static void tx_tick(struct mbox_chan *chan, int r)
-@@ -125,10 +122,11 @@ static enum hrtimer_restart txdone_hrtimer(struct hrtimer *hrtimer)
+@@ -125,10 +122,11 @@ static enum hrtimer_restart txdone_hrtim
  		struct mbox_chan *chan = &mbox->chans[i];
  
  		if (chan->active_req && chan->cl) {
@@ -58,6 +56,3 @@ index 3e7d4b20ab34..0b821a5b2db8 100644
  		}
  	}
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0038-Revert-Bluetooth-Always-request-for-user-confirmatio.patch b/root/target/linux/bcm27xx/patches-5.15/950-0030-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0038-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0030-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
index b931614e..d755d85b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0038-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0030-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
@@ -1,7 +1,7 @@
-From b16229ce33d1f597585e7a9adb2797698cd70d53 Mon Sep 17 00:00:00 2001
+From c8c89dff518af84e8850000441f6f2e0f40dfec6 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Mon, 1 Mar 2021 09:12:44 +0000
-Subject: [PATCH 038/634] Revert "Bluetooth: Always request for user
+Subject: [PATCH 030/828] Revert "Bluetooth: Always request for user
  confirmation for Just Works (LE SC)"
 
 This reverts commit ffee202a78c2980688bc5d2f7d56480e69a5e0c9.
@@ -22,11 +22,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  net/bluetooth/smp.c | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
 
-diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
-index 11f853d0500f..3efb60918dda 100644
 --- a/net/bluetooth/smp.c
 +++ b/net/bluetooth/smp.c
-@@ -2207,7 +2207,7 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)
+@@ -2207,7 +2207,7 @@ mackey_and_ltk:
  	if (err)
  		return SMP_UNSPECIFIED;
  
@@ -35,7 +33,7 @@ index 11f853d0500f..3efb60918dda 100644
  		if (hcon->out) {
  			sc_dhkey_check(smp);
  			SMP_ALLOW_CMD(smp, SMP_CMD_DHKEY_CHECK);
-@@ -2222,9 +2222,6 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)
+@@ -2222,9 +2222,6 @@ mackey_and_ltk:
  	confirm_hint = 0;
  
  confirm:
@@ -45,6 +43,3 @@ index 11f853d0500f..3efb60918dda 100644
  	err = mgmt_user_confirm_request(hcon->hdev, &hcon->dst, hcon->type,
  					hcon->dst_type, passkey, confirm_hint);
  	if (err)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0039-Revert-Bluetooth-Always-request-for-user-confirmatio.patch b/root/target/linux/bcm27xx/patches-5.15/950-0031-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0039-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0031-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
index 21f267d5..7d731931 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0039-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0031-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
@@ -1,7 +1,7 @@
-From 08df3cf28d296e75a24617b3f42e4074424d8723 Mon Sep 17 00:00:00 2001
+From b112518daffca7e8d95009da1eeaed967498d52b Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Mon, 1 Mar 2021 09:14:35 +0000
-Subject: [PATCH 039/634] Revert "Bluetooth: Always request for user
+Subject: [PATCH 031/828] Revert "Bluetooth: Always request for user
  confirmation for Just Works"
 
 This reverts commit 92516cd97fd4d8ad5b1421a0d51771044f453a5f.
@@ -20,11 +20,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  net/bluetooth/smp.c | 11 ++---------
  1 file changed, 2 insertions(+), 9 deletions(-)
 
-diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
-index 3efb60918dda..6f555b3c96a6 100644
 --- a/net/bluetooth/smp.c
 +++ b/net/bluetooth/smp.c
-@@ -883,16 +883,9 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,
+@@ -883,16 +883,9 @@ static int tk_request(struct l2cap_conn
  	    hcon->io_capability == HCI_IO_NO_INPUT_OUTPUT)
  		smp->method = JUST_WORKS;
  
@@ -43,6 +41,3 @@ index 3efb60918dda..6f555b3c96a6 100644
  		return 0;
  	}
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0040-smsx95xx-fix-crimes-against-truesize.patch b/root/target/linux/bcm27xx/patches-5.15/950-0032-smsx95xx-fix-crimes-against-truesize.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0040-smsx95xx-fix-crimes-against-truesize.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0032-smsx95xx-fix-crimes-against-truesize.patch
index 1c9d0c4a..1c2aea15 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0040-smsx95xx-fix-crimes-against-truesize.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0032-smsx95xx-fix-crimes-against-truesize.patch
@@ -1,7 +1,7 @@
-From cca91bca835263af74f73a048e15907037163f3e Mon Sep 17 00:00:00 2001
+From 96891c255392aadca5b5976544dc072886ee5cba Mon Sep 17 00:00:00 2001
 From: Steve Glendinning <steve.glendinning@smsc.com>
 Date: Thu, 19 Feb 2015 18:47:12 +0000
-Subject: [PATCH 040/634] smsx95xx: fix crimes against truesize
+Subject: [PATCH 032/828] smsx95xx: fix crimes against truesize
 
 smsc95xx is adjusting truesize when it shouldn't, and following a recent patch from Eric this is now triggering warnings.
 
@@ -12,8 +12,6 @@ Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
  drivers/net/usb/smsc95xx.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index 26b1bd8e845b..befbabddb7f2 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
 @@ -67,6 +67,10 @@ static bool turbo_mode = true;
@@ -27,7 +25,7 @@ index 26b1bd8e845b..befbabddb7f2 100644
  static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
  					    u32 *data, int in_pm)
  {
-@@ -1830,7 +1834,8 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
+@@ -1839,7 +1843,8 @@ static int smsc95xx_rx_fixup(struct usbn
  				if (dev->net->features & NETIF_F_RXCSUM)
  					smsc95xx_rx_csum_offload(skb);
  				skb_trim(skb, skb->len - 4); /* remove fcs */
@@ -37,7 +35,7 @@ index 26b1bd8e845b..befbabddb7f2 100644
  
  				return 1;
  			}
-@@ -1848,7 +1853,8 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
+@@ -1857,7 +1862,8 @@ static int smsc95xx_rx_fixup(struct usbn
  			if (dev->net->features & NETIF_F_RXCSUM)
  				smsc95xx_rx_csum_offload(ax_skb);
  			skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */
@@ -47,6 +45,3 @@ index 26b1bd8e845b..befbabddb7f2 100644
  
  			usbnet_skb_return(dev, ax_skb);
  		}
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0041-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch b/root/target/linux/bcm27xx/patches-5.15/950-0033-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0041-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0033-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
index 8ff565b2..7804cc0f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0041-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0033-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
@@ -1,7 +1,7 @@
-From 533c49dd675017d8027f555106df6c135a787c48 Mon Sep 17 00:00:00 2001
+From 368f02a84a036c5efd224ad62415bb58e085650c Mon Sep 17 00:00:00 2001
 From: Sam Nazarko <email@samnazarko.co.uk>
 Date: Fri, 1 Apr 2016 17:27:21 +0100
-Subject: [PATCH 041/634] smsc95xx: Experimental: Enable turbo_mode and
+Subject: [PATCH 033/828] smsc95xx: Experimental: Enable turbo_mode and
  packetsize=2560 by default
 
 See: http://forum.kodi.tv/showthread.php?tid=285288
@@ -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 befbabddb7f2..a7bb0bfa51a7 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
 @@ -71,6 +71,10 @@ static bool truesize_mode = false;
@@ -24,7 +22,7 @@ index befbabddb7f2..a7bb0bfa51a7 100644
  static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
  					    u32 *data, int in_pm)
  {
-@@ -905,13 +909,13 @@ static int smsc95xx_reset(struct usbnet *dev)
+@@ -917,13 +921,13 @@ static int smsc95xx_reset(struct usbnet
  
  	if (!turbo_mode) {
  		burst_cap = 0;
@@ -43,6 +41,3 @@ index befbabddb7f2..a7bb0bfa51a7 100644
  	}
  
  	netif_dbg(dev, ifup, dev->net, "rx_urb_size=%ld\n",
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0042-Allow-mac-address-to-be-set-in-smsc95xx.patch b/root/target/linux/bcm27xx/patches-5.15/950-0034-Allow-mac-address-to-be-set-in-smsc95xx.patch
similarity index 87%
rename from root/target/linux/bcm27xx/patches-5.15/0042-Allow-mac-address-to-be-set-in-smsc95xx.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0034-Allow-mac-address-to-be-set-in-smsc95xx.patch
index 7a2366f8..13980026 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0042-Allow-mac-address-to-be-set-in-smsc95xx.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0034-Allow-mac-address-to-be-set-in-smsc95xx.patch
@@ -1,15 +1,13 @@
-From de98c2df30df39fc7ea36af74fbe791b2be5c867 Mon Sep 17 00:00:00 2001
+From f4415fe11a71b6f549477d28060d1585d9585bf6 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 26 Mar 2013 17:26:38 +0000
-Subject: [PATCH 042/634] Allow mac address to be set in smsc95xx
+Subject: [PATCH 034/828] Allow mac address to be set in smsc95xx
 
 Signed-off-by: popcornmix <popcornmix@gmail.com>
 ---
  drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++
  1 file changed, 56 insertions(+)
 
-diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index a7bb0bfa51a7..8a035345d617 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
 @@ -50,6 +50,7 @@
@@ -31,7 +29,7 @@ index a7bb0bfa51a7..8a035345d617 100644
  static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
  					    u32 *data, int in_pm)
  {
-@@ -761,6 +766,53 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
+@@ -773,6 +778,53 @@ static int smsc95xx_ioctl(struct net_dev
  	return phy_mii_ioctl(netdev->phydev, rq, cmd);
  }
  
@@ -85,7 +83,7 @@ index a7bb0bfa51a7..8a035345d617 100644
  static void smsc95xx_init_mac_address(struct usbnet *dev)
  {
  	/* maybe the boot loader passed the MAC address in devicetree */
-@@ -783,6 +835,10 @@ static void smsc95xx_init_mac_address(struct usbnet *dev)
+@@ -795,6 +847,10 @@ static void smsc95xx_init_mac_address(st
  		}
  	}
  
@@ -96,6 +94,3 @@ index a7bb0bfa51a7..8a035345d617 100644
  	/* 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.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0043-cgroup-Disable-cgroup-memory-by-default.patch b/root/target/linux/bcm27xx/patches-5.15/950-0035-cgroup-Disable-cgroup-memory-by-default.patch
similarity index 79%
rename from root/target/linux/bcm27xx/patches-5.15/0043-cgroup-Disable-cgroup-memory-by-default.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0035-cgroup-Disable-cgroup-memory-by-default.patch
index 1fb37e7e..e7c6dc49 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0043-cgroup-Disable-cgroup-memory-by-default.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0035-cgroup-Disable-cgroup-memory-by-default.patch
@@ -1,7 +1,7 @@
-From 40a04a8163ad602e595998d97cd3278e85e7b398 Mon Sep 17 00:00:00 2001
+From f61ab6249b4da040e2a1d1e621bfe6acb3b70782 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Mon, 27 Nov 2017 17:14:54 +0000
-Subject: [PATCH 043/634] cgroup: Disable cgroup "memory" by default
+Subject: [PATCH 035/828] cgroup: Disable cgroup "memory" by default
 
 Some Raspberry Pis have limited RAM and most users won't use the
 cgroup memory support so it is disabled by default. Enable with:
@@ -15,11 +15,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  kernel/cgroup/cgroup.c | 38 ++++++++++++++++++++++++++++++++++++++
  1 file changed, 38 insertions(+)
 
-diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
-index d6ea872b23aa..db12e07ce531 100644
 --- a/kernel/cgroup/cgroup.c
 +++ b/kernel/cgroup/cgroup.c
-@@ -5788,6 +5788,9 @@ int __init cgroup_init_early(void)
+@@ -5824,6 +5824,9 @@ int __init cgroup_init_early(void)
  	return 0;
  }
  
@@ -29,7 +27,7 @@ index d6ea872b23aa..db12e07ce531 100644
  /**
   * cgroup_init - cgroup initialization
   *
-@@ -5826,6 +5829,12 @@ int __init cgroup_init(void)
+@@ -5862,6 +5865,12 @@ int __init cgroup_init(void)
  
  	mutex_unlock(&cgroup_mutex);
  
@@ -42,7 +40,7 @@ index d6ea872b23aa..db12e07ce531 100644
  	for_each_subsys(ss, ssid) {
  		if (ss->early_init) {
  			struct cgroup_subsys_state *css =
-@@ -6409,6 +6418,10 @@ static int __init cgroup_disable(char *str)
+@@ -6446,6 +6455,10 @@ static int __init cgroup_disable(char *s
  			    strcmp(token, ss->legacy_name))
  				continue;
  
@@ -53,7 +51,7 @@ index d6ea872b23aa..db12e07ce531 100644
  			static_branch_disable(cgroup_subsys_enabled_key[i]);
  			pr_info("Disabling %s control group subsystem\n",
  				ss->name);
-@@ -6427,6 +6440,31 @@ static int __init cgroup_disable(char *str)
+@@ -6464,6 +6477,31 @@ static int __init cgroup_disable(char *s
  }
  __setup("cgroup_disable=", cgroup_disable);
  
@@ -85,6 +83,3 @@ index d6ea872b23aa..db12e07ce531 100644
  void __init __weak enable_debug_cgroup(void) { }
  
  static int __init enable_cgroup_debug(char *str)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0044-Protect-__release_resource-against-resources-without.patch b/root/target/linux/bcm27xx/patches-5.15/950-0036-Protect-__release_resource-against-resources-without.patch
similarity index 63%
rename from root/target/linux/bcm27xx/patches-5.15/0044-Protect-__release_resource-against-resources-without.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0036-Protect-__release_resource-against-resources-without.patch
index 58296b79..aab0707e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0044-Protect-__release_resource-against-resources-without.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0036-Protect-__release_resource-against-resources-without.patch
@@ -1,7 +1,7 @@
-From 0f195b63e8705152d2774c6213ce3096efc8c14d Mon Sep 17 00:00:00 2001
+From 47a3b6930287238b8b4878ace1587e4c24d60678 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Fri, 13 Mar 2015 12:43:36 +0000
-Subject: [PATCH 044/634] Protect __release_resource against resources without
+Subject: [PATCH 036/828] Protect __release_resource against resources without
  parents
 
 Without this patch, removing a device tree overlay can crash here.
@@ -11,11 +11,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  kernel/resource.c | 6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/kernel/resource.c b/kernel/resource.c
-index ca9f5198a01f..dd5ac10ff847 100644
 --- a/kernel/resource.c
 +++ b/kernel/resource.c
-@@ -213,6 +213,12 @@ static int __release_resource(struct resource *old, bool release_child)
+@@ -188,6 +188,12 @@ static int __release_resource(struct res
  {
  	struct resource *tmp, **p, *chd;
  
@@ -28,6 +26,3 @@ index ca9f5198a01f..dd5ac10ff847 100644
  	p = &old->parent->child;
  	for (;;) {
  		tmp = *p;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0045-irq-bcm2836-Avoid-Invalid-trigger-warning.patch b/root/target/linux/bcm27xx/patches-5.15/950-0037-irq-bcm2836-Avoid-Invalid-trigger-warning.patch
similarity index 65%
rename from root/target/linux/bcm27xx/patches-5.15/0045-irq-bcm2836-Avoid-Invalid-trigger-warning.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0037-irq-bcm2836-Avoid-Invalid-trigger-warning.patch
index 5f258a53..582d7a1c 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0045-irq-bcm2836-Avoid-Invalid-trigger-warning.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0037-irq-bcm2836-Avoid-Invalid-trigger-warning.patch
@@ -1,7 +1,7 @@
-From 35a4353310b87f7e10c789cd5818bd83b6787a77 Mon Sep 17 00:00:00 2001
+From d767edbe02ee502f3dd3f7a9a607fedaa4eebdfb Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Thu, 9 Feb 2017 14:33:30 +0000
-Subject: [PATCH 045/634] irq-bcm2836: Avoid "Invalid trigger warning"
+Subject: [PATCH 037/828] irq-bcm2836: Avoid "Invalid trigger warning"
 
 Initialise the level for each IRQ to avoid a warning from the
 arm arch timer code.
@@ -11,11 +11,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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 501facdb4570..b6a7036305d8 100644
 --- a/drivers/irqchip/irq-bcm2836.c
 +++ b/drivers/irqchip/irq-bcm2836.c
-@@ -128,7 +128,7 @@ static int bcm2836_map(struct irq_domain *d, unsigned int irq,
+@@ -128,7 +128,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 501facdb4570..b6a7036305d8 100644
  
  	return 0;
  }
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0046-irqchip-bcm2835-Add-FIQ-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0038-irqchip-bcm2835-Add-FIQ-support.patch
similarity index 86%
rename from root/target/linux/bcm27xx/patches-5.15/0046-irqchip-bcm2835-Add-FIQ-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0038-irqchip-bcm2835-Add-FIQ-support.patch
index 528ddcea..107478d5 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0046-irqchip-bcm2835-Add-FIQ-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0038-irqchip-bcm2835-Add-FIQ-support.patch
@@ -1,7 +1,7 @@
-From 0fb5b605e449a0af9ea90b253729aa0cc05c1e9c Mon Sep 17 00:00:00 2001
+From 4625990bc4c0ae8ac4df8021dcd60cc33a640ef7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
 Date: Fri, 12 Jun 2015 19:01:05 +0200
-Subject: [PATCH 046/634] irqchip: bcm2835: Add FIQ support
+Subject: [PATCH 038/828] irqchip: bcm2835: Add FIQ support
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -18,8 +18,6 @@ Acked-by: Stephen Warren <swarren@wwwdotorg.org>
  drivers/irqchip/irq-bcm2835.c | 51 +++++++++++++++++++++++++++++++----
  2 files changed, 47 insertions(+), 5 deletions(-)
 
-diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
-index 2890e61b2b46..0462f870ab17 100644
 --- a/arch/arm/mach-bcm/Kconfig
 +++ b/arch/arm/mach-bcm/Kconfig
 @@ -162,6 +162,7 @@ config ARCH_BCM2835
@@ -30,8 +28,6 @@ index 2890e61b2b46..0462f870ab17 100644
  	select PINCTRL
  	select PINCTRL_BCM2835
  	select MFD_CORE
-diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c
-index adc1556ed332..0ae3b5d4d2de 100644
 --- a/drivers/irqchip/irq-bcm2835.c
 +++ b/drivers/irqchip/irq-bcm2835.c
 @@ -45,7 +45,7 @@
@@ -57,7 +53,7 @@ index adc1556ed332..0ae3b5d4d2de 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 adc1556ed332..0ae3b5d4d2de 100644
  }
  
  static struct irq_chip armctrl_chip = {
-@@ -142,8 +170,9 @@ static int __init armctrl_of_init(struct device_node *node,
+@@ -142,8 +170,9 @@ static int __init armctrl_of_init(struct
  	if (!base)
  		panic("%pOF: unable to map IC registers\n", node);
  
@@ -110,7 +106,7 @@ index adc1556ed332..0ae3b5d4d2de 100644
  	if (!intc.domain)
  		panic("%pOF: unable to create IRQ domain\n", node);
  
-@@ -186,6 +215,18 @@ static int __init armctrl_of_init(struct device_node *node,
+@@ -186,6 +215,18 @@ static int __init armctrl_of_init(struct
  		set_handle_irq(bcm2835_handle_irq);
  	}
  
@@ -129,6 +125,3 @@ index adc1556ed332..0ae3b5d4d2de 100644
  	return 0;
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0047-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0039-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch
similarity index 86%
rename from root/target/linux/bcm27xx/patches-5.15/0047-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0039-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch
index d952abf9..705e6ff9 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0047-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0039-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch
@@ -1,7 +1,7 @@
-From 7accb7f6c01b6922415a0c866f170088e0c28594 Mon Sep 17 00:00:00 2001
+From d23fc825c76b9d70833702f76c762f9afbadbb19 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
 Date: Fri, 23 Oct 2015 16:26:55 +0200
-Subject: [PATCH 047/634] irqchip: irq-bcm2835: Add 2836 FIQ support
+Subject: [PATCH 039/828] irqchip: irq-bcm2835: Add 2836 FIQ support
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -11,8 +11,6 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  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 0ae3b5d4d2de..a6ffff76c539 100644
 --- a/drivers/irqchip/irq-bcm2835.c
 +++ b/drivers/irqchip/irq-bcm2835.c
 @@ -41,8 +41,11 @@
@@ -45,7 +43,7 @@ index 0ae3b5d4d2de..a6ffff76c539 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 0ae3b5d4d2de..a6ffff76c539 100644
  }
  
  static struct irq_chip armctrl_chip = {
-@@ -215,6 +245,15 @@ static int __init armctrl_of_init(struct device_node *node,
+@@ -215,6 +245,15 @@ static int __init armctrl_of_init(struct
  		set_handle_irq(bcm2835_handle_irq);
  	}
  
@@ -99,6 +97,3 @@ index 0ae3b5d4d2de..a6ffff76c539 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.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0048-spi-spidev-Completely-disable-the-spidev-warning.patch b/root/target/linux/bcm27xx/patches-5.15/950-0040-spi-spidev-Completely-disable-the-spidev-warning.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0048-spi-spidev-Completely-disable-the-spidev-warning.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0040-spi-spidev-Completely-disable-the-spidev-warning.patch
index 462abe0d..0c2c27f6 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0048-spi-spidev-Completely-disable-the-spidev-warning.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0040-spi-spidev-Completely-disable-the-spidev-warning.patch
@@ -1,7 +1,7 @@
-From 0322d4639d99a2c0e472aee8996b566699b6355d Mon Sep 17 00:00:00 2001
+From 9c1ed77765cbf3b311edfe3be39561e778a355b9 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Tue, 14 Jul 2015 10:26:09 +0100
-Subject: [PATCH 048/634] spi: spidev: Completely disable the spidev warning
+Subject: [PATCH 040/828] spi: spidev: Completely disable the spidev warning
 
 An alternative strategy would be to use "rpi,spidev" instead, but that
 would require many Raspberry Pi Device Tree changes.
@@ -11,11 +11,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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 795bef1efcc6..9a3b8a51eaef 100644
 --- a/drivers/spi/spidev.c
 +++ b/drivers/spi/spidev.c
-@@ -746,7 +746,7 @@ static int spidev_probe(struct spi_device *spi)
+@@ -747,7 +747,7 @@ static int spidev_probe(struct spi_devic
  	 * compatible string, it is a Linux implementation thing
  	 * rather than a description of the hardware.
  	 */
@@ -24,6 +22,3 @@ index 795bef1efcc6..9a3b8a51eaef 100644
  	     of_device_is_compatible(spi->dev.of_node, "spidev"),
  	     "%pOF: buggy DT: spidev listed directly in DT\n", spi->dev.of_node);
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0049-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch b/root/target/linux/bcm27xx/patches-5.15/950-0041-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0049-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0041-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
index 69fddf64..9f44183f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0049-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0041-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
@@ -1,7 +1,7 @@
-From 1e5020ac43d2bf03efb094cf68b887de9a121a2e Mon Sep 17 00:00:00 2001
+From 576f90bdfda30cb1c00611c5e8d677a610e918b0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
 Date: Sat, 3 Oct 2015 22:22:55 +0200
-Subject: [PATCH 049/634] dmaengine: bcm2835: Load driver early and support
+Subject: [PATCH 041/828] dmaengine: bcm2835: Load driver early and support
  legacy API
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -18,8 +18,6 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  drivers/dma/bcm2835-dma.c | 26 +++++++++++++++++++++++++-
  2 files changed, 26 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
-index 80c2c03cb014..f5afe0ec4f96 100644
 --- a/drivers/dma/Kconfig
 +++ b/drivers/dma/Kconfig
 @@ -127,7 +127,7 @@ config BCM_SBA_RAID
@@ -31,8 +29,6 @@ index 80c2c03cb014..f5afe0ec4f96 100644
  	select DMA_ENGINE
  	select DMA_VIRTUAL_CHANNELS
  
-diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index 630dfbb01a40..bf7ba96a39f9 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -25,6 +25,7 @@
@@ -51,7 +47,7 @@ index 630dfbb01a40..bf7ba96a39f9 100644
  
  /**
   * struct bcm2835_dmadev - BCM2835 DMA controller
-@@ -906,6 +908,9 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
+@@ -906,6 +908,9 @@ static int bcm2835_dma_probe(struct plat
  	base = devm_ioremap_resource(&pdev->dev, res);
  	if (IS_ERR(base))
  		return PTR_ERR(base);
@@ -61,7 +57,7 @@ index 630dfbb01a40..bf7ba96a39f9 100644
  
  	od->base = base;
  
-@@ -951,6 +956,9 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
+@@ -951,6 +956,9 @@ static int bcm2835_dma_probe(struct plat
  		goto err_no_dma;
  	}
  
@@ -71,7 +67,7 @@ index 630dfbb01a40..bf7ba96a39f9 100644
  	/* get irqs for each channel that we support */
  	for (i = 0; i <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; i++) {
  		/* skip masked out channels */
-@@ -1025,6 +1033,7 @@ static int bcm2835_dma_remove(struct platform_device *pdev)
+@@ -1025,6 +1033,7 @@ static int bcm2835_dma_remove(struct pla
  {
  	struct bcm2835_dmadev *od = platform_get_drvdata(pdev);
  
@@ -79,7 +75,7 @@ index 630dfbb01a40..bf7ba96a39f9 100644
  	dma_async_device_unregister(&od->ddev);
  	bcm2835_dma_free(od);
  
-@@ -1040,7 +1049,22 @@ static struct platform_driver bcm2835_dma_driver = {
+@@ -1040,7 +1049,22 @@ static struct platform_driver bcm2835_dm
  	},
  };
  
@@ -103,6 +99,3 @@ index 630dfbb01a40..bf7ba96a39f9 100644
  
  MODULE_ALIAS("platform:bcm2835-dma");
  MODULE_DESCRIPTION("BCM2835 DMA engine driver");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0050-rtc-Add-SPI-alias-for-pcf2123-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0042-rtc-Add-SPI-alias-for-pcf2123-driver.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0050-rtc-Add-SPI-alias-for-pcf2123-driver.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0042-rtc-Add-SPI-alias-for-pcf2123-driver.patch
index 58a85bca..4fb5d95e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0050-rtc-Add-SPI-alias-for-pcf2123-driver.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0042-rtc-Add-SPI-alias-for-pcf2123-driver.patch
@@ -1,7 +1,7 @@
-From 2fa1a23df8dd065af38db8950c50b385cc96e583 Mon Sep 17 00:00:00 2001
+From 89020b09b62b7208c6e1dd42dddbe1c3f6caf947 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Wed, 15 Jun 2016 16:48:41 +0100
-Subject: [PATCH 050/634] rtc: Add SPI alias for pcf2123 driver
+Subject: [PATCH 042/828] rtc: Add SPI alias for pcf2123 driver
 
 Without this alias, Device Tree won't cause the driver
 to be loaded.
@@ -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 7473e6c8a183..4b986b338654 100644
 --- a/drivers/rtc/rtc-pcf2123.c
 +++ b/drivers/rtc/rtc-pcf2123.c
 @@ -473,3 +473,4 @@ module_spi_driver(pcf2123_driver);
@@ -20,6 +18,3 @@ index 7473e6c8a183..4b986b338654 100644
  MODULE_DESCRIPTION("NXP PCF2123 RTC driver");
  MODULE_LICENSE("GPL");
 +MODULE_ALIAS("spi:rtc-pcf2123");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0051-watchdog-bcm2835-Support-setting-reboot-partition.patch b/root/target/linux/bcm27xx/patches-5.15/950-0043-watchdog-bcm2835-Support-setting-reboot-partition.patch
similarity index 86%
rename from root/target/linux/bcm27xx/patches-5.15/0051-watchdog-bcm2835-Support-setting-reboot-partition.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0043-watchdog-bcm2835-Support-setting-reboot-partition.patch
index 909ce9b0..feb9fd0f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0051-watchdog-bcm2835-Support-setting-reboot-partition.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0043-watchdog-bcm2835-Support-setting-reboot-partition.patch
@@ -1,7 +1,7 @@
-From ee758835da30ce57abee8d3591170f0122a5b3b3 Mon Sep 17 00:00:00 2001
+From e43b149e1b5cec6127245d41a398e19bc77e787e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
 Date: Fri, 7 Oct 2016 16:50:59 +0200
-Subject: [PATCH 051/634] watchdog: bcm2835: Support setting reboot partition
+Subject: [PATCH 043/828] watchdog: bcm2835: Support setting reboot partition
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -19,8 +19,6 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  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 94907176a0e4..58d5a1b89584 100644
 --- a/drivers/watchdog/bcm2835_wdt.c
 +++ b/drivers/watchdog/bcm2835_wdt.c
 @@ -32,13 +32,7 @@
@@ -38,7 +36,7 @@ index 94907176a0e4..58d5a1b89584 100644
  
  #define SECS_TO_WDOG_TICKS(x) ((x) << 16)
  #define WDOG_TICKS_TO_SECS(x) ((x) >> 16)
-@@ -97,9 +91,24 @@ static unsigned int bcm2835_wdt_get_timeleft(struct watchdog_device *wdog)
+@@ -97,9 +91,24 @@ static unsigned int bcm2835_wdt_get_time
  	return WDOG_TICKS_TO_SECS(ret & PM_WDOG_TIME_SET);
  }
  
@@ -65,7 +63,7 @@ index 94907176a0e4..58d5a1b89584 100644
  
  	/* use a timeout of 10 ticks (~150us) */
  	writel_relaxed(10 | PM_PASSWORD, wdt->base + PM_WDOG);
-@@ -117,7 +126,13 @@ static int bcm2835_restart(struct watchdog_device *wdog,
+@@ -117,7 +126,13 @@ static int bcm2835_restart(struct watchd
  {
  	struct bcm2835_wdt *wdt = watchdog_get_drvdata(wdog);
  
@@ -80,7 +78,7 @@ index 94907176a0e4..58d5a1b89584 100644
  
  	return 0;
  }
-@@ -152,19 +167,9 @@ static struct watchdog_device bcm2835_wdt_wdd = {
+@@ -152,19 +167,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 94907176a0e4..58d5a1b89584 100644
  }
  
  static int bcm2835_wdt_probe(struct platform_device *pdev)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0052-reboot-Use-power-off-rather-than-busy-spinning-when-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0044-reboot-Use-power-off-rather-than-busy-spinning-when-.patch
similarity index 64%
rename from root/target/linux/bcm27xx/patches-5.15/0052-reboot-Use-power-off-rather-than-busy-spinning-when-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0044-reboot-Use-power-off-rather-than-busy-spinning-when-.patch
index 6ff44ad3..1492944f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0052-reboot-Use-power-off-rather-than-busy-spinning-when-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0044-reboot-Use-power-off-rather-than-busy-spinning-when-.patch
@@ -1,15 +1,13 @@
-From 10fbf516799bb00bf5c20fa539e7a10da9378ebc Mon Sep 17 00:00:00 2001
+From 7a658f50ad6404eda6f8bd883485418fcbbac6cb Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 5 Apr 2016 19:40:12 +0100
-Subject: [PATCH 052/634] reboot: Use power off rather than busy spinning when
+Subject: [PATCH 044/828] reboot: Use power off rather than busy spinning when
  halt is requested
 
 ---
  arch/arm/kernel/reboot.c | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
-diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c
-index 3044fcb8d073..fe22c46d9943 100644
 --- a/arch/arm/kernel/reboot.c
 +++ b/arch/arm/kernel/reboot.c
 @@ -101,9 +101,7 @@ void machine_shutdown(void)
@@ -23,6 +21,3 @@ index 3044fcb8d073..fe22c46d9943 100644
  }
  
  /*
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0053-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch b/root/target/linux/bcm27xx/patches-5.15/950-0045-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch
similarity index 67%
rename from root/target/linux/bcm27xx/patches-5.15/0053-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0045-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch
index 0ef2fe53..c89004c2 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0053-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0045-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch
@@ -1,14 +1,12 @@
-From e81b252831f153b6dc2b270eb66a5f002aed19ee Mon Sep 17 00:00:00 2001
+From 52370a1cddab2dd8100282ad329c1315ac38048d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 9 Nov 2016 13:02:52 +0000
-Subject: [PATCH 053/634] bcm: Make RASPBERRYPI_POWER depend on PM
+Subject: [PATCH 045/828] bcm: Make RASPBERRYPI_POWER depend on PM
 
 ---
  drivers/soc/bcm/Kconfig | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/soc/bcm/Kconfig b/drivers/soc/bcm/Kconfig
-index 24f92a6e882a..a6a705ec30c7 100644
 --- a/drivers/soc/bcm/Kconfig
 +++ b/drivers/soc/bcm/Kconfig
 @@ -17,6 +17,7 @@ config RASPBERRYPI_POWER
@@ -19,6 +17,3 @@ index 24f92a6e882a..a6a705ec30c7 100644
  	select PM_GENERIC_DOMAINS if PM
  	help
  	  This enables support for the RPi power domains which can be enabled
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0054-Register-the-clocks-early-during-the-boot-process-so.patch b/root/target/linux/bcm27xx/patches-5.15/950-0046-Register-the-clocks-early-during-the-boot-process-so.patch
similarity index 75%
rename from root/target/linux/bcm27xx/patches-5.15/0054-Register-the-clocks-early-during-the-boot-process-so.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0046-Register-the-clocks-early-during-the-boot-process-so.patch
index 0f6aaf96..9a76f71d 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0054-Register-the-clocks-early-during-the-boot-process-so.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0046-Register-the-clocks-early-during-the-boot-process-so.patch
@@ -1,7 +1,7 @@
-From 2240403332a02438761e961cc30e475001e0e971 Mon Sep 17 00:00:00 2001
+From f29de39e03adc3797d48b526ce78b15acfd01112 Mon Sep 17 00:00:00 2001
 From: Martin Sperl <kernel@martin.sperl.org>
 Date: Fri, 2 Sep 2016 16:45:27 +0100
-Subject: [PATCH 054/634] Register the clocks early during the boot process, so
+Subject: [PATCH 046/828] Register the clocks early during the boot process, so
  that special/critical clocks can get enabled early on in the boot process
  avoiding the risk of disabling a clock, pll_divider or pll when a claiming
  driver fails to install propperly - maybe it needs to defer.
@@ -11,11 +11,9 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
  drivers/clk/bcm/clk-bcm2835.c | 15 +++++++++++++--
  1 file changed, 13 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index 3667b4d731e7..9332379565cb 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -2289,8 +2289,15 @@ static int bcm2835_clk_probe(struct platform_device *pdev)
+@@ -2289,8 +2289,15 @@ static int bcm2835_clk_probe(struct plat
  	if (ret)
  		return ret;
  
@@ -32,7 +30,7 @@ index 3667b4d731e7..9332379565cb 100644
  }
  
  static const struct cprman_plat_data cprman_bcm2835_plat_data = {
-@@ -2316,7 +2323,11 @@ static struct platform_driver bcm2835_clk_driver = {
+@@ -2316,7 +2323,11 @@ static struct platform_driver bcm2835_cl
  	.probe          = bcm2835_clk_probe,
  };
  
@@ -45,6 +43,3 @@ index 3667b4d731e7..9332379565cb 100644
  
  MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
  MODULE_DESCRIPTION("BCM2835 clock driver");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0055-bcm2835-rng-Avoid-initialising-if-already-enabled.patch b/root/target/linux/bcm27xx/patches-5.15/950-0047-bcm2835-rng-Avoid-initialising-if-already-enabled.patch
similarity index 66%
rename from root/target/linux/bcm27xx/patches-5.15/0055-bcm2835-rng-Avoid-initialising-if-already-enabled.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0047-bcm2835-rng-Avoid-initialising-if-already-enabled.patch
index fe60bb55..c7236e47 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0055-bcm2835-rng-Avoid-initialising-if-already-enabled.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0047-bcm2835-rng-Avoid-initialising-if-already-enabled.patch
@@ -1,18 +1,16 @@
-From 6a478cf4989ca434f590096599fe7edf66d4c6f5 Mon Sep 17 00:00:00 2001
+From 9c44e3e8db46337d314ae91baec5e069554b72be Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 6 Dec 2016 17:05:39 +0000
-Subject: [PATCH 055/634] bcm2835-rng: Avoid initialising if already enabled
+Subject: [PATCH 047/828] bcm2835-rng: Avoid initialising if already enabled
 
 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 e7dd457e9b22..f9a4a89e762b 100644
 --- a/drivers/char/hw_random/bcm2835-rng.c
 +++ b/drivers/char/hw_random/bcm2835-rng.c
-@@ -106,8 +106,10 @@ static int bcm2835_rng_init(struct hwrng *rng)
+@@ -106,8 +106,10 @@ static int bcm2835_rng_init(struct hwrng
  	}
  
  	/* set warm-up count & enable */
@@ -25,6 +23,3 @@ index e7dd457e9b22..f9a4a89e762b 100644
  
  	return ret;
  }
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0056-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch b/root/target/linux/bcm27xx/patches-5.15/950-0048-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch
similarity index 68%
rename from root/target/linux/bcm27xx/patches-5.15/0056-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0048-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch
index 5bf89d07..825f667b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0056-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0048-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch
@@ -1,7 +1,7 @@
-From d1b7a7961814d5a60bc1e8494b2308525b42b584 Mon Sep 17 00:00:00 2001
+From dcce186901246abd12cf6280a4846934aeb5c595 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Mon, 13 Feb 2017 17:20:08 +0000
-Subject: [PATCH 056/634] clk-bcm2835: Mark used PLLs and dividers CRITICAL
+Subject: [PATCH 048/828] clk-bcm2835: Mark used PLLs and dividers CRITICAL
 
 The VPU configures and relies on several PLLs and dividers. Mark all
 enabled dividers and their PLLs as CRITICAL to prevent the kernel from
@@ -12,11 +12,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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 9332379565cb..d111f7f4fc81 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1378,6 +1378,11 @@ bcm2835_register_pll_divider(struct bcm2835_cprman *cprman,
+@@ -1378,6 +1378,11 @@ bcm2835_register_pll_divider(struct bcm2
  	divider->div.hw.init = &init;
  	divider->div.table = NULL;
  
@@ -28,6 +26,3 @@ index 9332379565cb..d111f7f4fc81 100644
  	divider->cprman = cprman;
  	divider->data = divider_data;
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0057-clk-bcm2835-Add-claim-clocks-property.patch b/root/target/linux/bcm27xx/patches-5.15/950-0049-clk-bcm2835-Add-claim-clocks-property.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0057-clk-bcm2835-Add-claim-clocks-property.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0049-clk-bcm2835-Add-claim-clocks-property.patch
index 61066c88..7ea9a52b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0057-clk-bcm2835-Add-claim-clocks-property.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0049-clk-bcm2835-Add-claim-clocks-property.patch
@@ -1,7 +1,7 @@
-From c1db994a1b6533cb5354f276fc68e95bb0a9bd67 Mon Sep 17 00:00:00 2001
+From 71691549878c2c1809b96c26bb8b2a87acd68969 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Mon, 13 Feb 2017 17:20:08 +0000
-Subject: [PATCH 057/634] clk-bcm2835: Add claim-clocks property
+Subject: [PATCH 049/828] clk-bcm2835: Add claim-clocks property
 
 The claim-clocks property can be used to prevent PLLs and dividers
 from being marked as critical. It contains a vector of clock IDs,
@@ -15,11 +15,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/clk/bcm/clk-bcm2835.c | 45 ++++++++++++++++++++++++++++++++---
  1 file changed, 42 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index d111f7f4fc81..76bf4c81316e 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1306,6 +1306,8 @@ static const struct clk_ops bcm2835_vpu_clock_clk_ops = {
+@@ -1306,6 +1306,8 @@ static const struct clk_ops bcm2835_vpu_
  	.debug_init = bcm2835_clock_debug_init,
  };
  
@@ -28,7 +26,7 @@ index d111f7f4fc81..76bf4c81316e 100644
  static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman,
  					   const void *data)
  {
-@@ -1323,6 +1325,9 @@ static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman,
+@@ -1323,6 +1325,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 d111f7f4fc81..76bf4c81316e 100644
  	pll = kzalloc(sizeof(*pll), GFP_KERNEL);
  	if (!pll)
  		return NULL;
-@@ -1378,9 +1383,11 @@ bcm2835_register_pll_divider(struct bcm2835_cprman *cprman,
+@@ -1378,9 +1383,11 @@ bcm2835_register_pll_divider(struct bcm2
  	divider->div.hw.init = &init;
  	divider->div.table = NULL;
  
@@ -53,11 +51,10 @@ index d111f7f4fc81..76bf4c81316e 100644
  	}
  
  	divider->cprman = cprman;
-@@ -1436,6 +1443,15 @@ static struct clk_hw *bcm2835_register_clock(struct bcm2835_cprman *cprman,
- 	init.name = clock_data->name;
+@@ -1437,6 +1444,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
@@ -66,10 +63,11 @@ index d111f7f4fc81..76bf4c81316e 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.
-@@ -2215,6 +2231,8 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {
+ 	 */
+@@ -2215,6 +2231,8 @@ static const struct bcm2835_clk_desc clk
  		.ctl_reg = CM_PERIICTL),
  };
  
@@ -78,7 +76,7 @@ index d111f7f4fc81..76bf4c81316e 100644
  /*
   * Permanently take a reference on the parent of the SDRAM clock.
   *
-@@ -2234,6 +2252,19 @@ static int bcm2835_mark_sdc_parent_critical(struct clk *sdc)
+@@ -2234,6 +2252,19 @@ static int bcm2835_mark_sdc_parent_criti
  	return clk_prepare_enable(parent);
  }
  
@@ -98,7 +96,7 @@ index d111f7f4fc81..76bf4c81316e 100644
  static int bcm2835_clk_probe(struct platform_device *pdev)
  {
  	struct device *dev = &pdev->dev;
-@@ -2243,6 +2274,7 @@ static int bcm2835_clk_probe(struct platform_device *pdev)
+@@ -2243,6 +2274,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;
@@ -106,7 +104,7 @@ index d111f7f4fc81..76bf4c81316e 100644
  	int ret;
  
  	pdata = of_device_get_match_data(&pdev->dev);
-@@ -2261,6 +2293,13 @@ static int bcm2835_clk_probe(struct platform_device *pdev)
+@@ -2261,6 +2293,13 @@ static int bcm2835_clk_probe(struct plat
  	if (IS_ERR(cprman->regs))
  		return PTR_ERR(cprman->regs);
  
@@ -120,6 +118,3 @@ index d111f7f4fc81..76bf4c81316e 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.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0058-clk-bcm2835-Read-max-core-clock-from-firmware.patch b/root/target/linux/bcm27xx/patches-5.15/950-0050-clk-bcm2835-Read-max-core-clock-from-firmware.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0058-clk-bcm2835-Read-max-core-clock-from-firmware.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0050-clk-bcm2835-Read-max-core-clock-from-firmware.patch
index 10508e03..357ccefd 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0058-clk-bcm2835-Read-max-core-clock-from-firmware.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0050-clk-bcm2835-Read-max-core-clock-from-firmware.patch
@@ -1,7 +1,7 @@
-From e096dfdc7d68b3fef9f5338df8df679969b1bc8a Mon Sep 17 00:00:00 2001
+From 4e3e5995804776cd5425928cd3bbbc74750643ed Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Mon, 6 Mar 2017 09:06:18 +0000
-Subject: [PATCH 058/634] clk-bcm2835: Read max core clock from firmware
+Subject: [PATCH 050/828] clk-bcm2835: Read max core clock from firmware
 
 The VPU is responsible for managing the core clock, usually under
 direction from the bcm2835-cpufreq driver but not via the clk-bcm2835
@@ -23,8 +23,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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 76bf4c81316e..9b9a799a487d 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
 @@ -35,6 +35,7 @@
@@ -44,7 +42,7 @@ index 76bf4c81316e..9b9a799a487d 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
-@@ -313,6 +316,7 @@ static const char *const cprman_parent_names[] = {
+@@ -313,6 +316,7 @@ static const char *const cprman_parent_n
  struct bcm2835_cprman {
  	struct device *dev;
  	void __iomem *regs;
@@ -52,7 +50,7 @@ index 76bf4c81316e..9b9a799a487d 100644
  	spinlock_t regs_lock; /* spinlock for all clocks */
  	unsigned int soc;
  
-@@ -1010,6 +1014,30 @@ static unsigned long bcm2835_clock_get_rate(struct clk_hw *hw,
+@@ -1010,6 +1014,30 @@ static unsigned long bcm2835_clock_get_r
  	return bcm2835_clock_rate_from_divisor(clock, parent_rate, div);
  }
  
@@ -83,7 +81,7 @@ index 76bf4c81316e..9b9a799a487d 100644
  static void bcm2835_clock_wait_busy(struct bcm2835_clock *clock)
  {
  	struct bcm2835_cprman *cprman = clock->cprman;
-@@ -1298,7 +1326,7 @@ static int bcm2835_vpu_clock_is_on(struct clk_hw *hw)
+@@ -1298,7 +1326,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,
@@ -92,7 +90,7 @@ index 76bf4c81316e..9b9a799a487d 100644
  	.set_rate = bcm2835_clock_set_rate,
  	.determine_rate = bcm2835_clock_determine_rate,
  	.set_parent = bcm2835_clock_set_parent,
-@@ -2273,6 +2301,7 @@ static int bcm2835_clk_probe(struct platform_device *pdev)
+@@ -2273,6 +2301,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;
@@ -100,7 +98,7 @@ index 76bf4c81316e..9b9a799a487d 100644
  	size_t i;
  	u32 clk_id;
  	int ret;
-@@ -2293,6 +2322,14 @@ static int bcm2835_clk_probe(struct platform_device *pdev)
+@@ -2293,6 +2322,14 @@ static int bcm2835_clk_probe(struct plat
  	if (IS_ERR(cprman->regs))
  		return PTR_ERR(cprman->regs);
  
@@ -115,6 +113,3 @@ index 76bf4c81316e..9b9a799a487d 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.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0059-sound-Demote-deferral-errors-to-INFO-level.patch b/root/target/linux/bcm27xx/patches-5.15/950-0051-sound-Demote-deferral-errors-to-INFO-level.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0059-sound-Demote-deferral-errors-to-INFO-level.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0051-sound-Demote-deferral-errors-to-INFO-level.patch
index 5a3e4107..c23feb48 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0059-sound-Demote-deferral-errors-to-INFO-level.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0051-sound-Demote-deferral-errors-to-INFO-level.patch
@@ -1,7 +1,7 @@
-From 322604e2085fc8b6e13a211718200ebd8802fb29 Mon Sep 17 00:00:00 2001
+From d91e03b406108d5134bfd4e059327ce68b356fa0 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Thu, 9 Feb 2017 14:36:44 +0000
-Subject: [PATCH 059/634] sound: Demote deferral errors to INFO level
+Subject: [PATCH 051/828] sound: Demote deferral errors to INFO level
 
 At present there is no mechanism to specify driver load order,
 which can lead to deferrals and repeated retries until successful.
@@ -13,11 +13,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  sound/soc/soc-core.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
-index 80ca260595fd..633b02b43c9f 100644
 --- a/sound/soc/soc-core.c
 +++ b/sound/soc/soc-core.c
-@@ -1017,7 +1017,7 @@ int snd_soc_add_pcm_runtime(struct snd_soc_card *card,
+@@ -1017,7 +1017,7 @@ int snd_soc_add_pcm_runtime(struct snd_s
  	for_each_link_cpus(dai_link, i, cpu) {
  		asoc_rtd_to_cpu(rtd, i) = snd_soc_find_dai(cpu);
  		if (!asoc_rtd_to_cpu(rtd, i)) {
@@ -26,7 +24,7 @@ index 80ca260595fd..633b02b43c9f 100644
  				 cpu->dai_name);
  			goto _err_defer;
  		}
-@@ -1028,7 +1028,7 @@ int snd_soc_add_pcm_runtime(struct snd_soc_card *card,
+@@ -1028,7 +1028,7 @@ int snd_soc_add_pcm_runtime(struct snd_s
  	for_each_link_codecs(dai_link, i, codec) {
  		asoc_rtd_to_codec(rtd, i) = snd_soc_find_dai(codec);
  		if (!asoc_rtd_to_codec(rtd, i)) {
@@ -35,6 +33,3 @@ index 80ca260595fd..633b02b43c9f 100644
  				 codec->dai_name);
  			goto _err_defer;
  		}
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0060-Update-vfpmodule.c.patch b/root/target/linux/bcm27xx/patches-5.15/950-0052-Update-vfpmodule.c.patch
similarity index 90%
rename from root/target/linux/bcm27xx/patches-5.15/0060-Update-vfpmodule.c.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0052-Update-vfpmodule.c.patch
index acb216e5..f4129c2b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0060-Update-vfpmodule.c.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0052-Update-vfpmodule.c.patch
@@ -1,7 +1,7 @@
-From 87d19cf28c0d690c08b0f2d172922fd9ed14b568 Mon Sep 17 00:00:00 2001
+From faff7b1971f9c03fbadc26f11e0a78cdbeb89ea3 Mon Sep 17 00:00:00 2001
 From: Claggy3 <stephen.maclagan@hotmail.com>
 Date: Sat, 11 Feb 2017 14:00:30 +0000
-Subject: [PATCH 060/634] Update vfpmodule.c
+Subject: [PATCH 052/828] Update vfpmodule.c
 
 Christopher Alexander Tobias Schulze - May 2, 2015, 11:57 a.m.
 This patch fixes a problem with VFP state save and restore related
@@ -59,11 +59,9 @@ Signed-off-by: Christopher Alexander Tobias Schulze <cat.schulze@alice-dsl.net>
  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 2cb355c1b5b7..1e2dcf81aefa 100644
 --- a/arch/arm/vfp/vfpmodule.c
 +++ b/arch/arm/vfp/vfpmodule.c
-@@ -176,8 +176,11 @@ static int vfp_notifier(struct notifier_block *self, unsigned long cmd, void *v)
+@@ -176,8 +176,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 2cb355c1b5b7..1e2dcf81aefa 100644
  		vfp_save_state(vfp_current_hw_state[ti->cpu], fpexc);
  		fmxr(FPEXC, fpexc);
  #endif
-@@ -523,7 +529,8 @@ void vfp_sync_hwstate(struct thread_info *thread)
+@@ -523,7 +529,8 @@ void vfp_sync_hwstate(struct thread_info
  		/*
  		 * Save the last VFP state on this CPU.
  		 */
@@ -104,7 +102,7 @@ index 2cb355c1b5b7..1e2dcf81aefa 100644
  		vfp_save_state(&thread->vfpstate, fpexc | FPEXC_EN);
  		fmxr(FPEXC, fpexc);
  	}
-@@ -589,6 +596,7 @@ int vfp_restore_user_hwstate(struct user_vfp *ufp, struct user_vfp_exc *ufp_exc)
+@@ -589,6 +596,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 2cb355c1b5b7..1e2dcf81aefa 100644
  
  	/* Disable VFP to avoid corrupting the new thread state. */
  	vfp_flush_hwstate(thread);
-@@ -611,8 +619,12 @@ int vfp_restore_user_hwstate(struct user_vfp *ufp, struct user_vfp_exc *ufp_exc)
+@@ -611,8 +619,12 @@ int vfp_restore_user_hwstate(struct user
  	/* Ensure the VFP is enabled. */
  	fpexc |= FPEXC_EN;
  
@@ -137,6 +135,3 @@ index 2cb355c1b5b7..1e2dcf81aefa 100644
  
  	/*
  	 * Save the userland NEON/VFP state. Under UP,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0061-i2c-bcm2835-Add-debug-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0053-i2c-bcm2835-Add-debug-support.patch
similarity index 88%
rename from root/target/linux/bcm27xx/patches-5.15/0061-i2c-bcm2835-Add-debug-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0053-i2c-bcm2835-Add-debug-support.patch
index 6623c8c0..30a36004 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0061-i2c-bcm2835-Add-debug-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0053-i2c-bcm2835-Add-debug-support.patch
@@ -1,7 +1,7 @@
-From e8015f39c17a5a2f91cbac60cd39069220a0d2ac Mon Sep 17 00:00:00 2001
+From 1e04beb3cb702f3d57cf5111a8fd21068454f78c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
 Date: Tue, 1 Nov 2016 15:15:41 +0100
-Subject: [PATCH 061/634] i2c: bcm2835: Add debug support
+Subject: [PATCH 053/828] i2c: bcm2835: Add debug support
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -35,11 +35,9 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  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 37443edbf754..18b2e9e3d752 100644
 --- a/drivers/i2c/busses/i2c-bcm2835.c
 +++ b/drivers/i2c/busses/i2c-bcm2835.c
-@@ -51,6 +51,18 @@
+@@ -56,6 +56,18 @@
  #define BCM2835_I2C_CDIV_MIN	0x0002
  #define BCM2835_I2C_CDIV_MAX	0xFFFE
  
@@ -58,7 +56,7 @@ index 37443edbf754..18b2e9e3d752 100644
  struct bcm2835_i2c_dev {
  	struct device *dev;
  	void __iomem *regs;
-@@ -63,8 +75,78 @@ struct bcm2835_i2c_dev {
+@@ -68,8 +80,78 @@ struct bcm2835_i2c_dev {
  	u32 msg_err;
  	u8 *msg_buf;
  	size_t msg_buf_remaining;
@@ -137,7 +135,7 @@ index 37443edbf754..18b2e9e3d752 100644
  static inline void bcm2835_i2c_writel(struct bcm2835_i2c_dev *i2c_dev,
  				      u32 reg, u32 val)
  {
-@@ -252,6 +334,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 37443edbf754..18b2e9e3d752 100644
  }
  
  static void bcm2835_i2c_finish_transfer(struct bcm2835_i2c_dev *i2c_dev)
-@@ -278,6 +361,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 37443edbf754..18b2e9e3d752 100644
  
  	err = val & (BCM2835_I2C_S_CLKT | BCM2835_I2C_S_ERR);
  	if (err) {
-@@ -344,6 +428,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 37443edbf754..18b2e9e3d752 100644
  	for (i = 0; i < (num - 1); i++)
  		if (msgs[i].flags & I2C_M_RD) {
  			dev_warn_once(i2c_dev->dev,
-@@ -362,6 +453,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 37443edbf754..18b2e9e3d752 100644
  	if (!time_left) {
  		bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C,
  				   BCM2835_I2C_C_CLEAR);
-@@ -372,7 +467,9 @@ static int bcm2835_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[],
+@@ -377,7 +472,9 @@ static int bcm2835_i2c_xfer(struct i2c_a
  	if (!i2c_dev->msg_err)
  		return num;
  
@@ -189,6 +187,3 @@ index 37443edbf754..18b2e9e3d752 100644
  
  	if (i2c_dev->msg_err & BCM2835_I2C_S_ERR)
  		return -EREMOTEIO;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0062-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch b/root/target/linux/bcm27xx/patches-5.15/950-0054-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch
similarity index 84%
rename from root/target/linux/bcm27xx/patches-5.15/0062-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0054-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch
index c9bb12a2..2b60cdfd 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0062-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0054-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch
@@ -1,7 +1,7 @@
-From afad4ffe2d466cadf396592d78df9cdb16041c26 Mon Sep 17 00:00:00 2001
+From 990b66cf837f2088744d63764983943e9df13e6a Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Tue, 23 Jan 2018 16:52:45 +0000
-Subject: [PATCH 062/634] irqchip: irq-bcm2836: Remove regmap and syscon use
+Subject: [PATCH 054/828] irqchip: irq-bcm2836: Remove regmap and syscon use
 
 The syscon node defines a register range that duplicates that used by
 the local_intc node on bcm2836/7. Since irq-bcm2835 and irq-bcm2836 are
@@ -20,8 +20,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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 a6ffff76c539..e08c209521ac 100644
 --- a/drivers/irqchip/irq-bcm2835.c
 +++ b/drivers/irqchip/irq-bcm2835.c
 @@ -41,8 +41,6 @@
@@ -42,7 +40,7 @@ index a6ffff76c539..e08c209521ac 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 a6ffff76c539..e08c209521ac 100644
  		}
  
  		writel_relaxed(REG_FIQ_ENABLE | hwirq_to_fiq(d->hwirq),
-@@ -246,12 +240,10 @@ static int __init armctrl_of_init(struct device_node *node,
+@@ -246,12 +240,10 @@ static int __init armctrl_of_init(struct
  	}
  
  	if (is_2836) {
@@ -91,8 +89,6 @@ index a6ffff76c539..e08c209521ac 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 b6a7036305d8..867c3b43490c 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 b6a7036305d8..867c3b43490c 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 b6a7036305d8..867c3b43490c 100644
  	bcm2835_init_local_timer_frequency();
  
  	intc.domain = irq_domain_add_linear(node, LAST_IRQ + 1,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0063-lan78xx-Enable-LEDs-and-auto-negotiation.patch b/root/target/linux/bcm27xx/patches-5.15/950-0055-lan78xx-Enable-LEDs-and-auto-negotiation.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0063-lan78xx-Enable-LEDs-and-auto-negotiation.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0055-lan78xx-Enable-LEDs-and-auto-negotiation.patch
index d93482ea..cd97e605 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0063-lan78xx-Enable-LEDs-and-auto-negotiation.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0055-lan78xx-Enable-LEDs-and-auto-negotiation.patch
@@ -1,7 +1,7 @@
-From 68c76ce879b7e970a748f8c2686f25ac3b817f7e Mon Sep 17 00:00:00 2001
+From 191379e03871c844045018dff9913dcacb5561e1 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Tue, 17 Oct 2017 15:04:29 +0100
-Subject: [PATCH 063/634] lan78xx: Enable LEDs and auto-negotiation
+Subject: [PATCH 055/828] lan78xx: Enable LEDs and auto-negotiation
 
 For applications of the LAN78xx that don't have valid programmed
 EEPROMs or OTPs, enabling both LEDs and auto-negotiation by default
@@ -12,11 +12,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/net/usb/lan78xx.c | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
-diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
-index 63cd72c5f580..3d39f34bc641 100644
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -2714,6 +2714,11 @@ static int lan78xx_reset(struct lan78xx_net *dev)
+@@ -2716,6 +2716,11 @@ static int lan78xx_reset(struct lan78xx_
  	int ret;
  	u32 buf;
  	u8 sig;
@@ -28,7 +26,7 @@ index 63cd72c5f580..3d39f34bc641 100644
  
  	ret = lan78xx_read_reg(dev, HW_CFG, &buf);
  	if (ret < 0)
-@@ -2795,6 +2800,10 @@ static int lan78xx_reset(struct lan78xx_net *dev)
+@@ -2797,6 +2802,10 @@ static int lan78xx_reset(struct lan78xx_
  
  	buf |= HW_CFG_MEF_;
  
@@ -39,7 +37,7 @@ index 63cd72c5f580..3d39f34bc641 100644
  	ret = lan78xx_write_reg(dev, HW_CFG, buf);
  	if (ret < 0)
  		return ret;
-@@ -2893,6 +2902,9 @@ static int lan78xx_reset(struct lan78xx_net *dev)
+@@ -2895,6 +2904,9 @@ static int lan78xx_reset(struct lan78xx_
  			buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
  		}
  	}
@@ -49,6 +47,3 @@ index 63cd72c5f580..3d39f34bc641 100644
  	ret = lan78xx_write_reg(dev, MAC_CR, buf);
  	if (ret < 0)
  		return ret;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0064-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch b/root/target/linux/bcm27xx/patches-5.15/950-0056-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch
similarity index 71%
rename from root/target/linux/bcm27xx/patches-5.15/0064-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0056-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch
index 14a10438..c69ca552 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0064-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0056-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch
@@ -1,7 +1,7 @@
-From f5381879293b3019d229028a3fc30e0f6e6b9539 Mon Sep 17 00:00:00 2001
+From 47ea899493e9814e8b627d98b9f19c56331cddfd Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Tue, 23 Feb 2016 17:26:48 +0000
-Subject: [PATCH 064/634] amba_pl011: Don't use DT aliases for numbering
+Subject: [PATCH 056/828] amba_pl011: Don't use DT aliases for numbering
 
 The pl011 driver looks for DT aliases of the form "serial<n>",
 and if found uses <n> as the device ID. This can cause
@@ -12,11 +12,9 @@ use the same logic.
  drivers/tty/serial/amba-pl011.c | 5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index d361cd84ff8c..82429e05ed7d 100644
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
-@@ -2752,7 +2752,12 @@ static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap,
+@@ -2733,7 +2733,12 @@ static int pl011_setup_port(struct devic
  	if (IS_ERR(base))
  		return PTR_ERR(base);
  
@@ -29,6 +27,3 @@ index d361cd84ff8c..82429e05ed7d 100644
  
  	uap->old_cr = 0;
  	uap->port.dev = dev;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0065-amba_pl011-Round-input-clock-up.patch b/root/target/linux/bcm27xx/patches-5.15/950-0057-amba_pl011-Round-input-clock-up.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0065-amba_pl011-Round-input-clock-up.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0057-amba_pl011-Round-input-clock-up.patch
index 7689ec9c..bab15af3 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0065-amba_pl011-Round-input-clock-up.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0057-amba_pl011-Round-input-clock-up.patch
@@ -1,7 +1,7 @@
-From 676d05db81365c6c247a626ad9bfec58a1fe45b1 Mon Sep 17 00:00:00 2001
+From e747140c826eb558f1743d5a2ff9bb9d9085e011 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Wed, 1 Mar 2017 16:07:39 +0000
-Subject: [PATCH 065/634] amba_pl011: Round input clock up
+Subject: [PATCH 057/828] amba_pl011: Round input clock up
 
 The UART clock is initialised to be as close to the requested
 frequency as possible without exceeding it. Now that there is a
@@ -24,11 +24,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/tty/serial/amba-pl011.c | 23 +++++++++++++++++++++--
  1 file changed, 21 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index 82429e05ed7d..83c5ab78b0d0 100644
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
-@@ -1716,6 +1716,23 @@ static void pl011_put_poll_char(struct uart_port *port,
+@@ -1720,6 +1720,23 @@ static void pl011_put_poll_char(struct u
  
  #endif /* CONFIG_CONSOLE_POLL */
  
@@ -52,7 +50,7 @@ index 82429e05ed7d..83c5ab78b0d0 100644
  static int pl011_hwinit(struct uart_port *port)
  {
  	struct uart_amba_port *uap =
-@@ -1732,7 +1749,7 @@ static int pl011_hwinit(struct uart_port *port)
+@@ -1736,7 +1753,7 @@ static int pl011_hwinit(struct uart_port
  	if (retval)
  		return retval;
  
@@ -61,7 +59,7 @@ index 82429e05ed7d..83c5ab78b0d0 100644
  
  	/* Clear pending error and receive interrupts */
  	pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS |
-@@ -2448,7 +2465,7 @@ static int pl011_console_setup(struct console *co, char *options)
+@@ -2429,7 +2446,7 @@ static int pl011_console_setup(struct co
  			plat->init();
  	}
  
@@ -70,7 +68,7 @@ index 82429e05ed7d..83c5ab78b0d0 100644
  
  	if (uap->vendor->fixed_options) {
  		baud = uap->fixed_baud;
-@@ -2665,6 +2682,7 @@ static struct uart_driver amba_reg = {
+@@ -2646,6 +2663,7 @@ static struct uart_driver amba_reg = {
  	.cons			= AMBA_CONSOLE,
  };
  
@@ -78,7 +76,7 @@ index 82429e05ed7d..83c5ab78b0d0 100644
  static int pl011_probe_dt_alias(int index, struct device *dev)
  {
  	struct device_node *np;
-@@ -2696,6 +2714,7 @@ static int pl011_probe_dt_alias(int index, struct device *dev)
+@@ -2677,6 +2695,7 @@ static int pl011_probe_dt_alias(int inde
  
  	return ret;
  }
@@ -86,6 +84,3 @@ index 82429e05ed7d..83c5ab78b0d0 100644
  
  /* unregisters the driver also if no more ports are left */
  static void pl011_unregister_port(struct uart_amba_port *uap)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0066-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch b/root/target/linux/bcm27xx/patches-5.15/950-0058-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0066-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0058-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch
index 7149cd58..d957f9cd 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0066-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0058-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch
@@ -1,7 +1,7 @@
-From a62a788b8b85ec1ddcb720d9b4587a43a8a263e8 Mon Sep 17 00:00:00 2001
+From b7091bd20c8d42fe27ca48d649fadb6dfb07608b Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Fri, 29 Sep 2017 10:32:19 +0100
-Subject: [PATCH 066/634] amba_pl011: Insert mb() for correct FIFO handling
+Subject: [PATCH 058/828] amba_pl011: Insert mb() for correct FIFO handling
 
 The pl011 register accessor functions use the _relaxed versions of the
 standard readl() and writel() functions, meaning that there are no
@@ -15,11 +15,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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 83c5ab78b0d0..e940909308b0 100644
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
-@@ -1418,6 +1418,7 @@ static bool pl011_tx_char(struct uart_amba_port *uap, unsigned char c,
+@@ -1418,6 +1418,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 83c5ab78b0d0..e940909308b0 100644
  	uap->port.icount.tx++;
  
  	return true;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0067-amba_pl011-Add-cts-event-workaround-DT-property.patch b/root/target/linux/bcm27xx/patches-5.15/950-0059-amba_pl011-Add-cts-event-workaround-DT-property.patch
similarity index 75%
rename from root/target/linux/bcm27xx/patches-5.15/0067-amba_pl011-Add-cts-event-workaround-DT-property.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0059-amba_pl011-Add-cts-event-workaround-DT-property.patch
index 5c4b1fc7..fa9939f6 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0067-amba_pl011-Add-cts-event-workaround-DT-property.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0059-amba_pl011-Add-cts-event-workaround-DT-property.patch
@@ -1,7 +1,7 @@
-From 5c24e541edade9b7dee3d462c078199733072b23 Mon Sep 17 00:00:00 2001
+From 36f680f4c877dfefa5a4406f3e12c5c1aa9c23e1 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Fri, 29 Sep 2017 10:32:19 +0100
-Subject: [PATCH 067/634] amba_pl011: Add cts-event-workaround DT property
+Subject: [PATCH 059/828] amba_pl011: Add cts-event-workaround DT property
 
 The BCM2835 PL011 implementation seems to have a bug that can lead to a
 transmission lockup if CTS changes frequently. A workaround was added to
@@ -19,8 +19,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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 5ea00f8a283d..8df2883abc04 100644
 --- a/Documentation/devicetree/bindings/serial/pl011.yaml
 +++ b/Documentation/devicetree/bindings/serial/pl011.yaml
 @@ -91,6 +91,12 @@ properties:
@@ -36,11 +34,9 @@ index 5ea00f8a283d..8df2883abc04 100644
  required:
    - compatible
    - reg
-diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index e940909308b0..44a5cbf92542 100644
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
-@@ -2843,6 +2843,11 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
+@@ -2824,6 +2824,11 @@ static int pl011_probe(struct amba_devic
  	if (IS_ERR(uap->clk))
  		return PTR_ERR(uap->clk);
  
@@ -52,6 +48,3 @@ index e940909308b0..44a5cbf92542 100644
  	uap->reg_offset = vendor->reg_offset;
  	uap->vendor = vendor;
  	uap->fifosize = vendor->get_fifosize(dev);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0068-tty-amba-pl011-Add-un-throttle-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0060-tty-amba-pl011-Add-un-throttle-support.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0068-tty-amba-pl011-Add-un-throttle-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0060-tty-amba-pl011-Add-un-throttle-support.patch
index 6911e5c4..783efacb 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0068-tty-amba-pl011-Add-un-throttle-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0060-tty-amba-pl011-Add-un-throttle-support.patch
@@ -1,7 +1,7 @@
-From b09e7ee5c298c9a22c2018ee6d2f81f50c687b71 Mon Sep 17 00:00:00 2001
+From f6185bce3d95e12cce0eb27c10ce6d7e308681d7 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Fri, 24 Jan 2020 11:38:28 +0000
-Subject: [PATCH 068/634] tty: amba-pl011: Add un/throttle support
+Subject: [PATCH 060/828] tty: amba-pl011: Add un/throttle support
 
 The PL011 driver lacks throttle and unthrottle methods. As a result,
 sending more data to the Pi than it can immediately sink while CRTSCTS
@@ -15,11 +15,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/tty/serial/amba-pl011.c | 28 ++++++++++++++++++++++++++++
  1 file changed, 28 insertions(+)
 
-diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index 44a5cbf92542..5e9a789e3c15 100644
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
-@@ -1355,6 +1355,32 @@ static void pl011_start_tx(struct uart_port *port)
+@@ -1355,6 +1355,32 @@ static void pl011_start_tx(struct uart_p
  		pl011_start_tx_pio(uap);
  }
  
@@ -52,7 +50,7 @@ index 44a5cbf92542..5e9a789e3c15 100644
  static void pl011_stop_rx(struct uart_port *port)
  {
  	struct uart_amba_port *uap =
-@@ -2286,6 +2312,8 @@ static const struct uart_ops amba_pl011_pops = {
+@@ -2271,6 +2297,8 @@ static const struct uart_ops amba_pl011_
  	.stop_tx	= pl011_stop_tx,
  	.start_tx	= pl011_start_tx,
  	.stop_rx	= pl011_stop_rx,
@@ -61,6 +59,3 @@ index 44a5cbf92542..5e9a789e3c15 100644
  	.enable_ms	= pl011_enable_ms,
  	.break_ctl	= pl011_break_ctl,
  	.startup	= pl011_startup,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0069-tty-amba-pl011-Avoid-rare-write-when-full-error.patch b/root/target/linux/bcm27xx/patches-5.15/950-0061-tty-amba-pl011-Avoid-rare-write-when-full-error.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0069-tty-amba-pl011-Avoid-rare-write-when-full-error.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0061-tty-amba-pl011-Avoid-rare-write-when-full-error.patch
index a89618ec..3c54fb60 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0069-tty-amba-pl011-Avoid-rare-write-when-full-error.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0061-tty-amba-pl011-Avoid-rare-write-when-full-error.patch
@@ -1,7 +1,7 @@
-From 4957c6f9a91339b182625ad74aee2b392aa5d148 Mon Sep 17 00:00:00 2001
+From 27817f65220792b0f820e9da8bec49c75cc25ab3 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Wed, 29 Jan 2020 09:35:19 +0000
-Subject: [PATCH 069/634] tty: amba-pl011: Avoid rare write-when-full error
+Subject: [PATCH 061/828] tty: amba-pl011: Avoid rare write-when-full error
 
 Under some circumstances on BCM283x processors data loss can be
 observed - a single byte missing from the TX output stream. These bytes
@@ -27,11 +27,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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 5e9a789e3c15..979fce6a05a7 100644
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
-@@ -1505,6 +1505,10 @@ static bool pl011_tx_chars(struct uart_amba_port *uap, bool from_irq)
+@@ -1505,6 +1505,10 @@ static bool pl011_tx_chars(struct uart_a
  		if (likely(from_irq) && count-- == 0)
  			break;
  
@@ -42,6 +40,3 @@ index 5e9a789e3c15..979fce6a05a7 100644
  		if (!pl011_tx_char(uap, xmit->buf[xmit->tail], from_irq))
  			break;
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0070-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch b/root/target/linux/bcm27xx/patches-5.15/950-0062-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0070-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0062-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch
index 0550d1cb..5d47cf60 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0070-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0062-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch
@@ -1,7 +1,7 @@
-From a6e1d77c5279b86105db8c352208e20e3c1822b6 Mon Sep 17 00:00:00 2001
+From 356aa7855c69a31cd6a00cdaf4e27b80f7aa3a27 Mon Sep 17 00:00:00 2001
 From: notro <notro@tronnes.org>
 Date: Thu, 10 Jul 2014 13:59:47 +0200
-Subject: [PATCH 070/634] pinctrl-bcm2835: Set base to 0 give expected gpio
+Subject: [PATCH 062/828] pinctrl-bcm2835: Set base to 0 give expected gpio
  numbering
 
 Signed-off-by: Noralf Tronnes <notro@tronnes.org>
@@ -18,11 +18,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/pinctrl/bcm/pinctrl-bcm2835.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-index 6e6fefeb21ea..7167927e9f26 100644
 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
 +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-@@ -362,7 +362,7 @@ static const struct gpio_chip bcm2835_gpio_chip = {
+@@ -362,7 +362,7 @@ static const struct gpio_chip bcm2835_gp
  	.get = bcm2835_gpio_get,
  	.set = bcm2835_gpio_set,
  	.set_config = gpiochip_generic_config,
@@ -31,7 +29,7 @@ index 6e6fefeb21ea..7167927e9f26 100644
  	.ngpio = BCM2835_NUM_GPIOS,
  	.can_sleep = false,
  };
-@@ -378,7 +378,7 @@ static const struct gpio_chip bcm2711_gpio_chip = {
+@@ -378,7 +378,7 @@ static const struct gpio_chip bcm2711_gp
  	.get = bcm2835_gpio_get,
  	.set = bcm2835_gpio_set,
  	.set_config = gpiochip_generic_config,
@@ -40,6 +38,3 @@ index 6e6fefeb21ea..7167927e9f26 100644
  	.ngpio = BCM2711_NUM_GPIOS,
  	.can_sleep = false,
  };
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0071-Main-bcm2708-bcm2709-linux-port.patch b/root/target/linux/bcm27xx/patches-5.15/950-0063-Main-bcm2708-bcm2709-linux-port.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0071-Main-bcm2708-bcm2709-linux-port.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0063-Main-bcm2708-bcm2709-linux-port.patch
index 08082396..30aadd83 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0071-Main-bcm2708-bcm2709-linux-port.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0063-Main-bcm2708-bcm2709-linux-port.patch
@@ -1,7 +1,7 @@
-From 404cf082aed147576fb07d389aa8f92d32fee9a5 Mon Sep 17 00:00:00 2001
+From 5016eb2f9089a8cd60716d796a4583f2919b957f Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Sun, 12 May 2013 12:24:19 +0100
-Subject: [PATCH 071/634] Main bcm2708/bcm2709 linux port
+Subject: [PATCH 063/828] Main bcm2708/bcm2709 linux port
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -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 0462f870ab17..d802ded21ed6 100644
 --- a/arch/arm/mach-bcm/Kconfig
 +++ b/arch/arm/mach-bcm/Kconfig
 @@ -166,6 +166,7 @@ config ARCH_BCM2835
@@ -44,8 +42,6 @@ index 0462f870ab17..d802ded21ed6 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 a0618f3e6836..b3a2fce22eac 100644
 --- a/arch/arm/mm/proc-v6.S
 +++ b/arch/arm/mm/proc-v6.S
 @@ -70,10 +70,19 @@ ENDPROC(cpu_v6_reset)
@@ -71,8 +67,6 @@ index a0618f3e6836..b3a2fce22eac 100644
  	ret	lr
  
  ENTRY(cpu_v6_dcache_clean_area)
-diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c
-index e08c209521ac..4dbb4b16ee6e 100644
 --- a/drivers/irqchip/irq-bcm2835.c
 +++ b/drivers/irqchip/irq-bcm2835.c
 @@ -43,7 +43,9 @@
@@ -93,7 +87,7 @@ index e08c209521ac..4dbb4b16ee6e 100644
  #define FIQ_START		(NR_IRQS_BANK0 + MAKE_HWIRQ(NR_BANKS - 1, 0))
  
  static const int reg_pending[] __initconst = { 0x00, 0x04, 0x08 };
-@@ -253,10 +256,12 @@ static int __init armctrl_of_init(struct device_node *node,
+@@ -253,10 +256,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 e08c209521ac..4dbb4b16ee6e 100644
  
  	return 0;
  }
-diff --git a/drivers/mailbox/bcm2835-mailbox.c b/drivers/mailbox/bcm2835-mailbox.c
-index 86b7ce3549c5..f0c2ad3d59c9 100644
 --- a/drivers/mailbox/bcm2835-mailbox.c
 +++ b/drivers/mailbox/bcm2835-mailbox.c
 @@ -45,12 +45,15 @@
@@ -127,7 +119,7 @@ index 86b7ce3549c5..f0c2ad3d59c9 100644
  
  struct bcm2835_mbox {
  	void __iomem *regs;
-@@ -145,7 +148,7 @@ static int bcm2835_mbox_probe(struct platform_device *pdev)
+@@ -145,7 +148,7 @@ static int bcm2835_mbox_probe(struct pla
  		return -ENOMEM;
  	spin_lock_init(&mbox->lock);
  
@@ -136,7 +128,7 @@ index 86b7ce3549c5..f0c2ad3d59c9 100644
  			       bcm2835_mbox_irq, 0, dev_name(dev), mbox);
  	if (ret) {
  		dev_err(dev, "Failed to register a mailbox IRQ handler: %d\n",
-@@ -194,7 +197,18 @@ static struct platform_driver bcm2835_mbox_driver = {
+@@ -194,7 +197,18 @@ static struct platform_driver bcm2835_mb
  	},
  	.probe		= bcm2835_mbox_probe,
  };
@@ -156,6 +148,3 @@ index 86b7ce3549c5..f0c2ad3d59c9 100644
  
  MODULE_AUTHOR("Lubomir Rintel <lkundrak@v3.sk>");
  MODULE_DESCRIPTION("BCM2835 mailbox IPC driver");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0072-Add-dwc_otg-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0064-Add-dwc_otg-driver.patch
similarity index 99%
rename from root/target/linux/bcm27xx/patches-5.15/0072-Add-dwc_otg-driver.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0064-Add-dwc_otg-driver.patch
index 665f44c5..856345ab 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0072-Add-dwc_otg-driver.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0064-Add-dwc_otg-driver.patch
@@ -1,7 +1,7 @@
-From bd92e5e89a295480cb49dbc7d145bcfb688c43d8 Mon Sep 17 00:00:00 2001
+From 1561c1c0488ca3d335b72a0b1f28f35f6cdf6664 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 1 May 2013 19:46:17 +0100
-Subject: [PATCH 072/634] Add dwc_otg driver
+Subject: [PATCH 064/828] Add dwc_otg driver
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -1062,11 +1062,9 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  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
  }
  
  /*
@@ -1093,8 +1091,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)
@@ -1105,8 +1101,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 643edf5fe18c..0e6efcd960d0 100644
 --- a/drivers/usb/Makefile
 +++ b/drivers/usb/Makefile
 @@ -9,6 +9,7 @@ obj-$(CONFIG_USB_COMMON)	+= common/
@@ -1117,11 +1111,9 @@ index 643edf5fe18c..0e6efcd960d0 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 26f9fb9f67ca..fe8c7a85e141 100644
 --- a/drivers/usb/core/generic.c
 +++ b/drivers/usb/core/generic.c
-@@ -190,6 +190,7 @@ int usb_choose_configuration(struct usb_device *udev)
+@@ -190,6 +190,7 @@ int usb_choose_configuration(struct usb_
  		dev_warn(&udev->dev,
  			"no configuration chosen from %d choice%s\n",
  			num_configs, plural(num_configs));
@@ -1129,11 +1121,9 @@ index 26f9fb9f67ca..fe8c7a85e141 100644
  	}
  	return i;
  }
-diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 86658a81d284..1b85a0f17e06 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -5570,7 +5570,7 @@ static void port_event(struct usb_hub *hub, int port1)
+@@ -5582,7 +5582,7 @@ static void port_event(struct usb_hub *h
  		port_dev->over_current_count++;
  		port_over_current_notify(port_dev);
  
@@ -1142,11 +1132,9 @@ index 86658a81d284..1b85a0f17e06 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 4d59d927ae3e..7a32053e941f 100644
 --- a/drivers/usb/core/message.c
 +++ b/drivers/usb/core/message.c
-@@ -2140,6 +2140,85 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
+@@ -2140,6 +2140,85 @@ free_interfaces:
  	if (cp->string == NULL &&
  			!(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
  		cp->string = usb_cache_string(dev, cp->desc.iConfiguration);
@@ -1232,8 +1220,6 @@ index 4d59d927ae3e..7a32053e941f 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..1839e169469b 100644
 --- a/drivers/usb/core/otg_productlist.h
 +++ b/drivers/usb/core/otg_productlist.h
 @@ -11,33 +11,82 @@
@@ -1325,7 +1311,7 @@ index db67df29fb2b..1839e169469b 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;
@@ -1348,15 +1334,11 @@ index db67df29fb2b..1839e169469b 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) &&
@@ -1378,20 +1360,21 @@ index db67df29fb2b..1839e169469b 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 @@
@@ -5071,8 +5054,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 c4736d1d020c..b325ebb6b35c 100644
 --- a/drivers/usb/host/Kconfig
 +++ b/drivers/usb/host/Kconfig
 @@ -730,6 +730,16 @@ config USB_RENESAS_USBHS_HCD
@@ -5092,11 +5073,9 @@ index c4736d1d020c..b325ebb6b35c 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 171de4df50bd..073f31432690 100644
 --- a/drivers/usb/host/Makefile
 +++ b/drivers/usb/host/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_USB_SL811_HCD)	+= sl811-hcd.o
+@@ -77,6 +77,7 @@ obj-$(CONFIG_USB_SL811_HCD)	+= sl811-hcd
  obj-$(CONFIG_USB_SL811_CS)	+= sl811_cs.o
  obj-$(CONFIG_USB_U132_HCD)	+= u132-hcd.o
  obj-$(CONFIG_USB_R8A66597_HCD)	+= r8a66597-hcd.o
@@ -5104,9 +5083,6 @@ index 171de4df50bd..073f31432690 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 @@
@@ -5168,9 +5144,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 @@
@@ -5191,9 +5164,6 @@ index 000000000000..45db9915b9d3
 +       dwc_common_fbsd.c dwc_mem.c
 +
 +.include <bsd.kmod.mk>
-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 @@
@@ -5246,9 +5216,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 @@
@@ -5426,9 +5393,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 @@
@@ -5702,9 +5666,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 @@
@@ -6240,9 +6201,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 @@
@@ -6470,9 +6428,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 @@
@@ -7784,9 +7739,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..1460afaf997d
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_common_linux.c
 @@ -0,0 +1,1409 @@
@@ -9199,9 +9151,6 @@ index 000000000000..1460afaf997d
 +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 @@
@@ -10480,9 +10429,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 @@
@@ -10794,9 +10740,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 @@
@@ -10911,9 +10854,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 @@
@@ -11208,9 +11148,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 @@
@@ -11320,9 +11257,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 @@
@@ -11920,9 +11854,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 @@
@@ -12171,9 +12102,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 @@
@@ -12813,9 +12741,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 @@
@@ -12853,9 +12778,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 @@
@@ -13178,9 +13100,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 @@
@@ -13306,9 +13225,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..9a86d299403b
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_os.h
 @@ -0,0 +1,1276 @@
@@ -14588,9 +14504,6 @@ index 000000000000..9a86d299403b
 +#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..27bda82dac2e
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/usb.h
 @@ -0,0 +1,946 @@
@@ -15540,9 +15453,6 @@ index 000000000000..27bda82dac2e
 +#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..7ea65a6bcdb7
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/Makefile
 @@ -0,0 +1,85 @@
@@ -15631,9 +15541,6 @@ index 000000000000..7ea65a6bcdb7
 +	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 @@
@@ -15861,9 +15768,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..f827102fa644
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dummy_audio.c
 @@ -0,0 +1,1574 @@
@@ -17441,9 +17345,6 @@ index 000000000000..f827102fa644
 +	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 @@
@@ -17589,9 +17490,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..ce0618dd3f4a
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_adp.c
 @@ -0,0 +1,854 @@
@@ -18449,9 +18347,6 @@ index 000000000000..ce0618dd3f4a
 +#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 @@
@@ -18535,9 +18430,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 @@
@@ -19753,9 +19645,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 @@
@@ -19848,9 +19737,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..bbb3d32093d0
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_cfi.c
 @@ -0,0 +1,1876 @@
@@ -21730,9 +21616,6 @@ index 000000000000..bbb3d32093d0
 +}
 +
 +#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 @@
@@ -22056,9 +21939,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..14300ad0f2af
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil.c
 @@ -0,0 +1,7146 @@
@@ -29208,9 +29088,6 @@ index 000000000000..14300ad0f2af
 +	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 @@
@@ -30678,9 +30555,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..799ab14b9eda
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c
 @@ -0,0 +1,1601 @@
@@ -32285,9 +32159,6 @@ index 000000000000..799ab14b9eda
 +		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 @@
@@ -32996,9 +32867,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 @@
@@ -33119,9 +32987,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..cb576e553d76
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.c
 @@ -0,0 +1,1772 @@
@@ -34897,9 +34762,6 @@ index 000000000000..cb576e553d76
 + </td></tr>
 +
 +*/
-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 @@
@@ -34989,9 +34851,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..490a7801e737
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
 @@ -0,0 +1,1431 @@
@@ -36426,9 +36285,6 @@ index 000000000000..490a7801e737
 +	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..537cc237b4bc
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h
 @@ -0,0 +1,399 @@
@@ -36831,9 +36687,6 @@ index 000000000000..537cc237b4bc
 +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 @@
@@ -36917,9 +36770,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..0f6645e2383c
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
 @@ -0,0 +1,4356 @@
@@ -41279,9 +41129,6 @@ index 000000000000..0f6645e2383c
 +}
 +
 +#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..5ed8dccf0395
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.h
 @@ -0,0 +1,870 @@
@@ -42155,9 +42002,6 @@ index 000000000000..5ed8dccf0395
 +#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..bd8a20403713
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c
 @@ -0,0 +1,1134 @@
@@ -43295,9 +43139,6 @@ index 000000000000..bd8a20403713
 +}
 +
 +#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..a384db5e7ac2
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h
 @@ -0,0 +1,421 @@
@@ -43722,9 +43563,6 @@ index 000000000000..a384db5e7ac2
 +
 +#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..d3097ef3728c
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
 @@ -0,0 +1,2757 @@
@@ -46485,9 +46323,6 @@ index 000000000000..d3097ef3728c
 +	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..eda7a33908b3
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
 @@ -0,0 +1,1086 @@
@@ -47577,9 +47412,6 @@ index 000000000000..eda7a33908b3
 +}
 +
 +#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..2823dc9af63f
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
 @@ -0,0 +1,970 @@
@@ -48553,9 +48385,6 @@ index 000000000000..2823dc9af63f
 +}
 +
 +#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..7a77977c9ddf
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h
 @@ -0,0 +1,200 @@
@@ -48759,9 +48588,6 @@ index 000000000000..7a77977c9ddf
 +
 +
 +#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..9dabbe5c9791
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd.c
 @@ -0,0 +1,2725 @@
@@ -51490,9 +51316,6 @@ index 000000000000..9dabbe5c9791
 +}
 +
 +#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..a70ebd049d2c
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd.h
 @@ -0,0 +1,273 @@
@@ -51769,9 +51592,6 @@ index 000000000000..a70ebd049d2c
 +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..4c1d591fbc09
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h
 @@ -0,0 +1,361 @@
@@ -52136,9 +51956,6 @@ index 000000000000..4c1d591fbc09
 +#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..e55ea9c74be4
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c
 @@ -0,0 +1,5148 @@
@@ -57290,9 +57107,6 @@ index 000000000000..e55ea9c74be4
 +}
 +
 +#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..a5ed8e83711d
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c
 @@ -0,0 +1,1262 @@
@@ -58558,9 +58372,6 @@ index 000000000000..a5ed8e83711d
 +}
 +
 +#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 @@
@@ -61114,9 +60925,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 @@
@@ -61136,9 +60944,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 @@
@@ -61479,9 +61284,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 @@
@@ -61618,9 +61420,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 @@
@@ -61817,6 +61616,3 @@ index 000000000000..cdc9963176e5
 +
 +test_main();
 +0;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0073-bcm2708-framebuffer-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0065-bcm2708-framebuffer-driver.patch
similarity index 99%
rename from root/target/linux/bcm27xx/patches-5.15/0073-bcm2708-framebuffer-driver.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0065-bcm2708-framebuffer-driver.patch
index 36a75eb2..b1185181 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0073-bcm2708-framebuffer-driver.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0065-bcm2708-framebuffer-driver.patch
@@ -1,7 +1,7 @@
-From 8b91cd2beb500674c49d6ebbb6aaabbbed26df83 Mon Sep 17 00:00:00 2001
+From 572e8ac98cf145a20bed39029726d3dcd1f1fa8e Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 17 Jun 2015 17:06:34 +0100
-Subject: [PATCH 073/634] bcm2708 framebuffer driver
+Subject: [PATCH 065/828] bcm2708 framebuffer driver
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -103,8 +103,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  5 files changed, 1817 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 6ed5e608dd04..0b409636ebcd 100644
 --- a/drivers/video/fbdev/Kconfig
 +++ b/drivers/video/fbdev/Kconfig
 @@ -219,6 +219,20 @@ config FB_TILEBLITTING
@@ -128,11 +126,9 @@ index 6ed5e608dd04..0b409636ebcd 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 477b9624b703..36624ffdf2bc 100644
 --- a/drivers/video/fbdev/Makefile
 +++ b/drivers/video/fbdev/Makefile
-@@ -11,6 +11,7 @@ obj-$(CONFIG_FB_MACMODES)      += macmodes.o
+@@ -11,6 +11,7 @@ obj-$(CONFIG_FB_MACMODES)      += macmod
  obj-$(CONFIG_FB_WMT_GE_ROPS)   += wmt_ge_rops.o
  
  # Hardware specific drivers go first
@@ -140,9 +136,6 @@ index 477b9624b703..36624ffdf2bc 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..831e9a7b6818
 --- /dev/null
 +++ b/drivers/video/fbdev/bcm2708_fb.c
 @@ -0,0 +1,920 @@
@@ -1066,8 +1059,6 @@ index 000000000000..831e9a7b6818
 +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/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 @@
@@ -3556,11 +3547,9 @@ 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/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index 73ad784fca96..40b8a32fced0 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
-@@ -121,6 +121,7 @@ enum rpi_firmware_property_tag {
+@@ -122,6 +122,7 @@ enum rpi_firmware_property_tag {
  	RPI_FIRMWARE_FRAMEBUFFER_SET_DEPTH =                  0x00048005,
  	RPI_FIRMWARE_FRAMEBUFFER_SET_PIXEL_ORDER =            0x00048006,
  	RPI_FIRMWARE_FRAMEBUFFER_SET_ALPHA_MODE =             0x00048007,
@@ -3568,6 +3557,3 @@ index 73ad784fca96..40b8a32fced0 100644
  	RPI_FIRMWARE_FRAMEBUFFER_SET_VIRTUAL_OFFSET =         0x00048009,
  	RPI_FIRMWARE_FRAMEBUFFER_SET_OVERSCAN =               0x0004800a,
  	RPI_FIRMWARE_FRAMEBUFFER_SET_PALETTE =                0x0004800b,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0074-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch b/root/target/linux/bcm27xx/patches-5.15/950-0066-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch
similarity index 91%
rename from root/target/linux/bcm27xx/patches-5.15/0074-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0066-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch
index e50c4180..dc516439 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0074-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0066-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch
@@ -1,7 +1,7 @@
-From 441052f1c98dde7ca5b6500e41e4b844ff6f9c5e Mon Sep 17 00:00:00 2001
+From 206c0a8b1c1cbe40982d385fc4b9382fe80fc918 Mon Sep 17 00:00:00 2001
 From: James Hughes <james.hughes@raspberrypi.org>
 Date: Thu, 14 Mar 2019 13:27:54 +0000
-Subject: [PATCH 074/634] Pulled in the multi frame buffer support from the Pi3
+Subject: [PATCH 066/828] Pulled in the multi frame buffer support from the Pi3
  repo
 
 ---
@@ -9,8 +9,6 @@ Subject: [PATCH 074/634] Pulled in the multi frame buffer support from the Pi3
  include/soc/bcm2835/raspberrypi-firmware.h |  13 +
  2 files changed, 337 insertions(+), 133 deletions(-)
 
-diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c
-index 831e9a7b6818..f66957d48dc3 100644
 --- a/drivers/video/fbdev/bcm2708_fb.c
 +++ b/drivers/video/fbdev/bcm2708_fb.c
 @@ -2,6 +2,7 @@
@@ -135,8 +133,9 @@ index 831e9a7b6818..f66957d48dc3 100644
 -		},
 +	{"dma_copies", offsetof(struct bcm2708_fb_stats, dma_copies)},
 +	{"dma_irqs",   offsetof(struct bcm2708_fb_stats, dma_irqs)},
-+	};
-+
+ 	};
+ 
+-	fb->debugfs_dir = debugfs_create_dir(DRIVER_NAME, NULL);
 +	static struct debugfs_reg32 screeninfo[] = {
 +	{"width",	 offsetof(struct fb_var_screeninfo, xres)},
 +	{"height",	 offsetof(struct fb_var_screeninfo, yres)},
@@ -145,9 +144,8 @@ index 831e9a7b6818..f66957d48dc3 100644
 +	{"yres_virtual", offsetof(struct fb_var_screeninfo, yres_virtual)},
 +	{"xoffset",	 offsetof(struct fb_var_screeninfo, xoffset)},
 +	{"yoffset",	 offsetof(struct fb_var_screeninfo, yoffset)},
- 	};
- 
--	fb->debugfs_dir = debugfs_create_dir(DRIVER_NAME, NULL);
++	};
++
 +	fb->debugfs_dir = debugfs_lookup(DRIVER_NAME, NULL);
 +
 +	if (!fb->debugfs_dir)
@@ -213,7 +211,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  static int bcm2708_fb_set_bitfields(struct fb_var_screeninfo *var)
  {
  	int ret = 0;
-@@ -214,11 +303,11 @@ static int bcm2708_fb_check_var(struct fb_var_screeninfo *var,
+@@ -214,11 +303,11 @@ static int bcm2708_fb_check_var(struct f
  				struct fb_info *info)
  {
  	/* info input, var output */
@@ -228,7 +226,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  		    var->yres, var->xres_virtual, var->yres_virtual,
  		    var->bits_per_pixel);
  
-@@ -281,17 +370,24 @@ static int bcm2708_fb_set_par(struct fb_info *info)
+@@ -281,17 +370,24 @@ static int bcm2708_fb_set_par(struct fb_
  	};
  	int ret, image_size;
  
@@ -257,7 +255,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  	    (image_size != fb->image_size || !fb->dma_addr)) {
  		if (fb->dma_addr) {
  			dma_free_coherent(info->device, fb->image_size,
-@@ -306,7 +402,7 @@ static int bcm2708_fb_set_par(struct fb_info *info)
+@@ -306,7 +402,7 @@ static int bcm2708_fb_set_par(struct fb_
  
  		if (!fb->cpuaddr) {
  			fb->dma_addr = 0;
@@ -266,7 +264,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  		} else {
  			fb->image_size = image_size;
  		}
-@@ -317,7 +413,7 @@ static int bcm2708_fb_set_par(struct fb_info *info)
+@@ -317,7 +413,7 @@ static int bcm2708_fb_set_par(struct fb_
  		fbinfo.screen_size = image_size;
  		fbinfo.pitch = (info->var.xres * info->var.bits_per_pixel) >> 3;
  
@@ -275,7 +273,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  						 sizeof(fbinfo));
  		if (ret || fbinfo.base != fb->dma_addr) {
  			/* Firmware either failed, or assigned a different base
-@@ -330,7 +426,7 @@ static int bcm2708_fb_set_par(struct fb_info *info)
+@@ -330,7 +426,7 @@ static int bcm2708_fb_set_par(struct fb_
  			fb->image_size = 0;
  			fb->cpuaddr = NULL;
  			fb->dma_addr = 0;
@@ -284,7 +282,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  		}
  	} else {
  		/* Our allocation failed - drop into the old scheme of
-@@ -349,7 +445,7 @@ static int bcm2708_fb_set_par(struct fb_info *info)
+@@ -349,7 +445,7 @@ static int bcm2708_fb_set_par(struct fb_
  		fbinfo.tag6.tag = RPI_FIRMWARE_FRAMEBUFFER_GET_PITCH;
  		fbinfo.pitch = 0;
  
@@ -293,7 +291,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  						 sizeof(fbinfo));
  		if (ret) {
  			dev_err(info->device,
-@@ -439,7 +535,10 @@ static int bcm2708_fb_setcolreg(unsigned int regno, unsigned int red,
+@@ -439,7 +535,10 @@ static int bcm2708_fb_setcolreg(unsigned
  			packet->length = regno + 1;
  			memcpy(packet->cmap, fb->gpu_cmap,
  			       sizeof(packet->cmap));
@@ -305,7 +303,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  						    RPI_FIRMWARE_FRAMEBUFFER_SET_PALETTE,
  						    packet,
  						    (2 + packet->length) * sizeof(u32));
-@@ -478,8 +577,11 @@ static int bcm2708_fb_blank(int blank_mode, struct fb_info *info)
+@@ -478,8 +577,11 @@ static int bcm2708_fb_blank(int blank_mo
  		return -EINVAL;
  	}
  
@@ -318,7 +316,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  	if (ret)
  		dev_err(info->device, "%s(%d) failed: %d\n", __func__,
  			blank_mode, ret);
-@@ -496,12 +598,14 @@ static int bcm2708_fb_pan_display(struct fb_var_screeninfo *var,
+@@ -496,12 +598,14 @@ static int bcm2708_fb_pan_display(struct
  	info->var.yoffset = var->yoffset;
  	result = bcm2708_fb_set_par(info);
  	if (result != 0)
@@ -334,7 +332,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  {
  	struct bcm2708_fb *fb = to_bcm2708(info);
  	u32 dummy = 0;
-@@ -509,7 +613,9 @@ static int bcm2708_ioctl(struct fb_info *info, unsigned int cmd, unsigned long a
+@@ -509,7 +613,9 @@ static int bcm2708_ioctl(struct fb_info
  
  	switch (cmd) {
  	case FBIO_WAITFORVSYNC:
@@ -345,7 +343,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  					    RPI_FIRMWARE_FRAMEBUFFER_SET_VSYNC,
  					    &dummy, sizeof(dummy));
  		break;
-@@ -526,23 +632,22 @@ static int bcm2708_ioctl(struct fb_info *info, unsigned int cmd, unsigned long a
+@@ -526,23 +632,22 @@ static int bcm2708_ioctl(struct fb_info
  static void bcm2708_fb_fillrect(struct fb_info *info,
  				const struct fb_fillrect *rect)
  {
@@ -378,7 +376,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  	cb->dst = dst;
  	cb->src = src;
  	/*
-@@ -560,15 +665,19 @@ static void bcm2708_fb_copyarea(struct fb_info *info,
+@@ -560,15 +665,19 @@ static void bcm2708_fb_copyarea(struct f
  				const struct fb_copyarea *region)
  {
  	struct bcm2708_fb *fb = to_bcm2708(info);
@@ -402,7 +400,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  	    info->var.xres * info->var.yres > 1920 * 1200 ||
  	    region->width <= 0 || region->width > info->var.xres ||
  	    region->height <= 0 || region->height > info->var.yres ||
-@@ -595,8 +704,8 @@ static void bcm2708_fb_copyarea(struct fb_info *info,
+@@ -595,8 +704,8 @@ static void bcm2708_fb_copyarea(struct f
  		 * 1920x1200 resolution at 32bpp pixel depth.
  		 */
  		int y;
@@ -413,7 +411,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  		int scanline_size = bytes_per_pixel * region->width;
  		int scanlines_per_cb = (64 * 1024 - 16 * 1024) / scanline_size;
  
-@@ -646,10 +755,10 @@ static void bcm2708_fb_copyarea(struct fb_info *info,
+@@ -646,10 +755,10 @@ static void bcm2708_fb_copyarea(struct f
  		}
  		set_dma_cb(cb, burst_size,
  			   fb->fb_bus_address + dy * fb->fb.fix.line_length +
@@ -426,7 +424,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  			   stride,
  			   region->width * bytes_per_pixel,
  			   region->height);
-@@ -659,32 +768,33 @@ static void bcm2708_fb_copyarea(struct fb_info *info,
+@@ -659,32 +768,33 @@ static void bcm2708_fb_copyarea(struct f
  	cb->next = 0;
  
  	if (pixels < dma_busy_wait_threshold) {
@@ -471,7 +469,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  
  	/* FIXME: should read status register to check if this is
  	 * actually interrupting us or not, in case this interrupt
-@@ -694,9 +804,9 @@ static irqreturn_t bcm2708_fb_dma_irq(int irq, void *cxt)
+@@ -694,9 +804,9 @@ static irqreturn_t bcm2708_fb_dma_irq(in
  	 */
  
  	/* acknowledge the interrupt */
@@ -483,7 +481,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  	return IRQ_HANDLED;
  }
  
-@@ -729,11 +839,23 @@ static int bcm2708_fb_register(struct bcm2708_fb *fb)
+@@ -729,11 +839,23 @@ static int bcm2708_fb_register(struct bc
  	fb->fb.fix.ywrapstep = 0;
  	fb->fb.fix.accel = FB_ACCEL_NONE;
  
@@ -512,7 +510,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  	fb->fb.var.vmode = FB_VMODE_NONINTERLACED;
  	fb->fb.var.activate = FB_ACTIVATE_NOW;
  	fb->fb.var.nonstd = 0;
-@@ -749,26 +871,23 @@ static int bcm2708_fb_register(struct bcm2708_fb *fb)
+@@ -749,26 +871,23 @@ static int bcm2708_fb_register(struct bc
  	fb->fb.monspecs.dclkmax = 100000000;
  
  	bcm2708_fb_set_bitfields(&fb->fb.var);
@@ -543,7 +541,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  out:
  	return ret;
  }
-@@ -777,10 +896,18 @@ static int bcm2708_fb_probe(struct platform_device *dev)
+@@ -777,10 +896,18 @@ static int bcm2708_fb_probe(struct platf
  {
  	struct device_node *fw_np;
  	struct rpi_firmware *fw;
@@ -564,7 +562,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  /* Remove comment when booting without Device Tree is no longer supported
   *	if (!fw_np) {
   *		dev_err(&dev->dev, "Missing firmware node\n");
-@@ -788,90 +915,154 @@ static int bcm2708_fb_probe(struct platform_device *dev)
+@@ -788,90 +915,154 @@ static int bcm2708_fb_probe(struct platf
   *	}
   */
  	fw = rpi_firmware_get(fw_np);
@@ -592,20 +590,17 @@ index 831e9a7b6818..f66957d48dc3 100644
 +		ret = 0;
 +	} else {
 +		fbdev->firmware_supports_multifb = 1;
- 	}
- 
--	fb->fw = fw;
--	bcm2708_fb_debugfs_init(fb);
++	}
++
 +	if (num_displays > MAX_FRAMEBUFFERS) {
 +		dev_warn(&dev->dev,
 +			 "More displays reported from firmware than supported in driver (%u vs %u)",
 +			 num_displays, MAX_FRAMEBUFFERS);
 +		num_displays = MAX_FRAMEBUFFERS;
-+	}
+ 	}
  
--	fb->cb_base = dma_alloc_wc(&dev->dev, SZ_64K,
--					     &fb->cb_handle, GFP_KERNEL);
--	if (!fb->cb_base) {
+-	fb->fw = fw;
+-	bcm2708_fb_debugfs_init(fb);
 +	dev_info(&dev->dev, "FB found %d display(s)\n", num_displays);
 +
 +	/* Set up the DMA information. Note we have just one set of DMA
@@ -614,7 +609,10 @@ index 831e9a7b6818..f66957d48dc3 100644
 +	 */
 +
 +	mutex_init(&fbdev->dma_mutex);
-+
+ 
+-	fb->cb_base = dma_alloc_wc(&dev->dev, SZ_64K,
+-					     &fb->cb_handle, GFP_KERNEL);
+-	if (!fb->cb_base) {
 +	fbdev->cb_base = dma_alloc_wc(&dev->dev, SZ_64K,
 +						&fbdev->cb_handle,
 +						GFP_KERNEL);
@@ -653,26 +651,15 @@ index 831e9a7b6818..f66957d48dc3 100644
 +	rpi_firmware_property(fbdev->fw,
 +			      RPI_FIRMWARE_GET_VC_MEMORY,
 +			      &gpu_mem, sizeof(gpu_mem));
- 
--	fb->dev = dev;
--	fb->fb.device = &dev->dev;
++
 +	for (i = 0; i < num_displays; i++) {
 +		struct bcm2708_fb *fb = &fbdev->displays[i];
- 
--	/* failure here isn't fatal, but we'll fail in vc_mem_copy if
--	 * fb->gpu is not valid
--	 */
--	rpi_firmware_property(fb->fw, RPI_FIRMWARE_GET_VC_MEMORY, &fb->gpu,
--			      sizeof(fb->gpu));
++
 +		fb->display_settings.display_num = i;
 +		fb->dev = dev;
 +		fb->fb.device = &dev->dev;
 +		fb->fbdev = fbdev;
- 
--	ret = bcm2708_fb_register(fb);
--	if (ret == 0) {
--		platform_set_drvdata(dev, fb);
--		goto out;
++
 +		fb->gpu.base = gpu_mem.base;
 +		fb->gpu.length = gpu_mem.length;
 +
@@ -685,12 +672,23 @@ index 831e9a7b6818..f66957d48dc3 100644
 +			memset(&fb->display_settings, 0,
 +			       sizeof(fb->display_settings));
 +		}
-+
+ 
+-	fb->dev = dev;
+-	fb->fb.device = &dev->dev;
 +		ret = bcm2708_fb_register(fb);
-+
+ 
+-	/* failure here isn't fatal, but we'll fail in vc_mem_copy if
+-	 * fb->gpu is not valid
+-	 */
+-	rpi_firmware_property(fb->fw, RPI_FIRMWARE_GET_VC_MEMORY, &fb->gpu,
+-			      sizeof(fb->gpu));
 +		if (ret == 0) {
 +			bcm2708_fb_debugfs_init(fb);
-+
+ 
+-	ret = bcm2708_fb_register(fb);
+-	if (ret == 0) {
+-		platform_set_drvdata(dev, fb);
+-		goto out;
 +			fbdev->num_displays++;
 +
 +			dev_info(&dev->dev,
@@ -738,14 +736,15 @@ index 831e9a7b6818..f66957d48dc3 100644
 -	if (fb->fb.screen_base)
 -		iounmap(fb->fb.screen_base);
 -	unregister_framebuffer(&fb->fb);
-+	for (i = 0; i < fbdev->num_displays; i++) {
-+		if (fbdev->displays[i].fb.screen_base)
-+			iounmap(fbdev->displays[i].fb.screen_base);
- 
+-
 -	dma_free_wc(&dev->dev, SZ_64K, fb->cb_base, fb->cb_handle);
 -	bcm_dma_chan_free(fb->dma_chan);
 -
 -	bcm2708_fb_debugfs_deinit(fb);
++	for (i = 0; i < fbdev->num_displays; i++) {
++		if (fbdev->displays[i].fb.screen_base)
++			iounmap(fbdev->displays[i].fb.screen_base);
++
 +		if (fbdev->displays[i].fbdev) {
 +			unregister_framebuffer(&fbdev->displays[i].fb);
 +			bcm2708_fb_debugfs_deinit(&fbdev->displays[i]);
@@ -763,7 +762,7 @@ index 831e9a7b6818..f66957d48dc3 100644
  
  	return 0;
  }
-@@ -886,10 +1077,10 @@ static struct platform_driver bcm2708_fb_driver = {
+@@ -886,10 +1077,10 @@ static struct platform_driver bcm2708_fb
  	.probe = bcm2708_fb_probe,
  	.remove = bcm2708_fb_remove,
  	.driver = {
@@ -778,11 +777,9 @@ index 831e9a7b6818..f66957d48dc3 100644
  };
  
  static int __init bcm2708_fb_init(void)
-diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index 40b8a32fced0..a8cff19aea83 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
-@@ -104,9 +104,15 @@ enum rpi_firmware_property_tag {
+@@ -105,9 +105,15 @@ enum rpi_firmware_property_tag {
  	RPI_FIRMWARE_FRAMEBUFFER_GET_VIRTUAL_OFFSET =         0x00040009,
  	RPI_FIRMWARE_FRAMEBUFFER_GET_OVERSCAN =               0x0004000a,
  	RPI_FIRMWARE_FRAMEBUFFER_GET_PALETTE =                0x0004000b,
@@ -798,7 +795,7 @@ index 40b8a32fced0..a8cff19aea83 100644
  	RPI_FIRMWARE_FRAMEBUFFER_TEST_PHYSICAL_WIDTH_HEIGHT = 0x00044003,
  	RPI_FIRMWARE_FRAMEBUFFER_TEST_VIRTUAL_WIDTH_HEIGHT =  0x00044004,
  	RPI_FIRMWARE_FRAMEBUFFER_TEST_DEPTH =                 0x00044005,
-@@ -115,6 +121,8 @@ enum rpi_firmware_property_tag {
+@@ -116,6 +122,8 @@ enum rpi_firmware_property_tag {
  	RPI_FIRMWARE_FRAMEBUFFER_TEST_VIRTUAL_OFFSET =        0x00044009,
  	RPI_FIRMWARE_FRAMEBUFFER_TEST_OVERSCAN =              0x0004400a,
  	RPI_FIRMWARE_FRAMEBUFFER_TEST_PALETTE =               0x0004400b,
@@ -807,7 +804,7 @@ index 40b8a32fced0..a8cff19aea83 100644
  	RPI_FIRMWARE_FRAMEBUFFER_TEST_VSYNC =                 0x0004400e,
  	RPI_FIRMWARE_FRAMEBUFFER_SET_PHYSICAL_WIDTH_HEIGHT =  0x00048003,
  	RPI_FIRMWARE_FRAMEBUFFER_SET_VIRTUAL_WIDTH_HEIGHT =   0x00048004,
-@@ -125,9 +133,12 @@ enum rpi_firmware_property_tag {
+@@ -126,9 +134,12 @@ enum rpi_firmware_property_tag {
  	RPI_FIRMWARE_FRAMEBUFFER_SET_VIRTUAL_OFFSET =         0x00048009,
  	RPI_FIRMWARE_FRAMEBUFFER_SET_OVERSCAN =               0x0004800a,
  	RPI_FIRMWARE_FRAMEBUFFER_SET_PALETTE =                0x0004800b,
@@ -820,7 +817,7 @@ index 40b8a32fced0..a8cff19aea83 100644
  	RPI_FIRMWARE_FRAMEBUFFER_SET_BACKLIGHT =              0x0004800f,
  
  	RPI_FIRMWARE_VCHIQ_INIT =                             0x00048010,
-@@ -136,6 +147,8 @@ enum rpi_firmware_property_tag {
+@@ -137,6 +148,8 @@ enum rpi_firmware_property_tag {
  	RPI_FIRMWARE_GET_DMA_CHANNELS =                       0x00060001,
  };
  
@@ -829,6 +826,3 @@ index 40b8a32fced0..a8cff19aea83 100644
  #if IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE)
  int rpi_firmware_property(struct rpi_firmware *fw,
  			  u32 tag, void *data, size_t len);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0075-fbdev-add-FBIOCOPYAREA-ioctl.patch b/root/target/linux/bcm27xx/patches-5.15/950-0067-fbdev-add-FBIOCOPYAREA-ioctl.patch
similarity index 88%
rename from root/target/linux/bcm27xx/patches-5.15/0075-fbdev-add-FBIOCOPYAREA-ioctl.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0067-fbdev-add-FBIOCOPYAREA-ioctl.patch
index 99e4ca1c..7c180417 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0075-fbdev-add-FBIOCOPYAREA-ioctl.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0067-fbdev-add-FBIOCOPYAREA-ioctl.patch
@@ -1,7 +1,7 @@
-From 52d69b5f72a13c68f51e2d4baf80d8fa436cc4b1 Mon Sep 17 00:00:00 2001
+From f2b7b1e3b70bc00a93ec9cbdc07ebeae821e166c Mon Sep 17 00:00:00 2001
 From: Siarhei Siamashka <siarhei.siamashka@gmail.com>
 Date: Mon, 17 Jun 2013 13:32:11 +0300
-Subject: [PATCH 075/634] fbdev: add FBIOCOPYAREA ioctl
+Subject: [PATCH 067/828] fbdev: add FBIOCOPYAREA ioctl
 
 Based on the patch authored by Ali Gholami Rudi at
     https://lkml.org/lkml/2009/7/13/153
@@ -26,8 +26,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  include/uapi/linux/fb.h          |  12 +++
  3 files changed, 213 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c
-index f66957d48dc3..0e9ec3f593b8 100644
 --- a/drivers/video/fbdev/bcm2708_fb.c
 +++ b/drivers/video/fbdev/bcm2708_fb.c
 @@ -32,8 +32,10 @@
@@ -41,7 +39,7 @@ index f66957d48dc3..0e9ec3f593b8 100644
  #include <soc/bcm2835/raspberrypi-firmware.h>
  #include <linux/mutex.h>
  
-@@ -184,9 +186,6 @@ static int bcm2708_fb_debugfs_init(struct bcm2708_fb *fb)
+@@ -184,9 +186,6 @@ static int bcm2708_fb_debugfs_init(struc
  
  	fb->debugfs_subdir = debugfs_create_dir(buf, fb->debugfs_dir);
  
@@ -51,7 +49,7 @@ index f66957d48dc3..0e9ec3f593b8 100644
  	if (!fb->debugfs_subdir) {
  		dev_warn(fb->fb.dev, "%s: could not create debugfs entry %u\n",
  			 __func__, fb->display_settings.display_num);
-@@ -603,7 +602,110 @@ static int bcm2708_fb_pan_display(struct fb_var_screeninfo *var,
+@@ -603,7 +602,110 @@ static int bcm2708_fb_pan_display(struct
  	return result;
  }
  
@@ -163,7 +161,7 @@ index f66957d48dc3..0e9ec3f593b8 100644
  static int bcm2708_ioctl(struct fb_info *info, unsigned int cmd,
  			 unsigned long arg)
  {
-@@ -619,6 +721,21 @@ static int bcm2708_ioctl(struct fb_info *info, unsigned int cmd,
+@@ -619,6 +721,21 @@ static int bcm2708_ioctl(struct fb_info
  					    RPI_FIRMWARE_FRAMEBUFFER_SET_VSYNC,
  					    &dummy, sizeof(dummy));
  		break;
@@ -185,7 +183,7 @@ index f66957d48dc3..0e9ec3f593b8 100644
  	default:
  		dev_dbg(info->device, "Unknown ioctl 0x%x\n", cmd);
  		return -ENOTTY;
-@@ -629,6 +746,48 @@ static int bcm2708_ioctl(struct fb_info *info, unsigned int cmd,
+@@ -629,6 +746,48 @@ static int bcm2708_ioctl(struct fb_info
  
  	return ret;
  }
@@ -244,11 +242,9 @@ index f66957d48dc3..0e9ec3f593b8 100644
  };
  
  static int bcm2708_fb_register(struct bcm2708_fb *fb)
-diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
-index 7420d2c16e47..f9b620f6a074 100644
 --- a/drivers/video/fbdev/core/fbmem.c
 +++ b/drivers/video/fbdev/core/fbmem.c
-@@ -1085,6 +1085,30 @@ fb_blank(struct fb_info *info, int blank)
+@@ -1086,6 +1086,30 @@ fb_blank(struct fb_info *info, int blank
  }
  EXPORT_SYMBOL(fb_blank);
  
@@ -279,7 +275,7 @@ index 7420d2c16e47..f9b620f6a074 100644
  static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
  			unsigned long arg)
  {
-@@ -1093,6 +1117,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
+@@ -1094,6 +1118,7 @@ static long do_fb_ioctl(struct fb_info *
  	struct fb_fix_screeninfo fix;
  	struct fb_cmap cmap_from;
  	struct fb_cmap_user cmap;
@@ -287,7 +283,7 @@ index 7420d2c16e47..f9b620f6a074 100644
  	void __user *argp = (void __user *)arg;
  	long ret = 0;
  
-@@ -1168,6 +1193,15 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
+@@ -1169,6 +1194,15 @@ static long do_fb_ioctl(struct fb_info *
  		unlock_fb_info(info);
  		console_unlock();
  		break;
@@ -299,11 +295,11 @@ index 7420d2c16e47..f9b620f6a074 100644
 +			ret = fb_copyarea_user(info, &copy);
 +			break;
 +		}
-+		/* fall through */
++		fallthrough;
  	default:
  		lock_fb_info(info);
  		fb = info->fbops;
-@@ -1307,6 +1341,7 @@ static long fb_compat_ioctl(struct file *file, unsigned int cmd,
+@@ -1308,6 +1342,7 @@ static long fb_compat_ioctl(struct file
  	case FBIOPAN_DISPLAY:
  	case FBIOGET_CON2FBMAP:
  	case FBIOPUT_CON2FBMAP:
@@ -311,8 +307,6 @@ index 7420d2c16e47..f9b620f6a074 100644
  		arg = (unsigned long) compat_ptr(arg);
  		fallthrough;
  	case FBIOBLANK:
-diff --git a/include/uapi/linux/fb.h b/include/uapi/linux/fb.h
-index 4c14e8be7267..3c6f12b76214 100644
 --- a/include/uapi/linux/fb.h
 +++ b/include/uapi/linux/fb.h
 @@ -35,6 +35,12 @@
@@ -341,6 +335,3 @@ index 4c14e8be7267..3c6f12b76214 100644
  struct fb_fillrect {
  	__u32 dx;	/* screen-relative */
  	__u32 dy;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0076-Speed-up-console-framebuffer-imageblit-function.patch b/root/target/linux/bcm27xx/patches-5.15/950-0068-Speed-up-console-framebuffer-imageblit-function.patch
similarity index 93%
rename from root/target/linux/bcm27xx/patches-5.15/0076-Speed-up-console-framebuffer-imageblit-function.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0068-Speed-up-console-framebuffer-imageblit-function.patch
index 51cdc6d5..310679b8 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0076-Speed-up-console-framebuffer-imageblit-function.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0068-Speed-up-console-framebuffer-imageblit-function.patch
@@ -1,7 +1,7 @@
-From 17159d3029ede4324a930ab62cb38d9844e2071e Mon Sep 17 00:00:00 2001
+From e2bda55c62d31d0a2de2aa8b8e286c1af2a67c55 Mon Sep 17 00:00:00 2001
 From: Harm Hanemaaijer <fgenfb@yahoo.com>
 Date: Thu, 20 Jun 2013 20:21:39 +0200
-Subject: [PATCH 076/634] Speed up console framebuffer imageblit function
+Subject: [PATCH 068/828] Speed up console framebuffer imageblit function
 
 Especially on platforms with a slower CPU but a relatively high
 framebuffer fill bandwidth, like current ARM devices, the existing
@@ -32,8 +32,6 @@ Signed-off-by: Harm Hanemaaijer <fgenfb@yahoo.com>
  drivers/video/fbdev/core/cfbimgblt.c | 152 ++++++++++++++++++++++++++-
  1 file changed, 147 insertions(+), 5 deletions(-)
 
-diff --git a/drivers/video/fbdev/core/cfbimgblt.c b/drivers/video/fbdev/core/cfbimgblt.c
-index a2bb276a8b24..436494fba15a 100644
 --- a/drivers/video/fbdev/core/cfbimgblt.c
 +++ b/drivers/video/fbdev/core/cfbimgblt.c
 @@ -28,6 +28,11 @@
@@ -48,7 +46,7 @@ index a2bb276a8b24..436494fba15a 100644
   */
  #include <linux/module.h>
  #include <linux/string.h>
-@@ -262,6 +267,133 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info *
+@@ -262,6 +267,133 @@ static inline void fast_imageblit(const
  	}
  }	
  	
@@ -182,7 +180,7 @@ index a2bb276a8b24..436494fba15a 100644
  void cfb_imageblit(struct fb_info *p, const struct fb_image *image)
  {
  	u32 fgcolor, bgcolor, start_index, bitstart, pitch_index = 0;
-@@ -294,11 +426,21 @@ void cfb_imageblit(struct fb_info *p, const struct fb_image *image)
+@@ -294,11 +426,21 @@ void cfb_imageblit(struct fb_info *p, co
  			bgcolor = image->bg_color;
  		}	
  		
@@ -209,6 +207,3 @@ index a2bb276a8b24..436494fba15a 100644
  			slow_imageblit(image, p, dst1, fgcolor, bgcolor,
  					start_index, pitch_index);
  	} else
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0077-dmaengine-Add-support-for-BCM2708.patch b/root/target/linux/bcm27xx/patches-5.15/950-0069-dmaengine-Add-support-for-BCM2708.patch
similarity index 97%
rename from root/target/linux/bcm27xx/patches-5.15/0077-dmaengine-Add-support-for-BCM2708.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0069-dmaengine-Add-support-for-BCM2708.patch
index 5b1671e6..7d7041d9 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0077-dmaengine-Add-support-for-BCM2708.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0069-dmaengine-Add-support-for-BCM2708.patch
@@ -1,7 +1,7 @@
-From b6c946afd75d362d948800546f05aceb24866f55 Mon Sep 17 00:00:00 2001
+From b38dd633de6fc7d969265acdb9b27f115467dd00 Mon Sep 17 00:00:00 2001
 From: Florian Meier <florian.meier@koalo.de>
 Date: Fri, 22 Nov 2013 14:22:53 +0100
-Subject: [PATCH 077/634] dmaengine: Add support for BCM2708
+Subject: [PATCH 069/828] dmaengine: Add support for BCM2708
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -176,8 +176,6 @@ Signed-off-by: Andrei Gherzan <andrei@gherzan.com>
  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 f5afe0ec4f96..bb1e9fb7ecda 100644
 --- a/drivers/dma/Kconfig
 +++ b/drivers/dma/Kconfig
 @@ -127,7 +127,7 @@ config BCM_SBA_RAID
@@ -200,8 +198,6 @@ index f5afe0ec4f96..bb1e9fb7ecda 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 616d926cf2a5..2f9fa1a12f51 100644
 --- a/drivers/dma/Makefile
 +++ b/drivers/dma/Makefile
 @@ -21,6 +21,7 @@ obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
@@ -212,9 +208,6 @@ index 616d926cf2a5..2f9fa1a12f51 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..075da9aadf6d
 --- /dev/null
 +++ b/drivers/dma/bcm2708-dmaengine.c
 @@ -0,0 +1,281 @@
@@ -499,9 +492,6 @@ index 000000000000..075da9aadf6d
 +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 @@
@@ -648,6 +638,3 @@ index 000000000000..6ca874d332a8
 +#endif /* CONFIG_DMA_BCM2708 || CONFIG_DMA_BCM2708_MODULE */
 +
 +#endif /* _PLAT_BCM2708_DMA_H */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0078-MMC-added-alternative-MMC-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch
similarity index 96%
rename from root/target/linux/bcm27xx/patches-5.15/0078-MMC-added-alternative-MMC-driver.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch
index 34f87ea0..4de828d6 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0078-MMC-added-alternative-MMC-driver.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch
@@ -1,7 +1,7 @@
-From 15fb4ba369a520f2b426837c44310c8041c5a7cb Mon Sep 17 00:00:00 2001
+From a5e0873893ea7c3cefae8792572ea0fb9bf2e03e Mon Sep 17 00:00:00 2001
 From: gellert <gellert@raspberrypi.org>
 Date: Fri, 15 Aug 2014 16:35:06 +0100
-Subject: [PATCH 078/634] MMC: added alternative MMC driver
+Subject: [PATCH 070/828] MMC: added alternative MMC driver
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -228,8 +228,6 @@ bcm2835-mmc: uninitialized_var is no more
  9 files changed, 1663 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 431af5e8be2f..8afaba9912e3 100644
 --- a/drivers/mmc/core/block.c
 +++ b/drivers/mmc/core/block.c
 @@ -171,6 +171,13 @@ static DEFINE_MUTEX(open_lock);
@@ -246,7 +244,7 @@ index 431af5e8be2f..8afaba9912e3 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,
-@@ -2886,6 +2893,8 @@ static int mmc_blk_probe(struct mmc_card *card)
+@@ -2924,6 +2931,8 @@ static int mmc_blk_probe(struct mmc_card
  {
  	struct mmc_blk_data *md;
  	int ret = 0;
@@ -255,7 +253,7 @@ index 431af5e8be2f..8afaba9912e3 100644
  
  	/*
  	 * Check that the card supports the command class(es) we need.
-@@ -2893,7 +2902,16 @@ static int mmc_blk_probe(struct mmc_card *card)
+@@ -2931,7 +2940,16 @@ static int mmc_blk_probe(struct mmc_card
  	if (!(card->csd.cmdclass & CCC_BLOCK_READ))
  		return -ENODEV;
  
@@ -273,7 +271,7 @@ index 431af5e8be2f..8afaba9912e3 100644
  
  	card->complete_wq = alloc_workqueue("mmc_complete",
  					WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
-@@ -2908,6 +2926,17 @@ static int mmc_blk_probe(struct mmc_card *card)
+@@ -2946,6 +2964,17 @@ static int mmc_blk_probe(struct mmc_card
  		goto out_free;
  	}
  
@@ -291,8 +289,6 @@ index 431af5e8be2f..8afaba9912e3 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 240c5af793dc..e76ac07a91a6 100644
 --- a/drivers/mmc/core/core.c
 +++ b/drivers/mmc/core/core.c
 @@ -1801,7 +1801,8 @@ EXPORT_SYMBOL(mmc_erase);
@@ -305,11 +301,9 @@ index 240c5af793dc..e76ac07a91a6 100644
  		return 1;
  	return 0;
  }
-diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h
-index d68e6e513a4f..e41bc00ece42 100644
 --- a/drivers/mmc/core/quirks.h
 +++ b/drivers/mmc/core/quirks.h
-@@ -99,6 +99,14 @@ static const struct mmc_fixup __maybe_unused mmc_blk_fixups[] = {
+@@ -99,6 +99,14 @@ static const struct mmc_fixup __maybe_un
  	MMC_FIXUP("V10016", CID_MANFID_KINGSTON, CID_OEMID_ANY, add_quirk_mmc,
  		  MMC_QUIRK_TRIM_BROKEN),
  
@@ -324,8 +318,6 @@ index d68e6e513a4f..e41bc00ece42 100644
  	END_FIXUP
  };
  
-diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
-index ccc148cdb5ee..e1f699de52ce 100644
 --- a/drivers/mmc/host/Kconfig
 +++ b/drivers/mmc/host/Kconfig
 @@ -5,6 +5,35 @@
@@ -364,11 +356,9 @@ index ccc148cdb5ee..e1f699de52ce 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 14004cc09aaa..1148f78ff6f9 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
@@ -376,9 +366,6 @@ index 14004cc09aaa..1148f78ff6f9 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..cdc1318e5936
 --- /dev/null
 +++ b/drivers/mmc/host/bcm2835-mmc.c
 @@ -0,0 +1,1576 @@
@@ -1958,11 +1945,9 @@ index 000000000000..cdc1318e5936
 +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 032bf852397f..37b0e1cfe7b7 100644
 --- a/drivers/mmc/host/sdhci-iproc.c
 +++ b/drivers/mmc/host/sdhci-iproc.c
-@@ -173,6 +173,17 @@ static unsigned int sdhci_iproc_get_max_clock(struct sdhci_host *host)
+@@ -173,6 +173,17 @@ static unsigned int sdhci_iproc_get_max_
  		return pltfm_host->clock;
  }
  
@@ -1980,7 +1965,7 @@ index 032bf852397f..37b0e1cfe7b7 100644
  /*
   * There is a known bug on BCM2711's SDHCI core integration where the
   * controller will hang when the difference between the core clock and the bus
-@@ -207,6 +218,7 @@ static const struct sdhci_ops sdhci_iproc_32only_ops = {
+@@ -207,6 +218,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,
@@ -1988,8 +1973,6 @@ index 032bf852397f..37b0e1cfe7b7 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 2d80a04e11d8..812e67fba8af 100644
 --- a/drivers/mmc/host/sdhci.c
 +++ b/drivers/mmc/host/sdhci.c
 @@ -40,7 +40,7 @@
@@ -2001,7 +1984,7 @@ index 2d80a04e11d8..812e67fba8af 100644
  
  #define MAX_TUNING_LOOP 40
  
-@@ -3131,7 +3131,7 @@ static void sdhci_timeout_timer(struct timer_list *t)
+@@ -3143,7 +3143,7 @@ static void sdhci_timeout_timer(struct t
  	spin_lock_irqsave(&host->lock, flags);
  
  	if (host->cmd && !sdhci_data_line_cmd(host->cmd)) {
@@ -2010,7 +1993,7 @@ index 2d80a04e11d8..812e67fba8af 100644
  		       mmc_hostname(host->mmc));
  		sdhci_dumpregs(host);
  
-@@ -3153,7 +3153,7 @@ static void sdhci_timeout_data_timer(struct timer_list *t)
+@@ -3165,7 +3165,7 @@ static void sdhci_timeout_data_timer(str
  
  	if (host->data || host->data_cmd ||
  	    (host->cmd && sdhci_data_line_cmd(host->cmd))) {
@@ -2019,8 +2002,6 @@ index 2d80a04e11d8..812e67fba8af 100644
  		       mmc_hostname(host->mmc));
  		sdhci_dumpregs(host);
  
-diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
-index 37f975875102..fca1b210266b 100644
 --- a/include/linux/mmc/card.h
 +++ b/include/linux/mmc/card.h
 @@ -293,6 +293,8 @@ struct mmc_card {
@@ -2032,6 +2013,3 @@ index 37f975875102..fca1b210266b 100644
  	bool			reenable_cmdq;	/* Re-enable Command Queue */
  
  	unsigned int		erase_size;	/* erase size in sectors */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0079-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch b/root/target/linux/bcm27xx/patches-5.15/950-0071-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch
similarity index 99%
rename from root/target/linux/bcm27xx/patches-5.15/0079-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0071-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch
index ac2e1fe5..6b863243 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0079-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0071-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch
@@ -1,7 +1,7 @@
-From 5323f8f1a65d288ccf964ca8a6d036e5c34a1799 Mon Sep 17 00:00:00 2001
+From 62a847d64494ded1556600cc1f7df63a00090e5c Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Wed, 25 Mar 2015 17:49:47 +0000
-Subject: [PATCH 079/634] Adding bcm2835-sdhost driver, and an overlay to
+Subject: [PATCH 071/828] Adding bcm2835-sdhost driver, and an overlay to
  enable it
 
 BCM2835 has two SD card interfaces. This driver uses the other one.
@@ -259,8 +259,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  3 files changed, 2219 insertions(+)
  create mode 100644 drivers/mmc/host/bcm2835-sdhost.c
 
-diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
-index e1f699de52ce..76c74a1ebf56 100644
 --- a/drivers/mmc/host/Kconfig
 +++ b/drivers/mmc/host/Kconfig
 @@ -34,6 +34,16 @@ config MMC_BCM2835_PIO_DMA_BARRIER
@@ -280,11 +278,9 @@ index e1f699de52ce..76c74a1ebf56 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 1148f78ff6f9..03c20de4597f 100644
 --- a/drivers/mmc/host/Makefile
 +++ b/drivers/mmc/host/Makefile
-@@ -24,6 +24,7 @@ obj-$(CONFIG_MMC_SDHCI_MILBEAUT)	+= sdhci-milbeaut.o
+@@ -24,6 +24,7 @@ obj-$(CONFIG_MMC_SDHCI_MILBEAUT)	+= sdhc
  obj-$(CONFIG_MMC_SDHCI_SPEAR)	+= sdhci-spear.o
  obj-$(CONFIG_MMC_SDHCI_AM654)	+= sdhci_am654.o
  obj-$(CONFIG_MMC_BCM2835_MMC)	+= bcm2835-mmc.o
@@ -292,9 +288,6 @@ index 1148f78ff6f9..03c20de4597f 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-sdhost.c b/drivers/mmc/host/bcm2835-sdhost.c
-new file mode 100644
-index 000000000000..2c4124082785
 --- /dev/null
 +++ b/drivers/mmc/host/bcm2835-sdhost.c
 @@ -0,0 +1,2208 @@
@@ -2506,6 +2499,3 @@ index 000000000000..2c4124082785
 +MODULE_DESCRIPTION("BCM2835 SDHost driver");
 +MODULE_LICENSE("GPL v2");
 +MODULE_AUTHOR("Phil Elwell");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0080-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch b/root/target/linux/bcm27xx/patches-5.15/950-0072-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch
similarity index 94%
rename from root/target/linux/bcm27xx/patches-5.15/0080-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0072-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch
index 7f32fb6f..c79f6c55 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0080-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0072-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch
@@ -1,7 +1,7 @@
-From dab7565d73c2f052c9cfe2d8c793682dc51f9dc6 Mon Sep 17 00:00:00 2001
+From e704db556dfdec5ad0df1903ff1b2e01667cdd76 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 28 Oct 2016 15:36:43 +0100
-Subject: [PATCH 080/634] vc_mem: Add vc_mem driver for querying firmware
+Subject: [PATCH 072/828] vc_mem: Add vc_mem driver for querying firmware
  memory addresses
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -48,9 +48,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  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 @@
@@ -72,16 +69,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..195b61a4387c
 --- /dev/null
 +++ b/drivers/char/broadcom/vc_mem.c
 @@ -0,0 +1,373 @@
@@ -458,9 +449,6 @@ index 000000000000..195b61a4387c
 +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 @@
@@ -503,6 +491,3 @@ index 000000000000..3c7079237496
 +#endif
 +
 +#endif  /* _VC_MEM_H */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0081-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch b/root/target/linux/bcm27xx/patches-5.15/950-0073-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch
similarity index 94%
rename from root/target/linux/bcm27xx/patches-5.15/0081-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0073-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch
index 7c718003..7fd4a757 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0081-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0073-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch
@@ -1,7 +1,7 @@
-From 8062954ce5d943c81d3a130cafac4d27853f8f86 Mon Sep 17 00:00:00 2001
+From ef2d1d2b0aa268e543ae56aa7c2ba9e9d4f51135 Mon Sep 17 00:00:00 2001
 From: Luke Wren <luke@raspberrypi.org>
 Date: Fri, 21 Aug 2015 23:14:48 +0100
-Subject: [PATCH 081/634] Add /dev/gpiomem device for rootless user GPIO access
+Subject: [PATCH 073/828] Add /dev/gpiomem device for rootless user GPIO access
 
 Signed-off-by: Luke Wren <luke@raspberrypi.org>
 
@@ -17,8 +17,6 @@ See: https://github.com/raspberrypi/linux/issues/1154
  3 files changed, 267 insertions(+)
  create mode 100644 drivers/char/broadcom/bcm2835-gpiomem.c
 
-diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig
-index fc1315209dab..13d4fce859ac 100644
 --- a/drivers/char/broadcom/Kconfig
 +++ b/drivers/char/broadcom/Kconfig
 @@ -16,3 +16,11 @@ config BCM2708_VCMEM
@@ -33,16 +31,11 @@ index fc1315209dab..13d4fce859ac 100644
 +		Provides users with root-free access to the GPIO registers
 +		on the 2835. Calling mmap(/dev/gpiomem) will map the GPIO
 +		register page to the user's pointer.
-diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile
-index 06c5c8ad00e7..c8747a4a11e7 100644
 --- a/drivers/char/broadcom/Makefile
 +++ b/drivers/char/broadcom/Makefile
 @@ -1 +1,2 @@
  obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o
 +obj-$(CONFIG_BCM2835_DEVGPIOMEM)+= bcm2835-gpiomem.o
-diff --git a/drivers/char/broadcom/bcm2835-gpiomem.c b/drivers/char/broadcom/bcm2835-gpiomem.c
-new file mode 100644
-index 000000000000..f5e7f1ba8fb6
 --- /dev/null
 +++ b/drivers/char/broadcom/bcm2835-gpiomem.c
 @@ -0,0 +1,258 @@
@@ -304,6 +297,3 @@ index 000000000000..f5e7f1ba8fb6
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("gpiomem driver for accessing GPIO from userspace");
 +MODULE_AUTHOR("Luke Wren <luke@raspberrypi.org>");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0082-Add-SMI-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0074-Add-SMI-driver.patch
similarity index 97%
rename from root/target/linux/bcm27xx/patches-5.15/0082-Add-SMI-driver.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0074-Add-SMI-driver.patch
index 1d4f9980..49da1fbc 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0082-Add-SMI-driver.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0074-Add-SMI-driver.patch
@@ -1,7 +1,7 @@
-From 42a5686ce064d1983505a18c242b449e01d394a2 Mon Sep 17 00:00:00 2001
+From e58cb5414ddc9f72731eecd2fbfdcb7423d5135e Mon Sep 17 00:00:00 2001
 From: Luke Wren <wren6991@gmail.com>
 Date: Sat, 5 Sep 2015 01:14:45 +0100
-Subject: [PATCH 082/634] Add SMI driver
+Subject: [PATCH 074/828] Add SMI driver
 
 Signed-off-by: Luke Wren <wren6991@gmail.com>
 
@@ -32,9 +32,6 @@ bcm2835_smi: re-add dereference to fix DMA transfers
  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 @@
@@ -55,9 +52,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 @@
@@ -109,8 +103,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 13d4fce859ac..48d29e5acb34 100644
 --- a/drivers/char/broadcom/Kconfig
 +++ b/drivers/char/broadcom/Kconfig
 @@ -24,3 +24,12 @@ config BCM2835_DEVGPIOMEM
@@ -126,17 +118,12 @@ index 13d4fce859ac..48d29e5acb34 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 c8747a4a11e7..a5d0f33221a3 100644
 --- a/drivers/char/broadcom/Makefile
 +++ b/drivers/char/broadcom/Makefile
 @@ -1,2 +1,3 @@
  obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o
  obj-$(CONFIG_BCM2835_DEVGPIOMEM)+= bcm2835-gpiomem.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..9db8f1e3db0f
 --- /dev/null
 +++ b/drivers/char/broadcom/bcm2835_smi_dev.c
 @@ -0,0 +1,402 @@
@@ -542,8 +529,6 @@ index 000000000000..9db8f1e3db0f
 +MODULE_DESCRIPTION(
 +	"Character device driver for BCM2835's secondary memory interface");
 +MODULE_AUTHOR("Luke Wren <luke@raspberrypi.org>");
-diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
-index 0f5a49fc7c9e..606331451466 100644
 --- a/drivers/misc/Kconfig
 +++ b/drivers/misc/Kconfig
 @@ -9,6 +9,14 @@ config SENSORS_LIS3LV02D
@@ -561,11 +546,9 @@ index 0f5a49fc7c9e..606331451466 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 a086197af544..e0188c30ffa8 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
@@ -573,9 +556,6 @@ index a086197af544..e0188c30ffa8 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..f1a7f6a3e966
 --- /dev/null
 +++ b/drivers/misc/bcm2835_smi.c
 @@ -0,0 +1,955 @@
@@ -1534,9 +1514,6 @@ index 000000000000..f1a7f6a3e966
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("Device driver for BCM2835's secondary memory interface");
 +MODULE_AUTHOR("Luke Wren <luke@raspberrypi.org>");
-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 @@
@@ -1931,6 +1908,3 @@ index 000000000000..ee3a75edfc03
 +#endif /* BCM2835_SMI_IMPLEMENTATION */
 +
 +#endif /* BCM2835_SMI_H */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0083-Add-Chris-Boot-s-i2c-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0075-Add-Chris-Boot-s-i2c-driver.patch
similarity index 97%
rename from root/target/linux/bcm27xx/patches-5.15/0083-Add-Chris-Boot-s-i2c-driver.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0075-Add-Chris-Boot-s-i2c-driver.patch
index e7841de8..85b8359b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0083-Add-Chris-Boot-s-i2c-driver.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0075-Add-Chris-Boot-s-i2c-driver.patch
@@ -1,7 +1,7 @@
-From b464c0603d02e89ac233b65fd71f600c4caa34e5 Mon Sep 17 00:00:00 2001
+From 6fbae01f3e6978d72c06c8a0e3910f6b5eb20432 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 17 Jun 2015 15:44:08 +0100
-Subject: [PATCH 083/634] Add Chris Boot's i2c driver
+Subject: [PATCH 075/828] Add Chris Boot's i2c driver
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -104,8 +104,6 @@ both bcm2708_bsc_fifo_fill and ~drain are changed as well.
  3 files changed, 533 insertions(+)
  create mode 100644 drivers/i2c/busses/i2c-bcm2708.c
 
-diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
-index e17790fe35a7..55597652bbb1 100644
 --- a/drivers/i2c/busses/Kconfig
 +++ b/drivers/i2c/busses/Kconfig
 @@ -9,6 +9,25 @@ menu "I2C Hardware Bus support"
@@ -134,8 +132,6 @@ index e17790fe35a7..55597652bbb1 100644
  config I2C_ALI1535
  	tristate "ALI 1535"
  	depends on PCI
-diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
-index 1336b04f40e2..95fe417d63e3 100644
 --- a/drivers/i2c/busses/Makefile
 +++ b/drivers/i2c/busses/Makefile
 @@ -3,6 +3,8 @@
@@ -147,9 +143,6 @@ index 1336b04f40e2..95fe417d63e3 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..962f2e5c7455
 --- /dev/null
 +++ b/drivers/i2c/busses/i2c-bcm2708.c
 @@ -0,0 +1,512 @@
@@ -665,6 +658,3 @@ index 000000000000..962f2e5c7455
 +MODULE_AUTHOR("Chris Boot <bootc@bootc.net>");
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS("platform:" DRV_NAME);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0084-char-broadcom-Add-vcio-module.patch b/root/target/linux/bcm27xx/patches-5.15/950-0076-char-broadcom-Add-vcio-module.patch
similarity index 92%
rename from root/target/linux/bcm27xx/patches-5.15/0084-char-broadcom-Add-vcio-module.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0076-char-broadcom-Add-vcio-module.patch
index f3d8d653..7b2c0f06 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0084-char-broadcom-Add-vcio-module.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0076-char-broadcom-Add-vcio-module.patch
@@ -1,7 +1,7 @@
-From 14ffde5320a15a12960942b29171637410752006 Mon Sep 17 00:00:00 2001
+From 68ccf6ea75ab03809b8063cade9ca17fdad303fe Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
 Date: Fri, 26 Jun 2015 14:27:06 +0200
-Subject: [PATCH 084/634] char: broadcom: Add vcio module
+Subject: [PATCH 076/828] char: broadcom: Add vcio module
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -33,8 +33,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  3 files changed, 201 insertions(+)
  create mode 100644 drivers/char/broadcom/vcio.c
 
-diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig
-index 48d29e5acb34..c11b834ccdbd 100644
 --- a/drivers/char/broadcom/Kconfig
 +++ b/drivers/char/broadcom/Kconfig
 @@ -15,6 +15,12 @@ config BCM2708_VCMEM
@@ -50,8 +48,6 @@ index 48d29e5acb34..c11b834ccdbd 100644
  endif
  
  config BCM2835_DEVGPIOMEM
-diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile
-index a5d0f33221a3..ea7495b01c28 100644
 --- a/drivers/char/broadcom/Makefile
 +++ b/drivers/char/broadcom/Makefile
 @@ -1,3 +1,4 @@
@@ -59,9 +55,6 @@ index a5d0f33221a3..ea7495b01c28 100644
 +obj-$(CONFIG_BCM_VCIO)		+= vcio.o
  obj-$(CONFIG_BCM2835_DEVGPIOMEM)+= bcm2835-gpiomem.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..d2598663a2b5
 --- /dev/null
 +++ b/drivers/char/broadcom/vcio.c
 @@ -0,0 +1,194 @@
@@ -259,6 +252,3 @@ index 000000000000..d2598663a2b5
 +MODULE_AUTHOR("Noralf Trønnes");
 +MODULE_DESCRIPTION("Mailbox userspace access");
 +MODULE_LICENSE("GPL");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0085-firmware-bcm2835-Support-ARCH_BCM270x.patch b/root/target/linux/bcm27xx/patches-5.15/950-0077-firmware-bcm2835-Support-ARCH_BCM270x.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0085-firmware-bcm2835-Support-ARCH_BCM270x.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0077-firmware-bcm2835-Support-ARCH_BCM270x.patch
index de5285c5..0c7b53ca 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0085-firmware-bcm2835-Support-ARCH_BCM270x.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0077-firmware-bcm2835-Support-ARCH_BCM270x.patch
@@ -1,7 +1,7 @@
-From 48748dbf488a3a17297d54fefcddc5a477a1842f Mon Sep 17 00:00:00 2001
+From c1888f14e25039752859be495bce70265f60bca2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
 Date: Fri, 26 Jun 2015 14:25:01 +0200
-Subject: [PATCH 085/634] firmware: bcm2835: Support ARCH_BCM270x
+Subject: [PATCH 077/828] firmware: bcm2835: Support ARCH_BCM270x
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -25,8 +25,6 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  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 4b8978b254f9..54619623fe86 100644
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
 @@ -32,6 +32,8 @@ struct rpi_firmware {
@@ -38,7 +36,7 @@ index 4b8978b254f9..54619623fe86 100644
  static DEFINE_MUTEX(transaction_lock);
  
  static void response_callback(struct mbox_client *cl, void *msg)
-@@ -279,6 +281,7 @@ static int rpi_firmware_probe(struct platform_device *pdev)
+@@ -279,6 +281,7 @@ static int rpi_firmware_probe(struct pla
  	kref_init(&fw->consumers);
  
  	platform_set_drvdata(pdev, fw);
@@ -46,7 +44,7 @@ index 4b8978b254f9..54619623fe86 100644
  
  	rpi_firmware_print_firmware_revision(fw);
  	rpi_register_hwmon_driver(dev, fw);
-@@ -307,6 +310,7 @@ static int rpi_firmware_remove(struct platform_device *pdev)
+@@ -307,6 +310,7 @@ static int rpi_firmware_remove(struct pl
  	rpi_clk = NULL;
  
  	rpi_firmware_put(fw);
@@ -54,7 +52,7 @@ index 4b8978b254f9..54619623fe86 100644
  
  	return 0;
  }
-@@ -381,7 +385,18 @@ static struct platform_driver rpi_firmware_driver = {
+@@ -381,7 +385,18 @@ static struct platform_driver rpi_firmwa
  	.shutdown	= rpi_firmware_shutdown,
  	.remove		= rpi_firmware_remove,
  };
@@ -74,6 +72,3 @@ index 4b8978b254f9..54619623fe86 100644
  
  MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
  MODULE_DESCRIPTION("Raspberry Pi firmware driver");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0086-BCM2708-Add-core-Device-Tree-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0078-BCM2708-Add-core-Device-Tree-support.patch
similarity index 98%
rename from root/target/linux/bcm27xx/patches-5.15/0086-BCM2708-Add-core-Device-Tree-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0078-BCM2708-Add-core-Device-Tree-support.patch
index 6b9fd503..26371ae7 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0086-BCM2708-Add-core-Device-Tree-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0078-BCM2708-Add-core-Device-Tree-support.patch
@@ -1,7 +1,7 @@
-From 8c5e775a25b58750e02267d6efc6650833533d9a Mon Sep 17 00:00:00 2001
+From 5648905f1832862ca94c41b3be7b95bcfad95965 Mon Sep 17 00:00:00 2001
 From: notro <notro@tronnes.org>
 Date: Wed, 9 Jul 2014 14:46:08 +0200
-Subject: [PATCH 086/634] BCM2708: Add core Device Tree support
+Subject: [PATCH 078/828] BCM2708: Add core Device Tree support
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -798,7 +798,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  create mode 120000 arch/arm64/boot/dts/overlays
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 7e0934180724..b2d1fb05a975 100644
+index 27ca1ca6e..ab6a5c6ea 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -1,4 +1,11 @@
@@ -813,7 +813,7 @@ index 7e0934180724..b2d1fb05a975 100644
  dtb-$(CONFIG_ARCH_ALPINE) += \
  	alpine-db.dtb
  dtb-$(CONFIG_MACH_ARTPEC6) += \
-@@ -1498,3 +1505,13 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
+@@ -1499,3 +1506,13 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
  	aspeed-bmc-portwell-neptune.dtb \
  	aspeed-bmc-quanta-q71l.dtb \
  	aspeed-bmc-supermicro-x11spi.dtb
@@ -829,7 +829,7 @@ index 7e0934180724..b2d1fb05a975 100644
 +endif
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
 new file mode 100644
-index 000000000000..e42cba84ab0e
+index 000000000..e42cba84a
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
 @@ -0,0 +1,129 @@
@@ -964,7 +964,7 @@ index 000000000000..e42cba84ab0e
 +};
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
 new file mode 100644
-index 000000000000..4ea1e68f5e29
+index 000000000..4ea1e68f5
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
 @@ -0,0 +1,132 @@
@@ -1102,7 +1102,7 @@ index 000000000000..4ea1e68f5e29
 +};
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts
 new file mode 100644
-index 000000000000..a152c1c8e648
+index 000000000..a152c1c8e
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
 @@ -0,0 +1,119 @@
@@ -1227,7 +1227,7 @@ index 000000000000..a152c1c8e648
 +};
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi b/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi
 new file mode 100644
-index 000000000000..a18f80af97d3
+index 000000000..a18f80af9
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi
 @@ -0,0 +1,26 @@
@@ -1259,7 +1259,7 @@ index 000000000000..a18f80af97d3
 +};
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dts b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
 new file mode 100644
-index 000000000000..f61e3418425a
+index 000000000..f61e34184
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
 @@ -0,0 +1,112 @@
@@ -1377,7 +1377,7 @@ index 000000000000..f61e3418425a
 +};
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
 new file mode 100644
-index 000000000000..d5572b2d2103
+index 000000000..d5572b2d2
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
 @@ -0,0 +1,18 @@
@@ -1401,7 +1401,7 @@ index 000000000000..d5572b2d2103
 +};
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 new file mode 100644
-index 000000000000..75a5b41514f9
+index 000000000..75a5b4151
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 @@ -0,0 +1,169 @@
@@ -1576,7 +1576,7 @@ index 000000000000..75a5b41514f9
 +};
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 new file mode 100644
-index 000000000000..84591bd7d423
+index 000000000..84591bd7d
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 @@ -0,0 +1,123 @@
@@ -1705,7 +1705,7 @@ index 000000000000..84591bd7d423
 +};
 diff --git a/arch/arm/boot/dts/bcm2708-rpi.dtsi b/arch/arm/boot/dts/bcm2708-rpi.dtsi
 new file mode 100644
-index 000000000000..e2458b15d64a
+index 000000000..e2458b15d
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi
 @@ -0,0 +1,36 @@
@@ -1747,7 +1747,7 @@ index 000000000000..e2458b15d64a
 +};
 diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi
 new file mode 100644
-index 000000000000..36ec4989403f
+index 000000000..36ec49894
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708.dtsi
 @@ -0,0 +1,12 @@
@@ -1765,7 +1765,7 @@ index 000000000000..36ec4989403f
 +};
 diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
 new file mode 100644
-index 000000000000..e1381d2b3a2c
+index 000000000..e1381d2b3
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
 @@ -0,0 +1,129 @@
@@ -1900,7 +1900,7 @@ index 000000000000..e1381d2b3a2c
 +};
 diff --git a/arch/arm/boot/dts/bcm2709-rpi.dtsi b/arch/arm/boot/dts/bcm2709-rpi.dtsi
 new file mode 100644
-index 000000000000..babfa41cd9f7
+index 000000000..babfa41cd
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2709-rpi.dtsi
 @@ -0,0 +1,5 @@
@@ -1911,7 +1911,7 @@ index 000000000000..babfa41cd9f7
 +};
 diff --git a/arch/arm/boot/dts/bcm2709.dtsi b/arch/arm/boot/dts/bcm2709.dtsi
 new file mode 100644
-index 000000000000..68eafc1b281a
+index 000000000..68eafc1b2
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2709.dtsi
 @@ -0,0 +1,22 @@
@@ -1939,7 +1939,7 @@ index 000000000000..68eafc1b281a
 +};
 diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi
 new file mode 100644
-index 000000000000..68a7e1c09db1
+index 000000000..68a7e1c09
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
 @@ -0,0 +1,154 @@
@@ -2099,7 +2099,7 @@ index 000000000000..68a7e1c09db1
 +};
 diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi
 new file mode 100644
-index 000000000000..badcf341ecd2
+index 000000000..badcf341e
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm270x.dtsi
 @@ -0,0 +1,217 @@
@@ -2322,7 +2322,7 @@ index 000000000000..badcf341ecd2
 +};
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
 new file mode 100644
-index 000000000000..ae9db1b1be1b
+index 000000000..ae9db1b1b
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
 @@ -0,0 +1,129 @@
@@ -2457,7 +2457,7 @@ index 000000000000..ae9db1b1be1b
 +};
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 new file mode 100644
-index 000000000000..7e12c05cc28b
+index 000000000..7e12c05cc
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 @@ -0,0 +1,201 @@
@@ -2664,7 +2664,7 @@ index 000000000000..7e12c05cc28b
 +};
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 new file mode 100644
-index 000000000000..d40722ddc286
+index 000000000..d40722ddc
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 @@ -0,0 +1,203 @@
@@ -2873,7 +2873,7 @@ index 000000000000..d40722ddc286
 +};
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 new file mode 100644
-index 000000000000..c386a855cdc3
+index 000000000..c386a855c
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 @@ -0,0 +1,148 @@
@@ -3027,7 +3027,7 @@ index 000000000000..c386a855cdc3
 +};
 diff --git a/arch/arm/boot/dts/bcm2710.dtsi b/arch/arm/boot/dts/bcm2710.dtsi
 new file mode 100644
-index 000000000000..e7e5c913f1d1
+index 000000000..e7e5c913f
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2710.dtsi
 @@ -0,0 +1,25 @@
@@ -3057,7 +3057,7 @@ index 000000000000..e7e5c913f1d1
 +	status = "disabled";
 +};
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 72ce80fbf266..f6e0247f7d1b 100644
+index 72ce80fbf..f6e0247f7 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -2,7 +2,7 @@
@@ -3389,7 +3389,7 @@ index 72ce80fbf266..f6e0247f7d1b 100644
 +	};
 +};
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-400.dts b/arch/arm/boot/dts/bcm2711-rpi-400.dts
-index f4d2fc20397c..bed192b085df 100644
+index f4d2fc203..bed192b08 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
 @@ -1,6 +1,9 @@
@@ -4045,7 +4045,7 @@ index f4d2fc20397c..bed192b085df 100644
  };
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 new file mode 100644
-index 000000000000..76dd97513a20
+index 000000000..76dd97513
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 @@ -0,0 +1,660 @@
@@ -4711,7 +4711,7 @@ index 000000000000..76dd97513a20
 +};
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
 new file mode 100644
-index 000000000000..ebf73b789b4a
+index 000000000..ebf73b789
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
 @@ -0,0 +1,205 @@
@@ -4921,10 +4921,10 @@ index 000000000000..ebf73b789b4a
 +	status = "disabled";
 +};
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index 3b60297af7f6..05ef7089868f 100644
+index 21294f775..9ef2696b7 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
-@@ -322,6 +322,7 @@ aon_intr: interrupt-controller@7ef00100 {
+@@ -323,6 +323,7 @@ aon_intr: interrupt-controller@7ef00100 {
  			interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
  			interrupt-controller;
  			#interrupt-cells = <1>;
@@ -4932,7 +4932,7 @@ index 3b60297af7f6..05ef7089868f 100644
  		};
  
  		hdmi0: hdmi@7ef00700 {
-@@ -334,7 +335,8 @@ hdmi0: hdmi@7ef00700 {
+@@ -335,7 +336,8 @@ hdmi0: hdmi@7ef00700 {
  			      <0x7ef01f00 0x400>,
  			      <0x7ef00200 0x80>,
  			      <0x7ef04300 0x100>,
@@ -4942,7 +4942,7 @@ index 3b60297af7f6..05ef7089868f 100644
  			reg-names = "hdmi",
  				    "dvp",
  				    "phy",
-@@ -343,7 +345,12 @@ hdmi0: hdmi@7ef00700 {
+@@ -344,7 +346,12 @@ hdmi0: hdmi@7ef00700 {
  				    "metadata",
  				    "csc",
  				    "cec",
@@ -4956,7 +4956,7 @@ index 3b60297af7f6..05ef7089868f 100644
  			clock-names = "hdmi", "bvb", "audio", "cec";
  			resets = <&dvp 0>;
  			interrupt-parent = <&aon_intr>;
-@@ -352,7 +359,7 @@ hdmi0: hdmi@7ef00700 {
+@@ -353,7 +360,7 @@ hdmi0: hdmi@7ef00700 {
  			interrupt-names = "cec-tx", "cec-rx", "cec-low",
  					  "wakeup", "hpd-connected", "hpd-removed";
  			ddc = <&ddc0>;
@@ -4965,7 +4965,7 @@ index 3b60297af7f6..05ef7089868f 100644
  			dma-names = "audio-rx";
  			status = "disabled";
  		};
-@@ -375,7 +382,8 @@ hdmi1: hdmi@7ef05700 {
+@@ -376,7 +383,8 @@ hdmi1: hdmi@7ef05700 {
  			      <0x7ef06f00 0x400>,
  			      <0x7ef00280 0x80>,
  			      <0x7ef09300 0x100>,
@@ -4975,7 +4975,7 @@ index 3b60297af7f6..05ef7089868f 100644
  			reg-names = "hdmi",
  				    "dvp",
  				    "phy",
-@@ -384,16 +392,21 @@ hdmi1: hdmi@7ef05700 {
+@@ -385,16 +393,21 @@ hdmi1: hdmi@7ef05700 {
  				    "metadata",
  				    "csc",
  				    "cec",
@@ -4999,7 +4999,7 @@ index 3b60297af7f6..05ef7089868f 100644
  			dma-names = "audio-rx";
  			status = "disabled";
  		};
-@@ -494,14 +507,14 @@ cpu3: cpu@3 {
+@@ -495,14 +508,14 @@ cpu3: cpu@3 {
  	scb {
  		compatible = "simple-bus";
  		#address-cells = <2>;
@@ -5018,7 +5018,7 @@ index 3b60297af7f6..05ef7089868f 100644
  			device_type = "pci";
  			#address-cells = <3>;
  			#interrupt-cells = <1>;
-@@ -515,8 +528,8 @@ pcie0: pcie@7d500000 {
+@@ -522,8 +535,8 @@ IRQ_TYPE_LEVEL_HIGH>,
  			msi-controller;
  			msi-parent = <&pcie0>;
  
@@ -5029,7 +5029,7 @@ index 3b60297af7f6..05ef7089868f 100644
  			/*
  			 * The wrapper around the PCIe block has a bug
  			 * preventing it from accessing beyond the first 3GB of
-@@ -529,7 +542,7 @@ pcie0: pcie@7d500000 {
+@@ -536,7 +549,7 @@ IRQ_TYPE_LEVEL_HIGH>,
  
  		genet: ethernet@7d580000 {
  			compatible = "brcm,bcm2711-genet-v5";
@@ -5038,7 +5038,7 @@ index 3b60297af7f6..05ef7089868f 100644
  			#address-cells = <0x1>;
  			#size-cells = <0x1>;
  			interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>,
-@@ -1037,7 +1050,7 @@ &cma {
+@@ -1046,7 +1059,7 @@ &cma {
  	alloc-ranges = <0x0 0x00000000 0x40000000>;
  };
  
@@ -5047,7 +5047,7 @@ index 3b60297af7f6..05ef7089868f 100644
  	compatible = "brcm,bcm2711-i2c", "brcm,bcm2835-i2c";
  	interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
  };
-@@ -1093,8 +1106,3 @@ &uart1 {
+@@ -1102,8 +1115,3 @@ &uart1 {
  &usb {
  	interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
  };
@@ -5058,7 +5058,7 @@ index 3b60297af7f6..05ef7089868f 100644
 -};
 diff --git a/arch/arm/boot/dts/bcm271x-rpi-bt.dtsi b/arch/arm/boot/dts/bcm271x-rpi-bt.dtsi
 new file mode 100644
-index 000000000000..6b9b79f74cf3
+index 000000000..6b9b79f74
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm271x-rpi-bt.dtsi
 @@ -0,0 +1,26 @@
@@ -5089,7 +5089,7 @@ index 000000000000..6b9b79f74cf3
 +	};
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi
-index c25e797b9060..06d8c3882cb7 100644
+index c25e797b9..06d8c3882 100644
 --- a/arch/arm/boot/dts/bcm2835-common.dtsi
 +++ b/arch/arm/boot/dts/bcm2835-common.dtsi
 @@ -124,12 +124,14 @@ hdmi: hdmi@7e902000 {
@@ -5109,7 +5109,7 @@ index c25e797b9060..06d8c3882cb7 100644
  			status = "disabled";
  		};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
-index 40b9405f1a8e..d2384d8e8555 100644
+index 40b9405f1..d2384d8e8 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
 @@ -126,3 +126,8 @@ &uart0 {
@@ -5122,7 +5122,7 @@ index 40b9405f1a8e..d2384d8e8555 100644
 +	pinctrl-1 = <&i2c0_gpio28>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts
-index 11edb581dbaf..4ceca674b752 100644
+index 11edb581d..4ceca674b 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
 @@ -121,3 +121,10 @@ &uart0 {
@@ -5137,7 +5137,7 @@ index 11edb581dbaf..4ceca674b752 100644
 +	pinctrl-1 = <&i2c0_gpio0>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
-index 1b435c64bd9c..8f2d10d82fa1 100644
+index 1b435c64b..8f2d10d82 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
 @@ -128,3 +128,8 @@ &uart0 {
@@ -5150,7 +5150,7 @@ index 1b435c64bd9c..8f2d10d82fa1 100644
 +	pinctrl-1 = <&i2c0_gpio28>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
-index a23c25c00eea..547c88a3ae9f 100644
+index a23c25c00..547c88a3a 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
 @@ -121,3 +121,10 @@ &uart0 {
@@ -5165,7 +5165,7 @@ index a23c25c00eea..547c88a3ae9f 100644
 +	pinctrl-1 = <&i2c0_gpio0>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
-index 1b63d6b19750..073fc99ef8a2 100644
+index 1b63d6b19..073fc99ef 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
 @@ -116,3 +116,10 @@ &uart0 {
@@ -5180,7 +5180,7 @@ index 1b63d6b19750..073fc99ef8a2 100644
 +	pinctrl-1 = <&i2c0_gpio0>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
-index a75c882e6575..95564c93a645 100644
+index a75c882e6..95564c93a 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
 @@ -95,3 +95,8 @@ &uart0 {
@@ -5193,7 +5193,7 @@ index a75c882e6575..95564c93a645 100644
 +	pinctrl-1 = <&i2c0_gpio28>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
-index 33b2b77aa47d..3ea5c7e6be54 100644
+index 33b2b77aa..3ea5c7e6b 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
 @@ -149,3 +149,8 @@ &uart1 {
@@ -5206,7 +5206,7 @@ index 33b2b77aa47d..3ea5c7e6be54 100644
 +	pinctrl-1 = <&i2c0_gpio28>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
-index 6f9b3a908f28..a0eabab12c99 100644
+index 6f9b3a908..a0eabab12 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
 @@ -117,3 +117,8 @@ &uart0 {
@@ -5219,7 +5219,7 @@ index 6f9b3a908f28..a0eabab12c99 100644
 +	pinctrl-1 = <&i2c0_gpio28>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
-index 87ddcad76083..edc55bba5ff4 100644
+index 87ddcad76..edc55bba5 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
 @@ -19,6 +19,11 @@ firmware: firmware {
@@ -5267,7 +5267,7 @@ index 87ddcad76083..edc55bba5ff4 100644
  	power-domains = <&power RPI_POWER_DOMAIN_VEC>;
  	status = "okay";
 diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
-index 0549686134ea..2ea891228ea0 100644
+index 054968613..2ea891228 100644
 --- a/arch/arm/boot/dts/bcm2835.dtsi
 +++ b/arch/arm/boot/dts/bcm2835.dtsi
 @@ -19,7 +19,7 @@ cpu@0 {
@@ -5280,7 +5280,7 @@ index 0549686134ea..2ea891228ea0 100644
  
  	arm-pmu {
 diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
-index d8af8eeac7b6..bf22b74359d8 100644
+index d8af8eeac..bf22b7435 100644
 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
 +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
 @@ -128,3 +128,8 @@ &uart0 {
@@ -5293,7 +5293,7 @@ index d8af8eeac7b6..bf22b74359d8 100644
 +	pinctrl-1 = <&i2c0_gpio28>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
-index 77099a7871b0..9529c0475673 100644
+index 77099a787..9529c0475 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
 @@ -178,3 +178,8 @@ &uart1 {
@@ -5306,7 +5306,7 @@ index 77099a7871b0..9529c0475673 100644
 +	pinctrl-1 = <&i2c0_gpio44>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
-index 61010266ca9a..40cb269aed0f 100644
+index 61010266c..40cb269ae 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
 @@ -181,3 +181,8 @@ &uart1 {
@@ -5319,7 +5319,7 @@ index 61010266ca9a..40cb269aed0f 100644
 +	pinctrl-1 = <&i2c0_gpio44>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
-index dd4a48604097..8f16b6b3fe08 100644
+index dd4a48604..8f16b6b3f 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 @@ -174,3 +174,8 @@ &sdhost {
@@ -5332,7 +5332,7 @@ index dd4a48604097..8f16b6b3fe08 100644
 +	pinctrl-1 = <&i2c0_gpio44>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
-index 588d9411ceb6..dde209ade51b 100644
+index 588d9411c..dde209ade 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
 +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
 @@ -94,3 +94,8 @@ &uart0 {
@@ -5346,7 +5346,7 @@ index 588d9411ceb6..dde209ade51b 100644
 +};
 diff --git a/arch/arm/boot/dts/bcm283x-rpi-cam1-regulator.dtsi b/arch/arm/boot/dts/bcm283x-rpi-cam1-regulator.dtsi
 new file mode 100644
-index 000000000000..55237d03ed94
+index 000000000..55237d03e
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm283x-rpi-cam1-regulator.dtsi
 @@ -0,0 +1,10 @@
@@ -5362,7 +5362,7 @@ index 000000000000..55237d03ed94
 +};
 diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi
 new file mode 100644
-index 000000000000..6e4ce8622b47
+index 000000000..6e4ce8622
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi
 @@ -0,0 +1,4 @@
@@ -5372,7 +5372,7 @@ index 000000000000..6e4ce8622b47
 +};
 diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi
 new file mode 100644
-index 000000000000..6938f4daacdc
+index 000000000..6938f4daa
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi
 @@ -0,0 +1,4 @@
@@ -5382,7 +5382,7 @@ index 000000000000..6938f4daacdc
 +};
 diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi
 new file mode 100644
-index 000000000000..b37037437bee
+index 000000000..b37037437
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi
 @@ -0,0 +1,4 @@
@@ -5392,7 +5392,7 @@ index 000000000000..b37037437bee
 +};
 diff --git a/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_28.dtsi b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_28.dtsi
 new file mode 100644
-index 000000000000..38f0074bce3f
+index 000000000..38f0074bc
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_28.dtsi
 @@ -0,0 +1,4 @@
@@ -5402,7 +5402,7 @@ index 000000000000..38f0074bce3f
 +};
 diff --git a/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi
 new file mode 100644
-index 000000000000..119946d878db
+index 000000000..119946d87
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi
 @@ -0,0 +1,4 @@
@@ -5411,10 +5411,10 @@ index 000000000000..119946d878db
 +	pinctrl-1 = <&i2c0_gpio44>;
 +};
 diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index a3e06b680947..06d04cde52b9 100644
+index c113661a6..62d7ee513 100644
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -334,7 +334,7 @@ spi: spi@7e204000 {
+@@ -336,7 +336,7 @@ spi: spi@7e204000 {
  			status = "disabled";
  		};
  
@@ -5423,7 +5423,7 @@ index a3e06b680947..06d04cde52b9 100644
  			compatible = "brcm,bcm2835-i2c";
  			reg = <0x7e205000 0x200>;
  			interrupts = <2 21>;
-@@ -344,6 +344,30 @@ i2c0: i2c@7e205000 {
+@@ -346,6 +346,30 @@ i2c0: i2c@7e205000 {
  			status = "disabled";
  		};
  
@@ -5456,7 +5456,7 @@ index a3e06b680947..06d04cde52b9 100644
  			reg = <0x7e208000 0x8c>;
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
 new file mode 100644
-index 000000000000..44aedc149ff0
+index 000000000..44aedc149
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -0,0 +1,248 @@
@@ -5710,7 +5710,7 @@ index 000000000000..44aedc149ff0
 +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..eb2c9adfb1a8
+index 000000000..eb2c9adfb
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -0,0 +1,3530 @@
@@ -9246,7 +9246,7 @@ index 000000000000..eb2c9adfb1a8
 +http://www.raspberrypi.org/documentation/configuration/device-tree.md
 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..2f4bbb407f89
+index 000000000..2f4bbb407
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/act-led-overlay.dts
 @@ -0,0 +1,27 @@
@@ -9279,7 +9279,7 @@ index 000000000000..2f4bbb407f89
 +};
 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
+index 000000000..e1ce94a8c
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts
 @@ -0,0 +1,55 @@
@@ -9340,7 +9340,7 @@ index 000000000000..e1ce94a8cd3e
 +};
 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..298488e19156
+index 000000000..298488e19
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts
 @@ -0,0 +1,40 @@
@@ -9386,7 +9386,7 @@ index 000000000000..298488e19156
 +};
 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..5fed769d2526
+index 000000000..5fed769d2
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts
 @@ -0,0 +1,52 @@
@@ -9444,7 +9444,7 @@ index 000000000000..5fed769d2526
 +};
 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
+index 000000000..dc1764613
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ads1015-overlay.dts
 @@ -0,0 +1,98 @@
@@ -9548,7 +9548,7 @@ 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..e44ced704ee2
+index 000000000..e44ced704
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ads1115-overlay.dts
 @@ -0,0 +1,103 @@
@@ -9657,7 +9657,7 @@ index 000000000000..e44ced704ee2
 +};
 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..1c5c9b6bb6ff
+index 000000000..1c5c9b6bb
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ads7846-overlay.dts
 @@ -0,0 +1,89 @@
@@ -9752,7 +9752,7 @@ index 000000000000..1c5c9b6bb6ff
 +};
 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..5d85dfd0595c
+index 000000000..5d85dfd05
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts
 @@ -0,0 +1,65 @@
@@ -9823,7 +9823,7 @@ index 000000000000..5d85dfd0595c
 +};
 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
+index 000000000..ea392e886
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/adv728x-m-overlay.dts
 @@ -0,0 +1,37 @@
@@ -9866,7 +9866,7 @@ index 000000000000..ea392e886984
 +};
 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..82f9b3734fb1
+index 000000000..82f9b3734
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts
 @@ -0,0 +1,49 @@
@@ -9921,7 +9921,7 @@ index 000000000000..82f9b3734fb1
 +};
 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..873cb2fab52b
+index 000000000..873cb2fab
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts
 @@ -0,0 +1,59 @@
@@ -9986,7 +9986,7 @@ index 000000000000..873cb2fab52b
 +};
 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..a6adfb495eb9
+index 000000000..a6adfb495
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts
 @@ -0,0 +1,57 @@
@@ -10049,7 +10049,7 @@ index 000000000000..a6adfb495eb9
 +
 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..ea018ace34d4
+index 000000000..ea018ace3
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/allo-digione-overlay.dts
 @@ -0,0 +1,44 @@
@@ -10099,7 +10099,7 @@ index 000000000000..ea018ace34d4
 +};
 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..b25fd681f09f
+index 000000000..b25fd681f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts
 @@ -0,0 +1,57 @@
@@ -10162,7 +10162,7 @@ index 000000000000..b25fd681f09f
 +
 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..bfc66da6295a
+index 000000000..bfc66da62
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts
 @@ -0,0 +1,54 @@
@@ -10222,7 +10222,7 @@ index 000000000000..bfc66da6295a
 +};
 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..d47a35def4f7
+index 000000000..d47a35def
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts
 @@ -0,0 +1,57 @@
@@ -10285,7 +10285,7 @@ index 000000000000..d47a35def4f7
 +};
 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
+index 000000000..87523dcca
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/anyspi-overlay.dts
 @@ -0,0 +1,205 @@
@@ -10496,7 +10496,7 @@ index 000000000000..87523dcca318
 +};
 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..c216932278ab
+index 000000000..c21693227
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/apds9960-overlay.dts
 @@ -0,0 +1,57 @@
@@ -10559,7 +10559,7 @@ index 000000000000..c216932278ab
 +
 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..4769296ec9d6
+index 000000000..4769296ec
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts
 @@ -0,0 +1,57 @@
@@ -10622,7 +10622,7 @@ index 000000000000..4769296ec9d6
 +*/
 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..5a3f4571ee78
+index 000000000..5a3f4571e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/at86rf233-overlay.dts
 @@ -0,0 +1,57 @@
@@ -10685,7 +10685,7 @@ index 000000000000..5a3f4571ee78
 +};
 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..57a66eac8e9b
+index 000000000..57a66eac8
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts
 @@ -0,0 +1,60 @@
@@ -10751,7 +10751,7 @@ index 000000000000..57a66eac8e9b
 +};
 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..63e05cf9665d
+index 000000000..63e05cf96
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts
 @@ -0,0 +1,55 @@
@@ -10812,7 +10812,7 @@ index 000000000000..63e05cf9665d
 +};
 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..fb4a4678a17a
+index 000000000..fb4a4678a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts
 @@ -0,0 +1,71 @@
@@ -10889,7 +10889,7 @@ index 000000000000..fb4a4678a17a
 +};
 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..68f4427d86c3
+index 000000000..68f4427d8
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts
 @@ -0,0 +1,39 @@
@@ -10934,7 +10934,7 @@ index 000000000000..68f4427d86c3
 +};
 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..81af26374d92
+index 000000000..81af26374
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts
 @@ -0,0 +1,82 @@
@@ -11022,7 +11022,7 @@ index 000000000000..81af26374d92
 +};
 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..7324890ead86
+index 000000000..7324890ea
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/audremap-overlay.dts
 @@ -0,0 +1,42 @@
@@ -11070,7 +11070,7 @@ index 000000000000..7324890ead86
 +};
 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..e7ead7cdf5f5
+index 000000000..e7ead7cdf
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/balena-fin-overlay.dts
 @@ -0,0 +1,125 @@
@@ -11201,7 +11201,7 @@ index 000000000000..e7ead7cdf5f5
 +};
 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
+index 000000000..0a585e725
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/cap1106-overlay.dts
 @@ -0,0 +1,52 @@
@@ -11259,7 +11259,7 @@ index 000000000000..0a585e725f84
 +};
 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..09c7417b4707
+index 000000000..09c7417b4
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/chipdip-dac-overlay.dts
 @@ -0,0 +1,46 @@
@@ -11311,7 +11311,7 @@ index 000000000000..09c7417b4707
 +};
 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
+index 000000000..1d87c599f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/cma-overlay.dts
 @@ -0,0 +1,36 @@
@@ -11353,7 +11353,7 @@ index 000000000000..1d87c599f909
 +};
 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..6feeeb402493
+index 000000000..6feeeb402
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/dht11-overlay.dts
 @@ -0,0 +1,41 @@
@@ -11400,7 +11400,7 @@ index 000000000000..6feeeb402493
 +};
 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..d863e5c167cc
+index 000000000..d863e5c16
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts
 @@ -0,0 +1,39 @@
@@ -11445,7 +11445,7 @@ index 000000000000..d863e5c167cc
 +};
 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..dfb8922a654b
+index 000000000..dfb8922a6
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts
 @@ -0,0 +1,49 @@
@@ -11500,7 +11500,7 @@ index 000000000000..dfb8922a654b
 +};
 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..d5a66e5d76a9
+index 000000000..d5a66e5d7
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/disable-bt-overlay.dts
 @@ -0,0 +1,64 @@
@@ -11570,7 +11570,7 @@ index 000000000000..d5a66e5d76a9
 +};
 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
+index 000000000..75e046463
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/disable-wifi-overlay.dts
 @@ -0,0 +1,20 @@
@@ -11596,7 +11596,7 @@ index 000000000000..75e046463900
 +};
 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
+index 000000000..4abe5be74
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/dpi18-overlay.dts
 @@ -0,0 +1,39 @@
@@ -11641,7 +11641,7 @@ 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
+index 000000000..50c88a1ed
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/dpi18cpadhi-overlay.dts
 @@ -0,0 +1,26 @@
@@ -11673,7 +11673,7 @@ 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
+index 000000000..44335cc81
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/dpi24-overlay.dts
 @@ -0,0 +1,39 @@
@@ -11718,7 +11718,7 @@ 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..d18187d7f343
+index 000000000..d18187d7f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/draws-overlay.dts
 @@ -0,0 +1,208 @@
@@ -11932,7 +11932,7 @@ index 000000000000..d18187d7f343
 +};
 diff --git a/arch/arm/boot/dts/overlays/dwc-otg-overlay.dts b/arch/arm/boot/dts/overlays/dwc-otg-overlay.dts
 new file mode 100644
-index 000000000000..78c5e9f85048
+index 000000000..78c5e9f85
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/dwc-otg-overlay.dts
 @@ -0,0 +1,14 @@
@@ -11952,7 +11952,7 @@ 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
+index 000000000..0d83e344a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/dwc2-overlay.dts
 @@ -0,0 +1,26 @@
@@ -11984,7 +11984,7 @@ index 000000000000..0d83e344ad97
 +};
 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..f82b4d0e5047
+index 000000000..f82b4d0e5
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts
 @@ -0,0 +1,10 @@
@@ -12000,7 +12000,7 @@ index 000000000000..f82b4d0e5047
 +#include "edt-ft5406.dtsi"
 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..0473ff17f19f
+index 000000000..0473ff17f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/edt-ft5406.dtsi
 @@ -0,0 +1,55 @@
@@ -12061,7 +12061,7 @@ index 000000000000..0473ff17f19f
 +};
 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
+index 000000000..7af5c2e60
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/enc28j60-overlay.dts
 @@ -0,0 +1,53 @@
@@ -12120,7 +12120,7 @@ index 000000000000..7af5c2e607ea
 +};
 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
+index 000000000..17cb5b8fa
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts
 @@ -0,0 +1,47 @@
@@ -12173,7 +12173,7 @@ index 000000000000..17cb5b8fa485
 +};
 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
+index 000000000..6f087fb20
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/exc3000-overlay.dts
 @@ -0,0 +1,48 @@
@@ -12227,7 +12227,7 @@ index 000000000000..6f087fb20661
 +};
 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..743f14ae5768
+index 000000000..743f14ae5
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts
 @@ -0,0 +1,70 @@
@@ -12303,7 +12303,7 @@ index 000000000000..743f14ae5768
 +};
 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
+index 000000000..e9944f5cd
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/fsm-demo-overlay.dts
 @@ -0,0 +1,104 @@
@@ -12413,7 +12413,7 @@ index 000000000000..e9944f5cd258
 +};
 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..7509e00679c8
+index 000000000..7509e0067
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts
 @@ -0,0 +1,145 @@
@@ -12564,7 +12564,7 @@ index 000000000000..7509e00679c8
 +};
 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..8571527de49a
+index 000000000..8571527de
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/goodix-overlay.dts
 @@ -0,0 +1,46 @@
@@ -12616,7 +12616,7 @@ index 000000000000..8571527de49a
 +};
 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..e443be1f9a0e
+index 000000000..e443be1f9
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts
 @@ -0,0 +1,49 @@
@@ -12671,7 +12671,7 @@ index 000000000000..e443be1f9a0e
 +};
 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..77a7bbb41e3b
+index 000000000..77a7bbb41
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts
 @@ -0,0 +1,79 @@
@@ -12756,7 +12756,7 @@ index 000000000000..77a7bbb41e3b
 +};
 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
+index 000000000..162b6ce07
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts
 @@ -0,0 +1,49 @@
@@ -12811,7 +12811,7 @@ index 000000000000..162b6ce07dc9
 +};
 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
+index 000000000..3625431b7
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts
 @@ -0,0 +1,36 @@
@@ -12853,7 +12853,7 @@ index 000000000000..3625431b7560
 +};
 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..2e7253d1d0ab
+index 000000000..2e7253d1d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/gpio-key-overlay.dts
 @@ -0,0 +1,48 @@
@@ -12907,7 +12907,7 @@ index 000000000000..2e7253d1d0ab
 +};
 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
+index 000000000..d8e9d53f1
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/gpio-led-overlay.dts
 @@ -0,0 +1,97 @@
@@ -13010,7 +13010,7 @@ 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
+index 000000000..96cbe8082
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/gpio-no-bank0-irq-overlay.dts
 @@ -0,0 +1,14 @@
@@ -13030,7 +13030,7 @@ 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
+index 000000000..55f9bff3a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/gpio-no-irq-overlay.dts
 @@ -0,0 +1,14 @@
@@ -13050,7 +13050,7 @@ 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..416aa2bc797a
+index 000000000..416aa2bc7
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts
 @@ -0,0 +1,37 @@
@@ -13093,7 +13093,7 @@ index 000000000000..416aa2bc797a
 +};
 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
+index 000000000..da148064a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts
 @@ -0,0 +1,86 @@
@@ -13185,7 +13185,7 @@ index 000000000000..da148064aedd
 +};
 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
+index 000000000..ee726669f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hd44780-lcd-overlay.dts
 @@ -0,0 +1,46 @@
@@ -13237,7 +13237,7 @@ 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
+index 000000000..50b9a2665
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts
 @@ -0,0 +1,47 @@
@@ -13290,7 +13290,7 @@ index 000000000000..50b9a2665c80
 +};
 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..142518ab348b
+index 000000000..142518ab3
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts
 @@ -0,0 +1,39 @@
@@ -13335,7 +13335,7 @@ index 000000000000..142518ab348b
 +};
 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..ebdef55d6110
+index 000000000..ebdef55d6
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts
 @@ -0,0 +1,64 @@
@@ -13405,7 +13405,7 @@ index 000000000000..ebdef55d6110
 +};
 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..ea8a6c8f36c0
+index 000000000..ea8a6c8f3
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts
 @@ -0,0 +1,34 @@
@@ -13445,7 +13445,7 @@ index 000000000000..ea8a6c8f36c0
 +};
 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..ff19015ba656
+index 000000000..ff19015ba
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
 @@ -0,0 +1,65 @@
@@ -13516,7 +13516,7 @@ index 000000000000..ff19015ba656
 +};
 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..540563dec10f
+index 000000000..540563dec
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
 @@ -0,0 +1,72 @@
@@ -13594,7 +13594,7 @@ index 000000000000..540563dec10f
 +};
 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..cafa2ccd7ff7
+index 000000000..cafa2ccd7
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
 @@ -0,0 +1,65 @@
@@ -13665,7 +13665,7 @@ index 000000000000..cafa2ccd7ff7
 +};
 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..63432e8b983f
+index 000000000..63432e8b9
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts
 @@ -0,0 +1,34 @@
@@ -13705,7 +13705,7 @@ index 000000000000..63432e8b983f
 +};
 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..c5583e010339
+index 000000000..c5583e010
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts
 @@ -0,0 +1,106 @@
@@ -13817,7 +13817,7 @@ index 000000000000..c5583e010339
 +};
 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..a2309a50e8d8
+index 000000000..a2309a50e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts
 @@ -0,0 +1,41 @@
@@ -13864,7 +13864,7 @@ index 000000000000..a2309a50e8d8
 +};
 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..83de602e76ba
+index 000000000..83de602e7
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts
 @@ -0,0 +1,43 @@
@@ -13913,7 +13913,7 @@ index 000000000000..83de602e76ba
 +};
 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
+index 000000000..46cb76c2d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/highperi-overlay.dts
 @@ -0,0 +1,63 @@
@@ -13982,7 +13982,7 @@ 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..5843a5e9c86a
+index 000000000..5843a5e9c
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hy28a-overlay.dts
 @@ -0,0 +1,93 @@
@@ -14081,7 +14081,7 @@ index 000000000000..5843a5e9c86a
 +};
 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..95bfb1eadc20
+index 000000000..95bfb1ead
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts
 @@ -0,0 +1,152 @@
@@ -14239,7 +14239,7 @@ index 000000000000..95bfb1eadc20
 +};
 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..9edd0848d555
+index 000000000..9edd0848d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hy28b-overlay.dts
 @@ -0,0 +1,148 @@
@@ -14393,7 +14393,7 @@ index 000000000000..9edd0848d555
 +};
 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..0c4cff354674
+index 000000000..0c4cff354
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts
 @@ -0,0 +1,39 @@
@@ -14438,7 +14438,7 @@ index 000000000000..0c4cff354674
 +};
 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
+index 000000000..8204b6b3a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts
 @@ -0,0 +1,13 @@
@@ -14457,7 +14457,7 @@ index 000000000000..8204b6b3aef8
 +};
 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
+index 000000000..63231b5d7
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
 @@ -0,0 +1,47 @@
@@ -14510,7 +14510,7 @@ index 000000000000..63231b5d7c0c
 +};
 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..112aed91ecb2
+index 000000000..112aed91e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts
 @@ -0,0 +1,139 @@
@@ -14655,7 +14655,7 @@ index 000000000000..112aed91ecb2
 +};
 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..9bb16465a50e
+index 000000000..9bb16465a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts
 @@ -0,0 +1,26 @@
@@ -14687,7 +14687,7 @@ index 000000000000..9bb16465a50e
 +};
 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..7f749fc2d802
+index 000000000..7f749fc2d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi
 @@ -0,0 +1,323 @@
@@ -15016,7 +15016,7 @@ index 000000000000..7f749fc2d802
 +};
 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
+index 000000000..c83480c1c
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts
 @@ -0,0 +1,31 @@
@@ -15053,7 +15053,7 @@ index 000000000000..c83480c1c327
 +};
 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..1eae9e1a5c96
+index 000000000..1eae9e1a5
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
 @@ -0,0 +1,34 @@
@@ -15093,7 +15093,7 @@ index 000000000000..1eae9e1a5c96
 +};
 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..b05b0fa91942
+index 000000000..b05b0fa91
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
 @@ -0,0 +1,320 @@
@@ -15419,7 +15419,7 @@ index 000000000000..b05b0fa91942
 +};
 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
+index 000000000..46bf1bf2d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c0-overlay.dts
 @@ -0,0 +1,83 @@
@@ -15508,7 +15508,7 @@ index 000000000000..46bf1bf2dc5c
 +};
 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
+index 000000000..addaed73e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c1-overlay.dts
 @@ -0,0 +1,44 @@
@@ -15558,7 +15558,7 @@ index 000000000000..addaed73e665
 +};
 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..e24a1df21f99
+index 000000000..e24a1df21
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c3-overlay.dts
 @@ -0,0 +1,36 @@
@@ -15600,7 +15600,7 @@ index 000000000000..e24a1df21f99
 +};
 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..14c7f4d1da4c
+index 000000000..14c7f4d1d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c4-overlay.dts
 @@ -0,0 +1,36 @@
@@ -15642,7 +15642,7 @@ index 000000000000..14c7f4d1da4c
 +};
 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..7953621112de
+index 000000000..795362111
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c5-overlay.dts
 @@ -0,0 +1,36 @@
@@ -15684,7 +15684,7 @@ index 000000000000..7953621112de
 +};
 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..555305a7ee1f
+index 000000000..555305a7e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c6-overlay.dts
 @@ -0,0 +1,36 @@
@@ -15726,7 +15726,7 @@ index 000000000000..555305a7ee1f
 +};
 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
+index 000000000..cf43094c6
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2s-gpio28-31-overlay.dts
 @@ -0,0 +1,18 @@
@@ -15750,7 +15750,7 @@ index 000000000000..cf43094c6ff4
 +};
 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..551aba591d26
+index 000000000..551aba591
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ilitek251x-overlay.dts
 @@ -0,0 +1,45 @@
@@ -15801,7 +15801,7 @@ index 000000000000..551aba591d26
 +};
 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..0c065bf09f54
+index 000000000..0c065bf09
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts
 @@ -0,0 +1,115 @@
@@ -15922,7 +15922,7 @@ index 000000000000..0c065bf09f54
 +};
 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..e536aa7f9e33
+index 000000000..e536aa7f9
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/imx290-overlay.dts
 @@ -0,0 +1,32 @@
@@ -15960,7 +15960,7 @@ index 000000000000..e536aa7f9e33
 +};
 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..d4a5ed6dbbcf
+index 000000000..d4a5ed6db
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
 @@ -0,0 +1,144 @@
@@ -16110,7 +16110,7 @@ index 000000000000..d4a5ed6dbbcf
 +};
 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..74c7288d12f5
+index 000000000..74c7288d1
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/imx378-overlay.dts
 @@ -0,0 +1,10 @@
@@ -16126,7 +16126,7 @@ index 000000000000..74c7288d12f5
 +};
 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..ca315d120e6b
+index 000000000..ca315d120
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/imx477-overlay.dts
 @@ -0,0 +1,10 @@
@@ -16142,7 +16142,7 @@ index 000000000000..ca315d120e6b
 +};
 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..bb9a9acdbbd7
+index 000000000..bb9a9acdb
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
 @@ -0,0 +1,110 @@
@@ -16258,7 +16258,7 @@ index 000000000000..bb9a9acdbbd7
 +};
 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..9110f5d34298
+index 000000000..9110f5d34
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts
 @@ -0,0 +1,42 @@
@@ -16306,7 +16306,7 @@ index 000000000000..9110f5d34298
 +};
 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..24073cadd0ef
+index 000000000..24073cadd
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts
 @@ -0,0 +1,46 @@
@@ -16358,7 +16358,7 @@ index 000000000000..24073cadd0ef
 +};
 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..7c70b25e58d7
+index 000000000..7c70b25e5
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts
 @@ -0,0 +1,49 @@
@@ -16413,7 +16413,7 @@ index 000000000000..7c70b25e58d7
 +};
 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..ee54095c869b
+index 000000000..ee54095c8
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts
 @@ -0,0 +1,47 @@
@@ -16466,7 +16466,7 @@ index 000000000000..ee54095c869b
 +};
 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..e926e18e71fc
+index 000000000..e926e18e7
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts
 @@ -0,0 +1,85 @@
@@ -16557,7 +16557,7 @@ index 000000000000..e926e18e71fc
 +};
 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..585c7dbcdf7f
+index 000000000..585c7dbcd
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts
 @@ -0,0 +1,309 @@
@@ -16872,7 +16872,7 @@ index 000000000000..585c7dbcdf7f
 +
 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..9c42670631c0
+index 000000000..9c4267063
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/justboom-both-overlay.dts
 @@ -0,0 +1,65 @@
@@ -16943,7 +16943,7 @@ index 000000000000..9c42670631c0
 +};
 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..d00515dca419
+index 000000000..d00515dca
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts
 @@ -0,0 +1,46 @@
@@ -16995,7 +16995,7 @@ index 000000000000..d00515dca419
 +};
 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..e73336029c54
+index 000000000..e73336029
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts
 @@ -0,0 +1,41 @@
@@ -17042,7 +17042,7 @@ index 000000000000..e73336029c54
 +};
 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
+index 000000000..6d971f364
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ltc294x-overlay.dts
 @@ -0,0 +1,86 @@
@@ -17134,7 +17134,7 @@ index 000000000000..6d971f3649ca
 +};
 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..9e2afb05b7cb
+index 000000000..9e2afb05b
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/max98357a-overlay.dts
 @@ -0,0 +1,84 @@
@@ -17224,7 +17224,7 @@ index 000000000000..9e2afb05b7cb
 +};
 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
+index 000000000..9964e246c
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/maxtherm-overlay.dts
 @@ -0,0 +1,186 @@
@@ -17416,7 +17416,7 @@ index 000000000000..9964e246c14f
 +};
 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..840dd9b31db4
+index 000000000..840dd9b31
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts
 @@ -0,0 +1,64 @@
@@ -17486,7 +17486,7 @@ index 000000000000..840dd9b31db4
 +};
 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..c546d8ba7e6d
+index 000000000..c546d8ba7
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts
 @@ -0,0 +1,69 @@
@@ -17561,7 +17561,7 @@ index 000000000000..c546d8ba7e6d
 +
 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..484d64b225fb
+index 000000000..484d64b22
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts
 @@ -0,0 +1,732 @@
@@ -18299,7 +18299,7 @@ index 000000000000..484d64b225fb
 +
 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
+index 000000000..46f143d80
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts
 @@ -0,0 +1,73 @@
@@ -18378,7 +18378,7 @@ index 000000000000..46f143d809cc
 +};
 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
+index 000000000..0a8dd5768
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts
 @@ -0,0 +1,73 @@
@@ -18457,7 +18457,7 @@ index 000000000000..0a8dd576818e
 +};
 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
+index 000000000..65c861bbd
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts
 @@ -0,0 +1,226 @@
@@ -18689,7 +18689,7 @@ index 000000000000..65c861bbd340
 +};
 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
+index 000000000..957fdb931
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts
 @@ -0,0 +1,205 @@
@@ -18900,7 +18900,7 @@ index 000000000000..957fdb9310af
 +};
 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
+index 000000000..8e4e9f60f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mcp3202-overlay.dts
 @@ -0,0 +1,205 @@
@@ -19111,7 +19111,7 @@ index 000000000000..8e4e9f60f285
 +};
 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
+index 000000000..714eca5a4
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mcp342x-overlay.dts
 @@ -0,0 +1,164 @@
@@ -19281,7 +19281,7 @@ 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..1b56963f4f16
+index 000000000..1b56963f4
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/media-center-overlay.dts
 @@ -0,0 +1,134 @@
@@ -19421,7 +19421,7 @@ index 000000000000..1b56963f4f16
 +};
 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..4501fbdc253d
+index 000000000..4501fbdc2
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/merus-amp-overlay.dts
 @@ -0,0 +1,60 @@
@@ -19487,7 +19487,7 @@ index 000000000000..4501fbdc253d
 +};
 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
+index 000000000..f7e44d29e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts
 @@ -0,0 +1,36 @@
@@ -19529,7 +19529,7 @@ index 000000000000..f7e44d29e101
 +};
 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
+index 000000000..e0bc410ac
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/midi-uart1-overlay.dts
 @@ -0,0 +1,43 @@
@@ -19578,7 +19578,7 @@ index 000000000000..e0bc410acbff
 +};
 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..66f3092e9a74
+index 000000000..66f3092e9
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/midi-uart2-overlay.dts
 @@ -0,0 +1,37 @@
@@ -19621,7 +19621,7 @@ index 000000000000..66f3092e9a74
 +
 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..55c6cb94f963
+index 000000000..55c6cb94f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/midi-uart3-overlay.dts
 @@ -0,0 +1,38 @@
@@ -19665,7 +19665,7 @@ index 000000000000..55c6cb94f963
 +
 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..5819df1a6b2e
+index 000000000..5819df1a6
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/midi-uart4-overlay.dts
 @@ -0,0 +1,38 @@
@@ -19709,7 +19709,7 @@ index 000000000000..5819df1a6b2e
 +
 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..a1d37f7103ff
+index 000000000..a1d37f710
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/midi-uart5-overlay.dts
 @@ -0,0 +1,38 @@
@@ -19753,7 +19753,7 @@ index 000000000000..a1d37f7103ff
 +
 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..b1a0a2a41f72
+index 000000000..b1a0a2a41
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/minipitft13-overlay.dts
 @@ -0,0 +1,70 @@
@@ -19829,7 +19829,7 @@ index 000000000000..b1a0a2a41f72
 +};
 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..da49f14a0940
+index 000000000..da49f14a0
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
 @@ -0,0 +1,93 @@
@@ -19928,7 +19928,7 @@ index 000000000000..da49f14a0940
 +};
 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
+index 000000000..c1a2f691a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mmc-overlay.dts
 @@ -0,0 +1,46 @@
@@ -19980,7 +19980,7 @@ index 000000000000..c1a2f691aa1e
 +};
 diff --git a/arch/arm/boot/dts/overlays/mpu6050-overlay.dts b/arch/arm/boot/dts/overlays/mpu6050-overlay.dts
 new file mode 100644
-index 000000000000..1b4c06535687
+index 000000000..1b4c06535
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mpu6050-overlay.dts
 @@ -0,0 +1,29 @@
@@ -20015,7 +20015,7 @@ index 000000000000..1b4c06535687
 +};
 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..6e00e8b2ddf2
+index 000000000..6e00e8b2d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mz61581-overlay.dts
 @@ -0,0 +1,117 @@
@@ -20138,7 +20138,7 @@ index 000000000000..6e00e8b2ddf2
 +};
 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..d7ed4703c9b0
+index 000000000..d7ed4703c
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
 @@ -0,0 +1,94 @@
@@ -20238,7 +20238,7 @@ index 000000000000..d7ed4703c9b0
 +};
 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..09dbeda39d06
+index 000000000..09dbeda39
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ov7251-overlay.dts
 @@ -0,0 +1,113 @@
@@ -20357,7 +20357,7 @@ index 000000000000..09dbeda39d06
 +};
 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..277236c03358
+index 000000000..277236c03
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ov9281-overlay.dts
 @@ -0,0 +1,113 @@
@@ -20476,7 +20476,7 @@ index 000000000000..277236c03358
 +};
 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..bc6e3bce22c7
+index 000000000..bc6e3bce2
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/overlay_map.dts
 @@ -0,0 +1,158 @@
@@ -20640,7 +20640,7 @@ index 000000000000..bc6e3bce22c7
 +};
 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..7b6bcfd49c86
+index 000000000..7b6bcfd49
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/papirus-overlay.dts
 @@ -0,0 +1,89 @@
@@ -20735,7 +20735,7 @@ index 000000000000..7b6bcfd49c86
 +};
 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..8b6ee44665ce
+index 000000000..8b6ee4466
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pca953x-overlay.dts
 @@ -0,0 +1,240 @@
@@ -20981,7 +20981,7 @@ index 000000000000..8b6ee44665ce
 +};
 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..cca3e83721b7
+index 000000000..cca3e8372
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pcie-32bit-dma-overlay.dts
 @@ -0,0 +1,18 @@
@@ -21005,7 +21005,7 @@ index 000000000000..cca3e83721b7
 +};
 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..9333a9b09772
+index 000000000..9333a9b09
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pibell-overlay.dts
 @@ -0,0 +1,81 @@
@@ -21092,7 +21092,7 @@ index 000000000000..9333a9b09772
 +};
 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
+index 000000000..532a85868
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pifacedigital-overlay.dts
 @@ -0,0 +1,144 @@
@@ -21242,7 +21242,7 @@ index 000000000000..532a858683d6
 +};
 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..51a20e54977f
+index 000000000..51a20e549
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pifi-40-overlay.dts
 @@ -0,0 +1,50 @@
@@ -21298,7 +21298,7 @@ index 000000000000..51a20e54977f
 +};
 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..67f50db7861a
+index 000000000..67f50db78
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pifi-dac-hd-overlay.dts
 @@ -0,0 +1,49 @@
@@ -21353,7 +21353,7 @@ index 000000000000..67f50db7861a
 +};
 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..645ea74cb435
+index 000000000..645ea74cb
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pifi-dac-zero-overlay.dts
 @@ -0,0 +1,49 @@
@@ -21408,7 +21408,7 @@ index 000000000000..645ea74cb435
 +};
 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..963597d611b5
+index 000000000..963597d61
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pifi-mini-210-overlay.dts
 @@ -0,0 +1,42 @@
@@ -21456,7 +21456,7 @@ index 000000000000..963597d611b5
 +};
 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
+index 000000000..075bceef1
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/piglow-overlay.dts
 @@ -0,0 +1,97 @@
@@ -21559,7 +21559,7 @@ index 000000000000..075bceef158c
 +};
 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..1ac75a248fab
+index 000000000..1ac75a248
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/piscreen-overlay.dts
 @@ -0,0 +1,102 @@
@@ -21667,7 +21667,7 @@ index 000000000000..1ac75a248fab
 +};
 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..9d2b51101969
+index 000000000..9d2b51101
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts
 @@ -0,0 +1,106 @@
@@ -21779,7 +21779,7 @@ index 000000000000..9d2b51101969
 +
 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..49efb2b768fb
+index 000000000..49efb2b76
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pisound-overlay.dts
 @@ -0,0 +1,120 @@
@@ -21905,7 +21905,7 @@ index 000000000000..49efb2b768fb
 +};
 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..589ad13795b1
+index 000000000..589ad1379
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
 @@ -0,0 +1,69 @@
@@ -21980,7 +21980,7 @@ index 000000000000..589ad13795b1
 +};
 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..33901ee1db7a
+index 000000000..33901ee1d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts
 @@ -0,0 +1,91 @@
@@ -22077,7 +22077,7 @@ index 000000000000..33901ee1db7a
 +};
 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..4a4a3f44c29d
+index 000000000..4a4a3f44c
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts
 @@ -0,0 +1,119 @@
@@ -22202,7 +22202,7 @@ index 000000000000..4a4a3f44c29d
 +};
 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..37629f18a740
+index 000000000..37629f18a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
 @@ -0,0 +1,119 @@
@@ -22327,7 +22327,7 @@ index 000000000000..37629f18a740
 +};
 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..524a1c1d3670
+index 000000000..524a1c1d3
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts
 @@ -0,0 +1,38 @@
@@ -22371,7 +22371,7 @@ index 000000000000..524a1c1d3670
 +};
 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..4ddbbfa04065
+index 000000000..4ddbbfa04
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts
 @@ -0,0 +1,49 @@
@@ -22426,7 +22426,7 @@ index 000000000000..4ddbbfa04065
 +};
 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..119caf746b3b
+index 000000000..119caf746
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pwm-ir-tx-overlay.dts
 @@ -0,0 +1,40 @@
@@ -22472,7 +22472,7 @@ index 000000000000..119caf746b3b
 +};
 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..92876ab3bc8c
+index 000000000..92876ab3b
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pwm-overlay.dts
 @@ -0,0 +1,45 @@
@@ -22523,7 +22523,7 @@ index 000000000000..92876ab3bc8c
 +};
 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..f695f36024fa
+index 000000000..f695f3602
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/qca7000-overlay.dts
 @@ -0,0 +1,55 @@
@@ -22584,7 +22584,7 @@ index 000000000000..f695f36024fa
 +};
 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..5dee70853289
+index 000000000..5dee70853
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/qca7000-uart0-overlay.dts
 @@ -0,0 +1,46 @@
@@ -22636,7 +22636,7 @@ index 000000000000..5dee70853289
 +};
 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
+index 000000000..ea1d95273
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts
 @@ -0,0 +1,59 @@
@@ -22701,7 +22701,7 @@ index 000000000000..ea1d952734e9
 +};
 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
+index 000000000..cac5e44c6
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts
 @@ -0,0 +1,21 @@
@@ -22728,7 +22728,7 @@ index 000000000000..cac5e44c6ec5
 +};
 diff --git a/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts b/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts
 new file mode 100644
-index 000000000000..ed0c2745399f
+index 000000000..ed0c27453
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts
 @@ -0,0 +1,172 @@
@@ -22906,7 +22906,7 @@ index 000000000000..ed0c2745399f
 +};
 diff --git a/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts b/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts
 new file mode 100644
-index 000000000000..07a915342702
+index 000000000..07a915342
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts
 @@ -0,0 +1,34 @@
@@ -22946,7 +22946,7 @@ index 000000000000..07a915342702
 +};
 diff --git a/arch/arm/boot/dts/overlays/rpi-display-overlay.dts b/arch/arm/boot/dts/overlays/rpi-display-overlay.dts
 new file mode 100644
-index 000000000000..de87432ff2be
+index 000000000..de87432ff
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-display-overlay.dts
 @@ -0,0 +1,91 @@
@@ -23043,7 +23043,7 @@ index 000000000000..de87432ff2be
 +};
 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
+index 000000000..8483c4f4b
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts
 @@ -0,0 +1,25 @@
@@ -23074,7 +23074,7 @@ index 000000000000..8483c4f4b2eb
 +};
 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..1eeac4854db4
+index 000000000..1eeac4854
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
 @@ -0,0 +1,102 @@
@@ -23182,7 +23182,7 @@ index 000000000000..1eeac4854db4
 +};
 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..011f92ad33f3
+index 000000000..011f92ad3
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts
 @@ -0,0 +1,23 @@
@@ -23211,7 +23211,7 @@ index 000000000000..011f92ad33f3
 +};
 diff --git a/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts b/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts
 new file mode 100644
-index 000000000000..9cda044a0f62
+index 000000000..9cda044a0
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts
 @@ -0,0 +1,39 @@
@@ -23256,7 +23256,7 @@ index 000000000000..9cda044a0f62
 +};
 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..89d8d2ea6b2e
+index 000000000..89d8d2ea6
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts
 @@ -0,0 +1,47 @@
@@ -23309,7 +23309,7 @@ index 000000000000..89d8d2ea6b2e
 +};
 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
+index 000000000..3c97a545d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts
 @@ -0,0 +1,34 @@
@@ -23349,7 +23349,7 @@ index 000000000000..3c97a545d820
 +};
 diff --git a/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts b/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts
 new file mode 100644
-index 000000000000..bdd1c0e5a915
+index 000000000..bdd1c0e5a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts
 @@ -0,0 +1,50 @@
@@ -23405,7 +23405,7 @@ index 000000000000..bdd1c0e5a915
 +};
 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..87e9a326eff1
+index 000000000..87e9a326e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts
 @@ -0,0 +1,49 @@
@@ -23460,7 +23460,7 @@ index 000000000000..87e9a326eff1
 +};
 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
+index 000000000..c51f1c030
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts
 @@ -0,0 +1,52 @@
@@ -23518,7 +23518,7 @@ index 000000000000..c51f1c030a55
 +};
 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..04d74d62897b
+index 000000000..04d74d628
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts
 @@ -0,0 +1,43 @@
@@ -23567,7 +23567,7 @@ index 000000000000..04d74d62897b
 +};
 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..da05e981314c
+index 000000000..da05e9813
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts
 @@ -0,0 +1,43 @@
@@ -23616,7 +23616,7 @@ index 000000000000..da05e981314c
 +};
 diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts
 new file mode 100644
-index 000000000000..a49a04722b99
+index 000000000..a49a04722
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts
 @@ -0,0 +1,49 @@
@@ -23671,7 +23671,7 @@ index 000000000000..a49a04722b99
 +};
 diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts
 new file mode 100644
-index 000000000000..730c6e8cd614
+index 000000000..730c6e8cd
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts
 @@ -0,0 +1,67 @@
@@ -23744,7 +23744,7 @@ index 000000000000..730c6e8cd614
 +};
 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
+index 000000000..0b72b4eea
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sdhost-overlay.dts
 @@ -0,0 +1,38 @@
@@ -23788,7 +23788,7 @@ index 000000000000..0b72b4eeac88
 +};
 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
+index 000000000..873e49056
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sdio-overlay.dts
 @@ -0,0 +1,77 @@
@@ -23871,7 +23871,7 @@ index 000000000000..873e49056379
 +};
 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
+index 000000000..210d027a0
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts
 @@ -0,0 +1,138 @@
@@ -24015,7 +24015,7 @@ 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..e843d0b19745
+index 000000000..e843d0b19
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v2-overlay.dts
 @@ -0,0 +1,117 @@
@@ -24138,7 +24138,7 @@ index 000000000000..e843d0b19745
 +};
 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
+index 000000000..57a0cc9b1
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts
 @@ -0,0 +1,84 @@
@@ -24228,7 +24228,7 @@ index 000000000000..57a0cc9b1741
 +};
 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
+index 000000000..90495f094
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/si446x-spi0-overlay.dts
 @@ -0,0 +1,53 @@
@@ -24287,7 +24287,7 @@ index 000000000000..90495f0941fb
 +};
 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
+index 000000000..bafab6c92
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/smi-dev-overlay.dts
 @@ -0,0 +1,20 @@
@@ -24313,7 +24313,7 @@ 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
+index 000000000..ae1e50329
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/smi-nand-overlay.dts
 @@ -0,0 +1,66 @@
@@ -24385,7 +24385,7 @@ 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
+index 000000000..bb8c7830d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/smi-overlay.dts
 @@ -0,0 +1,37 @@
@@ -24428,7 +24428,7 @@ 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
+index 000000000..a132b8637
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi-gpio35-39-overlay.dts
 @@ -0,0 +1,31 @@
@@ -24465,7 +24465,7 @@ 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
+index 000000000..9ebcaf1b5
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi-gpio40-45-overlay.dts
 @@ -0,0 +1,36 @@
@@ -24507,7 +24507,7 @@ 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..51b7fec281c0
+index 000000000..51b7fec28
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts
 @@ -0,0 +1,75 @@
@@ -24588,7 +24588,7 @@ index 000000000000..51b7fec281c0
 +};
 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
+index 000000000..e6eb66e20
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi0-1cs-overlay.dts
 @@ -0,0 +1,42 @@
@@ -24636,7 +24636,7 @@ index 000000000000..e6eb66e2076a
 +};
 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
+index 000000000..df6519537
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi0-2cs-overlay.dts
 @@ -0,0 +1,37 @@
@@ -24679,7 +24679,7 @@ index 000000000000..df6519537c3a
 +};
 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
+index 000000000..ea2794bc5
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts
 @@ -0,0 +1,57 @@
@@ -24742,7 +24742,7 @@ index 000000000000..ea2794bc5fd5
 +};
 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
+index 000000000..dab34ee79
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts
 @@ -0,0 +1,69 @@
@@ -24817,7 +24817,7 @@ index 000000000000..dab34ee79ae2
 +};
 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
+index 000000000..bc7e7d043
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi1-3cs-overlay.dts
 @@ -0,0 +1,81 @@
@@ -24904,7 +24904,7 @@ index 000000000000..bc7e7d04324b
 +};
 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
+index 000000000..2a2975046
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi2-1cs-overlay.dts
 @@ -0,0 +1,57 @@
@@ -24967,7 +24967,7 @@ index 000000000000..2a29750462af
 +};
 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
+index 000000000..642678fc9
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi2-2cs-overlay.dts
 @@ -0,0 +1,69 @@
@@ -25042,7 +25042,7 @@ index 000000000000..642678fc9ddd
 +};
 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
+index 000000000..28d40c6c3
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi2-3cs-overlay.dts
 @@ -0,0 +1,81 @@
@@ -25129,7 +25129,7 @@ index 000000000000..28d40c6c3c37
 +};
 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..335af8637051
+index 000000000..335af8637
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts
 @@ -0,0 +1,44 @@
@@ -25179,7 +25179,7 @@ index 000000000000..335af8637051
 +};
 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..ce65da27f767
+index 000000000..ce65da27f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts
 @@ -0,0 +1,56 @@
@@ -25241,7 +25241,7 @@ index 000000000000..ce65da27f767
 +};
 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..85d70b40352b
+index 000000000..85d70b403
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts
 @@ -0,0 +1,44 @@
@@ -25291,7 +25291,7 @@ index 000000000000..85d70b40352b
 +};
 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..8bc2215a6a7e
+index 000000000..8bc2215a6
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts
 @@ -0,0 +1,56 @@
@@ -25353,7 +25353,7 @@ index 000000000000..8bc2215a6a7e
 +};
 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..c0f8cb8510ee
+index 000000000..c0f8cb851
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts
 @@ -0,0 +1,44 @@
@@ -25403,7 +25403,7 @@ index 000000000000..c0f8cb8510ee
 +};
 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..7758b9c00b4e
+index 000000000..7758b9c00
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts
 @@ -0,0 +1,56 @@
@@ -25465,7 +25465,7 @@ index 000000000000..7758b9c00b4e
 +};
 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..8c8a953eca01
+index 000000000..8c8a953ec
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts
 @@ -0,0 +1,44 @@
@@ -25515,7 +25515,7 @@ index 000000000000..8c8a953eca01
 +};
 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..2ff897f21aed
+index 000000000..2ff897f21
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts
 @@ -0,0 +1,56 @@
@@ -25577,7 +25577,7 @@ index 000000000000..2ff897f21aed
 +};
 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..84cf10e489d3
+index 000000000..84cf10e48
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ssd1306-overlay.dts
 @@ -0,0 +1,36 @@
@@ -25619,7 +25619,7 @@ index 000000000000..84cf10e489d3
 +};
 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..ffc90c7cecf6
+index 000000000..ffc90c7ce
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts
 @@ -0,0 +1,84 @@
@@ -25709,7 +25709,7 @@ index 000000000000..ffc90c7cecf6
 +};
 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
+index 000000000..9fd5ebf2f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ssd1331-spi-overlay.dts
 @@ -0,0 +1,83 @@
@@ -25798,7 +25798,7 @@ index 000000000000..9fd5ebf2feda
 +};
 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
+index 000000000..ffc872c60
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts
 @@ -0,0 +1,83 @@
@@ -25887,7 +25887,7 @@ index 000000000000..ffc872c60648
 +};
 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..bad61535981e
+index 000000000..bad615359
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts
 @@ -0,0 +1,73 @@
@@ -25966,7 +25966,7 @@ index 000000000000..bad61535981e
 +};
 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..1d1069345da2
+index 000000000..1d1069345
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sx150x-overlay.dts
 @@ -0,0 +1,1706 @@
@@ -27678,7 +27678,7 @@ index 000000000000..1d1069345da2
 +
 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..047695bb0c71
+index 000000000..047695bb0
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts
 @@ -0,0 +1,52 @@
@@ -27736,7 +27736,7 @@ index 000000000000..047695bb0c71
 +};
 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..a1f8af36d2e7
+index 000000000..a1f8af36d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
 @@ -0,0 +1,107 @@
@@ -27849,7 +27849,7 @@ index 000000000000..a1f8af36d2e7
 +};
 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..a102b09e3ab5
+index 000000000..a102b09e3
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts
 @@ -0,0 +1,222 @@
@@ -28077,7 +28077,7 @@ index 000000000000..a102b09e3ab5
 +};
 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
+index 000000000..e69188503
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/tpm-slb9670-overlay.dts
 @@ -0,0 +1,44 @@
@@ -28127,7 +28127,7 @@ index 000000000000..e69188503ca3
 +};
 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..73d563bbaabf
+index 000000000..73d563bba
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/uart0-overlay.dts
 @@ -0,0 +1,32 @@
@@ -28165,7 +28165,7 @@ index 000000000000..73d563bbaabf
 +};
 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..986d725a2652
+index 000000000..986d725a2
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/uart1-overlay.dts
 @@ -0,0 +1,38 @@
@@ -28209,7 +28209,7 @@ index 000000000000..986d725a2652
 +};
 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..9face240aca1
+index 000000000..9face240a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/uart2-overlay.dts
 @@ -0,0 +1,27 @@
@@ -28242,7 +28242,7 @@ index 000000000000..9face240aca1
 +};
 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..ae9f9fe5ea1d
+index 000000000..ae9f9fe5e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/uart3-overlay.dts
 @@ -0,0 +1,27 @@
@@ -28275,7 +28275,7 @@ index 000000000000..ae9f9fe5ea1d
 +};
 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..ac004ffbadbf
+index 000000000..ac004ffba
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/uart4-overlay.dts
 @@ -0,0 +1,27 @@
@@ -28308,7 +28308,7 @@ index 000000000000..ac004ffbadbf
 +};
 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..04eaf376effe
+index 000000000..04eaf376e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/uart5-overlay.dts
 @@ -0,0 +1,27 @@
@@ -28341,7 +28341,7 @@ index 000000000000..04eaf376effe
 +};
 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..ae7c37996894
+index 000000000..ae7c37996
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/udrc-overlay.dts
 @@ -0,0 +1,128 @@
@@ -28475,7 +28475,7 @@ index 000000000000..ae7c37996894
 +};
 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..fc8d9b118068
+index 000000000..fc8d9b118
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ugreen-dabboard-overlay.dts
 @@ -0,0 +1,49 @@
@@ -28530,7 +28530,7 @@ index 000000000000..fc8d9b118068
 +};
 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..7c4071a7cb27
+index 000000000..7c4071a7c
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts
 @@ -0,0 +1,101 @@
@@ -28637,7 +28637,7 @@ index 000000000000..7c4071a7cb27
 +};
 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..f4328634542e
+index 000000000..f43286345
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
 @@ -0,0 +1,137 @@
@@ -28780,7 +28780,7 @@ index 000000000000..f4328634542e
 +};
 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..ca344492bed8
+index 000000000..ca344492b
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
 @@ -0,0 +1,40 @@
@@ -28826,7 +28826,7 @@ index 000000000000..ca344492bed8
 +};
 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..7792ead0cbb3
+index 000000000..7792ead0c
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts
 @@ -0,0 +1,44 @@
@@ -28876,7 +28876,7 @@ index 000000000000..7792ead0cbb3
 +};
 diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-at056tn53v1-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dpi-at056tn53v1-overlay.dts
 new file mode 100644
-index 000000000000..f7181c9828bf
+index 000000000..f7181c982
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-at056tn53v1-overlay.dts
 @@ -0,0 +1,44 @@
@@ -28926,7 +28926,7 @@ index 000000000000..f7181c9828bf
 +};
 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..ecd3bef3d65a
+index 000000000..ecd3bef3d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts
 @@ -0,0 +1,118 @@
@@ -29050,7 +29050,7 @@ index 000000000000..ecd3bef3d65a
 +};
 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..d7b8f6713804
+index 000000000..d7b8f6713
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-overlay.dts
 @@ -0,0 +1,69 @@
@@ -29125,7 +29125,7 @@ index 000000000000..d7b8f6713804
 +};
 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
+index 000000000..5dcd0f224
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-v2-overlay.dts
 @@ -0,0 +1,64 @@
@@ -29195,7 +29195,7 @@ index 000000000000..5dcd0f2243e2
 +};
 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..b03394844abd
+index 000000000..b03394844
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts
 @@ -0,0 +1,43 @@
@@ -29244,7 +29244,7 @@ index 000000000000..b03394844abd
 +};
 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..5a4efdeed663
+index 000000000..5a4efdeed
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
 @@ -0,0 +1,123 @@
@@ -29373,7 +29373,7 @@ index 000000000000..5a4efdeed663
 +};
 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..4285e12a4e53
+index 000000000..4285e12a4
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
 @@ -0,0 +1,197 @@
@@ -29576,7 +29576,7 @@ index 000000000000..4285e12a4e53
 +};
 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..6e787099e861
+index 000000000..6e787099e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-vga666-overlay.dts
 @@ -0,0 +1,100 @@
@@ -29682,7 +29682,7 @@ index 000000000000..6e787099e861
 +};
 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
+index 000000000..a4968d180
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/vga666-overlay.dts
 @@ -0,0 +1,30 @@
@@ -29718,7 +29718,7 @@ index 000000000000..a4968d180a5d
 +};
 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
+index 000000000..f44e325bc
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts
 @@ -0,0 +1,40 @@
@@ -29764,7 +29764,7 @@ index 000000000000..f44e325bc1f2
 +};
 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
+index 000000000..953c6a1ae
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts
 @@ -0,0 +1,42 @@
@@ -29812,7 +29812,7 @@ index 000000000000..953c6a1aeab9
 +};
 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
+index 000000000..4d3e66296
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/w5500-overlay.dts
 @@ -0,0 +1,63 @@
@@ -29881,7 +29881,7 @@ index 000000000000..4d3e66296753
 +};
 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
+index 000000000..71ce80618
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/wittypi-overlay.dts
 @@ -0,0 +1,44 @@
@@ -29931,7 +29931,7 @@ 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..289fa4dacdf1
+index 000000000..289fa4dac
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts
 @@ -0,0 +1,82 @@
@@ -30018,7 +30018,7 @@ index 000000000000..289fa4dacdf1
 +	};
 +};
 diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
-index 639e01a4d855..becca30ad4fe 100644
+index 639e01a4d..becca30ad 100644
 --- a/arch/arm64/boot/dts/Makefile
 +++ b/arch/arm64/boot/dts/Makefile
 @@ -30,3 +30,5 @@ subdir-y += synaptics
@@ -30028,7 +30028,7 @@ index 639e01a4d855..becca30ad4fe 100644
 +
 +subdir-y += overlays
 diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
-index 11eae3e3a944..5a90727064ee 100644
+index 11eae3e3a..5a9072706 100644
 --- a/arch/arm64/boot/dts/broadcom/Makefile
 +++ b/arch/arm64/boot/dts/broadcom/Makefile
 @@ -5,7 +5,19 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb \
@@ -30053,34 +30053,34 @@ index 11eae3e3a944..5a90727064ee 100644
 +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..36ecea71f0ef
+index 000000000..36ecea71f
 --- /dev/null
 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts
 @@ -0,0 +1 @@
 +#include "../../../../arm/boot/dts/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..22fc6a82f2a9
+index 000000000..22fc6a82f
 --- /dev/null
 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
 @@ -0,0 +1 @@
 +#include "../../../../arm/boot/dts/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..4cacc5b72ae3
+index 000000000..4cacc5b72
 --- /dev/null
 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts
 @@ -0,0 +1 @@
 +#include "../../../../arm/boot/dts/bcm2710-rpi-3-b.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..e1e13784cff6
+index 000000000..e1e13784c
 --- /dev/null
 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts
 @@ -0,0 +1 @@
 +#include "../../../../arm/boot/dts/bcm2710-rpi-cm3.dts"
 diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts
-index d24c53682e44..bf69a4b0b172 100644
+index d24c53682..bf69a4b0b 100644
 --- a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts
 +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts
 @@ -1,2 +1 @@
@@ -30088,7 +30088,7 @@ index d24c53682e44..bf69a4b0b172 100644
 -#include "arm/bcm2711-rpi-4-b.dts"
 +#include "../../../../arm/boot/dts/bcm2711-rpi-4-b.dts"
 diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts
-index b9000f58beb5..90c2b5a195d4 100644
+index b9000f58b..90c2b5a19 100644
 --- a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts
 +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts
 @@ -1,2 +1 @@
@@ -30097,14 +30097,14 @@ index b9000f58beb5..90c2b5a195d4 100644
 +#include "../../../../arm/boot/dts/bcm2711-rpi-400.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..8064a58155f1
+index 000000000..8064a5815
 --- /dev/null
 +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts
 @@ -0,0 +1 @@
 +#include "../../../../arm/boot/dts/bcm2711-rpi-cm4.dts"
 diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi
 new file mode 120000
-index 000000000000..e5c400284467
+index 000000000..e5c400284
 --- /dev/null
 +++ b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi
 @@ -0,0 +1 @@
@@ -30112,7 +30112,7 @@ index 000000000000..e5c400284467
 \ No newline at end of file
 diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi
 new file mode 120000
-index 000000000000..fc4c05bbe7fd
+index 000000000..fc4c05bbe
 --- /dev/null
 +++ b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi
 @@ -0,0 +1 @@
@@ -30120,14 +30120,14 @@ index 000000000000..fc4c05bbe7fd
 \ No newline at end of file
 diff --git a/arch/arm64/boot/dts/overlays b/arch/arm64/boot/dts/overlays
 new file mode 120000
-index 000000000000..ded08646b6f6
+index 000000000..ded08646b
 --- /dev/null
 +++ b/arch/arm64/boot/dts/overlays
 @@ -0,0 +1 @@
 +../../../arm/boot/dts/overlays
 \ No newline at end of file
 diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
-index 190d781e84f4..84c46c081218 100644
+index 190d781e8..84c46c081 100644
 --- a/scripts/Makefile.dtbinst
 +++ b/scripts/Makefile.dtbinst
 @@ -18,9 +18,10 @@ include $(srctree)/scripts/Kbuild.include
@@ -30143,7 +30143,7 @@ index 190d781e84f4..84c46c081218 100644
  
  quiet_cmd_dtb_install = INSTALL $@
 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index 54582673fc1a..d1550a5b57bd 100644
+index 54582673f..d1550a5b5 100644
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
 @@ -311,6 +311,7 @@ DTC_FLAGS += -Wno-interrupt_provider
@@ -30174,5 +30174,5 @@ index 54582673fc1a..d1550a5b57bd 100644
  
  # Bzip2
 -- 
-2.33.1
+2.30.2
 
diff --git a/root/target/linux/bcm27xx/patches-5.15/0087-leds-Add-the-input-trigger-for-pwr_led.patch b/root/target/linux/bcm27xx/patches-5.15/950-0079-leds-Add-the-input-trigger-for-pwr_led.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0087-leds-Add-the-input-trigger-for-pwr_led.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0079-leds-Add-the-input-trigger-for-pwr_led.patch
index 202aed0f..07cf1c83 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0087-leds-Add-the-input-trigger-for-pwr_led.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0079-leds-Add-the-input-trigger-for-pwr_led.patch
@@ -1,7 +1,7 @@
-From baefc74faad90d99d7aa0cb697a468b404f97376 Mon Sep 17 00:00:00 2001
+From 29cdb6ce49510953f22f4bcab8904ca64ea2b003 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Fri, 6 Feb 2015 13:50:57 +0000
-Subject: [PATCH 087/634] leds: Add the "input" trigger, for pwr_led
+Subject: [PATCH 079/828] leds: Add the "input" trigger, for pwr_led
 
 The "input" trigger makes the associated GPIO an input.  This is to support
 the Raspberry Pi PWR LED, which is driven by external hardware in normal use.
@@ -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 092eb59a7d32..9e5327056b7a 100644
 --- a/drivers/leds/leds-gpio.c
 +++ b/drivers/leds/leds-gpio.c
-@@ -47,8 +47,15 @@ static void gpio_led_set(struct led_classdev *led_cdev,
+@@ -47,8 +47,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 092eb59a7d32..9e5327056b7a 100644
  			gpiod_set_value_cansleep(led_dat->gpiod, level);
  		else
  			gpiod_set_value(led_dat->gpiod, level);
-@@ -62,6 +69,13 @@ static int gpio_led_set_blocking(struct led_classdev *led_cdev,
+@@ -62,6 +69,13 @@ static int gpio_led_set_blocking(struct
  	return 0;
  }
  
@@ -64,7 +62,7 @@ index 092eb59a7d32..9e5327056b7a 100644
  static int gpio_blink_set(struct led_classdev *led_cdev,
  	unsigned long *delay_on, unsigned long *delay_off)
  {
-@@ -90,6 +104,7 @@ static int create_gpio_led(const struct gpio_led *template,
+@@ -90,6 +104,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 092eb59a7d32..9e5327056b7a 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 1f1d57288085..1d8341f3a6fe 100644
 --- a/drivers/leds/trigger/Kconfig
 +++ b/drivers/leds/trigger/Kconfig
 @@ -114,6 +114,13 @@ config LEDS_TRIGGER_CAMERA
@@ -90,11 +86,9 @@ index 1f1d57288085..1d8341f3a6fe 100644
  config LEDS_TRIGGER_PANIC
  	bool "LED Panic Trigger"
  	help
-diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile
-index 25c4db97cdd4..5b6bc14865ea 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 25c4db97cdd4..5b6bc14865ea 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 <phil@raspberrypi.org>");
 +MODULE_DESCRIPTION("Set LED GPIO to Input \"trigger\"");
 +MODULE_LICENSE("GPL");
-diff --git a/include/linux/leds.h b/include/linux/leds.h
-index a0b730be40ad..cb9a65b4b0f4 100644
 --- a/include/linux/leds.h
 +++ b/include/linux/leds.h
 @@ -85,6 +85,9 @@ struct led_classdev {
@@ -177,6 +166,3 @@ index a0b730be40ad..cb9a65b4b0f4 100644
  
  	/* set_brightness_work / blink_timer flags, atomic, private. */
  	unsigned long		work_flags;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0088-Added-Device-IDs-for-August-DVB-T-205.patch b/root/target/linux/bcm27xx/patches-5.15/950-0080-Added-Device-IDs-for-August-DVB-T-205.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0088-Added-Device-IDs-for-August-DVB-T-205.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0080-Added-Device-IDs-for-August-DVB-T-205.patch
index 9befb449..34d8bc57 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0088-Added-Device-IDs-for-August-DVB-T-205.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0080-Added-Device-IDs-for-August-DVB-T-205.patch
@@ -1,17 +1,15 @@
-From 169f2d56546c42705e0dedf2c72bb709c8f1f3df Mon Sep 17 00:00:00 2001
+From 5569c5f9c6f7b1eed2f6ae78f7dca6fae744dbbd Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 3 Jul 2013 00:54:08 +0100
-Subject: [PATCH 088/634] Added Device IDs for August DVB-T 205
+Subject: [PATCH 080/828] 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 795a012d4020..adb1028d5f25 100644
 --- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
 +++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
-@@ -1944,6 +1944,10 @@ static const struct usb_device_id rtl28xxu_id_table[] = {
+@@ -1944,6 +1944,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 795a012d4020..adb1028d5f25 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.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0089-Improve-__copy_to_user-and-__copy_from_user-performa.patch b/root/target/linux/bcm27xx/patches-5.15/950-0081-Improve-__copy_to_user-and-__copy_from_user-performa.patch
similarity index 95%
rename from root/target/linux/bcm27xx/patches-5.15/0089-Improve-__copy_to_user-and-__copy_from_user-performa.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0081-Improve-__copy_to_user-and-__copy_from_user-performa.patch
index 9ebf24fc..e95ad9d3 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0089-Improve-__copy_to_user-and-__copy_from_user-performa.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0081-Improve-__copy_to_user-and-__copy_from_user-performa.patch
@@ -1,7 +1,7 @@
-From 97118e2a5f27a942217a79262ff6b4d7411eef25 Mon Sep 17 00:00:00 2001
+From 38408d71937535a016902abdd26e84acb692d1d8 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 28 Nov 2016 16:50:04 +0000
-Subject: [PATCH 089/634] Improve __copy_to_user and __copy_from_user
+Subject: [PATCH 081/828] Improve __copy_to_user and __copy_from_user
  performance
 
 Provide a __copy_from_user that uses memcpy. On BCM2708, use
@@ -62,11 +62,9 @@ Signed-off-by: Christopher Blake <chrisrblake93@gmail.com>
  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 6c607c68f3ad..ba7fc0bc9a15 100644
 --- a/arch/arm/include/asm/string.h
 +++ b/arch/arm/include/asm/string.h
-@@ -65,4 +65,9 @@ static inline void *memset64(uint64_t *p, uint64_t v, __kernel_size_t n)
+@@ -65,4 +65,9 @@ static inline void *memset64(uint64_t *p
  
  #endif
  
@@ -76,11 +74,9 @@ index 6c607c68f3ad..ba7fc0bc9a15 100644
 +#endif
 +
  #endif
-diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
-index 36fbc3329252..464c66519909 100644
 --- a/arch/arm/include/asm/uaccess.h
 +++ b/arch/arm/include/asm/uaccess.h
-@@ -523,6 +523,9 @@ do {									\
+@@ -529,6 +529,9 @@ do {									\
  extern unsigned long __must_check
  arm_copy_from_user(void *to, const void __user *from, unsigned long n);
  
@@ -90,8 +86,6 @@ index 36fbc3329252..464c66519909 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 6d2ba454f25b..8271cde92dec 100644
 --- a/arch/arm/lib/Makefile
 +++ b/arch/arm/lib/Makefile
 @@ -7,8 +7,8 @@
@@ -122,9 +116,6 @@ index 6d2ba454f25b..8271cde92dec 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 @@
@@ -287,8 +278,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 480a20766137..d24527ef904b 100644
 --- a/arch/arm/lib/copy_from_user.S
 +++ b/arch/arm/lib/copy_from_user.S
 @@ -107,7 +107,8 @@
@@ -309,9 +298,6 @@ index 480a20766137..d24527ef904b 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 @@
@@ -352,9 +338,6 @@ index 000000000000..1f826047db75
 +#include <linux/module.h>
 +
 +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 @@
@@ -643,9 +626,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..30f8a9089a83
 --- /dev/null
 +++ b/arch/arm/lib/memcpy_rpi.S
 @@ -0,0 +1,61 @@
@@ -710,9 +690,6 @@ index 000000000000..30f8a9089a83
 +        memcpy  0
 +ENDPROC(memcpy)
 +ENDPROC(mmiocpy)
-diff --git a/arch/arm/lib/memcpymove.h b/arch/arm/lib/memcpymove.h
-new file mode 100644
-index 000000000000..d8be5849c860
 --- /dev/null
 +++ b/arch/arm/lib/memcpymove.h
 @@ -0,0 +1,506 @@
@@ -1222,9 +1199,6 @@ index 000000000000..d8be5849c860
 +        .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..8b0760c0904c
 --- /dev/null
 +++ b/arch/arm/lib/memmove_rpi.S
 @@ -0,0 +1,61 @@
@@ -1289,9 +1263,6 @@ index 000000000000..8b0760c0904c
 +        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..e8469cecabc1
 --- /dev/null
 +++ b/arch/arm/lib/memset_rpi.S
 @@ -0,0 +1,128 @@
@@ -1423,8 +1394,6 @@ index 000000000000..e8469cecabc1
 +ENDPROC(__memset32)
 +ENDPROC(memset)
 +ENDPROC(mmioset)
-diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
-index 106f83a5ea6d..b483e5713039 100644
 --- a/arch/arm/lib/uaccess_with_memcpy.c
 +++ b/arch/arm/lib/uaccess_with_memcpy.c
 @@ -19,6 +19,14 @@
@@ -1442,7 +1411,7 @@ index 106f83a5ea6d..b483e5713039 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);
@@ -1451,7 +1420,7 @@ index 106f83a5ea6d..b483e5713039 100644
  		return 0;
  
  	/*
-@@ -86,7 +94,46 @@ pin_page_for_write(const void __user *_addr, pte_t **ptep, spinlock_t **ptlp)
+@@ -86,7 +94,46 @@ pin_page_for_write(const void __user *_a
  	return 1;
  }
  
@@ -1499,7 +1468,7 @@ index 106f83a5ea6d..b483e5713039 100644
  __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n)
  {
  	unsigned long ua_flags;
-@@ -139,6 +186,57 @@ __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n)
+@@ -139,6 +186,57 @@ out:
  	return n;
  }
  
@@ -1557,7 +1526,7 @@ index 106f83a5ea6d..b483e5713039 100644
  unsigned long
  arm_copy_to_user(void __user *to, const void *from, unsigned long n)
  {
-@@ -149,7 +247,7 @@ arm_copy_to_user(void __user *to, const void *from, unsigned long n)
+@@ -149,7 +247,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.
  	 */
@@ -1566,7 +1535,7 @@ index 106f83a5ea6d..b483e5713039 100644
  		unsigned long ua_flags = uaccess_save_and_enable();
  		n = __copy_to_user_std(to, from, n);
  		uaccess_restore(ua_flags);
-@@ -159,6 +257,32 @@ arm_copy_to_user(void __user *to, const void *from, unsigned long n)
+@@ -159,6 +257,32 @@ arm_copy_to_user(void __user *to, const
  	}
  	return n;
  }
@@ -1599,8 +1568,6 @@ index 106f83a5ea6d..b483e5713039 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 d802ded21ed6..a77c495f8378 100644
 --- a/arch/arm/mach-bcm/Kconfig
 +++ b/arch/arm/mach-bcm/Kconfig
 @@ -185,6 +185,13 @@ config ARCH_BCM_53573
@@ -1617,6 +1584,3 @@ index d802ded21ed6..a77c495f8378 100644
  config ARCH_BCM_63XX
  	bool "Broadcom BCM63xx DSL SoC"
  	depends on ARCH_MULTI_V7
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0090-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch b/root/target/linux/bcm27xx/patches-5.15/950-0082-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0090-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0082-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch
index ddbae276..89afdab7 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0090-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0082-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch
@@ -1,7 +1,7 @@
-From 5ea5a578d1596f24191691cd3f10eeaa6e9e72f2 Mon Sep 17 00:00:00 2001
+From 744faed58885b1cc5a6d17c4efbb6f934e0fa45a Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Thu, 25 Jun 2015 12:16:11 +0100
-Subject: [PATCH 090/634] gpio-poweroff: Allow it to work on Raspberry Pi
+Subject: [PATCH 082/828] gpio-poweroff: Allow it to work on Raspberry Pi
 
 The Raspberry Pi firmware manages the power-down and reboot
 process. To do this it installs a pm_power_off handler, causing
@@ -18,11 +18,9 @@ of the trigger signal may be preferable.
  drivers/power/reset/gpio-poweroff.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c
-index 1c5af2fef142..3e670131f2a8 100644
 --- a/drivers/power/reset/gpio-poweroff.c
 +++ b/drivers/power/reset/gpio-poweroff.c
-@@ -50,9 +50,11 @@ static int gpio_poweroff_probe(struct platform_device *pdev)
+@@ -50,9 +50,11 @@ static int gpio_poweroff_probe(struct pl
  {
  	bool input = false;
  	enum gpiod_flags flags;
@@ -35,6 +33,3 @@ index 1c5af2fef142..3e670131f2a8 100644
  		dev_err(&pdev->dev,
  			"%s: pm_power_off function already registered\n",
  		       __func__);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0091-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0083-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch
similarity index 93%
rename from root/target/linux/bcm27xx/patches-5.15/0091-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0083-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch
index 4bc3409e..163a2392 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0091-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0083-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch
@@ -1,7 +1,7 @@
-From 1e57f6601cd08ee1ef0c5125ceff6fd9a9c197c7 Mon Sep 17 00:00:00 2001
+From c2f20ddb013852415f39814a70b81b8fff517fee Mon Sep 17 00:00:00 2001
 From: Phil Elwell <pelwell@users.noreply.github.com>
 Date: Tue, 14 Jul 2015 14:32:47 +0100
-Subject: [PATCH 091/634] mfd: Add Raspberry Pi Sense HAT core driver
+Subject: [PATCH 083/828] mfd: Add Raspberry Pi Sense HAT core driver
 
 mfd: Add rpi_sense_core of compatible string
 ---
@@ -25,8 +25,6 @@ mfd: Add rpi_sense_core of compatible string
  create mode 100644 include/linux/mfd/rpisense/framebuffer.h
  create mode 100644 include/linux/mfd/rpisense/joystick.h
 
-diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
-index 3b23078bc7b5..483653110314 100644
 --- a/drivers/input/joystick/Kconfig
 +++ b/drivers/input/joystick/Kconfig
 @@ -399,4 +399,12 @@ config JOYSTICK_N64
@@ -42,18 +40,13 @@ index 3b23078bc7b5..483653110314 100644
 +	  This is the joystick driver for the Raspberry Pi Sense HAT
 +
  endif
-diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile
-index 5174b8aba2dd..d401dacf7702 100644
 --- a/drivers/input/joystick/Makefile
 +++ b/drivers/input/joystick/Makefile
-@@ -39,3 +39,4 @@ obj-$(CONFIG_JOYSTICK_WARRIOR)		+= warrior.o
+@@ -39,3 +39,4 @@ obj-$(CONFIG_JOYSTICK_WARRIOR)		+= warri
  obj-$(CONFIG_JOYSTICK_WALKERA0701)	+= walkera0701.o
  obj-$(CONFIG_JOYSTICK_XPAD)		+= xpad.o
  obj-$(CONFIG_JOYSTICK_ZHENHUA)		+= zhenhua.o
 +obj-$(CONFIG_JOYSTICK_RPISENSE)		+= rpisense-js.o
-diff --git a/drivers/input/joystick/rpisense-js.c b/drivers/input/joystick/rpisense-js.c
-new file mode 100644
-index 000000000000..6a416769065d
 --- /dev/null
 +++ b/drivers/input/joystick/rpisense-js.c
 @@ -0,0 +1,153 @@
@@ -210,8 +203,6 @@ index 000000000000..6a416769065d
 +MODULE_DESCRIPTION("Raspberry Pi Sense HAT joystick driver");
 +MODULE_AUTHOR("Serge Schneider <serge@raspberrypi.org>");
 +MODULE_LICENSE("GPL");
-diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
-index d2f345245538..c79bb26f48d2 100644
 --- a/drivers/mfd/Kconfig
 +++ b/drivers/mfd/Kconfig
 @@ -11,6 +11,14 @@ config MFD_CORE
@@ -229,8 +220,6 @@ index d2f345245538..c79bb26f48d2 100644
  config MFD_CS5535
  	tristate "AMD CS5535 and CS5536 southbridge core functions"
  	select MFD_CORE
-diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
-index 2ba6646e874c..0a30247411e8 100644
 --- a/drivers/mfd/Makefile
 +++ b/drivers/mfd/Makefile
 @@ -266,6 +266,7 @@ obj-$(CONFIG_MFD_STMFX) 	+= stmfx.o
@@ -241,9 +230,6 @@ index 2ba6646e874c..0a30247411e8 100644
  
  obj-$(CONFIG_SGI_MFD_IOC3)	+= ioc3.o
  obj-$(CONFIG_MFD_SIMPLE_MFD_I2C)	+= simple-mfd-i2c.o
-diff --git a/drivers/mfd/rpisense-core.c b/drivers/mfd/rpisense-core.c
-new file mode 100644
-index 000000000000..6cfd63e5e8b8
 --- /dev/null
 +++ b/drivers/mfd/rpisense-core.c
 @@ -0,0 +1,165 @@
@@ -412,8 +398,6 @@ index 000000000000..6cfd63e5e8b8
 +MODULE_AUTHOR("Serge Schneider <serge@raspberrypi.org>");
 +MODULE_LICENSE("GPL");
 +
-diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
-index 0b409636ebcd..e7f1a831f947 100644
 --- a/drivers/video/fbdev/Kconfig
 +++ b/drivers/video/fbdev/Kconfig
 @@ -2252,6 +2252,19 @@ config FB_SM712
@@ -436,8 +420,6 @@ index 0b409636ebcd..e7f1a831f947 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 36624ffdf2bc..5a478be6bcb4 100644
 --- a/drivers/video/fbdev/Makefile
 +++ b/drivers/video/fbdev/Makefile
 @@ -130,6 +130,7 @@ obj-$(CONFIG_FB_MX3)		  += mx3fb.o
@@ -448,9 +430,6 @@ index 36624ffdf2bc..5a478be6bcb4 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..26432a5a0b4b
 --- /dev/null
 +++ b/drivers/video/fbdev/rpisense-fb.c
 @@ -0,0 +1,293 @@
@@ -747,9 +726,6 @@ index 000000000000..26432a5a0b4b
 +MODULE_AUTHOR("Serge Schneider <serge@raspberrypi.org>");
 +MODULE_LICENSE("GPL");
 +
-diff --git a/include/linux/mfd/rpisense/core.h b/include/linux/mfd/rpisense/core.h
-new file mode 100644
-index 000000000000..4856aa3c8b06
 --- /dev/null
 +++ b/include/linux/mfd/rpisense/core.h
 @@ -0,0 +1,47 @@
@@ -800,9 +776,6 @@ index 000000000000..4856aa3c8b06
 +int rpisense_block_write(struct rpisense *rpisense, const char *buf, int count);
 +
 +#endif
-diff --git a/include/linux/mfd/rpisense/framebuffer.h b/include/linux/mfd/rpisense/framebuffer.h
-new file mode 100644
-index 000000000000..2ba95d7eebaf
 --- /dev/null
 +++ b/include/linux/mfd/rpisense/framebuffer.h
 @@ -0,0 +1,32 @@
@@ -838,9 +811,6 @@ index 000000000000..2ba95d7eebaf
 +};
 +
 +#endif
-diff --git a/include/linux/mfd/rpisense/joystick.h b/include/linux/mfd/rpisense/joystick.h
-new file mode 100644
-index 000000000000..56196dc2af10
 --- /dev/null
 +++ b/include/linux/mfd/rpisense/joystick.h
 @@ -0,0 +1,35 @@
@@ -879,6 +849,3 @@ index 000000000000..56196dc2af10
 +
 +
 +#endif
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0092-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch b/root/target/linux/bcm27xx/patches-5.15/950-0084-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch
similarity index 98%
rename from root/target/linux/bcm27xx/patches-5.15/0092-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0084-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch
index a782c9fd..3c5cda02 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0092-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0084-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch
@@ -1,7 +1,7 @@
-From 6d345fe17f1aee3cae17937cf124b4197281c0a7 Mon Sep 17 00:00:00 2001
+From 2128e42c35dd4d42abf6343b356489182d836508 Mon Sep 17 00:00:00 2001
 From: Florian Meier <florian.meier@koalo.de>
 Date: Mon, 25 Jan 2016 15:48:59 +0000
-Subject: [PATCH 092/634] Add support for all the downstream rpi sound card
+Subject: [PATCH 084/828] Add support for all the downstream rpi sound card
  drivers
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -945,9 +945,6 @@ Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
  create mode 100644 sound/soc/codecs/tas5713.c
  create mode 100644 sound/soc/codecs/tas5713.h
 
-diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
-new file mode 100644
-index 000000000000..f8d32547195b
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
 @@ -0,0 +1,463 @@
@@ -1414,8 +1411,6 @@ index 000000000000..f8d32547195b
 +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 a867f7102c35..008fb3c902ed 100644
 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
 +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
 @@ -173,6 +173,8 @@ patternProperties:
@@ -1427,8 +1422,6 @@ index a867f7102c35..008fb3c902ed 100644
    "^blutek,.*":
      description: BluTek Power
    "^boe,.*":
-diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
-index c5b3dc97396a..bc17883bc6e0 100644
 --- a/drivers/clk/Kconfig
 +++ b/drivers/clk/Kconfig
 @@ -90,6 +90,12 @@ config COMMON_CLK_HI655X
@@ -1444,8 +1437,6 @@ index c5b3dc97396a..bc17883bc6e0 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 e42312121e51..a1d8cd66353b 100644
 --- a/drivers/clk/Makefile
 +++ b/drivers/clk/Makefile
 @@ -17,6 +17,7 @@ endif
@@ -1456,7 +1447,7 @@ index e42312121e51..a1d8cd66353b 100644
  obj-$(CONFIG_MACH_ASM9260)		+= clk-asm9260.o
  obj-$(CONFIG_COMMON_CLK_AXI_CLKGEN)	+= clk-axi-clkgen.o
  obj-$(CONFIG_ARCH_AXXIA)		+= clk-axm5516.o
-@@ -38,6 +39,8 @@ obj-$(CONFIG_CLK_HSDK)			+= clk-hsdk-pll.o
+@@ -38,6 +39,8 @@ obj-$(CONFIG_CLK_HSDK)			+= clk-hsdk-pll
  obj-$(CONFIG_COMMON_CLK_K210)		+= clk-k210.o
  obj-$(CONFIG_LMK04832)			+= clk-lmk04832.o
  obj-$(CONFIG_COMMON_CLK_LOCHNAGAR)	+= clk-lochnagar.o
@@ -1465,9 +1456,6 @@ index e42312121e51..a1d8cd66353b 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-allo-dac.c b/drivers/clk/clk-allo-dac.c
-new file mode 100644
-index 000000000000..a9844cb9454b
 --- /dev/null
 +++ b/drivers/clk/clk-allo-dac.c
 @@ -0,0 +1,161 @@
@@ -1632,9 +1620,6 @@ index 000000000000..a9844cb9454b
 +MODULE_DESCRIPTION("Allo DAC clock driver");
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS("platform:clk-allo-dac");
-diff --git a/drivers/clk/clk-hifiberry-dachd.c b/drivers/clk/clk-hifiberry-dachd.c
-new file mode 100644
-index 000000000000..ec528a0aef36
 --- /dev/null
 +++ b/drivers/clk/clk-hifiberry-dachd.c
 @@ -0,0 +1,333 @@
@@ -1971,9 +1956,6 @@ index 000000000000..ec528a0aef36
 +MODULE_AUTHOR("Joerg Schambacher <joerg@i2audio.com>");
 +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..9e2634465823
 --- /dev/null
 +++ b/drivers/clk/clk-hifiberry-dacpro.c
 @@ -0,0 +1,160 @@
@@ -2137,8 +2119,6 @@ index 000000000000..9e2634465823
 +MODULE_DESCRIPTION("HiFiBerry DAC Pro clock driver");
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS("platform:clk-hifiberry-dacpro");
-diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index 4218057b0874..94c2a8e8ad2d 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
 @@ -26,3 +26,294 @@ config SND_BCM63XX_I2S_WHISTLER
@@ -2436,11 +2416,9 @@ index 4218057b0874..94c2a8e8ad2d 100644
 +	help
 +	  Say Y or M if you want to add support for the Raspberry Pi
 +          generic driver for WM8804 based soundcards.
-diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
-index 7c2d7899603b..942464a729b3 100644
 --- a/sound/soc/bcm/Makefile
 +++ b/sound/soc/bcm/Makefile
-@@ -12,4 +12,70 @@ obj-$(CONFIG_SND_SOC_CYGNUS) += snd-soc-cygnus.o
+@@ -12,4 +12,70 @@ obj-$(CONFIG_SND_SOC_CYGNUS) += snd-soc-
  # BCM63XX Platform Support
  snd-soc-63xx-objs := bcm63xx-i2s-whistler.o bcm63xx-pcm-whistler.o
  
@@ -2513,9 +2491,6 @@ index 7c2d7899603b..942464a729b3 100644
 +obj-$(CONFIG_SND_RPI_WM8804_SOUNDCARD) += snd-soc-rpi-wm8804-soundcard.o
 +obj-$(CONFIG_SND_BCM2708_SOC_PIFI_40) += snd-soc-pifi-40.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..22564e895bba
 --- /dev/null
 +++ b/sound/soc/bcm/allo-boss-dac.c
 @@ -0,0 +1,456 @@
@@ -2975,9 +2950,6 @@ index 000000000000..22564e895bba
 +MODULE_AUTHOR("Baswaraj K <jaikumar@cem-solutions.net>");
 +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..5ad7f16964aa
 --- /dev/null
 +++ b/sound/soc/bcm/allo-boss2-dac.c
 @@ -0,0 +1,1133 @@
@@ -4114,9 +4086,6 @@ index 000000000000..5ad7f16964aa
 +MODULE_DESCRIPTION("ASoC Allo Boss2 Codec Driver");
 +MODULE_AUTHOR("Sudeepkumar <sudeepkumar@cem-solutions.net>");
 +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..b0aebd40fe5e
 --- /dev/null
 +++ b/sound/soc/bcm/allo-katana-codec.c
 @@ -0,0 +1,388 @@
@@ -4508,9 +4477,6 @@ index 000000000000..b0aebd40fe5e
 +MODULE_DESCRIPTION("ASoC Allo Katana Codec Driver");
 +MODULE_AUTHOR("Jaikumar <jaikumar@cem-solutions.net>");
 +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..fd0fe58421b0
 --- /dev/null
 +++ b/sound/soc/bcm/allo-piano-dac-plus.c
 @@ -0,0 +1,1063 @@
@@ -5577,9 +5543,6 @@ index 000000000000..fd0fe58421b0
 +MODULE_AUTHOR("Baswaraj K <jaikumar@cem-solutions.net>");
 +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..61640fb95431
 --- /dev/null
 +++ b/sound/soc/bcm/allo-piano-dac.c
 @@ -0,0 +1,122 @@
@@ -5705,9 +5668,6 @@ index 000000000000..61640fb95431
 +MODULE_AUTHOR("Baswaraj K <jaikumar@cem-solutions.net>");
 +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..127d49691935
 --- /dev/null
 +++ b/sound/soc/bcm/audioinjector-isolated-soundcard.c
 @@ -0,0 +1,183 @@
@@ -5894,9 +5854,6 @@ index 000000000000..127d49691935
 +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..47d622df3ec7
 --- /dev/null
 +++ b/sound/soc/bcm/audioinjector-octo-soundcard.c
 @@ -0,0 +1,346 @@
@@ -6246,9 +6203,6 @@ index 000000000000..47d622df3ec7
 +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..3f24fa739081
 --- /dev/null
 +++ b/sound/soc/bcm/audioinjector-pi-soundcard.c
 @@ -0,0 +1,187 @@
@@ -6439,9 +6393,6 @@ index 000000000000..3f24fa739081
 +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..b76d97488a44
 --- /dev/null
 +++ b/sound/soc/bcm/audiosense-pi.c
 @@ -0,0 +1,248 @@
@@ -6693,9 +6644,6 @@ index 000000000000..b76d97488a44
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS("platform:audiosense-pi");
 +
-diff --git a/sound/soc/bcm/digidac1-soundcard.c b/sound/soc/bcm/digidac1-soundcard.c
-new file mode 100644
-index 000000000000..4649c6f75c59
 --- /dev/null
 +++ b/sound/soc/bcm/digidac1-soundcard.c
 @@ -0,0 +1,421 @@
@@ -7120,9 +7068,6 @@ index 000000000000..4649c6f75c59
 +MODULE_AUTHOR("José M. Tasende <vintage@redrocksaudio.es>");
 +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..ca48aef621b6
 --- /dev/null
 +++ b/sound/soc/bcm/dionaudio_loco-v2.c
 @@ -0,0 +1,117 @@
@@ -7243,9 +7188,6 @@ index 000000000000..ca48aef621b6
 +MODULE_AUTHOR("Miquel Blauw <info@dionaudio.nl>");
 +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..b19a06afb6af
 --- /dev/null
 +++ b/sound/soc/bcm/dionaudio_loco.c
 @@ -0,0 +1,117 @@
@@ -7366,9 +7308,6 @@ index 000000000000..b19a06afb6af
 +MODULE_AUTHOR("Miquel Blauw <info@dionaudio.nl>");
 +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..ded4ba1a2815
 --- /dev/null
 +++ b/sound/soc/bcm/fe-pi-audio.c
 @@ -0,0 +1,154 @@
@@ -7526,9 +7465,6 @@ index 000000000000..ded4ba1a2815
 +MODULE_AUTHOR("Henry Kupis <fe-pi@cox.net>");
 +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..4d38818f0bde
 --- /dev/null
 +++ b/sound/soc/bcm/googlevoicehat-codec.c
 @@ -0,0 +1,214 @@
@@ -7746,9 +7682,6 @@ index 000000000000..4d38818f0bde
 +MODULE_DESCRIPTION("Google voiceHAT Codec driver");
 +MODULE_AUTHOR("Peter Malkin <petermalkin@google.com>");
 +MODULE_LICENSE("GPL v2");
-diff --git a/sound/soc/bcm/hifiberry_dacplus.c b/sound/soc/bcm/hifiberry_dacplus.c
-new file mode 100644
-index 000000000000..1d8985468be4
 --- /dev/null
 +++ b/sound/soc/bcm/hifiberry_dacplus.c
 @@ -0,0 +1,527 @@
@@ -8279,9 +8212,6 @@ index 000000000000..1d8985468be4
 +MODULE_AUTHOR("Daniel Matuschek <daniel@hifiberry.com>");
 +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..5fe6fd220556
 --- /dev/null
 +++ b/sound/soc/bcm/hifiberry_dacplusadc.c
 @@ -0,0 +1,398 @@
@@ -8683,9 +8613,6 @@ index 000000000000..5fe6fd220556
 +MODULE_AUTHOR("Daniel Matuschek <daniel@hifiberry.com>");
 +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..79eccdb4dc8c
 --- /dev/null
 +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c
 @@ -0,0 +1,537 @@
@@ -9226,9 +9153,6 @@ index 000000000000..79eccdb4dc8c
 +MODULE_AUTHOR("Daniel Matuschek <daniel@hifiberry.com>");
 +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..e5919f839dc2
 --- /dev/null
 +++ b/sound/soc/bcm/hifiberry_dacplusdsp.c
 @@ -0,0 +1,90 @@
@@ -9322,9 +9246,6 @@ index 000000000000..e5919f839dc2
 +MODULE_AUTHOR("Joerg Schambacher <joerg@i2audio.com>");
 +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..7e7e514a3019
 --- /dev/null
 +++ b/sound/soc/bcm/hifiberry_dacplushd.c
 @@ -0,0 +1,238 @@
@@ -9566,9 +9487,6 @@ index 000000000000..7e7e514a3019
 +MODULE_AUTHOR("Joerg Schambacher <joerg@i2audio.com>");
 +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..6809232e28cb
 --- /dev/null
 +++ b/sound/soc/bcm/i-sabre-q2m.c
 @@ -0,0 +1,158 @@
@@ -9730,9 +9648,6 @@ index 000000000000..6809232e28cb
 +MODULE_DESCRIPTION("ASoC Driver for I-Sabre Q2M");
 +MODULE_AUTHOR("Audiophonics <http://www.audiophonics.fr>");
 +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..ea431ae185c0
 --- /dev/null
 +++ b/sound/soc/bcm/iqaudio-codec.c
 @@ -0,0 +1,274 @@
@@ -10010,9 +9925,6 @@ index 000000000000..ea431ae185c0
 +MODULE_AUTHOR("Gordon Garrity <gordon@iqaudio.com>");
 +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..62f64c843219
 --- /dev/null
 +++ b/sound/soc/bcm/iqaudio-dac.c
 @@ -0,0 +1,223 @@
@@ -10239,9 +10151,6 @@ index 000000000000..62f64c843219
 +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
 +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..471ecebddcaa
 --- /dev/null
 +++ b/sound/soc/bcm/justboom-both.c
 @@ -0,0 +1,266 @@
@@ -10511,9 +10420,6 @@ index 000000000000..471ecebddcaa
 +MODULE_AUTHOR("Johannes Krude <johannes@krude.de>");
 +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..f9fbdc9ddeb6
 --- /dev/null
 +++ b/sound/soc/bcm/justboom-dac.c
 @@ -0,0 +1,147 @@
@@ -10664,9 +10570,6 @@ index 000000000000..f9fbdc9ddeb6
 +MODULE_AUTHOR("Milan Neskovic <info@justboom.co>");
 +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..ae699fb0485c
 --- /dev/null
 +++ b/sound/soc/bcm/pifi-40.c
 @@ -0,0 +1,283 @@
@@ -10953,9 +10856,6 @@ index 000000000000..ae699fb0485c
 +MODULE_AUTHOR("David Knell <david.knell@gmail.com>");
 +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..629dde0e99b2
 --- /dev/null
 +++ b/sound/soc/bcm/pisound.c
 @@ -0,0 +1,1240 @@
@@ -12199,9 +12099,6 @@ index 000000000000..629dde0e99b2
 +MODULE_AUTHOR("Giedrius Trainavicius <giedrius@blokas.io>");
 +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..227a528d59bd
 --- /dev/null
 +++ b/sound/soc/bcm/rpi-cirrus.c
 @@ -0,0 +1,1025 @@
@@ -13230,9 +13127,6 @@ index 000000000000..227a528d59bd
 +MODULE_AUTHOR("Matthias Reichl <hias@horus.com>");
 +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..9a5cf91719fb
 --- /dev/null
 +++ b/sound/soc/bcm/rpi-proto.c
 @@ -0,0 +1,147 @@
@@ -13383,9 +13277,6 @@ index 000000000000..9a5cf91719fb
 +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..c25351e6ee90
 --- /dev/null
 +++ b/sound/soc/bcm/rpi-simple-soundcard.c
 @@ -0,0 +1,419 @@
@@ -13808,9 +13699,6 @@ index 000000000000..c25351e6ee90
 +MODULE_AUTHOR("Tim Gover <tim.gover@raspberrypi.org>");
 +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..835d0f9420e7
 --- /dev/null
 +++ b/sound/soc/bcm/rpi-wm8804-soundcard.c
 @@ -0,0 +1,410 @@
@@ -14224,8 +14112,6 @@ index 000000000000..835d0f9420e7
 +MODULE_AUTHOR("Tim Gover <tim.gover@raspberrypi.org>");
 +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 216cea04ad70..853a4b0acefc 100644
 --- a/sound/soc/codecs/Kconfig
 +++ b/sound/soc/codecs/Kconfig
 @@ -102,6 +102,7 @@ config SND_SOC_ALL_CODECS
@@ -14260,7 +14146,7 @@ index 216cea04ad70..853a4b0acefc 100644
  	imply SND_SOC_TLV320AIC26
  	imply SND_SOC_TLV320AIC31XX
  	imply SND_SOC_TLV320AIC32X4_I2C
-@@ -359,12 +363,12 @@ config SND_SOC_AD193X
+@@ -358,12 +362,12 @@ config SND_SOC_AD193X
  	tristate
  
  config SND_SOC_AD193X_SPI
@@ -14275,7 +14161,7 @@ index 216cea04ad70..853a4b0acefc 100644
  	depends on I2C
  	select SND_SOC_AD193X
  
-@@ -869,6 +873,13 @@ config SND_SOC_LOCHNAGAR_SC
+@@ -873,6 +877,13 @@ config SND_SOC_LOCHNAGAR_SC
  	  This driver support the sound card functionality of the Cirrus
  	  Logic Lochnagar audio development board.
  
@@ -14289,7 +14175,7 @@ index 216cea04ad70..853a4b0acefc 100644
  config SND_SOC_MADERA
  	tristate
  	default y if SND_SOC_CS47L15=y
-@@ -1185,6 +1196,10 @@ config SND_SOC_RT5616
+@@ -1189,6 +1200,10 @@ config SND_SOC_RT5616
  	tristate "Realtek RT5616 CODEC"
  	depends on I2C
  
@@ -14300,7 +14186,7 @@ index 216cea04ad70..853a4b0acefc 100644
  config SND_SOC_RT5631
  	tristate "Realtek ALC5631/RT5631 CODEC"
  	depends on I2C
-@@ -1435,6 +1450,9 @@ config SND_SOC_TFA9879
+@@ -1439,6 +1454,9 @@ config SND_SOC_TFA9879
  	tristate "NXP Semiconductors TFA9879 amplifier"
  	depends on I2C
  
@@ -14310,7 +14196,7 @@ index 216cea04ad70..853a4b0acefc 100644
  config SND_SOC_TFA989X
  	tristate "NXP/Goodix TFA989X (TFA1) amplifiers"
  	depends on I2C
-@@ -1941,4 +1959,8 @@ config SND_SOC_LPASS_TX_MACRO
+@@ -1945,4 +1963,8 @@ config SND_SOC_LPASS_TX_MACRO
  	select REGMAP_MMIO
  	tristate "Qualcomm TX Macro in LPASS(Low Power Audio SubSystem)"
  
@@ -14319,8 +14205,6 @@ index 216cea04ad70..853a4b0acefc 100644
 +	depends on I2C
 +
  endmenu
-diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
-index 8dcea2c4604a..58493a2b0a6b 100644
 --- a/sound/soc/codecs/Makefile
 +++ b/sound/soc/codecs/Makefile
 @@ -99,6 +99,7 @@ snd-soc-hdac-hda-objs := hdac_hda.o
@@ -14331,7 +14215,7 @@ index 8dcea2c4604a..58493a2b0a6b 100644
  snd-soc-jz4740-codec-objs := jz4740.o
  snd-soc-jz4725b-codec-objs := jz4725b.o
  snd-soc-jz4760-codec-objs := jz4760.o
-@@ -111,6 +112,7 @@ snd-soc-lpass-rx-macro-objs := lpass-rx-macro.o
+@@ -111,6 +112,7 @@ snd-soc-lpass-rx-macro-objs := lpass-rx-
  snd-soc-lpass-tx-macro-objs := lpass-tx-macro.o
  snd-soc-lpass-wsa-macro-objs := lpass-wsa-macro.o
  snd-soc-lpass-va-macro-objs := lpass-va-macro.o
@@ -14339,7 +14223,7 @@ index 8dcea2c4604a..58493a2b0a6b 100644
  snd-soc-madera-objs := madera.o
  snd-soc-max9759-objs := max9759.o
  snd-soc-max9768-objs := max9768.o
-@@ -154,6 +156,7 @@ snd-soc-pcm179x-spi-objs := pcm179x-spi.o
+@@ -154,6 +156,7 @@ snd-soc-pcm179x-spi-objs := pcm179x-spi.
  snd-soc-pcm186x-objs := pcm186x.o
  snd-soc-pcm186x-i2c-objs := pcm186x-i2c.o
  snd-soc-pcm186x-spi-objs := pcm186x-spi.o
@@ -14355,7 +14239,7 @@ index 8dcea2c4604a..58493a2b0a6b 100644
  snd-soc-tfa989x-objs := tfa989x.o
  snd-soc-tlv320aic23-objs := tlv320aic23.o
  snd-soc-tlv320aic23-i2c-objs := tlv320aic23-i2c.o
-@@ -430,6 +434,7 @@ obj-$(CONFIG_SND_SOC_HDAC_HDA) += snd-soc-hdac-hda.o
+@@ -430,6 +434,7 @@ obj-$(CONFIG_SND_SOC_HDAC_HDA) += snd-so
  obj-$(CONFIG_SND_SOC_ICS43432)	+= snd-soc-ics43432.o
  obj-$(CONFIG_SND_SOC_INNO_RK3036)	+= snd-soc-inno-rk3036.o
  obj-$(CONFIG_SND_SOC_ISABELLE)	+= snd-soc-isabelle.o
@@ -14371,7 +14255,7 @@ index 8dcea2c4604a..58493a2b0a6b 100644
  obj-$(CONFIG_SND_SOC_MADERA)	+= snd-soc-madera.o
  obj-$(CONFIG_SND_SOC_MAX9759)	+= snd-soc-max9759.o
  obj-$(CONFIG_SND_SOC_MAX9768)	+= snd-soc-max9768.o
-@@ -492,6 +498,7 @@ obj-$(CONFIG_SND_SOC_PCM5102A)	+= snd-soc-pcm5102a.o
+@@ -492,6 +498,7 @@ obj-$(CONFIG_SND_SOC_PCM5102A)	+= snd-so
  obj-$(CONFIG_SND_SOC_PCM512x)	+= snd-soc-pcm512x.o
  obj-$(CONFIG_SND_SOC_PCM512x_I2C)	+= snd-soc-pcm512x-i2c.o
  obj-$(CONFIG_SND_SOC_PCM512x_SPI)	+= snd-soc-pcm512x-spi.o
@@ -14379,7 +14263,7 @@ index 8dcea2c4604a..58493a2b0a6b 100644
  obj-$(CONFIG_SND_SOC_RK3328)	+= snd-soc-rk3328.o
  obj-$(CONFIG_SND_SOC_RK817)	+= snd-soc-rk817.o
  obj-$(CONFIG_SND_SOC_RL6231)	+= snd-soc-rl6231.o
-@@ -558,6 +565,7 @@ obj-$(CONFIG_SND_SOC_TAS5720)	+= snd-soc-tas5720.o
+@@ -558,6 +565,7 @@ obj-$(CONFIG_SND_SOC_TAS5720)	+= snd-soc
  obj-$(CONFIG_SND_SOC_TAS6424)	+= snd-soc-tas6424.o
  obj-$(CONFIG_SND_SOC_TDA7419)	+= snd-soc-tda7419.o
  obj-$(CONFIG_SND_SOC_TAS2770) += snd-soc-tas2770.o
@@ -14387,11 +14271,9 @@ index 8dcea2c4604a..58493a2b0a6b 100644
  obj-$(CONFIG_SND_SOC_TFA9879)	+= snd-soc-tfa9879.o
  obj-$(CONFIG_SND_SOC_TFA989X)	+= snd-soc-tfa989x.o
  obj-$(CONFIG_SND_SOC_TLV320AIC23)	+= snd-soc-tlv320aic23.o
-diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c
-index 0214e3ab9da0..b8b15b886c22 100644
 --- a/sound/soc/codecs/cs42xx8-i2c.c
 +++ b/sound/soc/codecs/cs42xx8-i2c.c
-@@ -45,11 +45,18 @@ static struct i2c_device_id cs42xx8_i2c_id[] = {
+@@ -45,11 +45,18 @@ static struct i2c_device_id cs42xx8_i2c_
  };
  MODULE_DEVICE_TABLE(i2c, cs42xx8_i2c_id);
  
@@ -14411,11 +14293,9 @@ index 0214e3ab9da0..b8b15b886c22 100644
  	},
  	.probe = cs42xx8_i2c_probe,
  	.remove = cs42xx8_i2c_remove,
-diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c
-index 5d6ef660f851..7d840313bccb 100644
 --- a/sound/soc/codecs/cs42xx8.c
 +++ b/sound/soc/codecs/cs42xx8.c
-@@ -517,8 +517,10 @@ const struct of_device_id cs42xx8_of_match[] = {
+@@ -517,8 +517,10 @@ const struct of_device_id cs42xx8_of_mat
  	{ .compatible = "cirrus,cs42888", .data = &cs42888_data, },
  	{ /* sentinel */ }
  };
@@ -14426,9 +14306,6 @@ index 5d6ef660f851..7d840313bccb 100644
  
  int cs42xx8_probe(struct device *dev, struct regmap *regmap)
  {
-diff --git a/sound/soc/codecs/i-sabre-codec.c b/sound/soc/codecs/i-sabre-codec.c
-new file mode 100644
-index 000000000000..714e1f5852cb
 --- /dev/null
 +++ b/sound/soc/codecs/i-sabre-codec.c
 @@ -0,0 +1,392 @@
@@ -14824,9 +14701,6 @@ index 000000000000..714e1f5852cb
 +MODULE_DESCRIPTION("ASoC I-Sabre Q2M codec driver");
 +MODULE_AUTHOR("Audiophonics <http://www.audiophonics.fr>");
 +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 @@
@@ -14872,9 +14746,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..e1591b6aff43
 --- /dev/null
 +++ b/sound/soc/codecs/ma120x0p.c
 @@ -0,0 +1,1384 @@
@@ -16262,9 +16133,6 @@ index 000000000000..e1591b6aff43
 +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..36b5b6c26655
 --- /dev/null
 +++ b/sound/soc/codecs/pcm1794a.c
 @@ -0,0 +1,69 @@
@@ -16337,11 +16205,9 @@ index 000000000000..36b5b6c26655
 +MODULE_DESCRIPTION("ASoC PCM1794A codec driver");
 +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
 +MODULE_LICENSE("GPL v2");
-diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c
-index 60dee41816dc..33ed3bbf0362 100644
 --- a/sound/soc/codecs/pcm512x.c
 +++ b/sound/soc/codecs/pcm512x.c
-@@ -536,7 +536,7 @@ static unsigned long pcm512x_ncp_target(struct pcm512x_priv *pcm512x,
+@@ -536,7 +536,7 @@ static unsigned long pcm512x_ncp_target(
  
  static const u32 pcm512x_dai_rates[] = {
  	8000, 11025, 16000, 22050, 32000, 44100, 48000, 64000,
@@ -16350,9 +16216,6 @@ index 60dee41816dc..33ed3bbf0362 100644
  };
  
  static const struct snd_pcm_hw_constraint_list constraints_slave = {
-diff --git a/sound/soc/codecs/tas5713.c b/sound/soc/codecs/tas5713.c
-new file mode 100644
-index 000000000000..53acd2b355d6
 --- /dev/null
 +++ b/sound/soc/codecs/tas5713.c
 @@ -0,0 +1,363 @@
@@ -16719,9 +16582,6 @@ index 000000000000..53acd2b355d6
 +MODULE_AUTHOR("Sebastian Eickhoff <basti.eickhoff@googlemail.com>");
 +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 @@
@@ -16935,11 +16795,9 @@ index 000000000000..8f019e048987
 +
 +
 +#endif  /* _TAS5713_H */
-diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
-index 633b02b43c9f..b84f46116057 100644
 --- a/sound/soc/soc-core.c
 +++ b/sound/soc/soc-core.c
-@@ -1231,7 +1231,7 @@ static void snd_soc_runtime_get_dai_fmt(struct snd_soc_pcm_runtime *rtd)
+@@ -1231,7 +1231,7 @@ found:
   * Returns 0 on success, otherwise a negative error code.
   */
  int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
@@ -16948,7 +16806,7 @@ index 633b02b43c9f..b84f46116057 100644
  {
  	struct snd_soc_dai *cpu_dai;
  	struct snd_soc_dai *codec_dai;
-@@ -1240,7 +1240,15 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
+@@ -1240,7 +1240,15 @@ int snd_soc_runtime_set_dai_fmt(struct s
  	int ret;
  
  	for_each_rtd_codec_dais(rtd, i, codec_dai) {
@@ -16965,7 +16823,7 @@ index 633b02b43c9f..b84f46116057 100644
  		if (ret != 0 && ret != -ENOTSUPP)
  			return ret;
  	}
-@@ -1249,8 +1257,21 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
+@@ -1249,8 +1257,21 @@ int snd_soc_runtime_set_dai_fmt(struct s
  	 * Flip the polarity for the "CPU" end of a CODEC<->CODEC link
  	 * the component which has non_legacy_dai_naming is Codec
  	 */
@@ -16989,6 +16847,3 @@ index 633b02b43c9f..b84f46116057 100644
  	for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
  		unsigned int fmt = dai_fmt;
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0093-rpi_display-add-backlight-driver-and-overlay.patch b/root/target/linux/bcm27xx/patches-5.15/950-0085-rpi_display-add-backlight-driver-and-overlay.patch
similarity index 89%
rename from root/target/linux/bcm27xx/patches-5.15/0093-rpi_display-add-backlight-driver-and-overlay.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0085-rpi_display-add-backlight-driver-and-overlay.patch
index 0c4273dd..58824451 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0093-rpi_display-add-backlight-driver-and-overlay.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0085-rpi_display-add-backlight-driver-and-overlay.patch
@@ -1,7 +1,7 @@
-From 1634c4b33f22d71f3a41a4bfb5af3956db60e0a0 Mon Sep 17 00:00:00 2001
+From fc393a523244e5d270cea0dba51b733cee2327ba Mon Sep 17 00:00:00 2001
 From: P33M <P33M@github.com>
 Date: Wed, 21 Oct 2015 14:55:21 +0100
-Subject: [PATCH 093/634] rpi_display: add backlight driver and overlay
+Subject: [PATCH 085/828] rpi_display: add backlight driver and overlay
 
 Add a mailbox-driven backlight controller for the Raspberry Pi DSI
 touchscreen display. Requires updated GPU firmware to recognise the
@@ -22,8 +22,6 @@ Signed-off-by: Alex Riesen <alexander.riesen@cetitec.com>
  3 files changed, 127 insertions(+)
  create mode 100644 drivers/video/backlight/rpi_backlight.c
 
-diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
-index e32694c13da5..853ae0bd961d 100644
 --- a/drivers/video/backlight/Kconfig
 +++ b/drivers/video/backlight/Kconfig
 @@ -248,6 +248,13 @@ config BACKLIGHT_PWM
@@ -40,11 +38,9 @@ index e32694c13da5..853ae0bd961d 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 cae2c83422ae..30a17f4be040 100644
 --- a/drivers/video/backlight/Makefile
 +++ b/drivers/video/backlight/Makefile
-@@ -49,6 +49,7 @@ obj-$(CONFIG_BACKLIGHT_PANDORA)		+= pandora_bl.o
+@@ -49,6 +49,7 @@ obj-$(CONFIG_BACKLIGHT_PANDORA)		+= pand
  obj-$(CONFIG_BACKLIGHT_PCF50633)	+= pcf50633-backlight.o
  obj-$(CONFIG_BACKLIGHT_PWM)		+= pwm_bl.o
  obj-$(CONFIG_BACKLIGHT_QCOM_WLED)	+= qcom-wled.o
@@ -52,9 +48,6 @@ index cae2c83422ae..30a17f4be040 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..14a0d9b03739
 --- /dev/null
 +++ b/drivers/video/backlight/rpi_backlight.c
 @@ -0,0 +1,119 @@
@@ -177,6 +170,3 @@ index 000000000000..14a0d9b03739
 +MODULE_AUTHOR("Gordon Hollingworth <gordon@raspberrypi.org>");
 +MODULE_DESCRIPTION("Raspberry Pi mailbox based Backlight Driver");
 +MODULE_LICENSE("GPL");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0094-bcm2835-virtgpio-Virtual-GPIO-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0086-bcm2835-virtgpio-Virtual-GPIO-driver.patch
similarity index 92%
rename from root/target/linux/bcm27xx/patches-5.15/0094-bcm2835-virtgpio-Virtual-GPIO-driver.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0086-bcm2835-virtgpio-Virtual-GPIO-driver.patch
index c80dcc3d..16cffc81 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0094-bcm2835-virtgpio-Virtual-GPIO-driver.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0086-bcm2835-virtgpio-Virtual-GPIO-driver.patch
@@ -1,7 +1,7 @@
-From 70c00ff96cc66354d96b742eea2ac93e36b27e8d Mon Sep 17 00:00:00 2001
+From bf47545d183000c1200ab563990bd6f42b37d161 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 23 Feb 2016 19:56:04 +0000
-Subject: [PATCH 094/634] bcm2835-virtgpio: Virtual GPIO driver
+Subject: [PATCH 086/828] bcm2835-virtgpio: Virtual GPIO driver
 
 Add a virtual GPIO driver that uses the firmware mailbox interface to
 request that the VPU toggles LEDs.
@@ -12,8 +12,6 @@ request that the VPU toggles LEDs.
  3 files changed, 221 insertions(+)
  create mode 100644 drivers/gpio/gpio-bcm-virt.c
 
-diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
-index fae5141251e5..138ca5c8dab1 100644
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
 @@ -194,6 +194,12 @@ config GPIO_BCM_XGS_IPROC
@@ -29,11 +27,9 @@ index fae5141251e5..138ca5c8dab1 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 fbcda637d5e1..4e1ce3c97bca 100644
 --- a/drivers/gpio/Makefile
 +++ b/drivers/gpio/Makefile
-@@ -38,6 +38,7 @@ obj-$(CONFIG_GPIO_ASPEED_SGPIO)		+= gpio-aspeed-sgpio.o
+@@ -38,6 +38,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
@@ -41,9 +37,6 @@ index fbcda637d5e1..4e1ce3c97bca 100644
  obj-$(CONFIG_GPIO_BD70528)		+= gpio-bd70528.o
  obj-$(CONFIG_GPIO_BD71815)		+= gpio-bd71815.o
  obj-$(CONFIG_GPIO_BD71828)		+= gpio-bd71828.o
-diff --git a/drivers/gpio/gpio-bcm-virt.c b/drivers/gpio/gpio-bcm-virt.c
-new file mode 100644
-index 000000000000..49e28ad9760e
 --- /dev/null
 +++ b/drivers/gpio/gpio-bcm-virt.c
 @@ -0,0 +1,214 @@
@@ -261,6 +254,3 @@ index 000000000000..49e28ad9760e
 +MODULE_AUTHOR("Dom Cobley <popcornmix@gmail.com>");
 +MODULE_DESCRIPTION("brcmvirt GPIO driver");
 +MODULE_ALIAS("platform:brcmvirt-gpio");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0095-OF-DT-Overlay-configfs-interface.patch b/root/target/linux/bcm27xx/patches-5.15/950-0087-OF-DT-Overlay-configfs-interface.patch
similarity index 94%
rename from root/target/linux/bcm27xx/patches-5.15/0095-OF-DT-Overlay-configfs-interface.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0087-OF-DT-Overlay-configfs-interface.patch
index fe752b9e..639b753f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0095-OF-DT-Overlay-configfs-interface.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0087-OF-DT-Overlay-configfs-interface.patch
@@ -1,7 +1,7 @@
-From 66b07995a6f590646045ca6ad6d67b5e5933324e Mon Sep 17 00:00:00 2001
+From 90b578f23fef5308cf483ce8a48fcde8f0932235 Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
 Date: Wed, 3 Dec 2014 13:23:28 +0200
-Subject: [PATCH 095/634] OF: DT-Overlay configfs interface
+Subject: [PATCH 087/828] OF: DT-Overlay configfs interface
 
 This is a port of Pantelis Antoniou's v3 port that makes use of the
 new upstreamed configfs support for binary attributes.
@@ -54,9 +54,6 @@ configfs: New of_overlay API
  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 @@
@@ -91,11 +88,9 @@ 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 3dfeae8912df..654a25f96897 100644
 --- a/drivers/of/Kconfig
 +++ b/drivers/of/Kconfig
-@@ -98,4 +98,11 @@ config OF_DMA_DEFAULT_COHERENT
+@@ -94,4 +94,11 @@ config OF_DMA_DEFAULT_COHERENT
  	# arches should select this if DMA is coherent by default for OF devices
  	bool
  
@@ -107,8 +102,6 @@ index 3dfeae8912df..654a25f96897 100644
 +	  Enable a simple user-space driven DT overlay interface.
 +
  endif # OF
-diff --git a/drivers/of/Makefile b/drivers/of/Makefile
-index c13b982084a3..957a5b60c167 100644
 --- a/drivers/of/Makefile
 +++ b/drivers/of/Makefile
 @@ -1,6 +1,7 @@
@@ -119,9 +112,6 @@ index c13b982084a3..957a5b60c167 100644
  obj-$(CONFIG_OF_DYNAMIC) += dynamic.o
  obj-$(CONFIG_OF_FLATTREE) += fdt.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..178f0629b0f0
 --- /dev/null
 +++ b/drivers/of/configfs.c
 @@ -0,0 +1,310 @@
@@ -435,6 +425,3 @@ index 000000000000..178f0629b0f0
 +	return ret;
 +}
 +late_initcall(of_cfs_init);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0096-brcm-adds-support-for-BCM43341-wifi.patch b/root/target/linux/bcm27xx/patches-5.15/950-0088-brcm-adds-support-for-BCM43341-wifi.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0096-brcm-adds-support-for-BCM43341-wifi.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0088-brcm-adds-support-for-BCM43341-wifi.patch
index 5c042e0f..91f1b57f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0096-brcm-adds-support-for-BCM43341-wifi.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0088-brcm-adds-support-for-BCM43341-wifi.patch
@@ -1,7 +1,7 @@
-From a9c3bd5396da5807087ceeaa50312fffc069339e Mon Sep 17 00:00:00 2001
+From a1dfe7afe350926ac24c83f2e5e648d90b055695 Mon Sep 17 00:00:00 2001
 From: Cheong2K <cheong@redbear.cc>
 Date: Fri, 26 Feb 2016 18:20:10 +0800
-Subject: [PATCH 096/634] brcm: adds support for BCM43341 wifi
+Subject: [PATCH 088/828] brcm: adds support for BCM43341 wifi
 
 brcmfmac: Disable power management
 
@@ -59,11 +59,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c     | 3 ++-
  3 files changed, 4 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-index 9db12ffd2ff8..c388d56269bc 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -2953,7 +2953,7 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev,
+@@ -2953,7 +2953,7 @@ brcmf_cfg80211_set_power_mgmt(struct wip
  		brcmf_dbg(INFO, "Do not enable power save for P2P clients\n");
  		pm = PM_OFF;
  	}
@@ -72,8 +70,6 @@ index 9db12ffd2ff8..c388d56269bc 100644
  
  	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM, pm);
  	if (err) {
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
-index e3758bd86acf..591dcd04b4b4 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
 @@ -59,7 +59,7 @@ static int brcmf_fcmode;
@@ -85,8 +81,6 @@ index e3758bd86acf..591dcd04b4b4 100644
  module_param_named(roamoff, brcmf_roamoff, int, 0400);
  MODULE_PARM_DESC(roamoff, "Do not use internal roaming engine");
  
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-index 8effeb7a7269..14b2cdafe378 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 @@ -611,6 +611,7 @@ BRCMF_FW_DEF(4329, "brcmfmac4329-sdio");
@@ -97,7 +91,7 @@ index 8effeb7a7269..14b2cdafe378 100644
  BRCMF_FW_DEF(4335, "brcmfmac4335-sdio");
  BRCMF_FW_DEF(43362, "brcmfmac43362-sdio");
  BRCMF_FW_DEF(4339, "brcmfmac4339-sdio");
-@@ -643,7 +644,7 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
+@@ -642,7 +643,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),
@@ -106,6 +100,3 @@ index 8effeb7a7269..14b2cdafe378 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.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0097-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch b/root/target/linux/bcm27xx/patches-5.15/950-0089-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0097-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0089-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch
index fb2a6086..71f1b594 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0097-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0089-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch
@@ -1,7 +1,7 @@
-From fd2a369239fa03cef1fcdf05ddb5cfae55684825 Mon Sep 17 00:00:00 2001
+From 638f45633ce234ef1b3155497ad48d5824e61a9e Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Thu, 17 Dec 2015 13:37:07 +0000
-Subject: [PATCH 097/634] hci_h5: Don't send conf_req when ACTIVE
+Subject: [PATCH 089/828] hci_h5: Don't send conf_req when ACTIVE
 
 Without this patch, a modem and kernel can continuously bombard each
 other with conf_req and conf_rsp messages, in a demented game of tag.
@@ -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 d49a39d17d7d..6091727c8b78 100644
 --- a/drivers/bluetooth/hci_h5.c
 +++ b/drivers/bluetooth/hci_h5.c
-@@ -357,7 +357,8 @@ static void h5_handle_internal_rx(struct hci_uart *hu)
+@@ -357,7 +357,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 d49a39d17d7d..6091727c8b78 100644
  	} else if (memcmp(data, conf_rsp, 2) == 0) {
  		if (H5_HDR_LEN(hdr) > 2)
  			h5->tx_win = (data[2] & 0x07);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0099-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch b/root/target/linux/bcm27xx/patches-5.15/950-0090-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch
similarity index 75%
rename from root/target/linux/bcm27xx/patches-5.15/0099-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0090-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch
index 16ded2b1..2078d028 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0099-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0090-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch
@@ -1,7 +1,7 @@
-From 2f37c192a532eadd392482e359fb76f9ed148828 Mon Sep 17 00:00:00 2001
+From 2d8fcdfdf1528169f4bc41815d7ea256e372bb7e Mon Sep 17 00:00:00 2001
 From: Michael Zoran <mzoran@crowfest.net>
 Date: Sat, 14 Jan 2017 21:43:57 -0800
-Subject: [PATCH 099/634] ARM64: Round-Robin dispatch IRQs between CPUs.
+Subject: [PATCH 090/828] ARM64: Round-Robin dispatch IRQs between CPUs.
 
 IRQ-CPU mapping is round robined on ARM64 to increase
 concurrency and allow multiple interrupts to be serviced
@@ -13,11 +13,9 @@ Signed-off-by: Michael Zoran <mzoran@crowfest.net>
  drivers/irqchip/irq-bcm2836.c | 21 +++++++++++++++++++++
  2 files changed, 35 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c
-index 4dbb4b16ee6e..8950debf451b 100644
 --- a/drivers/irqchip/irq-bcm2835.c
 +++ b/drivers/irqchip/irq-bcm2835.c
-@@ -154,10 +154,23 @@ static void armctrl_unmask_irq(struct irq_data *d)
+@@ -154,10 +154,23 @@ static void armctrl_unmask_irq(struct ir
  	}
  }
  
@@ -42,11 +40,9 @@ index 4dbb4b16ee6e..8950debf451b 100644
  };
  
  static int armctrl_xlate(struct irq_domain *d, struct device_node *ctrlr,
-diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c
-index 867c3b43490c..f9da3f2a5f01 100644
 --- a/drivers/irqchip/irq-bcm2836.c
 +++ b/drivers/irqchip/irq-bcm2836.c
-@@ -87,6 +87,27 @@ static void bcm2836_arm_irqchip_unmask_gpu_irq(struct irq_data *d)
+@@ -87,6 +87,27 @@ static void bcm2836_arm_irqchip_unmask_g
  {
  }
  
@@ -74,6 +70,3 @@ index 867c3b43490c..f9da3f2a5f01 100644
  static struct irq_chip bcm2836_arm_irqchip_gpu = {
  	.name		= "bcm2836-gpu",
  	.irq_mask	= bcm2836_arm_irqchip_mask_gpu_irq,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0100-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch b/root/target/linux/bcm27xx/patches-5.15/950-0091-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch
similarity index 64%
rename from root/target/linux/bcm27xx/patches-5.15/0100-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0091-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch
index d136861c..d400be55 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0100-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0091-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch
@@ -1,18 +1,16 @@
-From 0a8326d8db2b2970fef816e4d9eecd00c22670d9 Mon Sep 17 00:00:00 2001
+From b96f15de97941215522c9bd2040ef134e7e123e2 Mon Sep 17 00:00:00 2001
 From: Michael Zoran <mzoran@crowfest.net>
 Date: Sat, 11 Feb 2017 01:18:31 -0800
-Subject: [PATCH 100/634] ARM64: Force hardware emulation of deprecated
+Subject: [PATCH 091/828] 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 0e86e8b9cedd..62078b06feb1 100644
 --- a/arch/arm64/kernel/armv8_deprecated.c
 +++ b/arch/arm64/kernel/armv8_deprecated.c
-@@ -182,10 +182,15 @@ static void __init register_insn_emulation(struct insn_emulation_ops *ops)
+@@ -182,10 +182,15 @@ static void __init register_insn_emulati
  
  	switch (ops->status) {
  	case INSN_DEPRECATED:
@@ -28,6 +26,3 @@ index 0e86e8b9cedd..62078b06feb1 100644
  		break;
  	case INSN_OBSOLETE:
  		insn->current_mode = INSN_UNDEF;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0101-cache-export-clean-and-invalidate.patch b/root/target/linux/bcm27xx/patches-5.15/950-0092-cache-export-clean-and-invalidate.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0101-cache-export-clean-and-invalidate.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0092-cache-export-clean-and-invalidate.patch
index 17635ab6..7b5d3348 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0101-cache-export-clean-and-invalidate.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0092-cache-export-clean-and-invalidate.patch
@@ -1,7 +1,7 @@
-From 4972cfff45a0465fa369b02f0e8050d164c22fbe Mon Sep 17 00:00:00 2001
+From 91e397d6dc28d1c90efc04780416e05ea2472d1f Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 25 Aug 2017 19:18:13 +0100
-Subject: [PATCH 101/634] cache: export clean and invalidate
+Subject: [PATCH 092/828] cache: export clean and invalidate
 
 hack: cache: Fix linker error
 ---
@@ -9,8 +9,6 @@ hack: cache: Fix linker error
  arch/arm/mm/cache-v7.S | 6 ++++--
  2 files changed, 6 insertions(+), 4 deletions(-)
 
-diff --git a/arch/arm/mm/cache-v6.S b/arch/arm/mm/cache-v6.S
-index f0f65eb073e4..868011801521 100644
 --- a/arch/arm/mm/cache-v6.S
 +++ b/arch/arm/mm/cache-v6.S
 @@ -198,7 +198,7 @@ ENTRY(v6_flush_kern_dcache_area)
@@ -31,8 +29,6 @@ index f0f65eb073e4..868011801521 100644
  	bic	r0, r0, #D_CACHE_LINE_SIZE - 1
  1:
  #ifdef CONFIG_DMA_CACHE_RWFO
-diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S
-index 830bbfb26ca5..097248743b4c 100644
 --- a/arch/arm/mm/cache-v7.S
 +++ b/arch/arm/mm/cache-v7.S
 @@ -363,7 +363,8 @@ ENDPROC(v7_flush_kern_dcache_area)
@@ -55,6 +51,3 @@ index 830bbfb26ca5..097248743b4c 100644
  	dcache_line_size r2, r3
  	sub	r3, r2, #1
  	bic	r0, r0, r3
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0102-AXI-performance-monitor-driver-2222.patch b/root/target/linux/bcm27xx/patches-5.15/950-0093-AXI-performance-monitor-driver-2222.patch
similarity index 96%
rename from root/target/linux/bcm27xx/patches-5.15/0102-AXI-performance-monitor-driver-2222.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0093-AXI-performance-monitor-driver-2222.patch
index 8a5124b3..f3509952 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0102-AXI-performance-monitor-driver-2222.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0093-AXI-performance-monitor-driver-2222.patch
@@ -1,7 +1,7 @@
-From 1d3914752882c2342ba42b302eb11429e83fad68 Mon Sep 17 00:00:00 2001
+From ba15915c5817e66bd17135951c3a3e0ddeee476f Mon Sep 17 00:00:00 2001
 From: James Hughes <JamesH65@users.noreply.github.com>
 Date: Tue, 14 Nov 2017 15:13:15 +0000
-Subject: [PATCH 102/634] AXI performance monitor driver (#2222)
+Subject: [PATCH 093/828] AXI performance monitor driver (#2222)
 
 Uses the debugfs I/F to provide access to the AXI
 bus performance monitors.
@@ -25,8 +25,6 @@ Signed-off-by: Matteo Croce <mcroce@redhat.com>
  3 files changed, 646 insertions(+)
  create mode 100644 drivers/perf/raspberrypi_axi_monitor.c
 
-diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig
-index 77522e5efe11..25b7423f3cd0 100644
 --- a/drivers/perf/Kconfig
 +++ b/drivers/perf/Kconfig
 @@ -137,6 +137,14 @@ config ARM_DMC620_PMU
@@ -44,18 +42,13 @@ index 77522e5efe11..25b7423f3cd0 100644
  source "drivers/perf/hisilicon/Kconfig"
  
  endmenu
-diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile
-index 5260b116c7da..7ca0b48a6570 100644
 --- a/drivers/perf/Makefile
 +++ b/drivers/perf/Makefile
-@@ -14,3 +14,4 @@ obj-$(CONFIG_THUNDERX2_PMU) += thunderx2_pmu.o
+@@ -14,3 +14,4 @@ obj-$(CONFIG_THUNDERX2_PMU) += thunderx2
  obj-$(CONFIG_XGENE_PMU) += xgene_pmu.o
  obj-$(CONFIG_ARM_SPE_PMU) += arm_spe_pmu.o
  obj-$(CONFIG_ARM_DMC620_PMU) += arm_dmc620_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..5ae2bdaa88b4
 --- /dev/null
 +++ b/drivers/perf/raspberrypi_axi_monitor.c
 @@ -0,0 +1,637 @@
@@ -696,6 +689,3 @@ index 000000000000..5ae2bdaa88b4
 +MODULE_DESCRIPTION("RPI AXI Performance monitor driver");
 +MODULE_LICENSE("GPL");
 +
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0103-ARM-bcm2835-Set-Serial-number-and-Revision.patch b/root/target/linux/bcm27xx/patches-5.15/950-0094-ARM-bcm2835-Set-Serial-number-and-Revision.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0103-ARM-bcm2835-Set-Serial-number-and-Revision.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0094-ARM-bcm2835-Set-Serial-number-and-Revision.patch
index fc7e8439..5f158d57 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0103-ARM-bcm2835-Set-Serial-number-and-Revision.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0094-ARM-bcm2835-Set-Serial-number-and-Revision.patch
@@ -1,7 +1,7 @@
-From a8eea09e4435412c033e836f83948ad152a9b1b9 Mon Sep 17 00:00:00 2001
+From 3b8d41d146ebc918a04f0fe8b9eda6077e9ea9c0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
 Date: Wed, 3 Jun 2015 12:26:13 +0200
-Subject: [PATCH 103/634] ARM: bcm2835: Set Serial number and Revision
+Subject: [PATCH 094/828] ARM: bcm2835: Set Serial number and Revision
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -25,8 +25,6 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  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.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0104-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch b/root/target/linux/bcm27xx/patches-5.15/950-0095-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch
similarity index 91%
rename from root/target/linux/bcm27xx/patches-5.15/0104-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0095-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch
index 28d5e823..703c5513 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0104-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0095-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch
@@ -1,7 +1,7 @@
-From d141c7b5deb8c8500ddc1f063f6f5d7f1e2ae1f4 Mon Sep 17 00:00:00 2001
+From bee04da07062c852dfeb561faa082eeed0983f3c Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Mon, 16 Jul 2018 14:40:13 +0100
-Subject: [PATCH 104/634] dwc-otg: FIQ: Fix "bad mode in data abort handler"
+Subject: [PATCH 095/828] dwc-otg: FIQ: Fix "bad mode in data abort handler"
 
 Create a semi-static mapping for the USB registers early in the boot
 process, before additional kernel threads are started, so all threads
@@ -15,8 +15,6 @@ Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
  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.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0105-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch b/root/target/linux/bcm27xx/patches-5.15/950-0096-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch
similarity index 79%
rename from root/target/linux/bcm27xx/patches-5.15/0105-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0096-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch
index e564a342..19a26787 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0105-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0096-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch
@@ -1,7 +1,7 @@
-From 64fa11fbe628f95d14df3bcef75f09f734cb13b6 Mon Sep 17 00:00:00 2001
+From aff6af309d8d27f152f66ed0240b98edaf7c46c7 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Mon, 11 Dec 2017 09:18:32 +0000
-Subject: [PATCH 105/634] ARM: Activate FIQs to avoid __irq_startup warnings
+Subject: [PATCH 096/828] ARM: Activate FIQs to avoid __irq_startup warnings
 
 There is a new test in __irq_startup that the IRQ is activated, which
 hasn't been the case for FIQs since they bypass some of the usual setup.
@@ -14,8 +14,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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 98ca3e3fa847..c3fe7d3cf482 100644
 --- a/arch/arm/kernel/fiq.c
 +++ b/arch/arm/kernel/fiq.c
 @@ -56,6 +56,8 @@
@@ -36,6 +34,3 @@ index 98ca3e3fa847..c3fe7d3cf482 100644
  	enable_irq(fiq + fiq_start);
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0106-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch b/root/target/linux/bcm27xx/patches-5.15/950-0097-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0106-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0097-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch
index 62d5e59f..c727191b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0106-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0097-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch
@@ -1,7 +1,7 @@
-From 82b1099243510fc803bd03bc53afae4ae743d95a Mon Sep 17 00:00:00 2001
+From 78dacf2306cab90184c26815e14c8f132d779ab9 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Tue, 20 Feb 2018 10:07:27 +0000
-Subject: [PATCH 106/634] i2c-gpio: Also set bus numbers from reg property
+Subject: [PATCH 097/828] i2c-gpio: Also set bus numbers from reg property
 
 I2C busses can be assigned specific bus numbers using aliases in
 Device Tree - string properties where the name is the alias and the
@@ -20,11 +20,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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 7a048abbf92b..08ad370c9881 100644
 --- a/drivers/i2c/busses/i2c-gpio.c
 +++ b/drivers/i2c/busses/i2c-gpio.c
-@@ -445,7 +445,9 @@ static int i2c_gpio_probe(struct platform_device *pdev)
+@@ -445,7 +445,9 @@ static int i2c_gpio_probe(struct platfor
  	adap->dev.parent = dev;
  	adap->dev.of_node = np;
  
@@ -35,6 +33,3 @@ index 7a048abbf92b..08ad370c9881 100644
  	ret = i2c_bit_add_numbered_bus(adap);
  	if (ret)
  		return ret;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0107-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch b/root/target/linux/bcm27xx/patches-5.15/950-0098-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch
similarity index 64%
rename from root/target/linux/bcm27xx/patches-5.15/0107-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0098-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch
index 78d1ef32..3e2d9e8b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0107-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0098-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch
@@ -1,18 +1,16 @@
-From 60294f22933a2095dd66120c4110597cf0d7d966 Mon Sep 17 00:00:00 2001
+From b002ba45bb5edf98506e1a478f4e61715c2294a1 Mon Sep 17 00:00:00 2001
 From: hdoverobinson <hdoverobinson@gmail.com>
 Date: Tue, 13 Mar 2018 06:58:39 -0400
-Subject: [PATCH 107/634] added capture_clear option to pps-gpio via dtoverlay
+Subject: [PATCH 098/828] 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 35799e6401c9..36b127e24661 100644
 --- a/drivers/pps/clients/pps-gpio.c
 +++ b/drivers/pps/clients/pps-gpio.c
-@@ -113,6 +113,9 @@ static int pps_gpio_setup(struct device *dev)
+@@ -113,6 +113,9 @@ static int pps_gpio_setup(struct device
  	data->assert_falling_edge =
  		device_property_read_bool(dev, "assert-falling-edge");
  
@@ -22,6 +20,3 @@ index 35799e6401c9..36b127e24661 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.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0108-lan78xx-Read-initial-EEE-status-from-DT.patch b/root/target/linux/bcm27xx/patches-5.15/950-0099-lan78xx-Read-initial-EEE-status-from-DT.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0108-lan78xx-Read-initial-EEE-status-from-DT.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0099-lan78xx-Read-initial-EEE-status-from-DT.patch
index 91d9337c..d5bb3ffb 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0108-lan78xx-Read-initial-EEE-status-from-DT.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0099-lan78xx-Read-initial-EEE-status-from-DT.patch
@@ -1,7 +1,7 @@
-From f4b4c223e6cfe746d7afb500082074282241d84d Mon Sep 17 00:00:00 2001
+From 3ce96f460b0b5d7530e1e00e53312c890b2dc7ec Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Fri, 9 Mar 2018 12:01:00 +0000
-Subject: [PATCH 108/634] lan78xx: Read initial EEE status from DT
+Subject: [PATCH 099/828] lan78xx: Read initial EEE status from DT
 
 Add two new DT properties:
 * microchip,eee-enabled  - a boolean to enable EEE
@@ -13,11 +13,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/net/usb/lan78xx.c | 16 ++++++++++++++++
  1 file changed, 16 insertions(+)
 
-diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
-index 3d39f34bc641..12363cfb3b61 100644
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -2958,6 +2958,22 @@ static int lan78xx_open(struct net_device *net)
+@@ -2960,6 +2960,22 @@ static int lan78xx_open(struct net_devic
  
  	netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
  
@@ -40,6 +38,3 @@ index 3d39f34bc641..12363cfb3b61 100644
  	/* for Link Check */
  	if (dev->urb_intr) {
  		ret = usb_submit_urb(dev->urb_intr, GFP_KERNEL);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0109-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch b/root/target/linux/bcm27xx/patches-5.15/950-0100-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0109-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0100-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch
index 91de7dae..242c4a59 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0109-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0100-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch
@@ -1,15 +1,13 @@
-From 85f3e9fdad05bf5cb8e5dcd3980e9be23d6f02bc Mon Sep 17 00:00:00 2001
+From f304c6847bbda286d4f94a3ba20ea5246cf03e4d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 14 Jul 2014 22:02:09 +0100
-Subject: [PATCH 109/634] hid: Reduce default mouse polling interval to 60Hz
+Subject: [PATCH 100/828] hid: Reduce default mouse polling interval to 60Hz
 
 Reduces overhead when using X
 ---
  drivers/hid/usbhid/hid-core.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
-index 2dcaf31eb9cd..8a9d8214d8af 100644
 --- a/drivers/hid/usbhid/hid-core.c
 +++ b/drivers/hid/usbhid/hid-core.c
 @@ -45,7 +45,7 @@
@@ -21,7 +19,7 @@ index 2dcaf31eb9cd..8a9d8214d8af 100644
  module_param_named(mousepoll, hid_mousepoll_interval, uint, 0644);
  MODULE_PARM_DESC(mousepoll, "Polling interval of mice");
  
-@@ -1112,7 +1112,9 @@ static int usbhid_start(struct hid_device *hid)
+@@ -1112,7 +1112,9 @@ static int usbhid_start(struct hid_devic
  		 */
  		switch (hid->collection->usage) {
  		case HID_GD_MOUSE:
@@ -32,6 +30,3 @@ index 2dcaf31eb9cd..8a9d8214d8af 100644
  				interval = hid_mousepoll_interval;
  			break;
  		case HID_GD_JOYSTICK:
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0110-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch b/root/target/linux/bcm27xx/patches-5.15/950-0101-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0110-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0101-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch
index fbac4201..7996e7a6 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0110-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0101-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch
@@ -1,7 +1,7 @@
-From fe1fe298221d1a64cbbf5e76597b70f7f3fee05a Mon Sep 17 00:00:00 2001
+From ba801acdb40aa62c7262ef7a2d5b755f5be982c8 Mon Sep 17 00:00:00 2001
 From: Nick Bulleid <nedbulleid@fastmail.com>
 Date: Thu, 10 May 2018 21:57:02 +0100
-Subject: [PATCH 110/634] Add ability to export gpio used by gpio-poweroff
+Subject: [PATCH 101/828] Add ability to export gpio used by gpio-poweroff
 
 Signed-off-by: Nick Bulleid <nedbulleid@fastmail.com>
 
@@ -13,8 +13,6 @@ Signed-off-by: Nick Bulleid <nedbulleid@fastmail.com>
  drivers/power/reset/gpio-poweroff.c                      | 9 +++++++++
  2 files changed, 10 insertions(+)
 
-diff --git a/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt b/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt
-index 3e56c1b34a4c..76dd7b06e26a 100644
 --- a/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt
 +++ b/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt
 @@ -31,6 +31,7 @@ Optional properties:
@@ -25,11 +23,9 @@ index 3e56c1b34a4c..76dd7b06e26a 100644
  
  Examples:
  
-diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c
-index 3e670131f2a8..e5dca66360a7 100644
 --- a/drivers/power/reset/gpio-poweroff.c
 +++ b/drivers/power/reset/gpio-poweroff.c
-@@ -51,6 +51,7 @@ static int gpio_poweroff_probe(struct platform_device *pdev)
+@@ -51,6 +51,7 @@ static int gpio_poweroff_probe(struct pl
  	bool input = false;
  	enum gpiod_flags flags;
  	bool force = false;
@@ -37,7 +33,7 @@ index 3e670131f2a8..e5dca66360a7 100644
  
  	/* If a pm_power_off function has already been added, leave it alone */
  	force = of_property_read_bool(pdev->dev.of_node, "force");
-@@ -76,6 +77,12 @@ static int gpio_poweroff_probe(struct platform_device *pdev)
+@@ -76,6 +77,12 @@ static int gpio_poweroff_probe(struct pl
  	if (IS_ERR(reset_gpio))
  		return PTR_ERR(reset_gpio);
  
@@ -50,7 +46,7 @@ index 3e670131f2a8..e5dca66360a7 100644
  	pm_power_off = &gpio_poweroff_do_poweroff;
  	return 0;
  }
-@@ -85,6 +92,8 @@ static int gpio_poweroff_remove(struct platform_device *pdev)
+@@ -85,6 +92,8 @@ static int gpio_poweroff_remove(struct p
  	if (pm_power_off == &gpio_poweroff_do_poweroff)
  		pm_power_off = NULL;
  
@@ -59,6 +55,3 @@ index 3e670131f2a8..e5dca66360a7 100644
  	return 0;
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0111-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch b/root/target/linux/bcm27xx/patches-5.15/950-0102-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0111-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0102-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch
index 5032a8ee..3af14c62 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0111-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0102-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch
@@ -1,7 +1,7 @@
-From e9cf488073396af9b561f589b9f0f94c0e1c5ece Mon Sep 17 00:00:00 2001
+From 06ca5575a847956d93320528aad02ae43174d5fa Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Sat, 12 May 2018 21:35:43 +0100
-Subject: [PATCH 111/634] firmware/raspberrypi: Notify firmware of a reboot
+Subject: [PATCH 102/828] firmware/raspberrypi: Notify firmware of a reboot
 
 Register for reboot notifications, sending RPI_FIRMWARE_NOTIFY_REBOOT
 over the mailbox interface on reception.
@@ -11,8 +11,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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 54619623fe86..48d724aba308 100644
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
 @@ -12,6 +12,7 @@
@@ -23,7 +21,7 @@ index 54619623fe86..48d724aba308 100644
  #include <linux/slab.h>
  #include <soc/bcm2835/raspberrypi-firmware.h>
  
-@@ -179,6 +180,26 @@ int rpi_firmware_property(struct rpi_firmware *fw,
+@@ -179,6 +180,26 @@ int rpi_firmware_property(struct rpi_fir
  }
  EXPORT_SYMBOL_GPL(rpi_firmware_property);
  
@@ -50,7 +48,7 @@ index 54619623fe86..48d724aba308 100644
  static void
  rpi_firmware_print_firmware_revision(struct rpi_firmware *fw)
  {
-@@ -386,15 +407,32 @@ static struct platform_driver rpi_firmware_driver = {
+@@ -386,15 +407,32 @@ static struct platform_driver rpi_firmwa
  	.remove		= rpi_firmware_remove,
  };
  
@@ -84,6 +82,3 @@ index 54619623fe86..48d724aba308 100644
  }
  module_exit(rpi_firmware_exit);
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0112-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch b/root/target/linux/bcm27xx/patches-5.15/950-0103-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch
similarity index 79%
rename from root/target/linux/bcm27xx/patches-5.15/0112-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0103-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch
index e5491e6b..7d1ce61d 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0112-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0103-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch
@@ -1,7 +1,7 @@
-From 759463faec71373265fe031f668636a0b4e3c862 Mon Sep 17 00:00:00 2001
+From 97c008f17d345fe2e6145d454538507f073da9f0 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Thu, 14 Jun 2018 11:21:04 +0100
-Subject: [PATCH 112/634] irqchip: irq-bcm2835: Calc. FIQ_START at boot-time
+Subject: [PATCH 103/828] irqchip: irq-bcm2835: Calc. FIQ_START at boot-time
 
 ad83c7cb2f37 ("irqchip/irq-bcm2836: Add support for DT interrupt polarity")
 changed the way that the BCM2836/7 local interrupts are mapped; instead
@@ -26,8 +26,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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 8950debf451b..7ed1b1fc642d 100644
 --- a/drivers/irqchip/irq-bcm2835.c
 +++ b/drivers/irqchip/irq-bcm2835.c
 @@ -74,8 +74,6 @@
@@ -39,7 +37,7 @@ index 8950debf451b..7ed1b1fc642d 100644
  
  static const int reg_pending[] __initconst = { 0x00, 0x04, 0x08 };
  static const int reg_enable[] __initconst = { 0x18, 0x10, 0x14 };
-@@ -203,7 +201,7 @@ static int __init armctrl_of_init(struct device_node *node,
+@@ -203,7 +201,7 @@ static int __init armctrl_of_init(struct
  				  bool is_2836)
  {
  	void __iomem *base;
@@ -48,7 +46,7 @@ index 8950debf451b..7ed1b1fc642d 100644
  	u32 reg;
  
  	base = of_iomap(node, 0);
-@@ -243,6 +241,8 @@ static int __init armctrl_of_init(struct device_node *node,
+@@ -243,6 +241,8 @@ static int __init armctrl_of_init(struct
  		pr_err(FW_BUG "Bootloader left fiq enabled\n");
  	}
  
@@ -57,7 +55,7 @@ index 8950debf451b..7ed1b1fc642d 100644
  	if (is_2836) {
  		int parent_irq = irq_of_parse_and_map(node, 0);
  
-@@ -273,7 +273,7 @@ static int __init armctrl_of_init(struct device_node *node,
+@@ -273,7 +273,7 @@ static int __init armctrl_of_init(struct
  		}
  	}
  #ifndef CONFIG_ARM64
@@ -66,6 +64,3 @@ index 8950debf451b..7ed1b1fc642d 100644
  #endif
  
  	return 0;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0113-of-configfs-Use-of_overlay_fdt_apply-API-call.patch b/root/target/linux/bcm27xx/patches-5.15/950-0104-of-configfs-Use-of_overlay_fdt_apply-API-call.patch
similarity index 79%
rename from root/target/linux/bcm27xx/patches-5.15/0113-of-configfs-Use-of_overlay_fdt_apply-API-call.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0104-of-configfs-Use-of_overlay_fdt_apply-API-call.patch
index 8e872c4e..ae19d14a 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0113-of-configfs-Use-of_overlay_fdt_apply-API-call.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0104-of-configfs-Use-of_overlay_fdt_apply-API-call.patch
@@ -1,7 +1,7 @@
-From d35fd0cfaba64236f87d1daabe43552e5e1bfd59 Mon Sep 17 00:00:00 2001
+From 168360c7ce5a39bc5a7ba6eb3eebf045d2b1ff6c Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Thu, 14 Jun 2018 15:07:26 +0100
-Subject: [PATCH 113/634] of: configfs: Use of_overlay_fdt_apply API call
+Subject: [PATCH 104/828] of: configfs: Use of_overlay_fdt_apply API call
 
 The published API to the dynamic overlay application mechanism now
 takes a Flattened Device Tree blob as input so that it can manage the
@@ -14,8 +14,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/of/configfs.c | 47 +++++++------------------------------------
  1 file changed, 7 insertions(+), 40 deletions(-)
 
-diff --git a/drivers/of/configfs.c b/drivers/of/configfs.c
-index 178f0629b0f0..ac04301dabe1 100644
 --- a/drivers/of/configfs.c
 +++ b/drivers/of/configfs.c
 @@ -40,41 +40,6 @@ struct cfs_overlay_item {
@@ -60,7 +58,7 @@ index 178f0629b0f0..ac04301dabe1 100644
  static inline struct cfs_overlay_item *to_cfs_overlay_item(
  		struct config_item *item)
  {
-@@ -115,7 +80,8 @@ static ssize_t cfs_overlay_item_path_store(struct config_item *item,
+@@ -115,7 +80,8 @@ static ssize_t cfs_overlay_item_path_sto
  	if (err != 0)
  		goto out_err;
  
@@ -70,7 +68,7 @@ index 178f0629b0f0..ac04301dabe1 100644
  	if (err != 0)
  		goto out_err;
  
-@@ -136,7 +102,7 @@ static ssize_t cfs_overlay_item_status_show(struct config_item *item,
+@@ -136,7 +102,7 @@ static ssize_t cfs_overlay_item_status_s
  	struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
  
  	return sprintf(page, "%s\n",
@@ -79,7 +77,7 @@ index 178f0629b0f0..ac04301dabe1 100644
  }
  
  CONFIGFS_ATTR(cfs_overlay_item_, path);
-@@ -188,7 +154,8 @@ ssize_t cfs_overlay_item_dtbo_write(struct config_item *item,
+@@ -188,7 +154,8 @@ ssize_t cfs_overlay_item_dtbo_write(stru
  
  	overlay->dtbo_size = count;
  
@@ -89,7 +87,7 @@ index 178f0629b0f0..ac04301dabe1 100644
  	if (err != 0)
  		goto out_err;
  
-@@ -198,6 +165,7 @@ ssize_t cfs_overlay_item_dtbo_write(struct config_item *item,
+@@ -198,6 +165,7 @@ out_err:
  	kfree(overlay->dtbo);
  	overlay->dtbo = NULL;
  	overlay->dtbo_size = 0;
@@ -97,7 +95,7 @@ index 178f0629b0f0..ac04301dabe1 100644
  
  	return err;
  }
-@@ -213,7 +181,7 @@ static void cfs_overlay_release(struct config_item *item)
+@@ -213,7 +181,7 @@ static void cfs_overlay_release(struct c
  {
  	struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
  
@@ -106,7 +104,7 @@ index 178f0629b0f0..ac04301dabe1 100644
  		of_overlay_remove(&overlay->ov_id);
  	if (overlay->fw)
  		release_firmware(overlay->fw);
-@@ -241,7 +209,6 @@ static struct config_item *cfs_overlay_group_make_item(
+@@ -241,7 +209,6 @@ static struct config_item *cfs_overlay_g
  	overlay = kzalloc(sizeof(*overlay), GFP_KERNEL);
  	if (!overlay)
  		return ERR_PTR(-ENOMEM);
@@ -114,6 +112,3 @@ index 178f0629b0f0..ac04301dabe1 100644
  
  	config_item_init_type_name(&overlay->item, name, &cfs_overlay_type);
  	return &overlay->item;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0114-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch b/root/target/linux/bcm27xx/patches-5.15/950-0105-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0114-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0105-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch
index 55d102e2..59a6b00c 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0114-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0105-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch
@@ -1,7 +1,7 @@
-From 438226dbec00d528be8da6701ca7fdfe4fbe162f Mon Sep 17 00:00:00 2001
+From 2b16fa93032cfb57c6abaebf5c8f6fac9380632f Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Wed, 13 Jun 2018 15:21:10 +0100
-Subject: [PATCH 114/634] net: lan78xx: Disable TCP Segmentation Offload (TSO)
+Subject: [PATCH 105/828] net: lan78xx: Disable TCP Segmentation Offload (TSO)
 
 TSO seems to be having issues when packets are dropped and the
 remote end uses Selective Acknowledge (SACK) to denote that
@@ -19,11 +19,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  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 12363cfb3b61..a64f77eddef9 100644
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -443,6 +443,15 @@ static int msg_level = -1;
+@@ -445,6 +445,15 @@ static int msg_level = -1;
  module_param(msg_level, int, 0);
  MODULE_PARM_DESC(msg_level, "Override default message level");
  
@@ -39,7 +37,7 @@ index 12363cfb3b61..a64f77eddef9 100644
  static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
  {
  	u32 *buf;
-@@ -3286,8 +3295,14 @@ static int lan78xx_bind(struct lan78xx_net *dev, struct usb_interface *intf)
+@@ -3288,8 +3297,14 @@ static int lan78xx_bind(struct lan78xx_n
  	if (DEFAULT_RX_CSUM_ENABLE)
  		dev->net->features |= NETIF_F_RXCSUM;
  
@@ -56,6 +54,3 @@ index 12363cfb3b61..a64f77eddef9 100644
  
  	if (DEFAULT_VLAN_RX_OFFLOAD)
  		dev->net->features |= NETIF_F_HW_VLAN_CTAG_RX;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0115-brcmfmac-Re-enable-firmware-roaming-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0106-brcmfmac-Re-enable-firmware-roaming-support.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0115-brcmfmac-Re-enable-firmware-roaming-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0106-brcmfmac-Re-enable-firmware-roaming-support.patch
index 9f98c7a4..97576af1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0115-brcmfmac-Re-enable-firmware-roaming-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0106-brcmfmac-Re-enable-firmware-roaming-support.patch
@@ -1,7 +1,7 @@
-From c86d73b910b2d0668f1439293e783f90c7282862 Mon Sep 17 00:00:00 2001
+From f1e3a14d9a0af6aa18db40ee26e84baf9a15b897 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Wed, 20 Jun 2018 12:20:01 +0100
-Subject: [PATCH 115/634] brcmfmac: Re-enable firmware roaming support
+Subject: [PATCH 106/828] brcmfmac: Re-enable firmware roaming support
 
 As of 4.18, a firmware that implements the update_connect_params
 method but doesn't claim to support roaming causes an error. We
@@ -16,8 +16,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
-index 591dcd04b4b4..e3758bd86acf 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
 @@ -59,7 +59,7 @@ static int brcmf_fcmode;
@@ -29,6 +27,3 @@ index 591dcd04b4b4..e3758bd86acf 100644
  module_param_named(roamoff, brcmf_roamoff, int, 0400);
  MODULE_PARM_DESC(roamoff, "Do not use internal roaming engine");
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0116-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch b/root/target/linux/bcm27xx/patches-5.15/950-0107-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0116-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0107-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch
index a4eb9f82..de03319b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0116-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0107-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch
@@ -1,7 +1,7 @@
-From efdc54127159071fb6e860964dae83a4a06aa4f3 Mon Sep 17 00:00:00 2001
+From 8285231cde27c4fe56b02fbbd3613deb7e19de73 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Thu, 5 Apr 2018 14:46:11 +0100
-Subject: [PATCH 116/634] lan78xx: Move enabling of EEE into PHY init code
+Subject: [PATCH 107/828] lan78xx: Move enabling of EEE into PHY init code
 
 Enable EEE mode as soon as possible after connecting to the PHY, and
 before phy_start. This avoids a second link negotiation, which speeds
@@ -14,11 +14,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/net/usb/lan78xx.c | 32 ++++++++++++++++----------------
  1 file changed, 16 insertions(+), 16 deletions(-)
 
-diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
-index a64f77eddef9..15f2989c9ba1 100644
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -2275,6 +2275,22 @@ static int lan78xx_phy_init(struct lan78xx_net *dev)
+@@ -2277,6 +2277,22 @@ static int lan78xx_phy_init(struct lan78
  	mii_adv_to_linkmode_adv_t(fc, mii_adv);
  	linkmode_or(phydev->advertising, fc, phydev->advertising);
  
@@ -41,7 +39,7 @@ index a64f77eddef9..15f2989c9ba1 100644
  	if (phydev->mdio.dev.of_node) {
  		u32 reg;
  		int len;
-@@ -2967,22 +2983,6 @@ static int lan78xx_open(struct net_device *net)
+@@ -2969,22 +2985,6 @@ static int lan78xx_open(struct net_devic
  
  	netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
  
@@ -64,6 +62,3 @@ index a64f77eddef9..15f2989c9ba1 100644
  	/* for Link Check */
  	if (dev->urb_intr) {
  		ret = usb_submit_urb(dev->urb_intr, GFP_KERNEL);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0117-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch b/root/target/linux/bcm27xx/patches-5.15/950-0108-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0117-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0108-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch
index d512256f..8b8c8cc1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0117-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0108-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch
@@ -1,15 +1,13 @@
-From 6faed4da3ef914751aac627ee5c06a971fddc3df Mon Sep 17 00:00:00 2001
+From 0a1a79dbb9a23fd6f100165fc30e9bee709f2615 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 17 Sep 2018 17:31:18 +0100
-Subject: [PATCH 117/634] cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880
+Subject: [PATCH 108/828] cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880
  with MEDIA_SUBDRV_AUTOSELECT
 
 ---
  drivers/media/spi/Kconfig | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/media/spi/Kconfig b/drivers/media/spi/Kconfig
-index 857ef4ace6e9..deae75ea3c44 100644
 --- a/drivers/media/spi/Kconfig
 +++ b/drivers/media/spi/Kconfig
 @@ -25,6 +25,7 @@ menu "Media SPI Adapters"
@@ -20,6 +18,3 @@ index 857ef4ace6e9..deae75ea3c44 100644
  	default m if !MEDIA_SUBDRV_AUTOSELECT
  	help
  	  Choose if you would like to have SPI interface support for Sony CXD2880.
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0118-firmware-raspberrypi-Add-backward-compatible-get_thr.patch b/root/target/linux/bcm27xx/patches-5.15/950-0109-firmware-raspberrypi-Add-backward-compatible-get_thr.patch
similarity index 79%
rename from root/target/linux/bcm27xx/patches-5.15/0118-firmware-raspberrypi-Add-backward-compatible-get_thr.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0109-firmware-raspberrypi-Add-backward-compatible-get_thr.patch
index e5b376c1..58de881a 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0118-firmware-raspberrypi-Add-backward-compatible-get_thr.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0109-firmware-raspberrypi-Add-backward-compatible-get_thr.patch
@@ -1,7 +1,7 @@
-From 16dd59155006adf282faabc52b8f410457b20dc3 Mon Sep 17 00:00:00 2001
+From ca718bdeea183f5953a6d67a919392219e37a419 Mon Sep 17 00:00:00 2001
 From: Stefan Wahren <stefan.wahren@i2se.com>
 Date: Sat, 13 Oct 2018 13:31:21 +0200
-Subject: [PATCH 118/634] firmware: raspberrypi: Add backward compatible
+Subject: [PATCH 109/828] firmware: raspberrypi: Add backward compatible
  get_throttled
 
 Avoid a hard userspace ABI change by adding a compatible get_throttled
@@ -14,8 +14,6 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
  drivers/firmware/raspberrypi.c | 33 +++++++++++++++++++++++++++++++++
  1 file changed, 33 insertions(+)
 
-diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
-index 48d724aba308..2a9edea7f0f1 100644
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
 @@ -31,6 +31,7 @@ struct rpi_firmware {
@@ -26,7 +24,7 @@ index 48d724aba308..2a9edea7f0f1 100644
  };
  
  static struct platform_device *g_pdev;
-@@ -176,6 +177,12 @@ int rpi_firmware_property(struct rpi_firmware *fw,
+@@ -176,6 +177,12 @@ int rpi_firmware_property(struct rpi_fir
  
  	kfree(data);
  
@@ -39,7 +37,7 @@ index 48d724aba308..2a9edea7f0f1 100644
  	return ret;
  }
  EXPORT_SYMBOL_GPL(rpi_firmware_property);
-@@ -200,6 +207,27 @@ static int rpi_firmware_notify_reboot(struct notifier_block *nb,
+@@ -200,6 +207,27 @@ static int rpi_firmware_notify_reboot(st
  	return 0;
  }
  
@@ -67,7 +65,7 @@ index 48d724aba308..2a9edea7f0f1 100644
  static void
  rpi_firmware_print_firmware_revision(struct rpi_firmware *fw)
  {
-@@ -229,6 +257,11 @@ rpi_register_hwmon_driver(struct device *dev, struct rpi_firmware *fw)
+@@ -229,6 +257,11 @@ rpi_register_hwmon_driver(struct device
  
  	rpi_hwmon = platform_device_register_data(dev, "raspberrypi-hwmon",
  						  -1, NULL, 0);
@@ -79,6 +77,3 @@ index 48d724aba308..2a9edea7f0f1 100644
  }
  
  static void rpi_register_clk_driver(struct device *dev)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0119-sc16is7xx-Don-t-spin-if-no-data-received.patch b/root/target/linux/bcm27xx/patches-5.15/950-0110-sc16is7xx-Don-t-spin-if-no-data-received.patch
similarity index 62%
rename from root/target/linux/bcm27xx/patches-5.15/0119-sc16is7xx-Don-t-spin-if-no-data-received.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0110-sc16is7xx-Don-t-spin-if-no-data-received.patch
index 6c60ae4a..a04a950d 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0119-sc16is7xx-Don-t-spin-if-no-data-received.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0110-sc16is7xx-Don-t-spin-if-no-data-received.patch
@@ -1,7 +1,7 @@
-From d8788cb9bf432fab42f1c8048369c9d7c62f6358 Mon Sep 17 00:00:00 2001
+From a1b057fd66559eac98a30df90eea0c4be07d4b98 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Tue, 6 Nov 2018 12:57:48 +0000
-Subject: [PATCH 119/634] sc16is7xx: Don't spin if no data received
+Subject: [PATCH 110/828] sc16is7xx: Don't spin if no data received
 
 See: https://github.com/raspberrypi/linux/issues/2676
 
@@ -10,11 +10,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/tty/serial/sc16is7xx.c | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
-index acbb615dd28f..f8adcb68c409 100644
 --- a/drivers/tty/serial/sc16is7xx.c
 +++ b/drivers/tty/serial/sc16is7xx.c
-@@ -696,6 +696,8 @@ static bool sc16is7xx_port_irq(struct sc16is7xx_port *s, int portno)
+@@ -696,6 +696,8 @@ static bool sc16is7xx_port_irq(struct sc
  			rxlen = sc16is7xx_port_read(port, SC16IS7XX_RXLVL_REG);
  			if (rxlen)
  				sc16is7xx_handle_rx(port, rxlen, iir);
@@ -23,6 +21,3 @@ index acbb615dd28f..f8adcb68c409 100644
  			break;
  		case SC16IS7XX_IIR_THRI_SRC:
  			sc16is7xx_handle_tx(port);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0120-drivers-thermal-step_wise-add-support-for-hysteresis.patch b/root/target/linux/bcm27xx/patches-5.15/950-0111-drivers-thermal-step_wise-add-support-for-hysteresis.patch
similarity index 84%
rename from root/target/linux/bcm27xx/patches-5.15/0120-drivers-thermal-step_wise-add-support-for-hysteresis.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0111-drivers-thermal-step_wise-add-support-for-hysteresis.patch
index 5def7b7e..e96f0bfc 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0120-drivers-thermal-step_wise-add-support-for-hysteresis.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0111-drivers-thermal-step_wise-add-support-for-hysteresis.patch
@@ -1,7 +1,7 @@
-From 1c32719a0b597d8ddfd724c515faf5468f7ebf3a Mon Sep 17 00:00:00 2001
+From a8971071993d10afbd8067dc5d1cf08623bba84c Mon Sep 17 00:00:00 2001
 From: Ram Chandrasekar <rkumbako@codeaurora.org>
 Date: Mon, 7 May 2018 11:54:08 -0600
-Subject: [PATCH 120/634] drivers: thermal: step_wise: add support for
+Subject: [PATCH 111/828] drivers: thermal: step_wise: add support for
  hysteresis
 
 Step wise governor increases the mitigation level when the temperature
@@ -21,8 +21,6 @@ Signed-off-by: Lina Iyer <ilina@codeaurora.org>
  drivers/thermal/gov_step_wise.c | 34 ++++++++++++++++++++++++---------
  1 file changed, 25 insertions(+), 9 deletions(-)
 
-diff --git a/drivers/thermal/gov_step_wise.c b/drivers/thermal/gov_step_wise.c
-index 12acb12aac50..9c8d615f3b63 100644
 --- a/drivers/thermal/gov_step_wise.c
 +++ b/drivers/thermal/gov_step_wise.c
 @@ -24,7 +24,7 @@
@@ -34,7 +32,7 @@ index 12acb12aac50..9c8d615f3b63 100644
   *    a. if the trend is THERMAL_TREND_RAISING, do nothing
   *    b. if the trend is THERMAL_TREND_DROPPING, use lower cooling
   *       state for this trip point, if the cooling state already
-@@ -115,7 +115,7 @@ static void update_passive_instance(struct thermal_zone_device *tz,
+@@ -115,7 +115,7 @@ static void update_passive_instance(stru
  
  static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip)
  {
@@ -43,7 +41,7 @@ index 12acb12aac50..9c8d615f3b63 100644
  	enum thermal_trip_type trip_type;
  	enum thermal_trend trend;
  	struct thermal_instance *instance;
-@@ -125,15 +125,19 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip)
+@@ -125,15 +125,19 @@ static void thermal_zone_trip_update(str
  	tz->ops->get_trip_temp(tz, trip, &trip_temp);
  	tz->ops->get_trip_type(tz, trip, &trip_type);
  
@@ -70,7 +68,7 @@ index 12acb12aac50..9c8d615f3b63 100644
  
  	mutex_lock(&tz->lock);
  
-@@ -142,6 +146,18 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip)
+@@ -142,6 +146,18 @@ static void thermal_zone_trip_update(str
  			continue;
  
  		old_target = instance->target;
@@ -89,6 +87,3 @@ index 12acb12aac50..9c8d615f3b63 100644
  		instance->target = get_target_state(instance, trend, throttle);
  		dev_dbg(&instance->cdev->device, "old_target=%d, target=%d\n",
  					old_target, (int)instance->target);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0121-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch b/root/target/linux/bcm27xx/patches-5.15/950-0112-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch
similarity index 63%
rename from root/target/linux/bcm27xx/patches-5.15/0121-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0112-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch
index 21d10b3c..96295ebd 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0121-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0112-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch
@@ -1,7 +1,7 @@
-From d1a47976d8df8e6b983d674ba530f2a2301e9095 Mon Sep 17 00:00:00 2001
+From 4d751240eaf0019819c17ede7e31309f4744f732 Mon Sep 17 00:00:00 2001
 From: Serge Schneider <serge@raspberrypi.org>
 Date: Tue, 2 Oct 2018 11:14:15 +0100
-Subject: [PATCH 121/634] drivers: thermal: step_wise: avoid throttling at
+Subject: [PATCH 112/828] drivers: thermal: step_wise: avoid throttling at
  hysteresis temperature after dropping below it
 
 Signed-off-by: Serge Schneider <serge@raspberrypi.org>
@@ -9,11 +9,9 @@ Signed-off-by: Serge Schneider <serge@raspberrypi.org>
  drivers/thermal/gov_step_wise.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/thermal/gov_step_wise.c b/drivers/thermal/gov_step_wise.c
-index 9c8d615f3b63..629f02fce2f2 100644
 --- a/drivers/thermal/gov_step_wise.c
 +++ b/drivers/thermal/gov_step_wise.c
-@@ -153,7 +153,7 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip)
+@@ -153,7 +153,7 @@ static void thermal_zone_trip_update(str
  		 */
  		if (tz->temperature >= trip_temp ||
  		   (tz->temperature >= hyst_temp &&
@@ -22,6 +20,3 @@ index 9c8d615f3b63..629f02fce2f2 100644
  			throttle = true;
  			trace_thermal_zone_trip(tz, trip, trip_type);
  		}
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0122-Update-issue-templates-2736.patch b/root/target/linux/bcm27xx/patches-5.15/950-0113-Update-issue-templates-2736.patch
similarity index 88%
rename from root/target/linux/bcm27xx/patches-5.15/0122-Update-issue-templates-2736.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0113-Update-issue-templates-2736.patch
index ce9c7f8a..567fcd88 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0122-Update-issue-templates-2736.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0113-Update-issue-templates-2736.patch
@@ -1,16 +1,13 @@
-From 6f8e12684ab8ab6cc70c57281c4ce8392b1cd36f Mon Sep 17 00:00:00 2001
+From 95377f00223dff9dcd65c0368020a8514c07475a Mon Sep 17 00:00:00 2001
 From: James Hughes <JamesH65@users.noreply.github.com>
 Date: Fri, 2 Nov 2018 11:55:49 +0000
-Subject: [PATCH 122/634] Update issue templates (#2736)
+Subject: [PATCH 113/828] Update issue templates (#2736)
 
 ---
  .github/ISSUE_TEMPLATE/bug_report.md | 34 ++++++++++++++++++++++++++++
  1 file changed, 34 insertions(+)
  create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 
-diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
-new file mode 100644
-index 000000000000..09bdc4a96838
 --- /dev/null
 +++ b/.github/ISSUE_TEMPLATE/bug_report.md
 @@ -0,0 +1,34 @@
@@ -48,6 +45,3 @@ index 000000000000..09bdc4a96838
 +
 +**Additional context**
 +Add any other relevant context for the problem.
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0123-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch b/root/target/linux/bcm27xx/patches-5.15/950-0114-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0123-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0114-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch
index f8ea2e6a..60deef2d 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0123-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0114-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch
@@ -1,7 +1,7 @@
-From b3ad6a2681a971bc278e28b9da7174b8c1ad0571 Mon Sep 17 00:00:00 2001
+From a8b3aa46e354fee529a01c54448699e7e84734c9 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Mon, 26 Nov 2018 19:46:58 +0000
-Subject: [PATCH 123/634] net: lan78xx: Support auto-downshift to 100Mb/s
+Subject: [PATCH 114/828] net: lan78xx: Support auto-downshift to 100Mb/s
 
 Ethernet cables with faulty or missing pairs (specifically pairs C and
 D) allow auto-negotiation to 1000Mbs, but do not support the successful
@@ -17,8 +17,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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 9f1f2b6c97d4..4703a989b392 100644
 --- a/drivers/net/phy/microchip.c
 +++ b/drivers/net/phy/microchip.c
-@@ -233,6 +233,7 @@ static int lan88xx_probe(struct phy_device *phydev)
+@@ -233,6 +233,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 9f1f2b6c97d4..4703a989b392 100644
  	int len;
  
  	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
-@@ -262,6 +263,32 @@ static int lan88xx_probe(struct phy_device *phydev)
+@@ -262,6 +263,32 @@ static int lan88xx_probe(struct phy_devi
  		return -EINVAL;
  	}
  
@@ -76,8 +72,6 @@ index 9f1f2b6c97d4..4703a989b392 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.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0124-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch b/root/target/linux/bcm27xx/patches-5.15/950-0115-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0124-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0115-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch
index ca643793..d7584302 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0124-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0115-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch
@@ -1,7 +1,7 @@
-From f75c4eeea9177ea1d83382807c261ddf7ef630c6 Mon Sep 17 00:00:00 2001
+From 50839c6753456e3b56485f6dd0572a4833040ee9 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Thu, 10 Jan 2019 17:58:06 +0000
-Subject: [PATCH 124/634] firmware: raspberrypi: Report the fw variant during
+Subject: [PATCH 115/828] firmware: raspberrypi: Report the fw variant during
  probe
 
 The driver already reported the firmware build date during probe.
@@ -25,11 +25,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  include/soc/bcm2835/raspberrypi-firmware.h |  2 ++
  2 files changed, 41 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
-index 2a9edea7f0f1..2a7a0a9933d7 100644
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
-@@ -233,6 +233,15 @@ rpi_firmware_print_firmware_revision(struct rpi_firmware *fw)
+@@ -233,6 +233,15 @@ rpi_firmware_print_firmware_revision(str
  {
  	time64_t date_and_time;
  	u32 packet;
@@ -45,7 +43,7 @@ index 2a9edea7f0f1..2a7a0a9933d7 100644
  	int ret = rpi_firmware_property(fw,
  					RPI_FIRMWARE_GET_FIRMWARE_REVISION,
  					&packet, sizeof(packet));
-@@ -242,7 +251,35 @@ rpi_firmware_print_firmware_revision(struct rpi_firmware *fw)
+@@ -242,7 +251,35 @@ rpi_firmware_print_firmware_revision(str
  
  	/* This is not compatible with y2038 */
  	date_and_time = packet;
@@ -82,7 +80,7 @@ index 2a9edea7f0f1..2a7a0a9933d7 100644
  }
  
  static void
-@@ -338,6 +375,7 @@ static int rpi_firmware_probe(struct platform_device *pdev)
+@@ -338,6 +375,7 @@ static int rpi_firmware_probe(struct pla
  	g_pdev = pdev;
  
  	rpi_firmware_print_firmware_revision(fw);
@@ -90,11 +88,9 @@ index 2a9edea7f0f1..2a7a0a9933d7 100644
  	rpi_register_hwmon_driver(dev, fw);
  	rpi_register_clk_driver(dev);
  
-diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index a8cff19aea83..5ccd6dd0b74e 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,
@@ -103,6 +99,3 @@ index a8cff19aea83..5ccd6dd0b74e 100644
  
  	RPI_FIRMWARE_SET_CURSOR_INFO =                        0x00008010,
  	RPI_FIRMWARE_SET_CURSOR_STATE =                       0x00008011,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0125-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch b/root/target/linux/bcm27xx/patches-5.15/950-0116-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0125-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0116-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch
index e770eb16..e767abec 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0125-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0116-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch
@@ -1,7 +1,7 @@
-From 58c221e5353c167f6c10129070a516cf651636c5 Mon Sep 17 00:00:00 2001
+From 48509683d941444904e934e66ee95ed8675d1ec6 Mon Sep 17 00:00:00 2001
 From: Joshua Emele <jemele@acm.org>
 Date: Wed, 7 Nov 2018 16:07:40 -0800
-Subject: [PATCH 125/634] lan78xx: Debounce link events to minimize poll storm
+Subject: [PATCH 116/828] lan78xx: Debounce link events to minimize poll storm
 
 The bInterval is set to 4 (i.e. 8 microframes => 1ms) and the only bit
 that the driver pays attention to is "link was reset". If there's a
@@ -14,11 +14,9 @@ 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 15f2989c9ba1..daa4e1518d18 100644
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -452,6 +452,11 @@ static bool enable_tso;
+@@ -454,6 +454,11 @@ static bool enable_tso;
  module_param(enable_tso, bool, 0644);
  MODULE_PARM_DESC(enable_tso, "Enables TCP segmentation offload");
  
@@ -30,7 +28,7 @@ index 15f2989c9ba1..daa4e1518d18 100644
  static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
  {
  	u32 *buf;
-@@ -4146,7 +4151,13 @@ static int lan78xx_probe(struct usb_interface *intf,
+@@ -4148,7 +4153,13 @@ static int lan78xx_probe(struct usb_inte
  	netdev->max_mtu = MAX_SINGLE_PACKET_SIZE;
  	netif_set_gso_max_size(netdev, MAX_SINGLE_PACKET_SIZE - MAX_HEADER);
  
@@ -45,6 +43,3 @@ index 15f2989c9ba1..daa4e1518d18 100644
  	maxp = usb_maxpacket(dev->udev, dev->pipe_intr, 0);
  	buf = kmalloc(maxp, GFP_KERNEL);
  	if (buf) {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0126-lan78xx-EEE-support-is-now-a-PHY-property.patch b/root/target/linux/bcm27xx/patches-5.15/950-0117-lan78xx-EEE-support-is-now-a-PHY-property.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0126-lan78xx-EEE-support-is-now-a-PHY-property.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0117-lan78xx-EEE-support-is-now-a-PHY-property.patch
index b5502929..9df5f5f8 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0126-lan78xx-EEE-support-is-now-a-PHY-property.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0117-lan78xx-EEE-support-is-now-a-PHY-property.patch
@@ -1,7 +1,7 @@
-From 1b9bdc36273501949b7ad4e93833302c4cba1229 Mon Sep 17 00:00:00 2001
+From 0724d386878451b0e8db4d10b5859d0651ce6257 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Tue, 5 Mar 2019 09:51:22 +0000
-Subject: [PATCH 126/634] lan78xx: EEE support is now a PHY property
+Subject: [PATCH 117/828] lan78xx: EEE support is now a PHY property
 
 Now that EEE support is a property of the PHY, use the PHY's DT node
 when querying the EEE-related properties.
@@ -13,11 +13,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/net/usb/lan78xx.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
-index daa4e1518d18..86661a19085f 100644
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -2280,7 +2280,7 @@ static int lan78xx_phy_init(struct lan78xx_net *dev)
+@@ -2282,7 +2282,7 @@ static int lan78xx_phy_init(struct lan78
  	mii_adv_to_linkmode_adv_t(fc, mii_adv);
  	linkmode_or(phydev->advertising, fc, phydev->advertising);
  
@@ -26,6 +24,3 @@ index daa4e1518d18..86661a19085f 100644
  				  "microchip,eee-enabled")) {
  		struct ethtool_eee edata;
  		memset(&edata, 0, sizeof(edata));
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0127-bcm2835-dma-Add-support-for-per-channel-flags.patch b/root/target/linux/bcm27xx/patches-5.15/950-0118-bcm2835-dma-Add-support-for-per-channel-flags.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0127-bcm2835-dma-Add-support-for-per-channel-flags.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0118-bcm2835-dma-Add-support-for-per-channel-flags.patch
index a23404a6..b2be3c1e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0127-bcm2835-dma-Add-support-for-per-channel-flags.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0118-bcm2835-dma-Add-support-for-per-channel-flags.patch
@@ -1,7 +1,7 @@
-From 8731a4b2e9cd96e110a3a3c331834632bb16148d Mon Sep 17 00:00:00 2001
+From 5f1575f4ad96028eaaf3c15d4d86cc04c0aa3b96 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Fri, 20 Jul 2018 22:03:41 +0100
-Subject: [PATCH 127/634] bcm2835-dma: Add support for per-channel flags
+Subject: [PATCH 118/828] bcm2835-dma: Add support for per-channel flags
 
 Add the ability to interpret the high bits of the dreq specifier as
 flags to be included in the DMA_CS register. The motivation for this
@@ -13,8 +13,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/dma/bcm2835-dma.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index bf7ba96a39f9..87b5d0bef355 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -139,6 +139,10 @@ struct bcm2835_desc {
@@ -28,7 +26,7 @@ index bf7ba96a39f9..87b5d0bef355 100644
  #define BCM2835_DMA_PER_MAP(x)	((x & 31) << 16) /* REQ source */
  #define BCM2835_DMA_WAIT(x)	((x & 31) << 21) /* add DMA-wait cycles */
  #define BCM2835_DMA_NO_WIDE_BURSTS BIT(26) /* no 2 beat write bursts */
-@@ -452,7 +456,8 @@ static void bcm2835_dma_start_desc(struct bcm2835_chan *c)
+@@ -452,7 +456,8 @@ static void bcm2835_dma_start_desc(struc
  	c->desc = d = to_bcm2835_dma_desc(&vd->tx);
  
  	writel(d->cb_list[0].paddr, c->chan_base + BCM2835_DMA_ADDR);
@@ -38,7 +36,7 @@ index bf7ba96a39f9..87b5d0bef355 100644
  }
  
  static irqreturn_t bcm2835_dma_callback(int irq, void *data)
-@@ -479,7 +484,8 @@ static irqreturn_t bcm2835_dma_callback(int irq, void *data)
+@@ -479,7 +484,8 @@ 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.
  	 */
@@ -48,6 +46,3 @@ index bf7ba96a39f9..87b5d0bef355 100644
  	       c->chan_base + BCM2835_DMA_CS);
  
  	d = c->desc;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0128-rtc-rv3028-Add-backup-switchover-mode-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0119-rtc-rv3028-Add-backup-switchover-mode-support.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0128-rtc-rv3028-Add-backup-switchover-mode-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0119-rtc-rv3028-Add-backup-switchover-mode-support.patch
index 96dcb634..dae84249 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0128-rtc-rv3028-Add-backup-switchover-mode-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0119-rtc-rv3028-Add-backup-switchover-mode-support.patch
@@ -1,15 +1,13 @@
-From f0f6b5591d1f27ac97131e0d895e71ddc1e3d7a5 Mon Sep 17 00:00:00 2001
+From cf0b475279648d32338002575c2541ab0cf86fc1 Mon Sep 17 00:00:00 2001
 From: Phil Howard <phil@gadgetoid.com>
 Date: Fri, 29 Mar 2019 10:53:14 +0000
-Subject: [PATCH 128/634] rtc: rv3028: Add backup switchover mode support
+Subject: [PATCH 119/828] rtc: rv3028: Add backup switchover mode support
 
 Signed-off-by: Phil Howard <phil@pimoroni.com>
 ---
  drivers/rtc/rtc-rv3028.c | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
-diff --git a/drivers/rtc/rtc-rv3028.c b/drivers/rtc/rtc-rv3028.c
-index 12c807306893..757c0ff82bdb 100644
 --- a/drivers/rtc/rtc-rv3028.c
 +++ b/drivers/rtc/rtc-rv3028.c
 @@ -80,6 +80,7 @@
@@ -20,7 +18,7 @@ index 12c807306893..757c0ff82bdb 100644
  
  #define OFFSET_STEP_PPT			953674
  
-@@ -789,6 +790,7 @@ static int rv3028_probe(struct i2c_client *client)
+@@ -789,6 +790,7 @@ static int rv3028_probe(struct i2c_clien
  	struct rv3028_data *rv3028;
  	int ret, status;
  	u32 ohms;
@@ -28,7 +26,7 @@ index 12c807306893..757c0ff82bdb 100644
  	struct nvmem_config nvmem_cfg = {
  		.name = "rv3028_nvram",
  		.word_size = 1,
-@@ -855,6 +857,21 @@ static int rv3028_probe(struct i2c_client *client)
+@@ -855,6 +857,21 @@ static int rv3028_probe(struct i2c_clien
  	if (ret)
  		return ret;
  
@@ -50,6 +48,3 @@ index 12c807306893..757c0ff82bdb 100644
  	/* setup trickle charger */
  	if (!device_property_read_u32(&client->dev, "trickle-resistor-ohms",
  				      &ohms)) {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0129-lan78xx-use-default-alignment-for-rx-buffers.patch b/root/target/linux/bcm27xx/patches-5.15/950-0120-lan78xx-use-default-alignment-for-rx-buffers.patch
similarity index 63%
rename from root/target/linux/bcm27xx/patches-5.15/0129-lan78xx-use-default-alignment-for-rx-buffers.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0120-lan78xx-use-default-alignment-for-rx-buffers.patch
index 0327730d..ccd61745 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0129-lan78xx-use-default-alignment-for-rx-buffers.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0120-lan78xx-use-default-alignment-for-rx-buffers.patch
@@ -1,7 +1,7 @@
-From 27442146992db075539b1766d7328d26030053b5 Mon Sep 17 00:00:00 2001
+From 5009ffcedc138499094a6126845ec5dc07b6c134 Mon Sep 17 00:00:00 2001
 From: P33M <p33m@github.com>
 Date: Thu, 2 May 2019 11:53:45 +0100
-Subject: [PATCH 129/634] lan78xx: use default alignment for rx buffers
+Subject: [PATCH 120/828] lan78xx: use default alignment for rx buffers
 
 The lan78xx uses a 12-byte hardware rx header, so there is no need
 to allocate SKBs with NET_IP_ALIGN set. Removes alignment faults
@@ -10,11 +10,9 @@ in both dwc_otg and in ipv6 processing.
  drivers/net/usb/lan78xx.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
-index 86661a19085f..fdcf14aa4485 100644
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -3525,7 +3525,7 @@ static int rx_submit(struct lan78xx_net *dev, struct urb *urb, gfp_t flags)
+@@ -3527,7 +3527,7 @@ static int rx_submit(struct lan78xx_net
  	size_t size = dev->rx_urb_size;
  	int ret = 0;
  
@@ -23,6 +21,3 @@ index 86661a19085f..fdcf14aa4485 100644
  	if (!skb) {
  		usb_free_urb(urb);
  		return -ENOMEM;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0130-media-tc358743-Increase-FIFO-level-to-374.patch b/root/target/linux/bcm27xx/patches-5.15/950-0121-media-tc358743-Increase-FIFO-level-to-374.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0130-media-tc358743-Increase-FIFO-level-to-374.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0121-media-tc358743-Increase-FIFO-level-to-374.patch
index 103588bf..d4709543 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0130-media-tc358743-Increase-FIFO-level-to-374.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0121-media-tc358743-Increase-FIFO-level-to-374.patch
@@ -1,7 +1,7 @@
-From e2397630c8659f508f7c49f2b892a343b203b17b Mon Sep 17 00:00:00 2001
+From db5eb041d475395efbd792b0b6cc3bd9940330b1 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Wed, 31 Oct 2018 14:56:59 +0000
-Subject: [PATCH 130/634] media: tc358743: Increase FIFO level to 374.
+Subject: [PATCH 121/828] media: tc358743: Increase FIFO level to 374.
 
 The existing fixed value of 16 worked for UYVY 720P60 over
 2 lanes at 594MHz, or UYVY 1080P60 over 4 lanes. (RGB888
@@ -18,11 +18,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  drivers/media/i2c/tc358743.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
-index 3205cd8298dd..ae879e0835ff 100644
 --- a/drivers/media/i2c/tc358743.c
 +++ b/drivers/media/i2c/tc358743.c
-@@ -1950,7 +1950,7 @@ static int tc358743_probe_of(struct tc358743_state *state)
+@@ -1950,7 +1950,7 @@ static int tc358743_probe_of(struct tc35
  	state->pdata.ddc5v_delay = DDC5V_DELAY_100_MS;
  	state->pdata.enable_hdcp = false;
  	/* A FIFO level of 16 should be enough for 2-lane 720p60 at 594 MHz. */
@@ -31,6 +29,3 @@ index 3205cd8298dd..ae879e0835ff 100644
  	/*
  	 * The PLL input clock is obtained by dividing refclk by pll_prd.
  	 * It must be between 6 MHz and 40 MHz, lower frequency is better.
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0131-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch b/root/target/linux/bcm27xx/patches-5.15/950-0122-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch
similarity index 84%
rename from root/target/linux/bcm27xx/patches-5.15/0131-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0122-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch
index 4bed6839..ac49955e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0131-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0122-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch
@@ -1,7 +1,7 @@
-From 6e591be1d2f0902c35a3cd58b8c17fcae0f8d14c Mon Sep 17 00:00:00 2001
+From f75fb7b3a383480ec14696ad544ce83390ae600f Mon Sep 17 00:00:00 2001
 From: Philipp Zabel <p.zabel@pengutronix.de>
 Date: Thu, 21 Sep 2017 17:30:24 +0200
-Subject: [PATCH 131/634] media: tc358743: fix connected/active CSI-2 lane
+Subject: [PATCH 122/828] media: tc358743: fix connected/active CSI-2 lane
  reporting
 
 g_mbus_config was supposed to indicate all supported lane numbers, not
@@ -22,11 +22,9 @@ Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
  include/media/v4l2-mediabus.h |  8 ++++++++
  2 files changed, 20 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
-index ae879e0835ff..1f4d78b147bb 100644
 --- a/drivers/media/i2c/tc358743.c
 +++ b/drivers/media/i2c/tc358743.c
-@@ -1609,11 +1609,20 @@ static int tc358743_get_mbus_config(struct v4l2_subdev *sd,
+@@ -1609,11 +1609,20 @@ static int tc358743_get_mbus_config(stru
  				    struct v4l2_mbus_config *cfg)
  {
  	struct tc358743_state *state = to_state(sd);
@@ -49,7 +47,7 @@ index ae879e0835ff..1f4d78b147bb 100644
  
  	switch (state->csi_lanes_in_use) {
  	case 1:
-@@ -2056,6 +2065,7 @@ static int tc358743_probe(struct i2c_client *client)
+@@ -2056,6 +2065,7 @@ static int tc358743_probe(struct i2c_cli
  	if (pdata) {
  		state->pdata = *pdata;
  		state->bus.flags = V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;
@@ -57,8 +55,6 @@ index ae879e0835ff..1f4d78b147bb 100644
  	} else {
  		err = tc358743_probe_of(state);
  		if (err == -ENODEV)
-diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
-index 841e190aedd9..80a641840071 100644
 --- a/include/media/v4l2-mediabus.h
 +++ b/include/media/v4l2-mediabus.h
 @@ -92,6 +92,14 @@
@@ -76,6 +72,3 @@ index 841e190aedd9..80a641840071 100644
  
  /**
   * enum v4l2_mbus_type - media bus type
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0132-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch b/root/target/linux/bcm27xx/patches-5.15/950-0123-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch
similarity index 88%
rename from root/target/linux/bcm27xx/patches-5.15/0132-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0123-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch
index a0d89a75..a002f88f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0132-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0123-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch
@@ -1,7 +1,7 @@
-From 666ac967be9f4e7c7cb6928393116fcedce24585 Mon Sep 17 00:00:00 2001
+From 15d6e9de88d3a37f090ed837931215659d0d9b3d Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Wed, 31 Oct 2018 14:57:21 +0000
-Subject: [PATCH 132/634] media: tc358743: Add support for 972Mbit/s link freq.
+Subject: [PATCH 123/828] media: tc358743: Add support for 972Mbit/s link freq.
 
 Adds register setups for running the CSI lanes at 972Mbit/s,
 which allows 1080P50 UYVY down 2 lanes.
@@ -11,11 +11,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  drivers/media/i2c/tc358743.c | 47 +++++++++++++++++++++++++-----------
  1 file changed, 33 insertions(+), 14 deletions(-)
 
-diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
-index 1f4d78b147bb..d5c6e1f0d8bd 100644
 --- a/drivers/media/i2c/tc358743.c
 +++ b/drivers/media/i2c/tc358743.c
-@@ -1979,6 +1979,7 @@ static int tc358743_probe_of(struct tc358743_state *state)
+@@ -1979,6 +1979,7 @@ static int tc358743_probe_of(struct tc35
  	/*
  	 * The CSI bps per lane must be between 62.5 Mbps and 1 Gbps.
  	 * The default is 594 Mbps for 4-lane 1080p60 or 2-lane 720p60.
@@ -23,7 +21,7 @@ index 1f4d78b147bb..d5c6e1f0d8bd 100644
  	 */
  	bps_pr_lane = 2 * endpoint.link_frequencies[0];
  	if (bps_pr_lane < 62500000U || bps_pr_lane > 1000000000U) {
-@@ -1992,23 +1993,41 @@ static int tc358743_probe_of(struct tc358743_state *state)
+@@ -1992,23 +1993,41 @@ static int tc358743_probe_of(struct tc35
  			       state->pdata.refclk_hz * state->pdata.pll_prd;
  
  	/*
@@ -79,6 +77,3 @@ index 1f4d78b147bb..d5c6e1f0d8bd 100644
  
  	state->reset_gpio = devm_gpiod_get_optional(dev, "reset",
  						    GPIOD_OUT_LOW);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0133-media-tc358743-Check-I2C-succeeded-during-probe.patch b/root/target/linux/bcm27xx/patches-5.15/950-0124-media-tc358743-Check-I2C-succeeded-during-probe.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0133-media-tc358743-Check-I2C-succeeded-during-probe.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0124-media-tc358743-Check-I2C-succeeded-during-probe.patch
index d4fe8fca..3b5c239b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0133-media-tc358743-Check-I2C-succeeded-during-probe.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0124-media-tc358743-Check-I2C-succeeded-during-probe.patch
@@ -1,7 +1,7 @@
-From d8fd0da70f0edd52bc18844106bff707edf69304 Mon Sep 17 00:00:00 2001
+From b35ca31456063ad7b78207135154dda210ea9569 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Wed, 31 Oct 2018 14:57:34 +0000
-Subject: [PATCH 133/634] media: tc358743: Check I2C succeeded during probe.
+Subject: [PATCH 124/828] media: tc358743: Check I2C succeeded during probe.
 
 The probe for the TC358743 reads the CHIPID register from
 the device and compares it to the expected value of 0.
@@ -18,11 +18,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  drivers/media/i2c/tc358743.c | 27 +++++++++++++++++++++++----
  1 file changed, 23 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
-index d5c6e1f0d8bd..80e7afe88a8c 100644
 --- a/drivers/media/i2c/tc358743.c
 +++ b/drivers/media/i2c/tc358743.c
-@@ -110,7 +110,7 @@ static inline struct tc358743_state *to_state(struct v4l2_subdev *sd)
+@@ -110,7 +110,7 @@ static inline struct tc358743_state *to_
  
  /* --------------- I2C --------------- */
  
@@ -31,7 +29,7 @@ index d5c6e1f0d8bd..80e7afe88a8c 100644
  {
  	struct tc358743_state *state = to_state(sd);
  	struct i2c_client *client = state->i2c_client;
-@@ -136,6 +136,7 @@ static void i2c_rd(struct v4l2_subdev *sd, u16 reg, u8 *values, u32 n)
+@@ -136,6 +136,7 @@ static void i2c_rd(struct v4l2_subdev *s
  		v4l2_err(sd, "%s: reading register 0x%x from 0x%x failed\n",
  				__func__, reg, client->addr);
  	}
@@ -39,7 +37,7 @@ index d5c6e1f0d8bd..80e7afe88a8c 100644
  }
  
  static void i2c_wr(struct v4l2_subdev *sd, u16 reg, u8 *values, u32 n)
-@@ -192,15 +193,24 @@ static void i2c_wr(struct v4l2_subdev *sd, u16 reg, u8 *values, u32 n)
+@@ -192,15 +193,24 @@ static void i2c_wr(struct v4l2_subdev *s
  	}
  }
  
@@ -66,7 +64,7 @@ index d5c6e1f0d8bd..80e7afe88a8c 100644
  static noinline void i2c_wrreg(struct v4l2_subdev *sd, u16 reg, u32 val, u32 n)
  {
  	__le32 raw = cpu_to_le32(val);
-@@ -229,6 +239,13 @@ static u16 i2c_rd16(struct v4l2_subdev *sd, u16 reg)
+@@ -229,6 +239,13 @@ static u16 i2c_rd16(struct v4l2_subdev *
  	return i2c_rdreg(sd, reg, 2);
  }
  
@@ -80,7 +78,7 @@ index d5c6e1f0d8bd..80e7afe88a8c 100644
  static void i2c_wr16(struct v4l2_subdev *sd, u16 reg, u16 val)
  {
  	i2c_wrreg(sd, reg, val, 2);
-@@ -2066,6 +2083,7 @@ static int tc358743_probe(struct i2c_client *client)
+@@ -2066,6 +2083,7 @@ static int tc358743_probe(struct i2c_cli
  	struct tc358743_platform_data *pdata = client->dev.platform_data;
  	struct v4l2_subdev *sd;
  	u16 irq_mask = MASK_HDMI_MSK | MASK_CSI_MSK;
@@ -88,7 +86,7 @@ index d5c6e1f0d8bd..80e7afe88a8c 100644
  	int err;
  
  	if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-@@ -2098,7 +2116,8 @@ static int tc358743_probe(struct i2c_client *client)
+@@ -2098,7 +2116,8 @@ static int tc358743_probe(struct i2c_cli
  	sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS;
  
  	/* i2c access */
@@ -98,6 +96,3 @@ index d5c6e1f0d8bd..80e7afe88a8c 100644
  		v4l2_info(sd, "not a TC358743 on address 0x%x\n",
  			  client->addr << 1);
  		return -ENODEV;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0134-media-adv7180-Default-to-the-first-valid-input.patch b/root/target/linux/bcm27xx/patches-5.15/950-0125-media-adv7180-Default-to-the-first-valid-input.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0134-media-adv7180-Default-to-the-first-valid-input.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0125-media-adv7180-Default-to-the-first-valid-input.patch
index 4b6a02a0..ea5eef27 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0134-media-adv7180-Default-to-the-first-valid-input.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0125-media-adv7180-Default-to-the-first-valid-input.patch
@@ -1,7 +1,7 @@
-From e618b5a667ad1088ba96fac49a611839482fba52 Mon Sep 17 00:00:00 2001
+From f40a1002bfeeb00ea95785fb6608a602f255d539 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Wed, 31 Oct 2018 14:57:46 +0000
-Subject: [PATCH 134/634] media: adv7180: Default to the first valid input
+Subject: [PATCH 125/828] media: adv7180: Default to the first valid input
 
 The hardware default is differential CVBS on AIN1 & 2, which
 isn't very useful.
@@ -14,11 +14,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  drivers/media/i2c/adv7180.c | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
-diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
-index d9a99fcfacb1..b0c3635eab71 100644
 --- a/drivers/media/i2c/adv7180.c
 +++ b/drivers/media/i2c/adv7180.c
-@@ -1291,6 +1291,7 @@ static const struct adv7180_chip_info adv7282_m_info = {
+@@ -1291,6 +1291,7 @@ static const struct adv7180_chip_info ad
  static int init_device(struct adv7180_state *state)
  {
  	int ret;
@@ -26,7 +24,7 @@ index d9a99fcfacb1..b0c3635eab71 100644
  
  	mutex_lock(&state->mutex);
  
-@@ -1338,6 +1339,18 @@ static int init_device(struct adv7180_state *state)
+@@ -1338,6 +1339,18 @@ static int init_device(struct adv7180_st
  			goto out_unlock;
  	}
  
@@ -45,6 +43,3 @@ index d9a99fcfacb1..b0c3635eab71 100644
  out_unlock:
  	mutex_unlock(&state->mutex);
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0135-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch b/root/target/linux/bcm27xx/patches-5.15/950-0126-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0135-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0126-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch
index 72a4f53a..4bd36dbd 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0135-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0126-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch
@@ -1,7 +1,7 @@
-From da80461d2cdb46c86e83a827f2fe8c6901955fb9 Mon Sep 17 00:00:00 2001
+From 45ea1a817a286352823dafc5dc7d54b3c756ba16 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Wed, 31 Oct 2018 14:57:56 +0000
-Subject: [PATCH 135/634] media: adv7180: Add YPrPb support for ADV7282M
+Subject: [PATCH 126/828] media: adv7180: Add YPrPb support for ADV7282M
 
 The ADV7282M can support YPbPr on AIN1-3, but this was
 not selectable from the driver. Add it to the list of
@@ -12,11 +12,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  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 b0c3635eab71..725d52f8c742 100644
 --- a/drivers/media/i2c/adv7180.c
 +++ b/drivers/media/i2c/adv7180.c
-@@ -1280,6 +1280,7 @@ static const struct adv7180_chip_info adv7282_m_info = {
+@@ -1280,6 +1280,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 b0c3635eab71..725d52f8c742 100644
  		BIT(ADV7182_INPUT_DIFF_CVBS_AIN1_AIN2) |
  		BIT(ADV7182_INPUT_DIFF_CVBS_AIN3_AIN4) |
  		BIT(ADV7182_INPUT_DIFF_CVBS_AIN7_AIN8),
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0136-media-videodev2-Add-helper-defines-for-printing-FOUR.patch b/root/target/linux/bcm27xx/patches-5.15/950-0127-media-videodev2-Add-helper-defines-for-printing-FOUR.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0136-media-videodev2-Add-helper-defines-for-printing-FOUR.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0127-media-videodev2-Add-helper-defines-for-printing-FOUR.patch
index 7188ed19..fe2837da 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0136-media-videodev2-Add-helper-defines-for-printing-FOUR.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0127-media-videodev2-Add-helper-defines-for-printing-FOUR.patch
@@ -1,7 +1,7 @@
-From 61d27433dd24a86cf4d9fc15adbdaee9b0bbf586 Mon Sep 17 00:00:00 2001
+From 297cc4b3b9a7eff240a765361aa5c1de104c2745 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Wed, 31 Oct 2018 14:58:08 +0000
-Subject: [PATCH 136/634] media: videodev2: Add helper defines for printing
+Subject: [PATCH 127/828] media: videodev2: Add helper defines for printing
  FOURCCs
 
 New helper defines that allow printing of a FOURCC using
@@ -12,8 +12,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  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 9260791b8438..fba99eb8eeee 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -82,6 +82,11 @@
@@ -28,6 +26,3 @@ index 9260791b8438..fba99eb8eeee 100644
  /*
   *	E N U M S
   */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0137-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0128-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch
similarity index 91%
rename from root/target/linux/bcm27xx/patches-5.15/0137-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0128-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch
index 1a092215..6e4dc3fb 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0137-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0128-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch
@@ -1,7 +1,7 @@
-From fdbaf8ea35358d1801d4aa96eef9d0abd16f2067 Mon Sep 17 00:00:00 2001
+From dbe28acecf267fa08b7b0cd5bc6bac3f9ce3c96a Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Wed, 31 Oct 2018 14:59:06 +0000
-Subject: [PATCH 137/634] dt-bindings: Document BCM283x CSI2/CCP2 receiver
+Subject: [PATCH 128/828] dt-bindings: Document BCM283x CSI2/CCP2 receiver
 
 Document the DT bindings for the CSI2/CCP2 receiver peripheral
 (known as Unicam) on BCM283x SoCs.
@@ -13,9 +13,6 @@ Acked-by: Rob Herring <robh@kernel.org>
  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..7714fb374b34
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt
 @@ -0,0 +1,85 @@
@@ -104,6 +101,3 @@ index 000000000000..7714fb374b34
 +			};
 +		};
 +	};
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0138-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0129-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0138-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0129-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch
index df3871a7..551591f5 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0138-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0129-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch
@@ -1,7 +1,7 @@
-From e378fcf490ac637e73756ba292ca2cade34a0a63 Mon Sep 17 00:00:00 2001
+From b5af192790415e06e2aa20e544b5d8cefb0c783d Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Wed, 31 Oct 2018 14:59:40 +0000
-Subject: [PATCH 138/634] MAINTAINERS: Add entry for BCM2835 Unicam driver
+Subject: [PATCH 129/828] MAINTAINERS: Add entry for BCM2835 Unicam driver
 
 Adds entry for the new BCM2835 Unicam (CSI-2 receiver) driver
 
@@ -10,11 +10,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  MAINTAINERS | 7 +++++++
  1 file changed, 7 insertions(+)
 
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 3b79fd441dde..d2cdcab16854 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3551,6 +3551,13 @@ N:	bcm113*
+@@ -3552,6 +3552,13 @@ N:	bcm113*
  N:	bcm216*
  N:	kona
  
@@ -28,6 +26,3 @@ index 3b79fd441dde..d2cdcab16854 100644
  BROADCOM BCM47XX MIPS ARCHITECTURE
  M:	Hauke Mehrtens <hauke@hauke-m.de>
  M:	Rafał Miłecki <zajec5@gmail.com>
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0139-media-tc358743-Return-an-appropriate-colorspace-from.patch b/root/target/linux/bcm27xx/patches-5.15/950-0130-media-tc358743-Return-an-appropriate-colorspace-from.patch
similarity index 88%
rename from root/target/linux/bcm27xx/patches-5.15/0139-media-tc358743-Return-an-appropriate-colorspace-from.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0130-media-tc358743-Return-an-appropriate-colorspace-from.patch
index 4d268f98..a0f7807e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0139-media-tc358743-Return-an-appropriate-colorspace-from.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0130-media-tc358743-Return-an-appropriate-colorspace-from.patch
@@ -1,7 +1,7 @@
-From 05e7ff0589cd43d85f8ef8ed119eada1e1363206 Mon Sep 17 00:00:00 2001
+From 8da2229fe18b9682d61134c4acf5da8b8223f3cf Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Thu, 22 Nov 2018 17:31:06 +0000
-Subject: [PATCH 139/634] media: tc358743: Return an appropriate colorspace
+Subject: [PATCH 130/828] media: tc358743: Return an appropriate colorspace
  from tc358743_set_fmt
 
 When calling tc358743_set_fmt, the code was calling tc358743_get_fmt
@@ -24,11 +24,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  drivers/media/i2c/tc358743.c | 40 +++++++++++++-----------------------
  1 file changed, 14 insertions(+), 26 deletions(-)
 
-diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
-index 80e7afe88a8c..69f2d676448e 100644
 --- a/drivers/media/i2c/tc358743.c
 +++ b/drivers/media/i2c/tc358743.c
-@@ -1691,12 +1691,23 @@ static int tc358743_enum_mbus_code(struct v4l2_subdev *sd,
+@@ -1691,12 +1691,23 @@ static int tc358743_enum_mbus_code(struc
  	return 0;
  }
  
@@ -53,7 +51,7 @@ index 80e7afe88a8c..69f2d676448e 100644
  
  	if (format->pad != 0)
  		return -EINVAL;
-@@ -1706,23 +1717,7 @@ static int tc358743_get_fmt(struct v4l2_subdev *sd,
+@@ -1706,23 +1717,7 @@ static int tc358743_get_fmt(struct v4l2_
  	format->format.height = state->timings.bt.height;
  	format->format.field = V4L2_FIELD_NONE;
  
@@ -78,7 +76,7 @@ index 80e7afe88a8c..69f2d676448e 100644
  
  	return 0;
  }
-@@ -1737,18 +1732,11 @@ static int tc358743_set_fmt(struct v4l2_subdev *sd,
+@@ -1737,18 +1732,11 @@ static int tc358743_set_fmt(struct v4l2_
  	int ret = tc358743_get_fmt(sd, sd_state, format);
  
  	format->format.code = code;
@@ -98,6 +96,3 @@ index 80e7afe88a8c..69f2d676448e 100644
  	if (format->which == V4L2_SUBDEV_FORMAT_TRY)
  		return 0;
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0140-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch b/root/target/linux/bcm27xx/patches-5.15/950-0131-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch
similarity index 63%
rename from root/target/linux/bcm27xx/patches-5.15/0140-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0131-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch
index f416c743..de35a7ae 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0140-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0131-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch
@@ -1,7 +1,7 @@
-From 94e8756a3fbe57cd330aee9f55c13106ef33d8bb Mon Sep 17 00:00:00 2001
+From 5d469e359d66182ad76dab8050b2106fe8178117 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Mon, 29 Oct 2018 16:20:46 +0000
-Subject: [PATCH 140/634] staging: mmal-vchiq: Avoid use of bool in structures
+Subject: [PATCH 131/828] staging: mmal-vchiq: Avoid use of bool in structures
 
 Fixes up a checkpatch error "Avoid using bool structure members
 because of possible alignment issues".
@@ -11,11 +11,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  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 76d3f0399964..61b9c09144b1 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 76d3f0399964..61b9c09144b1 100644
  
  	mutex_unlock(&instance->vchiq_mutex);
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0141-staging-mmal-vchiq-Add-support-for-event-callbacks.patch b/root/target/linux/bcm27xx/patches-5.15/950-0132-staging-mmal-vchiq-Add-support-for-event-callbacks.patch
similarity index 85%
rename from root/target/linux/bcm27xx/patches-5.15/0141-staging-mmal-vchiq-Add-support-for-event-callbacks.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0132-staging-mmal-vchiq-Add-support-for-event-callbacks.patch
index 9b24e1d6..dc1a1ca3 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0141-staging-mmal-vchiq-Add-support-for-event-callbacks.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0132-staging-mmal-vchiq-Add-support-for-event-callbacks.patch
@@ -1,7 +1,7 @@
-From 07d8cb52585f164eee11100eecdc1228a73caba9 Mon Sep 17 00:00:00 2001
+From 6cc6ff878eb5f2ac6ba8ebc7983b06f13d97679b Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Mon, 24 Sep 2018 18:15:38 +0100
-Subject: [PATCH 141/634] staging: mmal-vchiq: Add support for event callbacks.
+Subject: [PATCH 132/828] staging: mmal-vchiq: Add support for event callbacks.
 
 (Preparation for the codec driver).
 The codec uses the event mechanism to report things such as
@@ -18,8 +18,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  .../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 5bd7410a034a..58763d6a5003 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 5bd7410a034a..58763d6a5003 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 b636e889c8a1..ab63835ce01c 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 b636e889c8a1..ab63835ce01c 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 61b9c09144b1..e78858d24c4e 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -143,6 +143,8 @@ struct mmal_msg_context {
@@ -89,7 +83,7 @@ index 61b9c09144b1..e78858d24c4e 100644
  
  			int status;	/* context status */
  
-@@ -233,18 +235,6 @@ release_msg_context(struct mmal_msg_context *msg_context)
+@@ -233,18 +235,6 @@ release_msg_context(struct mmal_msg_cont
  	kfree(msg_context);
  }
  
@@ -108,7 +102,7 @@ index 61b9c09144b1..e78858d24c4e 100644
  /* workqueue scheduled callback
   *
   * we do this because it is important we do not call any other vchiq
-@@ -266,13 +256,18 @@ static void buffer_work_cb(struct work_struct *work)
+@@ -266,13 +256,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 61b9c09144b1..e78858d24c4e 100644
  }
  
  /* workqueue scheduled callback to handle receiving buffers
-@@ -350,6 +345,7 @@ static int bulk_receive(struct vchiq_mmal_instance *instance,
+@@ -350,6 +345,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 61b9c09144b1..e78858d24c4e 100644
  
  	queue_work(msg_context->instance->bulk_wq,
  		   &msg_context->u.bulk.buffer_to_host_work);
-@@ -452,6 +448,103 @@ buffer_from_host(struct vchiq_mmal_instance *instance,
+@@ -452,6 +448,103 @@ buffer_from_host(struct vchiq_mmal_insta
  	return ret;
  }
  
@@ -240,7 +234,7 @@ index 61b9c09144b1..e78858d24c4e 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 61b9c09144b1..e78858d24c4e 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 61b9c09144b1..e78858d24c4e 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 61b9c09144b1..e78858d24c4e 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 61b9c09144b1..e78858d24c4e 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 61b9c09144b1..e78858d24c4e 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 61b9c09144b1..e78858d24c4e 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 61b9c09144b1..e78858d24c4e 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 = 0;
  
@@ -347,8 +341,6 @@ index 61b9c09144b1..e78858d24c4e 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 1dc81ecf9268..e87f88f99338 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 1dc81ecf9268..e87f88f99338 100644
  };
  
  struct vchiq_mmal_component {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0142-staging-vc04_services-Support-sending-data-to-MMAL-p.patch b/root/target/linux/bcm27xx/patches-5.15/950-0133-staging-vc04_services-Support-sending-data-to-MMAL-p.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0142-staging-vc04_services-Support-sending-data-to-MMAL-p.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0133-staging-vc04_services-Support-sending-data-to-MMAL-p.patch
index aa86c979..f1c49e21 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0142-staging-vc04_services-Support-sending-data-to-MMAL-p.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0133-staging-vc04_services-Support-sending-data-to-MMAL-p.patch
@@ -1,7 +1,7 @@
-From 7904cb3ffafcb955d707d1001bb04ad6c790cf17 Mon Sep 17 00:00:00 2001
+From 48c6aea8bc1f06926b1f98259a84add0f6fcaea5 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Mon, 24 Sep 2018 18:26:02 +0100
-Subject: [PATCH 142/634] staging: vc04_services: Support sending data to MMAL
+Subject: [PATCH 133/828] staging: vc04_services: Support sending data to MMAL
  ports
 
 Add the ability to send data to ports. This only supports
@@ -13,11 +13,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  .../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 e78858d24c4e..2fbb813c27f1 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -422,11 +422,19 @@ buffer_from_host(struct vchiq_mmal_instance *instance,
+@@ -422,11 +422,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;
@@ -42,6 +40,3 @@ index e78858d24c4e..2fbb813c27f1 100644
  
  	/* clear buffer type specific data */
  	memset(&m.u.buffer_from_host.buffer_header_type_specific, 0,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0143-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch b/root/target/linux/bcm27xx/patches-5.15/950-0134-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0143-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0134-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch
index de9249e4..d6bfae46 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0143-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0134-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch
@@ -1,7 +1,7 @@
-From 8b7ebc4f65ceacdd873a9c263716830780068ac1 Mon Sep 17 00:00:00 2001
+From b6e6c4ee225d5f72508ea1e8a30d3290305e824f Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Mon, 29 Oct 2018 17:57:45 +0000
-Subject: [PATCH 143/634] media: videobuf2: Allow exporting of a struct dmabuf
+Subject: [PATCH 134/828] media: videobuf2: Allow exporting of a struct dmabuf
 
 videobuf2 only allowed exporting a dmabuf as a file descriptor,
 but there are instances where having the struct dma_buf is
@@ -17,11 +17,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  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 033b0c83272f..8f06b89f1a24 100644
 --- a/drivers/media/common/videobuf2/videobuf2-core.c
 +++ b/drivers/media/common/videobuf2/videobuf2-core.c
-@@ -2144,12 +2144,12 @@ static int __find_plane_by_offset(struct vb2_queue *q, unsigned long off,
+@@ -2144,12 +2144,12 @@ static int __find_plane_by_offset(struct
  	return -EINVAL;
  }
  
@@ -37,7 +35,7 @@ index 033b0c83272f..8f06b89f1a24 100644
  	struct dma_buf *dbuf;
  
  	if (q->memory != VB2_MEMORY_MMAP) {
-@@ -2201,6 +2201,21 @@ int vb2_core_expbuf(struct vb2_queue *q, int *fd, unsigned int type,
+@@ -2201,6 +2201,21 @@ int vb2_core_expbuf(struct vb2_queue *q,
  		return -EINVAL;
  	}
  
@@ -59,15 +57,12 @@ index 033b0c83272f..8f06b89f1a24 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 3b5986cee073..4b72d0e16ee3 100644
 --- a/include/media/videobuf2-core.h
 +++ b/include/media/videobuf2-core.h
-@@ -905,6 +905,21 @@ int vb2_core_streamon(struct vb2_queue *q, unsigned int type);
-  */
+@@ -906,6 +906,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
@@ -82,9 +77,7 @@ index 3b5986cee073..4b72d0e16ee3 100644
 +			   unsigned int index, 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.33.1
-
+  * @fd:		pointer to the file descriptor associated with DMABUF
diff --git a/root/target/linux/bcm27xx/patches-5.15/0144-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch b/root/target/linux/bcm27xx/patches-5.15/950-0135-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0144-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0135-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch
index 9214fdaa..16840172 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0144-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0135-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch
@@ -1,7 +1,7 @@
-From c4144f221b64e8eee2fba7a5deab6c36ce4215bc Mon Sep 17 00:00:00 2001
+From 732a6f5cff4884bb5f75ea6c20c5f32920ee6019 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Tue, 22 Jan 2019 12:04:09 +0000
-Subject: [PATCH 144/634] staging: mmal-vchiq: Fix client_component for 64 bit
+Subject: [PATCH 135/828] staging: mmal-vchiq: Fix client_component for 64 bit
  kernel
 
 The MMAL client_component field is used with the event
@@ -19,11 +19,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  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 2fbb813c27f1..d6d98b20c76a 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -460,9 +460,9 @@ buffer_from_host(struct vchiq_mmal_instance *instance,
+@@ -460,9 +460,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)
  {
@@ -35,6 +33,3 @@ index 2fbb813c27f1..d6d98b20c76a 100644
  	struct vchiq_mmal_port *port = NULL;
  	struct mmal_msg_context *msg_context;
  	u32 port_num = msg->u.event_to_host.port_num;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0145-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch b/root/target/linux/bcm27xx/patches-5.15/950-0136-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch
similarity index 64%
rename from root/target/linux/bcm27xx/patches-5.15/0145-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0136-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch
index b3229994..11aa4967 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0145-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0136-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch
@@ -1,7 +1,7 @@
-From 61a9bb66ac81ed1916b1f6cdc3b08bbe0cc76e28 Mon Sep 17 00:00:00 2001
+From 984dd42eb74bdc492fff8bf5b221d6c5b8b4c917 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Thu, 24 Jan 2019 15:09:28 +0000
-Subject: [PATCH 145/634] clk: clk-bcm2835: Use %zd when printing size_t
+Subject: [PATCH 136/828] clk: clk-bcm2835: Use %zd when printing size_t
 
 The debug text for how many clocks have been registered
 uses "%d" with a size_t. Correct it to "%zd".
@@ -11,11 +11,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  drivers/clk/bcm/clk-bcm2835.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index 9b9a799a487d..44f1c05fce85 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -2376,7 +2376,7 @@ static int bcm2835_clk_probe(struct platform_device *pdev)
+@@ -2376,7 +2376,7 @@ static int bcm2835_clk_probe(struct plat
  		return ret;
  
  	/* note that we have registered all the clocks */
@@ -24,6 +22,3 @@ index 9b9a799a487d..44f1c05fce85 100644
  
  	return 0;
  }
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0146-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch b/root/target/linux/bcm27xx/patches-5.15/950-0137-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch
similarity index 87%
rename from root/target/linux/bcm27xx/patches-5.15/0146-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0137-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch
index 36f0ab2c..67914790 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0146-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0137-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch
@@ -1,7 +1,7 @@
-From 2742216cf3596595e38912acd453b64c4d5b4f97 Mon Sep 17 00:00:00 2001
+From d50bdbbaf7c2b9e4b61163eb7b30a4caaa4ee6ac Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Wed, 13 Feb 2019 12:33:29 +0000
-Subject: [PATCH 146/634] staging: mmal_vchiq: Add in the Bayer encoding
+Subject: [PATCH 137/828] staging: mmal_vchiq: Add in the Bayer encoding
  formats
 
 The list of formats was copied before Bayer support was added.
@@ -13,8 +13,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  .../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 2be9941a1f30..44ba91aa6d47 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 @@
@@ -51,6 +49,3 @@ index 2be9941a1f30..44ba91aa6d47 100644
  /** An EGL image handle
   */
  #define MMAL_ENCODING_EGL_IMAGE        MMAL_FOURCC('E', 'G', 'L', 'I')
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0147-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch b/root/target/linux/bcm27xx/patches-5.15/950-0138-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch
similarity index 85%
rename from root/target/linux/bcm27xx/patches-5.15/0147-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0138-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch
index 435e7654..833c3931 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0147-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0138-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch
@@ -1,7 +1,7 @@
-From b154c9ddbba27222c182440bf007774c55ec4096 Mon Sep 17 00:00:00 2001
+From 96d441dc7841527e95ea5ea714997f9d79ea14b5 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Mon, 18 Feb 2019 15:52:29 +0000
-Subject: [PATCH 147/634] staging: mmal-vchiq: Update mmal_parameters.h with
+Subject: [PATCH 138/828] staging: mmal-vchiq: Update mmal_parameters.h with
  recently defined params
 
 mmal_parameters.h hasn't been updated to reflect additions made
@@ -13,8 +13,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  .../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 a1e39b1b1701..1793103b18fd 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 @@ -580,7 +580,37 @@ enum mmal_parameter_video_type {
@@ -56,6 +54,3 @@ index a1e39b1b1701..1793103b18fd 100644
  };
  
  /** Valid mirror modes */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0148-staging-mmal-vchiq-Free-the-event-context-for-contro.patch b/root/target/linux/bcm27xx/patches-5.15/950-0139-staging-mmal-vchiq-Free-the-event-context-for-contro.patch
similarity index 66%
rename from root/target/linux/bcm27xx/patches-5.15/0148-staging-mmal-vchiq-Free-the-event-context-for-contro.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0139-staging-mmal-vchiq-Free-the-event-context-for-contro.patch
index e6408c00..d228efe1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0148-staging-mmal-vchiq-Free-the-event-context-for-contro.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0139-staging-mmal-vchiq-Free-the-event-context-for-contro.patch
@@ -1,7 +1,7 @@
-From a8b8a58bf93ed93e971fb1afa7a7ba596994bb11 Mon Sep 17 00:00:00 2001
+From 01e13ed3774b4550ec019f3c92814edf8b11ddea Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Wed, 1 May 2019 13:27:23 +0100
-Subject: [PATCH 148/634] staging: mmal-vchiq: Free the event context for
+Subject: [PATCH 139/828] staging: mmal-vchiq: Free the event context for
  control ports
 
 vchiq_mmal_component_init calls init_event_context for the
@@ -15,11 +15,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  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 d6d98b20c76a..b4893e08f54a 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]);
  
@@ -28,6 +26,3 @@ index d6d98b20c76a..b4893e08f54a 100644
  	mutex_unlock(&instance->vchiq_mutex);
  
  	return ret;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0149-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch b/root/target/linux/bcm27xx/patches-5.15/950-0140-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0149-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0140-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch
index ea2e1b51..9112bd15 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0149-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0140-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch
@@ -1,7 +1,7 @@
-From a454cb5bcb7e17e7065344e12c4a6820282449b9 Mon Sep 17 00:00:00 2001
+From bb7a88a8e9b0fec15f2e505c2742c9b6fbc33ac0 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Thu, 2 May 2019 15:50:01 +0100
-Subject: [PATCH 149/634] staging: mmal-vchiq: Fix memory leak in error path
+Subject: [PATCH 140/828] staging: mmal-vchiq: Fix memory leak in error path
 
 On error, vchiq_mmal_component_init could leave the
 event context allocated for ports.
@@ -12,11 +12,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  .../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 b4893e08f54a..38303b030156 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 b4893e08f54a..38303b030156 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 b4893e08f54a..38303b030156 100644
  unlock:
  	if (component)
  		component->in_use = 0;
-@@ -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 b4893e08f54a..38303b030156 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 = 0;
  
@@ -76,6 +74,3 @@ index b4893e08f54a..38303b030156 100644
  
  	mutex_unlock(&instance->vchiq_mutex);
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0150-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch b/root/target/linux/bcm27xx/patches-5.15/950-0141-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch
similarity index 71%
rename from root/target/linux/bcm27xx/patches-5.15/0150-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0141-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch
index f9a1e13c..03bf9f61 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0150-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0141-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch
@@ -1,7 +1,7 @@
-From e1ce50f1eb28a03b0291e56c9a560400594b8959 Mon Sep 17 00:00:00 2001
+From 3de45a590b6b8f96345b10c7cb1965bdf1a22ed5 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Wed, 12 Jun 2019 17:15:05 +0100
-Subject: [PATCH 150/634] w1: w1-gpio: Make GPIO an output for strong pullup
+Subject: [PATCH 141/828] w1: w1-gpio: Make GPIO an output for strong pullup
 
 The logic to drive the data line high to implement a strong pullup
 assumed that the pin was already an output - setting a value does
@@ -14,11 +14,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/w1/masters/w1-gpio.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
-index d4632aace402..4832cd8c2596 100644
 --- a/drivers/w1/masters/w1-gpio.c
 +++ b/drivers/w1/masters/w1-gpio.c
-@@ -30,7 +30,7 @@ static u8 w1_gpio_set_pullup(void *data, int delay)
+@@ -30,7 +30,7 @@ static u8 w1_gpio_set_pullup(void *data,
  			 * This will OVERRIDE open drain emulation and force-pull
  			 * the line high for some time.
  			 */
@@ -27,6 +25,3 @@ index d4632aace402..4832cd8c2596 100644
  			msleep(pdata->pullup_duration);
  			/*
  			 * This will simply set the line as input since we are doing
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0151-arm-bcm2835-Fix-FIQ-early-ioremap.patch b/root/target/linux/bcm27xx/patches-5.15/950-0142-arm-bcm2835-Fix-FIQ-early-ioremap.patch
similarity index 86%
rename from root/target/linux/bcm27xx/patches-5.15/0151-arm-bcm2835-Fix-FIQ-early-ioremap.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0142-arm-bcm2835-Fix-FIQ-early-ioremap.patch
index f0cb2dde..81a9aa48 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0151-arm-bcm2835-Fix-FIQ-early-ioremap.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0142-arm-bcm2835-Fix-FIQ-early-ioremap.patch
@@ -1,7 +1,7 @@
-From 9ed1c6436e27f743143024f1280229e614dd2072 Mon Sep 17 00:00:00 2001
+From 19c676cf4de5dea4a853093e52dabaa49967a326 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Wed, 20 Feb 2019 08:49:39 +0000
-Subject: [PATCH 151/634] arm: bcm2835: Fix FIQ early ioremap
+Subject: [PATCH 142/828] arm: bcm2835: Fix FIQ early ioremap
 
 The ioremapping creates mappings within the vmalloc area. The
 equivalent early function, create_mapping, now checks that the
@@ -15,8 +15,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0152-arm-bcm2835-DMA-can-only-address-1GB.patch b/root/target/linux/bcm27xx/patches-5.15/950-0143-arm-bcm2835-DMA-can-only-address-1GB.patch
similarity index 66%
rename from root/target/linux/bcm27xx/patches-5.15/0152-arm-bcm2835-DMA-can-only-address-1GB.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0143-arm-bcm2835-DMA-can-only-address-1GB.patch
index 1671de2a..3211dc7d 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0152-arm-bcm2835-DMA-can-only-address-1GB.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0143-arm-bcm2835-DMA-can-only-address-1GB.patch
@@ -1,7 +1,7 @@
-From 129c8b004eb7c432bcb9fc089c9a49ca82039700 Mon Sep 17 00:00:00 2001
+From a7fd907b5b54ae28b10471f7d08f36069b164733 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Wed, 29 May 2019 15:47:42 +0100
-Subject: [PATCH 152/634] arm: bcm2835: DMA can only address 1GB
+Subject: [PATCH 143/828] arm: bcm2835: DMA can only address 1GB
 
 The legacy peripherals can only address the first gigabyte of RAM, so
 ensure that DMA allocations are restricted to that region.
@@ -11,11 +11,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0153-hwrng-iproc-rng200-Add-BCM2838-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0144-hwrng-iproc-rng200-Add-BCM2838-support.patch
similarity index 89%
rename from root/target/linux/bcm27xx/patches-5.15/0153-hwrng-iproc-rng200-Add-BCM2838-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0144-hwrng-iproc-rng200-Add-BCM2838-support.patch
index 684eea00..f5086386 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0153-hwrng-iproc-rng200-Add-BCM2838-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0144-hwrng-iproc-rng200-Add-BCM2838-support.patch
@@ -1,7 +1,7 @@
-From d2bf716c9a53075e0afa4dc1289c9dc19f3a5bd6 Mon Sep 17 00:00:00 2001
+From 597c654989ecb0b9b75220157be37175bfbc2c5c Mon Sep 17 00:00:00 2001
 From: Stefan Wahren <wahrenst@gmx.net>
 Date: Sat, 4 May 2019 17:06:15 +0200
-Subject: [PATCH 153/634] hwrng: iproc-rng200: Add BCM2838 support
+Subject: [PATCH 144/828] hwrng: iproc-rng200: Add BCM2838 support
 
 The HWRNG on the BCM2838 is compatible to iproc-rng200, so add the
 support to this driver instead of bcm2835-rng.
@@ -20,8 +20,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/char/hw_random/iproc-rng200.c | 78 +++++++++++++++++++++++++--
  2 files changed, 76 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
-index 239eca4d6805..d17cc5f7fc03 100644
 --- a/drivers/char/hw_random/Kconfig
 +++ b/drivers/char/hw_random/Kconfig
 @@ -104,7 +104,7 @@ config HW_RANDOM_IPROC_RNG200
@@ -33,8 +31,6 @@ index 239eca4d6805..d17cc5f7fc03 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 a43743887db1..f689cd63deae 100644
 --- a/drivers/char/hw_random/iproc-rng200.c
 +++ b/drivers/char/hw_random/iproc-rng200.c
 @@ -28,6 +28,7 @@
@@ -69,7 +65,7 @@ index a43743887db1..f689cd63deae 100644
  
  struct iproc_rng200_dev {
  	struct hwrng rng;
-@@ -165,6 +173,64 @@ static int iproc_rng200_init(struct hwrng *rng)
+@@ -165,6 +173,64 @@ static int iproc_rng200_init(struct hwrn
  	return 0;
  }
  
@@ -134,7 +130,7 @@ index a43743887db1..f689cd63deae 100644
  static void iproc_rng200_cleanup(struct hwrng *rng)
  {
  	struct iproc_rng200_dev *priv = to_rng_priv(rng);
-@@ -189,11 +255,17 @@ static int iproc_rng200_probe(struct platform_device *pdev)
+@@ -189,11 +255,17 @@ static int iproc_rng200_probe(struct pla
  		return PTR_ERR(priv->base);
  	}
  
@@ -155,6 +151,3 @@ index a43743887db1..f689cd63deae 100644
  	/* Register driver */
  	ret = devm_hwrng_register(dev, &priv->rng);
  	if (ret) {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0154-bcmgenet-constrain-max-DMA-burst-length.patch b/root/target/linux/bcm27xx/patches-5.15/950-0145-bcmgenet-constrain-max-DMA-burst-length.patch
similarity index 67%
rename from root/target/linux/bcm27xx/patches-5.15/0154-bcmgenet-constrain-max-DMA-burst-length.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0145-bcmgenet-constrain-max-DMA-burst-length.patch
index f1f1a660..14a00892 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0154-bcmgenet-constrain-max-DMA-burst-length.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0145-bcmgenet-constrain-max-DMA-burst-length.patch
@@ -1,14 +1,12 @@
-From e39199661f193249f4796781a0218da3a1a2c900 Mon Sep 17 00:00:00 2001
+From 57f6e5d68942acb15de6bf4f7efd26ef9d15f5aa Mon Sep 17 00:00:00 2001
 From: Jonathan Bell <jonathan@raspberrypi.org>
 Date: Wed, 12 Sep 2018 14:44:53 +0100
-Subject: [PATCH 154/634] bcmgenet: constrain max DMA burst length
+Subject: [PATCH 145/828] 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 0a6d91b0f0aa..5e653f21aeb9 100644
 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h
 +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
 @@ -31,7 +31,7 @@
@@ -20,6 +18,3 @@ index 0a6d91b0f0aa..5e653f21aeb9 100644
  
  /* misc. configuration */
  #define MAX_NUM_OF_FS_RULES		16
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0155-bcmgenet-Better-coalescing-parameter-defaults.patch b/root/target/linux/bcm27xx/patches-5.15/950-0146-bcmgenet-Better-coalescing-parameter-defaults.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0155-bcmgenet-Better-coalescing-parameter-defaults.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0146-bcmgenet-Better-coalescing-parameter-defaults.patch
index 5641dd68..a4b6e238 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0155-bcmgenet-Better-coalescing-parameter-defaults.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0146-bcmgenet-Better-coalescing-parameter-defaults.patch
@@ -1,7 +1,7 @@
-From f566731dbb834a81c8aeae2ccf83b7d9676e185c Mon Sep 17 00:00:00 2001
+From 3f19386026486051fdbca7d45210b60a182a434f Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Wed, 27 Mar 2019 13:45:46 +0000
-Subject: [PATCH 155/634] bcmgenet: Better coalescing parameter defaults
+Subject: [PATCH 146/828] bcmgenet: Better coalescing parameter defaults
 
 Set defaults for TX and RX packet coalescing to be equivalent to:
 
@@ -16,11 +16,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/net/ethernet/broadcom/genet/bcmgenet.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-index 23c7595d2a1d..f10ff4e95ce0 100644
 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-@@ -2599,7 +2599,7 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_priv *priv,
+@@ -2601,7 +2601,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 23c7595d2a1d..f10ff4e95ce0 100644
  	/* Disable rate control for now */
  	bcmgenet_tdma_ring_writel(priv, index, flow_period_val,
  				  TDMA_FLOW_PERIOD);
-@@ -4060,9 +4060,12 @@ static int bcmgenet_probe(struct platform_device *pdev)
+@@ -4064,9 +4064,12 @@ static int bcmgenet_probe(struct platfor
  	netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1);
  
  	/* Set default coalescing parameters */
@@ -43,6 +41,3 @@ index 23c7595d2a1d..f10ff4e95ce0 100644
  
  	/* libphy will determine the link state */
  	netif_carrier_off(dev);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0156-net-genet-enable-link-energy-detect-powerdown-for-ex.patch b/root/target/linux/bcm27xx/patches-5.15/950-0147-net-genet-enable-link-energy-detect-powerdown-for-ex.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0156-net-genet-enable-link-energy-detect-powerdown-for-ex.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0147-net-genet-enable-link-energy-detect-powerdown-for-ex.patch
index a51a3472..16227af6 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0156-net-genet-enable-link-energy-detect-powerdown-for-ex.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0147-net-genet-enable-link-energy-detect-powerdown-for-ex.patch
@@ -1,7 +1,7 @@
-From 32222127e3f13414f09894b1940955d3e37a01fb Mon Sep 17 00:00:00 2001
+From 01e0db195114cb82037d77ce0bfa020b6ab75d8d Mon Sep 17 00:00:00 2001
 From: Jonathan Bell <jonathan@raspberrypi.org>
 Date: Tue, 14 May 2019 17:17:59 +0100
-Subject: [PATCH 156/634] net: genet: enable link energy detect powerdown for
+Subject: [PATCH 147/828] net: genet: enable link energy detect powerdown for
  external PHYs
 
 There are several warts surrounding bcmgenet_mii_probe() as this
@@ -18,11 +18,9 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  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 89d16c587bb7..817cd0042e30 100644
 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
-@@ -293,6 +293,8 @@ int bcmgenet_mii_probe(struct net_device *dev)
+@@ -293,6 +293,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 89d16c587bb7..817cd0042e30 100644
  
  	/* Initialize link state variables that bcmgenet_mii_setup() uses */
  	priv->old_link = -1;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0157-spi-bcm2835-enable-shared-interrupt-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0148-spi-bcm2835-enable-shared-interrupt-support.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0157-spi-bcm2835-enable-shared-interrupt-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0148-spi-bcm2835-enable-shared-interrupt-support.patch
index a4b1409c..27223d85 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0157-spi-bcm2835-enable-shared-interrupt-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0148-spi-bcm2835-enable-shared-interrupt-support.patch
@@ -1,7 +1,7 @@
-From 59147f610e4862898ac587404f5dd1ae966ed319 Mon Sep 17 00:00:00 2001
+From 0a82fc56efc23b20cfefb7b0f2e1abfdadec05b0 Mon Sep 17 00:00:00 2001
 From: Martin Sperl <kernel@martin.sperl.org>
 Date: Mon, 13 May 2019 11:05:27 +0000
-Subject: [PATCH 157/634] spi: bcm2835: enable shared interrupt support
+Subject: [PATCH 148/828] spi: bcm2835: enable shared interrupt support
 
 Add shared interrupt support for this driver.
 
@@ -10,11 +10,9 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
  drivers/spi/spi-bcm2835.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
-index 775c0bf2f923..80444e6bf034 100644
 --- a/drivers/spi/spi-bcm2835.c
 +++ b/drivers/spi/spi-bcm2835.c
-@@ -384,6 +384,10 @@ static irqreturn_t bcm2835_spi_interrupt(int irq, void *dev_id)
+@@ -384,6 +384,10 @@ static irqreturn_t bcm2835_spi_interrupt
  	if (bs->tx_len && cs & BCM2835_SPI_CS_DONE)
  		bcm2835_wr_fifo_blind(bs, BCM2835_SPI_FIFO_SIZE);
  
@@ -25,7 +23,7 @@ index 775c0bf2f923..80444e6bf034 100644
  	/* Read as many bytes as possible from FIFO */
  	bcm2835_rd_fifo(bs);
  	/* Write as many bytes as possible to FIFO */
-@@ -1365,7 +1369,8 @@ static int bcm2835_spi_probe(struct platform_device *pdev)
+@@ -1365,7 +1369,8 @@ static int bcm2835_spi_probe(struct plat
  	bcm2835_wr(bs, BCM2835_SPI_CS,
  		   BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);
  
@@ -35,6 +33,3 @@ index 775c0bf2f923..80444e6bf034 100644
  			       dev_name(&pdev->dev), bs);
  	if (err) {
  		dev_err(&pdev->dev, "could not request IRQ: %d\n", err);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0158-clk-bcm2835-Don-t-wait-for-pllh-lock.patch b/root/target/linux/bcm27xx/patches-5.15/950-0149-clk-bcm2835-Don-t-wait-for-pllh-lock.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0158-clk-bcm2835-Don-t-wait-for-pllh-lock.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0149-clk-bcm2835-Don-t-wait-for-pllh-lock.patch
index 44e99b60..5bc22eca 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0158-clk-bcm2835-Don-t-wait-for-pllh-lock.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0149-clk-bcm2835-Don-t-wait-for-pllh-lock.patch
@@ -1,18 +1,16 @@
-From f00b550546e7d143f180f1b3cf9254fa5515f5bb Mon Sep 17 00:00:00 2001
+From 8a3dffebb0376f06d78a7063c0399324333b759f Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Wed, 23 Jan 2019 16:11:50 +0000
-Subject: [PATCH 158/634] clk-bcm2835: Don't wait for pllh lock
+Subject: [PATCH 149/828] clk-bcm2835: Don't wait for pllh lock
 
 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 ---
  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 44f1c05fce85..8d624034ecbf 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -644,15 +644,17 @@ static int bcm2835_pll_on(struct clk_hw *hw)
+@@ -644,15 +644,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 44f1c05fce85..8d624034ecbf 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 44f1c05fce85..8d624034ecbf 100644
 +					clk_hw_get_name(hw));
 +				return -ETIMEDOUT;
 +			}
-+
-+			cpu_relax();
- 		}
--
+ 
 -		cpu_relax();
++			cpu_relax();
++		}
  	}
  
  	cprman_write(cprman, data->a2w_ctrl_reg,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0159-soc-bcm-bcm2835-pm-Add-support-for-2711.patch b/root/target/linux/bcm27xx/patches-5.15/950-0150-soc-bcm-bcm2835-pm-Add-support-for-2711.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0159-soc-bcm-bcm2835-pm-Add-support-for-2711.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0150-soc-bcm-bcm2835-pm-Add-support-for-2711.patch
index c6d0b26c..87ce0b24 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0159-soc-bcm-bcm2835-pm-Add-support-for-2711.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0150-soc-bcm-bcm2835-pm-Add-support-for-2711.patch
@@ -1,7 +1,7 @@
-From 88dd765a0589855121b64c6c956bab9b30122b9f Mon Sep 17 00:00:00 2001
+From 1019293a492c3721b3e5cdcfe9a8cf81acaf70ca Mon Sep 17 00:00:00 2001
 From: Eric Anholt <eric@anholt.net>
 Date: Fri, 11 Jan 2019 17:31:07 -0800
-Subject: [PATCH 159/634] soc: bcm: bcm2835-pm: Add support for 2711.
+Subject: [PATCH 150/828] soc: bcm: bcm2835-pm: Add support for 2711.
 
 Without the actual power management part any more, there's a lot less
 to set up for V3D.  We just need to clear the RSTN field for the power
@@ -18,11 +18,9 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  include/linux/mfd/bcm2835-pm.h  |  1 +
  3 files changed, 34 insertions(+)
 
-diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c
-index 42fe67f1538e..ab1e9cbc50b1 100644
 --- a/drivers/mfd/bcm2835-pm.c
 +++ b/drivers/mfd/bcm2835-pm.c
-@@ -50,6 +50,17 @@ static int bcm2835_pm_probe(struct platform_device *pdev)
+@@ -50,6 +50,17 @@ static int bcm2835_pm_probe(struct platf
  	if (ret)
  		return ret;
  
@@ -40,8 +38,6 @@ index 42fe67f1538e..ab1e9cbc50b1 100644
  	/* We'll use the presence of the AXI ASB regs in the
  	 * bcm2835-pm binding as the key for whether we can reference
  	 * the full PM register range and support power domains.
-diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c
-index 1e0041ec8132..c0618a9c26fa 100644
 --- a/drivers/soc/bcm/bcm2835-power.c
 +++ b/drivers/soc/bcm/bcm2835-power.c
 @@ -143,6 +143,8 @@ struct bcm2835_power {
@@ -53,7 +49,7 @@ index 1e0041ec8132..c0618a9c26fa 100644
  	struct genpd_onecell_data pd_xlate;
  	struct bcm2835_power_domain domains[BCM2835_POWER_DOMAIN_COUNT];
  	struct reset_controller_dev reset;
-@@ -192,6 +194,10 @@ static int bcm2835_power_power_off(struct bcm2835_power_domain *pd, u32 pm_reg)
+@@ -192,6 +194,10 @@ static int bcm2835_power_power_off(struc
  {
  	struct bcm2835_power *power = pd->power;
  
@@ -64,7 +60,7 @@ index 1e0041ec8132..c0618a9c26fa 100644
  	/* Enable functional isolation */
  	PM_WRITE(pm_reg, PM_READ(pm_reg) & ~PM_ISFUNC);
  
-@@ -213,6 +219,10 @@ static int bcm2835_power_power_on(struct bcm2835_power_domain *pd, u32 pm_reg)
+@@ -213,6 +219,10 @@ static int bcm2835_power_power_on(struct
  	int inrush;
  	bool powok;
  
@@ -75,7 +71,7 @@ index 1e0041ec8132..c0618a9c26fa 100644
  	/* If it was already powered on by the fw, leave it that way. */
  	if (PM_READ(pm_reg) & PM_POWUP)
  		return 0;
-@@ -627,6 +637,18 @@ static int bcm2835_power_probe(struct platform_device *pdev)
+@@ -627,6 +637,18 @@ static int bcm2835_power_probe(struct pl
  	power->base = pm->base;
  	power->asb = pm->asb;
  
@@ -94,8 +90,6 @@ index 1e0041ec8132..c0618a9c26fa 100644
  	id = ASB_READ(ASB_AXI_BRDG_ID);
  	if (id != 0x62726467 /* "BRDG" */) {
  		dev_err(dev, "ASB register ID returned 0x%08x\n", id);
-diff --git a/include/linux/mfd/bcm2835-pm.h b/include/linux/mfd/bcm2835-pm.h
-index ed37dc40e82a..b2d157091e12 100644
 --- a/include/linux/mfd/bcm2835-pm.h
 +++ b/include/linux/mfd/bcm2835-pm.h
 @@ -9,6 +9,7 @@ struct bcm2835_pm {
@@ -106,6 +100,3 @@ index ed37dc40e82a..b2d157091e12 100644
  };
  
  #endif /* BCM2835_MFD_PM_H */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0160-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch b/root/target/linux/bcm27xx/patches-5.15/950-0151-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0160-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0151-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch
index c18ba4c2..ec802f5d 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0160-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0151-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch
@@ -1,7 +1,7 @@
-From 95b11d99074a04fb79a052c23491ef17dae83e39 Mon Sep 17 00:00:00 2001
+From e172ee5d6effc8e8a3334a3e3b6694e0eed2dc30 Mon Sep 17 00:00:00 2001
 From: Eric Anholt <eric@anholt.net>
 Date: Thu, 2 May 2019 15:11:05 -0700
-Subject: [PATCH 160/634] clk: bcm2835: Add support for setting leaf clock
+Subject: [PATCH 151/828] clk: bcm2835: Add support for setting leaf clock
  rates while running.
 
 As long as you wait for !BUSY, you can do glitch-free updates of clock
@@ -12,11 +12,9 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  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 8d624034ecbf..bfeb6cac0393 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1109,15 +1109,19 @@ static int bcm2835_clock_set_rate(struct clk_hw *hw,
+@@ -1109,15 +1109,19 @@ static int bcm2835_clock_set_rate(struct
  
  	spin_lock(&cprman->regs_lock);
  
@@ -44,7 +42,7 @@ index 8d624034ecbf..bfeb6cac0393 100644
  	ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0;
  	cprman_write(cprman, data->ctl_reg, ctl);
  
-@@ -1493,7 +1497,7 @@ static struct clk_hw *bcm2835_register_clock(struct bcm2835_cprman *cprman,
+@@ -1493,7 +1497,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 8d624034ecbf..bfeb6cac0393 100644
  
  		/* If the clock wasn't actually enabled at boot, it's not
  		 * critical.
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0161-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch b/root/target/linux/bcm27xx/patches-5.15/950-0152-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch
similarity index 75%
rename from root/target/linux/bcm27xx/patches-5.15/0161-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0152-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch
index 7010d323..8fc06354 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0161-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0152-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch
@@ -1,7 +1,7 @@
-From ef20dbe3d9d7caf238f5dfb638f7a0ebc6ce5ba0 Mon Sep 17 00:00:00 2001
+From 4aa0c6ac6ecb7a0d89b77e6bf126a485edad0925 Mon Sep 17 00:00:00 2001
 From: Eric Anholt <eric@anholt.net>
 Date: Thu, 2 May 2019 15:24:04 -0700
-Subject: [PATCH 161/634] clk: bcm2835: Allow reparenting leaf clocks while
+Subject: [PATCH 152/828] clk: bcm2835: Allow reparenting leaf clocks while
  they're running.
 
 This falls under the same "we can reprogram glitch-free as long as we
@@ -13,11 +13,9 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  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 bfeb6cac0393..857a8e16d014 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1098,8 +1098,10 @@ static int bcm2835_clock_on(struct clk_hw *hw)
+@@ -1098,8 +1098,10 @@ static int bcm2835_clock_on(struct clk_h
  	return 0;
  }
  
@@ -30,7 +28,7 @@ index bfeb6cac0393..857a8e16d014 100644
  {
  	struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);
  	struct bcm2835_cprman *cprman = clock->cprman;
-@@ -1121,6 +1123,11 @@ static int bcm2835_clock_set_rate(struct clk_hw *hw,
+@@ -1121,6 +1123,11 @@ static int bcm2835_clock_set_rate(struct
  		bcm2835_clock_wait_busy(clock);
  	}
  
@@ -42,7 +40,7 @@ index bfeb6cac0393..857a8e16d014 100644
  	ctl &= ~CM_FRAC;
  	ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0;
  	cprman_write(cprman, data->ctl_reg, ctl);
-@@ -1132,6 +1139,12 @@ static int bcm2835_clock_set_rate(struct clk_hw *hw,
+@@ -1132,6 +1139,12 @@ static int bcm2835_clock_set_rate(struct
  	return 0;
  }
  
@@ -55,7 +53,7 @@ index bfeb6cac0393..857a8e16d014 100644
  static bool
  bcm2835_clk_is_pllc(struct clk_hw *hw)
  {
-@@ -1315,6 +1328,7 @@ static const struct clk_ops bcm2835_clock_clk_ops = {
+@@ -1315,6 +1328,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 bfeb6cac0393..857a8e16d014 100644
  	.determine_rate = bcm2835_clock_determine_rate,
  	.set_parent = bcm2835_clock_set_parent,
  	.get_parent = bcm2835_clock_get_parent,
-@@ -1497,7 +1511,6 @@ static struct clk_hw *bcm2835_register_clock(struct bcm2835_cprman *cprman,
+@@ -1497,7 +1511,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 bfeb6cac0393..857a8e16d014 100644
  
  		/* If the clock wasn't actually enabled at boot, it's not
  		 * critical.
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0162-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch b/root/target/linux/bcm27xx/patches-5.15/950-0153-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0162-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0153-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch
index 25a52f2d..91d35e46 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0162-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0153-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch
@@ -1,7 +1,7 @@
-From 27ecc53b8fcf3254355aa4f8e21a675982f23999 Mon Sep 17 00:00:00 2001
+From 60cf01dab21cfc6c606b1e77d51385af16592709 Mon Sep 17 00:00:00 2001
 From: Jonathan Bell <jonathan@raspberrypi.org>
 Date: Tue, 11 Jun 2019 10:55:00 +0100
-Subject: [PATCH 162/634] usb: add plumbing for updating interrupt endpoint
+Subject: [PATCH 153/828] usb: add plumbing for updating interrupt endpoint
  interval state
 
 xHCI caches device and endpoint data after the interface is configured,
@@ -25,11 +25,9 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  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 00d35fe1fef0..c8c1c89f7914 100644
 --- a/drivers/usb/core/hcd.c
 +++ b/drivers/usb/core/hcd.c
-@@ -1948,6 +1948,16 @@ int usb_hcd_alloc_bandwidth(struct usb_device *udev,
+@@ -1969,6 +1969,16 @@ reset:
  	return ret;
  }
  
@@ -46,11 +44,9 @@ index 00d35fe1fef0..c8c1c89f7914 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 7a32053e941f..e8045997d6ec 100644
 --- a/drivers/usb/core/message.c
 +++ b/drivers/usb/core/message.c
-@@ -1268,6 +1268,21 @@ static void remove_intf_ep_devs(struct usb_interface *intf)
+@@ -1268,6 +1268,21 @@ static void remove_intf_ep_devs(struct u
  	intf->ep_devs_created = 0;
  }
  
@@ -72,11 +68,9 @@ index 7a32053e941f..e8045997d6ec 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 7ccaa76a9a96..77d9a69534f0 100644
 --- a/include/linux/usb.h
 +++ b/include/linux/usb.h
-@@ -1840,6 +1840,8 @@ extern int usb_clear_halt(struct usb_device *dev, int pipe);
+@@ -1840,6 +1840,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 7ccaa76a9a96..77d9a69534f0 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 548a028f2dab..d397194881c3 100644
 --- a/include/linux/usb/hcd.h
 +++ b/include/linux/usb/hcd.h
 @@ -382,6 +382,11 @@ struct hc_driver {
@@ -101,7 +93,7 @@ index 548a028f2dab..d397194881c3 100644
  		/* Returns the hardware-chosen device address */
  	int	(*address_device)(struct usb_hcd *, struct usb_device *udev);
  		/* prepares the hardware to send commands to the device */
-@@ -446,6 +451,8 @@ extern void usb_hcd_unmap_urb_setup_for_dma(struct usb_hcd *, struct urb *);
+@@ -446,6 +451,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 548a028f2dab..d397194881c3 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.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0163-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch b/root/target/linux/bcm27xx/patches-5.15/950-0154-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
similarity index 90%
rename from root/target/linux/bcm27xx/patches-5.15/0163-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0154-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
index 06d6dfd5..53c818a9 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0163-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0154-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
@@ -1,7 +1,7 @@
-From 5920dec6b922358a29689658fc0b6611d0e04d1f Mon Sep 17 00:00:00 2001
+From 6f6bc0f3d9422043f0f2d5aa55d0baddb92a0f9f Mon Sep 17 00:00:00 2001
 From: Jonathan Bell <jonathan@raspberrypi.org>
 Date: Tue, 11 Jun 2019 11:33:39 +0100
-Subject: [PATCH 163/634] xhci: implement xhci_fixup_endpoint for interval
+Subject: [PATCH 154/828] xhci: implement xhci_fixup_endpoint for interval
  adjustments
 
 Must be called in a non-atomic context, after the endpoint
@@ -13,15 +13,12 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  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 902f410874e8..9be9e95f8c7a 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -1590,6 +1590,109 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id,
- 	return ret;
+@@ -1596,6 +1596,109 @@ command_cleanup:
  }
  
-+/*
+ /*
 + * RPI: Fixup endpoint intervals when requested
 + * - Check interval versus the (cached) endpoint context
 + * - set the endpoint interval to the new value
@@ -124,10 +121,11 @@ index 902f410874e8..9be9e95f8c7a 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
-@@ -5409,6 +5512,7 @@ static const struct hc_driver xhci_hc_driver = {
+  */
+@@ -5421,6 +5524,7 @@ static const struct hc_driver xhci_hc_dr
  	.endpoint_reset =	xhci_endpoint_reset,
  	.check_bandwidth =	xhci_check_bandwidth,
  	.reset_bandwidth =	xhci_reset_bandwidth,
@@ -135,6 +133,3 @@ index 902f410874e8..9be9e95f8c7a 100644
  	.address_device =	xhci_address_device,
  	.enable_device =	xhci_enable_device,
  	.update_hub_device =	xhci_update_hub_device,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0164-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch b/root/target/linux/bcm27xx/patches-5.15/950-0155-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch
similarity index 62%
rename from root/target/linux/bcm27xx/patches-5.15/0164-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0155-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch
index 35172c23..a7b47433 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0164-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0155-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch
@@ -1,7 +1,7 @@
-From d6d617b867c77cef7bc7578bc856c9a700b6aaa0 Mon Sep 17 00:00:00 2001
+From a4e552dc907c2aae8024be001cb91aac6efaa9b2 Mon Sep 17 00:00:00 2001
 From: Jonathan Bell <jonathan@raspberrypi.org>
 Date: Tue, 11 Jun 2019 11:42:03 +0100
-Subject: [PATCH 164/634] usbhid: call usb_fixup_endpoint after mangling
+Subject: [PATCH 155/828] usbhid: call usb_fixup_endpoint after mangling
  intervals
 
 Lets the mousepoll override mechanism work with xhci.
@@ -11,11 +11,9 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  drivers/hid/usbhid/hid-core.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
-index 8a9d8214d8af..3541229ef9dc 100644
 --- a/drivers/hid/usbhid/hid-core.c
 +++ b/drivers/hid/usbhid/hid-core.c
-@@ -1126,6 +1126,7 @@ static int usbhid_start(struct hid_device *hid)
+@@ -1126,6 +1126,7 @@ static int usbhid_start(struct hid_devic
  				interval = hid_kbpoll_interval;
  			break;
  		}
@@ -23,6 +21,3 @@ index 8a9d8214d8af..3541229ef9dc 100644
  
  		ret = -ENOMEM;
  		if (usb_endpoint_dir_in(endpoint)) {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0165-arm-bcm2835-Add-bcm2838-compatible-string.patch b/root/target/linux/bcm27xx/patches-5.15/950-0156-arm-bcm2835-Add-bcm2838-compatible-string.patch
similarity index 54%
rename from root/target/linux/bcm27xx/patches-5.15/0165-arm-bcm2835-Add-bcm2838-compatible-string.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0156-arm-bcm2835-Add-bcm2838-compatible-string.patch
index bc99f4a5..7d970616 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0165-arm-bcm2835-Add-bcm2838-compatible-string.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0156-arm-bcm2835-Add-bcm2838-compatible-string.patch
@@ -1,18 +1,16 @@
-From c30288ed705b3d77fe3cf6744b1f7be04328726b Mon Sep 17 00:00:00 2001
+From f3d3d894047198aa1aa8611db19c5b0dc8097ccc Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Tue, 11 Jun 2019 17:38:28 +0100
-Subject: [PATCH 165/634] arm: bcm2835: Add bcm2838 compatible string.
+Subject: [PATCH 156/828] arm: bcm2835: Add bcm2838 compatible string.
 
 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 ---
  arch/arm/mach-bcm/board_bcm2835.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
-index 7d59a9364175..282a023027fc 100644
 --- a/arch/arm/mach-bcm/board_bcm2835.c
 +++ b/arch/arm/mach-bcm/board_bcm2835.c
-@@ -109,6 +109,7 @@ static const char * const bcm2835_compat[] = {
+@@ -109,6 +109,7 @@ static const char * const bcm2835_compat
  #ifdef CONFIG_ARCH_MULTI_V7
  	"brcm,bcm2836",
  	"brcm,bcm2837",
@@ -20,6 +18,3 @@ index 7d59a9364175..282a023027fc 100644
  #endif
  	NULL
  };
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0166-drm-v3d-Add-support-for-2711.patch b/root/target/linux/bcm27xx/patches-5.15/950-0157-drm-v3d-Add-support-for-2711.patch
similarity index 60%
rename from root/target/linux/bcm27xx/patches-5.15/0166-drm-v3d-Add-support-for-2711.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0157-drm-v3d-Add-support-for-2711.patch
index 694bd431..9f708149 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0166-drm-v3d-Add-support-for-2711.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0157-drm-v3d-Add-support-for-2711.patch
@@ -1,18 +1,16 @@
-From 670579d8778e9c0e545ca914453d0cda91e2f89b Mon Sep 17 00:00:00 2001
+From 5aa74a5703783d066a24ad97f4971cd4c5f5a4c6 Mon Sep 17 00:00:00 2001
 From: Eric Anholt <eric@anholt.net>
 Date: Thu, 4 Oct 2018 17:22:43 -0700
-Subject: [PATCH 166/634] drm/v3d: Add support for 2711.
+Subject: [PATCH 157/828] drm/v3d: Add support for 2711.
 
 Signed-off-by: Eric Anholt <eric@anholt.net>
 ---
  drivers/gpu/drm/v3d/v3d_drv.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
-index 9403c3b36aca..02c6f4d67837 100644
 --- a/drivers/gpu/drm/v3d/v3d_drv.c
 +++ b/drivers/gpu/drm/v3d/v3d_drv.c
-@@ -199,6 +199,7 @@ static const struct drm_driver v3d_drm_driver = {
+@@ -199,6 +199,7 @@ static const struct drm_driver v3d_drm_d
  static const struct of_device_id v3d_of_match[] = {
  	{ .compatible = "brcm,7268-v3d" },
  	{ .compatible = "brcm,7278-v3d" },
@@ -20,6 +18,3 @@ index 9403c3b36aca..02c6f4d67837 100644
  	{},
  };
  MODULE_DEVICE_TABLE(of, v3d_of_match);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0167-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch b/root/target/linux/bcm27xx/patches-5.15/950-0158-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch
similarity index 75%
rename from root/target/linux/bcm27xx/patches-5.15/0167-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0158-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch
index 939703d2..0b87db7d 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0167-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0158-drm-v3d-Skip-MMU-flush-if-the-device-is-currently-of.patch
@@ -1,7 +1,7 @@
-From 23f69f62de1697356d978e7800890a445c62955c Mon Sep 17 00:00:00 2001
+From 3972a8a5d0effcec06982a738fdf40cf176b6b45 Mon Sep 17 00:00:00 2001
 From: Eric Anholt <eric@anholt.net>
 Date: Mon, 14 Jan 2019 12:35:43 -0800
-Subject: [PATCH 167/634] drm/v3d: Skip MMU flush if the device is currently
+Subject: [PATCH 158/828] drm/v3d: Skip MMU flush if the device is currently
  off.
 
 If it's off, we know it will be reset on poweron, so the MMU won't
@@ -14,8 +14,6 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  drivers/gpu/drm/v3d/v3d_mmu.c | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
-diff --git a/drivers/gpu/drm/v3d/v3d_mmu.c b/drivers/gpu/drm/v3d/v3d_mmu.c
-index 5a453532901f..8986e7b96461 100644
 --- a/drivers/gpu/drm/v3d/v3d_mmu.c
 +++ b/drivers/gpu/drm/v3d/v3d_mmu.c
 @@ -18,6 +18,8 @@
@@ -27,7 +25,7 @@ index 5a453532901f..8986e7b96461 100644
  #include "v3d_drv.h"
  #include "v3d_regs.h"
  
-@@ -34,6 +36,14 @@ static int v3d_mmu_flush_all(struct v3d_dev *v3d)
+@@ -34,6 +36,14 @@ static int v3d_mmu_flush_all(struct v3d_
  {
  	int ret;
  
@@ -42,7 +40,7 @@ index 5a453532901f..8986e7b96461 100644
  	/* Make sure that another flush isn't already running when we
  	 * start this one.
  	 */
-@@ -61,6 +71,9 @@ static int v3d_mmu_flush_all(struct v3d_dev *v3d)
+@@ -61,6 +71,9 @@ static int v3d_mmu_flush_all(struct v3d_
  	if (ret)
  		dev_err(v3d->drm.dev, "MMUC flush wait idle failed\n");
  
@@ -52,6 +50,3 @@ index 5a453532901f..8986e7b96461 100644
  	return ret;
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0168-drm-v3d-Hook-up-the-runtime-PM-ops.patch b/root/target/linux/bcm27xx/patches-5.15/950-0159-drm-v3d-Hook-up-the-runtime-PM-ops.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0168-drm-v3d-Hook-up-the-runtime-PM-ops.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0159-drm-v3d-Hook-up-the-runtime-PM-ops.patch
index 60c5ba91..bfdbb8a1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0168-drm-v3d-Hook-up-the-runtime-PM-ops.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0159-drm-v3d-Hook-up-the-runtime-PM-ops.patch
@@ -1,7 +1,7 @@
-From 77035aecac2af1f536a76a04bbc0310fa64d6bf7 Mon Sep 17 00:00:00 2001
+From 11e637a0361bf2d50aa0a67024ba2491dfc3907b Mon Sep 17 00:00:00 2001
 From: Eric Anholt <eric@anholt.net>
 Date: Mon, 14 Jan 2019 14:47:57 -0800
-Subject: [PATCH 168/634] drm/v3d: Hook up the runtime PM ops.
+Subject: [PATCH 159/828] drm/v3d: Hook up the runtime PM ops.
 
 In translating the runtime PM code from vc4, I missed the ".pm"
 assignment to actually connect them up.  Fixes missing MMU setup if
@@ -13,8 +13,6 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  drivers/gpu/drm/v3d/v3d_drv.c | 37 +++++++++++++++++++++++++++++++++++
  1 file changed, 37 insertions(+)
 
-diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
-index 02c6f4d67837..441ee13d7b65 100644
 --- a/drivers/gpu/drm/v3d/v3d_drv.c
 +++ b/drivers/gpu/drm/v3d/v3d_drv.c
 @@ -38,6 +38,42 @@
@@ -60,7 +58,7 @@ index 02c6f4d67837..441ee13d7b65 100644
  static int v3d_get_param_ioctl(struct drm_device *dev, void *data,
  			       struct drm_file *file_priv)
  {
-@@ -328,6 +364,7 @@ static struct platform_driver v3d_platform_driver = {
+@@ -332,6 +368,7 @@ static struct platform_driver v3d_platfo
  	.driver		= {
  		.name	= "v3d",
  		.of_match_table = v3d_of_match,
@@ -68,6 +66,3 @@ index 02c6f4d67837..441ee13d7b65 100644
  	},
  };
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0169-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch b/root/target/linux/bcm27xx/patches-5.15/950-0160-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0169-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0160-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch
index 76d56e8f..9ce7bf33 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0169-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0160-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch
@@ -1,7 +1,7 @@
-From e07e0c7d74c02b6ddf73ceaba8d51498317199c7 Mon Sep 17 00:00:00 2001
+From bfe64c398d4b3be2291178057d82bf5d1ee34855 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Fri, 12 Jul 2019 15:38:35 +0100
-Subject: [PATCH 169/634] i2c: bcm2835: Set clock-stretch timeout to 35ms
+Subject: [PATCH 160/828] i2c: bcm2835: Set clock-stretch timeout to 35ms
 
 The BCM2835 I2C blocks have a register to set the clock-stretch
 timeout - how long the device is allowed to hold SCL low - in bus
@@ -17,11 +17,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/i2c/busses/i2c-bcm2835.c | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
-diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
-index 18b2e9e3d752..5b2589b6b9cc 100644
 --- a/drivers/i2c/busses/i2c-bcm2835.c
 +++ b/drivers/i2c/busses/i2c-bcm2835.c
-@@ -188,6 +188,7 @@ static int clk_bcm2835_i2c_set_rate(struct clk_hw *hw, unsigned long rate,
+@@ -193,6 +193,7 @@ static int clk_bcm2835_i2c_set_rate(stru
  {
  	struct clk_bcm2835_i2c *div = to_clk_bcm2835_i2c(hw);
  	u32 redl, fedl;
@@ -29,7 +27,7 @@ index 18b2e9e3d752..5b2589b6b9cc 100644
  	u32 divider = clk_bcm2835_i2c_calc_divider(rate, parent_rate);
  
  	if (divider == -EINVAL)
-@@ -211,6 +212,17 @@ static int clk_bcm2835_i2c_set_rate(struct clk_hw *hw, unsigned long rate,
+@@ -216,6 +217,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));
@@ -47,6 +45,3 @@ index 18b2e9e3d752..5b2589b6b9cc 100644
  	return 0;
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0170-clk-bcm2835-Avoid-null-pointer-exception.patch b/root/target/linux/bcm27xx/patches-5.15/950-0161-clk-bcm2835-Avoid-null-pointer-exception.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0170-clk-bcm2835-Avoid-null-pointer-exception.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0161-clk-bcm2835-Avoid-null-pointer-exception.patch
index c3d756fd..583f7005 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0170-clk-bcm2835-Avoid-null-pointer-exception.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0161-clk-bcm2835-Avoid-null-pointer-exception.patch
@@ -1,7 +1,7 @@
-From 46593228b86c066260d738ae2403562209750374 Mon Sep 17 00:00:00 2001
+From 0fcd5f41c8b13705c9e1fce3652ea36f81e8d32e Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 6 Aug 2019 15:23:14 +0100
-Subject: [PATCH 170/634] clk-bcm2835: Avoid null pointer exception
+Subject: [PATCH 161/828] clk-bcm2835: Avoid null pointer exception
 
 clk_desc_array[BCM2835_PLLB] doesn't exist so we dereference null when iterating
 
@@ -10,11 +10,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  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 857a8e16d014..fe005f9dbe02 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -2304,9 +2304,11 @@ static bool bcm2835_clk_is_claimed(const char *name)
+@@ -2304,9 +2304,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 857a8e16d014..fe005f9dbe02 100644
  	}
  
  	return false;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0171-drm-v3d-HACK-gut-runtime-pm-for-now.patch b/root/target/linux/bcm27xx/patches-5.15/950-0162-drm-v3d-HACK-gut-runtime-pm-for-now.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0171-drm-v3d-HACK-gut-runtime-pm-for-now.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0162-drm-v3d-HACK-gut-runtime-pm-for-now.patch
index 1c46a29b..e7bfb090 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0171-drm-v3d-HACK-gut-runtime-pm-for-now.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0162-drm-v3d-HACK-gut-runtime-pm-for-now.patch
@@ -1,7 +1,7 @@
-From 80c0e9ca498d732f19cdf14dd7d6a08ff5f3080c Mon Sep 17 00:00:00 2001
+From 9ecfc6b9c50e67ab8c9a0a81d043a95fd9259136 Mon Sep 17 00:00:00 2001
 From: Eric Anholt <eric@anholt.net>
 Date: Mon, 14 Jan 2019 15:13:17 -0800
-Subject: [PATCH 171/634] drm/v3d: HACK: gut runtime pm for now.
+Subject: [PATCH 162/828] drm/v3d: HACK: gut runtime pm for now.
 
 Something is still unstable -- on starting a new glxgears from an idle
 X11, I get an MMU violation in high addresses.  The CTS also failed
@@ -15,8 +15,6 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  drivers/gpu/drm/v3d/v3d_drv.c     |  9 ---------
  2 files changed, 1 insertion(+), 24 deletions(-)
 
-diff --git a/drivers/gpu/drm/v3d/v3d_debugfs.c b/drivers/gpu/drm/v3d/v3d_debugfs.c
-index e76b24bb8828..b7b296bb87d0 100644
 --- a/drivers/gpu/drm/v3d/v3d_debugfs.c
 +++ b/drivers/gpu/drm/v3d/v3d_debugfs.c
 @@ -4,7 +4,6 @@
@@ -27,7 +25,7 @@ index e76b24bb8828..b7b296bb87d0 100644
  #include <linux/seq_file.h>
  
  #include <drm/drm_debugfs.h>
-@@ -130,11 +129,8 @@ static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused)
+@@ -130,11 +129,8 @@ static int v3d_v3d_debugfs_ident(struct
  	struct drm_device *dev = node->minor->dev;
  	struct v3d_dev *v3d = to_v3d_dev(dev);
  	u32 ident0, ident1, ident2, ident3, cores;
@@ -40,7 +38,7 @@ index e76b24bb8828..b7b296bb87d0 100644
  
  	ident0 = V3D_READ(V3D_HUB_IDENT0);
  	ident1 = V3D_READ(V3D_HUB_IDENT1);
-@@ -187,9 +183,6 @@ static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused)
+@@ -187,9 +183,6 @@ static int v3d_v3d_debugfs_ident(struct
  			   (misccfg & V3D_MISCCFG_OVRTMUOUT) != 0);
  	}
  
@@ -50,7 +48,7 @@ index e76b24bb8828..b7b296bb87d0 100644
  	return 0;
  }
  
-@@ -217,11 +210,6 @@ static int v3d_measure_clock(struct seq_file *m, void *unused)
+@@ -217,11 +210,6 @@ static int v3d_measure_clock(struct seq_
  	uint32_t cycles;
  	int core = 0;
  	int measure_ms = 1000;
@@ -62,7 +60,7 @@ index e76b24bb8828..b7b296bb87d0 100644
  
  	if (v3d->ver >= 40) {
  		V3D_CORE_WRITE(core, V3D_V4_PCTR_0_SRC_0_3,
-@@ -245,8 +233,6 @@ static int v3d_measure_clock(struct seq_file *m, void *unused)
+@@ -245,8 +233,6 @@ static int v3d_measure_clock(struct seq_
  		   cycles / (measure_ms * 1000),
  		   (cycles / (measure_ms * 100)) % 10);
  
@@ -71,11 +69,9 @@ index e76b24bb8828..b7b296bb87d0 100644
  
  	return 0;
  }
-diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
-index 441ee13d7b65..3969b64127e0 100644
 --- a/drivers/gpu/drm/v3d/v3d_drv.c
 +++ b/drivers/gpu/drm/v3d/v3d_drv.c
-@@ -79,7 +79,6 @@ static int v3d_get_param_ioctl(struct drm_device *dev, void *data,
+@@ -79,7 +79,6 @@ static int v3d_get_param_ioctl(struct dr
  {
  	struct v3d_dev *v3d = to_v3d_dev(dev);
  	struct drm_v3d_get_param *args = data;
@@ -83,7 +79,7 @@ index 441ee13d7b65..3969b64127e0 100644
  	static const u32 reg_map[] = {
  		[DRM_V3D_PARAM_V3D_UIFCFG] = V3D_HUB_UIFCFG,
  		[DRM_V3D_PARAM_V3D_HUB_IDENT1] = V3D_HUB_IDENT1,
-@@ -105,17 +104,12 @@ static int v3d_get_param_ioctl(struct drm_device *dev, void *data,
+@@ -105,17 +104,12 @@ static int v3d_get_param_ioctl(struct dr
  		if (args->value != 0)
  			return -EINVAL;
  
@@ -101,7 +97,7 @@ index 441ee13d7b65..3969b64127e0 100644
  		return 0;
  	}
  
-@@ -316,9 +310,6 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
+@@ -320,9 +314,6 @@ static int v3d_platform_drm_probe(struct
  		return -ENOMEM;
  	}
  
@@ -111,6 +107,3 @@ index 441ee13d7b65..3969b64127e0 100644
  
  	ret = v3d_gem_init(drm);
  	if (ret)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0172-drm-v3d-Clock-V3D-down-when-not-in-use.patch b/root/target/linux/bcm27xx/patches-5.15/950-0163-drm-v3d-Clock-V3D-down-when-not-in-use.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0172-drm-v3d-Clock-V3D-down-when-not-in-use.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0163-drm-v3d-Clock-V3D-down-when-not-in-use.patch
index 397ea07d..b29fcfe4 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0172-drm-v3d-Clock-V3D-down-when-not-in-use.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0163-drm-v3d-Clock-V3D-down-when-not-in-use.patch
@@ -1,7 +1,7 @@
-From 89cdfc8912ff1c9230668d2e81187a8279d0be46 Mon Sep 17 00:00:00 2001
+From 63c1536f33d8190d2ed481fe7baa4850f91b5f53 Mon Sep 17 00:00:00 2001
 From: Eric Anholt <eric@anholt.net>
 Date: Thu, 2 May 2019 13:22:53 -0700
-Subject: [PATCH 172/634] drm/v3d: Clock V3D down when not in use.
+Subject: [PATCH 163/828] drm/v3d: Clock V3D down when not in use.
 
 My various attempts at re-enabling runtime PM have failed, so just
 crank the clock down when V3D is idle to reduce power consumption.
@@ -13,11 +13,9 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  drivers/gpu/drm/v3d/v3d_gem.c | 53 +++++++++++++++++++++++++++++++----
  3 files changed, 72 insertions(+), 5 deletions(-)
 
-diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
-index 3969b64127e0..e202870873a4 100644
 --- a/drivers/gpu/drm/v3d/v3d_drv.c
 +++ b/drivers/gpu/drm/v3d/v3d_drv.c
-@@ -297,6 +297,21 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
+@@ -301,6 +301,21 @@ static int v3d_platform_drm_probe(struct
  		}
  	}
  
@@ -39,7 +37,7 @@ index 3969b64127e0..e202870873a4 100644
  	if (v3d->ver < 41) {
  		ret = map_regs(v3d, &v3d->gca_regs, "gca");
  		if (ret)
-@@ -323,6 +338,9 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
+@@ -327,6 +342,9 @@ static int v3d_platform_drm_probe(struct
  	if (ret)
  		goto irq_disable;
  
@@ -49,8 +47,6 @@ index 3969b64127e0..e202870873a4 100644
  	return 0;
  
  irq_disable:
-diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h
-index 270134779073..37b353a81ed0 100644
 --- a/drivers/gpu/drm/v3d/v3d_drv.h
 +++ b/drivers/gpu/drm/v3d/v3d_drv.h
 @@ -85,6 +85,12 @@ struct v3d_dev {
@@ -66,8 +62,6 @@ index 270134779073..37b353a81ed0 100644
  	struct reset_control *reset;
  
  	/* Virtual and DMA addresses of the single shared page table. */
-diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
-index 772b5831bcc6..d369221642c5 100644
 --- a/drivers/gpu/drm/v3d/v3d_gem.c
 +++ b/drivers/gpu/drm/v3d/v3d_gem.c
 @@ -4,6 +4,7 @@
@@ -78,11 +72,10 @@ index 772b5831bcc6..d369221642c5 100644
  #include <linux/module.h>
  #include <linux/platform_device.h>
  #include <linux/pm_runtime.h>
-@@ -18,6 +19,47 @@
- #include "v3d_regs.h"
+@@ -19,6 +20,47 @@
  #include "v3d_trace.h"
  
-+static void
+ static void
 +v3d_clock_down_work(struct work_struct *work)
 +{
 +	struct v3d_dev *v3d =
@@ -123,9 +116,10 @@ index 772b5831bcc6..d369221642c5 100644
 +}
 +
 +
- static void
++static void
  v3d_init_core(struct v3d_dev *v3d, int core)
  {
+ 	/* Set OVRTMUOUT, which means that the texture sampler uniform
 @@ -358,6 +400,7 @@ v3d_job_free(struct kref *ref)
  	struct v3d_job *job = container_of(ref, struct v3d_job, refcount);
  	unsigned long index;
@@ -147,7 +141,7 @@ index 772b5831bcc6..d369221642c5 100644
  
  	if (job->perfmon)
  		v3d_perfmon_put(job->perfmon);
-@@ -460,6 +499,7 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv,
+@@ -460,6 +499,7 @@ v3d_job_init(struct v3d_dev *v3d, struct
  	if (ret)
  		goto fail;
  
@@ -155,7 +149,7 @@ index 772b5831bcc6..d369221642c5 100644
  	kref_init(&job->refcount);
  
  	return 0;
-@@ -912,6 +952,9 @@ v3d_gem_init(struct drm_device *dev)
+@@ -914,6 +954,9 @@ v3d_gem_init(struct drm_device *dev)
  	mutex_init(&v3d->sched_lock);
  	mutex_init(&v3d->cache_clean_lock);
  
@@ -165,6 +159,3 @@ index 772b5831bcc6..d369221642c5 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".
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0173-drivers-char-add-chardev-for-mmap-ing-the-RPiVid-con.patch b/root/target/linux/bcm27xx/patches-5.15/950-0164-drivers-char-add-chardev-for-mmap-ing-the-RPiVid-con.patch
similarity index 92%
rename from root/target/linux/bcm27xx/patches-5.15/0173-drivers-char-add-chardev-for-mmap-ing-the-RPiVid-con.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0164-drivers-char-add-chardev-for-mmap-ing-the-RPiVid-con.patch
index a4732218..100959fd 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0173-drivers-char-add-chardev-for-mmap-ing-the-RPiVid-con.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0164-drivers-char-add-chardev-for-mmap-ing-the-RPiVid-con.patch
@@ -1,7 +1,7 @@
-From e32bcf7bb3087911bc759bf0672eb04d91a428b6 Mon Sep 17 00:00:00 2001
+From c76f759dbe576574734108ef65653180dd61ecf7 Mon Sep 17 00:00:00 2001
 From: Jonathan Bell <jonathan@raspberrypi.org>
 Date: Thu, 9 May 2019 14:30:37 +0100
-Subject: [PATCH 173/634] drivers: char: add chardev for mmap'ing the RPiVid
+Subject: [PATCH 164/828] drivers: char: add chardev for mmap'ing the RPiVid
  control registers
 
 Based on the gpiomem driver, allow mapping of the decoder register
@@ -68,8 +68,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  6 files changed, 311 insertions(+), 10 deletions(-)
  create mode 100644 drivers/char/broadcom/rpivid-mem.c
 
-diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig
-index c11b834ccdbd..e555e841b8db 100644
 --- a/drivers/char/broadcom/Kconfig
 +++ b/drivers/char/broadcom/Kconfig
 @@ -39,3 +39,11 @@ config BCM2835_SMI_DEV
@@ -84,8 +82,6 @@ index c11b834ccdbd..e555e841b8db 100644
 +		This driver provides a character device interface for memory-map operations
 +		so userspace tools can access the control and status registers of the
 +		Raspberry Pi RPiVid video decoder hardware.
-diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile
-index ea7495b01c28..a302fb3ff91a 100644
 --- a/drivers/char/broadcom/Makefile
 +++ b/drivers/char/broadcom/Makefile
 @@ -2,3 +2,4 @@ obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o
@@ -93,9 +89,6 @@ index ea7495b01c28..a302fb3ff91a 100644
  obj-$(CONFIG_BCM2835_DEVGPIOMEM)+= bcm2835-gpiomem.o
  obj-$(CONFIG_BCM2835_SMI_DEV)	+= bcm2835_smi_dev.o
 +obj-$(CONFIG_RPIVID_MEM)	+= rpivid-mem.o
-diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c
-new file mode 100644
-index 000000000000..fbf3d4f3fe0c
 --- /dev/null
 +++ b/drivers/char/broadcom/rpivid-mem.c
 @@ -0,0 +1,292 @@
@@ -391,11 +384,9 @@ index 000000000000..fbf3d4f3fe0c
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("Driver for accessing RPiVid decoder registers from userspace");
 +MODULE_AUTHOR("Jonathan Bell <jonathan@raspberrypi.org>");
-diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c
-index ab1e9cbc50b1..f66f92fe28c3 100644
 --- a/drivers/mfd/bcm2835-pm.c
 +++ b/drivers/mfd/bcm2835-pm.c
-@@ -50,14 +50,14 @@ static int bcm2835_pm_probe(struct platform_device *pdev)
+@@ -50,14 +50,14 @@ static int bcm2835_pm_probe(struct platf
  	if (ret)
  		return ret;
  
@@ -416,11 +407,9 @@ index ab1e9cbc50b1..f66f92fe28c3 100644
  		}
  	}
  
-diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c
-index c0618a9c26fa..6059210170bc 100644
 --- a/drivers/soc/bcm/bcm2835-power.c
 +++ b/drivers/soc/bcm/bcm2835-power.c
-@@ -637,15 +637,15 @@ static int bcm2835_power_probe(struct platform_device *pdev)
+@@ -637,15 +637,15 @@ static int bcm2835_power_probe(struct pl
  	power->base = pm->base;
  	power->asb = pm->asb;
  
@@ -439,8 +428,6 @@ index c0618a9c26fa..6059210170bc 100644
  		power->is_2711 = true;
  	}
  
-diff --git a/include/linux/mfd/bcm2835-pm.h b/include/linux/mfd/bcm2835-pm.h
-index b2d157091e12..f70a810c55f7 100644
 --- a/include/linux/mfd/bcm2835-pm.h
 +++ b/include/linux/mfd/bcm2835-pm.h
 @@ -9,7 +9,7 @@ struct bcm2835_pm {
@@ -452,6 +439,3 @@ index b2d157091e12..f70a810c55f7 100644
  };
  
  #endif /* BCM2835_MFD_PM_H */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0174-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/root/target/linux/bcm27xx/patches-5.15/950-0165-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0174-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0165-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
index 5dd05a3c..c3f75403 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0174-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0165-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
@@ -1,7 +1,7 @@
-From d77ad604bfb2a118e2bb7ff17e651597e90f972c Mon Sep 17 00:00:00 2001
+From 005d56e2ec60eee6776d287b1694d86e9dd9ac91 Mon Sep 17 00:00:00 2001
 From: Jonathan Bell <jonathan@raspberrypi.org>
 Date: Thu, 1 Aug 2019 16:41:20 +0100
-Subject: [PATCH 174/634] hid: usb: Add device quirks for Freeway Airmouse T3
+Subject: [PATCH 165/828] hid: usb: Add device quirks for Freeway Airmouse T3
  and MX3
 
 These wireless mouse/keyboard combo remote control devices specify
@@ -21,8 +21,6 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  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 29564b370341..23c080dd435f 100644
 --- a/drivers/hid/hid-ids.h
 +++ b/drivers/hid/hid-ids.h
 @@ -225,6 +225,9 @@
@@ -35,7 +33,7 @@ index 29564b370341..23c080dd435f 100644
  #define USB_VENDOR_ID_BELKIN		0x050d
  #define USB_DEVICE_ID_FLIP_KVM		0x3201
  
-@@ -1298,6 +1301,9 @@
+@@ -1305,6 +1308,9 @@
  #define USB_VENDOR_ID_XAT	0x2505
  #define USB_DEVICE_ID_XAT_CSR	0x0220
  
@@ -45,11 +43,9 @@ index 29564b370341..23c080dd435f 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 2e104682c22b..21f1517696d2 100644
 --- a/drivers/hid/hid-quirks.c
 +++ b/drivers/hid/hid-quirks.c
-@@ -41,6 +41,7 @@ static const struct hid_device_id hid_quirks[] = {
+@@ -41,6 +41,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 },
@@ -57,7 +53,7 @@ index 2e104682c22b..21f1517696d2 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 },
-@@ -193,6 +194,7 @@ static const struct hid_device_id hid_quirks[] = {
+@@ -195,6 +196,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 },
@@ -65,6 +61,3 @@ index 2e104682c22b..21f1517696d2 100644
  
  	{ 0 }
  };
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0175-Add-HDMI1-facility-to-the-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0166-Add-HDMI1-facility-to-the-driver.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0175-Add-HDMI1-facility-to-the-driver.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0166-Add-HDMI1-facility-to-the-driver.patch
index 9bad23bc..aba7d25a 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0175-Add-HDMI1-facility-to-the-driver.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0166-Add-HDMI1-facility-to-the-driver.patch
@@ -1,7 +1,7 @@
-From e6f4369a86fe02b8527cd8cb5fd22db919cbd116 Mon Sep 17 00:00:00 2001
+From 0a0d749c35bde50e0231b8848db26c0ec3d9fe80 Mon Sep 17 00:00:00 2001
 From: James Hughes <james.hughes@raspberrypi.org>
 Date: Tue, 16 Jul 2019 12:18:21 +0100
-Subject: [PATCH 175/634] Add HDMI1 facility to the driver.
+Subject: [PATCH 166/828] Add HDMI1 facility to the driver.
 
 For generic ALSA, all you need is the bcm2835.h change, but
 have also added structures for IEC958 HDMI. Not sure how to
@@ -11,11 +11,9 @@ test those.
  .../vc04_services/bcm2835-audio/bcm2835.h     |  4 ++-
  2 files changed, 28 insertions(+), 5 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-index b42917c25050..eb8a8a5b7ec8 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-@@ -79,7 +79,11 @@ static int bcm2835_audio_alsa_newpcm(struct bcm2835_chip *chip,
+@@ -79,7 +79,11 @@ static int bcm2835_audio_alsa_newpcm(str
  	if (err)
  		return err;
  
@@ -28,7 +26,7 @@ index b42917c25050..eb8a8a5b7ec8 100644
  	if (err)
  		return err;
  
-@@ -106,7 +110,7 @@ static struct bcm2835_audio_driver bcm2835_audio_alsa = {
+@@ -106,7 +110,7 @@ static struct bcm2835_audio_driver bcm28
  	.newctl = snd_bcm2835_new_ctl,
  };
  
@@ -37,7 +35,7 @@ index b42917c25050..eb8a8a5b7ec8 100644
  	.driver = {
  		.name = "bcm2835_hdmi",
  		.owner = THIS_MODULE,
-@@ -116,7 +120,20 @@ static struct bcm2835_audio_driver bcm2835_audio_hdmi = {
+@@ -116,7 +120,20 @@ static struct bcm2835_audio_driver bcm28
  	.minchannels = 1,
  	.newpcm = bcm2835_audio_simple_newpcm,
  	.newctl = snd_bcm2835_new_hdmi_ctl,
@@ -59,7 +57,7 @@ index b42917c25050..eb8a8a5b7ec8 100644
  };
  
  static struct bcm2835_audio_driver bcm2835_audio_headphones = {
-@@ -143,7 +160,11 @@ static struct bcm2835_audio_drivers children_devices[] = {
+@@ -143,7 +160,11 @@ static struct bcm2835_audio_drivers chil
  		.is_enabled = &enable_compat_alsa,
  	},
  	{
@@ -72,8 +70,6 @@ index b42917c25050..eb8a8a5b7ec8 100644
  		.is_enabled = &enable_hdmi,
  	},
  	{
-diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
-index 51066ac8eea5..b42a2fb12248 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
 @@ -33,7 +33,9 @@ enum {
@@ -87,6 +83,3 @@ index 51066ac8eea5..b42a2fb12248 100644
  	AUDIO_DEST_MAX,
  };
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0176-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch b/root/target/linux/bcm27xx/patches-5.15/950-0167-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0176-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0167-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch
index 96c43437..ed2dc294 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0176-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0167-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch
@@ -1,7 +1,7 @@
-From aed2994f21a62601acf9f1aaf454e8f7ea4ef47d Mon Sep 17 00:00:00 2001
+From 70351efcb62171405de72882f800a73f4f34f106 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Fri, 9 Aug 2019 08:51:43 +0100
-Subject: [PATCH 176/634] net: bcmgenet: Workaround #2 for Pi4 Ethernet fail
+Subject: [PATCH 167/828] net: bcmgenet: Workaround #2 for Pi4 Ethernet fail
 
 Some combinations of Pi 4Bs and Ethernet switches don't reliably get a
 DCHP-assigned IP address, leaving the unit with a self=assigned 169.254
@@ -25,8 +25,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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 f10ff4e95ce0..6bce096a364a 100644
 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 @@ -67,6 +67,9 @@
@@ -39,7 +37,7 @@ index f10ff4e95ce0..6bce096a364a 100644
  
  static inline void bcmgenet_writel(u32 value, void __iomem *offset)
  {
-@@ -2430,6 +2433,11 @@ static void reset_umac(struct bcmgenet_priv *priv)
+@@ -2432,6 +2435,11 @@ static void reset_umac(struct bcmgenet_p
  	bcmgenet_rbuf_ctrl_set(priv, 0);
  	udelay(10);
  
@@ -51,6 +49,3 @@ index f10ff4e95ce0..6bce096a364a 100644
  	/* issue soft reset and disable MAC while updating its registers */
  	bcmgenet_umac_writel(priv, CMD_SW_RESET, UMAC_CMD);
  	udelay(2);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0177-xhci-Use-more-event-ring-segment-table-entries.patch b/root/target/linux/bcm27xx/patches-5.15/950-0168-xhci-Use-more-event-ring-segment-table-entries.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0177-xhci-Use-more-event-ring-segment-table-entries.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0168-xhci-Use-more-event-ring-segment-table-entries.patch
index 39108dec..7653b556 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0177-xhci-Use-more-event-ring-segment-table-entries.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0168-xhci-Use-more-event-ring-segment-table-entries.patch
@@ -1,7 +1,7 @@
-From 6d78e6c63b43d46146b80d592cf5de1fb0afc804 Mon Sep 17 00:00:00 2001
+From 74049cc0109466c836409b09b6eb6337b245f3fe Mon Sep 17 00:00:00 2001
 From: Jonathan Bell <jonathan@raspberrypi.org>
 Date: Tue, 13 Aug 2019 15:53:29 +0100
-Subject: [PATCH 177/634] xhci: Use more event ring segment table entries
+Subject: [PATCH 168/828] xhci: Use more event ring segment table entries
 
 Users have reported log spam created by "Event Ring Full" xHC event
 TRBs. These are caused by interrupt latency in conjunction with a very
@@ -20,11 +20,9 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  drivers/usb/host/xhci.h     | 4 ++--
  2 files changed, 7 insertions(+), 5 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index 0e312066c5c6..df84bfae98ae 100644
 --- a/drivers/usb/host/xhci-mem.c
 +++ b/drivers/usb/host/xhci-mem.c
-@@ -2511,9 +2511,11 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
+@@ -2511,9 +2511,11 @@ int xhci_mem_init(struct xhci_hcd *xhci,
  	 * Event ring setup: Allocate a normal ring, but also setup
  	 * the event ring segment table (ERST).  Section 4.9.3.
  	 */
@@ -38,7 +36,7 @@ index 0e312066c5c6..df84bfae98ae 100644
  	if (!xhci->event_ring)
  		goto fail;
  	if (xhci_check_trb_in_td_math(xhci) < 0)
-@@ -2526,7 +2528,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
+@@ -2526,7 +2528,7 @@ int xhci_mem_init(struct xhci_hcd *xhci,
  	/* set ERST count with the number of entries in the segment table */
  	val = readl(&xhci->ir_set->erst_size);
  	val &= ERST_SIZE_MASK;
@@ -47,11 +45,9 @@ index 0e312066c5c6..df84bfae98ae 100644
  	xhci_dbg_trace(xhci, trace_xhci_dbg_init,
  			"// Write ERST size = %i to ir_set 0 (some bits preserved)",
  			val);
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index 5a75fe563123..20b1819ac8d5 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -1670,8 +1670,8 @@ struct urb_priv {
+@@ -1673,8 +1673,8 @@ struct urb_priv {
   * Each segment table entry is 4*32bits long.  1K seems like an ok size:
   * (1K bytes * 8bytes/bit) / (4*32 bits) = 64 segment entries in the table,
   * meaning 64 ring segments.
@@ -62,6 +58,3 @@ index 5a75fe563123..20b1819ac8d5 100644
  /* Poll every 60 seconds */
  #define	POLL_TIMEOUT	60
  /* Stop endpoint command timeout (secs) for URB cancellation watchdog timer */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0178-configs-arm64-bcm2711-Enable-V3D.patch b/root/target/linux/bcm27xx/patches-5.15/950-0169-configs-arm64-bcm2711-Enable-V3D.patch
similarity index 75%
rename from root/target/linux/bcm27xx/patches-5.15/0178-configs-arm64-bcm2711-Enable-V3D.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0169-configs-arm64-bcm2711-Enable-V3D.patch
index 21ace018..73c94556 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0178-configs-arm64-bcm2711-Enable-V3D.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0169-configs-arm64-bcm2711-Enable-V3D.patch
@@ -1,7 +1,7 @@
-From 59a038dee3a3d996031211235a5f58390b0d151d Mon Sep 17 00:00:00 2001
+From 40d7ce7c36d66cea6bac243eeae38c758b2ddf57 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Thu, 15 Aug 2019 12:02:34 +0100
-Subject: [PATCH 178/634] configs: arm64/bcm2711: Enable V3D
+Subject: [PATCH 169/828] configs: arm64/bcm2711: Enable V3D
 
 Enable the V3D driver, which depends on BCM2835_POWER.
 
@@ -15,8 +15,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/gpu/drm/v3d/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/gpu/drm/v3d/Kconfig b/drivers/gpu/drm/v3d/Kconfig
-index 9a5c44606337..b0e048697964 100644
 --- a/drivers/gpu/drm/v3d/Kconfig
 +++ b/drivers/gpu/drm/v3d/Kconfig
 @@ -1,7 +1,7 @@
@@ -28,6 +26,3 @@ index 9a5c44606337..b0e048697964 100644
  	depends on DRM
  	depends on COMMON_CLK
  	depends on MMU
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0179-arch-arm-Add-model-string-to-cpuinfo.patch b/root/target/linux/bcm27xx/patches-5.15/950-0170-arch-arm-Add-model-string-to-cpuinfo.patch
similarity index 64%
rename from root/target/linux/bcm27xx/patches-5.15/0179-arch-arm-Add-model-string-to-cpuinfo.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0170-arch-arm-Add-model-string-to-cpuinfo.patch
index 592ea6eb..6d1e8fb8 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0179-arch-arm-Add-model-string-to-cpuinfo.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0170-arch-arm-Add-model-string-to-cpuinfo.patch
@@ -1,18 +1,16 @@
-From 5e6c458ae35bc5a7a482b89c8e634c2662dbb4ce Mon Sep 17 00:00:00 2001
+From b6dd7062b3500f268a7104bc9ffae811054422c0 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Tue, 3 Sep 2019 18:16:56 +0100
-Subject: [PATCH 179/634] arch/arm: Add model string to cpuinfo
+Subject: [PATCH 170/828] arch/arm: Add model string to cpuinfo
 
 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 ---
  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 284a80c0b6e1..12e73ce6e8fa 100644
 --- a/arch/arm/kernel/setup.c
 +++ b/arch/arm/kernel/setup.c
-@@ -1264,6 +1264,8 @@ static int c_show(struct seq_file *m, void *v)
+@@ -1264,6 +1264,8 @@ static int c_show(struct seq_file *m, vo
  {
  	int i, j;
  	u32 cpuid;
@@ -21,7 +19,7 @@ index 284a80c0b6e1..12e73ce6e8fa 100644
  
  	for_each_online_cpu(i) {
  		/*
-@@ -1323,6 +1325,14 @@ static int c_show(struct seq_file *m, void *v)
+@@ -1323,6 +1325,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 284a80c0b6e1..12e73ce6e8fa 100644
  	return 0;
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0180-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch b/root/target/linux/bcm27xx/patches-5.15/950-0171-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0180-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0171-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch
index acb0e91a..2c3509f0 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0180-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0171-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch
@@ -1,15 +1,13 @@
-From 099b730b022be0b855dbb7d5c1815f1096aa434e Mon Sep 17 00:00:00 2001
+From dbde93677f27bb0b2a407ded3800ca380fc8a9f9 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Tue, 3 Sep 2019 18:17:25 +0100
-Subject: [PATCH 180/634] arch/arm64: Add Revision, Serial, Model to cpuinfo
+Subject: [PATCH 171/828] arch/arm64: Add Revision, Serial, Model to cpuinfo
 
 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 ---
  arch/arm64/kernel/cpuinfo.c | 25 +++++++++++++++++++++++++
  1 file changed, 25 insertions(+)
 
-diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
-index 87731fea5e41..619ad8e3db71 100644
 --- a/arch/arm64/kernel/cpuinfo.c
 +++ b/arch/arm64/kernel/cpuinfo.c
 @@ -17,6 +17,7 @@
@@ -20,7 +18,7 @@ index 87731fea5e41..619ad8e3db71 100644
  #include <linux/personality.h>
  #include <linux/preempt.h>
  #include <linux/printk.h>
-@@ -137,6 +138,10 @@ static int c_show(struct seq_file *m, void *v)
+@@ -140,6 +141,10 @@ static int c_show(struct seq_file *m, vo
  {
  	int i, j;
  	bool compat = personality(current->personality) == PER_LINUX32;
@@ -31,7 +29,7 @@ index 87731fea5e41..619ad8e3db71 100644
  
  	for_each_online_cpu(i) {
  		struct cpuinfo_arm64 *cpuinfo = &per_cpu(cpu_data, i);
-@@ -197,6 +202,26 @@ static int c_show(struct seq_file *m, void *v)
+@@ -200,6 +205,26 @@ static int c_show(struct seq_file *m, vo
  		seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));
  	}
  
@@ -58,6 +56,3 @@ index 87731fea5e41..619ad8e3db71 100644
  	return 0;
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0181-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch b/root/target/linux/bcm27xx/patches-5.15/950-0172-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch
similarity index 89%
rename from root/target/linux/bcm27xx/patches-5.15/0181-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0172-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch
index 798f46d3..a3ca6e78 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0181-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0172-media-dt-bindings-Add-binding-for-the-Sony-IMX219-se.patch
@@ -1,7 +1,7 @@
-From 6145fba2874d02d7811a202afc42a75575c3b633 Mon Sep 17 00:00:00 2001
+From d98997603f7d8664102a8cbc3d4d095d05bdfb7c Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Wed, 28 Aug 2019 13:34:30 +0100
-Subject: [PATCH 181/634] media: dt-bindings: Add binding for the Sony IMX219
+Subject: [PATCH 172/828] media: dt-bindings: Add binding for the Sony IMX219
  sensor
 
 The IMX219 is an 8MPix CSI2 sensor, supporting 2 or 4 data lanes.
@@ -13,9 +13,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 59 insertions(+)
  create mode 100644 Documentation/devicetree/bindings/media/i2c/imx219.txt
 
-diff --git a/Documentation/devicetree/bindings/media/i2c/imx219.txt b/Documentation/devicetree/bindings/media/i2c/imx219.txt
-new file mode 100644
-index 000000000000..a02f1ce1e120
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/media/i2c/imx219.txt
 @@ -0,0 +1,59 @@
@@ -78,6 +75,3 @@ index 000000000000..a02f1ce1e120
 +			};
 +		};
 +	};
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0182-v4l2-Add-a-Greyworld-AWB-mode.patch b/root/target/linux/bcm27xx/patches-5.15/950-0173-v4l2-Add-a-Greyworld-AWB-mode.patch
similarity index 99%
rename from root/target/linux/bcm27xx/patches-5.15/0182-v4l2-Add-a-Greyworld-AWB-mode.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0173-v4l2-Add-a-Greyworld-AWB-mode.patch
index d455ea07..7ded027c 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0182-v4l2-Add-a-Greyworld-AWB-mode.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0173-v4l2-Add-a-Greyworld-AWB-mode.patch
@@ -1,7 +1,7 @@
-From f7b793be77aa819fa1c8ad69f5759e247cfc1b98 Mon Sep 17 00:00:00 2001
+From d240683f4f0591e341935d91a7b4bb82ef2bf55b Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Fri, 6 Sep 2019 15:04:51 +0100
-Subject: [PATCH 182/634] v4l2: Add a Greyworld AWB mode.
+Subject: [PATCH 173/828] v4l2: Add a Greyworld AWB mode.
 
 Adds a simple greyworld white balance preset, mainly for use
 with cameras without an IR filter (eg Raspberry Pi NoIR)
@@ -13,9 +13,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  2 files changed, 5037 insertions(+)
  create mode 100644 drivers/media/v4l2-core/v4l2-ctrls.c
 
-diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
-new file mode 100644
-index 000000000000..49d9085d77e3
 --- /dev/null
 +++ b/drivers/media/v4l2-core/v4l2-ctrls.c
 @@ -0,0 +1,5036 @@
@@ -5055,8 +5052,6 @@ index 000000000000..49d9085d77e3
 +	return hdl->error;
 +}
 +EXPORT_SYMBOL(v4l2_ctrl_new_fwnode_properties);
-diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
-index 5532b5f68493..ee1684f51d97 100644
 --- a/include/uapi/linux/v4l2-controls.h
 +++ b/include/uapi/linux/v4l2-controls.h
 @@ -926,6 +926,7 @@ enum v4l2_auto_n_preset_white_balance {
@@ -5067,6 +5062,3 @@ index 5532b5f68493..ee1684f51d97 100644
  };
  
  #define V4L2_CID_WIDE_DYNAMIC_RANGE		(V4L2_CID_CAMERA_CLASS_BASE+21)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0183-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch b/root/target/linux/bcm27xx/patches-5.15/950-0174-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch
similarity index 67%
rename from root/target/linux/bcm27xx/patches-5.15/0183-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0174-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch
index 7be26575..1c4d1f3e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0183-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0174-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch
@@ -1,7 +1,7 @@
-From cdaef018bca97798356b6edbabe76cf6639f2668 Mon Sep 17 00:00:00 2001
+From 55150861a836d8a68efa527227236d707ea75add Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Fri, 6 Sep 2019 15:13:06 +0100
-Subject: [PATCH 183/634] staging: bcm2835-camera: Add greyworld AWB mode
+Subject: [PATCH 174/828] staging: bcm2835-camera: Add greyworld AWB mode
 
 This is mainly used for the NoIR camera which has no IR
 filter and can completely confuse normal AWB presets.
@@ -12,11 +12,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h | 1 +
  2 files changed, 5 insertions(+)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-index b096a12387f7..a7af25f90449 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-@@ -474,6 +474,10 @@ static int ctrl_set_awb_mode(struct bm2835_mmal_dev *dev,
+@@ -474,6 +474,10 @@ static int ctrl_set_awb_mode(struct bm28
  	case V4L2_WHITE_BALANCE_SHADE:
  		u32_value = MMAL_PARAM_AWBMODE_SHADE;
  		break;
@@ -27,8 +25,6 @@ index b096a12387f7..a7af25f90449 100644
  	}
  
  	return vchiq_mmal_port_parameter_set(dev->instance, control,
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-index 1793103b18fd..27bafc5f01d2 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 @@ -313,6 +313,7 @@ enum mmal_parameter_awbmode {
@@ -39,6 +35,3 @@ index 1793103b18fd..27bafc5f01d2 100644
  };
  
  enum mmal_parameter_imagefx {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0184-drm-v3d-Delete-pm_runtime-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0175-drm-v3d-Delete-pm_runtime-support.patch
similarity index 67%
rename from root/target/linux/bcm27xx/patches-5.15/0184-drm-v3d-Delete-pm_runtime-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0175-drm-v3d-Delete-pm_runtime-support.patch
index c90c2e3f..1e143e97 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0184-drm-v3d-Delete-pm_runtime-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0175-drm-v3d-Delete-pm_runtime-support.patch
@@ -1,7 +1,7 @@
-From 472a6ea35b5e790fa6a4029579d76fe26fb5f38c Mon Sep 17 00:00:00 2001
+From 692368d17b51193e449eb4cf4f9c6da7439f379e Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Wed, 18 Sep 2019 17:22:36 +0100
-Subject: [PATCH 184/634] drm/v3d: Delete pm_runtime support
+Subject: [PATCH 175/828] drm/v3d: Delete pm_runtime support
 
 The pm_runtime was blocking changelist submission, so delete it as a
 temporary workaround.
@@ -12,11 +12,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/gpu/drm/v3d/v3d_mmu.c | 11 -----------
  2 files changed, 16 deletions(-)
 
-diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
-index d369221642c5..7ca97c3d7975 100644
 --- a/drivers/gpu/drm/v3d/v3d_gem.c
 +++ b/drivers/gpu/drm/v3d/v3d_gem.c
-@@ -485,10 +485,6 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv,
+@@ -485,10 +485,6 @@ v3d_job_init(struct v3d_dev *v3d, struct
  	job->v3d = v3d;
  	job->free = free;
  
@@ -27,7 +25,7 @@ index d369221642c5..7ca97c3d7975 100644
  	xa_init_flags(&job->deps, XA_FLAGS_ALLOC);
  
  	ret = drm_syncobj_find_fence(file_priv, in_sync, 0, 0, &in_fence);
-@@ -505,7 +501,6 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv,
+@@ -505,7 +501,6 @@ v3d_job_init(struct v3d_dev *v3d, struct
  	return 0;
  fail:
  	xa_destroy(&job->deps);
@@ -35,11 +33,9 @@ index d369221642c5..7ca97c3d7975 100644
  	return ret;
  }
  
-diff --git a/drivers/gpu/drm/v3d/v3d_mmu.c b/drivers/gpu/drm/v3d/v3d_mmu.c
-index 8986e7b96461..618503f2f2f1 100644
 --- a/drivers/gpu/drm/v3d/v3d_mmu.c
 +++ b/drivers/gpu/drm/v3d/v3d_mmu.c
-@@ -36,14 +36,6 @@ static int v3d_mmu_flush_all(struct v3d_dev *v3d)
+@@ -36,14 +36,6 @@ static int v3d_mmu_flush_all(struct v3d_
  {
  	int ret;
  
@@ -54,7 +50,7 @@ index 8986e7b96461..618503f2f2f1 100644
  	/* Make sure that another flush isn't already running when we
  	 * start this one.
  	 */
-@@ -71,9 +63,6 @@ static int v3d_mmu_flush_all(struct v3d_dev *v3d)
+@@ -71,9 +63,6 @@ static int v3d_mmu_flush_all(struct v3d_
  	if (ret)
  		dev_err(v3d->drm.dev, "MMUC flush wait idle failed\n");
  
@@ -64,6 +60,3 @@ index 8986e7b96461..618503f2f2f1 100644
  	return ret;
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0185-ARM-bcm-Switch-board-clk-and-pinctrl-to-bcm2711-comp.patch b/root/target/linux/bcm27xx/patches-5.15/950-0176-ARM-bcm-Switch-board-clk-and-pinctrl-to-bcm2711-comp.patch
similarity index 65%
rename from root/target/linux/bcm27xx/patches-5.15/0185-ARM-bcm-Switch-board-clk-and-pinctrl-to-bcm2711-comp.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0176-ARM-bcm-Switch-board-clk-and-pinctrl-to-bcm2711-comp.patch
index 1a2598fc..59a25b64 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0185-ARM-bcm-Switch-board-clk-and-pinctrl-to-bcm2711-comp.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0176-ARM-bcm-Switch-board-clk-and-pinctrl-to-bcm2711-comp.patch
@@ -1,7 +1,7 @@
-From 7f8a5c818e97033dcf7e979b3ac0ca2d35e372f0 Mon Sep 17 00:00:00 2001
+From a5545f2bf11515db23ec92e6e236205835abf9b5 Mon Sep 17 00:00:00 2001
 From: Stefan Wahren <wahrenst@gmx.net>
 Date: Thu, 19 Sep 2019 20:45:30 +0200
-Subject: [PATCH 185/634] ARM: bcm: Switch board, clk and pinctrl to bcm2711
+Subject: [PATCH 176/828] ARM: bcm: Switch board, clk and pinctrl to bcm2711
  compatible
 
 After the decision to use bcm2711 compatible for upstream, we should
@@ -13,11 +13,9 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  arch/arm/mach-bcm/board_bcm2835.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
-index 282a023027fc..e538e0f899a5 100644
 --- a/arch/arm/mach-bcm/board_bcm2835.c
 +++ b/arch/arm/mach-bcm/board_bcm2835.c
-@@ -109,7 +109,7 @@ static const char * const bcm2835_compat[] = {
+@@ -109,7 +109,7 @@ static const char * const bcm2835_compat
  #ifdef CONFIG_ARCH_MULTI_V7
  	"brcm,bcm2836",
  	"brcm,bcm2837",
@@ -26,6 +24,3 @@ index 282a023027fc..e538e0f899a5 100644
  #endif
  	NULL
  };
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0186-Rename-HDMI-ALSA-device-names-check-for-enable-state.patch b/root/target/linux/bcm27xx/patches-5.15/950-0177-Rename-HDMI-ALSA-device-names-check-for-enable-state.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0186-Rename-HDMI-ALSA-device-names-check-for-enable-state.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0177-Rename-HDMI-ALSA-device-names-check-for-enable-state.patch
index 2b5cbab5..4abe91df 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0186-Rename-HDMI-ALSA-device-names-check-for-enable-state.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0177-Rename-HDMI-ALSA-device-names-check-for-enable-state.patch
@@ -1,7 +1,7 @@
-From c5a14d2ebbbc22ea4b88303b206368db8efe5877 Mon Sep 17 00:00:00 2001
+From 3a0c465116a10d93e406f1c11af9e74b1602945d Mon Sep 17 00:00:00 2001
 From: James Hughes <james.hughes@raspberrypi.org>
 Date: Tue, 24 Sep 2019 18:26:55 +0100
-Subject: [PATCH 186/634] Rename HDMI ALSA device names, check for enable state
+Subject: [PATCH 177/828] Rename HDMI ALSA device names, check for enable state
 
 HDMI Alsa devices renamed to match names used by DRM, to
 HDMI 1 and HDMI 2
@@ -19,8 +19,6 @@ Signed-off-by: James Hughes <james.hughes@raspberrypi.org>
  .../vc04_services/bcm2835-audio/bcm2835.c     | 70 +++++++++++++++++--
  1 file changed, 63 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-index eb8a8a5b7ec8..f926784c622d 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 @@ -9,8 +9,9 @@
@@ -34,7 +32,7 @@ index eb8a8a5b7ec8..f926784c622d 100644
  static bool enable_headphones;
  static bool enable_compat_alsa = true;
  
-@@ -115,8 +116,8 @@ static struct bcm2835_audio_driver bcm2835_audio_hdmi0 = {
+@@ -115,8 +116,8 @@ static struct bcm2835_audio_driver bcm28
  		.name = "bcm2835_hdmi",
  		.owner = THIS_MODULE,
  	},
@@ -45,7 +43,7 @@ index eb8a8a5b7ec8..f926784c622d 100644
  	.minchannels = 1,
  	.newpcm = bcm2835_audio_simple_newpcm,
  	.newctl = snd_bcm2835_new_hdmi_ctl,
-@@ -128,8 +129,8 @@ static struct bcm2835_audio_driver bcm2835_audio_hdmi1 = {
+@@ -128,8 +129,8 @@ static struct bcm2835_audio_driver bcm28
  		.name = "bcm2835_hdmi",
  		.owner = THIS_MODULE,
  	},
@@ -56,7 +54,7 @@ index eb8a8a5b7ec8..f926784c622d 100644
  	.minchannels = 1,
  	.newpcm = bcm2835_audio_simple_newpcm,
  	.newctl = snd_bcm2835_new_hdmi_ctl,
-@@ -161,11 +162,11 @@ static struct bcm2835_audio_drivers children_devices[] = {
+@@ -161,11 +162,11 @@ static struct bcm2835_audio_drivers chil
  	},
  	{
  		.audio_driver = &bcm2835_audio_hdmi0,
@@ -70,7 +68,7 @@ index eb8a8a5b7ec8..f926784c622d 100644
  	},
  	{
  		.audio_driver = &bcm2835_audio_headphones,
-@@ -312,6 +313,53 @@ static int snd_add_child_devices(struct device *device, u32 numchans)
+@@ -312,6 +313,53 @@ static int snd_add_child_devices(struct
  	return 0;
  }
  
@@ -124,7 +122,7 @@ index eb8a8a5b7ec8..f926784c622d 100644
  static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
  {
  	struct device *dev = &pdev->dev;
-@@ -332,6 +380,14 @@ static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
+@@ -332,6 +380,14 @@ static int snd_bcm2835_alsa_probe(struct
  			 numchans);
  	}
  
@@ -139,6 +137,3 @@ index eb8a8a5b7ec8..f926784c622d 100644
  	err = bcm2835_devm_add_vchi_ctx(dev);
  	if (err)
  		return err;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0187-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch b/root/target/linux/bcm27xx/patches-5.15/950-0178-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch
similarity index 86%
rename from root/target/linux/bcm27xx/patches-5.15/0187-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0178-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch
index 4366be13..66bbec8b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0187-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0178-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch
@@ -1,7 +1,7 @@
-From af2d53cf2914250dad85d1c659d38f78fb374824 Mon Sep 17 00:00:00 2001
+From 6e04679f54fafa25fbaab4de3f784ba0e5cfa205 Mon Sep 17 00:00:00 2001
 From: Markus Proeller <markus.proeller@pieye.org>
 Date: Thu, 10 Oct 2019 19:12:08 +0200
-Subject: [PATCH 187/634] dt-bindings: Add binding for the Infineon IRS1125
+Subject: [PATCH 178/828] dt-bindings: Add binding for the Infineon IRS1125
  sensor
 
 Adds a binding for the Infineon IRS1125 time-of-flight depth
@@ -13,9 +13,6 @@ Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
  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 @@
@@ -67,6 +64,3 @@ index 000000000000..25a48028c957
 +			};
 +		};
 +	};
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0188-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch b/root/target/linux/bcm27xx/patches-5.15/950-0179-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch
similarity index 98%
rename from root/target/linux/bcm27xx/patches-5.15/0188-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0179-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch
index 1bab0b0b..aac0c8fc 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0188-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0179-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch
@@ -1,7 +1,7 @@
-From f62f827c7b7a6b5e0c37311278ba4e6e7b9cdf43 Mon Sep 17 00:00:00 2001
+From 5180dcfb7cbd61d33640609f1fc0452e68b0f1c6 Mon Sep 17 00:00:00 2001
 From: Markus Proeller <markus.proeller@pieye.org>
 Date: Thu, 10 Oct 2019 19:12:36 +0200
-Subject: [PATCH 188/634] media: i2c: Add a driver for the Infineon IRS1125
+Subject: [PATCH 179/828] media: i2c: Add a driver for the Infineon IRS1125
  depth sensor
 
 The Infineon IRS1125 is a time of flight depth sensor that
@@ -19,8 +19,6 @@ Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
  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 6157e73eef24..f5eec949a93e 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
 @@ -1187,6 +1187,18 @@ config VIDEO_OV13858
@@ -42,8 +40,6 @@ index 6157e73eef24..f5eec949a93e 100644
  config VIDEO_VS6624
  	tristate "ST VS6624 sensor support"
  	depends on VIDEO_V4L2 && I2C
-diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
-index 83268f20aa3a..ceba2bbf43d2 100644
 --- a/drivers/media/i2c/Makefile
 +++ b/drivers/media/i2c/Makefile
 @@ -89,6 +89,7 @@ obj-$(CONFIG_VIDEO_OV9640) += ov9640.o
@@ -54,9 +50,6 @@ index 83268f20aa3a..ceba2bbf43d2 100644
  obj-$(CONFIG_VIDEO_MT9M001) += mt9m001.o
  obj-$(CONFIG_VIDEO_MT9M032) += mt9m032.o
  obj-$(CONFIG_VIDEO_MT9M111) += mt9m111.o
-diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c
-new file mode 100644
-index 000000000000..25e1dd5a08ef
 --- /dev/null
 +++ b/drivers/media/i2c/irs1125.c
 @@ -0,0 +1,1112 @@
@@ -1172,9 +1165,6 @@ index 000000000000..25e1dd5a08ef
 +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..dccaca23aa76
 --- /dev/null
 +++ b/drivers/media/i2c/irs1125.h
 @@ -0,0 +1,61 @@
@@ -1239,6 +1229,3 @@ index 000000000000..dccaca23aa76
 +
 +#endif /* IRS1125 */
 +
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0189-drm-v3d-Suppress-all-but-the-first-MMU-error.patch b/root/target/linux/bcm27xx/patches-5.15/950-0180-drm-v3d-Suppress-all-but-the-first-MMU-error.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0189-drm-v3d-Suppress-all-but-the-first-MMU-error.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0180-drm-v3d-Suppress-all-but-the-first-MMU-error.patch
index 1af79cf5..0c3a6f4f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0189-drm-v3d-Suppress-all-but-the-first-MMU-error.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0180-drm-v3d-Suppress-all-but-the-first-MMU-error.patch
@@ -1,7 +1,7 @@
-From 72dd74f47083e7e19d5505dd9149601d40e702df Mon Sep 17 00:00:00 2001
+From 3eaf1b1f7f9c4fd15697c9339ffe78b0d3f0d944 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Mon, 11 Nov 2019 20:18:08 +0000
-Subject: [PATCH 189/634] drm/v3d: Suppress all but the first MMU error
+Subject: [PATCH 180/828] drm/v3d: Suppress all but the first MMU error
 
 The v3d driver currently encounters a lot of MMU PTE exceptions, so
 only log the first to avoid swamping the kernel log.
@@ -11,8 +11,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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 e714d5318f30..0f7a23f051df 100644
 --- a/drivers/gpu/drm/v3d/v3d_irq.c
 +++ b/drivers/gpu/drm/v3d/v3d_irq.c
 @@ -177,6 +177,7 @@ v3d_hub_irq(int irq, void *arg)
@@ -39,6 +37,3 @@ index e714d5318f30..0f7a23f051df 100644
  		status = IRQ_HANDLED;
  	}
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0190-drm-v3d-Plug-dma_fence-leak.patch b/root/target/linux/bcm27xx/patches-5.15/950-0181-drm-v3d-Plug-dma_fence-leak.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0190-drm-v3d-Plug-dma_fence-leak.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0181-drm-v3d-Plug-dma_fence-leak.patch
index 43ea8657..e4d152f7 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0190-drm-v3d-Plug-dma_fence-leak.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0181-drm-v3d-Plug-dma_fence-leak.patch
@@ -1,7 +1,7 @@
-From 221c9ee03ed568457aa2b32054157b654ef4be87 Mon Sep 17 00:00:00 2001
+From 250cddf6a615ace05a830e2880aa67e579e23c55 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Tue, 12 Nov 2019 16:41:21 +0000
-Subject: [PATCH 190/634] drm/v3d: Plug dma_fence leak
+Subject: [PATCH 181/828] drm/v3d: Plug dma_fence leak
 
 The irq_fence and done_fence are given a reference that is never
 released. The necessary dma_fence_put()s seem to have been
@@ -14,8 +14,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/gpu/drm/v3d/v3d_gem.c | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
-index 7ca97c3d7975..a378a0cc67c2 100644
 --- a/drivers/gpu/drm/v3d/v3d_gem.c
 +++ b/drivers/gpu/drm/v3d/v3d_gem.c
 @@ -414,6 +414,9 @@ v3d_job_free(struct kref *ref)
@@ -28,6 +26,3 @@ index 7ca97c3d7975..a378a0cc67c2 100644
  	v3d_clock_up_put(v3d);
  
  	if (job->perfmon)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0191-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch b/root/target/linux/bcm27xx/patches-5.15/950-0182-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch
similarity index 71%
rename from root/target/linux/bcm27xx/patches-5.15/0191-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0182-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch
index 1f4e0595..b15982f9 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0191-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0182-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch
@@ -1,7 +1,7 @@
-From c190196f665d499d4625ba6b6fb890b217d31547 Mon Sep 17 00:00:00 2001
+From 6ba33c1ffadb826836eea6e04839ecf5b87df505 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 6 Nov 2019 13:57:48 +0000
-Subject: [PATCH 191/634] staging: vchiq_arm: Register vcsm-cma as a platform
+Subject: [PATCH 182/828] staging: vchiq_arm: Register vcsm-cma as a platform
  driver
 
 Following the same pattern as bcm2835-camera and bcm2835-audio,
@@ -12,8 +12,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  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 967f10b9582a..af0e2cae6175 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -67,6 +67,7 @@ struct vchiq_state g_state;
@@ -24,7 +22,7 @@ index 967f10b9582a..af0e2cae6175 100644
  
  static struct vchiq_drvdata bcm2835_drvdata = {
  	.cache_line_size = 32,
-@@ -1819,6 +1820,7 @@ static int vchiq_probe(struct platform_device *pdev)
+@@ -1838,6 +1839,7 @@ static int vchiq_probe(struct platform_d
  		goto error_exit;
  	}
  
@@ -32,7 +30,7 @@ index 967f10b9582a..af0e2cae6175 100644
  	bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
  	bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
  
-@@ -1834,6 +1836,7 @@ static int vchiq_remove(struct platform_device *pdev)
+@@ -1853,6 +1855,7 @@ static int vchiq_remove(struct platform_
  {
  	platform_device_unregister(bcm2835_audio);
  	platform_device_unregister(bcm2835_camera);
@@ -40,6 +38,3 @@ index 967f10b9582a..af0e2cae6175 100644
  	vchiq_debugfs_deinit();
  	vchiq_deregister_chrdev();
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0192-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch b/root/target/linux/bcm27xx/patches-5.15/950-0183-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0192-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0183-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch
index 43f9595c..02069dc9 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0192-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0183-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch
@@ -1,7 +1,7 @@
-From 7a4897dbef3cb2e2055af10f4c8bf9578f1fdfb6 Mon Sep 17 00:00:00 2001
+From 3cd45eeaec4045f0004f23950806cc9859692b14 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 6 Nov 2019 13:57:58 +0000
-Subject: [PATCH 192/634] staging: vchiq_arm: Register bcm2835-codec as a
+Subject: [PATCH 183/828] staging: vchiq_arm: Register bcm2835-codec as a
  platform driver
 
 Following the same pattern as bcm2835-camera and bcm2835-audio,
@@ -12,8 +12,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  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 af0e2cae6175..a457f31043fc 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -67,6 +67,7 @@ struct vchiq_state g_state;
@@ -24,7 +22,7 @@ index af0e2cae6175..a457f31043fc 100644
  static struct platform_device *vcsm_cma;
  
  static struct vchiq_drvdata bcm2835_drvdata = {
-@@ -1821,6 +1822,7 @@ static int vchiq_probe(struct platform_device *pdev)
+@@ -1840,6 +1841,7 @@ static int vchiq_probe(struct platform_d
  	}
  
  	vcsm_cma = vchiq_register_child(pdev, "vcsm-cma");
@@ -32,7 +30,7 @@ index af0e2cae6175..a457f31043fc 100644
  	bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
  	bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
  
-@@ -1836,6 +1838,7 @@ static int vchiq_remove(struct platform_device *pdev)
+@@ -1855,6 +1857,7 @@ static int vchiq_remove(struct platform_
  {
  	platform_device_unregister(bcm2835_audio);
  	platform_device_unregister(bcm2835_camera);
@@ -40,6 +38,3 @@ index af0e2cae6175..a457f31043fc 100644
  	platform_device_unregister(vcsm_cma);
  	vchiq_debugfs_deinit();
  	vchiq_deregister_chrdev();
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0193-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch b/root/target/linux/bcm27xx/patches-5.15/950-0184-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0193-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0184-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch
index 8983def5..09525ee7 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0193-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0184-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch
@@ -1,7 +1,7 @@
-From 38fd276e222a66a6b3101a742b19c6c86899fbed Mon Sep 17 00:00:00 2001
+From 2fb210003b2001472850579242c46cc17392f5e1 Mon Sep 17 00:00:00 2001
 From: James Hughes <james.hughes@raspberrypi.org>
 Date: Thu, 31 Oct 2019 14:39:44 +0000
-Subject: [PATCH 193/634] net:phy:2711 Allow ethernet LED mode to be set via
+Subject: [PATCH 184/828] net:phy:2711 Allow ethernet LED mode to be set via
  device tree
 
 Add device tree entries and code to allow the specification of
@@ -17,11 +17,9 @@ releases.
  drivers/net/phy/broadcom.c | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
-index 83aea5c5cd03..ab40956b8c65 100644
 --- a/drivers/net/phy/broadcom.c
 +++ b/drivers/net/phy/broadcom.c
-@@ -315,6 +315,9 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev)
+@@ -316,6 +316,9 @@ static void bcm54xx_adjust_rxrefclk(stru
  static int bcm54xx_config_init(struct phy_device *phydev)
  {
  	int reg, err, val;
@@ -31,7 +29,7 @@ index 83aea5c5cd03..ab40956b8c65 100644
  
  	reg = phy_read(phydev, MII_BCM54XX_ECR);
  	if (reg < 0)
-@@ -370,10 +373,10 @@ static int bcm54xx_config_init(struct phy_device *phydev)
+@@ -371,10 +374,10 @@ static int bcm54xx_config_init(struct ph
  
  	bcm54xx_phydsp_config(phydev);
  
@@ -44,7 +42,7 @@ index 83aea5c5cd03..ab40956b8c65 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.
-@@ -384,8 +387,8 @@ static int bcm54xx_config_init(struct phy_device *phydev)
+@@ -385,8 +388,8 @@ static int bcm54xx_config_init(struct ph
  		bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val);
  
  		val = BCM_LED_MULTICOLOR_IN_PHASE |
@@ -55,6 +53,3 @@ index 83aea5c5cd03..ab40956b8c65 100644
  		bcm_phy_write_exp(phydev, BCM_EXP_MULTICOLOR, val);
  	}
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0194-v3d_drv-Handle-missing-clock-more-gracefully.patch b/root/target/linux/bcm27xx/patches-5.15/950-0185-v3d_drv-Handle-missing-clock-more-gracefully.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0194-v3d_drv-Handle-missing-clock-more-gracefully.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0185-v3d_drv-Handle-missing-clock-more-gracefully.patch
index 18545a2d..310c249c 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0194-v3d_drv-Handle-missing-clock-more-gracefully.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0185-v3d_drv-Handle-missing-clock-more-gracefully.patch
@@ -1,18 +1,16 @@
-From 195b7433f951847965210bb8a7af7603f6b991c7 Mon Sep 17 00:00:00 2001
+From 6dbf29bf8e964eccbbc7d156d585a1bbd3e70222 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 23 Aug 2019 16:34:38 +0100
-Subject: [PATCH 194/634] v3d_drv: Handle missing clock more gracefully
+Subject: [PATCH 185/828] v3d_drv: Handle missing clock more gracefully
 
 Signed-off-by: popcornmix <popcornmix@gmail.com>
 ---
  drivers/gpu/drm/v3d/v3d_drv.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
-index e202870873a4..6112a8f72adc 100644
 --- a/drivers/gpu/drm/v3d/v3d_drv.c
 +++ b/drivers/gpu/drm/v3d/v3d_drv.c
-@@ -298,10 +298,10 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
+@@ -302,10 +302,10 @@ static int v3d_platform_drm_probe(struct
  	}
  
  	v3d->clk = devm_clk_get(dev, NULL);
@@ -27,6 +25,3 @@ index e202870873a4..6112a8f72adc 100644
  	}
  	v3d->clk_up_rate = clk_get_rate(v3d->clk);
  	/* For downclocking, drop it to the minimum frequency we can get from
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0195-v3d_gem-Kick-the-clock-so-firmware-knows-we-are-usin.patch b/root/target/linux/bcm27xx/patches-5.15/950-0186-v3d_gem-Kick-the-clock-so-firmware-knows-we-are-usin.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0195-v3d_gem-Kick-the-clock-so-firmware-knows-we-are-usin.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0186-v3d_gem-Kick-the-clock-so-firmware-knows-we-are-usin.patch
index 84399b4c..5e8c552c 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0195-v3d_gem-Kick-the-clock-so-firmware-knows-we-are-usin.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0186-v3d_gem-Kick-the-clock-so-firmware-knows-we-are-usin.patch
@@ -1,7 +1,7 @@
-From f12b90a2babfed3c9ea13f6d940bc5bdc76bb13f Mon Sep 17 00:00:00 2001
+From a74ef19f143d1bf1c333dd909597ce883992278d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 5 Sep 2019 17:59:14 +0100
-Subject: [PATCH 195/634] v3d_gem: Kick the clock so firmware knows we are
+Subject: [PATCH 186/828] v3d_gem: Kick the clock so firmware knows we are
  using firmware clock interface
 
 Setting the v3d clock to low value allows firmware to handle dvfs in case
@@ -12,11 +12,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  drivers/gpu/drm/v3d/v3d_gem.c | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
-index a378a0cc67c2..0cfc30daa6a6 100644
 --- a/drivers/gpu/drm/v3d/v3d_gem.c
 +++ b/drivers/gpu/drm/v3d/v3d_gem.c
-@@ -953,6 +953,10 @@ v3d_gem_init(struct drm_device *dev)
+@@ -955,6 +955,10 @@ v3d_gem_init(struct drm_device *dev)
  	mutex_init(&v3d->clk_lock);
  	INIT_DELAYED_WORK(&v3d->clk_down_work, v3d_clock_down_work);
  
@@ -27,6 +25,3 @@ index a378a0cc67c2..0cfc30daa6a6 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".
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0196-clk-raspberrypi-Allow-cpufreq-driver-to-also-adjust-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0187-clk-raspberrypi-Allow-cpufreq-driver-to-also-adjust-.patch
similarity index 65%
rename from root/target/linux/bcm27xx/patches-5.15/0196-clk-raspberrypi-Allow-cpufreq-driver-to-also-adjust-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0187-clk-raspberrypi-Allow-cpufreq-driver-to-also-adjust-.patch
index 455c274d..2c90d4bd 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0196-clk-raspberrypi-Allow-cpufreq-driver-to-also-adjust-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0187-clk-raspberrypi-Allow-cpufreq-driver-to-also-adjust-.patch
@@ -1,7 +1,7 @@
-From 9dee01ef3aa37167d4a146994011f07b8a8ab4c3 Mon Sep 17 00:00:00 2001
+From 9e50c584550d3dfea066aa49ab8baa86573bafd3 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 9 Sep 2019 15:49:56 +0100
-Subject: [PATCH 196/634] clk-raspberrypi: Allow cpufreq driver to also adjust
+Subject: [PATCH 187/828] clk-raspberrypi: Allow cpufreq driver to also adjust
  gpu clocks
 
 For performance/power it is beneficial to adjust gpu clocks with arm clock.
@@ -12,11 +12,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  drivers/clk/bcm/clk-raspberrypi.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index dd3b71eafabf..19f4e3b7b190 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
-@@ -97,7 +97,7 @@ static int raspberrypi_clock_property(struct rpi_firmware *firmware,
+@@ -97,7 +97,7 @@ static int raspberrypi_clock_property(st
  	struct raspberrypi_firmware_prop msg = {
  		.id = cpu_to_le32(data->id),
  		.val = cpu_to_le32(*val),
@@ -25,6 +23,3 @@ index dd3b71eafabf..19f4e3b7b190 100644
  	};
  	int ret;
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0197-clk-bcm2835-Disable-v3d-clock.patch b/root/target/linux/bcm27xx/patches-5.15/950-0188-clk-bcm2835-Disable-v3d-clock.patch
similarity index 84%
rename from root/target/linux/bcm27xx/patches-5.15/0197-clk-bcm2835-Disable-v3d-clock.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0188-clk-bcm2835-Disable-v3d-clock.patch
index 4c35d7bc..243da875 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0197-clk-bcm2835-Disable-v3d-clock.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0188-clk-bcm2835-Disable-v3d-clock.patch
@@ -1,7 +1,7 @@
-From e58fb03493b1a902c35bff550f07f7c484471e15 Mon Sep 17 00:00:00 2001
+From e653a73dd59f1126e425a3601d20db23d7d2d61b Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 3 Sep 2019 20:28:00 +0100
-Subject: [PATCH 197/634] clk-bcm2835: Disable v3d clock
+Subject: [PATCH 188/828] clk-bcm2835: Disable v3d clock
 
 This is controlled by firmware, see clk-raspberrypi.c
 
@@ -10,11 +10,9 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  drivers/clk/bcm/clk-bcm2835.c | 30 ++++++++++++------------------
  1 file changed, 12 insertions(+), 18 deletions(-)
 
-diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index fe005f9dbe02..4f983b82eab1 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1735,16 +1735,12 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {
+@@ -1735,16 +1735,12 @@ static const struct bcm2835_clk_desc clk
  		.hold_mask = CM_PLLA_HOLDCORE,
  		.fixed_divider = 1,
  		.flags = CLK_SET_RATE_PARENT),
@@ -37,7 +35,7 @@ index fe005f9dbe02..4f983b82eab1 100644
  	[BCM2835_PLLA_DSI0]	= REGISTER_PLL_DIV(
  		SOC_ALL,
  		.name = "plla_dsi0",
-@@ -2045,14 +2041,12 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {
+@@ -2045,14 +2041,12 @@ static const struct bcm2835_clk_desc clk
  		.int_bits = 6,
  		.frac_bits = 0,
  		.tcnt_mux = 3),
@@ -58,6 +56,3 @@ index fe005f9dbe02..4f983b82eab1 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
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0198-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch b/root/target/linux/bcm27xx/patches-5.15/950-0189-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch
similarity index 68%
rename from root/target/linux/bcm27xx/patches-5.15/0198-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0189-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch
index 7c9b289d..f4a497ba 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0198-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0189-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch
@@ -1,7 +1,7 @@
-From 5b4716e9f006006fb55df40766034623894572c9 Mon Sep 17 00:00:00 2001
+From 44f36204c45212a311159ae827e37624b0eeb793 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Tue, 29 Jan 2019 16:13:25 +0000
-Subject: [PATCH 198/634] staging: vchiq_arm: Set up dma ranges on child
+Subject: [PATCH 189/828] staging: vchiq_arm: Set up dma ranges on child
  devices
 
 The VCHIQ driver now loads the audio, camera, codec, and vc-sm
@@ -16,11 +16,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c   | 6 ++++++
  1 file changed, 6 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 a457f31043fc..b65dbcef9731 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -1771,6 +1771,12 @@ vchiq_register_child(struct platform_device *pdev, const char *name)
+@@ -1790,6 +1790,12 @@ vchiq_register_child(struct platform_dev
  		child = NULL;
  	}
  
@@ -33,6 +31,3 @@ index a457f31043fc..b65dbcef9731 100644
  	return child;
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0199-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch b/root/target/linux/bcm27xx/patches-5.15/950-0190-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0199-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0190-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch
index 54f86921..ed75d4bb 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0199-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0190-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch
@@ -1,7 +1,7 @@
-From 3b8c627872c59353b2966844bd3075a92e6d92f0 Mon Sep 17 00:00:00 2001
+From 235f45b0e4a9b0d5bb0b059e3991af0ab042d256 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Tue, 18 Jun 2019 12:15:50 +0100
-Subject: [PATCH 199/634] staging: vchiq: Use the old dma controller for OF
+Subject: [PATCH 190/828] staging: vchiq: Use the old dma controller for OF
  config on platform devices
 
 vchiq on Pi4 is no longer under the soc node, therefore it
@@ -15,11 +15,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  .../interface/vchiq_arm/vchiq_arm.c             | 17 ++++++++++++++---
  1 file changed, 14 insertions(+), 3 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 b65dbcef9731..d52f689ce8ca 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -1757,6 +1757,7 @@ vchiq_register_child(struct platform_device *pdev, const char *name)
+@@ -1776,6 +1776,7 @@ vchiq_register_child(struct platform_dev
  {
  	struct platform_device_info pdevinfo;
  	struct platform_device *child;
@@ -27,7 +25,7 @@ index b65dbcef9731..d52f689ce8ca 100644
  
  	memset(&pdevinfo, 0, sizeof(pdevinfo));
  
-@@ -1772,10 +1773,20 @@ vchiq_register_child(struct platform_device *pdev, const char *name)
+@@ -1791,10 +1792,20 @@ vchiq_register_child(struct platform_dev
  	}
  
  	/*
@@ -51,6 +49,3 @@ index b65dbcef9731..d52f689ce8ca 100644
  
  	return child;
  }
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0200-ARM-bcm-Backport-BCM2711-support-from-upstream.patch b/root/target/linux/bcm27xx/patches-5.15/950-0191-ARM-bcm-Backport-BCM2711-support-from-upstream.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0200-ARM-bcm-Backport-BCM2711-support-from-upstream.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0191-ARM-bcm-Backport-BCM2711-support-from-upstream.patch
index ec52a54c..9315f97a 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0200-ARM-bcm-Backport-BCM2711-support-from-upstream.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0191-ARM-bcm-Backport-BCM2711-support-from-upstream.patch
@@ -1,7 +1,7 @@
-From a951cbd47add6f9bd5bb9e849cbe7b46595cabcf Mon Sep 17 00:00:00 2001
+From 5ac7595da13f36b1314374ba978787ab739f9801 Mon Sep 17 00:00:00 2001
 From: Stefan Wahren <wahrenst@gmx.net>
 Date: Fri, 27 Dec 2019 11:40:56 +0100
-Subject: [PATCH 200/634] ARM: bcm: Backport BCM2711 support from upstream
+Subject: [PATCH 191/828] ARM: bcm: Backport BCM2711 support from upstream
 
 Make the BCM2711 a different machine, but keep it in board_bcm2835.
 
@@ -10,11 +10,9 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  arch/arm/mach-bcm/board_bcm2835.c | 17 +++++++++++++++--
  1 file changed, 15 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
-index e538e0f899a5..91a758c61f48 100644
 --- a/arch/arm/mach-bcm/board_bcm2835.c
 +++ b/arch/arm/mach-bcm/board_bcm2835.c
-@@ -109,17 +109,30 @@ static const char * const bcm2835_compat[] = {
+@@ -109,17 +109,30 @@ static const char * const bcm2835_compat
  #ifdef CONFIG_ARCH_MULTI_V7
  	"brcm,bcm2836",
  	"brcm,bcm2837",
@@ -47,6 +45,3 @@ index e538e0f899a5..91a758c61f48 100644
 +	.dt_compat = bcm2711_compat,
  	.smp = smp_ops(bcm2836_smp_ops),
  MACHINE_END
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0201-Initialise-rpi-firmware-before-clk-bcm2835.patch b/root/target/linux/bcm27xx/patches-5.15/950-0192-Initialise-rpi-firmware-before-clk-bcm2835.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0201-Initialise-rpi-firmware-before-clk-bcm2835.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0192-Initialise-rpi-firmware-before-clk-bcm2835.patch
index 2527fcda..56e22b28 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0201-Initialise-rpi-firmware-before-clk-bcm2835.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0192-Initialise-rpi-firmware-before-clk-bcm2835.patch
@@ -1,7 +1,7 @@
-From 175480d37bdf8f12136469735fb92904daf0b879 Mon Sep 17 00:00:00 2001
+From c66a405e5fb57a02137d890466f7e62920dea213 Mon Sep 17 00:00:00 2001
 From: Luke Hinds <7058938+lukehinds@users.noreply.github.com>
 Date: Wed, 22 Jan 2020 16:03:00 +0000
-Subject: [PATCH 201/634] Initialise rpi-firmware before clk-bcm2835
+Subject: [PATCH 192/828] Initialise rpi-firmware before clk-bcm2835
 
 The IMA (Integrity Measurement Architecture) looks for a TPM (Trusted
 Platform Module) having been registered when it initialises; otherwise
@@ -23,11 +23,9 @@ Co-authored-by: Phil Elwell <phil@raspberrypi.org>
  drivers/firmware/raspberrypi.c | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index 4f983b82eab1..961acade005f 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -2423,7 +2423,7 @@ static int __init __bcm2835_clk_driver_init(void)
+@@ -2423,7 +2423,7 @@ static int __init __bcm2835_clk_driver_i
  {
  	return platform_driver_register(&bcm2835_clk_driver);
  }
@@ -36,11 +34,9 @@ index 4f983b82eab1..961acade005f 100644
  
  MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
  MODULE_DESCRIPTION("BCM2835 clock driver");
-diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
-index 2a7a0a9933d7..fa105074f05f 100644
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
-@@ -498,7 +498,7 @@ static int __init rpi_firmware_init(void)
+@@ -498,7 +498,7 @@ out2:
  out1:
  	return ret;
  }
@@ -49,6 +45,3 @@ index 2a7a0a9933d7..fa105074f05f 100644
  
  static void __init rpi_firmware_exit(void)
  {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0202-staging-vchiq_arm-Give-vchiq-children-DT-nodes.patch b/root/target/linux/bcm27xx/patches-5.15/950-0193-staging-vchiq_arm-Give-vchiq-children-DT-nodes.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0202-staging-vchiq_arm-Give-vchiq-children-DT-nodes.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0193-staging-vchiq_arm-Give-vchiq-children-DT-nodes.patch
index 3c3ac50a..a98e51d4 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0202-staging-vchiq_arm-Give-vchiq-children-DT-nodes.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0193-staging-vchiq_arm-Give-vchiq-children-DT-nodes.patch
@@ -1,7 +1,7 @@
-From d473a06242f6253dd9b1537a93469fabd85b4c07 Mon Sep 17 00:00:00 2001
+From 74d3f5f26b0d2454bdbeda6bcf6ecf21e31f93c9 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Mon, 3 Feb 2020 17:30:46 +0000
-Subject: [PATCH 202/634] staging: vchiq_arm: Give vchiq children DT nodes
+Subject: [PATCH 193/828] staging: vchiq_arm: Give vchiq children DT nodes
 
 vchiq kernel clients are now instantiated as platform drivers rather
 than using DT, but the children of the vchiq interface may still
@@ -14,11 +14,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 8 ++++++++
  1 file changed, 8 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 d52f689ce8ca..79009bd24354 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -1766,12 +1766,20 @@ vchiq_register_child(struct platform_device *pdev, const char *name)
+@@ -1785,12 +1785,20 @@ vchiq_register_child(struct platform_dev
  	pdevinfo.id = PLATFORM_DEVID_NONE;
  	pdevinfo.dma_mask = DMA_BIT_MASK(32);
  
@@ -39,6 +37,3 @@ index d52f689ce8ca..79009bd24354 100644
  	/*
  	 * We want the dma-ranges etc to be copied from a device with the
  	 * correct dma-ranges for the VPU.
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0203-pinctrl-bcm2835-Remove-gpiochip-on-error.patch b/root/target/linux/bcm27xx/patches-5.15/950-0194-pinctrl-bcm2835-Remove-gpiochip-on-error.patch
similarity index 66%
rename from root/target/linux/bcm27xx/patches-5.15/0203-pinctrl-bcm2835-Remove-gpiochip-on-error.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0194-pinctrl-bcm2835-Remove-gpiochip-on-error.patch
index 18079834..af28c98f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0203-pinctrl-bcm2835-Remove-gpiochip-on-error.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0194-pinctrl-bcm2835-Remove-gpiochip-on-error.patch
@@ -1,7 +1,7 @@
-From eeecd38020a2da0b84c51126bcec450284d46e83 Mon Sep 17 00:00:00 2001
+From ec1e2052164eb3f3215ce34a03944c3e5441c600 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Mon, 6 Jan 2020 16:04:30 +0000
-Subject: [PATCH 203/634] pinctrl: bcm2835: Remove gpiochip on error
+Subject: [PATCH 194/828] pinctrl: bcm2835: Remove gpiochip on error
 
 A failure in gpiochip_irqchip_add leads to a leak of a gpiochip. Fix
 the leak with the use of devm_gpiochip_add_data.
@@ -12,11 +12,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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 7167927e9f26..1fb103eb34a2 100644
 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
 +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-@@ -1303,7 +1303,7 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)
+@@ -1321,7 +1321,7 @@ static int bcm2835_pinctrl_probe(struct
  	girq->default_type = IRQ_TYPE_NONE;
  	girq->handler = handle_level_irq;
  
@@ -24,7 +22,4 @@ index 7167927e9f26..1fb103eb34a2 100644
 +	err = devm_gpiochip_add_data(dev, &pc->gpio_chip, pc);
  	if (err) {
  		dev_err(dev, "could not add GPIO chip\n");
- 		return err;
--- 
-2.33.1
-
+ 		goto out_remove;
diff --git a/root/target/linux/bcm27xx/patches-5.15/0205-drivers-char-vcio-Use-common-compat-header.patch b/root/target/linux/bcm27xx/patches-5.15/950-0195-drivers-char-vcio-Use-common-compat-header.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0205-drivers-char-vcio-Use-common-compat-header.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0195-drivers-char-vcio-Use-common-compat-header.patch
index e19b687a..89081a59 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0205-drivers-char-vcio-Use-common-compat-header.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0195-drivers-char-vcio-Use-common-compat-header.patch
@@ -1,7 +1,7 @@
-From a6d27048e25d448455ccbbdd5bd98cdd6e8d4375 Mon Sep 17 00:00:00 2001
+From 93ad49a5ad7df994bc65af7b600a619bfb59b505 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Mon, 2 Mar 2020 14:40:19 +0000
-Subject: [PATCH 205/634] drivers: char: vcio: Use common compat header
+Subject: [PATCH 195/828] drivers: char: vcio: Use common compat header
 
 The definition of compat_ptr is now common for most platforms, but
 requires the inclusion of <linux/compat.h>.
@@ -11,8 +11,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/char/broadcom/vcio.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/char/broadcom/vcio.c b/drivers/char/broadcom/vcio.c
-index d2598663a2b5..a39155a94fb7 100644
 --- a/drivers/char/broadcom/vcio.c
 +++ b/drivers/char/broadcom/vcio.c
 @@ -18,6 +18,7 @@
@@ -23,6 +21,3 @@ index d2598663a2b5..a39155a94fb7 100644
  #include <soc/bcm2835/raspberrypi-firmware.h>
  
  #define MBOX_CHAN_PROPERTY 8
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0206-video-fbdev-bcm2708_fb-Use-common-compat-header.patch b/root/target/linux/bcm27xx/patches-5.15/950-0196-video-fbdev-bcm2708_fb-Use-common-compat-header.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0206-video-fbdev-bcm2708_fb-Use-common-compat-header.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0196-video-fbdev-bcm2708_fb-Use-common-compat-header.patch
index 7ee09d12..9fe2e80e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0206-video-fbdev-bcm2708_fb-Use-common-compat-header.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0196-video-fbdev-bcm2708_fb-Use-common-compat-header.patch
@@ -1,7 +1,7 @@
-From 9c1c3405794665429e2690162dd3fbf111807744 Mon Sep 17 00:00:00 2001
+From 4f60e15b2476c8e84d6b08674cddbf2fe3e253a2 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Mon, 2 Mar 2020 14:42:23 +0000
-Subject: [PATCH 206/634] video: fbdev: bcm2708_fb: Use common compat header
+Subject: [PATCH 196/828] video: fbdev: bcm2708_fb: Use common compat header
 
 The definition of compat_ptr is now common for most platforms, but
 requires the inclusion of <linux/compat.h>.
@@ -11,8 +11,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/video/fbdev/bcm2708_fb.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c
-index 0e9ec3f593b8..17e9260655e4 100644
 --- a/drivers/video/fbdev/bcm2708_fb.c
 +++ b/drivers/video/fbdev/bcm2708_fb.c
 @@ -38,6 +38,7 @@
@@ -23,6 +21,3 @@ index 0e9ec3f593b8..17e9260655e4 100644
  
  //#define BCM2708_FB_DEBUG
  #define MODULE_NAME "bcm2708_fb"
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0207-of-overlay-Correct-symbol-path-fixups.patch b/root/target/linux/bcm27xx/patches-5.15/950-0197-of-overlay-Correct-symbol-path-fixups.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0207-of-overlay-Correct-symbol-path-fixups.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0197-of-overlay-Correct-symbol-path-fixups.patch
index c49cdb6d..eb66de31 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0207-of-overlay-Correct-symbol-path-fixups.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0197-of-overlay-Correct-symbol-path-fixups.patch
@@ -1,7 +1,7 @@
-From 412aa5c62539f08480673a36e5479e976a1f908a Mon Sep 17 00:00:00 2001
+From 18bf7068dc6df6caa77f44d457754ca85530594a Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Thu, 6 Feb 2020 12:23:15 +0000
-Subject: [PATCH 207/634] of: overlay: Correct symbol path fixups
+Subject: [PATCH 197/828] of: overlay: Correct symbol path fixups
 
 When symbols from overlays are added to the live tree their paths must
 be rebased. The translated symbol is normally the result of joining
@@ -24,11 +24,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/of/overlay.c | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
-index d80160cf34bb..2100d277ff98 100644
 --- a/drivers/of/overlay.c
 +++ b/drivers/of/overlay.c
-@@ -245,6 +245,8 @@ static struct property *dup_and_fixup_symbol_prop(
+@@ -245,6 +245,8 @@ static struct property *dup_and_fixup_sy
  	if (!target_path)
  		return NULL;
  	target_path_len = strlen(target_path);
@@ -37,6 +35,3 @@ index d80160cf34bb..2100d277ff98 100644
  
  	new_prop = kzalloc(sizeof(*new_prop), GFP_KERNEL);
  	if (!new_prop)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0208-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch b/root/target/linux/bcm27xx/patches-5.15/950-0198-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch
similarity index 90%
rename from root/target/linux/bcm27xx/patches-5.15/0208-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0198-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch
index b8b4cca5..86dadd21 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0208-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0198-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch
@@ -1,7 +1,7 @@
-From a3ce8bd7d947ada4ff3ee15a8bbaf159cb636f76 Mon Sep 17 00:00:00 2001
+From 15920b66c02ce0a8419d8315503cfeaaa9d1eef6 Mon Sep 17 00:00:00 2001
 From: Jim Quinlan <jim2101024@gmail.com>
 Date: Mon, 15 Jan 2018 18:28:39 -0500
-Subject: [PATCH 208/634] dt-bindings: pci: Add DT docs for Brcmstb PCIe device
+Subject: [PATCH 198/828] dt-bindings: pci: Add DT docs for Brcmstb PCIe device
 
 The DT bindings description of the Brcmstb PCIe device is described.  This
 node can be used by almost all Broadcom settop box chips, using
@@ -13,9 +13,6 @@ Signed-off-by: Jim Quinlan <jim2101024@gmail.com>
  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.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0209-bcmgenet-Disable-skip_umac_reset-by-default.patch b/root/target/linux/bcm27xx/patches-5.15/950-0199-bcmgenet-Disable-skip_umac_reset-by-default.patch
similarity index 71%
rename from root/target/linux/bcm27xx/patches-5.15/0209-bcmgenet-Disable-skip_umac_reset-by-default.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0199-bcmgenet-Disable-skip_umac_reset-by-default.patch
index 490b3a4e..95d4e91f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0209-bcmgenet-Disable-skip_umac_reset-by-default.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0199-bcmgenet-Disable-skip_umac_reset-by-default.patch
@@ -1,7 +1,7 @@
-From 40cd57420fcd0ad5514114d036dbd913c1da4191 Mon Sep 17 00:00:00 2001
+From 5630861657975b9ebed3d0437b60689d82c5a5c9 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 1 Apr 2020 11:22:44 +0100
-Subject: [PATCH 209/634] bcmgenet: Disable skip_umac_reset by default
+Subject: [PATCH 199/828] bcmgenet: Disable skip_umac_reset by default
 
 Possible fixed upstream by 'net: bcmgenet: keep MAC in reset until PHY is up'
 
@@ -10,8 +10,6 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  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 6bce096a364a..def2b05974c5 100644
 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 @@ -67,7 +67,7 @@
@@ -23,6 +21,3 @@ index 6bce096a364a..def2b05974c5 100644
  module_param(skip_umac_reset, bool, 0444);
  MODULE_PARM_DESC(skip_umac_reset, "Skip UMAC reset step");
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0210-drm-fourcc-Add-packed-10bit-YUV-4-2-0-format.patch b/root/target/linux/bcm27xx/patches-5.15/950-0200-drm-fourcc-Add-packed-10bit-YUV-4-2-0-format.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0210-drm-fourcc-Add-packed-10bit-YUV-4-2-0-format.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0200-drm-fourcc-Add-packed-10bit-YUV-4-2-0-format.patch
index a6ac6664..e81a37fc 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0210-drm-fourcc-Add-packed-10bit-YUV-4-2-0-format.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0200-drm-fourcc-Add-packed-10bit-YUV-4-2-0-format.patch
@@ -1,7 +1,7 @@
-From 903b10087640d2143b510641d49cdc1cb4b6ab11 Mon Sep 17 00:00:00 2001
+From 065d8e012c678f861455360caa35cea4f51c62b4 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 24 Jan 2020 14:22:06 +0000
-Subject: [PATCH 210/634] drm/fourcc: Add packed 10bit YUV 4:2:0 format
+Subject: [PATCH 200/828] drm/fourcc: Add packed 10bit YUV 4:2:0 format
 
 Adds a format that is 3 10bit YUV 4:2:0 samples packed into
 a 32bit work (with 2 spare bits).
@@ -14,11 +14,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  include/uapi/drm/drm_fourcc.h | 11 +++++++++++
  2 files changed, 14 insertions(+)
 
-diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
-index eda832f9200d..8537a41811e0 100644
 --- a/drivers/gpu/drm/drm_fourcc.c
 +++ b/drivers/gpu/drm/drm_fourcc.c
-@@ -266,6 +266,9 @@ const struct drm_format_info *__drm_format_info(u32 format)
+@@ -266,6 +266,9 @@ const struct drm_format_info *__drm_form
  		  .num_planes = 3, .char_per_block = { 2, 2, 2 },
  		  .block_w = { 1, 1, 1 }, .block_h = { 1, 1, 1 }, .hsub = 0,
  		  .vsub = 0, .is_yuv = true },
@@ -28,25 +26,23 @@ index eda832f9200d..8537a41811e0 100644
  	};
  
  	unsigned int i;
-diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
-index 9f4bb4a6f358..dcf0c65f1341 100644
 --- a/include/uapi/drm/drm_fourcc.h
 +++ b/include/uapi/drm/drm_fourcc.h
-@@ -324,6 +324,13 @@ extern "C" {
-  */
+@@ -325,6 +325,13 @@ extern "C" {
  #define DRM_FORMAT_Q401		fourcc_code('Q', '4', '0', '1')
  
-+/*
+ /*
 + * 2 plane YCbCr MSB aligned, 3 pixels packed into 4 bytes.
 + * index 0 = Y plane, [31:0] x:Y2:Y1:Y0 2:10:10:10 little endian
 + * index 1 = Cr:Cb plane, [63:0] x:Cr2:Cb2:Cr1:x:Cb1:Cr0:Cb0 [2:10:10:10:2:10:10:10] little endian
 + */
 +#define DRM_FORMAT_P030		fourcc_code('P', '0', '3', '0') /* 2x2 subsampled Cr:Cb plane 10 bits per channel packed */
 +
- /*
++/*
   * 3 plane YCbCr
   * index 0: Y plane, [7:0] Y
-@@ -842,6 +849,10 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier)
+  * index 1: Cb plane, [7:0] Cb
+@@ -842,6 +849,10 @@ drm_fourcc_canonicalize_nvidia_format_mo
   * and UV.  Some SAND-using hardware stores UV in a separate tiled
   * image from Y to reduce the column height, which is not supported
   * with these modifiers.
@@ -57,6 +53,3 @@ index 9f4bb4a6f358..dcf0c65f1341 100644
   */
  
  #define DRM_FORMAT_MOD_BROADCOM_SAND32_COL_HEIGHT(v) \
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0211-media-uapi-hevc-Add-scaling-matrix-control.patch b/root/target/linux/bcm27xx/patches-5.15/950-0201-media-uapi-hevc-Add-scaling-matrix-control.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0211-media-uapi-hevc-Add-scaling-matrix-control.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0201-media-uapi-hevc-Add-scaling-matrix-control.patch
index 3a92a314..1b69803f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0211-media-uapi-hevc-Add-scaling-matrix-control.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0201-media-uapi-hevc-Add-scaling-matrix-control.patch
@@ -1,7 +1,7 @@
-From 434f7185b28e6a0f882829c452c7ba5344d3aa2b Mon Sep 17 00:00:00 2001
+From 6676de325bd86d5bb096219f0ea24386fb5c4b70 Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <jernej.skrabec@siol.net>
 Date: Fri, 13 Dec 2019 17:04:25 +0100
-Subject: [PATCH 211/634] media: uapi: hevc: Add scaling matrix control
+Subject: [PATCH 201/828] media: uapi: hevc: Add scaling matrix control
 
 Taken from https://patchwork.linuxtv.org/patch/60728/
 Changes (mainly documentation) have been requested.
@@ -16,11 +16,9 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
  include/media/hevc-ctrls.h                    | 11 +++++
  4 files changed, 65 insertions(+), 2 deletions(-)
 
-diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
-index 976d34445a24..dca893cb9f18 100644
 --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
 +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
-@@ -3181,6 +3181,47 @@ enum v4l2_mpeg_video_hevc_size_of_length_field -
+@@ -3181,6 +3181,47 @@ enum v4l2_mpeg_video_hevc_size_of_length
  
      \normalsize
  
@@ -68,8 +66,6 @@ index 976d34445a24..dca893cb9f18 100644
  ``V4L2_CID_MPEG_VIDEO_HEVC_DECODE_MODE (enum)``
      Specifies the decoding mode to use. Currently exposes slice-based and
      frame-based decoding but new modes might be added later on.
-diff --git a/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst b/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst
-index 0ede39907ee2..e7d69b737abf 100644
 --- a/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst
 +++ b/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst
 @@ -195,8 +195,9 @@ Compressed Formats
@@ -84,8 +80,6 @@ index 0ede39907ee2..e7d69b737abf 100644
  	See the :ref:`associated Codec Control IDs <v4l2-mpeg-hevc>`.
  	Buffers associated with this pixel format must contain the appropriate
  	number of macroblocks to decode a full corresponding frame.
-diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
-index 49d9085d77e3..b750ce3ae723 100644
 --- a/drivers/media/v4l2-core/v4l2-ctrls.c
 +++ b/drivers/media/v4l2-core/v4l2-ctrls.c
 @@ -1042,6 +1042,7 @@ const char *v4l2_ctrl_get_name(u32 id)
@@ -96,7 +90,7 @@ index 49d9085d77e3..b750ce3ae723 100644
  	case V4L2_CID_MPEG_VIDEO_HEVC_DECODE_MODE:		return "HEVC Decode Mode";
  	case V4L2_CID_MPEG_VIDEO_HEVC_START_CODE:		return "HEVC Start Code";
  
-@@ -1527,6 +1528,9 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
+@@ -1527,6 +1528,9 @@ void v4l2_ctrl_fill(u32 id, const char *
  	case V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS:
  		*type = V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS;
  		break;
@@ -106,7 +100,7 @@ index 49d9085d77e3..b750ce3ae723 100644
  	case V4L2_CID_UNIT_CELL_SIZE:
  		*type = V4L2_CTRL_TYPE_AREA;
  		*flags |= V4L2_CTRL_FLAG_READ_ONLY;
-@@ -2238,6 +2242,9 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx,
+@@ -2238,6 +2242,9 @@ static int std_validate_compound(const s
  
  		break;
  
@@ -116,7 +110,7 @@ index 49d9085d77e3..b750ce3ae723 100644
  	case V4L2_CTRL_TYPE_AREA:
  		area = p;
  		if (!area->width || !area->height)
-@@ -2954,6 +2961,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
+@@ -2954,6 +2961,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(s
  	case V4L2_CTRL_TYPE_HDR10_MASTERING_DISPLAY:
  		elem_size = sizeof(struct v4l2_ctrl_hdr10_mastering_display);
  		break;
@@ -126,8 +120,6 @@ index 49d9085d77e3..b750ce3ae723 100644
  	case V4L2_CTRL_TYPE_AREA:
  		elem_size = sizeof(struct v4l2_area);
  		break;
-diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h
-index 781371bff2ad..1c6567b13b7e 100644
 --- a/include/media/hevc-ctrls.h
 +++ b/include/media/hevc-ctrls.h
 @@ -19,6 +19,7 @@
@@ -160,6 +152,3 @@ index 781371bff2ad..1c6567b13b7e 100644
 +};
 +
  #endif
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0212-media-uapi-hevc-Add-segment-address-field.patch b/root/target/linux/bcm27xx/patches-5.15/950-0202-media-uapi-hevc-Add-segment-address-field.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0212-media-uapi-hevc-Add-segment-address-field.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0202-media-uapi-hevc-Add-segment-address-field.patch
index 99ee200d..a0288d95 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0212-media-uapi-hevc-Add-segment-address-field.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0202-media-uapi-hevc-Add-segment-address-field.patch
@@ -1,7 +1,7 @@
-From a282fdf22ec16930283a198e4aa7a7b142839048 Mon Sep 17 00:00:00 2001
+From 0280fee1ca9b68e8485c51c4a3d9a0474691a194 Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <jernej.skrabec@siol.net>
 Date: Fri, 13 Dec 2019 17:04:27 +0100
-Subject: [PATCH 212/634] media: uapi: hevc: Add segment address field
+Subject: [PATCH 202/828] media: uapi: hevc: Add segment address field
 
 From https://patchwork.linuxtv.org/patch/60725/
 Changes requested, but mainly docs.
@@ -17,11 +17,9 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
  include/media/hevc-ctrls.h                               | 9 +++++++--
  2 files changed, 10 insertions(+), 2 deletions(-)
 
-diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
-index dca893cb9f18..b699257ebb96 100644
 --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
 +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
-@@ -2961,6 +2961,9 @@ enum v4l2_mpeg_video_hevc_size_of_length_field -
+@@ -2961,6 +2961,9 @@ enum v4l2_mpeg_video_hevc_size_of_length
      * - __u32
        - ``data_bit_offset``
        - Offset (in bits) to the video data in the current slice data.
@@ -31,8 +29,6 @@ index dca893cb9f18..b699257ebb96 100644
      * - __u8
        - ``nal_unit_type``
        -
-diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h
-index 1c6567b13b7e..7cbbbf055f47 100644
 --- a/include/media/hevc-ctrls.h
 +++ b/include/media/hevc-ctrls.h
 @@ -173,6 +173,10 @@ struct v4l2_ctrl_hevc_slice_params {
@@ -61,6 +57,3 @@ index 1c6567b13b7e..7cbbbf055f47 100644
  
  	/* ISO/IEC 23008-2, ITU-T Rec. H.265: Weighted prediction parameter */
  	struct v4l2_hevc_pred_weight_table pred_weight_table;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0213-media-videodev2.h-Add-a-format-for-column-YUV4-2-0-m.patch b/root/target/linux/bcm27xx/patches-5.15/950-0203-media-videodev2.h-Add-a-format-for-column-YUV4-2-0-m.patch
similarity index 91%
rename from root/target/linux/bcm27xx/patches-5.15/0213-media-videodev2.h-Add-a-format-for-column-YUV4-2-0-m.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0203-media-videodev2.h-Add-a-format-for-column-YUV4-2-0-m.patch
index f1422165..f68a67bb 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0213-media-videodev2.h-Add-a-format-for-column-YUV4-2-0-m.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0203-media-videodev2.h-Add-a-format-for-column-YUV4-2-0-m.patch
@@ -1,7 +1,7 @@
-From 7c408dcfe63ac501801083111d2ad3218d14482b Mon Sep 17 00:00:00 2001
+From f362b5320d259bde494733280656f9596b96fb7a Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 24 Jan 2020 14:28:21 +0000
-Subject: [PATCH 213/634] media: videodev2.h: Add a format for column YUV4:2:0
+Subject: [PATCH 203/828] media: videodev2.h: Add a format for column YUV4:2:0
  modes
 
 Some of the Broadcom codec blocks use a column based YUV4:2:0 image
@@ -18,9 +18,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  5 files changed, 251 insertions(+)
  create mode 100644 Documentation/userspace-api/media/v4l/pixfmt-nv12-col128.rst
 
-diff --git a/Documentation/userspace-api/media/v4l/pixfmt-nv12-col128.rst b/Documentation/userspace-api/media/v4l/pixfmt-nv12-col128.rst
-new file mode 100644
-index 000000000000..196ca33a5dff
 --- /dev/null
 +++ b/Documentation/userspace-api/media/v4l/pixfmt-nv12-col128.rst
 @@ -0,0 +1,215 @@
@@ -239,8 +236,6 @@ index 000000000000..196ca33a5dff
 +
 +
 +
-diff --git a/Documentation/userspace-api/media/v4l/pixfmt-yuv-planar.rst b/Documentation/userspace-api/media/v4l/pixfmt-yuv-planar.rst
-index 090c091affd2..34739b5b6338 100644
 --- a/Documentation/userspace-api/media/v4l/pixfmt-yuv-planar.rst
 +++ b/Documentation/userspace-api/media/v4l/pixfmt-yuv-planar.rst
 @@ -470,6 +470,17 @@ number of lines as the luma plane.
@@ -261,8 +256,6 @@ index 090c091affd2..34739b5b6338 100644
  
  Fully Planar YUV Formats
  ========================
-diff --git a/Documentation/userspace-api/media/v4l/yuv-formats.rst b/Documentation/userspace-api/media/v4l/yuv-formats.rst
-index 24b34cdfa6fe..458e07782c8d 100644
 --- a/Documentation/userspace-api/media/v4l/yuv-formats.rst
 +++ b/Documentation/userspace-api/media/v4l/yuv-formats.rst
 @@ -270,4 +270,23 @@ image.
@@ -289,11 +282,9 @@ index 24b34cdfa6fe..458e07782c8d 100644
 +    pixfmt-nv16m
 +    pixfmt-nv24
      pixfmt-m420
-diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index f4f67b385d00..96075d624c32 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1306,6 +1306,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
+@@ -1308,6 +1308,8 @@ static void v4l_fill_fmtdesc(struct v4l2
  	case V4L2_PIX_FMT_NV61M:	descr = "Y/CrCb 4:2:2 (N-C)"; break;
  	case V4L2_PIX_FMT_NV12MT:	descr = "Y/CbCr 4:2:0 (64x32 MB, N-C)"; break;
  	case V4L2_PIX_FMT_NV12MT_16X16:	descr = "Y/CbCr 4:2:0 (16x16 MB, N-C)"; break;
@@ -302,8 +293,6 @@ index f4f67b385d00..96075d624c32 100644
  	case V4L2_PIX_FMT_YUV420M:	descr = "Planar YUV 4:2:0 (N-C)"; break;
  	case V4L2_PIX_FMT_YVU420M:	descr = "Planar YVU 4:2:0 (N-C)"; break;
  	case V4L2_PIX_FMT_YUV422M:	descr = "Planar YUV 4:2:2 (N-C)"; break;
-diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index fba99eb8eeee..0cfd4089653f 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -742,6 +742,10 @@ struct v4l2_pix_format {
@@ -317,6 +306,3 @@ index fba99eb8eeee..0cfd4089653f 100644
  
  /* 10bit raw bayer packed, 32 bytes for every 25 pixels, last LSB 6 bits unused */
  #define V4L2_PIX_FMT_IPU3_SBGGR10	v4l2_fourcc('i', 'p', '3', 'b') /* IPU3 packed 10-bit BGGR bayer */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0214-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch b/root/target/linux/bcm27xx/patches-5.15/950-0204-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch
similarity index 85%
rename from root/target/linux/bcm27xx/patches-5.15/0214-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0204-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch
index 7a263369..aa11ad03 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0214-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0204-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch
@@ -1,7 +1,7 @@
-From 0a15835e4a916e99b8d8fd13c872c2b5b9ae661c Mon Sep 17 00:00:00 2001
+From a02399d4c243158528f491c1da9464beee55e578 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 17 Mar 2020 10:53:16 +0000
-Subject: [PATCH 214/634] media: dt-bindings: media: Add binding for the
+Subject: [PATCH 204/828] media: dt-bindings: media: Add binding for the
  Raspberry PI HEVC decoder
 
 Adds a binding for the HEVC decoder found on the BCM2711 / Raspberry Pi 4.
@@ -13,9 +13,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  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,11 +88,9 @@ index 000000000000..ce6b81a10303
 +    };
 +
 +...
-diff --git a/MAINTAINERS b/MAINTAINERS
-index d2cdcab16854..512a5a5d7b71 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3551,6 +3551,13 @@ N:	bcm113*
+@@ -3552,6 +3552,13 @@ N:	bcm113*
  N:	bcm216*
  N:	kona
  
@@ -109,6 +104,3 @@ index d2cdcab16854..512a5a5d7b71 100644
  BROADCOM BCM2835 CAMERA DRIVER
  M:	Dave Stevenson <dave.stevenson@raspberrypi.org>
  L:	linux-media@vger.kernel.org
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0215-staging-media-Add-Raspberry-Pi-V4L2-H265-decoder.patch b/root/target/linux/bcm27xx/patches-5.15/950-0205-staging-media-Add-Raspberry-Pi-V4L2-H265-decoder.patch
similarity index 98%
rename from root/target/linux/bcm27xx/patches-5.15/0215-staging-media-Add-Raspberry-Pi-V4L2-H265-decoder.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0205-staging-media-Add-Raspberry-Pi-V4L2-H265-decoder.patch
index a14d2e39..188528fe 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0215-staging-media-Add-Raspberry-Pi-V4L2-H265-decoder.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0205-staging-media-Add-Raspberry-Pi-V4L2-H265-decoder.patch
@@ -1,7 +1,7 @@
-From cb9e66c34599daf366b57b40e765c81eeae235d5 Mon Sep 17 00:00:00 2001
+From f3301f13a4d1846ae91c13fe0799d5eae59b3ed7 Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Thu, 5 Mar 2020 18:30:41 +0000
-Subject: [PATCH 215/634] staging: media: Add Raspberry Pi V4L2 H265 decoder
+Subject: [PATCH 205/828] staging: media: Add Raspberry Pi V4L2 H265 decoder
 
 This driver is for the HEVC/H265 decoder block on the Raspberry
 Pi 4, and conforms to the V4L2 stateless decoder API.
@@ -34,11 +34,9 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  create mode 100644 drivers/staging/media/rpivid/rpivid_video.c
  create mode 100644 drivers/staging/media/rpivid/rpivid_video.h
 
-diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
-index e3aaae920847..d2128cd87f92 100644
 --- a/drivers/staging/media/Kconfig
 +++ b/drivers/staging/media/Kconfig
-@@ -32,6 +32,8 @@ source "drivers/staging/media/omap4iss/Kconfig"
+@@ -32,6 +32,8 @@ source "drivers/staging/media/omap4iss/K
  
  source "drivers/staging/media/rkvdec/Kconfig"
  
@@ -47,8 +45,6 @@ index e3aaae920847..d2128cd87f92 100644
  source "drivers/staging/media/sunxi/Kconfig"
  
  source "drivers/staging/media/tegra-vde/Kconfig"
-diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
-index 5b5afc5b03a0..4d61af6ec42a 100644
 --- a/drivers/staging/media/Makefile
 +++ b/drivers/staging/media/Makefile
 @@ -4,6 +4,7 @@ obj-$(CONFIG_VIDEO_IMX_MEDIA)	+= imx/
@@ -59,9 +55,6 @@ index 5b5afc5b03a0..4d61af6ec42a 100644
  obj-$(CONFIG_VIDEO_SUNXI)	+= sunxi/
  obj-$(CONFIG_VIDEO_TEGRA)	+= tegra-video/
  obj-$(CONFIG_TEGRA_VDE)		+= tegra-vde/
-diff --git a/drivers/staging/media/rpivid/Kconfig b/drivers/staging/media/rpivid/Kconfig
-new file mode 100644
-index 000000000000..58b470c80db1
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/Kconfig
 @@ -0,0 +1,16 @@
@@ -81,9 +74,6 @@ index 000000000000..58b470c80db1
 +	  To compile this driver as a module, choose M here: the module
 +	  will be called rpivid-hevc.
 +
-diff --git a/drivers/staging/media/rpivid/Makefile b/drivers/staging/media/rpivid/Makefile
-new file mode 100644
-index 000000000000..990257052b07
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/Makefile
 @@ -0,0 +1,5 @@
@@ -92,9 +82,6 @@ index 000000000000..990257052b07
 +
 +rpivid-hevc-y = rpivid.o rpivid_video.o rpivid_dec.o \
 +		 rpivid_hw.o rpivid_h265.o
-diff --git a/drivers/staging/media/rpivid/rpivid.c b/drivers/staging/media/rpivid/rpivid.c
-new file mode 100644
-index 000000000000..4e28c9d91192
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid.c
 @@ -0,0 +1,432 @@
@@ -530,9 +517,6 @@ index 000000000000..4e28c9d91192
 +MODULE_LICENSE("GPL v2");
 +MODULE_AUTHOR("John Cox <jc@kynesim.co.uk>");
 +MODULE_DESCRIPTION("Raspberry Pi HEVC V4L2 driver");
-diff --git a/drivers/staging/media/rpivid/rpivid.h b/drivers/staging/media/rpivid/rpivid.h
-new file mode 100644
-index 000000000000..faafe936b878
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid.h
 @@ -0,0 +1,181 @@
@@ -717,9 +701,6 @@ index 000000000000..faafe936b878
 +void *rpivid_find_control_data(struct rpivid_ctx *ctx, u32 id);
 +
 +#endif
-diff --git a/drivers/staging/media/rpivid/rpivid_dec.c b/drivers/staging/media/rpivid/rpivid_dec.c
-new file mode 100644
-index 000000000000..d81aa46de017
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid_dec.c
 @@ -0,0 +1,79 @@
@@ -802,9 +783,6 @@ index 000000000000..d81aa46de017
 +
 +	dev->dec_ops->trigger(ctx);
 +}
-diff --git a/drivers/staging/media/rpivid/rpivid_dec.h b/drivers/staging/media/rpivid/rpivid_dec.h
-new file mode 100644
-index 000000000000..8f15bb6406ab
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid_dec.h
 @@ -0,0 +1,19 @@
@@ -827,9 +805,6 @@ index 000000000000..8f15bb6406ab
 +void rpivid_device_run(void *priv);
 +
 +#endif
-diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
-new file mode 100644
-index 000000000000..47d4de42c584
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
 @@ -0,0 +1,2275 @@
@@ -3108,9 +3083,6 @@ index 000000000000..47d4de42c584
 +	.stop = rpivid_h265_stop,
 +	.trigger = rpivid_h265_trigger,
 +};
-diff --git a/drivers/staging/media/rpivid/rpivid_hw.c b/drivers/staging/media/rpivid/rpivid_hw.c
-new file mode 100644
-index 000000000000..5f86bbed8c1c
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid_hw.c
 @@ -0,0 +1,321 @@
@@ -3435,9 +3407,6 @@ index 000000000000..5f86bbed8c1c
 +	ictl_uninit(&dev->ic_active2);
 +}
 +
-diff --git a/drivers/staging/media/rpivid/rpivid_hw.h b/drivers/staging/media/rpivid/rpivid_hw.h
-new file mode 100644
-index 000000000000..cf4cc8be8a55
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid_hw.h
 @@ -0,0 +1,300 @@
@@ -3741,9 +3710,6 @@ index 000000000000..cf4cc8be8a55
 +void rpivid_hw_remove(struct rpivid_dev *dev);
 +
 +#endif
-diff --git a/drivers/staging/media/rpivid/rpivid_video.c b/drivers/staging/media/rpivid/rpivid_video.c
-new file mode 100644
-index 000000000000..3b9e51ca05b3
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid_video.c
 @@ -0,0 +1,593 @@
@@ -4340,9 +4306,6 @@ index 000000000000..3b9e51ca05b3
 +
 +	return vb2_queue_init(dst_vq);
 +}
-diff --git a/drivers/staging/media/rpivid/rpivid_video.h b/drivers/staging/media/rpivid/rpivid_video.h
-new file mode 100644
-index 000000000000..9c4f3fb2f9f6
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid_video.h
 @@ -0,0 +1,30 @@
@@ -4376,6 +4339,3 @@ index 000000000000..9c4f3fb2f9f6
 +int rpivid_prepare_dst_format(struct v4l2_pix_format *pix_fmt);
 +
 +#endif
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0216-dt-bindings-clock-Add-a-binding-for-the-RPi-Firmware.patch b/root/target/linux/bcm27xx/patches-5.15/950-0206-dt-bindings-clock-Add-a-binding-for-the-RPi-Firmware.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0216-dt-bindings-clock-Add-a-binding-for-the-RPi-Firmware.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0206-dt-bindings-clock-Add-a-binding-for-the-RPi-Firmware.patch
index 7bc29e33..6a22b967 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0216-dt-bindings-clock-Add-a-binding-for-the-RPi-Firmware.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0206-dt-bindings-clock-Add-a-binding-for-the-RPi-Firmware.patch
@@ -1,7 +1,7 @@
-From a96f55453a199923d5b6449a0e3db3627b580783 Mon Sep 17 00:00:00 2001
+From ced8a050b0567f1e41e57d9c4f5dacc9cc2febb9 Mon Sep 17 00:00:00 2001
 From: Maxime Ripard <maxime@cerno.tech>
 Date: Thu, 13 Feb 2020 17:51:09 +0100
-Subject: [PATCH 216/634] dt-bindings: clock: Add a binding for the RPi
+Subject: [PATCH 206/828] dt-bindings: clock: Add a binding for the RPi
  Firmware clocks
 
 The firmare running on the RPi VideoCore can be used to discover and
@@ -19,9 +19,6 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 39 insertions(+)
  create mode 100644 Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml
 
-diff --git a/Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml b/Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml
-new file mode 100644
-index 000000000000..d37bc311321d
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml
 @@ -0,0 +1,39 @@
@@ -64,6 +61,3 @@ index 000000000000..d37bc311321d
 +    };
 +
 +...
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0217-dt-bindings-display-vc4-hdmi-Add-BCM2711-HDMI-contro.patch b/root/target/linux/bcm27xx/patches-5.15/950-0207-dt-bindings-display-vc4-hdmi-Add-BCM2711-HDMI-contro.patch
similarity index 92%
rename from root/target/linux/bcm27xx/patches-5.15/0217-dt-bindings-display-vc4-hdmi-Add-BCM2711-HDMI-contro.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0207-dt-bindings-display-vc4-hdmi-Add-BCM2711-HDMI-contro.patch
index 25bf09df..9dcdc084 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0217-dt-bindings-display-vc4-hdmi-Add-BCM2711-HDMI-contro.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0207-dt-bindings-display-vc4-hdmi-Add-BCM2711-HDMI-contro.patch
@@ -1,7 +1,7 @@
-From e3aed553a3e47de4de456e63b36f134290f4b6b9 Mon Sep 17 00:00:00 2001
+From 943ea1b8b3601d9abfc5b021f6ae00f08fb64cf3 Mon Sep 17 00:00:00 2001
 From: Maxime Ripard <maxime@cerno.tech>
 Date: Thu, 13 Feb 2020 16:45:24 +0100
-Subject: [PATCH 217/634] dt-bindings: display: vc4: hdmi: Add BCM2711 HDMI
+Subject: [PATCH 207/828] dt-bindings: display: vc4: hdmi: Add BCM2711 HDMI
  controllers bindings
 
 The HDMI controllers found in the BCM2711 SoC need some adjustments to the
@@ -15,8 +15,6 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  .../bindings/display/brcm,bcm2835-hdmi.yaml   | 118 ++++++++++++++++--
  1 file changed, 109 insertions(+), 9 deletions(-)
 
-diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml
-index 031e35e76db2..e7ef3a36327b 100644
 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml
 @@ -11,24 +11,58 @@ maintainers:
@@ -174,6 +172,3 @@ index 031e35e76db2..e7ef3a36327b 100644
 +    };
 +
  ...
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0218-drm-Checking-of-the-pitch-is-only-valid-for-linear-f.patch b/root/target/linux/bcm27xx/patches-5.15/950-0208-drm-Checking-of-the-pitch-is-only-valid-for-linear-f.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0218-drm-Checking-of-the-pitch-is-only-valid-for-linear-f.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0208-drm-Checking-of-the-pitch-is-only-valid-for-linear-f.patch
index 54522eed..2aed89d6 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0218-drm-Checking-of-the-pitch-is-only-valid-for-linear-f.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0208-drm-Checking-of-the-pitch-is-only-valid-for-linear-f.patch
@@ -1,7 +1,7 @@
-From a4002dabca01e1813c66e94eb4a88572f1fa8ec5 Mon Sep 17 00:00:00 2001
+From d478ecf17ca2f89caad188a890c9a18f3886a033 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Mon, 27 Jan 2020 10:22:44 +0000
-Subject: [PATCH 218/634] drm: Checking of the pitch is only valid for linear
+Subject: [PATCH 208/828] drm: Checking of the pitch is only valid for linear
  formats
 
 framebuffer_check was computing a minimum pitch value and ensuring
@@ -13,25 +13,22 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/gpu/drm/drm_framebuffer.c | 16 ++++++++++------
  1 file changed, 10 insertions(+), 6 deletions(-)
 
-diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
-index 07f5abc875e9..8683b59bcbcb 100644
 --- a/drivers/gpu/drm/drm_framebuffer.c
 +++ b/drivers/gpu/drm/drm_framebuffer.c
-@@ -214,12 +214,16 @@ static int framebuffer_check(struct drm_device *dev,
+@@ -214,12 +214,16 @@ static int framebuffer_check(struct drm_
  		if (min_pitch > UINT_MAX)
  			return -ERANGE;
  
 -		if ((uint64_t) height * r->pitches[i] + r->offsets[i] > UINT_MAX)
 -			return -ERANGE;
--
--		if (block_size && r->pitches[i] < min_pitch) {
--			DRM_DEBUG_KMS("bad pitch %u for plane %d\n", r->pitches[i], i);
--			return -EINVAL;
 +		if (r->modifier[i] == DRM_FORMAT_MOD_LINEAR) {
 +			if ((uint64_t)height * r->pitches[i] + r->offsets[i] >
 +								UINT_MAX)
 +				return -ERANGE;
-+
+ 
+-		if (block_size && r->pitches[i] < min_pitch) {
+-			DRM_DEBUG_KMS("bad pitch %u for plane %d\n", r->pitches[i], i);
+-			return -EINVAL;
 +			if (block_size && r->pitches[i] < min_pitch) {
 +				DRM_DEBUG_KMS("bad pitch %u for plane %d\n",
 +					      r->pitches[i], i);
@@ -40,6 +37,3 @@ index 07f5abc875e9..8683b59bcbcb 100644
  		}
  
  		if (r->modifier[i] && !(r->flags & DRM_MODE_FB_MODIFIERS)) {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0219-driver-char-rpivid-Remove-legacy-name-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0209-driver-char-rpivid-Remove-legacy-name-support.patch
similarity index 75%
rename from root/target/linux/bcm27xx/patches-5.15/0219-driver-char-rpivid-Remove-legacy-name-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0209-driver-char-rpivid-Remove-legacy-name-support.patch
index 780ebb43..d373e368 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0219-driver-char-rpivid-Remove-legacy-name-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0209-driver-char-rpivid-Remove-legacy-name-support.patch
@@ -1,18 +1,16 @@
-From c9dd7af7f66e6c5a4f999e79d53bf8d8d8dcf419 Mon Sep 17 00:00:00 2001
+From 9ee99d47ef581c1c41c7636870f2a06b6a1146ea Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Mon, 20 Apr 2020 22:18:52 +0100
-Subject: [PATCH 219/634] driver: char: rpivid: Remove legacy name support
+Subject: [PATCH 209/828] driver: char: rpivid: Remove legacy name support
 
 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 ---
  drivers/char/broadcom/rpivid-mem.c | 22 ----------------------
  1 file changed, 22 deletions(-)
 
-diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c
-index fbf3d4f3fe0c..5f4c91924ec1 100644
 --- a/drivers/char/broadcom/rpivid-mem.c
 +++ b/drivers/char/broadcom/rpivid-mem.c
-@@ -193,32 +193,11 @@ static int rpivid_mem_probe(struct platform_device *pdev)
+@@ -193,32 +193,11 @@ static int rpivid_mem_probe(struct platf
  		goto failed_device_create;
  	}
  
@@ -45,7 +43,7 @@ index fbf3d4f3fe0c..5f4c91924ec1 100644
  failed_device_create:
  	class_destroy(priv->class);
  failed_class_create:
-@@ -238,7 +217,6 @@ static int rpivid_mem_remove(struct platform_device *pdev)
+@@ -238,7 +217,6 @@ static int rpivid_mem_remove(struct plat
  	struct device *dev = &pdev->dev;
  	struct rpivid_mem_priv *priv = platform_get_drvdata(pdev);
  
@@ -53,6 +51,3 @@ index fbf3d4f3fe0c..5f4c91924ec1 100644
  	device_destroy(priv->class, priv->devid);
  	class_destroy(priv->class);
  	cdev_del(&priv->rpivid_mem_cdev);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0220-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch b/root/target/linux/bcm27xx/patches-5.15/950-0210-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0220-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0210-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
index 2eb13dcd..33d639b1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0220-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0210-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
@@ -1,7 +1,7 @@
-From a2dc8b146ee5d8f3285f5b6dc13c754bc10417de Mon Sep 17 00:00:00 2001
+From 656c95b9b67ca4eada929d0db5c75b591cb0a52f Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Fri, 17 Apr 2020 10:46:19 +0100
-Subject: [PATCH 220/634] spi: Force CS_HIGH if GPIO descriptors are used
+Subject: [PATCH 210/828] spi: Force CS_HIGH if GPIO descriptors are used
 
 Commit f3186dd87669 ("spi: Optionally use GPIO descriptors for CS GPIOs")
 amended of_spi_parse_dt() to always set SPI_CS_HIGH for SPI slaves whose
@@ -30,11 +30,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/spi/spi.c | 9 +++++++++
  1 file changed, 9 insertions(+)
 
-diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index 2a2f41b6df68..43c3f75b1740 100644
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -3466,6 +3466,7 @@ static int __spi_validate_bits_per_word(struct spi_controller *ctlr,
+@@ -3469,6 +3469,7 @@ static int __spi_validate_bits_per_word(
   */
  int spi_setup(struct spi_device *spi)
  {
@@ -42,7 +40,7 @@ index 2a2f41b6df68..43c3f75b1740 100644
  	unsigned	bad_bits, ugly_bits;
  	int		status;
  
-@@ -3487,6 +3488,14 @@ int spi_setup(struct spi_device *spi)
+@@ -3490,6 +3491,14 @@ int spi_setup(struct spi_device *spi)
  		(SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL |
  		 SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL)))
  		return -EINVAL;
@@ -57,6 +55,3 @@ index 2a2f41b6df68..43c3f75b1740 100644
  	/* help drivers fail *cleanly* when they need options
  	 * that aren't supported with their current controller
  	 * SPI_CS_WORD has a fallback software implementation,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0221-driver-char-rpivid-Don-t-map-more-than-wanted.patch b/root/target/linux/bcm27xx/patches-5.15/950-0211-driver-char-rpivid-Don-t-map-more-than-wanted.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0221-driver-char-rpivid-Don-t-map-more-than-wanted.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0211-driver-char-rpivid-Don-t-map-more-than-wanted.patch
index 4a8b3b9e..39f933a3 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0221-driver-char-rpivid-Don-t-map-more-than-wanted.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0211-driver-char-rpivid-Don-t-map-more-than-wanted.patch
@@ -1,7 +1,7 @@
-From 401da445edee9fa762de9aeff10a420323b730bb Mon Sep 17 00:00:00 2001
+From ca4c188997fe54222810c97fe035e103b8c9fcbf Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Tue, 21 Apr 2020 11:30:23 +0100
-Subject: [PATCH 221/634] driver: char: rpivid: Don't map more than wanted
+Subject: [PATCH 211/828] driver: char: rpivid: Don't map more than wanted
 
 Limit mappings to the permitted range, but don't map more than asked
 for otherwise we walk off the end of the allocated VMA.
@@ -11,11 +11,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/char/broadcom/rpivid-mem.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c
-index 5f4c91924ec1..9f38083f4cb6 100644
 --- a/drivers/char/broadcom/rpivid-mem.c
 +++ b/drivers/char/broadcom/rpivid-mem.c
-@@ -100,6 +100,7 @@ static int rpivid_mem_mmap(struct file *file, struct vm_area_struct *vma)
+@@ -100,6 +100,7 @@ static int rpivid_mem_mmap(struct file *
  {
  	struct rpivid_mem_priv *priv;
  	unsigned long pages;
@@ -23,7 +21,7 @@ index 5f4c91924ec1..9f38083f4cb6 100644
  
  	priv = file->private_data;
  	pages = priv->regs_phys >> PAGE_SHIFT;
-@@ -107,14 +108,13 @@ static int rpivid_mem_mmap(struct file *file, struct vm_area_struct *vma)
+@@ -107,14 +108,13 @@ static int rpivid_mem_mmap(struct file *
  	 * The address decode is far larger than the actual number of registers.
  	 * Just map the whole lot in.
  	 */
@@ -42,7 +40,7 @@ index 5f4c91924ec1..9f38083f4cb6 100644
  		return -EAGAIN;
  	}
  	return 0;
-@@ -156,7 +156,7 @@ static int rpivid_mem_probe(struct platform_device *pdev)
+@@ -156,7 +156,7 @@ static int rpivid_mem_probe(struct platf
  	ioresource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  	if (ioresource) {
  		priv->regs_phys = ioresource->start;
@@ -51,6 +49,3 @@ index 5f4c91924ec1..9f38083f4cb6 100644
  	} else {
  		dev_err(priv->dev, "failed to get IO resource");
  		err = -ENOENT;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0222-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch b/root/target/linux/bcm27xx/patches-5.15/950-0212-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
similarity index 98%
rename from root/target/linux/bcm27xx/patches-5.15/0222-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0212-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
index 91ab1821..bd591581 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0222-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0212-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
@@ -1,7 +1,7 @@
-From 0f9509c39e84912a073ab38146d4b8e66ff4a74e Mon Sep 17 00:00:00 2001
+From f477512e880232d3ef656be2fe3c0f6cd785d0fa Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Wed, 1 Apr 2020 08:39:49 +0100
-Subject: [PATCH 222/634] media: bcm2835-unicam: Driver for CCP2/CSI2 camera
+Subject: [PATCH 212/828] media: bcm2835-unicam: Driver for CCP2/CSI2 camera
  interface
 
 Add driver for the Unicam camera receiver block on
@@ -26,11 +26,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  create mode 100644 drivers/media/platform/bcm2835/bcm2835-unicam.c
  create mode 100644 drivers/media/platform/bcm2835/vc4-regs-unicam.h
 
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 512a5a5d7b71..8688aaded569 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3559,7 +3559,7 @@ F:	Documentation/devicetree/bindings/media/rpivid_hevc.jaml
+@@ -3560,7 +3560,7 @@ F:	Documentation/devicetree/bindings/med
  F:	drivers/staging/media/rpivid
  
  BROADCOM BCM2835 CAMERA DRIVER
@@ -39,11 +37,9 @@ index 512a5a5d7b71..8688aaded569 100644
  L:	linux-media@vger.kernel.org
  S:	Maintained
  F:	drivers/media/platform/bcm2835/
-diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
-index 80321e03809a..9263d3d04774 100644
 --- a/drivers/media/platform/Kconfig
 +++ b/drivers/media/platform/Kconfig
-@@ -170,6 +170,7 @@ source "drivers/media/platform/am437x/Kconfig"
+@@ -170,6 +170,7 @@ source "drivers/media/platform/am437x/Kc
  source "drivers/media/platform/xilinx/Kconfig"
  source "drivers/media/platform/rcar-vin/Kconfig"
  source "drivers/media/platform/atmel/Kconfig"
@@ -51,11 +47,9 @@ index 80321e03809a..9263d3d04774 100644
  source "drivers/media/platform/sunxi/Kconfig"
  
  config VIDEO_TI_CAL
-diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
-index 73ce083c2fc6..9d52476bc725 100644
 --- a/drivers/media/platform/Makefile
 +++ b/drivers/media/platform/Makefile
-@@ -83,6 +83,8 @@ obj-$(CONFIG_VIDEO_QCOM_CAMSS)		+= qcom/camss/
+@@ -83,6 +83,8 @@ obj-$(CONFIG_VIDEO_QCOM_CAMSS)		+= qcom/
  
  obj-$(CONFIG_VIDEO_QCOM_VENUS)		+= qcom/venus/
  
@@ -64,9 +58,6 @@ index 73ce083c2fc6..9d52476bc725 100644
  obj-y					+= sunxi/
  
  obj-$(CONFIG_VIDEO_MESON_GE2D)		+= meson/ge2d/
-diff --git a/drivers/media/platform/bcm2835/Kconfig b/drivers/media/platform/bcm2835/Kconfig
-new file mode 100644
-index 000000000000..20e15147ee02
 --- /dev/null
 +++ b/drivers/media/platform/bcm2835/Kconfig
 @@ -0,0 +1,14 @@
@@ -84,18 +75,12 @@ index 000000000000..20e15147ee02
 +
 +	   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..a98aba03598a
 --- /dev/null
 +++ b/drivers/media/platform/bcm2835/Makefile
 @@ -0,0 +1,3 @@
 +# Makefile for BCM2835 Unicam driver
 +
 +obj-$(CONFIG_VIDEO_BCM2835_UNICAM) += bcm2835-unicam.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..9da9f22c3db5
 --- /dev/null
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -0,0 +1,2369 @@
@@ -2468,9 +2453,6 @@ index 000000000000..9da9f22c3db5
 +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 @@
@@ -2727,6 +2709,3 @@ index 000000000000..ae059a171d0f
 +#define UNICAM_FL1		BIT(9)
 +
 +#endif
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0223-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0213-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch
similarity index 79%
rename from root/target/linux/bcm27xx/patches-5.15/0223-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0213-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch
index 9f4863a6..f129412e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0223-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0213-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch
@@ -1,7 +1,7 @@
-From 2f809887baf0abc4d322895d7a15a2e9c8b79c32 Mon Sep 17 00:00:00 2001
+From 6f907e017a1c117b6475e631034d20d411bfa0d0 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Wed, 1 Apr 2020 08:46:29 +0100
-Subject: [PATCH 223/634] media: uapi: v4l2-core: Add sensor ancillary data
+Subject: [PATCH 213/828] media: uapi: v4l2-core: Add sensor ancillary data
  V4L2 foucc type.
 
 Add V4L2_META_FMT_SENSOR_DATA format 4CC.
@@ -18,11 +18,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  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 fff25357fe86..b2201d1524eb 100644
 --- a/Documentation/userspace-api/media/v4l/meta-formats.rst
 +++ b/Documentation/userspace-api/media/v4l/meta-formats.rst
-@@ -15,6 +15,7 @@ These formats are used for the :ref:`metadata` interface only.
+@@ -15,6 +15,7 @@ These formats are used for the :ref:`met
      pixfmt-meta-d4xx
      pixfmt-meta-intel-ipu3
      pixfmt-meta-rkisp1
@@ -30,9 +28,6 @@ index fff25357fe86..b2201d1524eb 100644
      pixfmt-meta-uvc
      pixfmt-meta-vsp1-hgo
      pixfmt-meta-vsp1-hgt
-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 96075d624c32..939d9a775bb1 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1387,6 +1387,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
+@@ -1389,6 +1389,7 @@ static void v4l_fill_fmtdesc(struct v4l2
  	case V4L2_META_FMT_VIVID:       descr = "Vivid Metadata"; break;
  	case V4L2_META_FMT_RK_ISP1_PARAMS:	descr = "Rockchip ISP1 3A Parameters"; break;
  	case V4L2_META_FMT_RK_ISP1_STAT_3A:	descr = "Rockchip ISP1 3A Statistics"; break;
@@ -80,8 +73,6 @@ index 96075d624c32..939d9a775bb1 100644
  
  	default:
  		/* Compressed formats */
-diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 0cfd4089653f..58cbf8a9c5b7 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -775,6 +775,7 @@ struct v4l2_pix_format {
@@ -92,6 +83,3 @@ index 0cfd4089653f..58cbf8a9c5b7 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.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0224-media-uapi-Add-MEDIA_BUS_FMT_SENSOR_DATA-media-bus-f.patch b/root/target/linux/bcm27xx/patches-5.15/950-0214-media-uapi-Add-MEDIA_BUS_FMT_SENSOR_DATA-media-bus-f.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0224-media-uapi-Add-MEDIA_BUS_FMT_SENSOR_DATA-media-bus-f.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0214-media-uapi-Add-MEDIA_BUS_FMT_SENSOR_DATA-media-bus-f.patch
index 1e58d86c..5e993cda 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0224-media-uapi-Add-MEDIA_BUS_FMT_SENSOR_DATA-media-bus-f.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0214-media-uapi-Add-MEDIA_BUS_FMT_SENSOR_DATA-media-bus-f.patch
@@ -1,7 +1,7 @@
-From 9527d2f7b589155eb2771df74395a0467658a2b8 Mon Sep 17 00:00:00 2001
+From dd900d3d266aa01eb4fe0df2538e745853ad45a2 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Tue, 21 Jan 2020 14:06:47 +0000
-Subject: [PATCH 224/634] media: uapi: Add MEDIA_BUS_FMT_SENSOR_DATA media bus
+Subject: [PATCH 214/828] media: uapi: Add MEDIA_BUS_FMT_SENSOR_DATA media bus
  format
 
 This patch adds MEDIA_BUS_FMT_SENSOR_DATA used by the bcm2835-unicam
@@ -13,11 +13,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  include/uapi/linux/media-bus-format.h         |  3 ++
  2 files changed, 35 insertions(+)
 
-diff --git a/Documentation/userspace-api/media/v4l/subdev-formats.rst b/Documentation/userspace-api/media/v4l/subdev-formats.rst
-index bd68588b2683..e7a2fac30ae4 100644
 --- a/Documentation/userspace-api/media/v4l/subdev-formats.rst
 +++ b/Documentation/userspace-api/media/v4l/subdev-formats.rst
-@@ -7930,3 +7930,35 @@ The following table lists the existing metadata formats.
+@@ -7930,3 +7930,35 @@ The following table lists the existing m
  	both sides of the link and the bus format is a fixed
  	metadata format that is not configurable from userspace.
  	Width and height will be set to 0 for this format.
@@ -53,8 +51,6 @@ index bd68588b2683..e7a2fac30ae4 100644
 +        CSI-2/SMIA embedded data format as described in the `CSI-2 specification.
 +	<https://mipi.org/specifications/csi-2>`_
 +
-diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
-index 0dfc11ee243a..aa56d7f54784 100644
 --- a/include/uapi/linux/media-bus-format.h
 +++ b/include/uapi/linux/media-bus-format.h
 @@ -165,4 +165,7 @@
@@ -65,6 +61,3 @@ index 0dfc11ee243a..aa56d7f54784 100644
 +#define MEDIA_BUS_FMT_SENSOR_DATA		0x7002
 +
  #endif /* __LINUX_MEDIA_BUS_FORMAT_H */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0225-media-bcm2835-unicam-Add-support-for-mulitple-device.patch b/root/target/linux/bcm27xx/patches-5.15/950-0215-media-bcm2835-unicam-Add-support-for-mulitple-device.patch
similarity index 89%
rename from root/target/linux/bcm27xx/patches-5.15/0225-media-bcm2835-unicam-Add-support-for-mulitple-device.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0215-media-bcm2835-unicam-Add-support-for-mulitple-device.patch
index 0249208d..b47e96d4 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0225-media-bcm2835-unicam-Add-support-for-mulitple-device.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0215-media-bcm2835-unicam-Add-support-for-mulitple-device.patch
@@ -1,7 +1,7 @@
-From a764b1349621898ba896609f92c7b7304a24851b Mon Sep 17 00:00:00 2001
+From 38f9694390ca57c91d13451997d585fcbbc89eb9 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Tue, 7 Apr 2020 10:42:14 +0100
-Subject: [PATCH 225/634] media: bcm2835-unicam: Add support for mulitple
+Subject: [PATCH 215/828] media: bcm2835-unicam: Add support for mulitple
  device nodes.
 
 Move device node specific state out of the device state structure and
@@ -17,11 +17,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  .../media/platform/bcm2835/bcm2835-unicam.c   | 484 ++++++++++--------
  1 file changed, 283 insertions(+), 201 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 9da9f22c3db5..b34551a3f44b 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -109,7 +109,8 @@ MODULE_PARM_DESC(debug, "Debug level 0-3");
+@@ -109,7 +109,8 @@ MODULE_PARM_DESC(debug, "Debug level 0-3
  /* Define a nominal minimum image size */
  #define MIN_WIDTH	16
  #define MIN_HEIGHT	16
@@ -121,7 +119,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  };
  
  /* Hardware access */
-@@ -526,10 +530,11 @@ static inline unsigned int bytes_per_line(u32 width,
+@@ -526,10 +530,11 @@ static inline unsigned int bytes_per_lin
  }
  
  static int __subdev_get_format(struct unicam_device *dev,
@@ -134,7 +132,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	};
  	int ret;
  
-@@ -598,29 +603,30 @@ static int unicam_calc_format_size_bpl(struct unicam_device *dev,
+@@ -598,29 +603,30 @@ static int unicam_calc_format_size_bpl(s
  	return 0;
  }
  
@@ -173,7 +171,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	return 0;
  }
-@@ -635,14 +641,14 @@ static void unicam_wr_dma_addr(struct unicam_device *dev, dma_addr_t dmaaddr)
+@@ -635,14 +641,14 @@ static void unicam_wr_dma_addr(struct un
  
  	reg_write(&dev->cfg, UNICAM_IBSA0, dmaaddr);
  	reg_write(&dev->cfg, UNICAM_IBEA0,
@@ -191,7 +189,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	if (!frm)
  		return 0;
-@@ -654,12 +660,12 @@ static inline unsigned int unicam_get_lines_done(struct unicam_device *dev)
+@@ -654,12 +660,12 @@ static inline unsigned int unicam_get_li
  
  static inline void unicam_schedule_next_buffer(struct unicam_device *dev)
  {
@@ -206,7 +204,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	list_del(&buf->list);
  
  	addr = vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 0);
-@@ -668,11 +674,11 @@ static inline void unicam_schedule_next_buffer(struct unicam_device *dev)
+@@ -668,11 +674,11 @@ static inline void unicam_schedule_next_
  
  static inline void unicam_process_buffer_complete(struct unicam_device *dev)
  {
@@ -222,7 +220,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  }
  
  /*
-@@ -687,7 +693,7 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -687,7 +693,7 @@ static irqreturn_t unicam_isr(int irq, v
  {
  	struct unicam_device *unicam = (struct unicam_device *)dev;
  	struct unicam_cfg *cfg = &unicam->cfg;
@@ -231,7 +229,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	unsigned int lines_done = unicam_get_lines_done(dev);
  	unsigned int sequence = unicam->sequence;
  	int ista, sta;
-@@ -720,8 +726,9 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -720,8 +726,9 @@ static irqreturn_t unicam_isr(int irq, v
  		 * Timestamp is to be when the first data byte was captured,
  		 * aka frame start.
  		 */
@@ -243,7 +241,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	}
  	if (ista & UNICAM_FEI || sta & UNICAM_PI0) {
  		/*
-@@ -729,7 +736,8 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -729,7 +736,8 @@ static irqreturn_t unicam_isr(int irq, v
  		 * stop the peripheral. Overwrite the frame we've just
  		 * captured instead.
  		 */
@@ -253,7 +251,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  			unicam_process_buffer_complete(unicam);
  	}
  
-@@ -738,11 +746,11 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -738,11 +746,11 @@ static irqreturn_t unicam_isr(int irq, v
  	 * already started.
  	 */
  	if (ista & (UNICAM_FSI | UNICAM_LCI) && !(ista & UNICAM_FEI)) {
@@ -268,7 +266,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	}
  
  	if (reg_read(&unicam->cfg, UNICAM_ICTL) & UNICAM_FCM) {
-@@ -756,7 +764,8 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -756,7 +764,8 @@ static irqreturn_t unicam_isr(int irq, v
  static int unicam_querycap(struct file *file, void *priv,
  			   struct v4l2_capability *cap)
  {
@@ -278,7 +276,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	strlcpy(cap->driver, UNICAM_MODULE_NAME, sizeof(cap->driver));
  	strlcpy(cap->card, UNICAM_MODULE_NAME, sizeof(cap->card));
-@@ -770,7 +779,8 @@ static int unicam_querycap(struct file *file, void *priv,
+@@ -770,7 +779,8 @@ static int unicam_querycap(struct file *
  static int unicam_enum_fmt_vid_cap(struct file *file, void  *priv,
  				   struct v4l2_fmtdesc *f)
  {
@@ -288,7 +286,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	struct v4l2_subdev_mbus_code_enum mbus_code;
  	const struct unicam_fmt *fmt = NULL;
  	int index = 0;
-@@ -815,9 +825,9 @@ static int unicam_enum_fmt_vid_cap(struct file *file, void  *priv,
+@@ -815,9 +825,9 @@ static int unicam_enum_fmt_vid_cap(struc
  static int unicam_g_fmt_vid_cap(struct file *file, void *priv,
  				struct v4l2_format *f)
  {
@@ -300,7 +298,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	return 0;
  }
-@@ -859,9 +869,11 @@ const struct unicam_fmt *get_first_supported_format(struct unicam_device *dev)
+@@ -859,9 +869,11 @@ const struct unicam_fmt *get_first_suppo
  static int unicam_try_fmt_vid_cap(struct file *file, void *priv,
  				  struct v4l2_format *f)
  {
@@ -313,7 +311,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	};
  	struct v4l2_mbus_framefmt *mbus_fmt = &sd_fmt.format;
  	const struct unicam_fmt *fmt;
-@@ -939,8 +951,9 @@ static int unicam_try_fmt_vid_cap(struct file *file, void *priv,
+@@ -939,8 +951,9 @@ static int unicam_try_fmt_vid_cap(struct
  static int unicam_s_fmt_vid_cap(struct file *file, void *priv,
  				struct v4l2_format *f)
  {
@@ -325,7 +323,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	struct v4l2_mbus_framefmt mbus_fmt = {0};
  	const struct unicam_fmt *fmt;
  	int ret;
-@@ -985,17 +998,18 @@ static int unicam_s_fmt_vid_cap(struct file *file, void *priv,
+@@ -985,17 +998,18 @@ static int unicam_s_fmt_vid_cap(struct f
  		return -EINVAL;
  	}
  
@@ -333,15 +331,16 @@ index 9da9f22c3db5..b34551a3f44b 100644
 -	dev->v_fmt.fmt.pix.pixelformat = f->fmt.pix.pixelformat;
 -	dev->v_fmt.fmt.pix.bytesperline = f->fmt.pix.bytesperline;
 -	unicam_reset_format(dev);
-+	node->fmt = fmt;
-+	node->v_fmt.fmt.pix.pixelformat = f->fmt.pix.pixelformat;
-+	node->v_fmt.fmt.pix.bytesperline = f->fmt.pix.bytesperline;
-+	unicam_reset_format(node);
- 
+-
 -	unicam_dbg(3, dev, "%s %dx%d, mbus_fmt 0x%08X, V4L2 pix 0x%08X.\n",
 -		   __func__, dev->v_fmt.fmt.pix.width,
 -		   dev->v_fmt.fmt.pix.height, mbus_fmt.code,
 -		   dev->v_fmt.fmt.pix.pixelformat);
++	node->fmt = fmt;
++	node->v_fmt.fmt.pix.pixelformat = f->fmt.pix.pixelformat;
++	node->v_fmt.fmt.pix.bytesperline = f->fmt.pix.bytesperline;
++	unicam_reset_format(node);
++
 +	unicam_dbg(3, dev,
 +		   "%s %dx%d, mbus_fmt 0x%08X, V4L2 pix 0x%08X.\n",
 +		   __func__, node->v_fmt.fmt.pix.width,
@@ -353,7 +352,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	return 0;
  }
-@@ -1006,8 +1020,9 @@ static int unicam_queue_setup(struct vb2_queue *vq,
+@@ -1006,8 +1020,9 @@ static int unicam_queue_setup(struct vb2
  			      unsigned int sizes[],
  			      struct device *alloc_devs[])
  {
@@ -365,7 +364,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	if (vq->num_buffers + *nbuffers < 3)
  		*nbuffers = 3 - vq->num_buffers;
-@@ -1029,15 +1044,16 @@ static int unicam_queue_setup(struct vb2_queue *vq,
+@@ -1029,15 +1044,16 @@ static int unicam_queue_setup(struct vb2
  
  static int unicam_buffer_prepare(struct vb2_buffer *vb)
  {
@@ -385,7 +384,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	if (vb2_plane_size(vb, 0) < size) {
  		unicam_err(dev, "data will not fit into plane (%lu < %lu)\n",
  			   vb2_plane_size(vb, 0), size);
-@@ -1050,15 +1066,15 @@ static int unicam_buffer_prepare(struct vb2_buffer *vb)
+@@ -1050,15 +1066,15 @@ static int unicam_buffer_prepare(struct
  
  static void unicam_buffer_queue(struct vb2_buffer *vb)
  {
@@ -405,7 +404,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  }
  
  static void unicam_set_packing_config(struct unicam_device *dev)
-@@ -1066,11 +1082,12 @@ static void unicam_set_packing_config(struct unicam_device *dev)
+@@ -1066,11 +1082,12 @@ static void unicam_set_packing_config(st
  	int pack, unpack;
  	u32 val;
  
@@ -420,7 +419,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  		case 8:
  			unpack = UNICAM_PUM_UNPACK8;
  			break;
-@@ -1108,17 +1125,17 @@ static void unicam_cfg_image_id(struct unicam_device *dev)
+@@ -1108,17 +1125,17 @@ static void unicam_cfg_image_id(struct u
  	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
  		/* CSI2 mode */
  		reg_write(cfg, UNICAM_IDI0,
@@ -441,7 +440,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	unsigned int i;
  	u32 val;
  
-@@ -1266,7 +1283,8 @@ static void unicam_start_rx(struct unicam_device *dev, unsigned long addr)
+@@ -1266,7 +1283,8 @@ static void unicam_start_rx(struct unica
  		reg_write(cfg, UNICAM_DAT3, val);
  	}
  
@@ -451,7 +450,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	unicam_wr_dma_addr(dev, addr);
  	unicam_set_packing_config(dev);
  	unicam_cfg_image_id(dev);
-@@ -1327,21 +1345,22 @@ static void unicam_disable(struct unicam_device *dev)
+@@ -1327,21 +1345,22 @@ static void unicam_disable(struct unicam
  
  static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
  {
@@ -481,7 +480,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	dev->sequence = 0;
  
  	ret = unicam_runtime_get(dev);
-@@ -1411,20 +1430,21 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -1411,20 +1430,21 @@ err_release_buffers:
  		list_del(&buf->list);
  		vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
  	}
@@ -510,7 +509,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	struct unicam_buffer *buf, *tmp;
  	unsigned long flags;
  
-@@ -1434,22 +1454,24 @@ static void unicam_stop_streaming(struct vb2_queue *vq)
+@@ -1434,22 +1454,24 @@ static void unicam_stop_streaming(struct
  	unicam_disable(dev);
  
  	/* Release all active buffers */
@@ -543,7 +542,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	clk_disable_unprepare(dev->clock);
  	unicam_runtime_put(dev);
-@@ -1458,7 +1480,8 @@ static void unicam_stop_streaming(struct vb2_queue *vq)
+@@ -1458,7 +1480,8 @@ static void unicam_stop_streaming(struct
  static int unicam_enum_input(struct file *file, void *priv,
  			     struct v4l2_input *inp)
  {
@@ -553,7 +552,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	if (inp->index != 0)
  		return -EINVAL;
-@@ -1506,21 +1529,24 @@ static int unicam_s_input(struct file *file, void *priv, unsigned int i)
+@@ -1506,21 +1529,24 @@ static int unicam_s_input(struct file *f
  static int unicam_querystd(struct file *file, void *priv,
  			   v4l2_std_id *std)
  {
@@ -581,7 +580,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	int ret;
  	v4l2_std_id current_std;
  
-@@ -1531,29 +1557,31 @@ static int unicam_s_std(struct file *file, void *priv, v4l2_std_id std)
+@@ -1531,29 +1557,31 @@ static int unicam_s_std(struct file *fil
  	if (std == current_std)
  		return 0;
  
@@ -618,7 +617,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	return v4l2_subdev_call(dev->sensor, pad, get_edid, edid);
  }
-@@ -1561,7 +1589,8 @@ static int unicam_g_edid(struct file *file, void *priv, struct v4l2_edid *edid)
+@@ -1561,7 +1589,8 @@ static int unicam_g_edid(struct file *fi
  static int unicam_enum_framesizes(struct file *file, void *priv,
  				  struct v4l2_frmsizeenum *fsize)
  {
@@ -628,7 +627,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	const struct unicam_fmt *fmt;
  	struct v4l2_subdev_frame_size_enum fse;
  	int ret;
-@@ -1596,7 +1625,8 @@ static int unicam_enum_framesizes(struct file *file, void *priv,
+@@ -1596,7 +1625,8 @@ static int unicam_enum_framesizes(struct
  static int unicam_enum_frameintervals(struct file *file, void *priv,
  				      struct v4l2_frmivalenum *fival)
  {
@@ -638,7 +637,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	const struct unicam_fmt *fmt;
  	struct v4l2_subdev_frame_interval_enum fie = {
  		.index = fival->index,
-@@ -1624,14 +1654,16 @@ static int unicam_enum_frameintervals(struct file *file, void *priv,
+@@ -1624,14 +1654,16 @@ static int unicam_enum_frameintervals(st
  
  static int unicam_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
  {
@@ -657,7 +656,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	return v4l2_s_parm_cap(video_devdata(file), dev->sensor, a);
  }
-@@ -1639,7 +1671,8 @@ static int unicam_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
+@@ -1639,7 +1671,8 @@ static int unicam_s_parm(struct file *fi
  static int unicam_g_dv_timings(struct file *file, void *priv,
  			       struct v4l2_dv_timings *timings)
  {
@@ -667,7 +666,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	return v4l2_subdev_call(dev->sensor, video, g_dv_timings, timings);
  }
-@@ -1647,7 +1680,8 @@ static int unicam_g_dv_timings(struct file *file, void *priv,
+@@ -1647,7 +1680,8 @@ static int unicam_g_dv_timings(struct fi
  static int unicam_s_dv_timings(struct file *file, void *priv,
  			       struct v4l2_dv_timings *timings)
  {
@@ -677,7 +676,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	struct v4l2_dv_timings current_timings;
  	int ret;
  
-@@ -1657,15 +1691,15 @@ static int unicam_s_dv_timings(struct file *file, void *priv,
+@@ -1657,15 +1691,15 @@ static int unicam_s_dv_timings(struct fi
  	if (v4l2_match_dv_timings(timings, &current_timings, 0, false))
  		return 0;
  
@@ -696,7 +695,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	return ret;
  }
-@@ -1673,7 +1707,8 @@ static int unicam_s_dv_timings(struct file *file, void *priv,
+@@ -1673,7 +1707,8 @@ static int unicam_s_dv_timings(struct fi
  static int unicam_query_dv_timings(struct file *file, void *priv,
  				   struct v4l2_dv_timings *timings)
  {
@@ -706,7 +705,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	return v4l2_subdev_call(dev->sensor, video, query_dv_timings, timings);
  }
-@@ -1681,7 +1716,8 @@ static int unicam_query_dv_timings(struct file *file, void *priv,
+@@ -1681,7 +1716,8 @@ static int unicam_query_dv_timings(struc
  static int unicam_enum_dv_timings(struct file *file, void *priv,
  				  struct v4l2_enum_dv_timings *timings)
  {
@@ -716,7 +715,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	return v4l2_subdev_call(dev->sensor, pad, enum_dv_timings, timings);
  }
-@@ -1689,7 +1725,8 @@ static int unicam_enum_dv_timings(struct file *file, void *priv,
+@@ -1689,7 +1725,8 @@ static int unicam_enum_dv_timings(struct
  static int unicam_dv_timings_cap(struct file *file, void *priv,
  				 struct v4l2_dv_timings_cap *cap)
  {
@@ -726,7 +725,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	return v4l2_subdev_call(dev->sensor, pad, dv_timings_cap, cap);
  }
-@@ -1707,7 +1744,8 @@ static int unicam_subscribe_event(struct v4l2_fh *fh,
+@@ -1707,7 +1744,8 @@ static int unicam_subscribe_event(struct
  
  static int unicam_log_status(struct file *file, void *fh)
  {
@@ -736,7 +735,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	struct unicam_cfg *cfg = &dev->cfg;
  	u32 reg;
  
-@@ -1716,10 +1754,10 @@ static int unicam_log_status(struct file *file, void *fh)
+@@ -1716,10 +1754,10 @@ static int unicam_log_status(struct file
  
  	unicam_info(dev, "-----Receiver status-----\n");
  	unicam_info(dev, "V4L2 width/height:   %ux%u\n",
@@ -750,7 +749,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	reg = reg_read(&dev->cfg, UNICAM_IPIPE);
  	unicam_info(dev, "Unpacking/packing:   %u / %u\n",
  		    get_field(reg, UNICAM_PUM_MASK),
-@@ -1744,7 +1782,7 @@ static void unicam_notify(struct v4l2_subdev *sd,
+@@ -1744,7 +1782,7 @@ static void unicam_notify(struct v4l2_su
  
  	switch (notification) {
  	case V4L2_DEVICE_NOTIFY_EVENT:
@@ -759,7 +758,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  		break;
  	default:
  		break;
-@@ -1767,10 +1805,11 @@ static const struct vb2_ops unicam_video_qops = {
+@@ -1767,10 +1805,11 @@ static const struct vb2_ops unicam_video
   */
  static int unicam_open(struct file *file)
  {
@@ -773,7 +772,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	ret = v4l2_fh_open(file);
  	if (ret) {
-@@ -1790,18 +1829,19 @@ static int unicam_open(struct file *file)
+@@ -1790,18 +1829,19 @@ static int unicam_open(struct file *file
  	ret = 0;
  
  unlock:
@@ -796,7 +795,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	fh_singular = v4l2_fh_is_singular_file(file);
  
-@@ -1810,7 +1850,7 @@ static int unicam_release(struct file *file)
+@@ -1810,7 +1850,7 @@ static int unicam_release(struct file *f
  	if (fh_singular)
  		v4l2_subdev_call(sd, core, s_power, 0);
  
@@ -805,7 +804,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	return ret;
  }
-@@ -1892,7 +1932,8 @@ unicam_async_bound(struct v4l2_async_notifier *notifier,
+@@ -1892,7 +1932,8 @@ unicam_async_bound(struct v4l2_async_not
  	return 0;
  }
  
@@ -815,7 +814,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  {
  	struct video_device *vdev;
  	struct vb2_queue *q;
-@@ -1900,15 +1941,7 @@ static int unicam_probe_complete(struct unicam_device *unicam)
+@@ -1900,15 +1941,7 @@ static int unicam_probe_complete(struct
  	const struct unicam_fmt *fmt;
  	int ret;
  
@@ -832,7 +831,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	if (ret) {
  		unicam_err(unicam, "Failed to get_format - ret %d\n", ret);
  		return ret;
-@@ -1938,14 +1971,15 @@ static int unicam_probe_complete(struct unicam_device *unicam)
+@@ -1938,14 +1971,15 @@ static int unicam_probe_complete(struct
  			return -EINVAL;
  	}
  
@@ -852,7 +851,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  
  	if (v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
  		v4l2_std_id tvnorms;
-@@ -1962,27 +1996,30 @@ static int unicam_probe_complete(struct unicam_device *unicam)
+@@ -1962,27 +1996,30 @@ static int unicam_probe_complete(struct
  				       g_tvnorms, &tvnorms);
  		if (WARN_ON(ret))
  			return -EINVAL;
@@ -895,7 +894,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	q->min_buffers_needed = 2;
  	q->dev = &unicam->pdev->dev;
  
-@@ -1992,9 +2029,9 @@ static int unicam_probe_complete(struct unicam_device *unicam)
+@@ -1992,9 +2029,9 @@ static int unicam_probe_complete(struct
  		return ret;
  	}
  
@@ -907,7 +906,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	strlcpy(vdev->name, UNICAM_MODULE_NAME, sizeof(vdev->name));
  	vdev->release = video_device_release_empty;
  	vdev->fops = &unicam_fops;
-@@ -2002,69 +2039,113 @@ static int unicam_probe_complete(struct unicam_device *unicam)
+@@ -2002,69 +2039,113 @@ static int unicam_probe_complete(struct
  	vdev->v4l2_dev = &unicam->v4l2_dev;
  	vdev->vfl_dir = VFL_DIR_RX;
  	vdev->queue = q;
@@ -1052,7 +1051,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  }
  
  static int unicam_async_complete(struct v4l2_async_notifier *notifier)
-@@ -2274,7 +2355,8 @@ static int unicam_probe(struct platform_device *pdev)
+@@ -2274,7 +2355,8 @@ static int unicam_probe(struct platform_
  		 pdev->dev.driver->name, dev_name(&pdev->dev));
  	unicam->mdev.hw_revision = 1;
  
@@ -1062,7 +1061,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	media_device_init(&unicam->mdev);
  
  	unicam->v4l2_dev.mdev = &unicam->mdev;
-@@ -2294,7 +2376,7 @@ static int unicam_probe(struct platform_device *pdev)
+@@ -2294,7 +2376,7 @@ static int unicam_probe(struct platform_
  	}
  
  	/* Reserve space for the controls */
@@ -1071,7 +1070,7 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	ret = v4l2_ctrl_handler_init(hdl, 16);
  	if (ret < 0)
  		goto media_unregister;
-@@ -2335,9 +2417,9 @@ static int unicam_remove(struct platform_device *pdev)
+@@ -2335,9 +2417,9 @@ static int unicam_remove(struct platform
  	pm_runtime_disable(&pdev->dev);
  
  	v4l2_async_notifier_unregister(&unicam->notifier);
@@ -1083,6 +1082,3 @@ index 9da9f22c3db5..b34551a3f44b 100644
  	if (unicam->sensor_config)
  		v4l2_subdev_free_pad_config(unicam->sensor_config);
  	media_device_unregister(&unicam->mdev);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0226-media-bcm2835-unicam-Add-embedded-data-node.patch b/root/target/linux/bcm27xx/patches-5.15/950-0216-media-bcm2835-unicam-Add-embedded-data-node.patch
similarity index 91%
rename from root/target/linux/bcm27xx/patches-5.15/0226-media-bcm2835-unicam-Add-embedded-data-node.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0216-media-bcm2835-unicam-Add-embedded-data-node.patch
index 06b56505..8781ca13 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0226-media-bcm2835-unicam-Add-embedded-data-node.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0216-media-bcm2835-unicam-Add-embedded-data-node.patch
@@ -1,7 +1,7 @@
-From 3b47d0669f2613f50b12c8925ee3f3a91184444c Mon Sep 17 00:00:00 2001
+From 2d12ef792f9e2da4be359b9856643da8ac7778d5 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Thu, 16 Apr 2020 11:35:41 +0100
-Subject: [PATCH 226/634] media: bcm2835-unicam: Add embedded data node.
+Subject: [PATCH 216/828] media: bcm2835-unicam: Add embedded data node.
 
 This patch adds a new node in the bcm2835-unicam driver to support
 CSI-2 embedded data streams.  The subdevice is queried to see if
@@ -12,11 +12,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  .../media/platform/bcm2835/bcm2835-unicam.c   | 667 +++++++++++++-----
  1 file changed, 474 insertions(+), 193 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index b34551a3f44b..d5e0f70b600c 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -109,8 +109,15 @@ MODULE_PARM_DESC(debug, "Debug level 0-3");
+@@ -109,8 +109,15 @@ MODULE_PARM_DESC(debug, "Debug level 0-3
  /* Define a nominal minimum image size */
  #define MIN_WIDTH	16
  #define MIN_HEIGHT	16
@@ -34,7 +32,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  /*
   * struct unicam_fmt - Unicam media bus format information
   * @pixelformat: V4L2 pixel format FCC identifier. 0 if n/a.
-@@ -327,6 +334,12 @@ static const struct unicam_fmt formats[] = {
+@@ -327,6 +334,12 @@ static const struct unicam_fmt formats[]
  		.depth		= 12,
  		.csi_dt		= 0x2c,
  	},
@@ -87,7 +85,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  
  	struct unicam_node node[MAX_NODES];
  };
-@@ -488,6 +499,7 @@ static int check_mbus_format(struct unicam_device *dev,
+@@ -488,6 +499,7 @@ static int check_mbus_format(struct unic
  	for (i = 0; !ret && i < MAX_ENUM_MBUS_CODE; i++) {
  		memset(&mbus_code, 0, sizeof(mbus_code));
  		mbus_code.index = i;
@@ -95,7 +93,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  		mbus_code.which = V4L2_SUBDEV_FORMAT_ACTIVE;
  
  		ret = v4l2_subdev_call(dev->sensor, pad, enum_mbus_code,
-@@ -552,10 +564,11 @@ static int __subdev_get_format(struct unicam_device *dev,
+@@ -552,10 +564,11 @@ static int __subdev_get_format(struct un
  }
  
  static int __subdev_set_format(struct unicam_device *dev,
@@ -108,7 +106,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	};
  	int ret;
  
-@@ -566,8 +579,12 @@ static int __subdev_set_format(struct unicam_device *dev,
+@@ -566,8 +579,12 @@ static int __subdev_set_format(struct un
  	if (ret < 0)
  		return ret;
  
@@ -123,7 +121,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  
  	return 0;
  }
-@@ -609,46 +626,70 @@ static int unicam_reset_format(struct unicam_node *node)
+@@ -609,46 +626,70 @@ static int unicam_reset_format(struct un
  	struct v4l2_mbus_framefmt mbus_fmt;
  	int ret;
  
@@ -215,7 +213,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  
  	if (!frm)
  		return 0;
-@@ -658,27 +699,51 @@ static inline unsigned int unicam_get_lines_done(struct unicam_device *dev)
+@@ -658,27 +699,51 @@ static inline unsigned int unicam_get_li
  	return (unsigned int)(cur_addr - start_addr) / stride;
  }
  
@@ -276,7 +274,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  }
  
  /*
-@@ -693,10 +758,12 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -693,10 +758,12 @@ static irqreturn_t unicam_isr(int irq, v
  {
  	struct unicam_device *unicam = (struct unicam_device *)dev;
  	struct unicam_cfg *cfg = &unicam->cfg;
@@ -290,7 +288,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  
  	/*
  	 * Don't service interrupts if not streaming.
-@@ -704,7 +771,7 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -704,7 +771,7 @@ static irqreturn_t unicam_isr(int irq, v
  	 * peripheral without the kernel knowing (that
  	 * shouldn't happen, but causes issues if it does).
  	 */
@@ -299,7 +297,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  		return IRQ_HANDLED;
  
  	sta = reg_read(cfg, UNICAM_STA);
-@@ -726,9 +793,12 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -726,9 +793,12 @@ static irqreturn_t unicam_isr(int irq, v
  		 * Timestamp is to be when the first data byte was captured,
  		 * aka frame start.
  		 */
@@ -315,7 +313,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	}
  	if (ista & UNICAM_FEI || sta & UNICAM_PI0) {
  		/*
-@@ -736,9 +806,13 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -736,9 +806,13 @@ static irqreturn_t unicam_isr(int irq, v
  		 * stop the peripheral. Overwrite the frame we've just
  		 * captured instead.
  		 */
@@ -332,7 +330,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	}
  
  	/* Cannot swap buffer at frame end, there may be a race condition
-@@ -746,11 +820,13 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -746,11 +820,13 @@ static irqreturn_t unicam_isr(int irq, v
  	 * already started.
  	 */
  	if (ista & (UNICAM_FSI | UNICAM_LCI) && !(ista & UNICAM_FEI)) {
@@ -351,7 +349,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	}
  
  	if (reg_read(&unicam->cfg, UNICAM_ICTL) & UNICAM_FCM) {
-@@ -773,6 +849,15 @@ static int unicam_querycap(struct file *file, void *priv,
+@@ -773,6 +849,15 @@ static int unicam_querycap(struct file *
  	snprintf(cap->bus_info, sizeof(cap->bus_info),
  		 "platform:%s", dev->v4l2_dev.name);
  
@@ -367,7 +365,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	return 0;
  }
  
-@@ -787,9 +872,14 @@ static int unicam_enum_fmt_vid_cap(struct file *file, void  *priv,
+@@ -787,9 +872,14 @@ static int unicam_enum_fmt_vid_cap(struc
  	int ret = 0;
  	int i;
  
@@ -382,7 +380,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  
  		ret = v4l2_subdev_call(dev->sensor, pad, enum_mbus_code,
  				       NULL, &mbus_code);
-@@ -827,6 +917,9 @@ static int unicam_g_fmt_vid_cap(struct file *file, void *priv,
+@@ -827,6 +917,9 @@ static int unicam_g_fmt_vid_cap(struct f
  {
  	struct unicam_node *node = video_drvdata(file);
  
@@ -392,7 +390,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	*f = node->v_fmt;
  
  	return 0;
-@@ -843,6 +936,9 @@ const struct unicam_fmt *get_first_supported_format(struct unicam_device *dev)
+@@ -843,6 +936,9 @@ const struct unicam_fmt *get_first_suppo
  	for (j = 0; ret != -EINVAL && ret != -ENOIOCTLCMD; ++j) {
  		memset(&mbus_code, 0, sizeof(mbus_code));
  		mbus_code.index = j;
@@ -402,7 +400,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  		ret = v4l2_subdev_call(dev->sensor, pad, enum_mbus_code, NULL,
  				       &mbus_code);
  		if (ret < 0) {
-@@ -873,12 +969,15 @@ static int unicam_try_fmt_vid_cap(struct file *file, void *priv,
+@@ -873,12 +969,15 @@ static int unicam_try_fmt_vid_cap(struct
  	struct unicam_device *dev = node->dev;
  	struct v4l2_subdev_format sd_fmt = {
  		.which = V4L2_SUBDEV_FORMAT_TRY,
@@ -419,7 +417,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	fmt = find_format_by_pix(dev, f->fmt.pix.pixelformat);
  	if (!fmt) {
  		/* Pixel format not supported by unicam. Choose the first
-@@ -983,7 +1082,7 @@ static int unicam_s_fmt_vid_cap(struct file *file, void *priv,
+@@ -983,7 +1082,7 @@ static int unicam_s_fmt_vid_cap(struct f
  
  	v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, fmt->code);
  
@@ -428,7 +426,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	if (ret) {
  		unicam_dbg(3, dev, "%s __subdev_set_format failed %d\n",
  			   __func__, ret);
-@@ -1014,6 +1113,106 @@ static int unicam_s_fmt_vid_cap(struct file *file, void *priv,
+@@ -1014,6 +1113,106 @@ static int unicam_s_fmt_vid_cap(struct f
  	return 0;
  }
  
@@ -535,7 +533,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  static int unicam_queue_setup(struct vb2_queue *vq,
  			      unsigned int *nbuffers,
  			      unsigned int *nplanes,
-@@ -1022,7 +1221,9 @@ static int unicam_queue_setup(struct vb2_queue *vq,
+@@ -1022,7 +1221,9 @@ static int unicam_queue_setup(struct vb2
  {
  	struct unicam_node *node = vb2_get_drv_priv(vq);
  	struct unicam_device *dev = node->dev;
@@ -546,7 +544,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  
  	if (vq->num_buffers + *nbuffers < 3)
  		*nbuffers = 3 - vq->num_buffers;
-@@ -1053,7 +1254,8 @@ static int unicam_buffer_prepare(struct vb2_buffer *vb)
+@@ -1053,7 +1254,8 @@ static int unicam_buffer_prepare(struct
  	if (WARN_ON(!node->fmt))
  		return -EINVAL;
  
@@ -556,7 +554,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	if (vb2_plane_size(vb, 0) < size) {
  		unicam_err(dev, "data will not fit into plane (%lu < %lu)\n",
  			   vb2_plane_size(vb, 0), size);
-@@ -1082,12 +1284,12 @@ static void unicam_set_packing_config(struct unicam_device *dev)
+@@ -1082,12 +1284,12 @@ static void unicam_set_packing_config(st
  	int pack, unpack;
  	u32 val;
  
@@ -572,7 +570,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  		case 8:
  			unpack = UNICAM_PUM_UNPACK8;
  			break;
-@@ -1125,17 +1327,31 @@ static void unicam_cfg_image_id(struct unicam_device *dev)
+@@ -1125,17 +1327,31 @@ static void unicam_cfg_image_id(struct u
  	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
  		/* CSI2 mode */
  		reg_write(cfg, UNICAM_IDI0,
@@ -608,7 +606,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	unsigned int i;
  	u32 val;
  
-@@ -1284,27 +1500,31 @@ static void unicam_start_rx(struct unicam_device *dev, unsigned long addr)
+@@ -1284,27 +1500,31 @@ static void unicam_start_rx(struct unica
  	}
  
  	reg_write(&dev->cfg, UNICAM_IBLS,
@@ -647,7 +645,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	/*
  	 * Enable trigger only for the first frame to
  	 * sync correctly to the FS from the source.
-@@ -1339,6 +1559,9 @@ static void unicam_disable(struct unicam_device *dev)
+@@ -1339,6 +1559,9 @@ static void unicam_disable(struct unicam
  	/* Disable peripheral */
  	reg_write_field(cfg, UNICAM_CTRL, 0, UNICAM_CPE);
  
@@ -657,7 +655,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	/* Disable all lane clocks */
  	clk_write(cfg, 0);
  }
-@@ -1347,26 +1570,23 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -1347,26 +1570,23 @@ static int unicam_start_streaming(struct
  {
  	struct unicam_node *node = vb2_get_drv_priv(vq);
  	struct unicam_device *dev = node->dev;
@@ -694,7 +692,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	}
  
  	dev->active_data_lanes = dev->max_data_lanes;
-@@ -1388,7 +1608,7 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -1388,7 +1608,7 @@ static int unicam_start_streaming(struct
  			dev->active_data_lanes = dev->max_data_lanes;
  	}
  	if (dev->active_data_lanes > dev->max_data_lanes) {
@@ -703,7 +701,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  			   dev->active_data_lanes, dev->max_data_lanes);
  		ret = -EINVAL;
  		goto err_pm_put;
-@@ -1408,9 +1628,22 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -1408,9 +1628,22 @@ static int unicam_start_streaming(struct
  		unicam_err(dev, "Failed to enable CSI clock: %d\n", ret);
  		goto err_pm_put;
  	}
@@ -728,7 +726,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  
  	ret = v4l2_subdev_call(dev->sensor, video, s_stream, 1);
  	if (ret < 0) {
-@@ -1421,21 +1654,11 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -1421,21 +1654,11 @@ static int unicam_start_streaming(struct
  	return 0;
  
  err_disable_unicam:
@@ -751,7 +749,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  
  	return ret;
  }
-@@ -1448,33 +1671,47 @@ static void unicam_stop_streaming(struct vb2_queue *vq)
+@@ -1448,33 +1671,47 @@ static void unicam_stop_streaming(struct
  	struct unicam_buffer *buf, *tmp;
  	unsigned long flags;
  
@@ -767,7 +765,8 @@ index b34551a3f44b..d5e0f70b600c 100644
 +		 */
 +		if (v4l2_subdev_call(dev->sensor, video, s_stream, 0) < 0)
 +			unicam_err(dev, "stream off failed in subdev\n");
-+
+ 
+-	/* Release all active buffers */
 +		unicam_disable(dev);
 +		clk_disable_unprepare(dev->clock);
 +		unicam_runtime_put(dev);
@@ -781,8 +780,7 @@ index b34551a3f44b..d5e0f70b600c 100644
 +		 */
 +		unicam_wr_dma_addr(dev, 0xc0000000, METADATA_PAD);
 +	}
- 
--	/* Release all active buffers */
++
 +	/* Clear all queued buffers for the node */
  	spin_lock_irqsave(&node->dma_queue_lock, flags);
  	list_for_each_entry_safe(buf, tmp, &dma_q->active, list) {
@@ -811,7 +809,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  }
  
  static int unicam_enum_input(struct file *file, void *priv,
-@@ -1595,17 +1832,23 @@ static int unicam_enum_framesizes(struct file *file, void *priv,
+@@ -1595,17 +1832,23 @@ static int unicam_enum_framesizes(struct
  	struct v4l2_subdev_frame_size_enum fse;
  	int ret;
  
@@ -843,7 +841,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  
  	ret = v4l2_subdev_call(dev->sensor, pad, enum_frame_size, NULL, &fse);
  	if (ret)
-@@ -1782,7 +2025,7 @@ static void unicam_notify(struct v4l2_subdev *sd,
+@@ -1782,7 +2025,7 @@ static void unicam_notify(struct v4l2_su
  
  	switch (notification) {
  	case V4L2_DEVICE_NOTIFY_EVENT:
@@ -852,7 +850,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  		break;
  	default:
  		break;
-@@ -1826,6 +2069,7 @@ static int unicam_open(struct file *file)
+@@ -1826,6 +2069,7 @@ static int unicam_open(struct file *file
  		goto unlock;
  	}
  
@@ -860,7 +858,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	ret = 0;
  
  unlock:
-@@ -1850,6 +2094,10 @@ static int unicam_release(struct file *file)
+@@ -1850,6 +2094,10 @@ static int unicam_release(struct file *f
  	if (fh_singular)
  		v4l2_subdev_call(sd, core, s_power, 0);
  
@@ -871,7 +869,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	mutex_unlock(&node->lock);
  
  	return ret;
-@@ -1874,6 +2122,11 @@ static const struct v4l2_ioctl_ops unicam_ioctl_ops = {
+@@ -1874,6 +2122,11 @@ static const struct v4l2_ioctl_ops unica
  	.vidioc_s_fmt_vid_cap		= unicam_s_fmt_vid_cap,
  	.vidioc_try_fmt_vid_cap		= unicam_try_fmt_vid_cap,
  
@@ -883,7 +881,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	.vidioc_enum_input		= unicam_enum_input,
  	.vidioc_g_input			= unicam_g_input,
  	.vidioc_s_input			= unicam_s_input,
-@@ -1941,42 +2194,53 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -1941,42 +2194,53 @@ static int register_node(struct unicam_d
  	const struct unicam_fmt *fmt;
  	int ret;
  
@@ -892,6 +890,13 @@ index b34551a3f44b..d5e0f70b600c 100644
 -		unicam_err(unicam, "Failed to get_format - ret %d\n", ret);
 -		return ret;
 -	}
+-
+-	fmt = find_format_by_code(mbus_fmt.code);
+-	if (!fmt) {
+-		/* Find the first format that the sensor and unicam both
+-		 * support
+-		 */
+-		fmt = get_first_supported_format(unicam);
 +	if (unicam->sensor_embedded_data || pad_id != METADATA_PAD) {
 +		ret = __subdev_get_format(unicam, &mbus_fmt, pad_id);
 +		if (ret) {
@@ -900,12 +905,9 @@ index b34551a3f44b..d5e0f70b600c 100644
 +			return ret;
 +		}
  
--	fmt = find_format_by_code(mbus_fmt.code);
--	if (!fmt) {
--		/* Find the first format that the sensor and unicam both
--		 * support
--		 */
--		fmt = get_first_supported_format(unicam);
+-		if (!fmt)
+-			/* No compatible formats */
+-			return -EINVAL;
 +		fmt = find_format_by_code(mbus_fmt.code);
 +		if (!fmt) {
 +			/* Find the first format that the sensor and unicam both
@@ -913,13 +915,6 @@ index b34551a3f44b..d5e0f70b600c 100644
 +			 */
 +			fmt = get_first_supported_format(unicam);
  
--		if (!fmt)
--			/* No compatible formats */
--			return -EINVAL;
-+			if (!fmt)
-+				/* No compatible formats */
-+				return -EINVAL;
- 
 -		mbus_fmt.code = fmt->code;
 -		ret = __subdev_set_format(unicam, &mbus_fmt);
 -		if (ret)
@@ -931,6 +926,10 @@ index b34551a3f44b..d5e0f70b600c 100644
 -		ret = __subdev_set_format(unicam, &mbus_fmt);
 -		if (ret)
 -			return -EINVAL;
++			if (!fmt)
++				/* No compatible formats */
++				return -EINVAL;
++
 +			mbus_fmt.code = fmt->code;
 +			ret = __subdev_set_format(unicam, &mbus_fmt, pad_id);
 +			if (ret)
@@ -965,7 +964,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  
  	/* Read current subdev format */
  	unicam_reset_format(node);
-@@ -2002,13 +2266,21 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2002,13 +2266,21 @@ static int register_node(struct unicam_d
  	spin_lock_init(&node->dma_queue_lock);
  	mutex_init(&node->lock);
  
@@ -988,7 +987,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	}
  
  	q = &node->buffer_queue;
-@@ -2031,8 +2303,6 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2031,8 +2303,6 @@ static int register_node(struct unicam_d
  
  	INIT_LIST_HEAD(&node->dma_queue.active);
  
@@ -997,7 +996,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	vdev->release = video_device_release_empty;
  	vdev->fops = &unicam_fops;
  	vdev->ioctl_ops = &unicam_ioctl_ops;
-@@ -2040,24 +2310,28 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2040,24 +2310,28 @@ static int register_node(struct unicam_d
  	vdev->vfl_dir = VFL_DIR_RX;
  	vdev->queue = q;
  	vdev->lock = &node->lock;
@@ -1035,7 +1034,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  		v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_EDID);
  		v4l2_disable_ioctl(&node->video_dev, VIDIOC_G_EDID);
  		v4l2_disable_ioctl(&node->video_dev, VIDIOC_DV_TIMINGS_CAP);
-@@ -2066,15 +2340,19 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2066,15 +2340,19 @@ static int register_node(struct unicam_d
  		v4l2_disable_ioctl(&node->video_dev, VIDIOC_ENUM_DV_TIMINGS);
  		v4l2_disable_ioctl(&node->video_dev, VIDIOC_QUERY_DV_TIMINGS);
  	}
@@ -1059,7 +1058,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  		v4l2_disable_ioctl(&node->video_dev, VIDIOC_ENUM_FRAMESIZES);
  
  	ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
-@@ -2082,27 +2360,29 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2082,27 +2360,29 @@ static int register_node(struct unicam_d
  		unicam_err(unicam, "Unable to register video device.\n");
  		return ret;
  	}
@@ -1089,20 +1088,21 @@ index b34551a3f44b..d5e0f70b600c 100644
 -	if (unicam->node[0].registered) {
 -		video_unregister_device(&unicam->node[0].video_dev);
 -		unicam->node[0].registered = false;
-+	if (unicam->node[IMAGE_PAD].registered) {
-+		video_unregister_device(&unicam->node[IMAGE_PAD].video_dev);
-+		unicam->node[IMAGE_PAD].registered = 0;
- 	}
+-	}
 -	if (unicam->node[1].registered) {
 -		video_unregister_device(&unicam->node[1].video_dev);
 -		unicam->node[1].registered = false;
++	if (unicam->node[IMAGE_PAD].registered) {
++		video_unregister_device(&unicam->node[IMAGE_PAD].video_dev);
++		unicam->node[IMAGE_PAD].registered = 0;
++	}
 +	if (unicam->node[METADATA_PAD].registered) {
 +		video_unregister_device(&unicam->node[METADATA_PAD].video_dev);
 +		unicam->node[METADATA_PAD].registered = 0;
  	}
  }
  
-@@ -2118,20 +2398,20 @@ static int unicam_probe_complete(struct unicam_device *unicam)
+@@ -2118,20 +2398,20 @@ static int unicam_probe_complete(struct
  	if (!unicam->sensor_config)
  		return -ENOMEM;
  
@@ -1133,7 +1133,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	}
  
  	ret = v4l2_device_register_ro_subdev_nodes(&unicam->v4l2_dev);
-@@ -2355,8 +2635,10 @@ static int unicam_probe(struct platform_device *pdev)
+@@ -2355,8 +2635,10 @@ static int unicam_probe(struct platform_
  		 pdev->dev.driver->name, dev_name(&pdev->dev));
  	unicam->mdev.hw_revision = 1;
  
@@ -1146,7 +1146,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  	media_device_init(&unicam->mdev);
  
  	unicam->v4l2_dev.mdev = &unicam->mdev;
-@@ -2376,11 +2658,10 @@ static int unicam_probe(struct platform_device *pdev)
+@@ -2376,11 +2658,10 @@ static int unicam_probe(struct platform_
  	}
  
  	/* Reserve space for the controls */
@@ -1159,7 +1159,7 @@ index b34551a3f44b..d5e0f70b600c 100644
  
  	/* set the driver data in platform device */
  	platform_set_drvdata(pdev, unicam);
-@@ -2417,7 +2698,7 @@ static int unicam_remove(struct platform_device *pdev)
+@@ -2417,7 +2698,7 @@ static int unicam_remove(struct platform
  	pm_runtime_disable(&pdev->dev);
  
  	v4l2_async_notifier_unregister(&unicam->notifier);
@@ -1168,6 +1168,3 @@ index b34551a3f44b..d5e0f70b600c 100644
  	v4l2_device_unregister(&unicam->v4l2_dev);
  	unregister_nodes(unicam);
  	if (unicam->sensor_config)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0227-media-bcm2835-unicam-Use-dummy-buffer-if-none-have-b.patch b/root/target/linux/bcm27xx/patches-5.15/950-0217-media-bcm2835-unicam-Use-dummy-buffer-if-none-have-b.patch
similarity index 86%
rename from root/target/linux/bcm27xx/patches-5.15/0227-media-bcm2835-unicam-Use-dummy-buffer-if-none-have-b.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0217-media-bcm2835-unicam-Use-dummy-buffer-if-none-have-b.patch
index c829be10..60570e88 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0227-media-bcm2835-unicam-Use-dummy-buffer-if-none-have-b.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0217-media-bcm2835-unicam-Use-dummy-buffer-if-none-have-b.patch
@@ -1,7 +1,7 @@
-From e122e87b59aa2a7d2a256ac4e0eb99de3be54cdd Mon Sep 17 00:00:00 2001
+From 508c93705916df5b83af07f9b122fb5c6f945b6d Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Thu, 2 Apr 2020 16:08:51 +0100
-Subject: [PATCH 227/634] media: bcm2835-unicam: Use dummy buffer if none have
+Subject: [PATCH 217/828] media: bcm2835-unicam: Use dummy buffer if none have
  been queued
 
 If no buffer has been queued by a userland application, we use an
@@ -14,8 +14,6 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  .../media/platform/bcm2835/bcm2835-unicam.c   | 160 ++++++++++++------
  1 file changed, 110 insertions(+), 50 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index d5e0f70b600c..933f1ba49e3d 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -47,6 +47,7 @@
@@ -26,7 +24,7 @@ index d5e0f70b600c..933f1ba49e3d 100644
  #include <linux/err.h>
  #include <linux/init.h>
  #include <linux/interrupt.h>
-@@ -112,6 +113,12 @@ MODULE_PARM_DESC(debug, "Debug level 0-3");
+@@ -112,6 +113,12 @@ MODULE_PARM_DESC(debug, "Debug level 0-3
  /* Default size of the embedded buffer */
  #define UNICAM_EMBEDDED_SIZE	8192
  
@@ -52,7 +50,7 @@ index d5e0f70b600c..933f1ba49e3d 100644
  };
  
  struct unicam_device {
-@@ -661,27 +674,24 @@ static int unicam_reset_format(struct unicam_node *node)
+@@ -661,27 +674,24 @@ static int unicam_reset_format(struct un
  	return 0;
  }
  
@@ -91,7 +89,7 @@ index d5e0f70b600c..933f1ba49e3d 100644
  	}
  }
  
-@@ -704,6 +714,7 @@ static inline void unicam_schedule_next_buffer(struct unicam_node *node)
+@@ -704,6 +714,7 @@ static inline void unicam_schedule_next_
  	struct unicam_device *dev = node->dev;
  	struct unicam_dmaqueue *dma_q = &node->dma_queue;
  	struct unicam_buffer *buf;
@@ -99,7 +97,7 @@ index d5e0f70b600c..933f1ba49e3d 100644
  	dma_addr_t addr;
  
  	buf = list_entry(dma_q->active.next, struct unicam_buffer, list);
-@@ -711,7 +722,23 @@ static inline void unicam_schedule_next_buffer(struct unicam_node *node)
+@@ -711,7 +722,23 @@ static inline void unicam_schedule_next_
  	list_del(&buf->list);
  
  	addr = vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 0);
@@ -124,7 +122,7 @@ index d5e0f70b600c..933f1ba49e3d 100644
  }
  
  static inline void unicam_process_buffer_complete(struct unicam_node *node,
-@@ -721,7 +748,6 @@ static inline void unicam_process_buffer_complete(struct unicam_node *node,
+@@ -721,7 +748,6 @@ static inline void unicam_process_buffer
  	node->cur_frm->vb.sequence = sequence;
  
  	vb2_buffer_done(&node->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
@@ -132,7 +130,7 @@ index d5e0f70b600c..933f1ba49e3d 100644
  }
  
  static int unicam_num_nodes_streaming(struct unicam_device *dev)
-@@ -788,6 +814,28 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -788,6 +814,28 @@ static irqreturn_t unicam_isr(int irq, v
  	if (!(sta && (UNICAM_IS | UNICAM_PI0)))
  		return IRQ_HANDLED;
  
@@ -161,7 +159,7 @@ index d5e0f70b600c..933f1ba49e3d 100644
  	if (ista & UNICAM_FSI) {
  		/*
  		 * Timestamp is to be when the first data byte was captured,
-@@ -798,24 +846,16 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -798,24 +846,16 @@ static irqreturn_t unicam_isr(int irq, v
  			if (unicam->node[i].cur_frm)
  				unicam->node[i].cur_frm->vb.vb2_buf.timestamp =
  								ts;
@@ -194,7 +192,7 @@ index d5e0f70b600c..933f1ba49e3d 100644
  	 * where the HW does not actually swap it if the new frame has
  	 * already started.
  	 */
-@@ -823,7 +863,7 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -823,7 +863,7 @@ static irqreturn_t unicam_isr(int irq, v
  		for (i = 0; i < num_nodes_streaming; i++) {
  			spin_lock(&unicam->node[i].dma_queue_lock);
  			if (!list_empty(&unicam->node[i].dma_queue.active) &&
@@ -203,7 +201,7 @@ index d5e0f70b600c..933f1ba49e3d 100644
  				unicam_schedule_next_buffer(&unicam->node[i]);
  			spin_unlock(&unicam->node[i].dma_queue_lock);
  		}
-@@ -1352,7 +1392,7 @@ static void unicam_start_rx(struct unicam_device *dev, dma_addr_t *addr)
+@@ -1352,7 +1392,7 @@ static void unicam_start_rx(struct unica
  {
  	struct unicam_cfg *cfg = &dev->cfg;
  	int line_int_freq = dev->node[IMAGE_PAD].v_fmt.fmt.pix.height >> 2;
@@ -212,7 +210,7 @@ index d5e0f70b600c..933f1ba49e3d 100644
  	u32 val;
  
  	if (line_int_freq < 128)
-@@ -1413,7 +1453,7 @@ static void unicam_start_rx(struct unicam_device *dev, dma_addr_t *addr)
+@@ -1413,7 +1453,7 @@ static void unicam_start_rx(struct unica
  	reg_write_field(cfg, UNICAM_ANA, 0, UNICAM_DDL);
  
  	/* Always start in trigger frame capture mode (UNICAM_FCM set) */
@@ -221,7 +219,7 @@ index d5e0f70b600c..933f1ba49e3d 100644
  	set_field(&val,  line_int_freq, UNICAM_LCIE_MASK);
  	reg_write(cfg, UNICAM_ICTL, val);
  	reg_write(cfg, UNICAM_STA, UNICAM_STA_MASK_ALL);
-@@ -1501,7 +1541,8 @@ static void unicam_start_rx(struct unicam_device *dev, dma_addr_t *addr)
+@@ -1501,7 +1541,8 @@ static void unicam_start_rx(struct unica
  
  	reg_write(&dev->cfg, UNICAM_IBLS,
  		  dev->node[IMAGE_PAD].v_fmt.fmt.pix.bytesperline);
@@ -231,7 +229,7 @@ index d5e0f70b600c..933f1ba49e3d 100644
  	unicam_set_packing_config(dev);
  	unicam_cfg_image_id(dev);
  
-@@ -1511,8 +1552,10 @@ static void unicam_start_rx(struct unicam_device *dev, dma_addr_t *addr)
+@@ -1511,8 +1552,10 @@ static void unicam_start_rx(struct unica
  	reg_write(cfg, UNICAM_MISC, val);
  
  	if (dev->node[METADATA_PAD].streaming && dev->sensor_embedded_data) {
@@ -243,7 +241,7 @@ index d5e0f70b600c..933f1ba49e3d 100644
  	}
  
  	/* Enable peripheral */
-@@ -1686,13 +1729,14 @@ static void unicam_stop_streaming(struct vb2_queue *vq)
+@@ -1686,13 +1729,14 @@ static void unicam_stop_streaming(struct
  		unicam_runtime_put(dev);
  
  	} else if (node->pad_id == METADATA_PAD) {
@@ -264,7 +262,7 @@ index d5e0f70b600c..933f1ba49e3d 100644
  	}
  
  	/* Clear all queued buffers for the node */
-@@ -2321,6 +2365,15 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2321,6 +2365,15 @@ static int register_node(struct unicam_d
  	video_set_drvdata(vdev, node);
  	vdev->entity.flags |= MEDIA_ENT_FL_DEFAULT;
  
@@ -280,7 +278,7 @@ index d5e0f70b600c..933f1ba49e3d 100644
  	if (node->pad_id == METADATA_PAD ||
  	    !v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
  		v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_STD);
-@@ -2376,13 +2429,20 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2376,13 +2429,20 @@ static int register_node(struct unicam_d
  
  static void unregister_nodes(struct unicam_device *unicam)
  {
@@ -308,6 +306,3 @@ index d5e0f70b600c..933f1ba49e3d 100644
  	}
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0228-media-bcm2835-unicam-Disable-event-related-ioctls-on.patch b/root/target/linux/bcm27xx/patches-5.15/950-0218-media-bcm2835-unicam-Disable-event-related-ioctls-on.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0228-media-bcm2835-unicam-Disable-event-related-ioctls-on.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0218-media-bcm2835-unicam-Disable-event-related-ioctls-on.patch
index 949c2d46..f31e1308 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0228-media-bcm2835-unicam-Disable-event-related-ioctls-on.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0218-media-bcm2835-unicam-Disable-event-related-ioctls-on.patch
@@ -1,7 +1,7 @@
-From 0387e64d8fd383b74994ccb02e304840ea56d350 Mon Sep 17 00:00:00 2001
+From eb26017cdebde6e61c8b76e6bec2a37d1ea7a326 Mon Sep 17 00:00:00 2001
 From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 Date: Tue, 24 Mar 2020 23:13:02 +0200
-Subject: [PATCH 228/634] media: bcm2835-unicam: Disable event-related ioctls
+Subject: [PATCH 218/828] media: bcm2835-unicam: Disable event-related ioctls
  on metadata node
 
 The unicam driver supports both the SOURCE_CHANGE and CTRL events. Both
@@ -15,11 +15,9 @@ Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 933f1ba49e3d..2d4c7a247fc5 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -2374,6 +2374,11 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2374,6 +2374,11 @@ static int register_node(struct unicam_d
  		return -ENOMEM;
  	}
  
@@ -31,6 +29,3 @@ index 933f1ba49e3d..2d4c7a247fc5 100644
  	if (node->pad_id == METADATA_PAD ||
  	    !v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
  		v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_STD);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0229-media-bcm2835-unicam-Add-support-for-the-FRAME_SYNC-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0219-media-bcm2835-unicam-Add-support-for-the-FRAME_SYNC-.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0229-media-bcm2835-unicam-Add-support-for-the-FRAME_SYNC-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0219-media-bcm2835-unicam-Add-support-for-the-FRAME_SYNC-.patch
index c7e78c3b..b4713ec8 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0229-media-bcm2835-unicam-Add-support-for-the-FRAME_SYNC-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0219-media-bcm2835-unicam-Add-support-for-the-FRAME_SYNC-.patch
@@ -1,7 +1,7 @@
-From 9bfa2cba51a25e53466e5eab0645e74e3a2fd38c Mon Sep 17 00:00:00 2001
+From 972b51d8784316919ca1d0a107bceff893962dc1 Mon Sep 17 00:00:00 2001
 From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 Date: Tue, 24 Mar 2020 23:13:02 +0200
-Subject: [PATCH 229/634] media: bcm2835-unicam: Add support for the FRAME_SYNC
+Subject: [PATCH 219/828] media: bcm2835-unicam: Add support for the FRAME_SYNC
  event
 
 The FRAME_SYNC event is useful for userspace image processing algorithms
@@ -16,11 +16,9 @@ Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 2d4c7a247fc5..21d3a8585118 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -772,6 +772,16 @@ static int unicam_all_nodes_disabled(struct unicam_device *dev)
+@@ -772,6 +772,16 @@ static int unicam_all_nodes_disabled(str
  	       !dev->node[METADATA_PAD].streaming;
  }
  
@@ -37,7 +35,7 @@ index 2d4c7a247fc5..21d3a8585118 100644
  /*
   * unicam_isr : ISR handler for unicam capture
   * @irq: irq number
-@@ -853,6 +863,8 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -853,6 +863,8 @@ static irqreturn_t unicam_isr(int irq, v
  			 */
  			unicam_schedule_dummy_buffer(&unicam->node[i]);
  		}
@@ -46,7 +44,7 @@ index 2d4c7a247fc5..21d3a8585118 100644
  	}
  	/*
  	 * Cannot swap buffer at frame end, there may be a race condition
-@@ -2022,6 +2034,8 @@ static int unicam_subscribe_event(struct v4l2_fh *fh,
+@@ -2022,6 +2034,8 @@ static int unicam_subscribe_event(struct
  				  const struct v4l2_event_subscription *sub)
  {
  	switch (sub->type) {
@@ -55,6 +53,3 @@ index 2d4c7a247fc5..21d3a8585118 100644
  	case V4L2_EVENT_SOURCE_CHANGE:
  		return v4l2_event_subscribe(fh, sub, 4, NULL);
  	}
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0230-media-bcm2835-unicam-Re-fetch-mbus-code-from-subdev-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0220-media-bcm2835-unicam-Re-fetch-mbus-code-from-subdev-.patch
similarity index 79%
rename from root/target/linux/bcm27xx/patches-5.15/0230-media-bcm2835-unicam-Re-fetch-mbus-code-from-subdev-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0220-media-bcm2835-unicam-Re-fetch-mbus-code-from-subdev-.patch
index 7ccb3322..eca102ed 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0230-media-bcm2835-unicam-Re-fetch-mbus-code-from-subdev-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0220-media-bcm2835-unicam-Re-fetch-mbus-code-from-subdev-.patch
@@ -1,7 +1,7 @@
-From 081408a6fa21ceb9669c624a4906d2c8d27e98fe Mon Sep 17 00:00:00 2001
+From 406161018f8f412f7e1d705349a17e74ae99ce83 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Tue, 21 Apr 2020 16:26:03 +0100
-Subject: [PATCH 230/634] media: bcm2835-unicam: Re-fetch mbus code from subdev
+Subject: [PATCH 220/828] media: bcm2835-unicam: Re-fetch mbus code from subdev
  on a g_fmt call
 
 The sensor subdevice may change the Bayer order if a H/V flip is
@@ -13,11 +13,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  .../media/platform/bcm2835/bcm2835-unicam.c   | 21 ++++++++++++++++++-
  1 file changed, 20 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 21d3a8585118..d4684fb2797f 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -967,11 +967,30 @@ static int unicam_enum_fmt_vid_cap(struct file *file, void  *priv,
+@@ -967,11 +967,30 @@ static int unicam_enum_fmt_vid_cap(struc
  static int unicam_g_fmt_vid_cap(struct file *file, void *priv,
  				struct v4l2_format *f)
  {
@@ -29,16 +27,16 @@ index 21d3a8585118..d4684fb2797f 100644
  
 -	if (node->pad_id == METADATA_PAD)
 +	if (node->pad_id != IMAGE_PAD)
-+		return -EINVAL;
-+
+ 		return -EINVAL;
+ 
 +	/*
 +	 * If a flip has occurred in the sensor, the fmt code might have
 +	 * changed. So we will need to re-fetch the format from the subdevice.
 +	 */
 +	ret = __subdev_get_format(dev, &mbus_fmt, node->pad_id);
 +	if (ret)
- 		return -EINVAL;
- 
++		return -EINVAL;
++
 +	/* Find the V4L2 format from mbus code. We must match a known format. */
 +	fmt = find_format_by_code(mbus_fmt.code);
 +	if (!fmt)
@@ -49,6 +47,3 @@ index 21d3a8585118..d4684fb2797f 100644
  	*f = node->v_fmt;
  
  	return 0;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0231-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0221-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch
similarity index 79%
rename from root/target/linux/bcm27xx/patches-5.15/0231-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0221-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch
index 67622a63..ebd21aaa 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0231-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0221-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch
@@ -1,7 +1,7 @@
-From 69d73c1279aa12a1ba971253e6d2f14daa1c5a13 Mon Sep 17 00:00:00 2001
+From c286f2e1532ffbaee87fce5c83b5ea995b78d401 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Thu, 23 Apr 2020 10:20:26 +0100
-Subject: [PATCH 231/634] media: uapi: v4l2-core: Add ISP statistics output
+Subject: [PATCH 221/828] media: uapi: v4l2-core: Add ISP statistics output
  V4L2 fourcc type
 
 Add V4L2_META_FMT_BCM2835_ISP_STATS V4L2 format type.
@@ -18,11 +18,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  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 b2201d1524eb..c1dd92a2d617 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 b2201d1524eb..c1dd92a2d617 100644
      pixfmt-meta-d4xx
      pixfmt-meta-intel-ipu3
      pixfmt-meta-rkisp1
-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 939d9a775bb1..67e5ad8bc80d 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1388,6 +1388,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
+@@ -1390,6 +1390,7 @@ static void v4l_fill_fmtdesc(struct v4l2
  	case V4L2_META_FMT_RK_ISP1_PARAMS:	descr = "Rockchip ISP1 3A Parameters"; break;
  	case V4L2_META_FMT_RK_ISP1_STAT_3A:	descr = "Rockchip ISP1 3A Statistics"; break;
  	case V4L2_META_FMT_SENSOR_DATA:	descr = "Sensor Ancillary Metadata"; break;
@@ -89,8 +82,6 @@ index 939d9a775bb1..67e5ad8bc80d 100644
  
  	default:
  		/* Compressed formats */
-diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 58cbf8a9c5b7..f56bae0c4671 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -776,6 +776,7 @@ struct v4l2_pix_format {
@@ -101,6 +92,3 @@ index 58cbf8a9c5b7..f56bae0c4671 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.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0232-media-uapi-v4l-ctrls-Add-CID-base-for-the-bcm2835-is.patch b/root/target/linux/bcm27xx/patches-5.15/950-0222-media-uapi-v4l-ctrls-Add-CID-base-for-the-bcm2835-is.patch
similarity index 89%
rename from root/target/linux/bcm27xx/patches-5.15/0232-media-uapi-v4l-ctrls-Add-CID-base-for-the-bcm2835-is.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0222-media-uapi-v4l-ctrls-Add-CID-base-for-the-bcm2835-is.patch
index 2e8885f4..4daeceb2 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0232-media-uapi-v4l-ctrls-Add-CID-base-for-the-bcm2835-is.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0222-media-uapi-v4l-ctrls-Add-CID-base-for-the-bcm2835-is.patch
@@ -1,7 +1,7 @@
-From 216bc235c7f7d2050d52e3348b6a3aa26f45f9bc Mon Sep 17 00:00:00 2001
+From 3fd8c86caf51a567548d1ac85cd1a478d6163544 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Tue, 21 Apr 2020 15:06:19 +0100
-Subject: [PATCH 232/634] media: uapi: v4l-ctrls: Add CID base for the
+Subject: [PATCH 222/828] media: uapi: v4l-ctrls: Add CID base for the
  bcm2835-isp driver
 
 We are reserving controls for the new bcm2835-isp driver.
@@ -14,9 +14,6 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  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 12e3c512d718..8f4d593c54a5 100644
 --- a/Documentation/userspace-api/media/drivers/index.rst
 +++ b/Documentation/userspace-api/media/drivers/index.rst
-@@ -35,6 +35,7 @@ For more details see the file COPYING in the source distribution of Linux.
+@@ -35,6 +35,7 @@ For more details see the file COPYING in
  	cx2341x-uapi
          hantro
  	imx-uapi
@@ -159,8 +154,6 @@ index 12e3c512d718..8f4d593c54a5 100644
  	max2175
  	meye-uapi
  	omap3isp-uapi
-diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
-index ee1684f51d97..cda42967cdb3 100644
 --- a/include/uapi/linux/v4l2-controls.h
 +++ b/include/uapi/linux/v4l2-controls.h
 @@ -212,6 +212,10 @@ enum v4l2_colorfx {
@@ -174,6 +167,3 @@ index ee1684f51d97..cda42967cdb3 100644
  /* MPEG-class control IDs */
  /* The MPEG controls are applicable to all codec controls
   * and the 'MPEG' part of the define is historical */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0233-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch b/root/target/linux/bcm27xx/patches-5.15/950-0223-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0233-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0223-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch
index 5dbc79da..6c1bfb71 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0233-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0223-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch
@@ -1,7 +1,7 @@
-From 7e8c9c8078aba0672acef249969c889802171ef5 Mon Sep 17 00:00:00 2001
+From d57aa89766495d350972f6fd76342919098ad84d Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Wed, 22 Apr 2020 08:32:32 +0100
-Subject: [PATCH 233/634] staging: vchiq: Load bcm2835_isp driver from vchiq
+Subject: [PATCH 223/828] staging: vchiq: Load bcm2835_isp driver from vchiq
 
 bcmn2835_isp is a platform driver dependent on vchiq,
 therefore add the load/unload functions for it to vchiq.
@@ -11,11 +11,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  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 79009bd24354..45da87359cd2 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -69,6 +69,7 @@ static struct platform_device *bcm2835_camera;
+@@ -69,6 +69,7 @@ static struct platform_device *bcm2835_c
  static struct platform_device *bcm2835_audio;
  static struct platform_device *bcm2835_codec;
  static struct platform_device *vcsm_cma;
@@ -23,7 +21,7 @@ index 79009bd24354..45da87359cd2 100644
  
  static struct vchiq_drvdata bcm2835_drvdata = {
  	.cache_line_size = 32,
-@@ -1850,6 +1851,7 @@ static int vchiq_probe(struct platform_device *pdev)
+@@ -1869,6 +1870,7 @@ static int vchiq_probe(struct platform_d
  	bcm2835_codec = vchiq_register_child(pdev, "bcm2835-codec");
  	bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
  	bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
@@ -31,7 +29,7 @@ index 79009bd24354..45da87359cd2 100644
  
  	return 0;
  
-@@ -1861,6 +1863,7 @@ static int vchiq_probe(struct platform_device *pdev)
+@@ -1880,6 +1882,7 @@ error_exit:
  
  static int vchiq_remove(struct platform_device *pdev)
  {
@@ -39,6 +37,3 @@ index 79009bd24354..45da87359cd2 100644
  	platform_device_unregister(bcm2835_audio);
  	platform_device_unregister(bcm2835_camera);
  	platform_device_unregister(bcm2835_codec);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0234-bcm2835-dma-Add-proper-40-bit-DMA-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0224-bcm2835-dma-Add-proper-40-bit-DMA-support.patch
similarity index 90%
rename from root/target/linux/bcm27xx/patches-5.15/0234-bcm2835-dma-Add-proper-40-bit-DMA-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0224-bcm2835-dma-Add-proper-40-bit-DMA-support.patch
index 2507485f..4a511d4f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0234-bcm2835-dma-Add-proper-40-bit-DMA-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0224-bcm2835-dma-Add-proper-40-bit-DMA-support.patch
@@ -1,7 +1,7 @@
-From 9a19d132c732479cdd19cd6942e9dba9d796ca85 Mon Sep 17 00:00:00 2001
+From 3e8b86625c68d2d3a7ba594f921081fd980080b8 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Thu, 4 Apr 2019 13:33:47 +0100
-Subject: [PATCH 234/634] bcm2835-dma: Add proper 40-bit DMA support
+Subject: [PATCH 224/828] bcm2835-dma: Add proper 40-bit DMA support
 
 BCM2711 has 4 DMA channels with a 40-bit address range, allowing them
 to access the full 4GB of memory on a Pi 4.
@@ -11,8 +11,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  drivers/dma/bcm2835-dma.c | 485 ++++++++++++++++++++++++++++++++------
  1 file changed, 412 insertions(+), 73 deletions(-)
 
-diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index 87b5d0bef355..ac0458a8027f 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -38,6 +38,11 @@
@@ -181,7 +179,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  static inline size_t bcm2835_dma_max_frame_length(struct bcm2835_chan *c)
  {
  	/* lite and normal channels have different max frame length */
-@@ -207,6 +330,32 @@ static inline struct bcm2835_desc *to_bcm2835_dma_desc(
+@@ -207,6 +330,32 @@ static inline struct bcm2835_desc *to_bc
  	return container_of(t, struct bcm2835_desc, vd.tx);
  }
  
@@ -214,7 +212,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  static void bcm2835_dma_free_cb_chain(struct bcm2835_desc *desc)
  {
  	size_t i;
-@@ -225,45 +374,53 @@ static void bcm2835_dma_desc_free(struct virt_dma_desc *vd)
+@@ -225,45 +374,53 @@ static void bcm2835_dma_desc_free(struct
  }
  
  static void bcm2835_dma_create_cb_set_length(
@@ -276,12 +274,13 @@ index 87b5d0bef355..ac0458a8027f 100644
 -
 -	/* 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;
- 
--	/* add extrainfo bits in info */
--	control_block->info |= finalextrainfo;
++
 +		scb->len = cb_len;
 +		/* add extrainfo bits to ti */
 +		scb->ti |= to_bcm2711_ti(finalextrainfo);
@@ -293,7 +292,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  }
  
  static inline size_t bcm2835_dma_count_frames_for_sg(
-@@ -286,7 +443,7 @@ static inline size_t bcm2835_dma_count_frames_for_sg(
+@@ -286,7 +443,7 @@ static inline size_t bcm2835_dma_count_f
  /**
   * bcm2835_dma_create_cb_chain - create a control block and fills data in
   *
@@ -302,7 +301,7 @@ index 87b5d0bef355..ac0458a8027f 100644
   * @direction:      the direction in which we transfer
   * @cyclic:         it is a cyclic transfer
   * @info:           the default info bits to apply per controlblock
-@@ -304,12 +461,11 @@ static inline size_t bcm2835_dma_count_frames_for_sg(
+@@ -304,12 +461,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(
@@ -316,7 +315,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  	size_t len = buf_len, total_len;
  	size_t frame;
  	struct bcm2835_desc *d;
-@@ -341,11 +497,23 @@ static struct bcm2835_desc *bcm2835_dma_create_cb_chain(
+@@ -341,11 +497,23 @@ static struct bcm2835_desc *bcm2835_dma_
  
  		/* fill in the control block */
  		control_block = cb_entry->cb;
@@ -345,7 +344,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  		/* set up length in control_block if requested */
  		if (buf_len) {
  			/* calculate length honoring period_length */
-@@ -359,7 +527,11 @@ static struct bcm2835_desc *bcm2835_dma_create_cb_chain(
+@@ -359,7 +527,11 @@ static struct bcm2835_desc *bcm2835_dma_
  		}
  
  		/* link this the last controlblock */
@@ -358,7 +357,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  			d->cb_list[frame - 1].cb->next = cb_entry->paddr;
  
  		/* update src and dst and length */
-@@ -369,11 +541,21 @@ static struct bcm2835_desc *bcm2835_dma_create_cb_chain(
+@@ -369,11 +541,21 @@ static struct bcm2835_desc *bcm2835_dma_
  			dst += control_block->length;
  
  		/* Length of total transfer */
@@ -382,7 +381,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  
  	/* detect a size missmatch */
  	if (buf_len && (d->size != buf_len))
-@@ -387,13 +569,12 @@ static struct bcm2835_desc *bcm2835_dma_create_cb_chain(
+@@ -387,13 +569,12 @@ error_cb:
  }
  
  static void bcm2835_dma_fill_cb_chain_with_sg(
@@ -397,7 +396,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  	size_t len, max_len;
  	unsigned int i;
  	dma_addr_t addr;
-@@ -401,14 +582,35 @@ static void bcm2835_dma_fill_cb_chain_with_sg(
+@@ -401,14 +582,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) {
@@ -441,7 +440,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  		}
  	}
  }
-@@ -417,6 +619,10 @@ static void bcm2835_dma_abort(struct bcm2835_chan *c)
+@@ -417,6 +619,10 @@ static void bcm2835_dma_abort(struct bcm
  {
  	void __iomem *chan_base = c->chan_base;
  	long int timeout = 10000;
@@ -452,7 +451,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  
  	/*
  	 * A zero control block address means the channel is idle.
-@@ -429,8 +635,7 @@ static void bcm2835_dma_abort(struct bcm2835_chan *c)
+@@ -429,8 +635,7 @@ static void bcm2835_dma_abort(struct bcm
  	writel(0, chan_base + BCM2835_DMA_CS);
  
  	/* Wait for any current AXI transfer to complete */
@@ -462,7 +461,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  		cpu_relax();
  
  	/* Peripheral might be stuck and fail to signal AXI write responses */
-@@ -455,9 +660,16 @@ static void bcm2835_dma_start_desc(struct bcm2835_chan *c)
+@@ -455,9 +660,16 @@ static void bcm2835_dma_start_desc(struc
  
  	c->desc = d = to_bcm2835_dma_desc(&vd->tx);
  
@@ -482,7 +481,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  }
  
  static irqreturn_t bcm2835_dma_callback(int irq, void *data)
-@@ -484,8 +696,7 @@ static irqreturn_t bcm2835_dma_callback(int irq, void *data)
+@@ -484,8 +696,7 @@ 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.
  	 */
@@ -492,7 +491,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  	       c->chan_base + BCM2835_DMA_CS);
  
  	d = c->desc;
-@@ -588,9 +799,17 @@ static enum dma_status bcm2835_dma_tx_status(struct dma_chan *chan,
+@@ -588,9 +799,17 @@ static enum dma_status bcm2835_dma_tx_st
  		struct bcm2835_desc *d = c->desc;
  		dma_addr_t pos;
  
@@ -512,7 +511,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  			pos = readl(c->chan_base + BCM2835_DMA_DEST_AD);
  		else
  			pos = 0;
-@@ -636,7 +855,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_memcpy(
+@@ -636,7 +855,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 */
@@ -521,7 +520,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  					info, extra, frames,
  					src, dst, len, 0, GFP_KERNEL);
  	if (!d)
-@@ -671,11 +890,21 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_slave_sg(
+@@ -671,11 +890,21 @@ static struct dma_async_tx_descriptor *b
  		if (c->cfg.src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
  			return NULL;
  		src = c->cfg.src_addr;
@@ -543,7 +542,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  		info |= BCM2835_DMA_D_DREQ | BCM2835_DMA_S_INC;
  	}
  
-@@ -683,7 +912,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_slave_sg(
+@@ -683,7 +912,7 @@ static struct dma_async_tx_descriptor *b
  	frames = bcm2835_dma_count_frames_for_sg(c, sgl, sg_len);
  
  	/* allocate the CB chain */
@@ -552,7 +551,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  					info, extra,
  					frames, src, dst, 0, 0,
  					GFP_NOWAIT);
-@@ -691,7 +920,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_slave_sg(
+@@ -691,7 +920,7 @@ static struct dma_async_tx_descriptor *b
  		return NULL;
  
  	/* fill in frames with scatterlist pointers */
@@ -561,7 +560,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  					  sgl, sg_len);
  
  	return vchan_tx_prep(&c->vc, &d->vd, flags);
-@@ -745,12 +974,16 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic(
+@@ -745,12 +974,16 @@ static struct dma_async_tx_descriptor *b
  		if (c->cfg.src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
  			return NULL;
  		src = c->cfg.src_addr;
@@ -578,7 +577,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  		src = buf_addr;
  		info |= BCM2835_DMA_D_DREQ | BCM2835_DMA_S_INC;
  
-@@ -770,7 +1003,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic(
+@@ -770,7 +1003,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.
  	 */
@@ -587,7 +586,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  					info, extra,
  					frames, src, dst, buf_len,
  					period_len, GFP_NOWAIT);
-@@ -778,7 +1011,12 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic(
+@@ -778,7 +1011,12 @@ static struct dma_async_tx_descriptor *b
  		return NULL;
  
  	/* wrap around into a loop */
@@ -601,7 +600,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  
  	return vchan_tx_prep(&c->vc, &d->vd, flags);
  }
-@@ -839,9 +1077,11 @@ static int bcm2835_dma_chan_init(struct bcm2835_dmadev *d, int chan_id,
+@@ -839,9 +1077,11 @@ static int bcm2835_dma_chan_init(struct
  	c->irq_number = irq;
  	c->irq_flags = irq_flags;
  
@@ -616,7 +615,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  		c->is_lite_channel = true;
  
  	return 0;
-@@ -861,8 +1101,58 @@ static void bcm2835_dma_free(struct bcm2835_dmadev *od)
+@@ -861,8 +1101,58 @@ static void bcm2835_dma_free(struct bcm2
  			     DMA_TO_DEVICE, DMA_ATTR_SKIP_CPU_SYNC);
  }
  
@@ -676,7 +675,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  	{},
  };
  MODULE_DEVICE_TABLE(of, bcm2835_dma_of_match);
-@@ -894,6 +1184,8 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
+@@ -894,6 +1184,8 @@ static int bcm2835_dma_probe(struct plat
  	int irq_flags;
  	uint32_t chans_available;
  	char chan_name[BCM2835_DMA_CHAN_NAME_SIZE];
@@ -685,7 +684,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  
  	if (!pdev->dev.dma_mask)
  		pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
-@@ -914,9 +1206,13 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
+@@ -914,9 +1206,13 @@ static int bcm2835_dma_probe(struct plat
  	base = devm_ioremap_resource(&pdev->dev, res);
  	if (IS_ERR(base))
  		return PTR_ERR(base);
@@ -702,7 +701,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  
  	od->base = base;
  
-@@ -953,6 +1249,14 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
+@@ -953,6 +1249,14 @@ static int bcm2835_dma_probe(struct plat
  		return -ENOMEM;
  	}
  
@@ -717,7 +716,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  	/* Request DMA channel mask from device tree */
  	if (of_property_read_u32(pdev->dev.of_node,
  			"brcm,dma-channel-mask",
-@@ -962,11 +1266,34 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
+@@ -962,11 +1266,34 @@ static int bcm2835_dma_probe(struct plat
  		goto err_no_dma;
  	}
  
@@ -755,7 +754,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  		/* skip masked out channels */
  		if (!(chans_available & (1 << i))) {
  			irq[i] = -1;
-@@ -989,13 +1316,17 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
+@@ -989,13 +1316,17 @@ static int bcm2835_dma_probe(struct plat
  		irq[i] = platform_get_irq(pdev, i < 11 ? i : 11);
  	}
  
@@ -774,7 +773,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  		irq_flags = 0;
  		for (j = 0; j <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; j++)
  			if ((i != j) && (irq[j] == irq[i])) {
-@@ -1007,9 +1338,10 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
+@@ -1007,9 +1338,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;
@@ -786,7 +785,7 @@ index 87b5d0bef355..ac0458a8027f 100644
  
  	/* Device-tree DMA controller registration */
  	rc = of_dma_controller_register(pdev->dev.of_node,
-@@ -1041,6 +1373,13 @@ static int bcm2835_dma_remove(struct platform_device *pdev)
+@@ -1041,6 +1373,13 @@ static int bcm2835_dma_remove(struct pla
  
  	bcm_dmaman_remove(pdev);
  	dma_async_device_unregister(&od->ddev);
@@ -800,6 +799,3 @@ index 87b5d0bef355..ac0458a8027f 100644
  	bcm2835_dma_free(od);
  
  	return 0;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0235-media-bcm2835-unicam-Add-support-for-VIDIOC_-S-G-_SE.patch b/root/target/linux/bcm27xx/patches-5.15/950-0225-media-bcm2835-unicam-Add-support-for-VIDIOC_-S-G-_SE.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0235-media-bcm2835-unicam-Add-support-for-VIDIOC_-S-G-_SE.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0225-media-bcm2835-unicam-Add-support-for-VIDIOC_-S-G-_SE.patch
index e1adc8ad..c6fb7efa 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0235-media-bcm2835-unicam-Add-support-for-VIDIOC_-S-G-_SE.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0225-media-bcm2835-unicam-Add-support-for-VIDIOC_-S-G-_SE.patch
@@ -1,7 +1,7 @@
-From 29fd62995cd40ef899dc407079fea060e7b21ec2 Mon Sep 17 00:00:00 2001
+From 1177118ba1ac3b45eeadf794fc51f6748351bb50 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 29 Apr 2020 16:45:02 +0100
-Subject: [PATCH 235/634] media: bcm2835-unicam: Add support for
+Subject: [PATCH 225/828] media: bcm2835-unicam: Add support for
  VIDIOC_[S|G]_SELECTION
 
 Sensors are now reflecting cropping and scaling parameters through
@@ -13,11 +13,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../media/platform/bcm2835/bcm2835-unicam.c   | 44 +++++++++++++++++++
  1 file changed, 44 insertions(+)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index d4684fb2797f..0e1d525a0b35 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -1898,6 +1898,39 @@ static int unicam_g_edid(struct file *file, void *priv, struct v4l2_edid *edid)
+@@ -1898,6 +1898,39 @@ static int unicam_g_edid(struct file *fi
  	return v4l2_subdev_call(dev->sensor, pad, get_edid, edid);
  }
  
@@ -57,7 +55,7 @@ index d4684fb2797f..0e1d525a0b35 100644
  static int unicam_enum_framesizes(struct file *file, void *priv,
  				  struct v4l2_frmsizeenum *fsize)
  {
-@@ -2218,6 +2251,9 @@ static const struct v4l2_ioctl_ops unicam_ioctl_ops = {
+@@ -2218,6 +2251,9 @@ static const struct v4l2_ioctl_ops unica
  	.vidioc_enum_framesizes		= unicam_enum_framesizes,
  	.vidioc_enum_frameintervals	= unicam_enum_frameintervals,
  
@@ -67,7 +65,7 @@ index d4684fb2797f..0e1d525a0b35 100644
  	.vidioc_g_parm			= unicam_g_parm,
  	.vidioc_s_parm			= unicam_s_parm,
  
-@@ -2446,6 +2482,14 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2446,6 +2482,14 @@ static int register_node(struct unicam_d
  	    !v4l2_subdev_has_op(unicam->sensor, pad, enum_frame_size))
  		v4l2_disable_ioctl(&node->video_dev, VIDIOC_ENUM_FRAMESIZES);
  
@@ -82,6 +80,3 @@ index d4684fb2797f..0e1d525a0b35 100644
  	ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
  	if (ret) {
  		unicam_err(unicam, "Unable to register video device.\n");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0236-media-bcm2835-unicam-Do-not-stop-streaming-in-unicam.patch b/root/target/linux/bcm27xx/patches-5.15/950-0226-media-bcm2835-unicam-Do-not-stop-streaming-in-unicam.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0236-media-bcm2835-unicam-Do-not-stop-streaming-in-unicam.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0226-media-bcm2835-unicam-Do-not-stop-streaming-in-unicam.patch
index 13602af9..b25c51ab 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0236-media-bcm2835-unicam-Do-not-stop-streaming-in-unicam.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0226-media-bcm2835-unicam-Do-not-stop-streaming-in-unicam.patch
@@ -1,7 +1,7 @@
-From ca61129542c7cf2d86589251548eb41dd172f9ae Mon Sep 17 00:00:00 2001
+From bdcea74a84a4d8ca59a83cb09ec4275610448630 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 29 Apr 2020 22:05:09 +0100
-Subject: [PATCH 236/634] media: bcm2835-unicam: Do not stop streaming in
+Subject: [PATCH 226/828] media: bcm2835-unicam: Do not stop streaming in
  unicam_release
 
 unicam_release calls _vb2_fop_release, which will call stop_streaming
@@ -14,11 +14,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 3 ---
  1 file changed, 3 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 0e1d525a0b35..c7e211d04ed3 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -2204,9 +2204,6 @@ static int unicam_release(struct file *file)
+@@ -2204,9 +2204,6 @@ static int unicam_release(struct file *f
  	if (fh_singular)
  		v4l2_subdev_call(sd, core, s_power, 0);
  
@@ -28,6 +26,3 @@ index 0e1d525a0b35..c7e211d04ed3 100644
  	node->open--;
  	mutex_unlock(&node->lock);
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0237-media-bcm2835-unicam-Fix-reference-counting-in-unica.patch b/root/target/linux/bcm27xx/patches-5.15/950-0227-media-bcm2835-unicam-Fix-reference-counting-in-unica.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0237-media-bcm2835-unicam-Fix-reference-counting-in-unica.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0227-media-bcm2835-unicam-Fix-reference-counting-in-unica.patch
index c8fbb21f..0d7fe21c 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0237-media-bcm2835-unicam-Fix-reference-counting-in-unica.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0227-media-bcm2835-unicam-Fix-reference-counting-in-unica.patch
@@ -1,7 +1,7 @@
-From adbb3ce2d7af228db346909bb321174e238ebafe Mon Sep 17 00:00:00 2001
+From d2bd297666eabcc351bab79ced0dc4e8ff0d74ff Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 30 Apr 2020 09:52:50 +0100
-Subject: [PATCH 237/634] media: bcm2835-unicam: Fix reference counting in
+Subject: [PATCH 227/828] media: bcm2835-unicam: Fix reference counting in
  unicam_open
 
 The reference counting of node->open was only incremented after
@@ -14,11 +14,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index c7e211d04ed3..a79fc4d99d36 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -2170,16 +2170,18 @@ static int unicam_open(struct file *file)
+@@ -2170,16 +2170,18 @@ static int unicam_open(struct file *file
  		goto unlock;
  	}
  
@@ -38,6 +36,3 @@ index c7e211d04ed3..a79fc4d99d36 100644
  	ret = 0;
  
  unlock:
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0238-media-i2c-tc358743-Fix-fallthrough-warning.patch b/root/target/linux/bcm27xx/patches-5.15/950-0228-media-i2c-tc358743-Fix-fallthrough-warning.patch
similarity index 60%
rename from root/target/linux/bcm27xx/patches-5.15/0238-media-i2c-tc358743-Fix-fallthrough-warning.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0228-media-i2c-tc358743-Fix-fallthrough-warning.patch
index 5f1d5a43..b8d24c68 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0238-media-i2c-tc358743-Fix-fallthrough-warning.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0228-media-i2c-tc358743-Fix-fallthrough-warning.patch
@@ -1,18 +1,16 @@
-From 63f5efed800c66b968c46fd061b442e2d09c2cad Mon Sep 17 00:00:00 2001
+From 7f67a057d1f44fd4faedf5649419b438fa26f596 Mon Sep 17 00:00:00 2001
 From: Jacko Dirks <jdirks.linuxdev@gmail.com>
 Date: Tue, 5 May 2020 14:28:14 +0200
-Subject: [PATCH 238/634] media: i2c: tc358743: Fix fallthrough warning
+Subject: [PATCH 228/828] media: i2c: tc358743: Fix fallthrough warning
 
 Signed-off-by: Jacko Dirks <jdirks.linuxdev@gmail.com>
 ---
  drivers/media/i2c/tc358743.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
-index 69f2d676448e..2985dd9e46cd 100644
 --- a/drivers/media/i2c/tc358743.c
 +++ b/drivers/media/i2c/tc358743.c
-@@ -2006,6 +2006,7 @@ static int tc358743_probe_of(struct tc358743_state *state)
+@@ -2006,6 +2006,7 @@ static int tc358743_probe_of(struct tc35
  	switch (bps_pr_lane) {
  	default:
  		dev_warn(dev, "untested bps per lane: %u bps\n", bps_pr_lane);
@@ -20,6 +18,3 @@ index 69f2d676448e..2985dd9e46cd 100644
  	case 594000000U:
  		state->pdata.lineinitcnt = 0xe80;
  		state->pdata.lptxtimecnt = 0x003;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0239-media-bcm2835-unicam-Fix-uninitialized-warning.patch b/root/target/linux/bcm27xx/patches-5.15/950-0229-media-bcm2835-unicam-Fix-uninitialized-warning.patch
similarity index 58%
rename from root/target/linux/bcm27xx/patches-5.15/0239-media-bcm2835-unicam-Fix-uninitialized-warning.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0229-media-bcm2835-unicam-Fix-uninitialized-warning.patch
index 0e8d2d21..f501ba46 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0239-media-bcm2835-unicam-Fix-uninitialized-warning.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0229-media-bcm2835-unicam-Fix-uninitialized-warning.patch
@@ -1,18 +1,16 @@
-From afa0a128d810a9c987f48234d3989f158ecf9937 Mon Sep 17 00:00:00 2001
+From eee7a1da77f41106ba256bd72a63d1e6c2c78b94 Mon Sep 17 00:00:00 2001
 From: Jacko Dirks <jdirks.linuxdev@gmail.com>
 Date: Tue, 5 May 2020 14:33:31 +0200
-Subject: [PATCH 239/634] media: bcm2835: unicam: Fix uninitialized warning
+Subject: [PATCH 229/828] media: bcm2835: unicam: Fix uninitialized warning
 
 Signed-off-by: Jacko Dirks <jdirks.linuxdev@gmail.com>
 ---
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index a79fc4d99d36..92e5deb4c6fd 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -1001,7 +1001,7 @@ const struct unicam_fmt *get_first_supported_format(struct unicam_device *dev)
+@@ -1001,7 +1001,7 @@ const struct unicam_fmt *get_first_suppo
  {
  	struct v4l2_subdev_mbus_code_enum mbus_code;
  	const struct unicam_fmt *fmt = NULL;
@@ -21,6 +19,3 @@ index a79fc4d99d36..92e5deb4c6fd 100644
  	int j;
  
  	for (j = 0; ret != -EINVAL && ret != -ENOIOCTLCMD; ++j) {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0240-video-bcm2708_fb-Disable-FB-if-no-displays-found.patch b/root/target/linux/bcm27xx/patches-5.15/950-0230-video-bcm2708_fb-Disable-FB-if-no-displays-found.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0240-video-bcm2708_fb-Disable-FB-if-no-displays-found.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0230-video-bcm2708_fb-Disable-FB-if-no-displays-found.patch
index 4c674bbd..42eff5ac 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0240-video-bcm2708_fb-Disable-FB-if-no-displays-found.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0230-video-bcm2708_fb-Disable-FB-if-no-displays-found.patch
@@ -1,7 +1,7 @@
-From 1c0089c2268f72f53e513f1cc81ef0b898824bcc Mon Sep 17 00:00:00 2001
+From 2d19332d93b7739e51e4e641b485f3064aa90c8a Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Tue, 5 May 2020 19:45:41 +0100
-Subject: [PATCH 240/634] video: bcm2708_fb: Disable FB if no displays found
+Subject: [PATCH 230/828] video: bcm2708_fb: Disable FB if no displays found
 
 If the firmware hasn't detected a display, the driver would assume
 one display was available, but because it had failed to retrieve the
@@ -17,11 +17,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/video/fbdev/bcm2708_fb.c | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c
-index 17e9260655e4..dac5c021ce52 100644
 --- a/drivers/video/fbdev/bcm2708_fb.c
 +++ b/drivers/video/fbdev/bcm2708_fb.c
-@@ -1092,10 +1092,9 @@ static int bcm2708_fb_probe(struct platform_device *dev)
+@@ -1092,10 +1092,9 @@ static int bcm2708_fb_probe(struct platf
  	 * set one display
  	 */
  	if (ret || num_displays == 0) {
@@ -34,6 +32,3 @@ index 17e9260655e4..dac5c021ce52 100644
  	} else {
  		fbdev->firmware_supports_multifb = 1;
  	}
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0241-dt-bindings-media-i2c-Add-IMX477-CMOS-sensor-binding.patch b/root/target/linux/bcm27xx/patches-5.15/950-0231-dt-bindings-media-i2c-Add-IMX477-CMOS-sensor-binding.patch
similarity index 91%
rename from root/target/linux/bcm27xx/patches-5.15/0241-dt-bindings-media-i2c-Add-IMX477-CMOS-sensor-binding.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0231-dt-bindings-media-i2c-Add-IMX477-CMOS-sensor-binding.patch
index e3202c02..a27f6d42 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0241-dt-bindings-media-i2c-Add-IMX477-CMOS-sensor-binding.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0231-dt-bindings-media-i2c-Add-IMX477-CMOS-sensor-binding.patch
@@ -1,7 +1,7 @@
-From bccf3df3736ff4d27ead15803ff595de53271d13 Mon Sep 17 00:00:00 2001
+From d2354a9d6fec42208eb71b4bd69edd98646e9b94 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Thu, 7 May 2020 15:50:54 +0100
-Subject: [PATCH 241/634] dt-bindings: media: i2c: Add IMX477 CMOS sensor
+Subject: [PATCH 231/828] dt-bindings: media: i2c: Add IMX477 CMOS sensor
  binding
 
 Add YAML device tree binding for IMX477 CMOS image sensor.
@@ -12,9 +12,6 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 113 insertions(+)
  create mode 100644 Documentation/devicetree/bindings/media/i2c/imx477.yaml
 
-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 @@
@@ -131,6 +128,3 @@ index 000000000000..0994e13e67f6
 +    };
 +
 +...
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0242-media-bcm2835-unicam-Always-service-interrupts.patch b/root/target/linux/bcm27xx/patches-5.15/950-0232-media-bcm2835-unicam-Always-service-interrupts.patch
similarity index 75%
rename from root/target/linux/bcm27xx/patches-5.15/0242-media-bcm2835-unicam-Always-service-interrupts.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0232-media-bcm2835-unicam-Always-service-interrupts.patch
index ca15ffcb..4853f73d 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0242-media-bcm2835-unicam-Always-service-interrupts.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0232-media-bcm2835-unicam-Always-service-interrupts.patch
@@ -1,7 +1,7 @@
-From b9654e991c61643e2aac8525c7d0baceade29133 Mon Sep 17 00:00:00 2001
+From 4855155d32ac204d85c8f16c494e8bb8c70a7c83 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 13 May 2020 18:28:27 +0100
-Subject: [PATCH 242/634] media: bcm2835-unicam: Always service interrupts
+Subject: [PATCH 232/828] media: bcm2835-unicam: Always service interrupts
 
 From when bringing up the driver, there was a check in the isr
 to ignore interrupts (claiming them handled) should the driver
@@ -18,11 +18,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 15 ---------------
  1 file changed, 15 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 92e5deb4c6fd..52a534d932bf 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -766,12 +766,6 @@ static int unicam_all_nodes_streaming(struct unicam_device *dev)
+@@ -766,12 +766,6 @@ static int unicam_all_nodes_streaming(st
  	return ret;
  }
  
@@ -35,7 +33,7 @@ index 92e5deb4c6fd..52a534d932bf 100644
  static void unicam_queue_event_sof(struct unicam_device *unicam)
  {
  	struct v4l2_event event = {
-@@ -801,15 +795,6 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -801,15 +795,6 @@ static irqreturn_t unicam_isr(int irq, v
  	u64 ts;
  	int i;
  
@@ -51,6 +49,3 @@ index 92e5deb4c6fd..52a534d932bf 100644
  	sta = reg_read(cfg, UNICAM_STA);
  	/* Write value back to clear the interrupts */
  	reg_write(cfg, UNICAM_STA, sta);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0243-sc16is7xx-Fix-for-hardware-flow-control.patch b/root/target/linux/bcm27xx/patches-5.15/950-0233-sc16is7xx-Fix-for-hardware-flow-control.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0243-sc16is7xx-Fix-for-hardware-flow-control.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0233-sc16is7xx-Fix-for-hardware-flow-control.patch
index e551a6e0..efe60334 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0243-sc16is7xx-Fix-for-hardware-flow-control.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0233-sc16is7xx-Fix-for-hardware-flow-control.patch
@@ -1,7 +1,7 @@
-From a78c7abb44150cf2e63d42867df0d62e64661eea Mon Sep 17 00:00:00 2001
+From 665e0c3a2b5f8dff0c037f02ca6b62772dcdaa15 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Wed, 13 May 2020 20:10:15 +0100
-Subject: [PATCH 243/634] sc16is7xx: Fix for hardware flow control
+Subject: [PATCH 233/828] sc16is7xx: Fix for hardware flow control
 
 The SC16IS7XX hardware flow control is mishandled by the driver in
 a number of ways:
@@ -24,11 +24,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/tty/serial/sc16is7xx.c | 14 ++++++++++----
  1 file changed, 10 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
-index f8adcb68c409..2836fc22b1d4 100644
 --- a/drivers/tty/serial/sc16is7xx.c
 +++ b/drivers/tty/serial/sc16is7xx.c
-@@ -523,8 +523,9 @@ static int sc16is7xx_set_baud(struct uart_port *port, int baud)
+@@ -523,8 +523,9 @@ static int sc16is7xx_set_baud(struct uar
  
  	/* Enable enhanced features */
  	regcache_cache_bypass(s->regmap, true);
@@ -40,7 +38,7 @@ index f8adcb68c409..2836fc22b1d4 100644
  	regcache_cache_bypass(s->regmap, false);
  
  	/* Put LCR back to the normal mode */
-@@ -839,7 +840,7 @@ static unsigned int sc16is7xx_get_mctrl(struct uart_port *port)
+@@ -842,7 +843,7 @@ static unsigned int sc16is7xx_get_mctrl(
  	/* DCD and DSR are not wired and CTS/RTS is handled automatically
  	 * so just indicate DSR and CAR asserted
  	 */
@@ -49,7 +47,7 @@ index f8adcb68c409..2836fc22b1d4 100644
  }
  
  static void sc16is7xx_set_mctrl(struct uart_port *port, unsigned int mctrl)
-@@ -926,14 +927,19 @@ static void sc16is7xx_set_termios(struct uart_port *port,
+@@ -929,14 +930,19 @@ static void sc16is7xx_set_termios(struct
  	regcache_cache_bypass(s->regmap, true);
  	sc16is7xx_port_write(port, SC16IS7XX_XON1_REG, termios->c_cc[VSTART]);
  	sc16is7xx_port_write(port, SC16IS7XX_XOFF1_REG, termios->c_cc[VSTOP]);
@@ -70,6 +68,3 @@ index f8adcb68c409..2836fc22b1d4 100644
  	sc16is7xx_port_write(port, SC16IS7XX_EFR_REG, flow);
  	regcache_cache_bypass(s->regmap, false);
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0244-staging-vc04_services-mmal-vchiq-Update-parameters-l.patch b/root/target/linux/bcm27xx/patches-5.15/950-0234-staging-vc04_services-mmal-vchiq-Update-parameters-l.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0244-staging-vc04_services-mmal-vchiq-Update-parameters-l.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0234-staging-vc04_services-mmal-vchiq-Update-parameters-l.patch
index aa5527ae..c514d994 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0244-staging-vc04_services-mmal-vchiq-Update-parameters-l.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0234-staging-vc04_services-mmal-vchiq-Update-parameters-l.patch
@@ -1,7 +1,7 @@
-From 5109f89b692276d7ac36d42959ed7563203154fe Mon Sep 17 00:00:00 2001
+From c8d96de559662047e3ca6eceff890a94445b282f Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 15 May 2020 13:42:10 +0100
-Subject: [PATCH 244/634] staging: vc04_services: mmal-vchiq: Update parameters
+Subject: [PATCH 234/828] staging: vc04_services: mmal-vchiq: Update parameters
  list
 
 Adds in a couple of new MMAL parameter defines.
@@ -11,8 +11,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  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 27bafc5f01d2..89059bca0b77 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 @@ -612,6 +612,12 @@ enum mmal_parameter_video_type {
@@ -28,6 +26,3 @@ index 27bafc5f01d2..89059bca0b77 100644
  };
  
  /** Valid mirror modes */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0245-staging-vc04_services-bcm2835-camera-Request-headers.patch b/root/target/linux/bcm27xx/patches-5.15/950-0235-staging-vc04_services-bcm2835-camera-Request-headers.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0245-staging-vc04_services-bcm2835-camera-Request-headers.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0235-staging-vc04_services-bcm2835-camera-Request-headers.patch
index 104cc234..73d5731b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0245-staging-vc04_services-bcm2835-camera-Request-headers.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0235-staging-vc04_services-bcm2835-camera-Request-headers.patch
@@ -1,7 +1,7 @@
-From 8cd8ec2a5d671ffcf19f5271a2198ed3ba84ddcb Mon Sep 17 00:00:00 2001
+From c1fa65117abad264bb8c697f014b636fd5863df0 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 15 May 2020 13:48:59 +0100
-Subject: [PATCH 245/634] staging:vc04_services: bcm2835-camera: Request
+Subject: [PATCH 235/828] staging:vc04_services: bcm2835-camera: Request
  headers with I-frame
 
 V4L2 wishes to have the codec header bytes in the same buffer as the
@@ -13,11 +13,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../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 1b184d5c6b82..6b348e399c06 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-@@ -1734,6 +1734,12 @@ static int mmal_init(struct bm2835_mmal_dev *dev)
+@@ -1734,6 +1734,12 @@ static int mmal_init(struct bm2835_mmal_
  					      MMAL_PARAMETER_MINIMISE_FRAGMENTATION,
  					      &enable,
  					      sizeof(enable));
@@ -30,6 +28,3 @@ index 1b184d5c6b82..6b348e399c06 100644
  	}
  	ret = bm2835_mmal_set_all_camera_controls(dev);
  	if (ret < 0) {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0246-media-bcm2835-unicam-Retain-packing-information-on-G.patch b/root/target/linux/bcm27xx/patches-5.15/950-0236-media-bcm2835-unicam-Retain-packing-information-on-G.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0246-media-bcm2835-unicam-Retain-packing-information-on-G.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0236-media-bcm2835-unicam-Retain-packing-information-on-G.patch
index 41093ea8..5eb97eb5 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0246-media-bcm2835-unicam-Retain-packing-information-on-G.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0236-media-bcm2835-unicam-Retain-packing-information-on-G.patch
@@ -1,7 +1,7 @@
-From fb6a8f536e6e0374a9feacc554dea1b73080339f Mon Sep 17 00:00:00 2001
+From ed07f6c8df98216c634d209400a33198c75f442a Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 19 May 2020 11:46:47 +0100
-Subject: [PATCH 246/634] media: bcm2835-unicam: Retain packing information on
+Subject: [PATCH 236/828] media: bcm2835-unicam: Retain packing information on
  G_FMT
 
 The change to retrieve the pixel format always on g_fmt didn't
@@ -18,11 +18,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../media/platform/bcm2835/bcm2835-unicam.c   | 19 +++++++++++++++++--
  1 file changed, 17 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 52a534d932bf..b32b2d33a4e2 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -974,8 +974,23 @@ static int unicam_g_fmt_vid_cap(struct file *file, void *priv,
+@@ -974,8 +974,23 @@ static int unicam_g_fmt_vid_cap(struct f
  	if (!fmt)
  		return -EINVAL;
  
@@ -48,6 +46,3 @@ index 52a534d932bf..b32b2d33a4e2 100644
  	*f = node->v_fmt;
  
  	return 0;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0247-zswap-Defer-zswap-initialisation.patch b/root/target/linux/bcm27xx/patches-5.15/950-0237-zswap-Defer-zswap-initialisation.patch
similarity index 85%
rename from root/target/linux/bcm27xx/patches-5.15/0247-zswap-Defer-zswap-initialisation.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0237-zswap-Defer-zswap-initialisation.patch
index e65c5578..bdfe5460 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0247-zswap-Defer-zswap-initialisation.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0237-zswap-Defer-zswap-initialisation.patch
@@ -1,7 +1,7 @@
-From a7633aee0a5e8cf5c05997403b43621b8d339eeb Mon Sep 17 00:00:00 2001
+From 82da79ba4a9c7c9d813575150665f426f5bf84fb Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Tue, 5 May 2020 15:23:32 +0100
-Subject: [PATCH 247/634] zswap: Defer zswap initialisation
+Subject: [PATCH 237/828] zswap: Defer zswap initialisation
 
 Enabling zswap support in the kernel configuration costs about 1.5MB
 of RAM, even when zswap is not enabled at runtime. This cost can be
@@ -18,11 +18,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  mm/zswap.c | 53 +++++++++++++++++++++++++++++------------------------
  1 file changed, 29 insertions(+), 24 deletions(-)
 
-diff --git a/mm/zswap.c b/mm/zswap.c
-index 7944e3e57e78..4719af5f27fe 100644
 --- a/mm/zswap.c
 +++ b/mm/zswap.c
-@@ -648,8 +648,9 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor)
+@@ -648,8 +648,9 @@ error:
  	return NULL;
  }
  
@@ -33,7 +31,7 @@ index 7944e3e57e78..4719af5f27fe 100644
  	bool has_comp, has_zpool;
  
  	has_comp = crypto_has_acomp(zswap_compressor, 0, 0);
-@@ -685,9 +686,21 @@ static __init struct zswap_pool *__zswap_pool_create_fallback(void)
+@@ -685,9 +686,21 @@ static __init struct zswap_pool *__zswap
  	}
  
  	if (!has_comp || !has_zpool)
@@ -57,7 +55,7 @@ index 7944e3e57e78..4719af5f27fe 100644
  }
  
  static void zswap_pool_destroy(struct zswap_pool *pool)
-@@ -860,16 +873,19 @@ static int zswap_zpool_param_set(const char *val,
+@@ -860,16 +873,19 @@ static int zswap_zpool_param_set(const c
  static int zswap_enabled_param_set(const char *val,
  				   const struct kernel_param *kp)
  {
@@ -82,7 +80,7 @@ index 7944e3e57e78..4719af5f27fe 100644
  }
  
  /*********************************
-@@ -1436,7 +1452,6 @@ static int __init zswap_debugfs_init(void)
+@@ -1436,7 +1452,6 @@ static int __init zswap_debugfs_init(voi
  **********************************/
  static int __init init_zswap(void)
  {
@@ -125,6 +123,3 @@ index 7944e3e57e78..4719af5f27fe 100644
  hp_fail:
  	cpuhp_remove_state(CPUHP_MM_ZSWP_MEM_PREPARE);
  dstmem_fail:
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0248-media-bcm2835-unicam-change-minimum-number-of-vb2_qu.patch b/root/target/linux/bcm27xx/patches-5.15/950-0238-media-bcm2835-unicam-change-minimum-number-of-vb2_qu.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0248-media-bcm2835-unicam-change-minimum-number-of-vb2_qu.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0238-media-bcm2835-unicam-change-minimum-number-of-vb2_qu.patch
index 20d748f9..1646b03c 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0248-media-bcm2835-unicam-change-minimum-number-of-vb2_qu.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0238-media-bcm2835-unicam-change-minimum-number-of-vb2_qu.patch
@@ -1,7 +1,7 @@
-From 68fddd0f12feaed8be4d54ac8f857d61df0b0b39 Mon Sep 17 00:00:00 2001
+From 787a639203bd8adc231e9248892fc0209936e582 Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Thu, 28 May 2020 11:09:48 +0100
-Subject: [PATCH 248/634] media: bcm2835-unicam: change minimum number of
+Subject: [PATCH 238/828] media: bcm2835-unicam: change minimum number of
  vb2_queue buffers to 1
 
 Since the unicam driver was modified to write to a dummy buffer when no
@@ -15,11 +15,9 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index b32b2d33a4e2..e76323af0952 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -2404,7 +2404,7 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2404,7 +2404,7 @@ static int register_node(struct unicam_d
  	q->buf_struct_size = sizeof(struct unicam_buffer);
  	q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
  	q->lock = &node->lock;
@@ -28,6 +26,3 @@ index b32b2d33a4e2..e76323af0952 100644
  	q->dev = &unicam->pdev->dev;
  
  	ret = vb2_queue_init(q);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0250-snd_bcm2835-disable-HDMI-audio-when-vc4-is-used-3640.patch b/root/target/linux/bcm27xx/patches-5.15/950-0239-snd_bcm2835-disable-HDMI-audio-when-vc4-is-used-3640.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0250-snd_bcm2835-disable-HDMI-audio-when-vc4-is-used-3640.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0239-snd_bcm2835-disable-HDMI-audio-when-vc4-is-used-3640.patch
index 539f92e6..3d8eda11 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0250-snd_bcm2835-disable-HDMI-audio-when-vc4-is-used-3640.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0239-snd_bcm2835-disable-HDMI-audio-when-vc4-is-used-3640.patch
@@ -1,7 +1,7 @@
-From 3e390a38f29f48f8f2addc9710184ea03ea185cc Mon Sep 17 00:00:00 2001
+From 1be28b65180d3813010be470dfc450fb81fd2205 Mon Sep 17 00:00:00 2001
 From: Hristo Venev <hristo@venev.name>
 Date: Fri, 5 Jun 2020 09:22:49 +0000
-Subject: [PATCH 250/634] snd_bcm2835: disable HDMI audio when vc4 is used
+Subject: [PATCH 239/828] snd_bcm2835: disable HDMI audio when vc4 is used
  (#3640)
 
 Things don't work too well when both the vc4 driver and the firmware
@@ -18,11 +18,9 @@ Signed-off-by: Hristo Venev <hristo@venev.name>
  drivers/staging/vc04_services/bcm2835-audio/bcm2835.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-index f926784c622d..31968fec297f 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-@@ -381,7 +381,9 @@ static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
+@@ -381,7 +381,9 @@ static int snd_bcm2835_alsa_probe(struct
  	}
  
  	if (!enable_compat_alsa) {
@@ -33,6 +31,3 @@ index f926784c622d..31968fec297f 100644
  		// In this mode, always enable analog output
  		enable_headphones = true;
  	} else {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0251-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch b/root/target/linux/bcm27xx/patches-5.15/950-0240-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0251-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0240-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch
index 3a9ed6b6..b1ac49b3 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0251-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0240-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch
@@ -1,7 +1,7 @@
-From 0b18a52fbc7157a48e9e9e8d79a9e50467f8f214 Mon Sep 17 00:00:00 2001
+From 51c37ec0763368c1bd5abdf870e0e454ff858b3b Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Tue, 24 Apr 2018 14:42:27 +0100
-Subject: [PATCH 251/634] gpiolib: Don't prevent IRQ usage of output GPIOs
+Subject: [PATCH 240/828] gpiolib: Don't prevent IRQ usage of output GPIOs
 
 Upstream Linux deems using output GPIOs to generate IRQs as a bogus
 use case, even though the BCM2835 GPIO controller is capable of doing
@@ -15,8 +15,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  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 d1b9b721218f..34bac9a763ef 100644
 --- a/drivers/gpio/gpiolib.c
 +++ b/drivers/gpio/gpiolib.c
 @@ -52,6 +52,8 @@
@@ -28,7 +26,7 @@ index d1b9b721218f..34bac9a763ef 100644
  /* Device and char device-related information */
  static DEFINE_IDA(gpio_ida);
  static dev_t gpio_devt;
-@@ -2332,8 +2334,8 @@ int gpiod_direction_output(struct gpio_desc *desc, int value)
+@@ -2361,8 +2363,8 @@ int gpiod_direction_output(struct gpio_d
  		value = !!value;
  
  	/* GPIOs used for enabled IRQs shall not be set as output */
@@ -39,7 +37,7 @@ index d1b9b721218f..34bac9a763ef 100644
  		gpiod_err(desc,
  			  "%s: tried to set a GPIO tied to an IRQ as output\n",
  			  __func__);
-@@ -3141,8 +3143,8 @@ int gpiochip_lock_as_irq(struct gpio_chip *gc, unsigned int offset)
+@@ -3180,8 +3182,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 d1b9b721218f..34bac9a763ef 100644
  		chip_err(gc,
  			 "%s: tried to flag a GPIO set as output for IRQ\n",
  			 __func__);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0252-PCI-brcmstb-Add-DT-property-to-control-L1SS.patch b/root/target/linux/bcm27xx/patches-5.15/950-0241-PCI-brcmstb-Add-DT-property-to-control-L1SS.patch
similarity index 88%
rename from root/target/linux/bcm27xx/patches-5.15/0252-PCI-brcmstb-Add-DT-property-to-control-L1SS.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0241-PCI-brcmstb-Add-DT-property-to-control-L1SS.patch
index d2c2021f..7e0b2bab 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0252-PCI-brcmstb-Add-DT-property-to-control-L1SS.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0241-PCI-brcmstb-Add-DT-property-to-control-L1SS.patch
@@ -1,7 +1,7 @@
-From 1a3755601874900b451bfb71cea1ce8d9d5a3a1c Mon Sep 17 00:00:00 2001
+From 6906c2e3573fe37d90a643143020c3e66bdb095c Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Thu, 11 Jun 2020 09:57:03 +0100
-Subject: [PATCH 252/634] PCI: brcmstb: Add DT property to control L1SS
+Subject: [PATCH 241/828] PCI: brcmstb: Add DT property to control L1SS
 
 The BRCM PCIe block has controls to enable control of the CLKREQ#
 signal by the L1SS, and to gate the refclk with the CLKREQ# input.
@@ -16,8 +16,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/pci/controller/pcie-brcmstb.c | 30 ++++++++++++++++++++-------
  1 file changed, 23 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index cc30215f5a43..77967a37cbd9 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -116,8 +116,9 @@
@@ -40,7 +38,7 @@ index cc30215f5a43..77967a37cbd9 100644
  	int			gen;
  	u64			msi_target_addr;
  	struct brcm_msi		*msi;
-@@ -1033,12 +1035,25 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
+@@ -1033,12 +1035,25 @@ static int brcm_pcie_setup(struct brcm_p
  		PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1_ENDIAN_MODE_BAR2_MASK);
  	writel(tmp, base + PCIE_RC_CFG_VENDOR_VENDOR_SPECIFIC_REG1);
  
@@ -71,7 +69,7 @@ index cc30215f5a43..77967a37cbd9 100644
  	writel(tmp, base + PCIE_MISC_HARD_PCIE_HARD_DEBUG);
  
  	return 0;
-@@ -1267,6 +1282,7 @@ static int brcm_pcie_probe(struct platform_device *pdev)
+@@ -1267,6 +1282,7 @@ static int brcm_pcie_probe(struct platfo
  	pcie->gen = (ret < 0) ? 0 : ret;
  
  	pcie->ssc = of_property_read_bool(np, "brcm,enable-ssc");
@@ -79,6 +77,3 @@ index cc30215f5a43..77967a37cbd9 100644
  
  	ret = clk_prepare_enable(pcie->clk);
  	if (ret) {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0253-media-irs1125-Using-i2c_transfer-for-ic2-reads.patch b/root/target/linux/bcm27xx/patches-5.15/950-0242-media-irs1125-Using-i2c_transfer-for-ic2-reads.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0253-media-irs1125-Using-i2c_transfer-for-ic2-reads.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0242-media-irs1125-Using-i2c_transfer-for-ic2-reads.patch
index b84c636f..c415bc77 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0253-media-irs1125-Using-i2c_transfer-for-ic2-reads.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0242-media-irs1125-Using-i2c_transfer-for-ic2-reads.patch
@@ -1,7 +1,7 @@
-From 88cec5d2caabb83866ae42546971d34657501f52 Mon Sep 17 00:00:00 2001
+From 433b3181ad361e70b67536d03d1cc2a4b2086a3c Mon Sep 17 00:00:00 2001
 From: Markus Proeller <markus.proeller@pieye.org>
 Date: Tue, 16 Jun 2020 13:24:31 +0200
-Subject: [PATCH 253/634] media: irs1125: Using i2c_transfer for ic2 reads
+Subject: [PATCH 242/828] media: irs1125: Using i2c_transfer for ic2 reads
 
 Reading data over i2c is done by using i2c_transfer to ensure that this
 operation can't be interrupted.
@@ -11,11 +11,9 @@ Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
  drivers/media/i2c/irs1125.c | 37 ++++++++++++++++++++++---------------
  1 file changed, 22 insertions(+), 15 deletions(-)
 
-diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c
-index 25e1dd5a08ef..6680afea5894 100644
 --- a/drivers/media/i2c/irs1125.c
 +++ b/drivers/media/i2c/irs1125.c
-@@ -248,27 +248,34 @@ static int irs1125_write(struct v4l2_subdev *sd, u16 reg, u16 val)
+@@ -248,27 +248,34 @@ static int irs1125_write(struct v4l2_sub
  
  static int irs1125_read(struct v4l2_subdev *sd, u16 reg, u16 *val)
  {
@@ -65,6 +63,3 @@ index 25e1dd5a08ef..6680afea5894 100644
  }
  
  static int irs1125_write_array(struct v4l2_subdev *sd,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0254-media-irs1125-Refactoring-and-debug-messages.patch b/root/target/linux/bcm27xx/patches-5.15/950-0243-media-irs1125-Refactoring-and-debug-messages.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0254-media-irs1125-Refactoring-and-debug-messages.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0243-media-irs1125-Refactoring-and-debug-messages.patch
index 5727b7f9..a96c9849 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0254-media-irs1125-Refactoring-and-debug-messages.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0243-media-irs1125-Refactoring-and-debug-messages.patch
@@ -1,7 +1,7 @@
-From 41938024886d9aae3f7d95cdd341646a42fa28d5 Mon Sep 17 00:00:00 2001
+From 561f2461853713fe485c243b57e29ed127f10057 Mon Sep 17 00:00:00 2001
 From: Markus Proeller <markus.proeller@pieye.org>
 Date: Tue, 16 Jun 2020 13:27:42 +0200
-Subject: [PATCH 254/634] media: irs1125: Refactoring and debug messages
+Subject: [PATCH 243/828] media: irs1125: Refactoring and debug messages
 
 Changed some variable names to comply with checkpatch --strict mode.
 Debug messages added.
@@ -11,8 +11,6 @@ Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
  drivers/media/i2c/irs1125.c | 36 ++++++++++++++++++++----------------
  1 file changed, 20 insertions(+), 16 deletions(-)
 
-diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c
-index 6680afea5894..289f0c25b141 100644
 --- a/drivers/media/i2c/irs1125.c
 +++ b/drivers/media/i2c/irs1125.c
 @@ -15,6 +15,7 @@
@@ -67,7 +65,7 @@ index 6680afea5894..289f0c25b141 100644
  #define IRS1125_WINDOW_WIDTH_DEF	352
  
  struct regval_list {
-@@ -87,7 +89,7 @@ static inline struct irs1125 *to_state(struct v4l2_subdev *sd)
+@@ -87,7 +89,7 @@ static inline struct irs1125 *to_state(s
  	return container_of(sd, struct irs1125, sd);
  }
  
@@ -76,7 +74,7 @@ index 6680afea5894..289f0c25b141 100644
  	{0xB017, 0x0413},
  	{0xB086, 0x3535},
  	{0xB0AE, 0xEF02},
-@@ -153,7 +155,7 @@ static struct regval_list irs1125_26MHz[] = {
+@@ -153,7 +155,7 @@ static struct regval_list irs1125_26MHz[
  	{0xFFFF, 100}
  };
  
@@ -85,7 +83,7 @@ index 6680afea5894..289f0c25b141 100644
  	{0xC3A0, 0x823D},
  	{0xC3A1, 0xB13B},
  	{0xC3A2, 0x0313},
-@@ -243,6 +245,7 @@ static int irs1125_write(struct v4l2_subdev *sd, u16 reg, u16 val)
+@@ -243,6 +245,7 @@ static int irs1125_write(struct v4l2_sub
  		dev_err(&client->dev, "%s: i2c write error, reg: %x\n",
  			__func__, reg);
  
@@ -93,7 +91,7 @@ index 6680afea5894..289f0c25b141 100644
  	return ret;
  }
  
-@@ -364,8 +367,8 @@ static int __sensor_init(struct v4l2_subdev *sd)
+@@ -364,8 +367,8 @@ static int __sensor_init(struct v4l2_sub
  		cnt++;
  	}
  
@@ -104,7 +102,7 @@ index 6680afea5894..289f0c25b141 100644
  	if (ret < 0) {
  		dev_err(&client->dev, "write sensor default regs error\n");
  		return ret;
-@@ -415,8 +418,8 @@ static int __sensor_init(struct v4l2_subdev *sd)
+@@ -415,8 +418,8 @@ static int __sensor_init(struct v4l2_sub
  	}
  	release_firmware(fw);
  
@@ -115,7 +113,7 @@ index 6680afea5894..289f0c25b141 100644
  	if (ret < 0) {
  		dev_err(&client->dev, "write default sequence failed\n");
  		return ret;
-@@ -1037,6 +1040,7 @@ static int irs1125_probe(struct i2c_client *client,
+@@ -1037,6 +1040,7 @@ static int irs1125_probe(struct i2c_clie
  	}
  
  	gpio_num = desc_to_gpio(sensor->reset);
@@ -123,6 +121,3 @@ index 6680afea5894..289f0c25b141 100644
  
  	mutex_init(&sensor->lock);
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0255-media-irs1125-Atomic-access-to-imager-reconfiguratio.patch b/root/target/linux/bcm27xx/patches-5.15/950-0244-media-irs1125-Atomic-access-to-imager-reconfiguratio.patch
similarity index 93%
rename from root/target/linux/bcm27xx/patches-5.15/0255-media-irs1125-Atomic-access-to-imager-reconfiguratio.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0244-media-irs1125-Atomic-access-to-imager-reconfiguratio.patch
index 2b0084d1..cb81d0d2 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0255-media-irs1125-Atomic-access-to-imager-reconfiguratio.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0244-media-irs1125-Atomic-access-to-imager-reconfiguratio.patch
@@ -1,7 +1,7 @@
-From 86ff3d9c824ae03cc92f20a4f06825b1565fb019 Mon Sep 17 00:00:00 2001
+From a38f39915e7ffa099907c442b43996fe109bb764 Mon Sep 17 00:00:00 2001
 From: Markus Proeller <markus.proeller@pieye.org>
 Date: Tue, 16 Jun 2020 13:31:36 +0200
-Subject: [PATCH 255/634] media: irs1125: Atomic access to imager
+Subject: [PATCH 244/828] media: irs1125: Atomic access to imager
  reconfiguration
 
 Instead of changing the exposure and framerate settings for all sequences,
@@ -18,11 +18,9 @@ Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
  drivers/media/i2c/irs1125.h |  68 ++++++++---
  2 files changed, 204 insertions(+), 88 deletions(-)
 
-diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c
-index 289f0c25b141..d59e05004a03 100644
 --- a/drivers/media/i2c/irs1125.c
 +++ b/drivers/media/i2c/irs1125.c
-@@ -89,6 +89,52 @@ static inline struct irs1125 *to_state(struct v4l2_subdev *sd)
+@@ -89,6 +89,52 @@ static inline struct irs1125 *to_state(s
  	return container_of(sd, struct irs1125, sd);
  }
  
@@ -75,7 +73,7 @@ index 289f0c25b141..d59e05004a03 100644
  static struct regval_list irs1125_26mhz[] = {
  	{0xB017, 0x0413},
  	{0xB086, 0x3535},
-@@ -561,36 +607,57 @@ static int irs1125_s_ctrl(struct v4l2_ctrl *ctrl)
+@@ -561,36 +607,57 @@ static int irs1125_s_ctrl(struct v4l2_ct
  	struct irs1125 *dev = container_of(ctrl->handler,
  					struct irs1125, ctrl_handler);
  	struct i2c_client *client = v4l2_get_subdevdata(&dev->sd);
@@ -159,7 +157,7 @@ index 289f0c25b141..d59e05004a03 100644
  		break;
  	}
  	case IRS1125_CID_MOD_PLL:
-@@ -655,40 +722,40 @@ static int irs1125_s_ctrl(struct v4l2_ctrl *ctrl)
+@@ -655,40 +722,40 @@ static int irs1125_s_ctrl(struct v4l2_ct
  			}
  		}
  		break;
@@ -230,12 +228,10 @@ index 289f0c25b141..d59e05004a03 100644
  	case IRS1125_CID_NUM_SEQS:
  		err = irs1125_write(&dev->sd, 0xA88D, ctrl->val - 1);
  		if (err >= 0)
-@@ -758,19 +825,6 @@ static const struct v4l2_ctrl_config irs1125_custom_ctrls[] = {
- 		.elem_size = sizeof(u16),
- 		.dims = {sizeof(struct irs1125_mod_pll) / sizeof(u16),
+@@ -760,19 +827,6 @@ static const struct v4l2_ctrl_config irs
  			IRS1125_NUM_MOD_PLLS}
--	}, {
--		.ops = &irs1125_ctrl_ops,
+ 	}, {
+ 		.ops = &irs1125_ctrl_ops,
 -		.id = IRS1125_CID_SAFE_RECONFIG,
 -		.name = "Change exposure and pause of single seq",
 -		.type = V4L2_CTRL_TYPE_U16,
@@ -247,10 +243,12 @@ index 289f0c25b141..d59e05004a03 100644
 -		.elem_size = sizeof(u16),
 -		.dims = {sizeof(struct irs1125_illu) / sizeof(u16),
 -			IRS1125_NUM_SEQ_ENTRIES}
- 	}, {
- 		.ops = &irs1125_ctrl_ops,
+-	}, {
+-		.ops = &irs1125_ctrl_ops,
  		.id = IRS1125_CID_SEQ_CONFIG,
-@@ -900,9 +954,16 @@ static int irs1125_ctrls_init(struct irs1125 *sensor, struct device *dev)
+ 		.name = "Change sequence settings",
+ 		.type = V4L2_CTRL_TYPE_U16,
+@@ -900,9 +954,16 @@ static int irs1125_ctrls_init(struct irs
  {
  	struct v4l2_ctrl *ctrl;
  	int err, i;
@@ -269,7 +267,7 @@ index 289f0c25b141..d59e05004a03 100644
  	v4l2_ctrl_handler_init(hdl, ARRAY_SIZE(irs1125_custom_ctrls));
  
  	for (i = 0; i < ARRAY_SIZE(irs1125_custom_ctrls); i++)	{
-@@ -923,6 +984,27 @@ static int irs1125_ctrls_init(struct irs1125 *sensor, struct device *dev)
+@@ -923,6 +984,27 @@ static int irs1125_ctrls_init(struct irs
  		goto error_ctrls;
  	}
  
@@ -297,8 +295,6 @@ index 289f0c25b141..d59e05004a03 100644
  	sensor->sd.ctrl_handler = hdl;
  	return 0;
  
-diff --git a/drivers/media/i2c/irs1125.h b/drivers/media/i2c/irs1125.h
-index dccaca23aa76..96d676123d5e 100644
 --- a/drivers/media/i2c/irs1125.h
 +++ b/drivers/media/i2c/irs1125.h
 @@ -21,18 +21,57 @@
@@ -383,6 +379,3 @@ index dccaca23aa76..96d676123d5e 100644
  struct irs1125_mod_pll {
  	__u16 pllcfg1;
  	__u16 pllcfg2;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0256-media-irs1125-Keep-HW-in-sync-after-imager-reset.patch b/root/target/linux/bcm27xx/patches-5.15/950-0245-media-irs1125-Keep-HW-in-sync-after-imager-reset.patch
similarity index 89%
rename from root/target/linux/bcm27xx/patches-5.15/0256-media-irs1125-Keep-HW-in-sync-after-imager-reset.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0245-media-irs1125-Keep-HW-in-sync-after-imager-reset.patch
index bdcacaee..45821fba 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0256-media-irs1125-Keep-HW-in-sync-after-imager-reset.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0245-media-irs1125-Keep-HW-in-sync-after-imager-reset.patch
@@ -1,7 +1,7 @@
-From 10bc85c32986727748817b8d4d9002eb774aa779 Mon Sep 17 00:00:00 2001
+From c6e3e462801bfc69373874b3778848211bc575c6 Mon Sep 17 00:00:00 2001
 From: Markus Proeller <markus.proeller@pieye.org>
 Date: Tue, 16 Jun 2020 13:33:56 +0200
-Subject: [PATCH 256/634] media: irs1125: Keep HW in sync after imager reset
+Subject: [PATCH 245/828] media: irs1125: Keep HW in sync after imager reset
 
 When closing the video device, the irs1125 is put in power down state.
 To keep V4L2 ctrls and the HW in sync, v4l2_ctrl_handler_setup is
@@ -17,8 +17,6 @@ Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
  drivers/media/i2c/irs1125.c | 121 +++++++++++++++++-------------------
  1 file changed, 58 insertions(+), 63 deletions(-)
 
-diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c
-index d59e05004a03..30c3d2640386 100644
 --- a/drivers/media/i2c/irs1125.c
 +++ b/drivers/media/i2c/irs1125.c
 @@ -82,6 +82,7 @@ struct irs1125 {
@@ -29,7 +27,7 @@ index d59e05004a03..30c3d2640386 100644
  };
  
  static inline struct irs1125 *to_state(struct v4l2_subdev *sd)
-@@ -276,8 +277,7 @@ static struct regval_list irs1125_seq_cfg_init[] = {
+@@ -276,8 +277,7 @@ static struct regval_list irs1125_seq_cf
  	{0xC039, 0x0000},
  	{0xC401, 0x0002},
  
@@ -39,7 +37,7 @@ index d59e05004a03..30c3d2640386 100644
  };
  
  static int irs1125_write(struct v4l2_subdev *sd, u16 reg, u16 val)
-@@ -471,7 +471,11 @@ static int __sensor_init(struct v4l2_subdev *sd)
+@@ -471,7 +471,11 @@ static int __sensor_init(struct v4l2_sub
  		return ret;
  	}
  
@@ -52,7 +50,7 @@ index d59e05004a03..30c3d2640386 100644
  }
  
  static int irs1125_sensor_power(struct v4l2_subdev *sd, int on)
-@@ -607,8 +611,6 @@ static int irs1125_s_ctrl(struct v4l2_ctrl *ctrl)
+@@ -607,8 +611,6 @@ static int irs1125_s_ctrl(struct v4l2_ct
  	struct irs1125 *dev = container_of(ctrl->handler,
  					struct irs1125, ctrl_handler);
  	struct i2c_client *client = v4l2_get_subdevdata(&dev->sd);
@@ -61,7 +59,7 @@ index d59e05004a03..30c3d2640386 100644
  	int err = 0, i;
  
  	switch (ctrl->id) {
-@@ -660,68 +662,61 @@ static int irs1125_s_ctrl(struct v4l2_ctrl *ctrl)
+@@ -660,68 +662,61 @@ static int irs1125_s_ctrl(struct v4l2_ct
  				    ctrl->val);
  		break;
  	}
@@ -181,6 +179,3 @@ index d59e05004a03..30c3d2640386 100644
  	case IRS1125_CID_SEQ_CONFIG: {
  		struct irs1125_seq_cfg *cfg_new;
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0257-staging-bcm2835-audio-Add-missing-MODULE_ALIAS.patch b/root/target/linux/bcm27xx/patches-5.15/950-0246-staging-bcm2835-audio-Add-missing-MODULE_ALIAS.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0257-staging-bcm2835-audio-Add-missing-MODULE_ALIAS.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0246-staging-bcm2835-audio-Add-missing-MODULE_ALIAS.patch
index 30d59072..bd6d1fea 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0257-staging-bcm2835-audio-Add-missing-MODULE_ALIAS.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0246-staging-bcm2835-audio-Add-missing-MODULE_ALIAS.patch
@@ -1,7 +1,7 @@
-From 1f88c470cf3b4c3b6db0ed02c03c633abdda8ef5 Mon Sep 17 00:00:00 2001
+From 94cbe2b0a76192bb69ae6168ec0439c6367ada7b Mon Sep 17 00:00:00 2001
 From: Maxim Mikityanskiy <maxtram95@gmail.com>
 Date: Sat, 20 Jun 2020 15:40:00 +0300
-Subject: [PATCH 257/634] staging: bcm2835-audio: Add missing MODULE_ALIAS
+Subject: [PATCH 246/828] staging: bcm2835-audio: Add missing MODULE_ALIAS
 
 Commit 8353fe6f1e0f ("Revert "staging: bcm2835-audio: Drop DT
 dependency"") reverts the upstream change and makes bcm2835-audio use
@@ -21,15 +21,10 @@ Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
  drivers/staging/vc04_services/bcm2835-audio/bcm2835.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-index 31968fec297f..a0cba3823e5e 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-@@ -438,3 +438,4 @@ module_platform_driver(bcm2835_alsa_driver);
+@@ -438,3 +438,4 @@ module_platform_driver(bcm2835_alsa_driv
  MODULE_AUTHOR("Dom Cobley");
  MODULE_DESCRIPTION("Alsa driver for BCM2835 chip");
  MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:bcm2835_audio");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0258-brcmfmac-Prefer-a-ccode-from-OTP-over-nvram-file.patch b/root/target/linux/bcm27xx/patches-5.15/950-0247-brcmfmac-Prefer-a-ccode-from-OTP-over-nvram-file.patch
similarity index 86%
rename from root/target/linux/bcm27xx/patches-5.15/0258-brcmfmac-Prefer-a-ccode-from-OTP-over-nvram-file.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0247-brcmfmac-Prefer-a-ccode-from-OTP-over-nvram-file.patch
index bf750fa5..8aa70e30 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0258-brcmfmac-Prefer-a-ccode-from-OTP-over-nvram-file.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0247-brcmfmac-Prefer-a-ccode-from-OTP-over-nvram-file.patch
@@ -1,7 +1,7 @@
-From 27eb3f6f7c3928da6360101ddc41d22abef961d0 Mon Sep 17 00:00:00 2001
+From 0e585ca8be4c2e35a9fba1af88720e5a4732b5a1 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Fri, 26 Jun 2020 11:51:05 +0100
-Subject: [PATCH 258/634] brcmfmac: Prefer a ccode from OTP over nvram file
+Subject: [PATCH 247/828] brcmfmac: Prefer a ccode from OTP over nvram file
 
 Allow the nvram file to set a default ccode (regulatory domain) without
 overriding one set in OTP.
@@ -12,8 +12,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  .../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 c388d56269bc..fefa8c058350 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 c388d56269bc..fefa8c058350 100644
  #include <net/cfg80211.h>
  #include <net/netlink.h>
  #include <uapi/linux/if_arp.h>
-@@ -7508,31 +7509,45 @@ static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy,
+@@ -7508,31 +7509,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 c388d56269bc..fefa8c058350 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 0eb13e5df517..bce38ddfab9e 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 0eb13e5df517..bce38ddfab9e 100644
  /**
   * struct nvram_parser - internal info for parser.
   *
-@@ -541,10 +544,26 @@ static int brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx)
+@@ -543,10 +546,26 @@ static int brcmf_fw_request_nvram_done(c
  			goto fail;
  	}
  
@@ -131,6 +127,3 @@ index 0eb13e5df517..bce38ddfab9e 100644
  
  	if (free_bcm47xx_nvram)
  		bcm47xx_nvram_release_contents(data);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0259-drivers-media-Remove-the-downstream-version-of-bcm28.patch b/root/target/linux/bcm27xx/patches-5.15/950-0248-drivers-media-Remove-the-downstream-version-of-bcm28.patch
similarity index 99%
rename from root/target/linux/bcm27xx/patches-5.15/0259-drivers-media-Remove-the-downstream-version-of-bcm28.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0248-drivers-media-Remove-the-downstream-version-of-bcm28.patch
index fbe07733..54bce064 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0259-drivers-media-Remove-the-downstream-version-of-bcm28.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0248-drivers-media-Remove-the-downstream-version-of-bcm28.patch
@@ -1,7 +1,7 @@
-From 7728035d7358ad8f99128e7d5a9b727f73563227 Mon Sep 17 00:00:00 2001
+From 7d004a9a9e1acbe5a1c93372dcb92cbc42f45779 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 23 Jun 2020 10:05:57 +0100
-Subject: [PATCH 259/634] drivers: media: Remove the downstream version of
+Subject: [PATCH 248/828] drivers: media: Remove the downstream version of
  bcm2835-unicam
 
 About to be replaced by the upstream version.
@@ -18,9 +18,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  delete mode 100644 drivers/media/platform/bcm2835/bcm2835-unicam.c
  delete mode 100644 drivers/media/platform/bcm2835/vc4-regs-unicam.h
 
-diff --git a/drivers/media/platform/bcm2835/Kconfig b/drivers/media/platform/bcm2835/Kconfig
-deleted file mode 100644
-index 20e15147ee02..000000000000
 --- a/drivers/media/platform/bcm2835/Kconfig
 +++ /dev/null
 @@ -1,14 +0,0 @@
@@ -38,18 +35,12 @@ index 20e15147ee02..000000000000
 -
 -	   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
-deleted file mode 100644
-index a98aba03598a..000000000000
 --- a/drivers/media/platform/bcm2835/Makefile
 +++ /dev/null
 @@ -1,3 +0,0 @@
 -# Makefile for BCM2835 Unicam driver
 -
 -obj-$(CONFIG_VIDEO_BCM2835_UNICAM) += bcm2835-unicam.o
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-deleted file mode 100644
-index e76323af0952..000000000000
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ /dev/null
 @@ -1,2873 +0,0 @@
@@ -2926,9 +2917,6 @@ index e76323af0952..000000000000
 -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
-deleted file mode 100644
-index ae059a171d0f..000000000000
 --- a/drivers/media/platform/bcm2835/vc4-regs-unicam.h
 +++ /dev/null
 @@ -1,253 +0,0 @@
@@ -3185,6 +3173,3 @@ index ae059a171d0f..000000000000
 -#define UNICAM_FL1		BIT(9)
 -
 -#endif
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0260-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch b/root/target/linux/bcm27xx/patches-5.15/950-0249-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
similarity index 98%
rename from root/target/linux/bcm27xx/patches-5.15/0260-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0249-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
index b75fac19..bdd2aba1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0260-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0249-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
@@ -1,7 +1,7 @@
-From 2e13d36f35073b72d84d93721e46f8a973e05a58 Mon Sep 17 00:00:00 2001
+From af60fe428f7daec12a552ac5256fa872ca0d2219 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Mon, 4 May 2020 12:25:41 +0300
-Subject: [PATCH 260/634] media: bcm2835-unicam: Driver for CCP2/CSI2 camera
+Subject: [PATCH 249/828] media: bcm2835-unicam: Driver for CCP2/CSI2 camera
  interface
 
 Add a driver for the Unicam camera receiver block on BCM283x processors.
@@ -29,11 +29,9 @@ Reported-by: kbuild test robot <lkp@intel.com>
  create mode 100644 drivers/media/platform/bcm2835/bcm2835-unicam.c
  create mode 100644 drivers/media/platform/bcm2835/vc4-regs-unicam.h
 
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 8688aaded569..77181bae6abe 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3563,7 +3563,7 @@ M:	Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.com>
+@@ -3564,7 +3564,7 @@ M:	Raspberry Pi Kernel Maintenance <kern
  L:	linux-media@vger.kernel.org
  S:	Maintained
  F:	drivers/media/platform/bcm2835/
@@ -42,9 +40,6 @@ index 8688aaded569..77181bae6abe 100644
  
  BROADCOM BCM47XX MIPS ARCHITECTURE
  M:	Hauke Mehrtens <hauke@hauke-m.de>
-diff --git a/drivers/media/platform/bcm2835/Kconfig b/drivers/media/platform/bcm2835/Kconfig
-new file mode 100644
-index 000000000000..ec46e3ef053c
 --- /dev/null
 +++ b/drivers/media/platform/bcm2835/Kconfig
 @@ -0,0 +1,15 @@
@@ -63,18 +58,12 @@ index 000000000000..ec46e3ef053c
 +
 +	  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..a98aba03598a
 --- /dev/null
 +++ b/drivers/media/platform/bcm2835/Makefile
 @@ -0,0 +1,3 @@
 +# Makefile for BCM2835 Unicam driver
 +
 +obj-$(CONFIG_VIDEO_BCM2835_UNICAM) += bcm2835-unicam.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..2e9387cbc1e0
 --- /dev/null
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -0,0 +1,2825 @@
@@ -2903,9 +2892,6 @@ index 000000000000..2e9387cbc1e0
 +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 @@
@@ -3162,6 +3148,3 @@ index 000000000000..ae059a171d0f
 +#define UNICAM_FL1		BIT(9)
 +
 +#endif
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0261-media-bcm2835-unicam-Add-support-for-get_mbus_config.patch b/root/target/linux/bcm27xx/patches-5.15/950-0250-media-bcm2835-unicam-Add-support-for-get_mbus_config.patch
similarity index 84%
rename from root/target/linux/bcm27xx/patches-5.15/0261-media-bcm2835-unicam-Add-support-for-get_mbus_config.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0250-media-bcm2835-unicam-Add-support-for-get_mbus_config.patch
index 0b24cf2d..2013301a 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0261-media-bcm2835-unicam-Add-support-for-get_mbus_config.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0250-media-bcm2835-unicam-Add-support-for-get_mbus_config.patch
@@ -1,7 +1,7 @@
-From 29a850685bb7616e7f2a6e3797e69fb57a6beb4e Mon Sep 17 00:00:00 2001
+From edfca11d9de1480d4a9653f42ec521723bba377e Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 23 Jun 2020 14:32:51 +0100
-Subject: [PATCH 261/634] media: bcm2835-unicam: Add support for
+Subject: [PATCH 250/828] media: bcm2835-unicam: Add support for
  get_mbus_config to set num lanes
 
 Use the get_mbus_config pad subdev call to allow a source to use
@@ -12,11 +12,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../media/platform/bcm2835/bcm2835-unicam.c   | 31 ++++++++++++++++---
  1 file changed, 27 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 2e9387cbc1e0..9adfb2d217af 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -1639,12 +1639,35 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -1639,12 +1639,35 @@ static int unicam_start_streaming(struct
  		goto err_streaming;
  	}
  
@@ -56,6 +54,3 @@ index 2e9387cbc1e0..9adfb2d217af 100644
  	ret = clk_set_rate(dev->clock, 100 * 1000 * 1000);
  	if (ret) {
  		unicam_err(dev, "failed to set up clock\n");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0262-media-bcm2835-unicam-Avoid-gcc-warning-over-0-on-end.patch b/root/target/linux/bcm27xx/patches-5.15/950-0251-media-bcm2835-unicam-Avoid-gcc-warning-over-0-on-end.patch
similarity index 68%
rename from root/target/linux/bcm27xx/patches-5.15/0262-media-bcm2835-unicam-Avoid-gcc-warning-over-0-on-end.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0251-media-bcm2835-unicam-Avoid-gcc-warning-over-0-on-end.patch
index f6f284f6..db544302 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0262-media-bcm2835-unicam-Avoid-gcc-warning-over-0-on-end.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0251-media-bcm2835-unicam-Avoid-gcc-warning-over-0-on-end.patch
@@ -1,7 +1,7 @@
-From e2e3dbdc0ab710902a6886b8cad5803e03949e07 Mon Sep 17 00:00:00 2001
+From a7785ffbb26519f0250027ec0c4a9e00941d2b08 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 26 Jun 2020 15:53:44 +0100
-Subject: [PATCH 262/634] media: bcm2835-unicam: Avoid gcc warning over {0} on
+Subject: [PATCH 251/828] media: bcm2835-unicam: Avoid gcc warning over {0} on
  endpoint
 
 Older gcc versions object to = { 0 } initialisation if the first
@@ -14,11 +14,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 9adfb2d217af..a65e1da55142 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -2586,7 +2586,7 @@ static const struct v4l2_async_notifier_operations unicam_async_ops = {
+@@ -2586,7 +2586,7 @@ static const struct v4l2_async_notifier_
  static int of_unicam_connect_subdevs(struct unicam_device *dev)
  {
  	struct platform_device *pdev = dev->pdev;
@@ -27,6 +25,3 @@ index 9adfb2d217af..a65e1da55142 100644
  	struct device_node *ep_node;
  	struct device_node *sensor_node;
  	unsigned int lane;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0263-media-i2c-imx290-set-the-format-before-VIDIOC_SUBDEV.patch b/root/target/linux/bcm27xx/patches-5.15/950-0252-media-i2c-imx290-set-the-format-before-VIDIOC_SUBDEV.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0263-media-i2c-imx290-set-the-format-before-VIDIOC_SUBDEV.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0252-media-i2c-imx290-set-the-format-before-VIDIOC_SUBDEV.patch
index 2f1c49a0..d5cf0163 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0263-media-i2c-imx290-set-the-format-before-VIDIOC_SUBDEV.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0252-media-i2c-imx290-set-the-format-before-VIDIOC_SUBDEV.patch
@@ -1,7 +1,7 @@
-From 747d384b2930f8c5a9848d1b3c82a4c20eabcf74 Mon Sep 17 00:00:00 2001
+From ad5af1b10a777ba456e48af615a16c6fe0d2be0b Mon Sep 17 00:00:00 2001
 From: Andrey Konovalov <andrey.konovalov@linaro.org>
 Date: Fri, 12 Jun 2020 15:53:46 +0200
-Subject: [PATCH 263/634] media: i2c: imx290: set the format before
+Subject: [PATCH 252/828] media: i2c: imx290: set the format before
  VIDIOC_SUBDEV_G_FMT is called
 
 Commit d46cfdc86c30d5ec768924f0b1e2683c8d20b671 upstream.
@@ -26,11 +26,9 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  drivers/media/i2c/imx290.c | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index bf7a6c37ca5d..f6ae24a964d4 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
-@@ -1087,6 +1087,9 @@ static int imx290_probe(struct i2c_client *client)
+@@ -1087,6 +1087,9 @@ static int imx290_probe(struct i2c_clien
  		goto free_ctrl;
  	}
  
@@ -40,6 +38,3 @@ index bf7a6c37ca5d..f6ae24a964d4 100644
  	ret = v4l2_async_register_subdev(&imx290->sd);
  	if (ret < 0) {
  		dev_err(dev, "Could not register v4l2 device\n");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0264-media-i2c-imx290-Add-support-for-74.25MHz-clock.patch b/root/target/linux/bcm27xx/patches-5.15/950-0253-media-i2c-imx290-Add-support-for-74.25MHz-clock.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0264-media-i2c-imx290-Add-support-for-74.25MHz-clock.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0253-media-i2c-imx290-Add-support-for-74.25MHz-clock.patch
index 36cffd0d..66384ac8 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0264-media-i2c-imx290-Add-support-for-74.25MHz-clock.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0253-media-i2c-imx290-Add-support-for-74.25MHz-clock.patch
@@ -1,7 +1,7 @@
-From 0e533fd55be400ca2fa15cd0b659e984e4c8d41f Mon Sep 17 00:00:00 2001
+From f090a245997bffaf33cab254ef7735c90da11520 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 25 Jun 2020 08:28:51 +0100
-Subject: [PATCH 264/634] media: i2c: imx290: Add support for 74.25MHz clock
+Subject: [PATCH 253/828] media: i2c: imx290: Add support for 74.25MHz clock
 
 The existing driver only supported a clock of 37.125MHz, but the
 sensor also supports 74.25MHz.
@@ -14,8 +14,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/imx290.c | 119 ++++++++++++++++++++++++++++++-------
  1 file changed, 97 insertions(+), 22 deletions(-)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index f6ae24a964d4..45b10a8aafa1 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -1,6 +1,10 @@
@@ -59,7 +57,7 @@ index f6ae24a964d4..45b10a8aafa1 100644
  	struct regmap *regmap;
  	u8 nlanes;
  	u8 bpp;
-@@ -116,8 +130,6 @@ static const struct imx290_regval imx290_global_init_settings[] = {
+@@ -116,8 +130,6 @@ static const struct imx290_regval imx290
  	{ 0x3018, 0x65 },
  	{ 0x3019, 0x04 },
  	{ 0x301a, 0x00 },
@@ -68,7 +66,7 @@ index f6ae24a964d4..45b10a8aafa1 100644
  	{ 0x303a, 0x0c },
  	{ 0x3040, 0x00 },
  	{ 0x3041, 0x00 },
-@@ -171,6 +183,30 @@ static const struct imx290_regval imx290_global_init_settings[] = {
+@@ -171,6 +183,30 @@ static const struct imx290_regval imx290
  	{ 0x33b3, 0x04 },
  };
  
@@ -99,7 +97,7 @@ index f6ae24a964d4..45b10a8aafa1 100644
  static const struct imx290_regval imx290_1080p_settings[] = {
  	/* mode settings */
  	{ 0x3007, 0x00 },
-@@ -182,13 +218,6 @@ static const struct imx290_regval imx290_1080p_settings[] = {
+@@ -182,13 +218,6 @@ static const struct imx290_regval imx290
  	{ 0x3419, 0x04 },
  	{ 0x3012, 0x64 },
  	{ 0x3013, 0x00 },
@@ -113,7 +111,7 @@ index f6ae24a964d4..45b10a8aafa1 100644
  	/* data rate settings */
  	{ 0x3405, 0x10 },
  	{ 0x3446, 0x57 },
-@@ -209,6 +238,30 @@ static const struct imx290_regval imx290_1080p_settings[] = {
+@@ -209,6 +238,30 @@ static const struct imx290_regval imx290
  	{ 0x3455, 0x00 },
  };
  
@@ -144,7 +142,7 @@ index f6ae24a964d4..45b10a8aafa1 100644
  static const struct imx290_regval imx290_720p_settings[] = {
  	/* mode settings */
  	{ 0x3007, 0x10 },
-@@ -220,13 +273,6 @@ static const struct imx290_regval imx290_720p_settings[] = {
+@@ -220,13 +273,6 @@ static const struct imx290_regval imx290
  	{ 0x3419, 0x02 },
  	{ 0x3012, 0x64 },
  	{ 0x3013, 0x00 },
@@ -158,7 +156,7 @@ index f6ae24a964d4..45b10a8aafa1 100644
  	/* data rate settings */
  	{ 0x3405, 0x10 },
  	{ 0x3446, 0x4f },
-@@ -312,6 +358,11 @@ static const struct imx290_mode imx290_modes_2lanes[] = {
+@@ -312,6 +358,11 @@ static const struct imx290_mode imx290_m
  		.link_freq_index = FREQ_INDEX_1080P,
  		.data = imx290_1080p_settings,
  		.data_size = ARRAY_SIZE(imx290_1080p_settings),
@@ -170,7 +168,7 @@ index f6ae24a964d4..45b10a8aafa1 100644
  	},
  	{
  		.width = 1280,
-@@ -320,6 +371,11 @@ static const struct imx290_mode imx290_modes_2lanes[] = {
+@@ -320,6 +371,11 @@ static const struct imx290_mode imx290_m
  		.link_freq_index = FREQ_INDEX_720P,
  		.data = imx290_720p_settings,
  		.data_size = ARRAY_SIZE(imx290_720p_settings),
@@ -182,7 +180,7 @@ index f6ae24a964d4..45b10a8aafa1 100644
  	},
  };
  
-@@ -331,6 +387,11 @@ static const struct imx290_mode imx290_modes_4lanes[] = {
+@@ -331,6 +387,11 @@ static const struct imx290_mode imx290_m
  		.link_freq_index = FREQ_INDEX_1080P,
  		.data = imx290_1080p_settings,
  		.data_size = ARRAY_SIZE(imx290_1080p_settings),
@@ -194,7 +192,7 @@ index f6ae24a964d4..45b10a8aafa1 100644
  	},
  	{
  		.width = 1280,
-@@ -339,6 +400,11 @@ static const struct imx290_mode imx290_modes_4lanes[] = {
+@@ -339,6 +400,11 @@ static const struct imx290_mode imx290_m
  		.link_freq_index = FREQ_INDEX_720P,
  		.data = imx290_720p_settings,
  		.data_size = ARRAY_SIZE(imx290_720p_settings),
@@ -206,7 +204,7 @@ index f6ae24a964d4..45b10a8aafa1 100644
  	},
  };
  
-@@ -712,6 +778,8 @@ static int imx290_set_hmax(struct imx290 *imx290, u32 val)
+@@ -712,6 +778,8 @@ static int imx290_set_hmax(struct imx290
  /* Start streaming */
  static int imx290_start_streaming(struct imx290 *imx290)
  {
@@ -215,7 +213,7 @@ index f6ae24a964d4..45b10a8aafa1 100644
  	int ret;
  
  	/* Set init register settings */
-@@ -723,6 +791,14 @@ static int imx290_start_streaming(struct imx290 *imx290)
+@@ -723,6 +791,14 @@ static int imx290_start_streaming(struct
  		return ret;
  	}
  
@@ -230,7 +228,7 @@ index f6ae24a964d4..45b10a8aafa1 100644
  	/* Apply the register values related to current frame format */
  	ret = imx290_write_current_format(imx290);
  	if (ret < 0) {
-@@ -935,7 +1011,6 @@ static int imx290_probe(struct i2c_client *client)
+@@ -935,7 +1011,6 @@ static int imx290_probe(struct i2c_clien
  		.bus_type = V4L2_MBUS_CSI2_DPHY
  	};
  	struct imx290 *imx290;
@@ -238,7 +236,7 @@ index f6ae24a964d4..45b10a8aafa1 100644
  	s64 fq;
  	int ret;
  
-@@ -999,21 +1074,21 @@ static int imx290_probe(struct i2c_client *client)
+@@ -999,21 +1074,21 @@ static int imx290_probe(struct i2c_clien
  	}
  
  	ret = fwnode_property_read_u32(dev_fwnode(dev), "clock-frequency",
@@ -264,6 +262,3 @@ index f6ae24a964d4..45b10a8aafa1 100644
  	if (ret) {
  		dev_err(dev, "Could not set xclk frequency\n");
  		goto free_err;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0265-media-i2c-imx290-Correct-range-for-V4L2_CID_GAIN-to-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0254-media-i2c-imx290-Correct-range-for-V4L2_CID_GAIN-to-.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0265-media-i2c-imx290-Correct-range-for-V4L2_CID_GAIN-to-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0254-media-i2c-imx290-Correct-range-for-V4L2_CID_GAIN-to-.patch
index c6ed8220..d91cc13e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0265-media-i2c-imx290-Correct-range-for-V4L2_CID_GAIN-to-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0254-media-i2c-imx290-Correct-range-for-V4L2_CID_GAIN-to-.patch
@@ -1,7 +1,7 @@
-From 4d6177efadc41b3f293656fbb720fd692cf200e8 Mon Sep 17 00:00:00 2001
+From 0c6f16dc548e60f7db63ba747bd001eb7dd8bc9e Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 11 Jun 2020 13:41:43 +0100
-Subject: [PATCH 265/634] media: i2c: imx290: Correct range for V4L2_CID_GAIN
+Subject: [PATCH 254/828] media: i2c: imx290: Correct range for V4L2_CID_GAIN
  to 0-238
 
 The datasheet lists the gain as being 0.0 to 72.0dB in 0.3dB steps, which
@@ -13,11 +13,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/imx290.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 45b10a8aafa1..f89584a9bbd7 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
-@@ -1120,7 +1120,7 @@ static int imx290_probe(struct i2c_client *client)
+@@ -1120,7 +1120,7 @@ static int imx290_probe(struct i2c_clien
  	v4l2_ctrl_handler_init(&imx290->ctrls, 4);
  
  	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
@@ -26,6 +24,3 @@ index 45b10a8aafa1..f89584a9bbd7 100644
  
  	imx290->link_freq =
  		v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0266-media-i2c-imx290-Convert-HMAX-setting-into-V4L2_CID_.patch b/root/target/linux/bcm27xx/patches-5.15/950-0255-media-i2c-imx290-Convert-HMAX-setting-into-V4L2_CID_.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0266-media-i2c-imx290-Convert-HMAX-setting-into-V4L2_CID_.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0255-media-i2c-imx290-Convert-HMAX-setting-into-V4L2_CID_.patch
index 7d3332f5..5dbc0f3d 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0266-media-i2c-imx290-Convert-HMAX-setting-into-V4L2_CID_.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0255-media-i2c-imx290-Convert-HMAX-setting-into-V4L2_CID_.patch
@@ -1,7 +1,7 @@
-From 89be9babd0aa324bc79db3f524b5d47e5608a2f8 Mon Sep 17 00:00:00 2001
+From 654bf9e440c97319cc8bada4ee21e5599052fe74 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 11 Jun 2020 14:36:40 +0100
-Subject: [PATCH 266/634] media: i2c: imx290: Convert HMAX setting into
+Subject: [PATCH 255/828] media: i2c: imx290: Convert HMAX setting into
  V4L2_CID_HBLANK
 
 Userspace needs to know HBLANK if it is to work out exposure times
@@ -12,8 +12,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/imx290.c | 66 +++++++++++++++++++++++++-------------
  1 file changed, 44 insertions(+), 22 deletions(-)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index f89584a9bbd7..e77ddd0dea4e 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -40,6 +40,9 @@ enum imx290_clk_index {
@@ -42,7 +40,7 @@ index f89584a9bbd7..e77ddd0dea4e 100644
  
  	struct mutex lock;
  };
-@@ -518,6 +523,26 @@ static int imx290_set_gain(struct imx290 *imx290, u32 value)
+@@ -518,6 +523,26 @@ static int imx290_set_gain(struct imx290
  	return ret;
  }
  
@@ -69,7 +67,7 @@ index f89584a9bbd7..e77ddd0dea4e 100644
  /* Stop streaming */
  static int imx290_stop_streaming(struct imx290 *imx290)
  {
-@@ -546,6 +571,9 @@ static int imx290_set_ctrl(struct v4l2_ctrl *ctrl)
+@@ -546,6 +571,9 @@ static int imx290_set_ctrl(struct v4l2_c
  	case V4L2_CID_GAIN:
  		ret = imx290_set_gain(imx290, ctrl->val);
  		break;
@@ -79,7 +77,7 @@ index f89584a9bbd7..e77ddd0dea4e 100644
  	case V4L2_CID_TEST_PATTERN:
  		if (ctrl->val) {
  			imx290_write_reg(imx290, IMX290_BLKLEVEL_LOW, 0x00);
-@@ -702,6 +730,12 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,
+@@ -702,6 +730,12 @@ static int imx290_set_fmt(struct v4l2_su
  		if (imx290->pixel_rate)
  			__v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate,
  						 imx290_calc_pixel_rate(imx290));
@@ -92,7 +90,7 @@ index f89584a9bbd7..e77ddd0dea4e 100644
  	}
  
  	*format = fmt->format;
-@@ -756,25 +790,6 @@ static int imx290_write_current_format(struct imx290 *imx290)
+@@ -756,25 +790,6 @@ static int imx290_write_current_format(s
  	return 0;
  }
  
@@ -118,7 +116,7 @@ index f89584a9bbd7..e77ddd0dea4e 100644
  /* Start streaming */
  static int imx290_start_streaming(struct imx290 *imx290)
  {
-@@ -813,9 +828,6 @@ static int imx290_start_streaming(struct imx290 *imx290)
+@@ -813,9 +828,6 @@ static int imx290_start_streaming(struct
  		dev_err(imx290->dev, "Could not set current mode\n");
  		return ret;
  	}
@@ -128,7 +126,7 @@ index f89584a9bbd7..e77ddd0dea4e 100644
  
  	/* Apply customized values from user */
  	ret = v4l2_ctrl_handler_setup(imx290->sd.ctrl_handler);
-@@ -1010,6 +1022,7 @@ static int imx290_probe(struct i2c_client *client)
+@@ -1010,6 +1022,7 @@ static int imx290_probe(struct i2c_clien
  	struct v4l2_fwnode_endpoint ep = {
  		.bus_type = V4L2_MBUS_CSI2_DPHY
  	};
@@ -136,7 +134,7 @@ index f89584a9bbd7..e77ddd0dea4e 100644
  	struct imx290 *imx290;
  	s64 fq;
  	int ret;
-@@ -1048,6 +1061,8 @@ static int imx290_probe(struct i2c_client *client)
+@@ -1048,6 +1061,8 @@ static int imx290_probe(struct i2c_clien
  		ret = -EINVAL;
  		goto free_err;
  	}
@@ -145,7 +143,7 @@ index f89584a9bbd7..e77ddd0dea4e 100644
  
  	dev_dbg(dev, "Using %u data lanes\n", imx290->nlanes);
  
-@@ -1122,6 +1137,13 @@ static int imx290_probe(struct i2c_client *client)
+@@ -1122,6 +1137,13 @@ static int imx290_probe(struct i2c_clien
  	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
  			  V4L2_CID_GAIN, 0, 238, 1, 0);
  
@@ -159,6 +157,3 @@ index f89584a9bbd7..e77ddd0dea4e 100644
  	imx290->link_freq =
  		v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops,
  				       V4L2_CID_LINK_FREQ,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0267-media-i2c-imx290-Add-support-for-V4L2_CID_VBLANK.patch b/root/target/linux/bcm27xx/patches-5.15/950-0256-media-i2c-imx290-Add-support-for-V4L2_CID_VBLANK.patch
similarity index 79%
rename from root/target/linux/bcm27xx/patches-5.15/0267-media-i2c-imx290-Add-support-for-V4L2_CID_VBLANK.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0256-media-i2c-imx290-Add-support-for-V4L2_CID_VBLANK.patch
index f2ec5b26..b7c3b4c1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0267-media-i2c-imx290-Add-support-for-V4L2_CID_VBLANK.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0256-media-i2c-imx290-Add-support-for-V4L2_CID_VBLANK.patch
@@ -1,7 +1,7 @@
-From ceb88f6b700c85e1cdd6f46be3546ef55d2b26a4 Mon Sep 17 00:00:00 2001
+From 3d882213388fb86e2cc2ec96822ea224910ed6f7 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 11 Jun 2020 18:09:12 +0100
-Subject: [PATCH 267/634] media: i2c: imx290: Add support for V4L2_CID_VBLANK
+Subject: [PATCH 256/828] media: i2c: imx290: Add support for V4L2_CID_VBLANK
 
 In order to calculate framerate and durations userspace needs
 the vertical blanking information. This can be configurable,
@@ -15,8 +15,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/imx290.c | 38 ++++++++++++++++++++++++++++++++++++--
  1 file changed, 36 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index e77ddd0dea4e..ceb71d83c993 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -38,6 +38,8 @@ enum imx290_clk_index {
@@ -44,7 +42,7 @@ index e77ddd0dea4e..ceb71d83c993 100644
  
  	struct mutex lock;
  };
-@@ -132,8 +136,6 @@ static const char * const imx290_test_pattern_menu[] = {
+@@ -132,8 +136,6 @@ static const char * const imx290_test_pa
  
  static const struct imx290_regval imx290_global_init_settings[] = {
  	{ 0x3007, 0x00 },
@@ -53,7 +51,7 @@ index e77ddd0dea4e..ceb71d83c993 100644
  	{ 0x301a, 0x00 },
  	{ 0x303a, 0x0c },
  	{ 0x3040, 0x00 },
-@@ -360,6 +362,7 @@ static const struct imx290_mode imx290_modes_2lanes[] = {
+@@ -360,6 +362,7 @@ static const struct imx290_mode imx290_m
  		.width = 1920,
  		.height = 1080,
  		.hmax = 0x1130,
@@ -61,7 +59,7 @@ index e77ddd0dea4e..ceb71d83c993 100644
  		.link_freq_index = FREQ_INDEX_1080P,
  		.data = imx290_1080p_settings,
  		.data_size = ARRAY_SIZE(imx290_1080p_settings),
-@@ -373,6 +376,7 @@ static const struct imx290_mode imx290_modes_2lanes[] = {
+@@ -373,6 +376,7 @@ static const struct imx290_mode imx290_m
  		.width = 1280,
  		.height = 720,
  		.hmax = 0x19c8,
@@ -69,7 +67,7 @@ index e77ddd0dea4e..ceb71d83c993 100644
  		.link_freq_index = FREQ_INDEX_720P,
  		.data = imx290_720p_settings,
  		.data_size = ARRAY_SIZE(imx290_720p_settings),
-@@ -389,6 +393,7 @@ static const struct imx290_mode imx290_modes_4lanes[] = {
+@@ -389,6 +393,7 @@ static const struct imx290_mode imx290_m
  		.width = 1920,
  		.height = 1080,
  		.hmax = 0x0898,
@@ -77,7 +75,7 @@ index e77ddd0dea4e..ceb71d83c993 100644
  		.link_freq_index = FREQ_INDEX_1080P,
  		.data = imx290_1080p_settings,
  		.data_size = ARRAY_SIZE(imx290_1080p_settings),
-@@ -402,6 +407,7 @@ static const struct imx290_mode imx290_modes_4lanes[] = {
+@@ -402,6 +407,7 @@ static const struct imx290_mode imx290_m
  		.width = 1280,
  		.height = 720,
  		.hmax = 0x0ce4,
@@ -85,7 +83,7 @@ index e77ddd0dea4e..ceb71d83c993 100644
  		.link_freq_index = FREQ_INDEX_720P,
  		.data = imx290_720p_settings,
  		.data_size = ARRAY_SIZE(imx290_720p_settings),
-@@ -543,6 +549,19 @@ static int imx290_set_hmax(struct imx290 *imx290, u32 val)
+@@ -543,6 +549,19 @@ static int imx290_set_hmax(struct imx290
  	return 0;
  }
  
@@ -105,7 +103,7 @@ index e77ddd0dea4e..ceb71d83c993 100644
  /* Stop streaming */
  static int imx290_stop_streaming(struct imx290 *imx290)
  {
-@@ -574,6 +593,9 @@ static int imx290_set_ctrl(struct v4l2_ctrl *ctrl)
+@@ -574,6 +593,9 @@ static int imx290_set_ctrl(struct v4l2_c
  	case V4L2_CID_HBLANK:
  		ret = imx290_set_hmax(imx290, ctrl->val);
  		break;
@@ -115,7 +113,7 @@ index e77ddd0dea4e..ceb71d83c993 100644
  	case V4L2_CID_TEST_PATTERN:
  		if (ctrl->val) {
  			imx290_write_reg(imx290, IMX290_BLKLEVEL_LOW, 0x00);
-@@ -736,6 +758,12 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,
+@@ -736,6 +758,12 @@ static int imx290_set_fmt(struct v4l2_su
  						 imx290->hmax_min - mode->width,
  						 IMX290_HMAX_MAX - mode->width,
  						 1, mode->hmax - mode->width);
@@ -128,7 +126,7 @@ index e77ddd0dea4e..ceb71d83c993 100644
  	}
  
  	*format = fmt->format;
-@@ -1144,6 +1172,12 @@ static int imx290_probe(struct i2c_client *client)
+@@ -1144,6 +1172,12 @@ static int imx290_probe(struct i2c_clien
  					   IMX290_HMAX_MAX - mode->width, 1,
  					   mode->hmax - mode->width);
  
@@ -141,6 +139,3 @@ index e77ddd0dea4e..ceb71d83c993 100644
  	imx290->link_freq =
  		v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops,
  				       V4L2_CID_LINK_FREQ,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0268-media-i2c-imx290-Add-exposure-control-to-the-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0257-media-i2c-imx290-Add-exposure-control-to-the-driver.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0268-media-i2c-imx290-Add-exposure-control-to-the-driver.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0257-media-i2c-imx290-Add-exposure-control-to-the-driver.patch
index af231e9c..a1cf6b82 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0268-media-i2c-imx290-Add-exposure-control-to-the-driver.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0257-media-i2c-imx290-Add-exposure-control-to-the-driver.patch
@@ -1,7 +1,7 @@
-From 70ab44beded5d0238d71760c0ede856557d1ed38 Mon Sep 17 00:00:00 2001
+From 4ec99016f9e815a0d5208d92f95b5233143ff732 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 11 Jun 2020 18:19:13 +0100
-Subject: [PATCH 268/634] media: i2c: imx290: Add exposure control to the
+Subject: [PATCH 257/828] media: i2c: imx290: Add exposure control to the
  driver.
 
 Adds support for V4L2_CID_EXPOSURE so that userspace can control
@@ -12,8 +12,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/imx290.c | 35 +++++++++++++++++++++++++++++++++++
  1 file changed, 35 insertions(+)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index ceb71d83c993..3e52c43b837d 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -45,6 +45,10 @@ enum imx290_clk_index {
@@ -35,7 +33,7 @@ index ceb71d83c993..3e52c43b837d 100644
  
  	struct mutex lock;
  };
-@@ -529,6 +534,20 @@ static int imx290_set_gain(struct imx290 *imx290, u32 value)
+@@ -529,6 +534,20 @@ static int imx290_set_gain(struct imx290
  	return ret;
  }
  
@@ -56,7 +54,7 @@ index ceb71d83c993..3e52c43b837d 100644
  static int imx290_set_hmax(struct imx290 *imx290, u32 val)
  {
  	u32 hmax = val + imx290->current_mode->width;
-@@ -590,6 +609,9 @@ static int imx290_set_ctrl(struct v4l2_ctrl *ctrl)
+@@ -590,6 +609,9 @@ static int imx290_set_ctrl(struct v4l2_c
  	case V4L2_CID_GAIN:
  		ret = imx290_set_gain(imx290, ctrl->val);
  		break;
@@ -66,7 +64,7 @@ index ceb71d83c993..3e52c43b837d 100644
  	case V4L2_CID_HBLANK:
  		ret = imx290_set_hmax(imx290, ctrl->val);
  		break;
-@@ -764,6 +786,12 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,
+@@ -764,6 +786,12 @@ static int imx290_set_fmt(struct v4l2_su
  						 IMX290_VMAX_MAX - mode->height,
  						 1,
  						 mode->vmax - mode->height);
@@ -79,7 +77,7 @@ index ceb71d83c993..3e52c43b837d 100644
  	}
  
  	*format = fmt->format;
-@@ -1178,6 +1206,13 @@ static int imx290_probe(struct i2c_client *client)
+@@ -1178,6 +1206,13 @@ static int imx290_probe(struct i2c_clien
  					   IMX290_VMAX_MAX - mode->height, 1,
  					   mode->vmax - mode->height);
  
@@ -93,6 +91,3 @@ index ceb71d83c993..3e52c43b837d 100644
  	imx290->link_freq =
  		v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops,
  				       V4L2_CID_LINK_FREQ,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0269-media-i2c-imx290-Add-H-and-V-flip-controls.patch b/root/target/linux/bcm27xx/patches-5.15/950-0258-media-i2c-imx290-Add-H-and-V-flip-controls.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0269-media-i2c-imx290-Add-H-and-V-flip-controls.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0258-media-i2c-imx290-Add-H-and-V-flip-controls.patch
index b7e39262..24941c48 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0269-media-i2c-imx290-Add-H-and-V-flip-controls.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0258-media-i2c-imx290-Add-H-and-V-flip-controls.patch
@@ -1,7 +1,7 @@
-From f03f7f35e816b803af2ac6b1d2d5c279ae0db9c4 Mon Sep 17 00:00:00 2001
+From 41a2c4308195c1c514ad13a163cba5dec033bc1e Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 11 Jun 2020 18:34:16 +0100
-Subject: [PATCH 269/634] media: i2c: imx290: Add H and V flip controls
+Subject: [PATCH 258/828] media: i2c: imx290: Add H and V flip controls
 
 The sensor supports horizontal and vertical flips, so support them
 through V4L2_CID_HFLIP and V4L2_CID_VFLIP.
@@ -15,8 +15,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/imx290.c | 22 ++++++++++++++++++++++
  1 file changed, 22 insertions(+)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 3e52c43b837d..375a83ce71d0 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -34,6 +34,7 @@ enum imx290_clk_index {
@@ -36,7 +34,7 @@ index 3e52c43b837d..375a83ce71d0 100644
  	struct v4l2_ctrl *exposure;
  
  	struct mutex lock;
-@@ -600,6 +603,7 @@ static int imx290_set_ctrl(struct v4l2_ctrl *ctrl)
+@@ -600,6 +603,7 @@ static int imx290_set_ctrl(struct v4l2_c
  	struct imx290 *imx290 = container_of(ctrl->handler,
  					     struct imx290, ctrls);
  	int ret = 0;
@@ -44,7 +42,7 @@ index 3e52c43b837d..375a83ce71d0 100644
  
  	/* V4L2 controls values will be applied only when power is already up */
  	if (!pm_runtime_get_if_in_use(imx290->dev))
-@@ -618,6 +622,16 @@ static int imx290_set_ctrl(struct v4l2_ctrl *ctrl)
+@@ -618,6 +622,16 @@ static int imx290_set_ctrl(struct v4l2_c
  	case V4L2_CID_VBLANK:
  		ret = imx290_set_vmax(imx290, ctrl->val);
  		break;
@@ -61,7 +59,7 @@ index 3e52c43b837d..375a83ce71d0 100644
  	case V4L2_CID_TEST_PATTERN:
  		if (ctrl->val) {
  			imx290_write_reg(imx290, IMX290_BLKLEVEL_LOW, 0x00);
-@@ -922,6 +936,9 @@ static int imx290_set_stream(struct v4l2_subdev *sd, int enable)
+@@ -922,6 +936,9 @@ static int imx290_set_stream(struct v4l2
  		imx290_stop_streaming(imx290);
  		pm_runtime_put(imx290->dev);
  	}
@@ -71,7 +69,7 @@ index 3e52c43b837d..375a83ce71d0 100644
  
  unlock_and_return:
  
-@@ -1213,6 +1230,11 @@ static int imx290_probe(struct i2c_client *client)
+@@ -1213,6 +1230,11 @@ static int imx290_probe(struct i2c_clien
  					     IMX290_EXPOSURE_STEP,
  					     mode->vmax - 4);
  
@@ -83,6 +81,3 @@ index 3e52c43b837d..375a83ce71d0 100644
  	imx290->link_freq =
  		v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops,
  				       V4L2_CID_LINK_FREQ,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0270-media-dt-bindings-media-i2c-Add-mono-version-to-IMX2.patch b/root/target/linux/bcm27xx/patches-5.15/950-0259-media-dt-bindings-media-i2c-Add-mono-version-to-IMX2.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0270-media-dt-bindings-media-i2c-Add-mono-version-to-IMX2.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0259-media-dt-bindings-media-i2c-Add-mono-version-to-IMX2.patch
index 90595ce5..fdfa08d5 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0270-media-dt-bindings-media-i2c-Add-mono-version-to-IMX2.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0259-media-dt-bindings-media-i2c-Add-mono-version-to-IMX2.patch
@@ -1,7 +1,7 @@
-From 3686fe363cd3b9a8f5fc88af4e1c9a0224cf5208 Mon Sep 17 00:00:00 2001
+From 27cf801d42f918b316cd25f9aa37b3a5a2d6dd8a Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 25 Jun 2020 16:52:14 +0100
-Subject: [PATCH 270/634] media: dt-bindings: media: i2c: Add mono version to
+Subject: [PATCH 259/828] media: dt-bindings: media: i2c: Add mono version to
  IMX290 bindings
 
 The IMX290 module is available as either monochrome or colour and
@@ -14,8 +14,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  Documentation/devicetree/bindings/media/i2c/imx290.txt | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
-diff --git a/Documentation/devicetree/bindings/media/i2c/imx290.txt b/Documentation/devicetree/bindings/media/i2c/imx290.txt
-index a3cc21410f7c..294e63650d9e 100644
 --- a/Documentation/devicetree/bindings/media/i2c/imx290.txt
 +++ b/Documentation/devicetree/bindings/media/i2c/imx290.txt
 @@ -1,13 +1,14 @@
@@ -36,6 +34,3 @@ index a3cc21410f7c..294e63650d9e 100644
  - reg: I2C bus address of the device
  - clocks: Reference to the xclk clock.
  - clock-names: Should be "xclk".
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0271-media-i2c-imx290-Add-support-for-the-mono-sensor-var.patch b/root/target/linux/bcm27xx/patches-5.15/950-0260-media-i2c-imx290-Add-support-for-the-mono-sensor-var.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0271-media-i2c-imx290-Add-support-for-the-mono-sensor-var.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0260-media-i2c-imx290-Add-support-for-the-mono-sensor-var.patch
index 1c8c64e3..e724bf9b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0271-media-i2c-imx290-Add-support-for-the-mono-sensor-var.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0260-media-i2c-imx290-Add-support-for-the-mono-sensor-var.patch
@@ -1,7 +1,7 @@
-From 668e20b8adf1fa2bf447dc2060d9f048d1e81144 Mon Sep 17 00:00:00 2001
+From a6abd5c13eb7e6b1226659a3abbbe0a288ff9331 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 25 Jun 2020 17:03:11 +0100
-Subject: [PATCH 271/634] media : i2c: imx290: Add support for the mono sensor
+Subject: [PATCH 260/828] media : i2c: imx290: Add support for the mono sensor
  variant.
 
 The IMX290 module is available as either mono or colour (Bayer).
@@ -14,8 +14,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/imx290.c | 58 +++++++++++++++++++++++++++-----------
  1 file changed, 41 insertions(+), 17 deletions(-)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 375a83ce71d0..aeb95161b4fe 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -1,10 +1,12 @@
@@ -71,7 +69,7 @@ index 375a83ce71d0..aeb95161b4fe 100644
  static const struct regmap_config imx290_regmap_config = {
  	.reg_bits = 16,
  	.val_bits = 8,
-@@ -671,10 +683,12 @@ static int imx290_enum_mbus_code(struct v4l2_subdev *sd,
+@@ -671,10 +683,12 @@ static int imx290_enum_mbus_code(struct
  				 struct v4l2_subdev_state *sd_state,
  				 struct v4l2_subdev_mbus_code_enum *code)
  {
@@ -86,7 +84,7 @@ index 375a83ce71d0..aeb95161b4fe 100644
  
  	return 0;
  }
-@@ -686,8 +700,8 @@ static int imx290_enum_frame_size(struct v4l2_subdev *sd,
+@@ -686,8 +700,8 @@ static int imx290_enum_frame_size(struct
  	const struct imx290 *imx290 = to_imx290(sd);
  	const struct imx290_mode *imx290_modes = imx290_modes_ptr(imx290);
  
@@ -97,7 +95,7 @@ index 375a83ce71d0..aeb95161b4fe 100644
  		return -EINVAL;
  
  	if (fse->index >= imx290_modes_num(imx290))
-@@ -765,14 +779,14 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,
+@@ -765,14 +779,14 @@ static int imx290_set_fmt(struct v4l2_su
  	fmt->format.width = mode->width;
  	fmt->format.height = mode->height;
  
@@ -116,7 +114,7 @@ index 375a83ce71d0..aeb95161b4fe 100644
  	fmt->format.field = V4L2_FIELD_NONE;
  
  	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-@@ -780,7 +794,7 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,
+@@ -780,7 +794,7 @@ static int imx290_set_fmt(struct v4l2_su
  	} else {
  		format = &imx290->current_format;
  		imx290->current_mode = mode;
@@ -125,7 +123,7 @@ index 375a83ce71d0..aeb95161b4fe 100644
  
  		if (imx290->link_freq)
  			__v4l2_ctrl_s_ctrl(imx290->link_freq,
-@@ -835,6 +849,7 @@ static int imx290_write_current_format(struct imx290 *imx290)
+@@ -835,6 +849,7 @@ static int imx290_write_current_format(s
  
  	switch (imx290->current_format.code) {
  	case MEDIA_BUS_FMT_SRGGB10_1X10:
@@ -133,7 +131,7 @@ index 375a83ce71d0..aeb95161b4fe 100644
  		ret = imx290_set_register_array(imx290, imx290_10bit_settings,
  						ARRAY_SIZE(
  							imx290_10bit_settings));
-@@ -844,6 +859,7 @@ static int imx290_write_current_format(struct imx290 *imx290)
+@@ -844,6 +859,7 @@ static int imx290_write_current_format(s
  		}
  		break;
  	case MEDIA_BUS_FMT_SRGGB12_1X12:
@@ -141,7 +139,7 @@ index 375a83ce71d0..aeb95161b4fe 100644
  		ret = imx290_set_register_array(imx290, imx290_12bit_settings,
  						ARRAY_SIZE(
  							imx290_12bit_settings));
-@@ -1087,6 +1103,12 @@ static s64 imx290_check_link_freqs(const struct imx290 *imx290,
+@@ -1087,6 +1103,12 @@ static s64 imx290_check_link_freqs(const
  	return 0;
  }
  
@@ -154,7 +152,7 @@ index 375a83ce71d0..aeb95161b4fe 100644
  static int imx290_probe(struct i2c_client *client)
  {
  	struct device *dev = &client->dev;
-@@ -1095,6 +1117,7 @@ static int imx290_probe(struct i2c_client *client)
+@@ -1095,6 +1117,7 @@ static int imx290_probe(struct i2c_clien
  	struct v4l2_fwnode_endpoint ep = {
  		.bus_type = V4L2_MBUS_CSI2_DPHY
  	};
@@ -162,7 +160,7 @@ index 375a83ce71d0..aeb95161b4fe 100644
  	const struct imx290_mode *mode;
  	struct imx290 *imx290;
  	s64 fq;
-@@ -1111,6 +1134,11 @@ static int imx290_probe(struct i2c_client *client)
+@@ -1111,6 +1134,11 @@ static int imx290_probe(struct i2c_clien
  		return -ENODEV;
  	}
  
@@ -174,7 +172,7 @@ index 375a83ce71d0..aeb95161b4fe 100644
  	endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL);
  	if (!endpoint) {
  		dev_err(dev, "Endpoint node not found\n");
-@@ -1329,10 +1357,6 @@ static int imx290_remove(struct i2c_client *client)
+@@ -1329,10 +1357,6 @@ static int imx290_remove(struct i2c_clie
  	return 0;
  }
  
@@ -185,6 +183,3 @@ index 375a83ce71d0..aeb95161b4fe 100644
  MODULE_DEVICE_TABLE(of, imx290_of_match);
  
  static struct i2c_driver imx290_i2c_driver = {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0272-media-i2c-imx290-Switch-set_hmax-to-use-imx290_write.patch b/root/target/linux/bcm27xx/patches-5.15/950-0261-media-i2c-imx290-Switch-set_hmax-to-use-imx290_write.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0272-media-i2c-imx290-Switch-set_hmax-to-use-imx290_write.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0261-media-i2c-imx290-Switch-set_hmax-to-use-imx290_write.patch
index f68563b5..8c67699e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0272-media-i2c-imx290-Switch-set_hmax-to-use-imx290_write.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0261-media-i2c-imx290-Switch-set_hmax-to-use-imx290_write.patch
@@ -1,7 +1,7 @@
-From 3937327e79df74af43d68f275db434a3d2f8f478 Mon Sep 17 00:00:00 2001
+From 0d0d0382ba944a19a59d642b684f7214ed131c5f Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 26 Jun 2020 18:11:49 +0100
-Subject: [PATCH 272/634] media: i2c: imx290: Switch set_hmax to use
+Subject: [PATCH 261/828] media: i2c: imx290: Switch set_hmax to use
  imx290_write_buffered_reg
 
 imx290_set_hmax was using two independent writes to set up hmax,
@@ -15,22 +15,14 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/imx290.c | 15 ++++-----------
  1 file changed, 4 insertions(+), 11 deletions(-)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index aeb95161b4fe..e64124a521b2 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
-@@ -568,19 +568,12 @@ static int imx290_set_hmax(struct imx290 *imx290, u32 val)
+@@ -568,19 +568,12 @@ static int imx290_set_hmax(struct imx290
  	u32 hmax = val + imx290->current_mode->width;
  	int ret;
  
 -	ret = imx290_write_reg(imx290, IMX290_HMAX_LOW, (hmax & 0xff));
 -	if (ret) {
--		dev_err(imx290->dev, "Error setting HMAX register\n");
--		return ret;
--	}
--
--	ret = imx290_write_reg(imx290, IMX290_HMAX_HIGH, ((hmax >> 8) & 0xff));
--	if (ret) {
 +	ret = imx290_write_buffered_reg(imx290, IMX290_HMAX_LOW, 2,
 +					hmax);
 +	if (ret)
@@ -38,11 +30,14 @@ index aeb95161b4fe..e64124a521b2 100644
 -		return ret;
 -	}
  
+-	ret = imx290_write_reg(imx290, IMX290_HMAX_HIGH, ((hmax >> 8) & 0xff));
+-	if (ret) {
+-		dev_err(imx290->dev, "Error setting HMAX register\n");
+-		return ret;
+-	}
+-
 -	return 0;
 +	return ret;
  }
  
  static int imx290_set_vmax(struct imx290 *imx290, u32 val)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0273-serial-8250-bcm2835aux-defer-if-clock-is-zero.patch b/root/target/linux/bcm27xx/patches-5.15/950-0262-serial-8250-bcm2835aux-defer-if-clock-is-zero.patch
similarity index 68%
rename from root/target/linux/bcm27xx/patches-5.15/0273-serial-8250-bcm2835aux-defer-if-clock-is-zero.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0262-serial-8250-bcm2835aux-defer-if-clock-is-zero.patch
index 4838c1e9..cfea5ec2 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0273-serial-8250-bcm2835aux-defer-if-clock-is-zero.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0262-serial-8250-bcm2835aux-defer-if-clock-is-zero.patch
@@ -1,7 +1,7 @@
-From 8daf39ef69f880c5de1e816c1cd1a7f7adff3db0 Mon Sep 17 00:00:00 2001
+From 96230b99568c8cb89de5db00419c516ba53a4c92 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Thu, 2 Jul 2020 13:53:20 +0100
-Subject: [PATCH 273/634] serial: 8250: bcm2835aux - defer if clock is zero
+Subject: [PATCH 262/828] serial: 8250: bcm2835aux - defer if clock is zero
 
 See: https://github.com/raspberrypi/linux/issues/3700
 
@@ -10,11 +10,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  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 fd95860cd661..fc36e5963e30 100644
 --- a/drivers/tty/serial/8250/8250_bcm2835aux.c
 +++ b/drivers/tty/serial/8250/8250_bcm2835aux.c
-@@ -148,6 +148,13 @@ static int bcm2835aux_serial_probe(struct platform_device *pdev)
+@@ -148,6 +148,13 @@ static int bcm2835aux_serial_probe(struc
  	 */
  	up.port.uartclk = clk_get_rate(data->clk) * 2;
  
@@ -28,6 +26,3 @@ index fd95860cd661..fc36e5963e30 100644
  	/* register the port */
  	ret = serial8250_register_8250_port(&up);
  	if (ret < 0) {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0274-media-Add-a-pixel-format-for-MIPI-packed-12bit-luma-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0263-media-Add-a-pixel-format-for-MIPI-packed-12bit-luma-.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0274-media-Add-a-pixel-format-for-MIPI-packed-12bit-luma-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0263-media-Add-a-pixel-format-for-MIPI-packed-12bit-luma-.patch
index baa4ec37..5e4744fb 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0274-media-Add-a-pixel-format-for-MIPI-packed-12bit-luma-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0263-media-Add-a-pixel-format-for-MIPI-packed-12bit-luma-.patch
@@ -1,7 +1,7 @@
-From 9f8aa5c9089ec873ffe775741d0c26f01875df53 Mon Sep 17 00:00:00 2001
+From a9cf7372ada077f79175d7d0b6b02cc2021a9bb9 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 7 May 2020 16:59:03 +0100
-Subject: [PATCH 274/634] media: Add a pixel format for MIPI packed 12bit luma
+Subject: [PATCH 263/828] media: Add a pixel format for MIPI packed 12bit luma
  only.
 
 This is the format used by monochrome 12bit image sensors.
@@ -15,9 +15,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  4 files changed, 48 insertions(+)
  create mode 100644 Documentation/userspace-api/media/v4l/pixfmt-y12p.rst
 
-diff --git a/Documentation/userspace-api/media/v4l/pixfmt-y12p.rst b/Documentation/userspace-api/media/v4l/pixfmt-y12p.rst
-new file mode 100644
-index 000000000000..3704f9180fd7
 --- /dev/null
 +++ b/Documentation/userspace-api/media/v4l/pixfmt-y12p.rst
 @@ -0,0 +1,45 @@
@@ -66,8 +63,6 @@ index 000000000000..3704f9180fd7
 +
 +          Y'\ :sub:`00low`\ (bits 3--0)
 +
-diff --git a/Documentation/userspace-api/media/v4l/yuv-formats.rst b/Documentation/userspace-api/media/v4l/yuv-formats.rst
-index 458e07782c8d..390996d95fe5 100644
 --- a/Documentation/userspace-api/media/v4l/yuv-formats.rst
 +++ b/Documentation/userspace-api/media/v4l/yuv-formats.rst
 @@ -267,6 +267,7 @@ image.
@@ -78,11 +73,9 @@ index 458e07782c8d..390996d95fe5 100644
      pixfmt-y8i
      pixfmt-y12i
      pixfmt-uv8
-diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index 67e5ad8bc80d..e774b7dea3f9 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1263,6 +1263,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
+@@ -1265,6 +1265,7 @@ static void v4l_fill_fmtdesc(struct v4l2
  	case V4L2_PIX_FMT_Y16_BE:	descr = "16-bit Greyscale BE"; break;
  	case V4L2_PIX_FMT_Y10BPACK:	descr = "10-bit Greyscale (Packed)"; break;
  	case V4L2_PIX_FMT_Y10P:		descr = "10-bit Greyscale (MIPI Packed)"; break;
@@ -90,8 +83,6 @@ index 67e5ad8bc80d..e774b7dea3f9 100644
  	case V4L2_PIX_FMT_Y8I:		descr = "Interleaved 8-bit Greyscale"; break;
  	case V4L2_PIX_FMT_Y12I:		descr = "Interleaved 12-bit Greyscale"; break;
  	case V4L2_PIX_FMT_Z16:		descr = "16-bit Depth"; break;
-diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index f56bae0c4671..a3ed5b2524c4 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -574,6 +574,7 @@ struct v4l2_pix_format {
@@ -102,6 +93,3 @@ index f56bae0c4671..a3ed5b2524c4 100644
  
  /* Palette formats */
  #define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P', 'A', 'L', '8') /*  8  8-bit palette */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0275-media-Add-a-pixel-format-for-MIPI-packed-14bit-luma-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0264-media-Add-a-pixel-format-for-MIPI-packed-14bit-luma-.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0275-media-Add-a-pixel-format-for-MIPI-packed-14bit-luma-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0264-media-Add-a-pixel-format-for-MIPI-packed-14bit-luma-.patch
index 67cf87f2..5844b1d8 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0275-media-Add-a-pixel-format-for-MIPI-packed-14bit-luma-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0264-media-Add-a-pixel-format-for-MIPI-packed-14bit-luma-.patch
@@ -1,7 +1,7 @@
-From 708ba0e8d730552720ef865c06c8a7eacb6d6dff Mon Sep 17 00:00:00 2001
+From ad8a8fe345c09d478961de39a8ba4e502129ec06 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 25 Jun 2020 17:51:03 +0100
-Subject: [PATCH 275/634] media: Add a pixel format for MIPI packed 14bit luma
+Subject: [PATCH 264/828] media: Add a pixel format for MIPI packed 14bit luma
  only.
 
 This is the format used by monochrome 14bit image sensors.
@@ -15,9 +15,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  4 files changed, 57 insertions(+)
  create mode 100644 Documentation/userspace-api/media/v4l/pixfmt-y14p.rst
 
-diff --git a/Documentation/userspace-api/media/v4l/pixfmt-y14p.rst b/Documentation/userspace-api/media/v4l/pixfmt-y14p.rst
-new file mode 100644
-index 000000000000..27fe14c9a9eb
 --- /dev/null
 +++ b/Documentation/userspace-api/media/v4l/pixfmt-y14p.rst
 @@ -0,0 +1,54 @@
@@ -75,8 +72,6 @@ index 000000000000..27fe14c9a9eb
 +       -  Y'\ :sub:`03low bits 5--0`\ (bits 7--2)
 +
 +	  Y'\ :sub:`02low bits 5--4`\ (bits 1--0)
-diff --git a/Documentation/userspace-api/media/v4l/yuv-formats.rst b/Documentation/userspace-api/media/v4l/yuv-formats.rst
-index 390996d95fe5..44589ac3e909 100644
 --- a/Documentation/userspace-api/media/v4l/yuv-formats.rst
 +++ b/Documentation/userspace-api/media/v4l/yuv-formats.rst
 @@ -268,6 +268,7 @@ image.
@@ -87,11 +82,9 @@ index 390996d95fe5..44589ac3e909 100644
      pixfmt-y8i
      pixfmt-y12i
      pixfmt-uv8
-diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index e774b7dea3f9..0f18d23837a5 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1264,6 +1264,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
+@@ -1266,6 +1266,7 @@ static void v4l_fill_fmtdesc(struct v4l2
  	case V4L2_PIX_FMT_Y10BPACK:	descr = "10-bit Greyscale (Packed)"; break;
  	case V4L2_PIX_FMT_Y10P:		descr = "10-bit Greyscale (MIPI Packed)"; break;
  	case V4L2_PIX_FMT_Y12P:		descr = "12-bit Greyscale (MIPI Packed)"; break;
@@ -99,8 +92,6 @@ index e774b7dea3f9..0f18d23837a5 100644
  	case V4L2_PIX_FMT_Y8I:		descr = "Interleaved 8-bit Greyscale"; break;
  	case V4L2_PIX_FMT_Y12I:		descr = "Interleaved 12-bit Greyscale"; break;
  	case V4L2_PIX_FMT_Z16:		descr = "16-bit Depth"; break;
-diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index a3ed5b2524c4..12f356c48616 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -575,6 +575,7 @@ struct v4l2_pix_format {
@@ -111,6 +102,3 @@ index a3ed5b2524c4..12f356c48616 100644
  
  /* Palette formats */
  #define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P', 'A', 'L', '8') /*  8  8-bit palette */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0276-media-bcm2835-unicam-Add-support-for-12bit-mono-pack.patch b/root/target/linux/bcm27xx/patches-5.15/950-0265-media-bcm2835-unicam-Add-support-for-12bit-mono-pack.patch
similarity index 67%
rename from root/target/linux/bcm27xx/patches-5.15/0276-media-bcm2835-unicam-Add-support-for-12bit-mono-pack.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0265-media-bcm2835-unicam-Add-support-for-12bit-mono-pack.patch
index 47d42f92..0209a66a 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0276-media-bcm2835-unicam-Add-support-for-12bit-mono-pack.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0265-media-bcm2835-unicam-Add-support-for-12bit-mono-pack.patch
@@ -1,7 +1,7 @@
-From c06128d6327e1d90ac90e8ace390b22a6e01749c Mon Sep 17 00:00:00 2001
+From e694cc21f790594776994ae5147d14f3ebcd1a6b Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 25 Jun 2020 17:53:32 +0100
-Subject: [PATCH 276/634] media: bcm2835-unicam: Add support for 12bit mono
+Subject: [PATCH 265/828] media: bcm2835-unicam: Add support for 12bit mono
  packed format
 
 Now that V4L2_PIX_FMT_Y12P is defined, allow passing raw 12bit
@@ -12,11 +12,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index a65e1da55142..5edb58cc9f03 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -336,7 +336,7 @@ static const struct unicam_fmt formats[] = {
+@@ -336,7 +336,7 @@ static const struct unicam_fmt formats[]
  		.depth		= 10,
  		.csi_dt		= 0x2b,
  	}, {
@@ -25,6 +23,3 @@ index a65e1da55142..5edb58cc9f03 100644
  		.repacked_fourcc = V4L2_PIX_FMT_Y12,
  		.code		= MEDIA_BUS_FMT_Y12_1X12,
  		.depth		= 12,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0277-media-bcm2835-unicam-Add-support-for-14bit-mono-sour.patch b/root/target/linux/bcm27xx/patches-5.15/950-0266-media-bcm2835-unicam-Add-support-for-14bit-mono-sour.patch
similarity index 68%
rename from root/target/linux/bcm27xx/patches-5.15/0277-media-bcm2835-unicam-Add-support-for-14bit-mono-sour.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0266-media-bcm2835-unicam-Add-support-for-14bit-mono-sour.patch
index 22b3fd14..f6b34b29 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0277-media-bcm2835-unicam-Add-support-for-14bit-mono-sour.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0266-media-bcm2835-unicam-Add-support-for-14bit-mono-sour.patch
@@ -1,7 +1,7 @@
-From 3466ca9e93c430d7999591d40b7d2fbe921817ca Mon Sep 17 00:00:00 2001
+From a43d8a0a267dd0dead5e96025d0398baf22d9f14 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 25 Jun 2020 18:03:47 +0100
-Subject: [PATCH 277/634] media: bcm2835-unicam: Add support for 14bit mono
+Subject: [PATCH 266/828] media: bcm2835-unicam: Add support for 14bit mono
  sources
 
 Now that V4L2_PIX_FMT_Y14 and V4L2_PIX_FMT_Y14P are defined,
@@ -12,11 +12,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 5edb58cc9f03..778153943160 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -341,6 +341,12 @@ static const struct unicam_fmt formats[] = {
+@@ -341,6 +341,12 @@ static const struct unicam_fmt formats[]
  		.code		= MEDIA_BUS_FMT_Y12_1X12,
  		.depth		= 12,
  		.csi_dt		= 0x2c,
@@ -29,6 +27,3 @@ index 5edb58cc9f03..778153943160 100644
  	},
  	/* Embedded data format */
  	{
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0278-media-bcm2835-unicam-Add-support-for-unpacked-14bit-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0267-media-bcm2835-unicam-Add-support-for-unpacked-14bit-.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0278-media-bcm2835-unicam-Add-support-for-unpacked-14bit-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0267-media-bcm2835-unicam-Add-support-for-unpacked-14bit-.patch
index a6b5eaa6..414fccbf 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0278-media-bcm2835-unicam-Add-support-for-unpacked-14bit-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0267-media-bcm2835-unicam-Add-support-for-unpacked-14bit-.patch
@@ -1,7 +1,7 @@
-From 396f29920d1891edc3abf41a14a5977557acb930 Mon Sep 17 00:00:00 2001
+From d69f889162a61d8888f36f34328088eebf1b4268 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 1 Jul 2020 10:57:57 +0100
-Subject: [PATCH 278/634] media: bcm2835-unicam: Add support for unpacked 14bit
+Subject: [PATCH 267/828] media: bcm2835-unicam: Add support for unpacked 14bit
  Bayer formats
 
 Now that the 14bit non-packed Bayer formats are defined, add them
@@ -12,11 +12,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 778153943160..c97ecfc0e55b 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -299,21 +299,25 @@ static const struct unicam_fmt formats[] = {
+@@ -299,21 +299,25 @@ static const struct unicam_fmt formats[]
  		.csi_dt		= 0x2c,
  	}, {
  		.fourcc		= V4L2_PIX_FMT_SBGGR14P,
@@ -42,6 +40,3 @@ index 778153943160..c97ecfc0e55b 100644
  		.code		= MEDIA_BUS_FMT_SRGGB14_1X14,
  		.depth		= 14,
  		.csi_dt		= 0x2d,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0279-bcm2835-dma-Add-NO_WAIT_RESP-flag.patch b/root/target/linux/bcm27xx/patches-5.15/950-0268-bcm2835-dma-Add-NO_WAIT_RESP-flag.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0279-bcm2835-dma-Add-NO_WAIT_RESP-flag.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0268-bcm2835-dma-Add-NO_WAIT_RESP-flag.patch
index c5e88fc6..e658af62 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0279-bcm2835-dma-Add-NO_WAIT_RESP-flag.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0268-bcm2835-dma-Add-NO_WAIT_RESP-flag.patch
@@ -1,7 +1,7 @@
-From 00c4d89cfbb12261105488c664d6c77c65601b89 Mon Sep 17 00:00:00 2001
+From e994133f68d6e4c2470132c3ce9ebc1a0cb23097 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Wed, 1 Jul 2020 20:28:27 +0100
-Subject: [PATCH 279/634] bcm2835-dma: Add NO_WAIT_RESP flag
+Subject: [PATCH 268/828] bcm2835-dma: Add NO_WAIT_RESP flag
 
 Use bit 27 of the dreq value (the second cell of the DT DMA descriptor)
 to request that the WAIT_RESP bit is not set.
@@ -11,8 +11,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/dma/bcm2835-dma.c | 11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index ac0458a8027f..84b1009da23b 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -165,6 +165,11 @@ struct bcm2835_desc {
@@ -27,7 +25,7 @@ index ac0458a8027f..84b1009da23b 100644
  /* debug register bits */
  #define BCM2835_DMA_DEBUG_LAST_NOT_SET_ERR	BIT(0)
  #define BCM2835_DMA_DEBUG_FIFO_ERR		BIT(1)
-@@ -843,7 +848,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_memcpy(
+@@ -843,7 +848,7 @@ static struct dma_async_tx_descriptor *b
  	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
  	struct bcm2835_desc *d;
  	u32 info = BCM2835_DMA_D_INC | BCM2835_DMA_S_INC;
@@ -36,7 +34,7 @@ index ac0458a8027f..84b1009da23b 100644
  	size_t max_len = bcm2835_dma_max_frame_length(c);
  	size_t frames;
  
-@@ -873,7 +878,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_slave_sg(
+@@ -873,7 +878,7 @@ 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;
@@ -45,7 +43,7 @@ index ac0458a8027f..84b1009da23b 100644
  	u32 extra = BCM2835_DMA_INT_EN;
  	size_t frames;
  
-@@ -935,7 +940,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic(
+@@ -935,7 +940,7 @@ 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;
@@ -54,6 +52,3 @@ index ac0458a8027f..84b1009da23b 100644
  	u32 extra = 0;
  	size_t max_len = bcm2835_dma_max_frame_length(c);
  	size_t frames;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0280-media-i2c-imx290-Explicitly-set-v-h-blank-on-mode-ch.patch b/root/target/linux/bcm27xx/patches-5.15/950-0269-media-i2c-imx290-Explicitly-set-v-h-blank-on-mode-ch.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0280-media-i2c-imx290-Explicitly-set-v-h-blank-on-mode-ch.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0269-media-i2c-imx290-Explicitly-set-v-h-blank-on-mode-ch.patch
index 4dc7989d..b35cdb03 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0280-media-i2c-imx290-Explicitly-set-v-h-blank-on-mode-ch.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0269-media-i2c-imx290-Explicitly-set-v-h-blank-on-mode-ch.patch
@@ -1,7 +1,7 @@
-From 39366dc393052244557e03bc60b0c699a7215b44 Mon Sep 17 00:00:00 2001
+From 75af184001cebce51d587f90f9ef3023e24bf1a8 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 7 Jul 2020 10:31:53 +0100
-Subject: [PATCH 280/634] media: i2c: imx290: Explicitly set v&h blank on mode
+Subject: [PATCH 269/828] media: i2c: imx290: Explicitly set v&h blank on mode
  change
 
 __v4l2_ctrl_modify_range only updates the current value should
@@ -16,11 +16,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/imx290.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index e64124a521b2..0b520a7f88b1 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
-@@ -796,17 +796,23 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,
+@@ -796,17 +796,23 @@ static int imx290_set_fmt(struct v4l2_su
  			__v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate,
  						 imx290_calc_pixel_rate(imx290));
  
@@ -46,6 +44,3 @@ index e64124a521b2..0b520a7f88b1 100644
  		if (imx290->exposure)
  			__v4l2_ctrl_modify_range(imx290->exposure,
  						 mode->vmax - mode->height,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0281-media-i2c-imx290-Add-support-for-g_selection-to-repo.patch b/root/target/linux/bcm27xx/patches-5.15/950-0270-media-i2c-imx290-Add-support-for-g_selection-to-repo.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0281-media-i2c-imx290-Add-support-for-g_selection-to-repo.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0270-media-i2c-imx290-Add-support-for-g_selection-to-repo.patch
index a54900dc..550b3588 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0281-media-i2c-imx290-Add-support-for-g_selection-to-repo.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0270-media-i2c-imx290-Add-support-for-g_selection-to-repo.patch
@@ -1,7 +1,7 @@
-From cc8f2e3149131c17e432f72e8f4fa13a5f5496c6 Mon Sep 17 00:00:00 2001
+From 336d37ffea42dd3de607c2d5207a5e0956404532 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 7 Jul 2020 11:23:48 +0100
-Subject: [PATCH 281/634] media: i2c: imx290: Add support for g_selection to
+Subject: [PATCH 270/828] media: i2c: imx290: Add support for g_selection to
  report cropping
 
 Userspace needs to know the cropping arrangements for each mode,
@@ -12,8 +12,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/imx290.c | 84 ++++++++++++++++++++++++++++++++++++++
  1 file changed, 84 insertions(+)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 0b520a7f88b1..e475d7889bc8 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -61,6 +61,13 @@ enum imx290_clk_index {
@@ -38,7 +36,7 @@ index 0b520a7f88b1..e475d7889bc8 100644
  
  	const struct imx290_regval *data;
  	u32 data_size;
-@@ -384,6 +392,12 @@ static const struct imx290_mode imx290_modes_2lanes[] = {
+@@ -384,6 +392,12 @@ static const struct imx290_mode imx290_m
  		.hmax = 0x1130,
  		.vmax = 0x0465,
  		.link_freq_index = FREQ_INDEX_1080P,
@@ -51,7 +49,7 @@ index 0b520a7f88b1..e475d7889bc8 100644
  		.data = imx290_1080p_settings,
  		.data_size = ARRAY_SIZE(imx290_1080p_settings),
  		.clk_data = {
-@@ -398,6 +412,12 @@ static const struct imx290_mode imx290_modes_2lanes[] = {
+@@ -398,6 +412,12 @@ static const struct imx290_mode imx290_m
  		.hmax = 0x19c8,
  		.vmax = 0x02ee,
  		.link_freq_index = FREQ_INDEX_720P,
@@ -64,7 +62,7 @@ index 0b520a7f88b1..e475d7889bc8 100644
  		.data = imx290_720p_settings,
  		.data_size = ARRAY_SIZE(imx290_720p_settings),
  		.clk_data = {
-@@ -415,6 +435,12 @@ static const struct imx290_mode imx290_modes_4lanes[] = {
+@@ -415,6 +435,12 @@ static const struct imx290_mode imx290_m
  		.hmax = 0x0898,
  		.vmax = 0x0465,
  		.link_freq_index = FREQ_INDEX_1080P,
@@ -77,7 +75,7 @@ index 0b520a7f88b1..e475d7889bc8 100644
  		.data = imx290_1080p_settings,
  		.data_size = ARRAY_SIZE(imx290_1080p_settings),
  		.clk_data = {
-@@ -429,6 +455,12 @@ static const struct imx290_mode imx290_modes_4lanes[] = {
+@@ -429,6 +455,12 @@ static const struct imx290_mode imx290_m
  		.hmax = 0x0ce4,
  		.vmax = 0x02ee,
  		.link_freq_index = FREQ_INDEX_720P,
@@ -90,7 +88,7 @@ index 0b520a7f88b1..e475d7889bc8 100644
  		.data = imx290_720p_settings,
  		.data_size = ARRAY_SIZE(imx290_720p_settings),
  		.clk_data = {
-@@ -875,6 +907,57 @@ static int imx290_write_current_format(struct imx290 *imx290)
+@@ -875,6 +907,57 @@ static int imx290_write_current_format(s
  	return 0;
  }
  
@@ -148,7 +146,7 @@ index 0b520a7f88b1..e475d7889bc8 100644
  /* Start streaming */
  static int imx290_start_streaming(struct imx290 *imx290)
  {
-@@ -1069,6 +1152,7 @@ static const struct v4l2_subdev_pad_ops imx290_pad_ops = {
+@@ -1069,6 +1152,7 @@ static const struct v4l2_subdev_pad_ops
  	.enum_frame_size = imx290_enum_frame_size,
  	.get_fmt = imx290_get_fmt,
  	.set_fmt = imx290_set_fmt,
@@ -156,6 +154,3 @@ index 0b520a7f88b1..e475d7889bc8 100644
  };
  
  static const struct v4l2_subdev_ops imx290_subdev_ops = {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0282-media-i2c-imx290-Set-the-colorspace-fields-in-the-fo.patch b/root/target/linux/bcm27xx/patches-5.15/950-0271-media-i2c-imx290-Set-the-colorspace-fields-in-the-fo.patch
similarity index 75%
rename from root/target/linux/bcm27xx/patches-5.15/0282-media-i2c-imx290-Set-the-colorspace-fields-in-the-fo.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0271-media-i2c-imx290-Set-the-colorspace-fields-in-the-fo.patch
index 1a1e9282..0a4dd83d 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0282-media-i2c-imx290-Set-the-colorspace-fields-in-the-fo.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0271-media-i2c-imx290-Set-the-colorspace-fields-in-the-fo.patch
@@ -1,7 +1,7 @@
-From c0fbab7215131c62cebced2061e9eec01c9ee905 Mon Sep 17 00:00:00 2001
+From ba542e7de1fecea9e6000746420e8ed7bcbf4fa3 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 7 Jul 2020 11:51:26 +0100
-Subject: [PATCH 282/634] media: i2c: imx290: Set the colorspace fields in the
+Subject: [PATCH 271/828] media: i2c: imx290: Set the colorspace fields in the
  format
 
 The colorspace fields were left untouched in imx290_set_fmt
@@ -12,11 +12,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/imx290.c | 8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index e475d7889bc8..def5e8fe41a0 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
-@@ -813,6 +813,14 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,
+@@ -813,6 +813,14 @@ static int imx290_set_fmt(struct v4l2_su
  
  	fmt->format.code = imx290->formats[i].code;
  	fmt->format.field = V4L2_FIELD_NONE;
@@ -31,6 +29,3 @@ index e475d7889bc8..def5e8fe41a0 100644
  
  	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
  		format = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0283-media-bcm2835-unicam-Reinstate-V4L2_CAP_READWRITE-in.patch b/root/target/linux/bcm27xx/patches-5.15/950-0272-media-bcm2835-unicam-Reinstate-V4L2_CAP_READWRITE-in.patch
similarity index 71%
rename from root/target/linux/bcm27xx/patches-5.15/0283-media-bcm2835-unicam-Reinstate-V4L2_CAP_READWRITE-in.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0272-media-bcm2835-unicam-Reinstate-V4L2_CAP_READWRITE-in.patch
index 47ef2d4f..e5906978 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0283-media-bcm2835-unicam-Reinstate-V4L2_CAP_READWRITE-in.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0272-media-bcm2835-unicam-Reinstate-V4L2_CAP_READWRITE-in.patch
@@ -1,7 +1,7 @@
-From f913f7dfed8c4bca106e1ef056ec8cac0530d8cc Mon Sep 17 00:00:00 2001
+From 4bacf6ce08c3aef11d509f1eebb0dadbaf163a60 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 7 Jul 2020 14:23:40 +0100
-Subject: [PATCH 283/634] media: bcm2835-unicam: Reinstate V4L2_CAP_READWRITE
+Subject: [PATCH 272/828] media: bcm2835-unicam: Reinstate V4L2_CAP_READWRITE
  in the caps
 
 v4l2-compliance throws a failure if the device doesn't advertise
@@ -13,11 +13,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index c97ecfc0e55b..20b46a9e04c3 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -2418,8 +2418,8 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2418,8 +2418,8 @@ static int register_node(struct unicam_d
  	vdev->queue = q;
  	vdev->lock = &node->lock;
  	vdev->device_caps = (pad_id == IMAGE_PAD) ?
@@ -28,6 +26,3 @@ index c97ecfc0e55b..20b46a9e04c3 100644
  
  	/* Define the device names */
  	snprintf(vdev->name, sizeof(vdev->name), "%s-%s", UNICAM_MODULE_NAME,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0284-media-bcm2835-unicam-Ensure-type-is-VIDEO_CAPTURE-in.patch b/root/target/linux/bcm27xx/patches-5.15/950-0273-media-bcm2835-unicam-Ensure-type-is-VIDEO_CAPTURE-in.patch
similarity index 65%
rename from root/target/linux/bcm27xx/patches-5.15/0284-media-bcm2835-unicam-Ensure-type-is-VIDEO_CAPTURE-in.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0273-media-bcm2835-unicam-Ensure-type-is-VIDEO_CAPTURE-in.patch
index dcfbe4da..6e7a0a44 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0284-media-bcm2835-unicam-Ensure-type-is-VIDEO_CAPTURE-in.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0273-media-bcm2835-unicam-Ensure-type-is-VIDEO_CAPTURE-in.patch
@@ -1,7 +1,7 @@
-From 2874d4b6d2ef8192b3402e85bfeef70549ca3440 Mon Sep 17 00:00:00 2001
+From f539fc4ca993d3160672468efc47ae40e0b8e4b5 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 7 Jul 2020 14:52:43 +0100
-Subject: [PATCH 284/634] media: bcm2835-unicam: Ensure type is VIDEO_CAPTURE
+Subject: [PATCH 273/828] media: bcm2835-unicam: Ensure type is VIDEO_CAPTURE
  in [g|s]_selection
 
 [g|s]_selection pass in a buffer type that needs to be validated
@@ -12,11 +12,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 20b46a9e04c3..de288f87ff2f 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -1885,6 +1885,9 @@ static int unicam_s_selection(struct file *file, void *priv,
+@@ -1885,6 +1885,9 @@ static int unicam_s_selection(struct fil
  		.r = sel->r,
  	};
  
@@ -26,7 +24,7 @@ index 20b46a9e04c3..de288f87ff2f 100644
  	return v4l2_subdev_call(dev->sensor, pad, set_selection, NULL, &sdsel);
  }
  
-@@ -1899,6 +1902,9 @@ static int unicam_g_selection(struct file *file, void *priv,
+@@ -1899,6 +1902,9 @@ static int unicam_g_selection(struct fil
  	};
  	int ret;
  
@@ -36,6 +34,3 @@ index 20b46a9e04c3..de288f87ff2f 100644
  	ret = v4l2_subdev_call(dev->sensor, pad, get_selection, NULL, &sdsel);
  	if (!ret)
  		sel->r = sdsel.r;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0285-media-bcm2835-unicam-Set-VPU-min-clock-freq-to-250Mh.patch b/root/target/linux/bcm27xx/patches-5.15/950-0274-media-bcm2835-unicam-Set-VPU-min-clock-freq-to-250Mh.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0285-media-bcm2835-unicam-Set-VPU-min-clock-freq-to-250Mh.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0274-media-bcm2835-unicam-Set-VPU-min-clock-freq-to-250Mh.patch
index b1768026..82596f93 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0285-media-bcm2835-unicam-Set-VPU-min-clock-freq-to-250Mh.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0274-media-bcm2835-unicam-Set-VPU-min-clock-freq-to-250Mh.patch
@@ -1,7 +1,7 @@
-From c5dae8d2fc9c5fa939e46ed65fd4755d1a0884a5 Mon Sep 17 00:00:00 2001
+From 73b93cea92035fa11dc2a8e2f91ac797ba6da31a Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Mon, 11 May 2020 13:02:22 +0100
-Subject: [PATCH 285/634] media: bcm2835: unicam: Set VPU min clock freq to
+Subject: [PATCH 274/828] media: bcm2835: unicam: Set VPU min clock freq to
  250Mhz.
 
 When streaming with Unicam, the VPU must have a clock frequency of at
@@ -13,22 +13,20 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  .../media/platform/bcm2835/bcm2835-unicam.c   | 49 +++++++++++++++++--
  1 file changed, 44 insertions(+), 5 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index de288f87ff2f..295db7564614 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -88,6 +88,11 @@ MODULE_PARM_DESC(debug, "Debug level 0-3");
- #define unicam_err(dev, fmt, arg...)	\
+@@ -89,6 +89,11 @@ MODULE_PARM_DESC(debug, "Debug level 0-3
  		v4l2_err(&(dev)->v4l2_dev, fmt, ##arg)
  
-+/*
+ /*
 + * Unicam must request a minimum of 250Mhz from the VPU clock.
 + * Otherwise the input FIFOs overrun and cause image corruption.
 + */
 +#define MIN_VPU_CLOCK_RATE (250 * 1000 * 1000)
- /*
++/*
   * To protect against a dodgy sensor driver never returning an error from
   * enum_mbus_code, set a maximum index value to be used.
+  */
 @@ -417,8 +422,10 @@ struct unicam_device {
  	void __iomem *base;
  	/* clock gating base address */
@@ -41,7 +39,7 @@ index de288f87ff2f..295db7564614 100644
  	/* V4l2 device */
  	struct v4l2_device v4l2_dev;
  	struct media_device mdev;
-@@ -1678,16 +1685,28 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -1678,16 +1685,28 @@ static int unicam_start_streaming(struct
  	unicam_dbg(1, dev, "Running with %u data lanes\n",
  		   dev->active_data_lanes);
  
@@ -73,7 +71,7 @@ index de288f87ff2f..295db7564614 100644
  	}
  
  	for (i = 0; i < ARRAY_SIZE(dev->node); i++) {
-@@ -1721,6 +1740,11 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -1721,6 +1740,11 @@ static int unicam_start_streaming(struct
  err_disable_unicam:
  	unicam_disable(dev);
  	clk_disable_unprepare(dev->clock);
@@ -85,7 +83,7 @@ index de288f87ff2f..295db7564614 100644
  err_pm_put:
  	unicam_runtime_put(dev);
  err_streaming:
-@@ -1738,6 +1762,8 @@ static void unicam_stop_streaming(struct vb2_queue *vq)
+@@ -1738,6 +1762,8 @@ static void unicam_stop_streaming(struct
  	node->streaming = false;
  
  	if (node->pad_id == IMAGE_PAD) {
@@ -94,7 +92,7 @@ index de288f87ff2f..295db7564614 100644
  		/*
  		 * Stop streaming the sensor and disable the peripheral.
  		 * We cannot continue streaming embedded data with the
-@@ -1747,6 +1773,12 @@ static void unicam_stop_streaming(struct vb2_queue *vq)
+@@ -1747,6 +1773,12 @@ static void unicam_stop_streaming(struct
  			unicam_err(dev, "stream off failed in subdev\n");
  
  		unicam_disable(dev);
@@ -107,7 +105,7 @@ index de288f87ff2f..295db7564614 100644
  		clk_disable_unprepare(dev->clock);
  		unicam_runtime_put(dev);
  
-@@ -2750,11 +2782,18 @@ static int unicam_probe(struct platform_device *pdev)
+@@ -2750,11 +2782,18 @@ static int unicam_probe(struct platform_
  
  	unicam->clock = devm_clk_get(&pdev->dev, "lp");
  	if (IS_ERR(unicam->clock)) {
@@ -127,6 +125,3 @@ index de288f87ff2f..295db7564614 100644
  	ret = platform_get_irq(pdev, 0);
  	if (ret <= 0) {
  		dev_err(&pdev->dev, "No IRQ resource\n");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0286-dt-bindings-bcm2835-unicam-Update-documentation-with.patch b/root/target/linux/bcm27xx/patches-5.15/950-0275-dt-bindings-bcm2835-unicam-Update-documentation-with.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0286-dt-bindings-bcm2835-unicam-Update-documentation-with.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0275-dt-bindings-bcm2835-unicam-Update-documentation-with.patch
index 90077288..fe889d4f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0286-dt-bindings-bcm2835-unicam-Update-documentation-with.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0275-dt-bindings-bcm2835-unicam-Update-documentation-with.patch
@@ -1,7 +1,7 @@
-From d182870d1e653448c9000920f5bfbb4b66f2e59c Mon Sep 17 00:00:00 2001
+From 6ed27bd2c323b83fb2d6b1c5eeebef602789ccce Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Mon, 11 May 2020 13:06:27 +0100
-Subject: [PATCH 286/634] dt-bindings: bcm2835-unicam: Update documentation
+Subject: [PATCH 275/828] dt-bindings: bcm2835-unicam: Update documentation
  with new clock params
 
 Update the documentation to reflect the new "VPU" clock needed
@@ -12,8 +12,6 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  .../devicetree/bindings/media/bcm2835-unicam.txt          | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/Documentation/devicetree/bindings/media/bcm2835-unicam.txt b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt
-index 7714fb374b34..164d0377dcd2 100644
 --- a/Documentation/devicetree/bindings/media/bcm2835-unicam.txt
 +++ b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt
 @@ -20,7 +20,7 @@ Required properties:
@@ -38,6 +36,3 @@ index 7714fb374b34..164d0377dcd2 100644
  		port {
  			csi1_ep: endpoint {
  				remote-endpoint = <&tc358743_0>;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0287-leds-Add-the-actpwr-trigger.patch b/root/target/linux/bcm27xx/patches-5.15/950-0276-leds-Add-the-actpwr-trigger.patch
similarity index 91%
rename from root/target/linux/bcm27xx/patches-5.15/0287-leds-Add-the-actpwr-trigger.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0276-leds-Add-the-actpwr-trigger.patch
index 9eff38f8..a343362e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0287-leds-Add-the-actpwr-trigger.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0276-leds-Add-the-actpwr-trigger.patch
@@ -1,7 +1,7 @@
-From a7c746bd0a854b6d7269403806a55b5306e904d3 Mon Sep 17 00:00:00 2001
+From 70353a1e17cef57776c44221e2694350572d1800 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Mon, 13 Jul 2020 10:33:19 +0100
-Subject: [PATCH 287/634] leds: Add the actpwr trigger
+Subject: [PATCH 276/828] leds: Add the actpwr trigger
 
 The actpwr trigger is a meta trigger that cycles between an inverted
 mmc0 and default-on. It is written in a way that could fairly easily
@@ -15,8 +15,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  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 1d8341f3a6fe..9fbdf5ff3f7e 100644
 --- a/drivers/leds/trigger/Kconfig
 +++ b/drivers/leds/trigger/Kconfig
 @@ -160,4 +160,15 @@ config LEDS_TRIGGER_TTY
@@ -35,18 +33,13 @@ index 1d8341f3a6fe..9fbdf5ff3f7e 100644
 +	  If unsure, say N.
 +
  endif # LEDS_TRIGGERS
-diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile
-index 5b6bc14865ea..8bcb57669549 100644
 --- a/drivers/leds/trigger/Makefile
 +++ b/drivers/leds/trigger/Makefile
-@@ -17,3 +17,4 @@ obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
+@@ -17,3 +17,4 @@ obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= led
  obj-$(CONFIG_LEDS_TRIGGER_PATTERN)	+= ledtrig-pattern.o
  obj-$(CONFIG_LEDS_TRIGGER_AUDIO)	+= ledtrig-audio.o
  obj-$(CONFIG_LEDS_TRIGGER_TTY)		+= ledtrig-tty.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..1a52107ceb03
 --- /dev/null
 +++ b/drivers/leds/trigger/ledtrig-actpwr.c
 @@ -0,0 +1,190 @@
@@ -240,6 +233,3 @@ index 000000000000..1a52107ceb03
 +MODULE_AUTHOR("Phil Elwell <phil@raspberrypi.com>");
 +MODULE_DESCRIPTION("ACT/PWR LED trigger");
 +MODULE_LICENSE("GPL v2");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0288-bcm2835-dma-Advertise-the-full-DMA-range.patch b/root/target/linux/bcm27xx/patches-5.15/950-0277-bcm2835-dma-Advertise-the-full-DMA-range.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0288-bcm2835-dma-Advertise-the-full-DMA-range.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0277-bcm2835-dma-Advertise-the-full-DMA-range.patch
index 059ee721..c64b62aa 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0288-bcm2835-dma-Advertise-the-full-DMA-range.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0277-bcm2835-dma-Advertise-the-full-DMA-range.patch
@@ -1,7 +1,7 @@
-From 4f12cb13425f321e565fcb0ed671b94e588a9479 Mon Sep 17 00:00:00 2001
+From c55328861f2cd5d6c7f3aafbb1f1610e4e2b1f53 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Wed, 22 Jul 2020 17:59:31 +0100
-Subject: [PATCH 288/634] bcm2835-dma: Advertise the full DMA range
+Subject: [PATCH 277/828] bcm2835-dma: Advertise the full DMA range
 
 Unless the DMA mask is set wider than 32 bits, DMA mapping will use a
 bounce buffer.
@@ -11,8 +11,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/dma/bcm2835-dma.c | 18 +++++++++++++++---
  1 file changed, 15 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index 84b1009da23b..d1127b9058a4 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -41,6 +41,7 @@
@@ -36,7 +34,7 @@ index 84b1009da23b..d1127b9058a4 100644
  };
  
  static inline size_t bcm2835_dma_max_frame_length(struct bcm2835_chan *c)
-@@ -1180,6 +1183,8 @@ static struct dma_chan *bcm2835_dma_xlate(struct of_phandle_args *spec,
+@@ -1180,6 +1183,8 @@ static struct dma_chan *bcm2835_dma_xlat
  
  static int bcm2835_dma_probe(struct platform_device *pdev)
  {
@@ -45,7 +43,7 @@ index 84b1009da23b..d1127b9058a4 100644
  	struct bcm2835_dmadev *od;
  	struct resource *res;
  	void __iomem *base;
-@@ -1189,13 +1194,20 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
+@@ -1189,13 +1194,20 @@ static int bcm2835_dma_probe(struct plat
  	int irq_flags;
  	uint32_t chans_available;
  	char chan_name[BCM2835_DMA_CHAN_NAME_SIZE];
@@ -68,7 +66,7 @@ index 84b1009da23b..d1127b9058a4 100644
  	if (rc) {
  		dev_err(&pdev->dev, "Unable to set DMA mask\n");
  		return rc;
-@@ -1260,7 +1272,7 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
+@@ -1260,7 +1272,7 @@ static int bcm2835_dma_probe(struct plat
  		return -EINVAL;
  	}
  
@@ -77,6 +75,3 @@ index 84b1009da23b..d1127b9058a4 100644
  
  	/* Request DMA channel mask from device tree */
  	if (of_property_read_u32(pdev->dev.of_node,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0289-media-bcm2835-unicam-Select-MEDIA_CONTROLLER-and-VID.patch b/root/target/linux/bcm27xx/patches-5.15/950-0278-media-bcm2835-unicam-Select-MEDIA_CONTROLLER-and-VID.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0289-media-bcm2835-unicam-Select-MEDIA_CONTROLLER-and-VID.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0278-media-bcm2835-unicam-Select-MEDIA_CONTROLLER-and-VID.patch
index a52469d1..67b2812b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0289-media-bcm2835-unicam-Select-MEDIA_CONTROLLER-and-VID.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0278-media-bcm2835-unicam-Select-MEDIA_CONTROLLER-and-VID.patch
@@ -1,7 +1,7 @@
-From dc0b7f5f09f9198c8f79cf5dc93c448e2144d61c Mon Sep 17 00:00:00 2001
+From 62b6ba2a4a377ffbf8a870fe3fb2f388a6d10972 Mon Sep 17 00:00:00 2001
 From: Hristo Venev <hristo@venev.name>
 Date: Wed, 19 Aug 2020 17:02:22 +0300
-Subject: [PATCH 289/634] media: bcm2835: unicam: Select MEDIA_CONTROLLER and
+Subject: [PATCH 278/828] media: bcm2835: unicam: Select MEDIA_CONTROLLER and
  VIDEO_V4L2_SUBDEV_API
 
 That is what almost all other drivers appear to be doing.
@@ -11,8 +11,6 @@ Signed-off-by: Hristo Venev <hristo@venev.name>
  drivers/media/platform/bcm2835/Kconfig | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/media/platform/bcm2835/Kconfig b/drivers/media/platform/bcm2835/Kconfig
-index ec46e3ef053c..7d5a0e6ba762 100644
 --- a/drivers/media/platform/bcm2835/Kconfig
 +++ b/drivers/media/platform/bcm2835/Kconfig
 @@ -2,8 +2,10 @@
@@ -27,6 +25,3 @@ index ec46e3ef053c..7d5a0e6ba762 100644
  	select VIDEOBUF2_DMA_CONTIG
  	select V4L2_FWNODE
  	help
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0290-staging-media-rpivid-Select-MEDIA_CONTROLLER-and-MED.patch b/root/target/linux/bcm27xx/patches-5.15/950-0279-staging-media-rpivid-Select-MEDIA_CONTROLLER-and-MED.patch
similarity index 79%
rename from root/target/linux/bcm27xx/patches-5.15/0290-staging-media-rpivid-Select-MEDIA_CONTROLLER-and-MED.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0279-staging-media-rpivid-Select-MEDIA_CONTROLLER-and-MED.patch
index bdeb4dd9..feac2735 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0290-staging-media-rpivid-Select-MEDIA_CONTROLLER-and-MED.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0279-staging-media-rpivid-Select-MEDIA_CONTROLLER-and-MED.patch
@@ -1,7 +1,7 @@
-From 5c507d2993ffea964f7c2b84d77056fad43fc577 Mon Sep 17 00:00:00 2001
+From e258f855941d3c021c84bcc84d434d0036318d7d Mon Sep 17 00:00:00 2001
 From: Hristo Venev <hristo@venev.name>
 Date: Wed, 19 Aug 2020 17:05:53 +0300
-Subject: [PATCH 290/634] staging: media: rpivid: Select MEDIA_CONTROLLER and
+Subject: [PATCH 279/828] staging: media: rpivid: Select MEDIA_CONTROLLER and
  MEDIA_CONTROLLER_REQUEST_API
 
 MEDIA_CONTROLLER_REQUEST_API is a hidden option. If rpivid depends on it,
@@ -16,8 +16,6 @@ Signed-off-by: Hristo Venev <hristo@venev.name>
  drivers/staging/media/rpivid/Kconfig | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/Kconfig b/drivers/staging/media/rpivid/Kconfig
-index 58b470c80db1..304c3edf0e71 100644
 --- a/drivers/staging/media/rpivid/Kconfig
 +++ b/drivers/staging/media/rpivid/Kconfig
 @@ -3,9 +3,9 @@
@@ -32,6 +30,3 @@ index 58b470c80db1..304c3edf0e71 100644
  	select VIDEOBUF2_DMA_CONTIG
  	select V4L2_MEM2MEM_DEV
  	help
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0291-media-bcm2835-unicam-Drop-WARN-on-uing-direct-cache-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0280-media-bcm2835-unicam-Drop-WARN-on-uing-direct-cache-.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0291-media-bcm2835-unicam-Drop-WARN-on-uing-direct-cache-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0280-media-bcm2835-unicam-Drop-WARN-on-uing-direct-cache-.patch
index 13c25e91..2e08e2d5 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0291-media-bcm2835-unicam-Drop-WARN-on-uing-direct-cache-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0280-media-bcm2835-unicam-Drop-WARN-on-uing-direct-cache-.patch
@@ -1,7 +1,7 @@
-From 2718a4d208663cc700091e4425fbe65ec6a5d675 Mon Sep 17 00:00:00 2001
+From 9d6d90c0e9ecf8f36ca28da9e39d415127312482 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 27 Aug 2020 16:30:26 +0100
-Subject: [PATCH 291/634] media: bcm2835-unicam: Drop WARN on uing direct cache
+Subject: [PATCH 280/828] media: bcm2835-unicam: Drop WARN on uing direct cache
  alias
 
 Pi 0&1 pass all ARM accesses through the VPU L2 cache, therefore
@@ -16,11 +16,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 7 -------
  1 file changed, 7 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 295db7564614..35ddb97f7f75 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -709,13 +709,6 @@ static void unicam_wr_dma_addr(struct unicam_device *dev, dma_addr_t dmaaddr,
+@@ -709,13 +709,6 @@ static void unicam_wr_dma_addr(struct un
  {
  	dma_addr_t endaddr = dmaaddr + buffer_size;
  
@@ -34,6 +32,3 @@ index 295db7564614..35ddb97f7f75 100644
  	if (pad_id == IMAGE_PAD) {
  		reg_write(dev, UNICAM_IBSA0, dmaaddr);
  		reg_write(dev, UNICAM_IBEA0, endaddr);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0292-media-i2c-tc358743-Only-allow-supported-pixel-fmts-i.patch b/root/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-tc358743-Only-allow-supported-pixel-fmts-i.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0292-media-i2c-tc358743-Only-allow-supported-pixel-fmts-i.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-tc358743-Only-allow-supported-pixel-fmts-i.patch
index 7df7cf94..2f5d2987 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0292-media-i2c-tc358743-Only-allow-supported-pixel-fmts-i.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-tc358743-Only-allow-supported-pixel-fmts-i.patch
@@ -1,7 +1,7 @@
-From a3640287a8c2d3d52c05b56eac8d3ee1ac7c48c3 Mon Sep 17 00:00:00 2001
+From 692dee676e10354bcf065691bf8a2059676ba9bd Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 10 Jul 2020 12:40:50 +0100
-Subject: [PATCH 292/634] media: i2c: tc358743: Only allow supported pixel fmts
+Subject: [PATCH 281/828] media: i2c: tc358743: Only allow supported pixel fmts
  in set_fmt
 
 Fix commit "media: tc358743: Return an appropriate colorspace from
@@ -13,11 +13,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/tc358743.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
-index 2985dd9e46cd..da166e6a41d6 100644
 --- a/drivers/media/i2c/tc358743.c
 +++ b/drivers/media/i2c/tc358743.c
-@@ -1731,8 +1731,10 @@ static int tc358743_set_fmt(struct v4l2_subdev *sd,
+@@ -1731,8 +1731,10 @@ static int tc358743_set_fmt(struct v4l2_
  	u32 code = format->format.code; /* is overwritten by get_fmt */
  	int ret = tc358743_get_fmt(sd, sd_state, format);
  
@@ -30,6 +28,3 @@ index 2985dd9e46cd..da166e6a41d6 100644
  
  	if (ret)
  		return ret;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0293-dwc_otg-whitelist_table-is-now-productlist_table.patch b/root/target/linux/bcm27xx/patches-5.15/950-0282-dwc_otg-whitelist_table-is-now-productlist_table.patch
similarity index 64%
rename from root/target/linux/bcm27xx/patches-5.15/0293-dwc_otg-whitelist_table-is-now-productlist_table.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0282-dwc_otg-whitelist_table-is-now-productlist_table.patch
index b2224a52..2914065f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0293-dwc_otg-whitelist_table-is-now-productlist_table.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0282-dwc_otg-whitelist_table-is-now-productlist_table.patch
@@ -1,17 +1,15 @@
-From 8124b96e672788e7c1df43a88aa89f8aa64a61b9 Mon Sep 17 00:00:00 2001
+From c649548b2353449c02dcf5602c812b9368cc2d19 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Thu, 3 Sep 2020 14:02:41 +0100
-Subject: [PATCH 293/634] dwc_otg: whitelist_table is now productlist_table
+Subject: [PATCH 282/828] dwc_otg: whitelist_table is now productlist_table
 
 ---
  drivers/usb/core/otg_productlist.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/usb/core/otg_productlist.h b/drivers/usb/core/otg_productlist.h
-index 1839e169469b..b16e528859a8 100644
 --- a/drivers/usb/core/otg_productlist.h
 +++ b/drivers/usb/core/otg_productlist.h
-@@ -139,7 +139,7 @@ static int is_targeted(struct usb_device *dev)
+@@ -139,7 +139,7 @@ static int is_targeted(struct usb_device
  		/* NOTE: can't use usb_match_id() since interface caches
  		 * aren't set up yet. this is cut/paste from that code.
  		 */
@@ -20,6 +18,3 @@ index 1839e169469b..b16e528859a8 100644
  #ifdef DEBUG
  			dev_dbg(&dev->dev,
  				"ID: V:%04x P:%04x DC:%04x SC:%04x PR:%04x \n",
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0294-include-firmware-Add-enum-for-RPI_FIRMWARE_FRAMEBUFF.patch b/root/target/linux/bcm27xx/patches-5.15/950-0283-include-firmware-Add-enum-for-RPI_FIRMWARE_FRAMEBUFF.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0294-include-firmware-Add-enum-for-RPI_FIRMWARE_FRAMEBUFF.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0283-include-firmware-Add-enum-for-RPI_FIRMWARE_FRAMEBUFF.patch
index f4094964..44862f76 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0294-include-firmware-Add-enum-for-RPI_FIRMWARE_FRAMEBUFF.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0283-include-firmware-Add-enum-for-RPI_FIRMWARE_FRAMEBUFF.patch
@@ -1,7 +1,7 @@
-From 822365ad80675dd82e8715193380e1bcdc37d15e Mon Sep 17 00:00:00 2001
+From 88b24e6b683a5ecb71763e7c0bed9a4a6212f549 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 3 Sep 2020 17:09:07 +0100
-Subject: [PATCH 294/634] include/firmware: Add enum for
+Subject: [PATCH 283/828] include/firmware: Add enum for
  RPI_FIRMWARE_FRAMEBUFFER_GET_DISPLAY_ID
 
 Used by audio and FKMS.
@@ -11,11 +11,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  include/soc/bcm2835/raspberrypi-firmware.h | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index 5ccd6dd0b74e..23f51be65801 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
-@@ -112,6 +112,7 @@ enum rpi_firmware_property_tag {
+@@ -113,6 +113,7 @@ enum rpi_firmware_property_tag {
  	RPI_FIRMWARE_FRAMEBUFFER_GET_TOUCHBUF =               0x0004000f,
  	RPI_FIRMWARE_FRAMEBUFFER_GET_GPIOVIRTBUF =            0x00040010,
  	RPI_FIRMWARE_FRAMEBUFFER_RELEASE =                    0x00048001,
@@ -23,6 +21,3 @@ index 5ccd6dd0b74e..23f51be65801 100644
  	RPI_FIRMWARE_FRAMEBUFFER_SET_DISPLAY_NUM =            0x00048013,
  	RPI_FIRMWARE_FRAMEBUFFER_GET_NUM_DISPLAYS =           0x00040013,
  	RPI_FIRMWARE_FRAMEBUFFER_GET_DISPLAY_SETTINGS =       0x00040014,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0295-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch b/root/target/linux/bcm27xx/patches-5.15/950-0284-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch
similarity index 98%
rename from root/target/linux/bcm27xx/patches-5.15/0295-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0284-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch
index 2438502c..38fa9731 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0295-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0284-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch
@@ -1,7 +1,7 @@
-From cef671803306de7087c11804f41eef28f1d4bec8 Mon Sep 17 00:00:00 2001
+From 3bc981920e05533a269944a67f64f3ad5cecc4bf Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Fri, 8 May 2020 10:00:12 +0100
-Subject: [PATCH 295/634] media: i2c: Add driver for Sony IMX477 sensor
+Subject: [PATCH 284/828] media: i2c: Add driver for Sony IMX477 sensor
 
 Adds a driver for the 12MPix Sony IMX477 CSI2 sensor.
 Whilst the sensor supports 2 or 4 CSI2 data lanes, this driver
@@ -23,11 +23,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  4 files changed, 2211 insertions(+)
  create mode 100644 drivers/media/i2c/imx477.c
 
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 77181bae6abe..4682efb95b40 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -17513,6 +17513,14 @@ T:	git git://linuxtv.org/media_tree.git
+@@ -17514,6 +17514,14 @@ T:	git git://linuxtv.org/media_tree.git
  F:	Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
  F:	drivers/media/i2c/imx412.c
  
@@ -42,8 +40,6 @@ index 77181bae6abe..4682efb95b40 100644
  SONY MEMORYSTICK SUBSYSTEM
  M:	Maxim Levitsky <maximlevitsky@gmail.com>
  M:	Alex Dubov <oakad@yahoo.com>
-diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index f5eec949a93e..a27c1bc63d7d 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
 @@ -817,6 +817,17 @@ config VIDEO_IMX290
@@ -64,8 +60,6 @@ index f5eec949a93e..a27c1bc63d7d 100644
  config VIDEO_IMX319
  	tristate "Sony IMX319 sensor support"
  	depends on I2C && VIDEO_V4L2
-diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
-index ceba2bbf43d2..d3442a07e1f4 100644
 --- a/drivers/media/i2c/Makefile
 +++ b/drivers/media/i2c/Makefile
 @@ -124,6 +124,7 @@ obj-$(CONFIG_VIDEO_IMX219)	+= imx219.o
@@ -76,9 +70,6 @@ index ceba2bbf43d2..d3442a07e1f4 100644
  obj-$(CONFIG_VIDEO_IMX319)	+= imx319.o
  obj-$(CONFIG_VIDEO_IMX334)	+= imx334.o
  obj-$(CONFIG_VIDEO_IMX335)	+= imx335.o
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-new file mode 100644
-index 000000000000..db615dbe1497
 --- /dev/null
 +++ b/drivers/media/i2c/imx477.c
 @@ -0,0 +1,2191 @@
@@ -2273,6 +2264,3 @@ index 000000000000..db615dbe1497
 +MODULE_AUTHOR("Naushir Patuck <naush@raspberrypi.com>");
 +MODULE_DESCRIPTION("Sony IMX477 sensor driver");
 +MODULE_LICENSE("GPL v2");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0296-media-i2c-imx477-Add-support-for-adaptive-frame-cont.patch b/root/target/linux/bcm27xx/patches-5.15/950-0285-media-i2c-imx477-Add-support-for-adaptive-frame-cont.patch
similarity index 90%
rename from root/target/linux/bcm27xx/patches-5.15/0296-media-i2c-imx477-Add-support-for-adaptive-frame-cont.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0285-media-i2c-imx477-Add-support-for-adaptive-frame-cont.patch
index 36720fef..2c5469b1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0296-media-i2c-imx477-Add-support-for-adaptive-frame-cont.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0285-media-i2c-imx477-Add-support-for-adaptive-frame-cont.patch
@@ -1,7 +1,7 @@
-From 37f3a1f0ec4979d914ace6ce4ddb0f2c2616c9fe Mon Sep 17 00:00:00 2001
+From 072aea36712e7f23afb4bf29fed11829825948c3 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Fri, 8 May 2020 09:41:17 +0100
-Subject: [PATCH 296/634] media: i2c: imx477: Add support for adaptive frame
+Subject: [PATCH 285/828] media: i2c: imx477: Add support for adaptive frame
  control
 
 Use V4L2_CID_EXPOSURE_AUTO_PRIORITY to control if the driver should
@@ -13,8 +13,6 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  drivers/media/i2c/imx477.c | 113 +++++++++++++++++++++++++++++--------
  1 file changed, 91 insertions(+), 22 deletions(-)
 
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index db615dbe1497..f76582f27181 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
 @@ -1082,6 +1082,8 @@ struct imx477 {
@@ -26,7 +24,7 @@ index db615dbe1497..f76582f27181 100644
  
  	/* Current mode */
  	const struct imx477_mode *mode;
-@@ -1278,6 +1280,72 @@ static int imx477_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+@@ -1278,6 +1280,72 @@ static int imx477_open(struct v4l2_subde
  	return 0;
  }
  
@@ -99,7 +97,7 @@ index db615dbe1497..f76582f27181 100644
  static int imx477_set_ctrl(struct v4l2_ctrl *ctrl)
  {
  	struct imx477 *imx477 =
-@@ -1285,17 +1353,13 @@ static int imx477_set_ctrl(struct v4l2_ctrl *ctrl)
+@@ -1285,17 +1353,13 @@ static int imx477_set_ctrl(struct v4l2_c
  	struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
  	int ret = 0;
  
@@ -124,7 +122,7 @@ index db615dbe1497..f76582f27181 100644
  	}
  
  	/*
-@@ -1311,8 +1375,14 @@ static int imx477_set_ctrl(struct v4l2_ctrl *ctrl)
+@@ -1311,8 +1375,14 @@ static int imx477_set_ctrl(struct v4l2_c
  				       IMX477_REG_VALUE_16BIT, ctrl->val);
  		break;
  	case V4L2_CID_EXPOSURE:
@@ -141,7 +139,7 @@ index db615dbe1497..f76582f27181 100644
  		break;
  	case V4L2_CID_DIGITAL_GAIN:
  		ret = imx477_write_reg(imx477, IMX477_REG_DIGITAL_GAIN,
-@@ -1510,9 +1580,8 @@ unsigned int imx477_get_frame_length(const struct imx477_mode *mode,
+@@ -1510,9 +1580,8 @@ unsigned int imx477_get_frame_length(con
  
  static void imx477_set_framing_limits(struct imx477 *imx477)
  {
@@ -152,7 +150,7 @@ index db615dbe1497..f76582f27181 100644
  
  	frm_length_min = imx477_get_frame_length(mode, &mode->timeperframe_min);
  	frm_length_default =
-@@ -1522,15 +1591,10 @@ static void imx477_set_framing_limits(struct imx477 *imx477)
+@@ -1522,15 +1591,10 @@ static void imx477_set_framing_limits(st
  	__v4l2_ctrl_modify_range(imx477->vblank, frm_length_min - mode->height,
  				 IMX477_FRAME_LENGTH_MAX - mode->height,
  				 1, frm_length_default - mode->height);
@@ -170,7 +168,7 @@ index db615dbe1497..f76582f27181 100644
  	/*
  	 * Currently PPL is fixed to the mode specified value, so hblank
  	 * depends on mode->width only, and is not changeable in any
-@@ -1939,6 +2003,11 @@ static int imx477_init_controls(struct imx477 *imx477)
+@@ -1939,6 +2003,11 @@ static int imx477_init_controls(struct i
  			  IMX477_DGTL_GAIN_MIN, IMX477_DGTL_GAIN_MAX,
  			  IMX477_DGTL_GAIN_STEP, IMX477_DGTL_GAIN_DEFAULT);
  
@@ -182,6 +180,3 @@ index db615dbe1497..f76582f27181 100644
  	imx477->hflip = v4l2_ctrl_new_std(ctrl_hdlr, &imx477_ctrl_ops,
  					  V4L2_CID_HFLIP, 0, 1, 1, 0);
  	if (imx477->hflip)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0297-media-i2c-imx477-Return-correct-result-on-sensor-id-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0286-media-i2c-imx477-Return-correct-result-on-sensor-id-.patch
similarity index 64%
rename from root/target/linux/bcm27xx/patches-5.15/0297-media-i2c-imx477-Return-correct-result-on-sensor-id-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0286-media-i2c-imx477-Return-correct-result-on-sensor-id-.patch
index 7521e2a3..2e94de28 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0297-media-i2c-imx477-Return-correct-result-on-sensor-id-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0286-media-i2c-imx477-Return-correct-result-on-sensor-id-.patch
@@ -1,7 +1,7 @@
-From 5d2873369cb47538326d0b943617f60dcf536e38 Mon Sep 17 00:00:00 2001
+From 402ce28359452ff0b6975d9ff40fe9f43be440dc Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Tue, 19 May 2020 16:56:33 +0100
-Subject: [PATCH 297/634] media: i2c: imx477: Return correct result on sensor
+Subject: [PATCH 286/828] media: i2c: imx477: Return correct result on sensor
  id verification
 
 The test should return -EIO if the register read id does not match
@@ -12,11 +12,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  drivers/media/i2c/imx477.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index f76582f27181..f4cdc2d4158e 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
-@@ -1919,7 +1919,7 @@ static int imx477_identify_module(struct imx477 *imx477)
+@@ -1919,7 +1919,7 @@ static int imx477_identify_module(struct
  	if (val != IMX477_CHIP_ID) {
  		dev_err(&client->dev, "chip id mismatch: %x!=%x\n",
  			IMX477_CHIP_ID, val);
@@ -25,6 +23,3 @@ index f76582f27181..f4cdc2d4158e 100644
  	}
  
  	return 0;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0298-media-i2c-imx477-Parse-and-register-properties.patch b/root/target/linux/bcm27xx/patches-5.15/950-0287-media-i2c-imx477-Parse-and-register-properties.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0298-media-i2c-imx477-Parse-and-register-properties.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0287-media-i2c-imx477-Parse-and-register-properties.patch
index 52e80d86..00863536 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0298-media-i2c-imx477-Parse-and-register-properties.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0287-media-i2c-imx477-Parse-and-register-properties.patch
@@ -1,7 +1,7 @@
-From 833a9887211e38ccecf569a00bcba8441f23a3f0 Mon Sep 17 00:00:00 2001
+From 6f7e138c837d78d8eb018318dd57fab282053661 Mon Sep 17 00:00:00 2001
 From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 Date: Sat, 4 Jul 2020 01:45:08 +0300
-Subject: [PATCH 298/634] media: i2c: imx477: Parse and register properties
+Subject: [PATCH 287/828] media: i2c: imx477: Parse and register properties
 
 Parse device properties and register controls for them using the V4L2
 fwnode properties helpers.
@@ -11,11 +11,9 @@ Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  drivers/media/i2c/imx477.c | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index f4cdc2d4158e..d0848f3f3c09 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
-@@ -1957,11 +1957,12 @@ static int imx477_init_controls(struct imx477 *imx477)
+@@ -1957,11 +1957,12 @@ static int imx477_init_controls(struct i
  {
  	struct v4l2_ctrl_handler *ctrl_hdlr;
  	struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
@@ -29,7 +27,7 @@ index f4cdc2d4158e..d0848f3f3c09 100644
  	if (ret)
  		return ret;
  
-@@ -2045,6 +2046,15 @@ static int imx477_init_controls(struct imx477 *imx477)
+@@ -2045,6 +2046,15 @@ static int imx477_init_controls(struct i
  		goto error;
  	}
  
@@ -45,6 +43,3 @@ index f4cdc2d4158e..d0848f3f3c09 100644
  	imx477->sd.ctrl_handler = ctrl_hdlr;
  
  	/* Setup exposure and frame/line length limits. */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0299-media-bcm2835-unicam-Always-service-interrupts.patch b/root/target/linux/bcm27xx/patches-5.15/950-0288-media-bcm2835-unicam-Always-service-interrupts.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0299-media-bcm2835-unicam-Always-service-interrupts.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0288-media-bcm2835-unicam-Always-service-interrupts.patch
index 40f8e52a..04fd7e50 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0299-media-bcm2835-unicam-Always-service-interrupts.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0288-media-bcm2835-unicam-Always-service-interrupts.patch
@@ -1,7 +1,7 @@
-From b589da3b957ecb32ecd7585c7b4de15df9d9b52c Mon Sep 17 00:00:00 2001
+From 7edc0a3573e0a0815faa5294237421fc1b4eb984 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 13 May 2020 18:28:27 +0100
-Subject: [PATCH 299/634] media: bcm2835-unicam: Always service interrupts
+Subject: [PATCH 288/828] media: bcm2835-unicam: Always service interrupts
 
 From when bringing up the driver, there was a check in the isr
 to ignore interrupts (claiming them handled) should the driver
@@ -18,11 +18,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 15 ---------------
  1 file changed, 15 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 35ddb97f7f75..d4ba911fe7e7 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -782,12 +782,6 @@ static bool unicam_all_nodes_streaming(struct unicam_device *dev)
+@@ -782,12 +782,6 @@ static bool unicam_all_nodes_streaming(s
  	return ret;
  }
  
@@ -35,7 +33,7 @@ index 35ddb97f7f75..d4ba911fe7e7 100644
  static void unicam_queue_event_sof(struct unicam_device *unicam)
  {
  	struct v4l2_event event = {
-@@ -815,15 +809,6 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -815,15 +809,6 @@ static irqreturn_t unicam_isr(int irq, v
  	u32 ista, sta;
  	u64 ts;
  
@@ -51,6 +49,3 @@ index 35ddb97f7f75..d4ba911fe7e7 100644
  	sta = reg_read(unicam, UNICAM_STA);
  	/* Write value back to clear the interrupts */
  	reg_write(unicam, UNICAM_STA, sta);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0300-media-bcm2835-unicam-Fix-uninitialized-warning.patch b/root/target/linux/bcm27xx/patches-5.15/950-0289-media-bcm2835-unicam-Fix-uninitialized-warning.patch
similarity index 60%
rename from root/target/linux/bcm27xx/patches-5.15/0300-media-bcm2835-unicam-Fix-uninitialized-warning.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0289-media-bcm2835-unicam-Fix-uninitialized-warning.patch
index dda099e9..8fd3d56e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0300-media-bcm2835-unicam-Fix-uninitialized-warning.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0289-media-bcm2835-unicam-Fix-uninitialized-warning.patch
@@ -1,18 +1,16 @@
-From f943e8dbf2fa62acc9d77ce895d3c5899239ac6a Mon Sep 17 00:00:00 2001
+From 3fff6028cfaf9b1d0ca574af041e0863c3bac11b Mon Sep 17 00:00:00 2001
 From: Jacko Dirks <jdirks.linuxdev@gmail.com>
 Date: Tue, 5 May 2020 14:33:31 +0200
-Subject: [PATCH 300/634] media: bcm2835: unicam: Fix uninitialized warning
+Subject: [PATCH 289/828] media: bcm2835: unicam: Fix uninitialized warning
 
 Signed-off-by: Jacko Dirks <jdirks.linuxdev@gmail.com>
 ---
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index d4ba911fe7e7..8b091d3a0d15 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -1004,7 +1004,7 @@ const struct unicam_fmt *get_first_supported_format(struct unicam_device *dev)
+@@ -1004,7 +1004,7 @@ const struct unicam_fmt *get_first_suppo
  	struct v4l2_subdev_mbus_code_enum mbus_code;
  	const struct unicam_fmt *fmt = NULL;
  	unsigned int i;
@@ -21,6 +19,3 @@ index d4ba911fe7e7..8b091d3a0d15 100644
  
  	for (i = 0; ret != -EINVAL && ret != -ENOIOCTLCMD; ++i) {
  		memset(&mbus_code, 0, sizeof(mbus_code));
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0301-media-bcm2835-unicam-Fixup-review-comments-from-Hans.patch b/root/target/linux/bcm27xx/patches-5.15/950-0290-media-bcm2835-unicam-Fixup-review-comments-from-Hans.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0301-media-bcm2835-unicam-Fixup-review-comments-from-Hans.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0290-media-bcm2835-unicam-Fixup-review-comments-from-Hans.patch
index 6033edf5..6cabff3f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0301-media-bcm2835-unicam-Fixup-review-comments-from-Hans.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0290-media-bcm2835-unicam-Fixup-review-comments-from-Hans.patch
@@ -1,7 +1,7 @@
-From c8bfaea94286d96bffdb68069340ad276a039393 Mon Sep 17 00:00:00 2001
+From 8427d4405154c6b5e72416e408d6386e0710246a Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 23 Jun 2020 15:14:05 +0100
-Subject: [PATCH 301/634] media: bcm2835-unicam: Fixup review comments from
+Subject: [PATCH 290/828] media: bcm2835-unicam: Fixup review comments from
  Hans.
 
 Updates the driver based on the upstream review comments from
@@ -13,8 +13,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../media/platform/bcm2835/bcm2835-unicam.c   | 70 ++++++++-----------
  2 files changed, 39 insertions(+), 43 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/Kconfig b/drivers/media/platform/bcm2835/Kconfig
-index 7d5a0e6ba762..bd1370199650 100644
 --- a/drivers/media/platform/bcm2835/Kconfig
 +++ b/drivers/media/platform/bcm2835/Kconfig
 @@ -1,7 +1,7 @@
@@ -43,8 +41,6 @@ index 7d5a0e6ba762..bd1370199650 100644
  
  	  To compile this driver as a module, choose M here. The module will be
  	  called bcm2835-unicam.
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 8b091d3a0d15..7dc96c3e8e83 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -1,6 +1,6 @@
@@ -55,7 +51,7 @@ index 8b091d3a0d15..7dc96c3e8e83 100644
   *
   * Copyright (C) 2017-2020 - Raspberry Pi (Trading) Ltd.
   *
-@@ -571,9 +571,8 @@ static const struct unicam_fmt *find_format_by_pix(struct unicam_device *dev,
+@@ -571,9 +571,8 @@ static const struct unicam_fmt *find_for
  	return NULL;
  }
  
@@ -67,7 +63,7 @@ index 8b091d3a0d15..7dc96c3e8e83 100644
  {
  	if (v4l2_fourcc == fmt->repacked_fourcc)
  		/* Repacking always goes to 16bpp */
-@@ -718,7 +717,7 @@ static void unicam_wr_dma_addr(struct unicam_device *dev, dma_addr_t dmaaddr,
+@@ -718,7 +717,7 @@ static void unicam_wr_dma_addr(struct un
  	}
  }
  
@@ -76,7 +72,7 @@ index 8b091d3a0d15..7dc96c3e8e83 100644
  {
  	dma_addr_t start_addr, cur_addr;
  	unsigned int stride = dev->node[IMAGE_PAD].v_fmt.fmt.pix.bytesperline;
-@@ -732,7 +731,7 @@ static inline unsigned int unicam_get_lines_done(struct unicam_device *dev)
+@@ -732,7 +731,7 @@ static inline unsigned int unicam_get_li
  	return (unsigned int)(cur_addr - start_addr) / stride;
  }
  
@@ -85,7 +81,7 @@ index 8b091d3a0d15..7dc96c3e8e83 100644
  {
  	struct unicam_device *dev = node->dev;
  	struct unicam_buffer *buf;
-@@ -751,7 +750,7 @@ static inline void unicam_schedule_next_buffer(struct unicam_node *node)
+@@ -751,7 +750,7 @@ static inline void unicam_schedule_next_
  	unicam_wr_dma_addr(dev, addr, size, node->pad_id);
  }
  
@@ -94,7 +90,7 @@ index 8b091d3a0d15..7dc96c3e8e83 100644
  {
  	struct unicam_device *dev = node->dev;
  
-@@ -763,8 +762,8 @@ static inline void unicam_schedule_dummy_buffer(struct unicam_node *node)
+@@ -763,8 +762,8 @@ static inline void unicam_schedule_dummy
  	node->next_frm = NULL;
  }
  
@@ -105,7 +101,7 @@ index 8b091d3a0d15..7dc96c3e8e83 100644
  {
  	node->cur_frm->vb.field = node->m_fmt.field;
  	node->cur_frm->vb.sequence = sequence;
-@@ -772,16 +771,6 @@ static inline void unicam_process_buffer_complete(struct unicam_node *node,
+@@ -772,16 +771,6 @@ static inline void unicam_process_buffer
  	vb2_buffer_done(&node->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
  }
  
@@ -122,7 +118,7 @@ index 8b091d3a0d15..7dc96c3e8e83 100644
  static void unicam_queue_event_sof(struct unicam_device *unicam)
  {
  	struct v4l2_event event = {
-@@ -904,8 +893,8 @@ static int unicam_querycap(struct file *file, void *priv,
+@@ -904,8 +893,8 @@ static int unicam_querycap(struct file *
  	struct unicam_node *node = video_drvdata(file);
  	struct unicam_device *dev = node->dev;
  
@@ -133,7 +129,7 @@ index 8b091d3a0d15..7dc96c3e8e83 100644
  
  	snprintf(cap->bus_info, sizeof(cap->bus_info),
  		 "platform:%s", dev_name(&dev->pdev->dev));
-@@ -998,8 +987,8 @@ static int unicam_g_fmt_vid_cap(struct file *file, void *priv,
+@@ -998,8 +987,8 @@ static int unicam_g_fmt_vid_cap(struct f
  	return 0;
  }
  
@@ -144,7 +140,7 @@ index 8b091d3a0d15..7dc96c3e8e83 100644
  {
  	struct v4l2_subdev_mbus_code_enum mbus_code;
  	const struct unicam_fmt *fmt = NULL;
-@@ -1589,7 +1578,8 @@ static void unicam_disable(struct unicam_device *dev)
+@@ -1589,7 +1578,8 @@ static void unicam_disable(struct unicam
  	clk_write(dev, 0);
  }
  
@@ -154,7 +150,7 @@ index 8b091d3a0d15..7dc96c3e8e83 100644
  {
  	struct unicam_buffer *buf, *tmp;
  	unsigned long flags;
-@@ -1597,15 +1587,15 @@ static void unicam_return_buffers(struct unicam_node *node)
+@@ -1597,15 +1587,15 @@ static void unicam_return_buffers(struct
  	spin_lock_irqsave(&node->dma_queue_lock, flags);
  	list_for_each_entry_safe(buf, tmp, &node->dma_queue, list) {
  		list_del(&buf->list);
@@ -173,7 +169,7 @@ index 8b091d3a0d15..7dc96c3e8e83 100644
  
  	node->cur_frm = NULL;
  	node->next_frm = NULL;
-@@ -1622,7 +1612,13 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -1622,7 +1612,13 @@ static int unicam_start_streaming(struct
  	int ret;
  
  	node->streaming = true;
@@ -188,7 +184,7 @@ index 8b091d3a0d15..7dc96c3e8e83 100644
  		unicam_dbg(3, dev, "Not all nodes are streaming yet.");
  		return 0;
  	}
-@@ -1726,7 +1722,7 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -1726,7 +1722,7 @@ err_vpu_clock:
  err_pm_put:
  	unicam_runtime_put(dev);
  err_streaming:
@@ -197,7 +193,7 @@ index 8b091d3a0d15..7dc96c3e8e83 100644
  	node->streaming = false;
  
  	return ret;
-@@ -1771,7 +1767,7 @@ static void unicam_stop_streaming(struct vb2_queue *vq)
+@@ -1771,7 +1767,7 @@ static void unicam_stop_streaming(struct
  	}
  
  	/* Clear all queued buffers for the node */
@@ -206,7 +202,7 @@ index 8b091d3a0d15..7dc96c3e8e83 100644
  }
  
  static int unicam_enum_input(struct file *file, void *priv,
-@@ -1789,14 +1785,13 @@ static int unicam_enum_input(struct file *file, void *priv,
+@@ -1789,14 +1785,13 @@ static int unicam_enum_input(struct file
  		inp->std = 0;
  	} else if (v4l2_subdev_has_op(dev->sensor, video, s_std)) {
  		inp->capabilities = V4L2_IN_CAP_STD;
@@ -223,7 +219,7 @@ index 8b091d3a0d15..7dc96c3e8e83 100644
  	return 0;
  }
  
-@@ -2025,6 +2020,9 @@ static int unicam_s_dv_timings(struct file *file, void *priv,
+@@ -2025,6 +2020,9 @@ static int unicam_s_dv_timings(struct fi
  	ret = v4l2_subdev_call(dev->sensor, video, g_dv_timings,
  			       &current_timings);
  
@@ -233,7 +229,7 @@ index 8b091d3a0d15..7dc96c3e8e83 100644
  	if (v4l2_match_dv_timings(timings, &current_timings, 0, false))
  		return 0;
  
-@@ -2455,12 +2453,6 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2455,12 +2453,6 @@ static int register_node(struct unicam_d
  		unicam_err(unicam, "Unable to allocate dummy buffer.\n");
  		return -ENOMEM;
  	}
@@ -246,6 +242,3 @@ index 8b091d3a0d15..7dc96c3e8e83 100644
  	if (pad_id == METADATA_PAD ||
  	    !v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
  		v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_STD);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0302-media-bcm2835-unicam-Retain-packing-information-on-G.patch b/root/target/linux/bcm27xx/patches-5.15/950-0291-media-bcm2835-unicam-Retain-packing-information-on-G.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0302-media-bcm2835-unicam-Retain-packing-information-on-G.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0291-media-bcm2835-unicam-Retain-packing-information-on-G.patch
index 89c90da5..f4ac92f1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0302-media-bcm2835-unicam-Retain-packing-information-on-G.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0291-media-bcm2835-unicam-Retain-packing-information-on-G.patch
@@ -1,7 +1,7 @@
-From e5c39181d39d310db2f002d738137ad5674c51ce Mon Sep 17 00:00:00 2001
+From cc5c79ff2363c03db2d229ad5ae6a1f16f0fc0f6 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 19 May 2020 11:46:47 +0100
-Subject: [PATCH 302/634] media: bcm2835-unicam: Retain packing information on
+Subject: [PATCH 291/828] media: bcm2835-unicam: Retain packing information on
  G_FMT
 
 The change to retrieve the pixel format always on g_fmt didn't
@@ -18,11 +18,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../media/platform/bcm2835/bcm2835-unicam.c   | 19 +++++++++++++++++--
  1 file changed, 17 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 7dc96c3e8e83..98ae97c367ea 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -980,8 +980,23 @@ static int unicam_g_fmt_vid_cap(struct file *file, void *priv,
+@@ -980,8 +980,23 @@ static int unicam_g_fmt_vid_cap(struct f
  	if (!fmt)
  		return -EINVAL;
  
@@ -48,6 +46,3 @@ index 7dc96c3e8e83..98ae97c367ea 100644
  	*f = node->v_fmt;
  
  	return 0;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0303-media-bcm2835-unicam-change-minimum-number-of-vb2_qu.patch b/root/target/linux/bcm27xx/patches-5.15/950-0292-media-bcm2835-unicam-change-minimum-number-of-vb2_qu.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0303-media-bcm2835-unicam-change-minimum-number-of-vb2_qu.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0292-media-bcm2835-unicam-change-minimum-number-of-vb2_qu.patch
index 3f547e71..09f9a5b3 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0303-media-bcm2835-unicam-change-minimum-number-of-vb2_qu.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0292-media-bcm2835-unicam-change-minimum-number-of-vb2_qu.patch
@@ -1,7 +1,7 @@
-From c17550f4c669f2af62d41443192302cb09f318ea Mon Sep 17 00:00:00 2001
+From 85b5e180ee0045776a8cb0b87ca80accd387f8ff Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Thu, 28 May 2020 11:09:48 +0100
-Subject: [PATCH 303/634] media: bcm2835-unicam: change minimum number of
+Subject: [PATCH 292/828] media: bcm2835-unicam: change minimum number of
  vb2_queue buffers to 1
 
 Since the unicam driver was modified to write to a dummy buffer when no
@@ -15,11 +15,9 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 98ae97c367ea..6501fb205e20 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -2428,7 +2428,7 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2428,7 +2428,7 @@ static int register_node(struct unicam_d
  	q->buf_struct_size = sizeof(struct unicam_buffer);
  	q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
  	q->lock = &node->lock;
@@ -28,6 +26,3 @@ index 98ae97c367ea..6501fb205e20 100644
  	q->dev = &unicam->pdev->dev;
  
  	ret = vb2_queue_init(q);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0304-staging-fbtft-Add-support-for-display-variants.patch b/root/target/linux/bcm27xx/patches-5.15/950-0293-staging-fbtft-Add-support-for-display-variants.patch
similarity index 84%
rename from root/target/linux/bcm27xx/patches-5.15/0304-staging-fbtft-Add-support-for-display-variants.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0293-staging-fbtft-Add-support-for-display-variants.patch
index 91f5ca0f..4653a5fd 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0304-staging-fbtft-Add-support-for-display-variants.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0293-staging-fbtft-Add-support-for-display-variants.patch
@@ -1,7 +1,7 @@
-From c18f95d2d74f4cb357c5d8ee793ed43bbe0464ef Mon Sep 17 00:00:00 2001
+From 75c3e47d6f43fdb76e440708bd064bfd64c74375 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Tue, 1 Sep 2020 18:15:27 +0100
-Subject: [PATCH 304/634] staging/fbtft: Add support for display variants
+Subject: [PATCH 293/828] staging/fbtft: Add support for display variants
 
 Display variants are intended as a replacement for the now-deleted
 fbtft_device drivers. Drivers can register additional compatible
@@ -18,8 +18,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/staging/fbtft/fbtft.h      | 28 +++++++++++++++++-----
  3 files changed, 74 insertions(+), 8 deletions(-)
 
-diff --git a/drivers/staging/fbtft/fb_st7735r.c b/drivers/staging/fbtft/fb_st7735r.c
-index 9670a8989b91..1a3219657cbb 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..1a3219657cbb 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..1a3219657cbb 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 ed992ca605eb..6b194bf3089c 100644
 --- a/drivers/staging/fbtft/fbtft-core.c
 +++ b/drivers/staging/fbtft/fbtft-core.c
 @@ -24,6 +24,8 @@
@@ -99,7 +95,7 @@ index ed992ca605eb..6b194bf3089c 100644
  
  #include <video/mipi_display.h>
  
-@@ -1191,6 +1193,7 @@ static struct fbtft_platform_data *fbtft_properties_read(struct device *dev)
+@@ -1184,6 +1186,7 @@ static struct fbtft_platform_data *fbtft
   * @display: Display properties
   * @sdev: SPI device
   * @pdev: Platform device
@@ -107,7 +103,7 @@ index ed992ca605eb..6b194bf3089c 100644
   *
   * Allocates, initializes and registers a framebuffer
   *
-@@ -1200,12 +1203,15 @@ static struct fbtft_platform_data *fbtft_properties_read(struct device *dev)
+@@ -1193,12 +1196,15 @@ static struct fbtft_platform_data *fbtft
   */
  int fbtft_probe_common(struct fbtft_display *display,
  		       struct spi_device *sdev,
@@ -124,7 +120,7 @@ index ed992ca605eb..6b194bf3089c 100644
  	int ret;
  
  	if (sdev)
-@@ -1221,6 +1227,14 @@ int fbtft_probe_common(struct fbtft_display *display,
+@@ -1214,6 +1220,14 @@ int fbtft_probe_common(struct fbtft_disp
  		pdata = fbtft_properties_read(dev);
  		if (IS_ERR(pdata))
  			return PTR_ERR(pdata);
@@ -139,11 +135,9 @@ index ed992ca605eb..6b194bf3089c 100644
  	}
  
  	info = fbtft_framebuffer_alloc(display, dev, pdata);
-diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
-index 76f8c090a837..f4f5ff0dc0c0 100644
 --- a/drivers/staging/fbtft/fbtft.h
 +++ b/drivers/staging/fbtft/fbtft.h
-@@ -251,7 +251,8 @@ void fbtft_register_backlight(struct fbtft_par *par);
+@@ -251,7 +251,8 @@ void fbtft_register_backlight(struct fbt
  void fbtft_unregister_backlight(struct fbtft_par *par);
  int fbtft_init_display(struct fbtft_par *par);
  int fbtft_probe_common(struct fbtft_display *display, struct spi_device *sdev,
@@ -153,7 +147,7 @@ index 76f8c090a837..f4f5ff0dc0c0 100644
  int fbtft_remove_common(struct device *dev, struct fb_info *info);
  
  /* fbtft-io.c */
-@@ -272,11 +273,13 @@ void fbtft_write_reg8_bus9(struct fbtft_par *par, int len, ...);
+@@ -272,11 +273,13 @@ void fbtft_write_reg8_bus9(struct fbtft_
  void fbtft_write_reg16_bus8(struct fbtft_par *par, int len, ...);
  void fbtft_write_reg16_bus16(struct fbtft_par *par, int len, ...);
  
@@ -169,7 +163,7 @@ index 76f8c090a837..f4f5ff0dc0c0 100644
  }                                                                          \
  									   \
  static int fbtft_driver_remove_spi(struct spi_device *spi)                 \
-@@ -288,7 +291,7 @@ static int fbtft_driver_remove_spi(struct spi_device *spi)                 \
+@@ -288,7 +291,7 @@ static int fbtft_driver_remove_spi(struc
  									   \
  static int fbtft_driver_probe_pdev(struct platform_device *pdev)           \
  {                                                                          \
@@ -178,7 +172,7 @@ index 76f8c090a837..f4f5ff0dc0c0 100644
  }                                                                          \
  									   \
  static int fbtft_driver_remove_pdev(struct platform_device *pdev)          \
-@@ -298,8 +301,16 @@ static int fbtft_driver_remove_pdev(struct platform_device *pdev)          \
+@@ -298,8 +301,16 @@ static int fbtft_driver_remove_pdev(stru
  	return fbtft_remove_common(&pdev->dev, info);                      \
  }                                                                          \
  									   \
@@ -197,7 +191,7 @@ index 76f8c090a837..f4f5ff0dc0c0 100644
  	{},                                                                \
  };                                                                         \
  									   \
-@@ -344,6 +355,11 @@ static void __exit fbtft_driver_module_exit(void)                          \
+@@ -347,6 +358,11 @@ static void __exit fbtft_driver_module_e
  module_init(fbtft_driver_module_init);                                     \
  module_exit(fbtft_driver_module_exit);
  
@@ -209,6 +203,3 @@ index 76f8c090a837..f4f5ff0dc0c0 100644
  /* Debug macros */
  
  /* shorthand debug levels */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0305-brcmfmac-Increase-power-saving-delay-to-2s.patch b/root/target/linux/bcm27xx/patches-5.15/950-0294-brcmfmac-Increase-power-saving-delay-to-2s.patch
similarity index 67%
rename from root/target/linux/bcm27xx/patches-5.15/0305-brcmfmac-Increase-power-saving-delay-to-2s.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0294-brcmfmac-Increase-power-saving-delay-to-2s.patch
index ce6ee35e..54ee5da4 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0305-brcmfmac-Increase-power-saving-delay-to-2s.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0294-brcmfmac-Increase-power-saving-delay-to-2s.patch
@@ -1,7 +1,7 @@
-From 222469104c60a79ff01a87c5edab854ac0097d48 Mon Sep 17 00:00:00 2001
+From 81e36f6e80407745551fc3a3d539d17884ab4c75 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Mon, 3 Feb 2020 09:32:22 +0000
-Subject: [PATCH 305/634] brcmfmac: Increase power saving delay to 2s
+Subject: [PATCH 294/828] brcmfmac: Increase power saving delay to 2s
 
 Increase the delay before entering the lower power state to 2 seconds
 (the maximum allowed) in order to reduce the packet latencies,
@@ -12,11 +12,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-index fefa8c058350..077852e6b049 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -2954,7 +2954,7 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev,
+@@ -2954,7 +2954,7 @@ brcmf_cfg80211_set_power_mgmt(struct wip
  		brcmf_dbg(INFO, "Do not enable power save for P2P clients\n");
  		pm = PM_OFF;
  	}
@@ -25,7 +23,7 @@ index fefa8c058350..077852e6b049 100644
  
  	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM, pm);
  	if (err) {
-@@ -2964,6 +2964,7 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev,
+@@ -2964,6 +2964,7 @@ brcmf_cfg80211_set_power_mgmt(struct wip
  			bphy_err(drvr, "error (%d)\n", err);
  	}
  
@@ -33,6 +31,3 @@ index fefa8c058350..077852e6b049 100644
  	err = brcmf_fil_iovar_int_set(ifp, "pm2_sleep_ret",
  				min_t(u32, timeout, BRCMF_PS_MAX_TIMEOUT_MS));
  	if (err)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0306-rpivid_h265-Fix-width-height-typo.patch b/root/target/linux/bcm27xx/patches-5.15/950-0295-rpivid_h265-Fix-width-height-typo.patch
similarity index 56%
rename from root/target/linux/bcm27xx/patches-5.15/0306-rpivid_h265-Fix-width-height-typo.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0295-rpivid_h265-Fix-width-height-typo.patch
index 4b4a99e9..03865220 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0306-rpivid_h265-Fix-width-height-typo.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0295-rpivid_h265-Fix-width-height-typo.patch
@@ -1,18 +1,16 @@
-From cffee116515b022ab1a0d1357e07afeff755ba39 Mon Sep 17 00:00:00 2001
+From fa7a92e4d08cce95cdbdc0a50d6356e1002ff971 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 21 Sep 2020 14:02:44 +0100
-Subject: [PATCH 306/634] rpivid_h265: Fix width/height typo
+Subject: [PATCH 295/828] rpivid_h265: Fix width/height typo
 
 Signed-off-by: popcornmix <popcornmix@gmail.com>
 ---
  drivers/staging/media/rpivid/rpivid_h265.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
-index 47d4de42c584..b677910e237c 100644
 --- a/drivers/staging/media/rpivid/rpivid_h265.c
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
-@@ -2178,7 +2178,7 @@ static int rpivid_h265_start(struct rpivid_ctx *ctx)
+@@ -2178,7 +2178,7 @@ static int rpivid_h265_start(struct rpiv
  	if (w > 4096)
  		w = 4096;
  	if (h == 0)
@@ -21,6 +19,3 @@ index 47d4de42c584..b677910e237c 100644
  	if (h > 4096)
  		h = 4096;
  	wxh = w * h;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0307-net-bcmgenet-Reset-RBUF-on-first-open.patch b/root/target/linux/bcm27xx/patches-5.15/950-0296-net-bcmgenet-Reset-RBUF-on-first-open.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0307-net-bcmgenet-Reset-RBUF-on-first-open.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0296-net-bcmgenet-Reset-RBUF-on-first-open.patch
index 541dc99e..63a6b490 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0307-net-bcmgenet-Reset-RBUF-on-first-open.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0296-net-bcmgenet-Reset-RBUF-on-first-open.patch
@@ -1,7 +1,7 @@
-From b5663401c5bee3468e7c688403fb299c48795500 Mon Sep 17 00:00:00 2001
+From 6a9182c7a5a363c7e40c21e3779fcd5aca0096f6 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Fri, 25 Sep 2020 15:07:23 +0100
-Subject: [PATCH 307/634] net: bcmgenet: Reset RBUF on first open
+Subject: [PATCH 296/828] net: bcmgenet: Reset RBUF on first open
 
 If the RBUF logic is not reset when the kernel starts then there
 may be some data left over from any network boot loader. If the
@@ -22,11 +22,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/net/ethernet/broadcom/genet/bcmgenet.c | 16 ++++++++++++----
  1 file changed, 12 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-index def2b05974c5..a06354959eae 100644
 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-@@ -3248,7 +3248,7 @@ static void bcmgenet_get_hw_addr(struct bcmgenet_priv *priv,
+@@ -3250,7 +3250,7 @@ static void bcmgenet_get_hw_addr(struct
  }
  
  /* Returns a reusable dma control register value */
@@ -35,7 +33,7 @@ index def2b05974c5..a06354959eae 100644
  {
  	unsigned int i;
  	u32 reg;
-@@ -3273,6 +3273,14 @@ static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv)
+@@ -3275,6 +3275,14 @@ static u32 bcmgenet_dma_disable(struct b
  	udelay(10);
  	bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH);
  
@@ -50,7 +48,7 @@ index def2b05974c5..a06354959eae 100644
  	return dma_ctrl;
  }
  
-@@ -3336,8 +3344,8 @@ static int bcmgenet_open(struct net_device *dev)
+@@ -3338,8 +3346,8 @@ static int bcmgenet_open(struct net_devi
  
  	bcmgenet_set_hw_addr(priv, dev->dev_addr);
  
@@ -61,7 +59,7 @@ index def2b05974c5..a06354959eae 100644
  
  	/* Reinitialize TDMA and RDMA and SW housekeeping */
  	ret = bcmgenet_init_dma(priv);
-@@ -4189,7 +4197,7 @@ static int bcmgenet_resume(struct device *d)
+@@ -4193,7 +4201,7 @@ static int bcmgenet_resume(struct device
  			bcmgenet_hfb_create_rxnfc_filter(priv, rule);
  
  	/* Disable RX/TX DMA and flush TX queues */
@@ -70,6 +68,3 @@ index def2b05974c5..a06354959eae 100644
  
  	/* Reinitialize TDMA and RDMA and SW housekeeping */
  	ret = bcmgenet_init_dma(priv);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0308-char-Add-broadcom-char-drivers-back-to-build-files.patch b/root/target/linux/bcm27xx/patches-5.15/950-0297-char-Add-broadcom-char-drivers-back-to-build-files.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0308-char-Add-broadcom-char-drivers-back-to-build-files.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0297-char-Add-broadcom-char-drivers-back-to-build-files.patch
index efe48db5..ab7b32ab 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0308-char-Add-broadcom-char-drivers-back-to-build-files.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0297-char-Add-broadcom-char-drivers-back-to-build-files.patch
@@ -1,7 +1,7 @@
-From 97950070513d024f98d2e08d5095064dc104af33 Mon Sep 17 00:00:00 2001
+From 448c86dece1a991cc79d94781d3dd349994fa86d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Mon, 28 Sep 2020 20:23:30 +0100
-Subject: [PATCH 308/634] char: Add broadcom char drivers back to build files
+Subject: [PATCH 297/828] char: Add broadcom char drivers back to build files
 
 See: https://github.com/raspberrypi/linux/issues/3875
 Signed-off-by: popcornmix <popcornmix@gmail.com>
@@ -10,8 +10,6 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  drivers/char/Makefile | 1 +
  2 files changed, 3 insertions(+)
 
-diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 740811893c57..61aa4b1e1ff2 100644
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig
 @@ -5,6 +5,8 @@
@@ -23,8 +21,6 @@ index 740811893c57..61aa4b1e1ff2 100644
  source "drivers/tty/Kconfig"
  
  config TTY_PRINTK
-diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index 264eb398fdd4..9bcd7d729cb0 100644
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile
 @@ -46,3 +46,4 @@ obj-$(CONFIG_PS3_FLASH)		+= ps3flash.o
@@ -32,6 +28,3 @@ index 264eb398fdd4..9bcd7d729cb0 100644
  obj-$(CONFIG_POWERNV_OP_PANEL)	+= powernv-op-panel.o
  obj-$(CONFIG_ADI)		+= adi.o
 +obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0309-dwc_otg-initialise-sched_frame-for-periodic-QHs-that.patch b/root/target/linux/bcm27xx/patches-5.15/950-0298-dwc_otg-initialise-sched_frame-for-periodic-QHs-that.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0309-dwc_otg-initialise-sched_frame-for-periodic-QHs-that.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0298-dwc_otg-initialise-sched_frame-for-periodic-QHs-that.patch
index b4ff27b5..91aa72fa 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0309-dwc_otg-initialise-sched_frame-for-periodic-QHs-that.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0298-dwc_otg-initialise-sched_frame-for-periodic-QHs-that.patch
@@ -1,7 +1,7 @@
-From 79e8ff920b0dbab4c0dc185c02b2cd08f1b0a1bf Mon Sep 17 00:00:00 2001
+From 00a5d6a8e935180c400dc63b4d2fcef41ac06895 Mon Sep 17 00:00:00 2001
 From: Jonathan Bell <jonathan@raspberrypi.org>
 Date: Wed, 7 Oct 2020 15:09:29 +0100
-Subject: [PATCH 309/634] dwc_otg: initialise sched_frame for periodic QHs that
+Subject: [PATCH 298/828] dwc_otg: initialise sched_frame for periodic QHs that
  were parked
 
 If a periodic QH has no remaining QTDs, then it is removed from all
@@ -17,11 +17,9 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
-index 2823dc9af63f..4503af692aef 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
-@@ -689,7 +689,11 @@ int dwc_otg_hcd_qh_add(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
+@@ -689,7 +689,11 @@ int dwc_otg_hcd_qh_add(dwc_otg_hcd_t * h
  				     &qh->qh_list_entry);
  		//hcd->fiq_state->kick_np_queues = 1;
  	} else {
@@ -33,6 +31,3 @@ index 2823dc9af63f..4503af692aef 100644
  		if ( !hcd->periodic_qh_count ) {
  			intr_mask.b.sofintr = 1;
  			if (fiq_enable) {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0310-staging-bcm2835-camera-Replace-deprecated-V4L2_PIX_F.patch b/root/target/linux/bcm27xx/patches-5.15/950-0299-staging-bcm2835-camera-Replace-deprecated-V4L2_PIX_F.patch
similarity index 75%
rename from root/target/linux/bcm27xx/patches-5.15/0310-staging-bcm2835-camera-Replace-deprecated-V4L2_PIX_F.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0299-staging-bcm2835-camera-Replace-deprecated-V4L2_PIX_F.patch
index 80d36f15..7cfbaaad 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0310-staging-bcm2835-camera-Replace-deprecated-V4L2_PIX_F.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0299-staging-bcm2835-camera-Replace-deprecated-V4L2_PIX_F.patch
@@ -1,7 +1,7 @@
-From 6d24f9bc5659a4383001e6efc67d059f4353cbea Mon Sep 17 00:00:00 2001
+From ebaa4f49bdbaf073449b5f60e515fd48802a91ad Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 8 Oct 2020 15:35:14 +0100
-Subject: [PATCH 310/634] staging: bcm2835-camera: Replace deprecated
+Subject: [PATCH 299/828] staging: bcm2835-camera: Replace deprecated
  V4L2_PIX_FMT_BGR32
 
 V4L2_PIX_FMT_BGR32 is deprecated as it is ambiguous over where
@@ -17,8 +17,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-index 6b348e399c06..5d14ddb28339 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 @@ -178,7 +178,7 @@ static struct mmal_fmt formats[] = {
@@ -30,6 +28,3 @@ index 6b348e399c06..5d14ddb28339 100644
  		.mmal = MMAL_ENCODING_BGRA,
  		.depth = 32,
  		.mmal_component = COMP_CAMERA,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0311-staging-vc04_services-Add-new-vc-sm-cma-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0300-staging-vc04_services-Add-new-vc-sm-cma-driver.patch
similarity index 97%
rename from root/target/linux/bcm27xx/patches-5.15/0311-staging-vc04_services-Add-new-vc-sm-cma-driver.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0300-staging-vc04_services-Add-new-vc-sm-cma-driver.patch
index b6b17432..73338174 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0311-staging-vc04_services-Add-new-vc-sm-cma-driver.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0300-staging-vc04_services-Add-new-vc-sm-cma-driver.patch
@@ -1,7 +1,7 @@
-From b7e9cd51eeb72d20da4d5c7dd1e104c385b828b8 Mon Sep 17 00:00:00 2001
+From 885f056618d9c2bb03b25be62fc3b7c6b7273499 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 8 Oct 2020 18:49:52 +0100
-Subject: [PATCH 311/634] staging: vc04_services: Add new vc-sm-cma driver
+Subject: [PATCH 300/828] staging: vc04_services: Add new vc-sm-cma driver
 
 Add Broadcom VideoCore Shared Memory support.
 
@@ -36,11 +36,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h
  create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h
 
-diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig
-index cb7c82403dbf..3f2b15a38c4e 100644
 --- a/drivers/staging/vc04_services/Kconfig
 +++ b/drivers/staging/vc04_services/Kconfig
-@@ -43,6 +43,8 @@ source "drivers/staging/vc04_services/bcm2835-audio/Kconfig"
+@@ -43,6 +43,8 @@ source "drivers/staging/vc04_services/bc
  
  source "drivers/staging/vc04_services/bcm2835-camera/Kconfig"
  
@@ -49,8 +47,6 @@ index cb7c82403dbf..3f2b15a38c4e 100644
  source "drivers/staging/vc04_services/vchiq-mmal/Kconfig"
  
  endif
-diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
-index 1fd191e2e2a5..01089f369fb4 100644
 --- a/drivers/staging/vc04_services/Makefile
 +++ b/drivers/staging/vc04_services/Makefile
 @@ -14,6 +14,7 @@ endif
@@ -61,9 +57,6 @@ index 1fd191e2e2a5..01089f369fb4 100644
  
  ccflags-y += -I $(srctree)/$(src)/include
  
-diff --git a/drivers/staging/vc04_services/include/linux/broadcom/vc_sm_cma_ioctl.h b/drivers/staging/vc04_services/include/linux/broadcom/vc_sm_cma_ioctl.h
-new file mode 100644
-index 000000000000..107460ad1be3
 --- /dev/null
 +++ b/drivers/staging/vc04_services/include/linux/broadcom/vc_sm_cma_ioctl.h
 @@ -0,0 +1,114 @@
@@ -181,9 +174,6 @@ index 000000000000..107460ad1be3
 +	 struct vc_sm_cma_ioctl_clean_invalid2)
 +
 +#endif /* __VC_SM_CMA_IOCTL_H */
-diff --git a/drivers/staging/vc04_services/vc-sm-cma/Kconfig b/drivers/staging/vc04_services/vc-sm-cma/Kconfig
-new file mode 100644
-index 000000000000..d812021385a0
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/Kconfig
 @@ -0,0 +1,10 @@
@@ -197,9 +187,6 @@ index 000000000000..d812021385a0
 +	  supports sharing dmabufs with VideoCore.
 +	  This operates over the VCHIQ interface to a service
 +	  running on VideoCore.
-diff --git a/drivers/staging/vc04_services/vc-sm-cma/Makefile b/drivers/staging/vc04_services/vc-sm-cma/Makefile
-new file mode 100644
-index 000000000000..c92a5775c62e
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/Makefile
 @@ -0,0 +1,12 @@
@@ -215,16 +202,10 @@ index 000000000000..c92a5775c62e
 +	vc_sm.o vc_sm_cma_vchi.o
 +
 +obj-$(CONFIG_BCM_VC_SM_CMA) += vc-sm-cma.o
-diff --git a/drivers/staging/vc04_services/vc-sm-cma/TODO b/drivers/staging/vc04_services/vc-sm-cma/TODO
-new file mode 100644
-index 000000000000..ac9b5f8a7389
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/TODO
 @@ -0,0 +1 @@
 +No currently outstanding tasks except some clean-up.
-diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
-new file mode 100644
-index 000000000000..40ce67f06fac
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
 @@ -0,0 +1,1725 @@
@@ -1953,9 +1934,6 @@ index 000000000000..40ce67f06fac
 +MODULE_DESCRIPTION("VideoCore CMA Shared Memory Driver");
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS("platform:vcsm-cma");
-diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h
-new file mode 100644
-index 000000000000..f1c7b95b14ce
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h
 @@ -0,0 +1,84 @@
@@ -2043,9 +2021,6 @@ index 000000000000..f1c7b95b14ce
 +};
 +
 +#endif
-diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
-new file mode 100644
-index 000000000000..122f2f66096f
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
 @@ -0,0 +1,503 @@
@@ -2552,9 +2527,6 @@ index 000000000000..122f2f66096f
 +				       msg, sizeof(*msg), 0, 0, cur_trans_id,
 +				       0);
 +}
-diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h
-new file mode 100644
-index 000000000000..ed881c56d69c
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h
 @@ -0,0 +1,63 @@
@@ -2621,9 +2593,6 @@ index 000000000000..ed881c56d69c
 +				       uint32_t *cur_trans_id);
 +
 +#endif /* __VC_SM_CMA_VCHI_H__INCLUDED__ */
-diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h
-new file mode 100644
-index 000000000000..4e6354000dfd
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h
 @@ -0,0 +1,297 @@
@@ -2924,9 +2893,6 @@ index 000000000000..4e6354000dfd
 +};
 +
 +#endif /* __VC_SM_DEFS_H__INCLUDED__ */
-diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h
-new file mode 100644
-index 000000000000..988fdd967922
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h
 @@ -0,0 +1,28 @@
@@ -2958,6 +2924,3 @@ index 000000000000..988fdd967922
 +int vc_sm_cma_import_dmabuf(struct dma_buf *dmabuf, void **handle);
 +
 +#endif /* __VC_SM_KNL_H__INCLUDED__ */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0312-staging-vchiq-mmal-Add-support-for-14bit-Bayer.patch b/root/target/linux/bcm27xx/patches-5.15/950-0301-staging-vchiq-mmal-Add-support-for-14bit-Bayer.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0312-staging-vchiq-mmal-Add-support-for-14bit-Bayer.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0301-staging-vchiq-mmal-Add-support-for-14bit-Bayer.patch
index 01d20a31..d34966f3 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0312-staging-vchiq-mmal-Add-support-for-14bit-Bayer.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0301-staging-vchiq-mmal-Add-support-for-14bit-Bayer.patch
@@ -1,7 +1,7 @@
-From 24e926d5295903b0a88c8daadf969f4879fdcbcf Mon Sep 17 00:00:00 2001
+From 2bc5f14676874c1188856dbec434133980d0a043 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 6 May 2020 18:09:04 +0100
-Subject: [PATCH 312/634] staging: vchiq-mmal: Add support for 14bit Bayer
+Subject: [PATCH 301/828] staging: vchiq-mmal: Add support for 14bit Bayer
 
 Add in the missing defines.
 
@@ -10,8 +10,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h | 6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-index 44ba91aa6d47..be8af09a6c80 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
 @@ -90,6 +90,12 @@
@@ -27,6 +25,3 @@ index 44ba91aa6d47..be8af09a6c80 100644
  /* 16 bit per pixel Bayer formats. */
  #define MMAL_ENCODING_BAYER_SBGGR16    MMAL_FOURCC('B', 'G', '1', '6')
  #define MMAL_ENCODING_BAYER_SGBRG16    MMAL_FOURCC('G', 'B', '1', '6')
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0313-staging-mmal-vchiq-Add-monochrome-image-formats.patch b/root/target/linux/bcm27xx/patches-5.15/950-0302-staging-mmal-vchiq-Add-monochrome-image-formats.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0313-staging-mmal-vchiq-Add-monochrome-image-formats.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0302-staging-mmal-vchiq-Add-monochrome-image-formats.patch
index 3ce4d277..682c473a 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0313-staging-mmal-vchiq-Add-monochrome-image-formats.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0302-staging-mmal-vchiq-Add-monochrome-image-formats.patch
@@ -1,7 +1,7 @@
-From 5b50741d6f630727cc80054b67ed084f7223e01d Mon Sep 17 00:00:00 2001
+From e321d8f4114f07577edfb1f9b12a49fdab6027c0 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 6 May 2020 18:11:14 +0100
-Subject: [PATCH 313/634] staging: mmal-vchiq: Add monochrome image formats
+Subject: [PATCH 302/828] staging: mmal-vchiq: Add monochrome image formats
 
 Adds support for monochrome image formats in the various
 MIPI packings.
@@ -11,8 +11,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h | 7 +++++++
  1 file changed, 7 insertions(+)
 
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-index be8af09a6c80..897e6cdf8dd9 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
 @@ -102,6 +102,13 @@
@@ -29,6 +27,3 @@ index be8af09a6c80..897e6cdf8dd9 100644
  /** An EGL image handle
   */
  #define MMAL_ENCODING_EGL_IMAGE        MMAL_FOURCC('E', 'G', 'L', 'I')
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0314-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch b/root/target/linux/bcm27xx/patches-5.15/950-0303-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0314-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0303-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch
index 66602eb6..1f295741 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0314-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0303-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch
@@ -1,7 +1,7 @@
-From 8272d70188b150149d7ded62e69efc68dbc5f755 Mon Sep 17 00:00:00 2001
+From 79f235a298faab7bc1fd8c7a2d400f70539ba0c0 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
 Date: Tue, 25 Sep 2018 16:07:55 +0100
-Subject: [PATCH 314/634] staging: mmal-vchiq: Use vc-sm-cma to support zero
+Subject: [PATCH 303/828] staging: mmal-vchiq: Use vc-sm-cma to support zero
  copy
 
 With the vc-sm-cma driver we can support zero copy of buffers between
@@ -15,8 +15,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../vc04_services/vchiq-mmal/mmal-vchiq.h     |  1 +
  4 files changed, 69 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/Kconfig b/drivers/staging/vc04_services/vchiq-mmal/Kconfig
-index c99525a0bb45..a7c1a7bf516e 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/Kconfig
 +++ b/drivers/staging/vc04_services/vchiq-mmal/Kconfig
 @@ -1,6 +1,7 @@
@@ -27,8 +25,6 @@ index c99525a0bb45..a7c1a7bf516e 100644
  	help
  	  Enables the MMAL API over VCHIQ interface as used for the
  	  majority of the multimedia services on VideoCore.
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
-index 58763d6a5003..72e5a0386c5b 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
 @@ -50,6 +50,10 @@ struct mmal_buffer {
@@ -42,8 +38,6 @@ index 58763d6a5003..72e5a0386c5b 100644
  	u32 cmd;		/* MMAL command. 0=data. */
  	unsigned long length;
  	u32 mmal_flags;
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index 38303b030156..c88393f22d87 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -27,9 +27,11 @@
@@ -58,7 +52,7 @@ index 38303b030156..c88393f22d87 100644
  /*
   * maximum number of components supported.
   * This matches the maximum permitted by default on the VPU
-@@ -419,8 +421,13 @@ buffer_from_host(struct vchiq_mmal_instance *instance,
+@@ -419,8 +421,13 @@ buffer_from_host(struct vchiq_mmal_insta
  
  	/* buffer header */
  	m.u.buffer_from_host.buffer_header.cmd = 0;
@@ -74,7 +68,7 @@ index 38303b030156..c88393f22d87 100644
  	m.u.buffer_from_host.buffer_header.alloc_size = buf->buffer_size;
  	if (port->type == MMAL_PORT_TYPE_OUTPUT) {
  		m.u.buffer_from_host.buffer_header.length = 0;
-@@ -586,6 +593,22 @@ static void buffer_to_host_cb(struct vchiq_mmal_instance *instance,
+@@ -586,6 +593,22 @@ static void buffer_to_host_cb(struct vch
  
  		msg_context->u.bulk.status = msg->h.status;
  
@@ -97,7 +91,7 @@ index 38303b030156..c88393f22d87 100644
  	} else if (msg->u.buffer_from_host.buffer_header.length == 0) {
  		/* empty buffer */
  		if (msg->u.buffer_from_host.buffer_header.flags &
-@@ -1530,6 +1553,9 @@ int vchiq_mmal_port_parameter_set(struct vchiq_mmal_instance *instance,
+@@ -1530,6 +1553,9 @@ int vchiq_mmal_port_parameter_set(struct
  
  	mutex_unlock(&instance->vchiq_mutex);
  
@@ -107,7 +101,7 @@ index 38303b030156..c88393f22d87 100644
  	return ret;
  }
  EXPORT_SYMBOL_GPL(vchiq_mmal_port_parameter_set);
-@@ -1698,6 +1724,31 @@ int vchiq_mmal_submit_buffer(struct vchiq_mmal_instance *instance,
+@@ -1698,6 +1724,31 @@ int vchiq_mmal_submit_buffer(struct vchi
  	unsigned long flags = 0;
  	int ret;
  
@@ -139,7 +133,7 @@ index 38303b030156..c88393f22d87 100644
  	ret = buffer_from_host(instance, port, buffer);
  	if (ret == -EINVAL) {
  		/* Port is disabled. Queue for when it is enabled. */
-@@ -1731,6 +1782,16 @@ int mmal_vchi_buffer_cleanup(struct mmal_buffer *buf)
+@@ -1731,6 +1782,16 @@ int mmal_vchi_buffer_cleanup(struct mmal
  		release_msg_context(msg_context);
  	buf->msg_context = NULL;
  
@@ -156,8 +150,6 @@ index 38303b030156..c88393f22d87 100644
  	return 0;
  }
  EXPORT_SYMBOL_GPL(mmal_vchi_buffer_cleanup);
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
-index e87f88f99338..247521fbcc1d 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
 @@ -49,6 +49,7 @@ typedef void (*vchiq_mmal_buffer_cb)(
@@ -168,6 +160,3 @@ index e87f88f99338..247521fbcc1d 100644
  	u32 handle;
  	u32 type; /* port type, cached to use on port info set */
  	u32 index; /* port index, cached to use on port info set */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0315-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0304-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch
similarity index 98%
rename from root/target/linux/bcm27xx/patches-5.15/0315-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0304-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch
index c1aa0a4b..6321c944 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0315-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0304-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch
@@ -1,7 +1,7 @@
-From d158d1bc84ec1b0847851a4fa9df4e5c3b946eff Mon Sep 17 00:00:00 2001
+From fca3a1bd2356cc06a578388ab371c42f90c21b62 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 8 Oct 2020 20:24:12 +0100
-Subject: [PATCH 315/634] staging: vc04_services: Add a V4L2 M2M codec driver
+Subject: [PATCH 304/828] staging: vc04_services: Add a V4L2 M2M codec driver
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -70,11 +70,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  create mode 100644 drivers/staging/vc04_services/bcm2835-codec/TODO
  create mode 100644 drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 
-diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig
-index 3f2b15a38c4e..41e25af802ce 100644
 --- a/drivers/staging/vc04_services/Kconfig
 +++ b/drivers/staging/vc04_services/Kconfig
-@@ -44,6 +44,7 @@ source "drivers/staging/vc04_services/bcm2835-audio/Kconfig"
+@@ -44,6 +44,7 @@ source "drivers/staging/vc04_services/bc
  source "drivers/staging/vc04_services/bcm2835-camera/Kconfig"
  
  source "drivers/staging/vc04_services/vc-sm-cma/Kconfig"
@@ -82,11 +80,9 @@ index 3f2b15a38c4e..41e25af802ce 100644
  
  source "drivers/staging/vc04_services/vchiq-mmal/Kconfig"
  
-diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
-index 01089f369fb4..1a5aa9cc09d3 100644
 --- a/drivers/staging/vc04_services/Makefile
 +++ b/drivers/staging/vc04_services/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_SND_BCM2835)		+= bcm2835-audio/
+@@ -15,6 +15,7 @@ obj-$(CONFIG_SND_BCM2835)		+= bcm2835-au
  obj-$(CONFIG_VIDEO_BCM2835)		+= bcm2835-camera/
  obj-$(CONFIG_BCM2835_VCHIQ_MMAL)	+= vchiq-mmal/
  obj-$(CONFIG_BCM_VC_SM_CMA)		+= vc-sm-cma/
@@ -94,9 +90,6 @@ index 01089f369fb4..1a5aa9cc09d3 100644
  
  ccflags-y += -I $(srctree)/$(src)/include
  
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/Kconfig b/drivers/staging/vc04_services/bcm2835-codec/Kconfig
-new file mode 100644
-index 000000000000..c104be9ad6da
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-codec/Kconfig
 @@ -0,0 +1,11 @@
@@ -111,9 +104,6 @@ index 000000000000..c104be9ad6da
 +	  Say Y here to enable the V4L2 video codecs for
 +	  Broadcom BCM2835 SoC. This operates over the VCHIQ interface
 +	  to a service running on VideoCore.
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/Makefile b/drivers/staging/vc04_services/bcm2835-codec/Makefile
-new file mode 100644
-index 000000000000..7fb908d824b2
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-codec/Makefile
 @@ -0,0 +1,8 @@
@@ -125,17 +115,11 @@ index 000000000000..7fb908d824b2
 +ccflags-y += \
 +	-I$(srctree)/drivers/staging/vc04_services \
 +	-D__VCCOREVER__=0x04000000
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/TODO b/drivers/staging/vc04_services/bcm2835-codec/TODO
-new file mode 100644
-index 000000000000..bc27a04ee9bd
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-codec/TODO
 @@ -0,0 +1 @@
 +No issues. Depends on VCHIQ which is in staging.
 \ No newline at end of file
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-new file mode 100644
-index 000000000000..8a8f1e8db7d0
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -0,0 +1,3016 @@
@@ -3155,8 +3139,6 @@ index 000000000000..8a8f1e8db7d0
 +MODULE_LICENSE("GPL");
 +MODULE_VERSION("0.0.1");
 +MODULE_ALIAS("platform:bcm2835-codec");
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-index 89059bca0b77..0a1edad8d4a8 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 @@ -618,6 +618,9 @@ enum mmal_parameter_video_type {
@@ -3169,6 +3151,3 @@ index 89059bca0b77..0a1edad8d4a8 100644
  };
  
  /** Valid mirror modes */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0316-bcm2835-dma-only-reserve-channel-0-if-legacy-dma-dri.patch b/root/target/linux/bcm27xx/patches-5.15/950-0305-bcm2835-dma-only-reserve-channel-0-if-legacy-dma-dri.patch
similarity index 65%
rename from root/target/linux/bcm27xx/patches-5.15/0316-bcm2835-dma-only-reserve-channel-0-if-legacy-dma-dri.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0305-bcm2835-dma-only-reserve-channel-0-if-legacy-dma-dri.patch
index 9aa81561..7e705895 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0316-bcm2835-dma-only-reserve-channel-0-if-legacy-dma-dri.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0305-bcm2835-dma-only-reserve-channel-0-if-legacy-dma-dri.patch
@@ -1,7 +1,7 @@
-From b03b832d7b27b9511f75ce8da36874e2271e1c72 Mon Sep 17 00:00:00 2001
+From f35c1df0c35d8763cde90d562b9f07722578c0cb Mon Sep 17 00:00:00 2001
 From: Matthias Reichl <hias@horus.com>
 Date: Sun, 11 Oct 2020 00:48:55 +0200
-Subject: [PATCH 316/634] bcm2835-dma: only reserve channel 0 if legacy dma
+Subject: [PATCH 305/828] bcm2835-dma: only reserve channel 0 if legacy dma
  driver is enabled
 
 If CONFIG_DMA_BCM2708 isn't enabled there's no need to mask out
@@ -12,11 +12,9 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
  drivers/dma/bcm2835-dma.c | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index d1127b9058a4..0cbfa9d559a2 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
-@@ -1283,6 +1283,7 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
+@@ -1283,6 +1283,7 @@ static int bcm2835_dma_probe(struct plat
  		goto err_no_dma;
  	}
  
@@ -24,7 +22,7 @@ index d1127b9058a4..0cbfa9d559a2 100644
  	/* One channel is reserved for the legacy API */
  	if (chans_available & BCM2835_DMA_BULK_MASK) {
  		rc = bcm_dmaman_probe(pdev, base,
-@@ -1293,6 +1294,7 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
+@@ -1293,6 +1294,7 @@ static int bcm2835_dma_probe(struct plat
  
  		chans_available &= ~BCM2835_DMA_BULK_MASK;
  	}
@@ -32,6 +30,3 @@ index d1127b9058a4..0cbfa9d559a2 100644
  
  	/* And possibly one for the 40-bit DMA memcpy API */
  	if (chans_available & od->cfg_data->chan_40bit_mask &
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0317-uapi-bcm2835-isp-Add-bcm2835-isp-uapi-header-file.patch b/root/target/linux/bcm27xx/patches-5.15/950-0306-uapi-bcm2835-isp-Add-bcm2835-isp-uapi-header-file.patch
similarity index 97%
rename from root/target/linux/bcm27xx/patches-5.15/0317-uapi-bcm2835-isp-Add-bcm2835-isp-uapi-header-file.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0306-uapi-bcm2835-isp-Add-bcm2835-isp-uapi-header-file.patch
index f3fdb652..1dd48383 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0317-uapi-bcm2835-isp-Add-bcm2835-isp-uapi-header-file.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0306-uapi-bcm2835-isp-Add-bcm2835-isp-uapi-header-file.patch
@@ -1,7 +1,7 @@
-From dabda283856a4d012449aedc2c25b5e8fe795bc1 Mon Sep 17 00:00:00 2001
+From 9a40aa64d849babf9a3ce2262273ca237ac3bf59 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Mon, 12 Oct 2020 17:03:14 +0100
-Subject: [PATCH 317/634] uapi: bcm2835-isp: Add bcm2835-isp uapi header file
+Subject: [PATCH 306/828] uapi: bcm2835-isp: Add bcm2835-isp uapi header file
 
 This file defines the userland interface to the bcm2835-isp driver
 that will follow in a separate commit.
@@ -13,9 +13,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 320 insertions(+)
  create mode 100644 include/uapi/linux/bcm2835-isp.h
 
-diff --git a/include/uapi/linux/bcm2835-isp.h b/include/uapi/linux/bcm2835-isp.h
-new file mode 100644
-index 000000000000..cf8c0437f159
 --- /dev/null
 +++ b/include/uapi/linux/bcm2835-isp.h
 @@ -0,0 +1,320 @@
@@ -339,6 +336,3 @@ index 000000000000..cf8c0437f159
 +};
 +
 +#endif /* __BCM2835_ISP_H_ */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0318-staging-vc04_services-ISP-Add-a-more-complex-ISP-pro.patch b/root/target/linux/bcm27xx/patches-5.15/950-0307-staging-vc04_services-ISP-Add-a-more-complex-ISP-pro.patch
similarity index 97%
rename from root/target/linux/bcm27xx/patches-5.15/0318-staging-vc04_services-ISP-Add-a-more-complex-ISP-pro.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0307-staging-vc04_services-ISP-Add-a-more-complex-ISP-pro.patch
index bbd05250..dc5c3fc4 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0318-staging-vc04_services-ISP-Add-a-more-complex-ISP-pro.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0307-staging-vc04_services-ISP-Add-a-more-complex-ISP-pro.patch
@@ -1,7 +1,7 @@
-From fdb5f16973843df4299f4c7f2dbb23f02349da2f Mon Sep 17 00:00:00 2001
+From b59f0c5e0575f09387610447c69af0827362de0d Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Thu, 23 Apr 2020 10:17:37 +0100
-Subject: [PATCH 318/634] staging: vc04_services: ISP: Add a more complex ISP
+Subject: [PATCH 307/828] staging: vc04_services: ISP: Add a more complex ISP
  processing component
 
 Driver for the BCM2835 ISP hardware block.  This driver uses the MMAL
@@ -33,11 +33,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  create mode 100644 drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
  create mode 100644 drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 4682efb95b40..e237578c96b6 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3565,6 +3565,15 @@ S:	Maintained
+@@ -3566,6 +3566,15 @@ S:	Maintained
  F:	drivers/media/platform/bcm2835/
  F:	Documentation/devicetree/bindings/media/brcm,bcm2835-unicam.yaml
  
@@ -53,11 +51,9 @@ index 4682efb95b40..e237578c96b6 100644
  BROADCOM BCM47XX MIPS ARCHITECTURE
  M:	Hauke Mehrtens <hauke@hauke-m.de>
  M:	Rafał Miłecki <zajec5@gmail.com>
-diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig
-index 41e25af802ce..0927c93338a1 100644
 --- a/drivers/staging/vc04_services/Kconfig
 +++ b/drivers/staging/vc04_services/Kconfig
-@@ -45,6 +45,7 @@ source "drivers/staging/vc04_services/bcm2835-camera/Kconfig"
+@@ -45,6 +45,7 @@ source "drivers/staging/vc04_services/bc
  
  source "drivers/staging/vc04_services/vc-sm-cma/Kconfig"
  source "drivers/staging/vc04_services/bcm2835-codec/Kconfig"
@@ -65,11 +61,9 @@ index 41e25af802ce..0927c93338a1 100644
  
  source "drivers/staging/vc04_services/vchiq-mmal/Kconfig"
  
-diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
-index 1a5aa9cc09d3..a0c4f71e7dbb 100644
 --- a/drivers/staging/vc04_services/Makefile
 +++ b/drivers/staging/vc04_services/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_VIDEO_BCM2835)		+= bcm2835-camera/
+@@ -16,6 +16,7 @@ obj-$(CONFIG_VIDEO_BCM2835)		+= bcm2835-
  obj-$(CONFIG_BCM2835_VCHIQ_MMAL)	+= vchiq-mmal/
  obj-$(CONFIG_BCM_VC_SM_CMA)		+= vc-sm-cma/
  obj-$(CONFIG_VIDEO_CODEC_BCM2835)	+= bcm2835-codec/
@@ -77,9 +71,6 @@ index 1a5aa9cc09d3..a0c4f71e7dbb 100644
  
  ccflags-y += -I $(srctree)/$(src)/include
  
-diff --git a/drivers/staging/vc04_services/bcm2835-isp/Kconfig b/drivers/staging/vc04_services/bcm2835-isp/Kconfig
-new file mode 100644
-index 000000000000..71b14acc297e
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-isp/Kconfig
 @@ -0,0 +1,14 @@
@@ -97,9 +88,6 @@ index 000000000000..71b14acc297e
 +
 +	  To compile this driver as a module, choose M here: the module
 +	  will be called bcm2835-isp.
-diff --git a/drivers/staging/vc04_services/bcm2835-isp/Makefile b/drivers/staging/vc04_services/bcm2835-isp/Makefile
-new file mode 100644
-index 000000000000..42d3081d342f
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-isp/Makefile
 @@ -0,0 +1,8 @@
@@ -111,9 +99,6 @@ index 000000000000..42d3081d342f
 +ccflags-y += \
 +	-I$(srctree)/drivers/staging/vc04_services \
 +	-D__VCCOREVER__=0x04000000
-diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-ctrls.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-ctrls.h
-new file mode 100644
-index 000000000000..cfbb1063aad1
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-ctrls.h
 @@ -0,0 +1,67 @@
@@ -184,9 +169,6 @@ index 000000000000..cfbb1063aad1
 +};
 +
 +#endif
-diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
-new file mode 100644
-index 000000000000..acd0d5b8b0b8
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
 @@ -0,0 +1,353 @@
@@ -543,9 +525,6 @@ index 000000000000..acd0d5b8b0b8
 +};
 +
 +#endif
-diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-new file mode 100644
-index 000000000000..8bb3d115b27a
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 @@ -0,0 +1,1694 @@
@@ -2243,8 +2222,6 @@ index 000000000000..8bb3d115b27a
 +MODULE_LICENSE("GPL");
 +MODULE_VERSION("1.0");
 +MODULE_ALIAS("platform:bcm2835-isp");
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-index 897e6cdf8dd9..8eb6334ee055 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
 @@ -113,6 +113,10 @@
@@ -2258,8 +2235,6 @@ index 897e6cdf8dd9..8eb6334ee055 100644
  /* }@ */
  
  /** \name Pre-defined audio encodings */
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-index 0a1edad8d4a8..efda4dc039c3 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 @@ -221,6 +221,62 @@ enum mmal_parameter_camera_type {
@@ -2429,6 +2404,3 @@ index 0a1edad8d4a8..efda4dc039c3 100644
  };
  
  #endif
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0319-gpio-Add-gpio-fsm-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0308-gpio-Add-gpio-fsm-driver.patch
similarity index 98%
rename from root/target/linux/bcm27xx/patches-5.15/0319-gpio-Add-gpio-fsm-driver.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0308-gpio-Add-gpio-fsm-driver.patch
index 559b8910..d85bc54b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0319-gpio-Add-gpio-fsm-driver.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0308-gpio-Add-gpio-fsm-driver.patch
@@ -1,7 +1,7 @@
-From 70af5e05fdf99f35fc2a63f543f6ef230ec656fc Mon Sep 17 00:00:00 2001
+From 19399f08d45f96a24196da781cb63e3facf67c85 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Wed, 30 Sep 2020 12:00:54 +0100
-Subject: [PATCH 319/634] gpio: Add gpio-fsm driver
+Subject: [PATCH 308/828] gpio: Add gpio-fsm driver
 
 The gpio-fsm driver implements simple state machines that allow GPIOs
 to be controlled in response to inputs from other GPIOs - real and
@@ -63,11 +63,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  create mode 100644 drivers/gpio/gpio-fsm.c
  create mode 100644 include/dt-bindings/gpio/gpio-fsm.h
 
-diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
-index 138ca5c8dab1..43c30308b1d5 100644
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
-@@ -1231,6 +1231,15 @@ config HTC_EGPIO
+@@ -1232,6 +1232,15 @@ config HTC_EGPIO
  	  several HTC phones.  It provides basic support for input
  	  pins, output pins, and irqs.
  
@@ -83,11 +81,9 @@ index 138ca5c8dab1..43c30308b1d5 100644
  config GPIO_JANZ_TTL
  	tristate "Janz VMOD-TTL Digital IO Module"
  	depends on MFD_JANZ_CMODIO
-diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
-index 4e1ce3c97bca..0900302c9ce0 100644
 --- a/drivers/gpio/Makefile
 +++ b/drivers/gpio/Makefile
-@@ -61,6 +61,7 @@ obj-$(CONFIG_GPIO_EP93XX)		+= gpio-ep93xx.o
+@@ -62,6 +62,7 @@ obj-$(CONFIG_GPIO_EP93XX)		+= gpio-ep93x
  obj-$(CONFIG_GPIO_EXAR)			+= gpio-exar.o
  obj-$(CONFIG_GPIO_F7188X)		+= gpio-f7188x.o
  obj-$(CONFIG_GPIO_FTGPIO010)		+= gpio-ftgpio010.o
@@ -95,9 +91,6 @@ index 4e1ce3c97bca..0900302c9ce0 100644
  obj-$(CONFIG_GPIO_GE_FPGA)		+= gpio-ge.o
  obj-$(CONFIG_GPIO_GPIO_MM)		+= gpio-gpio-mm.o
  obj-$(CONFIG_GPIO_GRGPIO)		+= gpio-grgpio.o
-diff --git a/drivers/gpio/gpio-fsm.c b/drivers/gpio/gpio-fsm.c
-new file mode 100644
-index 000000000000..3a348f1c6514
 --- /dev/null
 +++ b/drivers/gpio/gpio-fsm.c
 @@ -0,0 +1,1210 @@
@@ -1311,9 +1304,6 @@ index 000000000000..3a348f1c6514
 +MODULE_AUTHOR("Phil Elwell <phil@raspberrypi.com>");
 +MODULE_DESCRIPTION("GPIO FSM driver");
 +MODULE_ALIAS("platform:gpio-fsm");
-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 @@
@@ -1338,6 +1328,3 @@ index 000000000000..eb40cfdc71df
 +#define GF_SW(x)    GF_IO(GF_SOFT, (x))
 +
 +#endif
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0320-staging-bcm2835-audio-Add-disable-headphones-flag.patch b/root/target/linux/bcm27xx/patches-5.15/950-0309-staging-bcm2835-audio-Add-disable-headphones-flag.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0320-staging-bcm2835-audio-Add-disable-headphones-flag.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0309-staging-bcm2835-audio-Add-disable-headphones-flag.patch
index 6cc69353..df1ea146 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0320-staging-bcm2835-audio-Add-disable-headphones-flag.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0309-staging-bcm2835-audio-Add-disable-headphones-flag.patch
@@ -1,7 +1,7 @@
-From c72a7ae44d78c34e24e8d1eb9c1bb9bb1560df70 Mon Sep 17 00:00:00 2001
+From 286ef76cc0e55498ac2f04e3832a87d068022150 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Mon, 26 Oct 2020 10:23:22 +0000
-Subject: [PATCH 320/634] staging: bcm2835-audio: Add disable-headphones flag
+Subject: [PATCH 309/828] staging: bcm2835-audio: Add disable-headphones flag
 
 Add a property to allow the headphone output to be disabled. Use an
 integer property rather than a boolean so that an overlay can clear it.
@@ -11,11 +11,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/staging/vc04_services/bcm2835-audio/bcm2835.c | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-index a0cba3823e5e..ccda115ab9e0 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-@@ -381,11 +381,16 @@ static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
+@@ -381,11 +381,16 @@ static int snd_bcm2835_alsa_probe(struct
  	}
  
  	if (!enable_compat_alsa) {
@@ -34,6 +32,3 @@ index a0cba3823e5e..ccda115ab9e0 100644
  	} else {
  		enable_hdmi0 = enable_hdmi;
  	}
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0321-rpisense-fb-Set-pseudo_pallete-to-prevent-crash-on-f.patch b/root/target/linux/bcm27xx/patches-5.15/950-0310-rpisense-fb-Set-pseudo_pallete-to-prevent-crash-on-f.patch
similarity index 62%
rename from root/target/linux/bcm27xx/patches-5.15/0321-rpisense-fb-Set-pseudo_pallete-to-prevent-crash-on-f.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0310-rpisense-fb-Set-pseudo_pallete-to-prevent-crash-on-f.patch
index 0acea548..334412b2 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0321-rpisense-fb-Set-pseudo_pallete-to-prevent-crash-on-f.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0310-rpisense-fb-Set-pseudo_pallete-to-prevent-crash-on-f.patch
@@ -1,7 +1,7 @@
-From ea3e90aabd751dc0db4f1910f8b2751e7665c17f Mon Sep 17 00:00:00 2001
+From a2179e690d940be0b77cc8630d6aecb6bd067ffb Mon Sep 17 00:00:00 2001
 From: Serge Schneider <serge@raspberrypi.com>
 Date: Mon, 26 Oct 2020 16:38:21 +0000
-Subject: [PATCH 321/634] rpisense-fb: Set pseudo_pallete to prevent crash on
+Subject: [PATCH 310/828] rpisense-fb: Set pseudo_pallete to prevent crash on
  fbcon takeover
 
 Signed-off-by: Serge Schneider <serge@raspberrypi.com>
@@ -9,11 +9,9 @@ Signed-off-by: Serge Schneider <serge@raspberrypi.com>
  drivers/video/fbdev/rpisense-fb.c | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/video/fbdev/rpisense-fb.c b/drivers/video/fbdev/rpisense-fb.c
-index 26432a5a0b4b..325977def531 100644
 --- a/drivers/video/fbdev/rpisense-fb.c
 +++ b/drivers/video/fbdev/rpisense-fb.c
-@@ -52,6 +52,8 @@ static u8 gamma_low[32] = {0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+@@ -52,6 +52,8 @@ static u8 gamma_low[32] = {0x00, 0x01, 0
  
  static u8 gamma_user[32];
  
@@ -22,7 +20,7 @@ index 26432a5a0b4b..325977def531 100644
  static struct rpisense_fb_param rpisense_fb_param = {
  	.vmem = NULL,
  	.vmemsize = 128,
-@@ -225,6 +227,7 @@ static int rpisense_fb_probe(struct platform_device *pdev)
+@@ -225,6 +227,7 @@ static int rpisense_fb_probe(struct plat
  	info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB;
  	info->screen_base = rpisense_fb_param.vmem;
  	info->screen_size = rpisense_fb_param.vmemsize;
@@ -30,6 +28,3 @@ index 26432a5a0b4b..325977def531 100644
  
  	if (lowlight)
  		rpisense_fb_param.gamma = gamma_low;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0322-dwc_otg-Minimise-header-and-fix-build-warnings.patch b/root/target/linux/bcm27xx/patches-5.15/950-0311-dwc_otg-Minimise-header-and-fix-build-warnings.patch
similarity index 91%
rename from root/target/linux/bcm27xx/patches-5.15/0322-dwc_otg-Minimise-header-and-fix-build-warnings.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0311-dwc_otg-Minimise-header-and-fix-build-warnings.patch
index ab7a0f87..30982c94 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0322-dwc_otg-Minimise-header-and-fix-build-warnings.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0311-dwc_otg-Minimise-header-and-fix-build-warnings.patch
@@ -1,7 +1,7 @@
-From 6014f5be61987468ec783544b4eb96afc55795f8 Mon Sep 17 00:00:00 2001
+From 1e65d7f1a0bac2e34fef1abd2c9ef60124440f63 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Tue, 27 Oct 2020 09:59:49 +0000
-Subject: [PATCH 322/634] dwc_otg: Minimise header and fix build warnings
+Subject: [PATCH 311/828] dwc_otg: Minimise header and fix build warnings
 
 Delete a large amount of unused declaration from "usb.h", some of which
 were causing build warnings, and get the module building cleanly.
@@ -17,8 +17,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c  |   2 +-
  7 files changed, 30 insertions(+), 684 deletions(-)
 
-diff --git a/drivers/usb/host/dwc_common_port/usb.h b/drivers/usb/host/dwc_common_port/usb.h
-index 27bda82dac2e..f78593575736 100644
 --- a/drivers/usb/host/dwc_common_port/usb.h
 +++ b/drivers/usb/host/dwc_common_port/usb.h
 @@ -55,12 +55,6 @@ typedef u_int8_t uByte;
@@ -96,13 +94,10 @@ index 27bda82dac2e..f78593575736 100644
  /* Requests */
  #define UR_GET_STATUS		0x00
  #define  USTAT_STANDARD_STATUS  0x00
-@@ -240,71 +186,6 @@ typedef struct {
- #include <pshpack1.h>
- #endif
- 
--typedef struct {
--	uByte		bLength;
--	uByte		bDescriptorType;
+@@ -243,71 +189,6 @@ typedef struct {
+ typedef struct {
+ 	uByte		bLength;
+ 	uByte		bDescriptorType;
 -	uByte		bDescriptorSubtype;
 -} UPACKED usb_descriptor_t;
 -
@@ -165,9 +160,12 @@ index 27bda82dac2e..f78593575736 100644
 -} UPACKED usb_interface_descriptor_t;
 -#define USB_INTERFACE_DESCRIPTOR_SIZE 9
 -
- typedef struct {
- 	uByte		bLength;
- 	uByte		bDescriptorType;
+-typedef struct {
+-	uByte		bLength;
+-	uByte		bDescriptorType;
+ 	uByte		bEndpointAddress;
+ #define UE_GET_DIR(a)	((a) & 0x80)
+ #define UE_SET_DIR(a,d)	((a) | (((d)&1) << 7))
 @@ -332,27 +213,6 @@ typedef struct {
  } UPACKED usb_endpoint_descriptor_t;
  #define USB_ENDPOINT_DESCRIPTOR_SIZE 7
@@ -727,11 +725,9 @@ index 27bda82dac2e..f78593575736 100644
  #ifdef _MSC_VER
  #include <poppack.h>
  #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
-index 490a7801e737..f644acbce748 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
-@@ -240,7 +240,8 @@ static int notrace fiq_increment_dma_buf(struct fiq_state *st, int num_channels,
+@@ -240,7 +240,8 @@ static int notrace fiq_increment_dma_buf
  	hcdma_data_t hcdma;
  	int i = st->channel[n].dma_info.index;
  	int len;
@@ -741,7 +737,7 @@ index 490a7801e737..f644acbce748 100644
  
  	len = fiq_get_xfer_len(st, n);
  	fiq_print(FIQDBG_INT, st, "LEN: %03d", len);
-@@ -249,7 +250,7 @@ static int notrace fiq_increment_dma_buf(struct fiq_state *st, int num_channels,
+@@ -249,7 +250,7 @@ static int notrace fiq_increment_dma_buf
  	if (i > 6)
  		BUG();
  
@@ -750,7 +746,7 @@ index 490a7801e737..f644acbce748 100644
  	FIQ_WRITE(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HC_DMA, hcdma.d32);
  	st->channel[n].dma_info.index = i;
  	return 0;
-@@ -289,7 +290,8 @@ static int notrace fiq_iso_out_advance(struct fiq_state *st, int num_channels, i
+@@ -289,7 +290,8 @@ static int notrace fiq_iso_out_advance(s
  	hcsplt_data_t hcsplt;
  	hctsiz_data_t hctsiz;
  	hcdma_data_t hcdma;
@@ -760,7 +756,7 @@ index 490a7801e737..f644acbce748 100644
  	int last = 0;
  	int i = st->channel[n].dma_info.index;
  
-@@ -301,7 +303,7 @@ static int notrace fiq_iso_out_advance(struct fiq_state *st, int num_channels, i
+@@ -301,7 +303,7 @@ static int notrace fiq_iso_out_advance(s
  		last = 1;
  
  	/* New DMA address - address of bounce buffer referred to in index */
@@ -769,11 +765,9 @@ index 490a7801e737..f644acbce748 100644
  	//hcdma.d32 = FIQ_READ(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HC_DMA);
  	//hcdma.d32 += st->channel[n].dma_info.slot_len[i];
  	fiq_print(FIQDBG_INT, st, "LAST: %01d ", last);
-diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
-index 0f6645e2383c..e42d8ca89c01 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
-@@ -1270,7 +1270,8 @@ static void assign_and_init_hc(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
+@@ -1270,7 +1270,8 @@ static void assign_and_init_hc(dwc_otg_h
  	hc->multi_count = 1;
  
  	if (hcd->core_if->dma_enable) {
@@ -783,7 +777,7 @@ index 0f6645e2383c..e42d8ca89c01 100644
  
  		/* For non-dword aligned case */
  		if (((unsigned long)hc->xfer_buff & 0x3)
-@@ -1314,7 +1315,8 @@ static void assign_and_init_hc(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
+@@ -1314,7 +1315,8 @@ static void assign_and_init_hc(dwc_otg_h
  			hc->ep_is_in = 0;
  			hc->data_pid_start = DWC_OTG_HC_PID_SETUP;
  			if (hcd->core_if->dma_enable) {
@@ -793,7 +787,7 @@ index 0f6645e2383c..e42d8ca89c01 100644
  			} else {
  				hc->xfer_buff = (uint8_t *) urb->setup_packet;
  			}
-@@ -1362,7 +1364,8 @@ static void assign_and_init_hc(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
+@@ -1362,7 +1364,8 @@ static void assign_and_init_hc(dwc_otg_h
  
  			hc->xfer_len = 0;
  			if (hcd->core_if->dma_enable) {
@@ -803,7 +797,7 @@ index 0f6645e2383c..e42d8ca89c01 100644
  			} else {
  				hc->xfer_buff = (uint8_t *) hcd->status_buf;
  			}
-@@ -1390,7 +1393,7 @@ static void assign_and_init_hc(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
+@@ -1390,7 +1393,7 @@ static void assign_and_init_hc(dwc_otg_h
  			frame_desc->status = 0;
  
  			if (hcd->core_if->dma_enable) {
@@ -812,7 +806,7 @@ index 0f6645e2383c..e42d8ca89c01 100644
  			} else {
  				hc->xfer_buff = (uint8_t *) urb->buf;
  			}
-@@ -1571,8 +1574,10 @@ int fiq_fsm_setup_periodic_dma(dwc_otg_hcd_t *hcd, struct fiq_channel_state *st,
+@@ -1571,8 +1574,10 @@ int fiq_fsm_setup_periodic_dma(dwc_otg_h
  		 * Pointer arithmetic on hcd->fiq_state->dma_base (a dma_addr_t)
  		 * to point it to the correct offset in the allocated buffers.
  		 */
@@ -825,7 +819,7 @@ index 0f6645e2383c..e42d8ca89c01 100644
  
  		/* Calculate the max number of CSPLITS such that the FIQ can time out
  		 * a transaction if it fails.
-@@ -1627,8 +1632,10 @@ int fiq_fsm_setup_periodic_dma(dwc_otg_hcd_t *hcd, struct fiq_channel_state *st,
+@@ -1627,8 +1632,10 @@ int fiq_fsm_setup_periodic_dma(dwc_otg_h
  			 * dma_addr_t) to point it to the correct offset in the
  			 * allocated buffers.
  			 */
@@ -838,11 +832,9 @@ index 0f6645e2383c..e42d8ca89c01 100644
  
  			/* fixup xfersize to the actual packet size */
  			st->hctsiz_copy.b.pid = 0;
-diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c
-index bd8a20403713..2fd96e56e412 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c
-@@ -620,7 +620,8 @@ static void init_non_isoc_dma_desc(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
+@@ -620,7 +620,8 @@ static void init_non_isoc_dma_desc(dwc_o
  
  		if (n_desc) {
  			/* SG request - more than 1 QTDs */
@@ -852,11 +844,9 @@ index bd8a20403713..2fd96e56e412 100644
  			hc->xfer_len = qtd->urb->length - qtd->urb->actual_length;
  		}
  
-diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
-index d3097ef3728c..9d49b2b33227 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
-@@ -1857,10 +1857,10 @@ static int32_t handle_hc_ahberr_intr(dwc_otg_hcd_t * hcd,
+@@ -1857,10 +1857,10 @@ static int32_t handle_hc_ahberr_intr(dwc
  	DWC_ERROR("  Max packet size: %d\n",
  		  dwc_otg_hcd_get_mps(&urb->pipe_info));
  	DWC_ERROR("  Data buffer length: %d\n", urb->length);
@@ -871,8 +861,6 @@ index d3097ef3728c..9d49b2b33227 100644
  	DWC_ERROR("  Interval: %d\n", urb->interval);
  
  	/* Core haltes the channel for Descriptor DMA mode */
-diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
-index eda7a33908b3..50c8705185ad 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
 @@ -482,8 +482,8 @@ static void hcd_init_fiq(void *cookie)
@@ -886,11 +874,9 @@ index eda7a33908b3..50c8705185ad 100644
  	} else {
  		dwc_otg_hcd->fiq_state->mphi_regs.ctrl =
  			otg_dev->os_dep.mphi_base + 0x4c;
-diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c
-index e55ea9c74be4..76e94b4ebb43 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c
-@@ -3377,7 +3377,7 @@ void predict_nextep_seq( dwc_otg_core_if_t * core_if)
+@@ -3377,7 +3377,7 @@ void predict_nextep_seq( dwc_otg_core_if
  	dtknq1_data_t dtknqr1;
  	uint32_t in_tkn_epnums[4];
  	uint8_t seqnum[MAX_EPS_CHANNELS];
@@ -899,6 +885,3 @@ index e55ea9c74be4..76e94b4ebb43 100644
  	grstctl_t resetctl = {.d32 = 0 };
  	uint8_t temp;
  	int ndx = 0;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0323-rpivid_h625-Fix-build-warnings.patch b/root/target/linux/bcm27xx/patches-5.15/950-0312-rpivid_h625-Fix-build-warnings.patch
similarity index 85%
rename from root/target/linux/bcm27xx/patches-5.15/0323-rpivid_h625-Fix-build-warnings.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0312-rpivid_h625-Fix-build-warnings.patch
index dda327d0..5875e823 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0323-rpivid_h625-Fix-build-warnings.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0312-rpivid_h625-Fix-build-warnings.patch
@@ -1,18 +1,16 @@
-From 33179b9ac0cfc99f3d5a59d0cfb1c977866c12cd Mon Sep 17 00:00:00 2001
+From 52b7deb0e3b1af89204162b0bd1287978f6fe72f Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Tue, 27 Oct 2020 12:10:40 +0000
-Subject: [PATCH 323/634] rpivid_h625: Fix build warnings
+Subject: [PATCH 312/828] rpivid_h625: Fix build warnings
 
 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 ---
  drivers/staging/media/rpivid/rpivid_h265.c | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
-index b677910e237c..fc3caed58187 100644
 --- a/drivers/staging/media/rpivid/rpivid_h265.c
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
-@@ -1341,10 +1341,10 @@ static int frame_end(struct rpivid_dev *const dev,
+@@ -1341,10 +1341,10 @@ static int frame_end(struct rpivid_dev *
  
  		if (gptr_realloc_new(dev, de->cmd_copy_gptr, cmd_alloc)) {
  			v4l2_err(&dev->v4l2_dev,
@@ -25,7 +23,7 @@ index b677910e237c..fc3caed58187 100644
  			  cmd_alloc);
  	}
  
-@@ -1696,12 +1696,12 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1696,12 +1696,12 @@ static void rpivid_h265_setup(struct rpi
  				       bits_alloc,
  				       DMA_ATTR_FORCE_CONTIGUOUS) != 0) {
  				v4l2_err(&dev->v4l2_dev,
@@ -40,7 +38,7 @@ index b677910e237c..fc3caed58187 100644
  				  bits_alloc);
  		}
  	}
-@@ -1995,11 +1995,11 @@ static void phase1_thread(struct rpivid_dev *const dev, void *v)
+@@ -1995,11 +1995,11 @@ static void phase1_thread(struct rpivid_
  	if (de->p1_status & STATUS_PU_EXHAUSTED) {
  		if (gptr_realloc_new(dev, pu_gptr, next_size(pu_gptr->size))) {
  			v4l2_err(&dev->v4l2_dev,
@@ -54,7 +52,7 @@ index b677910e237c..fc3caed58187 100644
  			  __func__, pu_gptr->size);
  	}
  
-@@ -2007,11 +2007,11 @@ static void phase1_thread(struct rpivid_dev *const dev, void *v)
+@@ -2007,11 +2007,11 @@ static void phase1_thread(struct rpivid_
  		if (gptr_realloc_new(dev, coeff_gptr,
  				     next_size(coeff_gptr->size))) {
  			v4l2_err(&dev->v4l2_dev,
@@ -68,6 +66,3 @@ index b677910e237c..fc3caed58187 100644
  			  __func__, coeff_gptr->size);
  	}
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0324-bcm2708_fb-Fix-a-build-warning.patch b/root/target/linux/bcm27xx/patches-5.15/950-0313-bcm2708_fb-Fix-a-build-warning.patch
similarity index 64%
rename from root/target/linux/bcm27xx/patches-5.15/0324-bcm2708_fb-Fix-a-build-warning.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0313-bcm2708_fb-Fix-a-build-warning.patch
index 0f74b5fb..20453284 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0324-bcm2708_fb-Fix-a-build-warning.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0313-bcm2708_fb-Fix-a-build-warning.patch
@@ -1,18 +1,16 @@
-From 55278992137e6a29dc913319ddd5d259e1f37b06 Mon Sep 17 00:00:00 2001
+From 53d775ab99b36f47faf49d30cbc58742a3ce8d08 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Tue, 27 Oct 2020 12:12:22 +0000
-Subject: [PATCH 324/634] bcm2708_fb: Fix a build warning
+Subject: [PATCH 313/828] bcm2708_fb: Fix a build warning
 
 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 ---
  drivers/video/fbdev/bcm2708_fb.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c
-index dac5c021ce52..365c5b96b8a0 100644
 --- a/drivers/video/fbdev/bcm2708_fb.c
 +++ b/drivers/video/fbdev/bcm2708_fb.c
-@@ -693,7 +693,8 @@ static long vc_mem_copy(struct bcm2708_fb *fb, struct fb_dmacopy *ioparam)
+@@ -693,7 +693,8 @@ static long vc_mem_copy(struct bcm2708_f
  		u8 *q = (u8 *)ioparam->dst + offset;
  
  		dma_memcpy(fb, bus_addr,
@@ -22,6 +20,3 @@ index dac5c021ce52..365c5b96b8a0 100644
  		if (copy_to_user(q, buf, s) != 0) {
  			pr_err("[%s]: failed to copy-to-user\n", __func__);
  			rc = -EFAULT;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0325-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch b/root/target/linux/bcm27xx/patches-5.15/950-0314-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0325-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0314-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch
index 151d91f4..a185c589 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0325-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0314-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch
@@ -1,7 +1,7 @@
-From 7051db7d6c01f967be526e3c4cdc215197862339 Mon Sep 17 00:00:00 2001
+From 29bddf84d2171caf00c8e7db2fa928090080c1ba Mon Sep 17 00:00:00 2001
 From: Tim Gover <tim.gover@raspberrypi.org>
 Date: Thu, 22 Oct 2020 15:30:55 +0100
-Subject: [PATCH 325/634] watchdog: bcm2835: Ignore params after the partition
+Subject: [PATCH 314/828] watchdog: bcm2835: Ignore params after the partition
  number
 
 Use sscanf to extract the partition number and ignore extra parameters
@@ -10,11 +10,9 @@ which are only relevant to other reboot notifiers.
  drivers/watchdog/bcm2835_wdt.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
-index 58d5a1b89584..e8d151d524fd 100644
 --- a/drivers/watchdog/bcm2835_wdt.c
 +++ b/drivers/watchdog/bcm2835_wdt.c
-@@ -126,10 +126,12 @@ static int bcm2835_restart(struct watchdog_device *wdog,
+@@ -126,10 +126,12 @@ static int bcm2835_restart(struct watchd
  {
  	struct bcm2835_wdt *wdt = watchdog_get_drvdata(wdog);
  
@@ -29,6 +27,3 @@ index 58d5a1b89584..e8d151d524fd 100644
  		partition = val;
  
  	__bcm2835_restart(wdt, partition);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0326-firmware-raspberrypi-Add-support-for-tryonce-reboot-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0315-firmware-raspberrypi-Add-support-for-tryonce-reboot-.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0326-firmware-raspberrypi-Add-support-for-tryonce-reboot-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0315-firmware-raspberrypi-Add-support-for-tryonce-reboot-.patch
index a8c6896e..aa431781 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0326-firmware-raspberrypi-Add-support-for-tryonce-reboot-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0315-firmware-raspberrypi-Add-support-for-tryonce-reboot-.patch
@@ -1,7 +1,7 @@
-From be22cb68986048098e052a45ede237675743ca79 Mon Sep 17 00:00:00 2001
+From 0f4d46f41f6d97c3e96bd4f1227fa8c0ad35cc49 Mon Sep 17 00:00:00 2001
 From: Tim Gover <tim.gover@raspberrypi.com>
 Date: Tue, 20 Oct 2020 11:55:37 +0100
-Subject: [PATCH 326/634] firmware: raspberrypi: Add support for tryonce reboot
+Subject: [PATCH 315/828] firmware: raspberrypi: Add support for tryonce reboot
  flag
 
 Define a new mailbox (SET_REBOOT_FLAGS) which may be used to
@@ -18,11 +18,9 @@ mechanism to be implemented for OS upgrades.
  include/soc/bcm2835/raspberrypi-firmware.h |  2 ++
  2 files changed, 25 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
-index fa105074f05f..1223e3173cff 100644
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
-@@ -193,6 +193,7 @@ static int rpi_firmware_notify_reboot(struct notifier_block *nb,
+@@ -193,6 +193,7 @@ static int rpi_firmware_notify_reboot(st
  {
  	struct rpi_firmware *fw;
  	struct platform_device *pdev = g_pdev;
@@ -30,7 +28,7 @@ index fa105074f05f..1223e3173cff 100644
  
  	if (!pdev)
  		return 0;
-@@ -201,8 +202,28 @@ static int rpi_firmware_notify_reboot(struct notifier_block *nb,
+@@ -201,8 +202,28 @@ static int rpi_firmware_notify_reboot(st
  	if (!fw)
  		return 0;
  
@@ -61,8 +59,6 @@ index fa105074f05f..1223e3173cff 100644
  
  	return 0;
  }
-diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index 23f51be65801..0eca333ad2be 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
 @@ -93,6 +93,8 @@ enum rpi_firmware_property_tag {
@@ -71,9 +67,6 @@ index 23f51be65801..0eca333ad2be 100644
  	RPI_FIRMWARE_NOTIFY_XHCI_RESET =                      0x00030058,
 +	RPI_FIRMWARE_GET_REBOOT_FLAGS =                       0x00030064,
 +	RPI_FIRMWARE_SET_REBOOT_FLAGS =                       0x00038064,
+ 	RPI_FIRMWARE_NOTIFY_DISPLAY_DONE =                    0x00030066,
  
  	/* Dispmanx TAGS */
- 	RPI_FIRMWARE_FRAMEBUFFER_ALLOCATE =                   0x00040001,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0327-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch b/root/target/linux/bcm27xx/patches-5.15/950-0316-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0327-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0316-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
index 661b22ae..770e3fee 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0327-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0316-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
@@ -1,7 +1,7 @@
-From ef5219ba055d88fdf8d1c78757779ef16fba9c23 Mon Sep 17 00:00:00 2001
+From 5895285eb0165e4cb3acd3e4ed1aed4d32e70bac Mon Sep 17 00:00:00 2001
 From: Jonathan Bell <jonathan@raspberrypi.org>
 Date: Tue, 14 May 2019 17:00:41 +0100
-Subject: [PATCH 327/634] phy: broadcom: split out the BCM54213PE from the
+Subject: [PATCH 316/828] phy: broadcom: split out the BCM54213PE from the
  BCM54210E IDs
 
 The last nibble is a revision ID, and the 54213pe is a later rev
@@ -14,11 +14,9 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  include/linux/brcmphy.h    |  1 +
  2 files changed, 13 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
-index ab40956b8c65..a337fd979f83 100644
 --- a/drivers/net/phy/broadcom.c
 +++ b/drivers/net/phy/broadcom.c
-@@ -253,7 +253,8 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev)
+@@ -254,7 +254,8 @@ static void bcm54xx_adjust_rxrefclk(stru
  	    BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610M &&
  	    BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54210E &&
  	    BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54810 &&
@@ -28,7 +26,7 @@ index ab40956b8c65..a337fd979f83 100644
  		return;
  
  	val = bcm_phy_read_shadow(phydev, BCM54XX_SHD_SCR3);
-@@ -732,7 +733,7 @@ static struct phy_driver broadcom_drivers[] = {
+@@ -753,7 +754,7 @@ static struct phy_driver broadcom_driver
  	.handle_interrupt = bcm_phy_handle_interrupt,
  }, {
  	.phy_id		= PHY_ID_BCM54210E,
@@ -37,21 +35,21 @@ index ab40956b8c65..a337fd979f83 100644
  	.name		= "Broadcom BCM54210E",
  	/* PHY_GBIT_FEATURES */
  	.get_sset_count	= bcm_phy_get_sset_count,
-@@ -742,6 +743,13 @@ static struct phy_driver broadcom_drivers[] = {
- 	.config_init	= bcm54xx_config_init,
+@@ -764,6 +765,13 @@ static struct phy_driver broadcom_driver
  	.config_intr	= bcm_phy_config_intr,
  	.handle_interrupt = bcm_phy_handle_interrupt,
-+}, {
+ }, {
 +	.phy_id		= PHY_ID_BCM54213PE,
 +	.phy_id_mask	= 0xffffffff,
 +	.name		= "Broadcom BCM54213PE",
 +	/* PHY_GBIT_FEATURES */
 +	.config_init	= bcm54xx_config_init,
 +	.config_intr	= bcm_phy_config_intr,
- }, {
++}, {
  	.phy_id		= PHY_ID_BCM5461,
  	.phy_id_mask	= 0xfffffff0,
-@@ -940,7 +948,8 @@ module_phy_driver(broadcom_drivers);
+ 	.name		= "Broadcom BCM5461",
+@@ -962,7 +970,8 @@ module_phy_driver(broadcom_drivers);
  static struct mdio_device_id __maybe_unused broadcom_tbl[] = {
  	{ PHY_ID_BCM5411, 0xfffffff0 },
  	{ PHY_ID_BCM5421, 0xfffffff0 },
@@ -61,8 +59,6 @@ index ab40956b8c65..a337fd979f83 100644
  	{ PHY_ID_BCM5461, 0xfffffff0 },
  	{ PHY_ID_BCM54612E, 0xfffffff0 },
  	{ PHY_ID_BCM54616S, 0xfffffff0 },
-diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
-index c2c2147dfeb8..ea2f8ea92d54 100644
 --- a/include/linux/brcmphy.h
 +++ b/include/linux/brcmphy.h
 @@ -22,6 +22,7 @@
@@ -73,6 +69,3 @@ index c2c2147dfeb8..ea2f8ea92d54 100644
  #define PHY_ID_BCM5464			0x002060b0
  #define PHY_ID_BCM5461			0x002060c0
  #define PHY_ID_BCM54612E		0x03625e60
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0328-phy-broadcom-Add-bcm54213pe-configuration.patch b/root/target/linux/bcm27xx/patches-5.15/950-0317-phy-broadcom-Add-bcm54213pe-configuration.patch
similarity index 63%
rename from root/target/linux/bcm27xx/patches-5.15/0328-phy-broadcom-Add-bcm54213pe-configuration.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0317-phy-broadcom-Add-bcm54213pe-configuration.patch
index 6b9647dd..c85b222b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0328-phy-broadcom-Add-bcm54213pe-configuration.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0317-phy-broadcom-Add-bcm54213pe-configuration.patch
@@ -1,18 +1,16 @@
-From 851cb93eadc9bfc5e7778aecba749608533bcd03 Mon Sep 17 00:00:00 2001
+From ac3ed59aa8359559ab8c50fc72ab4ae92cf6b026 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Thu, 29 Oct 2020 14:10:56 +0000
-Subject: [PATCH 328/634] phy: broadcom: Add bcm54213pe configuration
+Subject: [PATCH 317/828] phy: broadcom: Add bcm54213pe configuration
 
 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 ---
  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 a337fd979f83..c9808a0d8a08 100644
 --- a/drivers/net/phy/broadcom.c
 +++ b/drivers/net/phy/broadcom.c
-@@ -82,6 +82,11 @@ static int bcm54210e_config_init(struct phy_device *phydev)
+@@ -83,6 +83,11 @@ static int bcm54210e_config_init(struct
  	return 0;
  }
  
@@ -24,7 +22,7 @@ index a337fd979f83..c9808a0d8a08 100644
  static int bcm54612e_config_init(struct phy_device *phydev)
  {
  	int reg;
-@@ -356,6 +361,9 @@ static int bcm54xx_config_init(struct phy_device *phydev)
+@@ -357,6 +362,9 @@ static int bcm54xx_config_init(struct ph
  	case PHY_ID_BCM54612E:
  		err = bcm54612e_config_init(phydev);
  		break;
@@ -34,6 +32,3 @@ index a337fd979f83..c9808a0d8a08 100644
  	case PHY_ID_BCM54616S:
  		err = bcm54616s_config_init(phydev);
  		break;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0329-PCI-brcmstb-Restore-initial-fundamental-reset.patch b/root/target/linux/bcm27xx/patches-5.15/950-0318-PCI-brcmstb-Restore-initial-fundamental-reset.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0329-PCI-brcmstb-Restore-initial-fundamental-reset.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0318-PCI-brcmstb-Restore-initial-fundamental-reset.patch
index 38bf65b3..2c919f91 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0329-PCI-brcmstb-Restore-initial-fundamental-reset.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0318-PCI-brcmstb-Restore-initial-fundamental-reset.patch
@@ -1,7 +1,7 @@
-From 1c70aaeb9d971400263ac73ce2dd0fb4cb53c22c Mon Sep 17 00:00:00 2001
+From 1deae19d485f6585b11ea2d2b5dad7c40fa124ef Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Wed, 11 Nov 2020 17:08:33 +0000
-Subject: [PATCH 329/634] PCI: brcmstb: Restore initial fundamental reset
+Subject: [PATCH 318/828] PCI: brcmstb: Restore initial fundamental reset
 
 [1] replaced a single reset function with a pointer to one of two
 implementations, but also removed the call asserting the reset
@@ -22,11 +22,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/pci/controller/pcie-brcmstb.c | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index 77967a37cbd9..d26844f03e25 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
-@@ -879,6 +879,8 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
+@@ -879,6 +879,8 @@ static int brcm_pcie_setup(struct brcm_p
  
  	/* Reset the bridge */
  	pcie->bridge_sw_init_set(pcie, 1);
@@ -35,6 +33,3 @@ index 77967a37cbd9..d26844f03e25 100644
  	usleep_range(100, 200);
  
  	/* Take the bridge out of reset */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0330-Input-edt-ft5x06-Poll-the-device-if-no-interrupt-is-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0319-Input-edt-ft5x06-Poll-the-device-if-no-interrupt-is-.patch
similarity index 88%
rename from root/target/linux/bcm27xx/patches-5.15/0330-Input-edt-ft5x06-Poll-the-device-if-no-interrupt-is-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0319-Input-edt-ft5x06-Poll-the-device-if-no-interrupt-is-.patch
index b9ccc580..9b260183 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0330-Input-edt-ft5x06-Poll-the-device-if-no-interrupt-is-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0319-Input-edt-ft5x06-Poll-the-device-if-no-interrupt-is-.patch
@@ -1,7 +1,7 @@
-From e3f59124d3370b321d2d3cd0b1545482d7fae434 Mon Sep 17 00:00:00 2001
+From 8313c71a10582135825bb299efcf57ed008c5e50 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 6 Nov 2020 18:45:10 +0000
-Subject: [PATCH 330/634] Input: edt-ft5x06: Poll the device if no interrupt is
+Subject: [PATCH 319/828] Input: edt-ft5x06: Poll the device if no interrupt is
  configured.
 
 Not all systems have the interrupt line wired up, so switch to
@@ -13,8 +13,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/input/touchscreen/edt-ft5x06.c | 51 +++++++++++++++++++++-----
  1 file changed, 41 insertions(+), 10 deletions(-)
 
-diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
-index bb2e1cbffba7..339eae4ec7a8 100644
 --- a/drivers/input/touchscreen/edt-ft5x06.c
 +++ b/drivers/input/touchscreen/edt-ft5x06.c
 @@ -72,6 +72,8 @@
@@ -36,7 +34,7 @@ index bb2e1cbffba7..339eae4ec7a8 100644
  };
  
  struct edt_i2c_chip_data {
-@@ -279,6 +284,22 @@ static irqreturn_t edt_ft5x06_ts_isr(int irq, void *dev_id)
+@@ -279,6 +284,22 @@ out:
  	return IRQ_HANDLED;
  }
  
@@ -59,7 +57,7 @@ index bb2e1cbffba7..339eae4ec7a8 100644
  static int edt_ft5x06_register_write(struct edt_ft5x06_ts_data *tsdata,
  				     u8 addr, u8 value)
  {
-@@ -1234,17 +1255,27 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
+@@ -1234,17 +1255,27 @@ static int edt_ft5x06_ts_probe(struct i2
  
  	i2c_set_clientdata(client, tsdata);
  
@@ -67,18 +65,19 @@ index bb2e1cbffba7..339eae4ec7a8 100644
 -	if (irq_flags == IRQF_TRIGGER_NONE)
 -		irq_flags = IRQF_TRIGGER_FALLING;
 -	irq_flags |= IRQF_ONESHOT;
-+	if (client->irq) {
-+		irq_flags = irq_get_trigger_type(client->irq);
-+		if (irq_flags == IRQF_TRIGGER_NONE)
-+			irq_flags = IRQF_TRIGGER_FALLING;
-+		irq_flags |= IRQF_ONESHOT;
- 
+-
 -	error = devm_request_threaded_irq(&client->dev, client->irq,
 -					NULL, edt_ft5x06_ts_isr, irq_flags,
 -					client->name, tsdata);
 -	if (error) {
 -		dev_err(&client->dev, "Unable to request touchscreen IRQ.\n");
 -		return error;
++	if (client->irq) {
++		irq_flags = irq_get_trigger_type(client->irq);
++		if (irq_flags == IRQF_TRIGGER_NONE)
++			irq_flags = IRQF_TRIGGER_FALLING;
++		irq_flags |= IRQF_ONESHOT;
++
 +		error = devm_request_threaded_irq(&client->dev, client->irq,
 +						  NULL, edt_ft5x06_ts_isr,
 +						  irq_flags, client->name,
@@ -97,6 +96,3 @@ index bb2e1cbffba7..339eae4ec7a8 100644
  	}
  
  	error = devm_device_add_group(&client->dev, &edt_ft5x06_attr_group);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0331-drm-panel-raspberrypi-touchscreen-Use-independent-I2.patch b/root/target/linux/bcm27xx/patches-5.15/950-0320-drm-panel-raspberrypi-touchscreen-Use-independent-I2.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0331-drm-panel-raspberrypi-touchscreen-Use-independent-I2.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0320-drm-panel-raspberrypi-touchscreen-Use-independent-I2.patch
index 03e5a203..a28af58c 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0331-drm-panel-raspberrypi-touchscreen-Use-independent-I2.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0320-drm-panel-raspberrypi-touchscreen-Use-independent-I2.patch
@@ -1,7 +1,7 @@
-From e123cf16cb44e9e1656441a482490df16a0bc193 Mon Sep 17 00:00:00 2001
+From 65ed215053553dc214a4febf87657123cf525095 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 23 Apr 2020 10:17:18 +0100
-Subject: [PATCH 331/634] drm/panel/raspberrypi-touchscreen: Use independent
+Subject: [PATCH 320/828] drm/panel/raspberrypi-touchscreen: Use independent
  I2C actions with delay.
 
 We now have the hardware I2C controller pinmuxed to the drive the
@@ -17,11 +17,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../drm/panel/panel-raspberrypi-touchscreen.c | 30 ++++++++++++++++++-
  1 file changed, 29 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-index 46029c5610c8..c5621f07158e 100644
 --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
 +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-@@ -219,7 +219,35 @@ static struct rpi_touchscreen *panel_to_ts(struct drm_panel *panel)
+@@ -219,7 +219,35 @@ static struct rpi_touchscreen *panel_to_
  
  static int rpi_touchscreen_i2c_read(struct rpi_touchscreen *ts, u8 reg)
  {
@@ -58,6 +56,3 @@ index 46029c5610c8..c5621f07158e 100644
  }
  
  static void rpi_touchscreen_i2c_write(struct rpi_touchscreen *ts,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0332-drm-panel-raspberrypi-ts-Insert-delay-before-polling.patch b/root/target/linux/bcm27xx/patches-5.15/950-0321-drm-panel-raspberrypi-ts-Insert-delay-before-polling.patch
similarity index 68%
rename from root/target/linux/bcm27xx/patches-5.15/0332-drm-panel-raspberrypi-ts-Insert-delay-before-polling.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0321-drm-panel-raspberrypi-ts-Insert-delay-before-polling.patch
index 6a7b9be7..4d384401 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0332-drm-panel-raspberrypi-ts-Insert-delay-before-polling.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0321-drm-panel-raspberrypi-ts-Insert-delay-before-polling.patch
@@ -1,7 +1,7 @@
-From a4c9c85da2fe26bebf940449d475724e7e9c4561 Mon Sep 17 00:00:00 2001
+From b174053dbe417c9f763aa6ccc9e48174da61568e Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 10 Nov 2020 11:21:56 +0000
-Subject: [PATCH 332/634] drm/panel/raspberrypi-ts: Insert delay before polling
+Subject: [PATCH 321/828] drm/panel/raspberrypi-ts: Insert delay before polling
  for startup state
 
 In switching to the hardware I2C controller there is an issue
@@ -14,11 +14,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-index c5621f07158e..07013bfddf42 100644
 --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
 +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-@@ -299,6 +299,7 @@ static int rpi_touchscreen_enable(struct drm_panel *panel)
+@@ -299,6 +299,7 @@ static int rpi_touchscreen_enable(struct
  	int i;
  
  	rpi_touchscreen_i2c_write(ts, REG_POWERON, 1);
@@ -26,6 +24,3 @@ index c5621f07158e..07013bfddf42 100644
  	/* Wait for nPWRDWN to go low to indicate poweron is done. */
  	for (i = 0; i < 100; i++) {
  		if (rpi_touchscreen_i2c_read(ts, REG_PORTB) & 1)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0333-dt-bindings-Add-compatible-for-BCM2711-DSI1.patch b/root/target/linux/bcm27xx/patches-5.15/950-0322-dt-bindings-Add-compatible-for-BCM2711-DSI1.patch
similarity index 68%
rename from root/target/linux/bcm27xx/patches-5.15/0333-dt-bindings-Add-compatible-for-BCM2711-DSI1.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0322-dt-bindings-Add-compatible-for-BCM2711-DSI1.patch
index c7499c6d..1a7b31a7 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0333-dt-bindings-Add-compatible-for-BCM2711-DSI1.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0322-dt-bindings-Add-compatible-for-BCM2711-DSI1.patch
@@ -1,7 +1,7 @@
-From 7527be94a993294e6d478368db38a29d815ecc0a Mon Sep 17 00:00:00 2001
+From 764c4595cfc395cd3247c18b3e9a729a66347de4 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 12 Nov 2020 17:01:52 +0000
-Subject: [PATCH 333/634] dt-bindings: Add compatible for BCM2711 DSI1
+Subject: [PATCH 322/828] dt-bindings: Add compatible for BCM2711 DSI1
 
 DSI1 on BCM2711 doesn't require the DMA workaround that is used
 on BCM2835/6/7, therefore it needs a new compatible string.
@@ -11,8 +11,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml
-index 32608578a352..112bc56de0b1 100644
 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml
 @@ -21,6 +21,7 @@ properties:
@@ -23,6 +21,3 @@ index 32608578a352..112bc56de0b1 100644
  
    reg:
      maxItems: 1
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0334-media-bcm2835-unicam-Correctly-handle-error-propagat.patch b/root/target/linux/bcm27xx/patches-5.15/950-0323-media-bcm2835-unicam-Correctly-handle-error-propagat.patch
similarity index 68%
rename from root/target/linux/bcm27xx/patches-5.15/0334-media-bcm2835-unicam-Correctly-handle-error-propagat.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0323-media-bcm2835-unicam-Correctly-handle-error-propagat.patch
index 7be44ac1..566755b0 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0334-media-bcm2835-unicam-Correctly-handle-error-propagat.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0323-media-bcm2835-unicam-Correctly-handle-error-propagat.patch
@@ -1,7 +1,7 @@
-From 0201542bfad5c521fd3a79cd199bba54cd7fc0d5 Mon Sep 17 00:00:00 2001
+From d8105752ca002e8ba139a72da8cc7d627926ef6c Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Wed, 2 Dec 2020 15:22:23 +0000
-Subject: [PATCH 334/634] media: bcm2835-unicam: Correctly handle error
+Subject: [PATCH 323/828] media: bcm2835-unicam: Correctly handle error
  propagation for stream on
 
 On a failure in start_streaming(), the error code would not propagate to
@@ -13,11 +13,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 6501fb205e20..c13a0a20fd12 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -1730,8 +1730,7 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -1730,8 +1730,7 @@ err_disable_unicam:
  	unicam_disable(dev);
  	clk_disable_unprepare(dev->clock);
  err_vpu_clock:
@@ -27,6 +25,3 @@ index 6501fb205e20..c13a0a20fd12 100644
  		unicam_err(dev, "failed to reset the VPU clock\n");
  	clk_disable_unprepare(dev->vpu_clock);
  err_pm_put:
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0335-media-bcm2835-unicam-Return-early-from-stop_streamin.patch b/root/target/linux/bcm27xx/patches-5.15/950-0324-media-bcm2835-unicam-Return-early-from-stop_streamin.patch
similarity index 79%
rename from root/target/linux/bcm27xx/patches-5.15/0335-media-bcm2835-unicam-Return-early-from-stop_streamin.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0324-media-bcm2835-unicam-Return-early-from-stop_streamin.patch
index 2f097b4c..68bfab48 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0335-media-bcm2835-unicam-Return-early-from-stop_streamin.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0324-media-bcm2835-unicam-Return-early-from-stop_streamin.patch
@@ -1,7 +1,7 @@
-From 6cc3723cc33892ea646381b0a387fafd85d3e80f Mon Sep 17 00:00:00 2001
+From 48c930f51b583708af2f52880b7e77e59518516c Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Wed, 2 Dec 2020 15:26:09 +0000
-Subject: [PATCH 335/634] media: bcm2835-unicam: Return early from
+Subject: [PATCH 324/828] media: bcm2835-unicam: Return early from
  stop_streaming() if stopped
 
 clk_disable_unprepare() is called unconditionally in stop_streaming().
@@ -15,8 +15,6 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 16 +++++++++-------
  1 file changed, 9 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index c13a0a20fd12..60309de02369 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -426,6 +426,8 @@ struct unicam_device {
@@ -28,7 +26,7 @@ index c13a0a20fd12..60309de02369 100644
  	/* V4l2 device */
  	struct v4l2_device v4l2_dev;
  	struct media_device mdev;
-@@ -1724,6 +1726,7 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -1724,6 +1726,7 @@ static int unicam_start_streaming(struct
  		goto err_disable_unicam;
  	}
  
@@ -36,7 +34,7 @@ index c13a0a20fd12..60309de02369 100644
  	return 0;
  
  err_disable_unicam:
-@@ -1750,8 +1753,6 @@ static void unicam_stop_streaming(struct vb2_queue *vq)
+@@ -1750,8 +1753,6 @@ static void unicam_stop_streaming(struct
  	node->streaming = false;
  
  	if (node->pad_id == IMAGE_PAD) {
@@ -45,7 +43,7 @@ index c13a0a20fd12..60309de02369 100644
  		/*
  		 * Stop streaming the sensor and disable the peripheral.
  		 * We cannot continue streaming embedded data with the
-@@ -1762,12 +1763,13 @@ static void unicam_stop_streaming(struct vb2_queue *vq)
+@@ -1762,12 +1763,13 @@ static void unicam_stop_streaming(struct
  
  		unicam_disable(dev);
  
@@ -64,6 +62,3 @@ index c13a0a20fd12..60309de02369 100644
  		unicam_runtime_put(dev);
  
  	} else if (node->pad_id == METADATA_PAD) {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0336-media-bcm2835-unicam-Clear-clock-state-when-stopping.patch b/root/target/linux/bcm27xx/patches-5.15/950-0325-media-bcm2835-unicam-Clear-clock-state-when-stopping.patch
similarity index 65%
rename from root/target/linux/bcm27xx/patches-5.15/0336-media-bcm2835-unicam-Clear-clock-state-when-stopping.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0325-media-bcm2835-unicam-Clear-clock-state-when-stopping.patch
index 43cb2685..d18f0b07 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0336-media-bcm2835-unicam-Clear-clock-state-when-stopping.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0325-media-bcm2835-unicam-Clear-clock-state-when-stopping.patch
@@ -1,7 +1,7 @@
-From acc15800ba0253be20c1d11ae003b524a4fb0d4b Mon Sep 17 00:00:00 2001
+From ddbb83234fbcc43810a3d1337b572aa0c0a02dbb Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Wed, 2 Dec 2020 16:48:41 +0000
-Subject: [PATCH 336/634] media: bcm2835-unicam: Clear clock state when
+Subject: [PATCH 325/828] media: bcm2835-unicam: Clear clock state when
  stopping streaming
 
 Commit 65e08c465020d4c5b51afb452efc2246d80fd66f failed to clear the
@@ -13,11 +13,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 60309de02369..a8b3f5433f04 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -1769,6 +1769,7 @@ static void unicam_stop_streaming(struct vb2_queue *vq)
+@@ -1769,6 +1769,7 @@ static void unicam_stop_streaming(struct
  
  			clk_disable_unprepare(dev->vpu_clock);
  			clk_disable_unprepare(dev->clock);
@@ -25,6 +23,3 @@ index 60309de02369..a8b3f5433f04 100644
  		}
  		unicam_runtime_put(dev);
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0337-PCI-brcmstb-Advertise-MSI-X-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0326-PCI-brcmstb-Advertise-MSI-X-support.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0337-PCI-brcmstb-Advertise-MSI-X-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0326-PCI-brcmstb-Advertise-MSI-X-support.patch
index 37120122..5ea02699 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0337-PCI-brcmstb-Advertise-MSI-X-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0326-PCI-brcmstb-Advertise-MSI-X-support.patch
@@ -1,7 +1,7 @@
-From 0fd01ebca05f72d33d630a868e9f6617503f6c08 Mon Sep 17 00:00:00 2001
+From 70855652348e5c83056e18a0a934f33fad77594c Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Thu, 3 Dec 2020 13:44:42 +0000
-Subject: [PATCH 337/634] PCI: brcmstb: Advertise MSI-X support
+Subject: [PATCH 326/828] PCI: brcmstb: Advertise MSI-X support
 
 Although the BRCMSTB PCIe interface doesn't technically support the
 MSI-X spec, in practise it seems to work provided no more than 32
@@ -13,11 +13,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/pci/controller/pcie-brcmstb.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index d26844f03e25..44f0ea66b60b 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
-@@ -471,7 +471,8 @@ static struct irq_chip brcm_msi_irq_chip = {
+@@ -471,7 +471,8 @@ static struct irq_chip brcm_msi_irq_chip
  
  static struct msi_domain_info brcm_msi_domain_info = {
  	/* Multi MSI is supported by the controller, but not by this driver */
@@ -27,6 +25,3 @@ index d26844f03e25..44f0ea66b60b 100644
  	.chip	= &brcm_msi_irq_chip,
  };
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0338-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch b/root/target/linux/bcm27xx/patches-5.15/950-0327-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0338-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0327-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch
index 9c5ec8c1..f51fe4cb 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0338-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0327-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch
@@ -1,7 +1,7 @@
-From e95d6f14d6ab15195125d2a08cbc7a659816ab05 Mon Sep 17 00:00:00 2001
+From 872a25fe160c6f770c94fba4090aefa9d23793a7 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Tue, 15 Dec 2020 16:38:37 +0000
-Subject: [PATCH 338/634] net: lan78xx: Ack pending PHY ints when resetting
+Subject: [PATCH 327/828] net: lan78xx: Ack pending PHY ints when resetting
 
 lan78xx_link_reset explicitly clears the MAC's view of the PHY's IRQ
 status. In doing so it potentially leaves the PHY with a pending
@@ -18,11 +18,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/net/usb/lan78xx.c | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
-index fdcf14aa4485..0c72686f1106 100644
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -1272,6 +1272,9 @@ static int lan78xx_link_reset(struct lan78xx_net *dev)
+@@ -1274,6 +1274,9 @@ static int lan78xx_link_reset(struct lan
  	if (unlikely(ret < 0))
  		return ret;
  
@@ -32,6 +30,3 @@ index fdcf14aa4485..0c72686f1106 100644
  	mutex_lock(&phydev->lock);
  	phy_read_status(phydev);
  	link = phydev->link;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0339-media-i2c-imx477-Selection-compliance-fixes.patch b/root/target/linux/bcm27xx/patches-5.15/950-0328-media-i2c-imx477-Selection-compliance-fixes.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0339-media-i2c-imx477-Selection-compliance-fixes.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0328-media-i2c-imx477-Selection-compliance-fixes.patch
index 71f9192b..42d104c6 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0339-media-i2c-imx477-Selection-compliance-fixes.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0328-media-i2c-imx477-Selection-compliance-fixes.patch
@@ -1,7 +1,7 @@
-From 7c4d2a030c24cc373cd3bcb6cd8ee56070275bb3 Mon Sep 17 00:00:00 2001
+From c4be66ac898e4317bfe15a9d0be8e8f08b59fb5b Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Wed, 9 Dec 2020 11:30:12 +0000
-Subject: [PATCH 339/634] media: i2c: imx477: Selection compliance fixes
+Subject: [PATCH 328/828] media: i2c: imx477: Selection compliance fixes
 
 To comply with the intended usage of the V4L2 selection target when
 used to retrieve a sensor image properties, adjust the rectangles
@@ -24,11 +24,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  drivers/media/i2c/imx477.c | 17 +++++++++--------
  1 file changed, 9 insertions(+), 8 deletions(-)
 
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index d0848f3f3c09..07a1e023ade8 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
-@@ -900,8 +900,8 @@ static const struct imx477_mode supported_modes_12bit[] = {
+@@ -900,8 +900,8 @@ static const struct imx477_mode supporte
  		.height = 3040,
  		.line_length_pix = 0x5dc0,
  		.crop = {
@@ -39,7 +37,7 @@ index d0848f3f3c09..07a1e023ade8 100644
  			.width = 4056,
  			.height = 3040,
  		},
-@@ -924,8 +924,8 @@ static const struct imx477_mode supported_modes_12bit[] = {
+@@ -924,8 +924,8 @@ static const struct imx477_mode supporte
  		.height = 1520,
  		.line_length_pix = 0x31c4,
  		.crop = {
@@ -50,7 +48,7 @@ index d0848f3f3c09..07a1e023ade8 100644
  			.width = 4056,
  			.height = 3040,
  		},
-@@ -948,8 +948,8 @@ static const struct imx477_mode supported_modes_12bit[] = {
+@@ -948,8 +948,8 @@ static const struct imx477_mode supporte
  		.height = 1080,
  		.line_length_pix = 0x31c4,
  		.crop = {
@@ -61,7 +59,7 @@ index d0848f3f3c09..07a1e023ade8 100644
  			.width = 4056,
  			.height = 2600,
  		},
-@@ -983,8 +983,8 @@ static const struct imx477_mode supported_modes_10bit[] = {
+@@ -983,8 +983,8 @@ static const struct imx477_mode supporte
  			 * rectangle once the driver is expanded to represent
  			 * its processing blocks with multiple subdevs.
  			 */
@@ -72,7 +70,7 @@ index d0848f3f3c09..07a1e023ade8 100644
  			.width = 4052,
  			.height = 3040,
  		},
-@@ -1696,6 +1696,7 @@ static int imx477_get_selection(struct v4l2_subdev *sd,
+@@ -1696,6 +1696,7 @@ static int imx477_get_selection(struct v
  		return 0;
  
  	case V4L2_SEL_TGT_CROP_DEFAULT:
@@ -80,6 +78,3 @@ index d0848f3f3c09..07a1e023ade8 100644
  		sel->r.left = IMX477_PIXEL_ARRAY_LEFT;
  		sel->r.top = IMX477_PIXEL_ARRAY_TOP;
  		sel->r.width = IMX477_PIXEL_ARRAY_WIDTH;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0341-vc-sm-cma-fixed-kbuild-problem.patch b/root/target/linux/bcm27xx/patches-5.15/950-0329-vc-sm-cma-fixed-kbuild-problem.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0341-vc-sm-cma-fixed-kbuild-problem.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0329-vc-sm-cma-fixed-kbuild-problem.patch
index 373eb5d0..c66ecb60 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0341-vc-sm-cma-fixed-kbuild-problem.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0329-vc-sm-cma-fixed-kbuild-problem.patch
@@ -1,7 +1,7 @@
-From 2a9a733a6306138810b1903d810eca9aa1060ae8 Mon Sep 17 00:00:00 2001
+From ea947383f501556a6f27241df933bb06dc8ee9c5 Mon Sep 17 00:00:00 2001
 From: gesangtome <gesangtome@foxmail.com>
 Date: Fri, 1 Jan 2021 18:03:17 +0800
-Subject: [PATCH 341/634] vc-sm-cma: fixed kbuild problem
+Subject: [PATCH 329/828] vc-sm-cma: fixed kbuild problem
 
 error logs:
   drivers/staging/vc04_services/vc-sm-cma/Kconfig:1:error: recursive dependency detected!
@@ -18,8 +18,6 @@ Branch: rpi-5.10.y
  drivers/staging/vc04_services/vchiq-mmal/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/Kconfig b/drivers/staging/vc04_services/vchiq-mmal/Kconfig
-index a7c1a7bf516e..5df9198cdab1 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/Kconfig
 +++ b/drivers/staging/vc04_services/vchiq-mmal/Kconfig
 @@ -1,6 +1,6 @@
@@ -30,6 +28,3 @@ index a7c1a7bf516e..5df9198cdab1 100644
  	select BCM_VC_SM_CMA
  	help
  	  Enables the MMAL API over VCHIQ interface as used for the
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0342-staging-vc04_services-Add-additional-unpacked-raw-fo.patch b/root/target/linux/bcm27xx/patches-5.15/950-0330-staging-vc04_services-Add-additional-unpacked-raw-fo.patch
similarity index 88%
rename from root/target/linux/bcm27xx/patches-5.15/0342-staging-vc04_services-Add-additional-unpacked-raw-fo.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0330-staging-vc04_services-Add-additional-unpacked-raw-fo.patch
index 119784e4..8c844acf 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0342-staging-vc04_services-Add-additional-unpacked-raw-fo.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0330-staging-vc04_services-Add-additional-unpacked-raw-fo.patch
@@ -1,7 +1,7 @@
-From 6895ee92756b022edd1091045cbebc6bb0e1f0e1 Mon Sep 17 00:00:00 2001
+From b911324083b525d011061038953a6330cc920cbd Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 7 Jan 2021 10:43:20 +0000
-Subject: [PATCH 342/634] staging/vc04_services: Add additional unpacked raw
+Subject: [PATCH 330/828] staging/vc04_services: Add additional unpacked raw
  formats
 
 Support has been added for the unpacked (16bpp) versions of
@@ -12,8 +12,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../vc04_services/vchiq-mmal/mmal-encodings.h | 22 +++++++++++++++++++
  1 file changed, 22 insertions(+)
 
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-index 8eb6334ee055..59f7ad3a5b3b 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
 @@ -102,12 +102,34 @@
@@ -51,6 +49,3 @@ index 8eb6334ee055..59f7ad3a5b3b 100644
  
  /** An EGL image handle
   */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0343-staging-bcm2835-codec-Add-the-unpacked-16bpp-raw-for.patch b/root/target/linux/bcm27xx/patches-5.15/950-0331-staging-bcm2835-codec-Add-the-unpacked-16bpp-raw-for.patch
similarity index 88%
rename from root/target/linux/bcm27xx/patches-5.15/0343-staging-bcm2835-codec-Add-the-unpacked-16bpp-raw-for.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0331-staging-bcm2835-codec-Add-the-unpacked-16bpp-raw-for.patch
index 088d121e..cecc74a5 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0343-staging-bcm2835-codec-Add-the-unpacked-16bpp-raw-for.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0331-staging-bcm2835-codec-Add-the-unpacked-16bpp-raw-for.patch
@@ -1,7 +1,7 @@
-From f32b587a1c61b3a42a40fe9b9fb6778be4789a74 Mon Sep 17 00:00:00 2001
+From 3a9c3c0f3f19aa815d9e3f8de78184891b930f16 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 7 Jan 2021 10:45:16 +0000
-Subject: [PATCH 343/634] staging/bcm2835-codec: Add the unpacked (16bpp) raw
+Subject: [PATCH 331/828] staging/bcm2835-codec: Add the unpacked (16bpp) raw
  formats
 
 Now that the firmware supports the unpacked (16bpp) variants
@@ -12,15 +12,12 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../bcm2835-codec/bcm2835-v4l2-codec.c        | 128 +++++++++++++++++-
  1 file changed, 126 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 8a8f1e8db7d0..c883db63808f 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -380,6 +380,106 @@ static const struct bcm2835_codec_fmt supported_formats[] = {
- 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG16,
+@@ -381,6 +381,106 @@ static const struct bcm2835_codec_fmt su
  		.size_multiplier_x2	= 2,
  		.is_bayer		= true,
-+	}, {
+ 	}, {
 +		/* Bayer formats unpacked to 16bpp */
 +		/* 10 bit */
 +		.fourcc			= V4L2_PIX_FMT_SRGGB10,
@@ -120,14 +117,14 @@ index 8a8f1e8db7d0..c883db63808f 100644
 +		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG14,
 +		.size_multiplier_x2	= 2,
 +		.is_bayer		= true,
- 	}, {
++	}, {
  		/* Monochrome MIPI formats */
  		/* 8 bit */
-@@ -421,6 +521,30 @@ static const struct bcm2835_codec_fmt supported_formats[] = {
- 		.flags			= 0,
+ 		.fourcc			= V4L2_PIX_FMT_GREY,
+@@ -422,6 +522,30 @@ static const struct bcm2835_codec_fmt su
  		.mmal_fmt		= MMAL_ENCODING_Y16,
  		.size_multiplier_x2	= 2,
-+	}, {
+ 	}, {
 +		/* 10 bit as 16bpp */
 +		.fourcc			= V4L2_PIX_FMT_Y10,
 +		.depth			= 16,
@@ -151,10 +148,11 @@ index 8a8f1e8db7d0..c883db63808f 100644
 +		.flags			= 0,
 +		.mmal_fmt		= MMAL_ENCODING_Y14,
 +		.size_multiplier_x2	= 2,
- 	}, {
++	}, {
  		/* Compressed formats */
  		.fourcc			= V4L2_PIX_FMT_H264,
-@@ -2681,10 +2805,10 @@ static const struct v4l2_m2m_ops m2m_ops = {
+ 		.depth			= 0,
+@@ -2681,10 +2805,10 @@ static const struct v4l2_m2m_ops m2m_ops
  
  /* Size of the array to provide to the VPU when asking for the list of supported
   * formats.
@@ -167,6 +165,3 @@ index 8a8f1e8db7d0..c883db63808f 100644
  
  /* Populate dev->supported_fmts with the formats supported by those ports. */
  static int bcm2835_codec_get_supported_fmts(struct bcm2835_codec_dev *dev)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0344-staging-bcm2835-codec-Log-the-number-of-excess-suppo.patch b/root/target/linux/bcm27xx/patches-5.15/950-0332-staging-bcm2835-codec-Log-the-number-of-excess-suppo.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0344-staging-bcm2835-codec-Log-the-number-of-excess-suppo.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0332-staging-bcm2835-codec-Log-the-number-of-excess-suppo.patch
index f56b81d4..f80dafcd 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0344-staging-bcm2835-codec-Log-the-number-of-excess-suppo.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0332-staging-bcm2835-codec-Log-the-number-of-excess-suppo.patch
@@ -1,7 +1,7 @@
-From 0ffc1b78d98d5bd899be266c7ed397a41e31b442 Mon Sep 17 00:00:00 2001
+From 318b11d1a3c5eef04ba184e13261dbd51ff5edfe Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 7 Jan 2021 11:41:26 +0000
-Subject: [PATCH 344/634] staging/bcm2835-codec: Log the number of excess
+Subject: [PATCH 332/828] staging/bcm2835-codec: Log the number of excess
  supported formats
 
 When logging that the firmware has provided more supported formats
@@ -13,11 +13,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index c883db63808f..94691ab7175a 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -2836,8 +2836,10 @@ static int bcm2835_codec_get_supported_fmts(struct bcm2835_codec_dev *dev)
+@@ -2836,8 +2836,10 @@ static int bcm2835_codec_get_supported_f
  
  	if (ret) {
  		if (ret == MMAL_MSG_STATUS_ENOSPC) {
@@ -30,7 +28,7 @@ index c883db63808f..94691ab7175a 100644
  			num_encodings = MAX_SUPPORTED_ENCODINGS;
  		} else {
  			v4l2_err(&dev->v4l2_dev, "%s: get_param ret %u.\n",
-@@ -2880,8 +2882,10 @@ static int bcm2835_codec_get_supported_fmts(struct bcm2835_codec_dev *dev)
+@@ -2880,8 +2882,10 @@ static int bcm2835_codec_get_supported_f
  
  	if (ret) {
  		if (ret == MMAL_MSG_STATUS_ENOSPC) {
@@ -43,6 +41,3 @@ index c883db63808f..94691ab7175a 100644
  			num_encodings = MAX_SUPPORTED_ENCODINGS;
  		} else {
  			ret = -EINVAL;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0345-staging-bcm2835-isp-Add-the-unpacked-16bpp-raw-forma.patch b/root/target/linux/bcm27xx/patches-5.15/950-0333-staging-bcm2835-isp-Add-the-unpacked-16bpp-raw-forma.patch
similarity index 88%
rename from root/target/linux/bcm27xx/patches-5.15/0345-staging-bcm2835-isp-Add-the-unpacked-16bpp-raw-forma.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0333-staging-bcm2835-isp-Add-the-unpacked-16bpp-raw-forma.patch
index fa74f76a..11dcc2b1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0345-staging-bcm2835-isp-Add-the-unpacked-16bpp-raw-forma.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0333-staging-bcm2835-isp-Add-the-unpacked-16bpp-raw-forma.patch
@@ -1,7 +1,7 @@
-From 08ec88c2d545b9ac04b01d999f373a273d184253 Mon Sep 17 00:00:00 2001
+From d46fb4197b52cdd93e2f52c7d7da3dce555c593e Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 7 Jan 2021 11:37:10 +0000
-Subject: [PATCH 345/634] staging/bcm2835-isp: Add the unpacked (16bpp) raw
+Subject: [PATCH 333/828] staging/bcm2835-isp: Add the unpacked (16bpp) raw
  formats
 
 Now that the firmware supports the unpacked (16bpp) variants
@@ -13,15 +13,12 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../bcm2835-isp/bcm2835-v4l2-isp.c            |   4 +-
  2 files changed, 129 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
-index acd0d5b8b0b8..12d8ec85d2c4 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
-@@ -297,6 +297,106 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
- 		.size_multiplier_x2 = 2,
+@@ -298,6 +298,106 @@ static const struct bcm2835_isp_fmt supp
  		.colorspace	    = V4L2_COLORSPACE_RAW,
  		.step_size	    = 2,
-+	}, {
+ 	}, {
 +		/* Bayer formats unpacked to 16bpp */
 +		/* 10 bit */
 +		.fourcc		    = V4L2_PIX_FMT_SRGGB10,
@@ -121,10 +118,11 @@ index acd0d5b8b0b8..12d8ec85d2c4 100644
 +		.size_multiplier_x2 = 2,
 +		.colorspace	    = V4L2_COLORSPACE_RAW,
 +		.step_size	    = 2,
- 	}, {
++	}, {
  		/* Monochrome MIPI formats */
  		/* 8 bit */
-@@ -343,6 +443,33 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+ 		.fourcc		    = V4L2_PIX_FMT_GREY,
+@@ -343,6 +443,33 @@ static const struct bcm2835_isp_fmt supp
  		.size_multiplier_x2 = 2,
  		.colorspace	    = V4L2_COLORSPACE_RAW,
  		.step_size	    = 2,
@@ -158,11 +156,9 @@ index acd0d5b8b0b8..12d8ec85d2c4 100644
  	}, {
  		.fourcc		    = V4L2_META_FMT_BCM2835_ISP_STATS,
  		.mmal_fmt	    = MMAL_ENCODING_BRCM_STATS,
-diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-index 8bb3d115b27a..9a313ffcabf5 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -1146,11 +1146,11 @@ static const struct v4l2_ioctl_ops bcm2835_isp_node_ioctl_ops = {
+@@ -1146,11 +1146,11 @@ static const struct v4l2_ioctl_ops bcm28
   * Size of the array to provide to the VPU when asking for the list of supported
   * formats.
   *
@@ -176,6 +172,3 @@ index 8bb3d115b27a..9a313ffcabf5 100644
  
  /* Populate node->supported_fmts with the formats supported by those ports. */
  static int bcm2835_isp_get_supported_fmts(struct bcm2835_isp_node *node)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0346-staging-bcm2835-isp-Log-the-number-of-excess-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0334-staging-bcm2835-isp-Log-the-number-of-excess-support.patch
similarity index 71%
rename from root/target/linux/bcm27xx/patches-5.15/0346-staging-bcm2835-isp-Log-the-number-of-excess-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0334-staging-bcm2835-isp-Log-the-number-of-excess-support.patch
index 7b357b82..8ee83f70 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0346-staging-bcm2835-isp-Log-the-number-of-excess-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0334-staging-bcm2835-isp-Log-the-number-of-excess-support.patch
@@ -1,7 +1,7 @@
-From 73548f475f15fda7fed1aa0aab57d2eedb793c28 Mon Sep 17 00:00:00 2001
+From a9838d1f41ce107d62b8fc8bea5f4c73682928fe Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 7 Jan 2021 11:43:22 +0000
-Subject: [PATCH 346/634] staging/bcm2835-isp: Log the number of excess
+Subject: [PATCH 334/828] staging/bcm2835-isp: Log the number of excess
  supported formats
 
 When logging that the firmware has provided more supported formats
@@ -13,11 +13,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-index 9a313ffcabf5..afac2ad65790 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -1169,8 +1169,9 @@ static int bcm2835_isp_get_supported_fmts(struct bcm2835_isp_node *node)
+@@ -1169,8 +1169,9 @@ static int bcm2835_isp_get_supported_fmt
  	if (ret) {
  		if (ret == MMAL_MSG_STATUS_ENOSPC) {
  			v4l2_err(&dev->v4l2_dev,
@@ -29,6 +27,3 @@ index 9a313ffcabf5..afac2ad65790 100644
  			num_encodings = MAX_SUPPORTED_ENCODINGS;
  		} else {
  			v4l2_err(&dev->v4l2_dev, "%s: get_param ret %u.\n",
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0347-bcm2835-dma-Avoid-losing-CS-flags-after-interrupt.patch b/root/target/linux/bcm27xx/patches-5.15/950-0335-bcm2835-dma-Avoid-losing-CS-flags-after-interrupt.patch
similarity index 65%
rename from root/target/linux/bcm27xx/patches-5.15/0347-bcm2835-dma-Avoid-losing-CS-flags-after-interrupt.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0335-bcm2835-dma-Avoid-losing-CS-flags-after-interrupt.patch
index 218ea311..91dfd587 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0347-bcm2835-dma-Avoid-losing-CS-flags-after-interrupt.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0335-bcm2835-dma-Avoid-losing-CS-flags-after-interrupt.patch
@@ -1,18 +1,16 @@
-From 7b3a4084257e383ad6df0152757fb89bc60f5da3 Mon Sep 17 00:00:00 2001
+From e6ef1d7fb93aac47dea2d6d22279bd301e796f43 Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Wed, 6 Jan 2021 18:16:10 +0000
-Subject: [PATCH 347/634] bcm2835-dma: Avoid losing CS flags after interrupt
+Subject: [PATCH 335/828] bcm2835-dma: Avoid losing CS flags after interrupt
 
 Signed-off-by: Dom Cobley <popcornmix@gmail.com>
 ---
  drivers/dma/bcm2835-dma.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index 0cbfa9d559a2..9878d1bed589 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
-@@ -704,7 +704,7 @@ static irqreturn_t bcm2835_dma_callback(int irq, void *data)
+@@ -704,7 +704,7 @@ 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.
  	 */
@@ -21,6 +19,3 @@ index 0cbfa9d559a2..9878d1bed589 100644
  	       c->chan_base + BCM2835_DMA_CS);
  
  	d = c->desc;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0348-arch-arm-Add-__memset-alias-to-memset_rpi.S.patch b/root/target/linux/bcm27xx/patches-5.15/950-0336-arch-arm-Add-__memset-alias-to-memset_rpi.S.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0348-arch-arm-Add-__memset-alias-to-memset_rpi.S.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0336-arch-arm-Add-__memset-alias-to-memset_rpi.S.patch
index 3303e141..dbe6cd44 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0348-arch-arm-Add-__memset-alias-to-memset_rpi.S.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0336-arch-arm-Add-__memset-alias-to-memset_rpi.S.patch
@@ -1,7 +1,7 @@
-From 2463eda385df8bc1bb3fea798b32ab1dd7757438 Mon Sep 17 00:00:00 2001
+From 206c1e42e5aad1f9a23b60a280746f99ca1157fb Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Fri, 8 Jan 2021 13:37:25 +0000
-Subject: [PATCH 348/634] arch/arm: Add __memset alias to memset_rpi.S
+Subject: [PATCH 336/828] arch/arm: Add __memset alias to memset_rpi.S
 
 memset_rpi.S is an optimised memset implementation, but doesn't define
 __memset (which was just added to memset.S). As a result, building
@@ -14,11 +14,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  arch/arm/lib/memset_rpi.S | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/arch/arm/lib/memset_rpi.S b/arch/arm/lib/memset_rpi.S
-index e8469cecabc1..bda4c5b99367 100644
 --- a/arch/arm/lib/memset_rpi.S
 +++ b/arch/arm/lib/memset_rpi.S
-@@ -52,6 +52,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+@@ -52,6 +52,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
   */
  ENTRY(mmioset)
  ENTRY(memset)
@@ -33,6 +31,3 @@ index e8469cecabc1..bda4c5b99367 100644
 +ENDPROC(__memset)
  ENDPROC(memset)
  ENDPROC(mmioset)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0349-bcm2835-dma-Add-bcm2835-dma-Add-DMA_WIDE_SOURCE-and-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0337-bcm2835-dma-Add-bcm2835-dma-Add-DMA_WIDE_SOURCE-and-.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0349-bcm2835-dma-Add-bcm2835-dma-Add-DMA_WIDE_SOURCE-and-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0337-bcm2835-dma-Add-bcm2835-dma-Add-DMA_WIDE_SOURCE-and-.patch
index d032c420..f4760d9c 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0349-bcm2835-dma-Add-bcm2835-dma-Add-DMA_WIDE_SOURCE-and-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0337-bcm2835-dma-Add-bcm2835-dma-Add-DMA_WIDE_SOURCE-and-.patch
@@ -1,7 +1,7 @@
-From 0fd1ba174224b1d9c62b3da2d0cf8edaa95239d5 Mon Sep 17 00:00:00 2001
+From 7bb2ff4f06b6125a4c5f563f95c353b7d05a0312 Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Wed, 30 Dec 2020 14:51:29 +0000
-Subject: [PATCH 349/634] bcm2835-dma: Add bcm2835-dma: Add DMA_WIDE_SOURCE and
+Subject: [PATCH 337/828] bcm2835-dma: Add bcm2835-dma: Add DMA_WIDE_SOURCE and
  DMA_WIDE_DEST flags
 
 Use (reserved) bits 24 and 25 of the dreq value
@@ -13,8 +13,6 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  drivers/dma/bcm2835-dma.c | 19 ++++++++++++++++---
  1 file changed, 16 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index 9878d1bed589..6aee9e97d207 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -171,6 +171,17 @@ struct bcm2835_desc {
@@ -35,7 +33,7 @@ index 9878d1bed589..6aee9e97d207 100644
  /* debug register bits */
  #define BCM2835_DMA_DEBUG_LAST_NOT_SET_ERR	BIT(0)
  #define BCM2835_DMA_DEBUG_FIFO_ERR		BIT(1)
-@@ -850,7 +861,8 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_memcpy(
+@@ -850,7 +861,8 @@ static struct dma_async_tx_descriptor *b
  {
  	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
  	struct bcm2835_desc *d;
@@ -45,7 +43,7 @@ index 9878d1bed589..6aee9e97d207 100644
  	u32 extra = BCM2835_DMA_INT_EN | WAIT_RESP(c->dreq);
  	size_t max_len = bcm2835_dma_max_frame_length(c);
  	size_t frames;
-@@ -881,7 +893,8 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_slave_sg(
+@@ -881,7 +893,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;
@@ -55,7 +53,7 @@ index 9878d1bed589..6aee9e97d207 100644
  	u32 extra = BCM2835_DMA_INT_EN;
  	size_t frames;
  
-@@ -943,7 +956,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic(
+@@ -943,7 +956,7 @@ 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;
@@ -64,6 +62,3 @@ index 9878d1bed589..6aee9e97d207 100644
  	u32 extra = 0;
  	size_t max_len = bcm2835_dma_max_frame_length(c);
  	size_t frames;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0350-uapi-bcm2835-isp-Add-colour-denoise-configuration.patch b/root/target/linux/bcm27xx/patches-5.15/950-0338-uapi-bcm2835-isp-Add-colour-denoise-configuration.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0350-uapi-bcm2835-isp-Add-colour-denoise-configuration.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0338-uapi-bcm2835-isp-Add-colour-denoise-configuration.patch
index c39abb73..7a037f48 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0350-uapi-bcm2835-isp-Add-colour-denoise-configuration.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0338-uapi-bcm2835-isp-Add-colour-denoise-configuration.patch
@@ -1,7 +1,7 @@
-From 51d7d7df14d9a4e2df6eeed0139a929854508319 Mon Sep 17 00:00:00 2001
+From fc2c555d848f05876486a73a9902a38363a43e18 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Thu, 14 Jan 2021 09:18:42 +0000
-Subject: [PATCH 350/634] uapi: bcm2835-isp: Add colour denoise configuration
+Subject: [PATCH 338/828] uapi: bcm2835-isp: Add colour denoise configuration
 
 Add a configuration structure for colour denoise to the bcm2835_isp
 driver.
@@ -11,8 +11,6 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  include/uapi/linux/bcm2835-isp.h | 27 +++++++++++++++++++++++++++
  1 file changed, 27 insertions(+)
 
-diff --git a/include/uapi/linux/bcm2835-isp.h b/include/uapi/linux/bcm2835-isp.h
-index cf8c0437f159..c50e3ca81565 100644
 --- a/include/uapi/linux/bcm2835-isp.h
 +++ b/include/uapi/linux/bcm2835-isp.h
 @@ -31,6 +31,8 @@
@@ -24,11 +22,10 @@ index cf8c0437f159..c50e3ca81565 100644
  
  /*
   * All structs below are directly mapped onto the equivalent structs in
-@@ -175,6 +177,31 @@ struct bcm2835_isp_gamma {
- 	__u16 y[BCM2835_NUM_GAMMA_PTS];
+@@ -176,6 +178,31 @@ struct bcm2835_isp_gamma {
  };
  
-+/**
+ /**
 + * enum bcm2835_isp_cdn_mode - Mode of operation for colour denoise.
 + *
 + * @CDN_MODE_FAST:		Fast (but lower quality) colour denoise
@@ -53,9 +50,7 @@ index cf8c0437f159..c50e3ca81565 100644
 +	__u32 mode;
 +};
 +
- /**
++/**
   * struct bcm2835_isp_denoise - Denoise parameters set with the
   *				V4L2_CID_USER_BCM2835_ISP_DENOISE ctrl.
--- 
-2.33.1
-
+  *
diff --git a/root/target/linux/bcm27xx/patches-5.15/0351-staging-vc04_services-ISP-Add-colour-denoise-control.patch b/root/target/linux/bcm27xx/patches-5.15/950-0339-staging-vc04_services-ISP-Add-colour-denoise-control.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0351-staging-vc04_services-ISP-Add-colour-denoise-control.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0339-staging-vc04_services-ISP-Add-colour-denoise-control.patch
index b2bc61b8..06c4b78e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0351-staging-vc04_services-ISP-Add-colour-denoise-control.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0339-staging-vc04_services-ISP-Add-colour-denoise-control.patch
@@ -1,7 +1,7 @@
-From e9eccf1b1ea4b23a512cf8b9e7a5c66bb9836dda Mon Sep 17 00:00:00 2001
+From 4dbf53effbc5a1589853c33ace7ffbcb43725a2f Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Thu, 14 Jan 2021 09:20:52 +0000
-Subject: [PATCH 351/634] staging: vc04_services: ISP: Add colour denoise
+Subject: [PATCH 339/828] staging: vc04_services: ISP: Add colour denoise
  control
 
 Add colour denoise control to the bcm2835 driver through a new v4l2
@@ -16,27 +16,23 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  .../vc04_services/vchiq-mmal/mmal-parameters.h      | 13 +++++++++++++
  3 files changed, 23 insertions(+)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-ctrls.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-ctrls.h
-index cfbb1063aad1..172605718cdf 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-ctrls.h
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-ctrls.h
-@@ -56,6 +56,11 @@ static const struct bcm2835_isp_custom_ctrl custom_ctrls[] = {
- 		.id	= V4L2_CID_USER_BCM2835_ISP_DENOISE,
+@@ -57,6 +57,11 @@ static const struct bcm2835_isp_custom_c
  		.size	= sizeof(struct bcm2835_isp_denoise),
  		.flags  = 0
-+	}, {
+ 	}, {
 +		.name	= "Colour Denoise",
 +		.id	= V4L2_CID_USER_BCM2835_ISP_CDN,
 +		.size	= sizeof(struct bcm2835_isp_cdn),
 +		.flags  = 0
- 	}, {
++	}, {
  		.name	= "Defective Pixel Correction",
  		.id	= V4L2_CID_USER_BCM2835_ISP_DPC,
-diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-index afac2ad65790..4d24aec7203d 100644
+ 		.size	= sizeof(struct bcm2835_isp_dpc),
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -764,6 +764,11 @@ static int bcm2835_isp_s_ctrl(struct v4l2_ctrl *ctrl)
+@@ -764,6 +764,11 @@ static int bcm2835_isp_s_ctrl(struct v4l
  				    ctrl->p_new.p_u8,
  				    sizeof(struct bcm2835_isp_denoise));
  		break;
@@ -48,8 +44,6 @@ index afac2ad65790..4d24aec7203d 100644
  	case V4L2_CID_USER_BCM2835_ISP_SHARPEN:
  		ret = set_isp_param(node, MMAL_PARAMETER_SHARPEN,
  				    ctrl->p_new.p_u8,
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-index efda4dc039c3..79438d23912f 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 @@ -277,6 +277,8 @@ enum mmal_parameter_camera_type {
@@ -79,6 +73,3 @@ index efda4dc039c3..79438d23912f 100644
  struct mmal_parameter_denoise {
  	u32 enabled;
  	u32 constant;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0352-spi-bcm2835-Workaround-fix-for-zero-length-transfers.patch b/root/target/linux/bcm27xx/patches-5.15/950-0340-spi-bcm2835-Workaround-fix-for-zero-length-transfers.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0352-spi-bcm2835-Workaround-fix-for-zero-length-transfers.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0340-spi-bcm2835-Workaround-fix-for-zero-length-transfers.patch
index 1f7891ad..5336ac60 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0352-spi-bcm2835-Workaround-fix-for-zero-length-transfers.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0340-spi-bcm2835-Workaround-fix-for-zero-length-transfers.patch
@@ -1,7 +1,7 @@
-From 5aacd1b69c67ffc8d8ec2f71d56b993454de2a8c Mon Sep 17 00:00:00 2001
+From b19297ac8f2b2b97d3405c635c5ef471b8128f78 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Thu, 28 Jan 2021 11:30:04 +0000
-Subject: [PATCH 352/634] spi: bcm2835: Workaround/fix for zero-length
+Subject: [PATCH 340/828] spi: bcm2835: Workaround/fix for zero-length
  transfers
 
 A relatively recent commit ([1]) contained optimisation for the PIO
@@ -29,11 +29,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/spi/spi-bcm2835.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
-diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
-index 80444e6bf034..5b7e32c0cf49 100644
 --- a/drivers/spi/spi-bcm2835.c
 +++ b/drivers/spi/spi-bcm2835.c
-@@ -1055,6 +1055,16 @@ static int bcm2835_spi_transfer_one(struct spi_controller *ctlr,
+@@ -1055,6 +1055,16 @@ static int bcm2835_spi_transfer_one(stru
  	unsigned long hz_per_byte, byte_limit;
  	u32 cs = slv->prepare_cs;
  
@@ -50,6 +48,3 @@ index 80444e6bf034..5b7e32c0cf49 100644
  	/* set clock */
  	spi_hz = tfr->speed_hz;
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0353-kbuild-Silence-unavoidable-dtc-overlay-warnings.patch b/root/target/linux/bcm27xx/patches-5.15/950-0341-kbuild-Silence-unavoidable-dtc-overlay-warnings.patch
similarity index 75%
rename from root/target/linux/bcm27xx/patches-5.15/0353-kbuild-Silence-unavoidable-dtc-overlay-warnings.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0341-kbuild-Silence-unavoidable-dtc-overlay-warnings.patch
index 42415b5e..ca7fb6e0 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0353-kbuild-Silence-unavoidable-dtc-overlay-warnings.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0341-kbuild-Silence-unavoidable-dtc-overlay-warnings.patch
@@ -1,7 +1,7 @@
-From c8fbb6222aab1be712563c28e4c4031477f05693 Mon Sep 17 00:00:00 2001
+From 30bd0b3cefba59a8bd1c60ff75dc061c0a9fa267 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Fri, 29 Jan 2021 10:34:11 +0000
-Subject: [PATCH 353/634] kbuild: Silence unavoidable dtc overlay warnings
+Subject: [PATCH 341/828] kbuild: Silence unavoidable dtc overlay warnings
 
 Much effort has been put into finding ways to avoid warnings from dtc
 about overlays, usually to do with the presence of #address-cells and
@@ -14,11 +14,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  scripts/Makefile.lib | 6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index d1550a5b57bd..7e3f156ac5a1 100644
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
-@@ -391,6 +391,12 @@ cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \
+@@ -391,6 +391,12 @@ cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ;
  	$(DTC) -@ -H epapr -O dtb -o $@ -b 0 \
  		-i $(dir $<) $(DTC_FLAGS) \
  		-Wno-interrupts_property \
@@ -31,6 +29,3 @@ index d1550a5b57bd..7e3f156ac5a1 100644
  		-d $(depfile).dtc.tmp $(dtc-tmp) ; \
  	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0354-media-i2c-imx290-Replace-V4L2_CID_GAIN-with-V4L2_CID.patch b/root/target/linux/bcm27xx/patches-5.15/950-0342-media-i2c-imx290-Replace-V4L2_CID_GAIN-with-V4L2_CID.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0354-media-i2c-imx290-Replace-V4L2_CID_GAIN-with-V4L2_CID.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0342-media-i2c-imx290-Replace-V4L2_CID_GAIN-with-V4L2_CID.patch
index 7c433909..7aea0a59 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0354-media-i2c-imx290-Replace-V4L2_CID_GAIN-with-V4L2_CID.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0342-media-i2c-imx290-Replace-V4L2_CID_GAIN-with-V4L2_CID.patch
@@ -1,7 +1,7 @@
-From 6086bef4432a9dafcbde3fa8b7fe31a78f475961 Mon Sep 17 00:00:00 2001
+From dce4c6e384c002f123f73c990fe32e7e9c64b07e Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Thu, 4 Feb 2021 17:29:32 +0000
-Subject: [PATCH 354/634] media: i2c: imx290: Replace V4L2_CID_GAIN with
+Subject: [PATCH 342/828] media: i2c: imx290: Replace V4L2_CID_GAIN with
  V4L2_CID_ANALOGUE_GAIN
 
 Most software (including libcamera) requires V4L2_CID_ANALOGUE_GAIN,
@@ -16,11 +16,9 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/i2c/imx290.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index def5e8fe41a0..1028a339beee 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
-@@ -647,7 +647,7 @@ static int imx290_set_ctrl(struct v4l2_ctrl *ctrl)
+@@ -647,7 +647,7 @@ static int imx290_set_ctrl(struct v4l2_c
  		return 0;
  
  	switch (ctrl->id) {
@@ -29,7 +27,7 @@ index def5e8fe41a0..1028a339beee 100644
  		ret = imx290_set_gain(imx290, ctrl->val);
  		break;
  	case V4L2_CID_EXPOSURE:
-@@ -1327,7 +1327,7 @@ static int imx290_probe(struct i2c_client *client)
+@@ -1327,7 +1327,7 @@ static int imx290_probe(struct i2c_clien
  	v4l2_ctrl_handler_init(&imx290->ctrls, 4);
  
  	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
@@ -38,6 +36,3 @@ index def5e8fe41a0..1028a339beee 100644
  
  	mode = imx290->current_mode;
  	imx290->hblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0355-media-i2c-imx290-Fix-number-of-controls-in-v4l2_ctrl.patch b/root/target/linux/bcm27xx/patches-5.15/950-0343-media-i2c-imx290-Fix-number-of-controls-in-v4l2_ctrl.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0355-media-i2c-imx290-Fix-number-of-controls-in-v4l2_ctrl.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0343-media-i2c-imx290-Fix-number-of-controls-in-v4l2_ctrl.patch
index 87a5ca25..2d56859a 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0355-media-i2c-imx290-Fix-number-of-controls-in-v4l2_ctrl.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0343-media-i2c-imx290-Fix-number-of-controls-in-v4l2_ctrl.patch
@@ -1,7 +1,7 @@
-From db96b1720fa50fda9f489e47fc0eb59ceb00452d Mon Sep 17 00:00:00 2001
+From 3b234ef8bbc025076fcc39028ddaecd12c75c0cb Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Thu, 4 Feb 2021 21:21:44 +0000
-Subject: [PATCH 355/634] media: i2c: imx290: Fix number of controls in
+Subject: [PATCH 343/828] media: i2c: imx290: Fix number of controls in
  v4l2_ctrl_handler_init
 
 The number is only a hint, but may as well be correct.
@@ -15,11 +15,9 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/i2c/imx290.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 1028a339beee..401afc4dc67d 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
-@@ -1324,7 +1324,7 @@ static int imx290_probe(struct i2c_client *client)
+@@ -1324,7 +1324,7 @@ static int imx290_probe(struct i2c_clien
  	 */
  	imx290_entity_init_cfg(&imx290->sd, NULL);
  
@@ -28,6 +26,3 @@ index 1028a339beee..401afc4dc67d 100644
  
  	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
  			  V4L2_CID_ANALOGUE_GAIN, 0, 100, 1, 0);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0356-dt-binding-display-bcm2711-hdmi-Add-CEC-and-hotplug-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0344-dt-binding-display-bcm2711-hdmi-Add-CEC-and-hotplug-.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0356-dt-binding-display-bcm2711-hdmi-Add-CEC-and-hotplug-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0344-dt-binding-display-bcm2711-hdmi-Add-CEC-and-hotplug-.patch
index cc362f96..1216688b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0356-dt-binding-display-bcm2711-hdmi-Add-CEC-and-hotplug-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0344-dt-binding-display-bcm2711-hdmi-Add-CEC-and-hotplug-.patch
@@ -1,7 +1,7 @@
-From 83bc724f8ae8e9380b1a0c6262d79590dedf4c9d Mon Sep 17 00:00:00 2001
+From c4cbca16af5232d8cefb5fbf276c85de4fcb4c33 Mon Sep 17 00:00:00 2001
 From: Maxime Ripard <maxime@cerno.tech>
 Date: Mon, 11 Jan 2021 15:23:07 +0100
-Subject: [PATCH 356/634] dt-binding: display: bcm2711-hdmi: Add CEC and
+Subject: [PATCH 344/828] dt-binding: display: bcm2711-hdmi: Add CEC and
  hotplug interrupts
 
 The CEC and hotplug interrupts were missing when that binding was
@@ -13,8 +13,6 @@ Acked-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../devicetree/bindings/display/brcm,bcm2711-hdmi.yaml          | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml
-index a1d5a32660e0..57324a5f0271 100644
 --- a/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml
 @@ -109,7 +109,7 @@ required:
@@ -26,6 +24,3 @@ index a1d5a32660e0..57324a5f0271 100644
  
  examples:
    - |
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0357-staging-bcm2835-camera-Fix-the-cherry-pick-of-AWB-Gr.patch b/root/target/linux/bcm27xx/patches-5.15/950-0345-staging-bcm2835-camera-Fix-the-cherry-pick-of-AWB-Gr.patch
similarity index 68%
rename from root/target/linux/bcm27xx/patches-5.15/0357-staging-bcm2835-camera-Fix-the-cherry-pick-of-AWB-Gr.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0345-staging-bcm2835-camera-Fix-the-cherry-pick-of-AWB-Gr.patch
index 563742b7..d8a5e1ad 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0357-staging-bcm2835-camera-Fix-the-cherry-pick-of-AWB-Gr.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0345-staging-bcm2835-camera-Fix-the-cherry-pick-of-AWB-Gr.patch
@@ -1,7 +1,7 @@
-From 04d65cec796d6c75859550f2d8b5dbf7fd511be7 Mon Sep 17 00:00:00 2001
+From e05cb08c215d12bda65433972130b13b27d9edf4 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Mon, 8 Feb 2021 11:48:35 +0000
-Subject: [PATCH 357/634] staging:bcm2835-camera: Fix the cherry-pick of AWB
+Subject: [PATCH 345/828] staging:bcm2835-camera: Fix the cherry-pick of AWB
  Greyworld
 
 The cherry-pick of the patch that added the greyworld AWB mode
@@ -13,11 +13,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/staging/vc04_services/bcm2835-camera/controls.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-index a7af25f90449..f73daa38fa66 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-@@ -1056,8 +1056,8 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
+@@ -1056,8 +1056,8 @@ static const struct bm2835_mmal_v4l2_ctr
  	{
  		.id = V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE,
  		.type = MMAL_CONTROL_TYPE_STD_MENU,
@@ -28,6 +26,3 @@ index a7af25f90449..f73daa38fa66 100644
  		.def = V4L2_WHITE_BALANCE_AUTO,
  		.step = 0,
  		.imenu = NULL,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0358-bcm2835-isp-Allow-formats-with-different-colour-spac.patch b/root/target/linux/bcm27xx/patches-5.15/950-0346-bcm2835-isp-Allow-formats-with-different-colour-spac.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0358-bcm2835-isp-Allow-formats-with-different-colour-spac.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0346-bcm2835-isp-Allow-formats-with-different-colour-spac.patch
index 0e5ec113..e9764342 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0358-bcm2835-isp-Allow-formats-with-different-colour-spac.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0346-bcm2835-isp-Allow-formats-with-different-colour-spac.patch
@@ -1,7 +1,7 @@
-From 3005e60bb064ff201624ad24df351547c039d103 Mon Sep 17 00:00:00 2001
+From f401492248a9673ae0d31f1517a0a23f463d17ac Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Tue, 12 Jan 2021 13:55:39 +0000
-Subject: [PATCH 358/634] bcm2835-isp: Allow formats with different colour
+Subject: [PATCH 346/828] bcm2835-isp: Allow formats with different colour
  spaces.
 
 Each supported format now includes a mask showing the allowed colour
@@ -17,8 +17,6 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  .../bcm2835-isp/bcm2835-v4l2-isp.c            |  66 ++++++-
  2 files changed, 190 insertions(+), 56 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
-index 12d8ec85d2c4..7541fb316cb9 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
 @@ -20,10 +20,29 @@ struct bcm2835_isp_fmt {
@@ -52,7 +50,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  static const struct bcm2835_isp_fmt supported_formats[] = {
  	{
  		/* YUV formats */
-@@ -32,7 +51,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -32,7 +51,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_I420,
  		.size_multiplier_x2 = 3,
@@ -62,7 +60,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_YVU420,
-@@ -40,7 +60,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -40,7 +60,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_YV12,
  		.size_multiplier_x2 = 3,
@@ -72,7 +70,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_NV12,
-@@ -48,7 +69,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -48,7 +69,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_NV12,
  		.size_multiplier_x2 = 3,
@@ -82,7 +80,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_NV21,
-@@ -56,7 +78,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -56,7 +78,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_NV21,
  		.size_multiplier_x2 = 3,
@@ -92,7 +90,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_YUYV,
-@@ -64,7 +87,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -64,7 +87,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 64,
  		.mmal_fmt	    = MMAL_ENCODING_YUYV,
  		.size_multiplier_x2 = 2,
@@ -102,7 +100,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_UYVY,
-@@ -72,7 +96,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -72,7 +96,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 64,
  		.mmal_fmt	    = MMAL_ENCODING_UYVY,
  		.size_multiplier_x2 = 2,
@@ -112,7 +110,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_YVYU,
-@@ -80,7 +105,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -80,7 +105,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 64,
  		.mmal_fmt	    = MMAL_ENCODING_YVYU,
  		.size_multiplier_x2 = 2,
@@ -122,7 +120,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_VYUY,
-@@ -88,7 +114,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -88,7 +114,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 64,
  		.mmal_fmt	    = MMAL_ENCODING_VYUY,
  		.size_multiplier_x2 = 2,
@@ -132,7 +130,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		/* RGB formats */
-@@ -97,7 +124,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -97,7 +124,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_RGB24,
  		.size_multiplier_x2 = 2,
@@ -142,7 +140,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 1,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_RGB565,
-@@ -105,7 +133,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -105,7 +133,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_RGB16,
  		.size_multiplier_x2 = 2,
@@ -152,7 +150,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 1,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_BGR24,
-@@ -113,7 +142,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -113,7 +142,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BGR24,
  		.size_multiplier_x2 = 2,
@@ -162,7 +160,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 1,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_XBGR32,
-@@ -121,7 +151,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -121,7 +151,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 64,
  		.mmal_fmt	    = MMAL_ENCODING_BGRA,
  		.size_multiplier_x2 = 2,
@@ -172,7 +170,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 1,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_RGBX32,
-@@ -129,7 +160,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -129,7 +160,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 64,
  		.mmal_fmt	    = MMAL_ENCODING_RGBA,
  		.size_multiplier_x2 = 2,
@@ -182,7 +180,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 1,
  	}, {
  		/* Bayer formats */
-@@ -139,7 +171,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -139,7 +171,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB8,
  		.size_multiplier_x2 = 2,
@@ -192,7 +190,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SBGGR8,
-@@ -147,7 +180,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -147,7 +180,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR8,
  		.size_multiplier_x2 = 2,
@@ -202,7 +200,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SGRBG8,
-@@ -155,7 +189,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -155,7 +189,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG8,
  		.size_multiplier_x2 = 2,
@@ -212,7 +210,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SGBRG8,
-@@ -163,7 +198,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -163,7 +198,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG8,
  		.size_multiplier_x2 = 2,
@@ -222,7 +220,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		/* 10 bit */
-@@ -172,7 +208,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -172,7 +208,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB10P,
  		.size_multiplier_x2 = 2,
@@ -232,7 +230,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SBGGR10P,
-@@ -180,7 +217,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -180,7 +217,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR10P,
  		.size_multiplier_x2 = 2,
@@ -242,7 +240,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SGRBG10P,
-@@ -188,7 +226,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -188,7 +226,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG10P,
  		.size_multiplier_x2 = 2,
@@ -252,7 +250,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SGBRG10P,
-@@ -196,7 +235,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -196,7 +235,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG10P,
  		.size_multiplier_x2 = 2,
@@ -262,7 +260,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		/* 12 bit */
-@@ -205,7 +245,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -205,7 +245,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB12P,
  		.size_multiplier_x2 = 2,
@@ -272,7 +270,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SBGGR12P,
-@@ -213,7 +254,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -213,7 +254,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR12P,
  		.size_multiplier_x2 = 2,
@@ -282,7 +280,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SGRBG12P,
-@@ -221,7 +263,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -221,7 +263,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG12P,
  		.size_multiplier_x2 = 2,
@@ -292,7 +290,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SGBRG12P,
-@@ -229,7 +272,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -229,7 +272,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG12P,
  		.size_multiplier_x2 = 2,
@@ -302,7 +300,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		/* 14 bit */
-@@ -238,7 +282,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -238,7 +282,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB14P,
  		.size_multiplier_x2 = 2,
@@ -312,7 +310,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SBGGR14P,
-@@ -246,7 +291,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -246,7 +291,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR14P,
  		.size_multiplier_x2 = 2,
@@ -322,7 +320,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SGRBG14P,
-@@ -254,7 +300,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -254,7 +300,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG14P,
  		.size_multiplier_x2 = 2,
@@ -332,7 +330,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SGBRG14P,
-@@ -262,7 +309,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -262,7 +309,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG14P,
  		.size_multiplier_x2 = 2,
@@ -342,7 +340,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		/* 16 bit */
-@@ -271,7 +319,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -271,7 +319,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB16,
  		.size_multiplier_x2 = 2,
@@ -352,7 +350,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SBGGR16,
-@@ -279,7 +328,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -279,7 +328,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR16,
  		.size_multiplier_x2 = 2,
@@ -362,7 +360,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SGRBG16,
-@@ -287,7 +337,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -287,7 +337,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG16,
  		.size_multiplier_x2 = 2,
@@ -372,7 +370,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SGBRG16,
-@@ -295,7 +346,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -295,7 +346,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG16,
  		.size_multiplier_x2 = 2,
@@ -382,7 +380,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		/* Bayer formats unpacked to 16bpp */
-@@ -305,7 +357,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -305,7 +357,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB10,
  		.size_multiplier_x2 = 2,
@@ -392,7 +390,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SBGGR10,
-@@ -313,7 +366,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -313,7 +366,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR10,
  		.size_multiplier_x2 = 2,
@@ -402,7 +400,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SGRBG10,
-@@ -321,7 +375,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -321,7 +375,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG10,
  		.size_multiplier_x2 = 2,
@@ -412,7 +410,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SGBRG10,
-@@ -329,7 +384,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -329,7 +384,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG10,
  		.size_multiplier_x2 = 2,
@@ -422,7 +420,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		/* 12 bit */
-@@ -338,7 +394,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -338,7 +394,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB12,
  		.size_multiplier_x2 = 2,
@@ -432,7 +430,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SBGGR12,
-@@ -346,7 +403,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -346,7 +403,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR12,
  		.size_multiplier_x2 = 2,
@@ -442,7 +440,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SGRBG12,
-@@ -354,7 +412,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -354,7 +412,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG12,
  		.size_multiplier_x2 = 2,
@@ -452,7 +450,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SGBRG12,
-@@ -362,7 +421,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -362,7 +421,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG12,
  		.size_multiplier_x2 = 2,
@@ -462,7 +460,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		/* 14 bit */
-@@ -371,7 +431,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -371,7 +431,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB14,
  		.size_multiplier_x2 = 2,
@@ -472,7 +470,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SBGGR14,
-@@ -379,7 +440,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -379,7 +440,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR14,
  		.size_multiplier_x2 = 2,
@@ -482,7 +480,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SGRBG14,
-@@ -387,7 +449,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -387,7 +449,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG14,
  		.size_multiplier_x2 = 2,
@@ -492,7 +490,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_SGBRG14,
-@@ -395,7 +458,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -395,7 +458,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG14,
  		.size_multiplier_x2 = 2,
@@ -502,7 +500,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		/* Monochrome MIPI formats */
-@@ -405,7 +469,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -405,7 +469,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_GREY,
  		.size_multiplier_x2 = 2,
@@ -512,7 +510,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		/* 10 bit */
-@@ -414,7 +479,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -414,7 +479,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_Y10P,
  		.size_multiplier_x2 = 2,
@@ -522,7 +520,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		/* 12 bit */
-@@ -423,7 +489,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -423,7 +489,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_Y12P,
  		.size_multiplier_x2 = 2,
@@ -532,7 +530,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		/* 14 bit */
-@@ -432,7 +499,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -432,7 +499,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_Y14P,
  		.size_multiplier_x2 = 2,
@@ -542,7 +540,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		/* 16 bit */
-@@ -441,7 +509,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -441,7 +509,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_Y16,
  		.size_multiplier_x2 = 2,
@@ -552,7 +550,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		/* 10 bit as 16bpp */
-@@ -450,7 +519,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -450,7 +519,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_Y10,
  		.size_multiplier_x2 = 2,
@@ -562,7 +560,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		/* 12 bit as 16bpp */
-@@ -459,7 +529,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -459,7 +529,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_Y12,
  		.size_multiplier_x2 = 2,
@@ -572,7 +570,7 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		/* 14 bit as 16bpp */
-@@ -468,7 +539,8 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -468,7 +539,8 @@ static const struct bcm2835_isp_fmt supp
  		.bytesperline_align = 32,
  		.mmal_fmt	    = MMAL_ENCODING_Y14,
  		.size_multiplier_x2 = 2,
@@ -582,8 +580,6 @@ index 12d8ec85d2c4..7541fb316cb9 100644
  		.step_size	    = 2,
  	}, {
  		.fourcc		    = V4L2_META_FMT_BCM2835_ISP_STATS,
-diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-index 4d24aec7203d..5cca8bdd1d65 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 @@ -72,6 +72,7 @@ struct bcm2835_isp_q_data {
@@ -594,7 +590,7 @@ index 4d24aec7203d..5cca8bdd1d65 100644
  	const struct bcm2835_isp_fmt *fmt;
  };
  
-@@ -311,6 +312,43 @@ static void mmal_buffer_cb(struct vchiq_mmal_instance *instance,
+@@ -311,6 +312,43 @@ static void mmal_buffer_cb(struct vchiq_
  		complete(&dev->frame_cmplt);
  }
  
@@ -638,7 +634,7 @@ index 4d24aec7203d..5cca8bdd1d65 100644
  static void setup_mmal_port_format(struct bcm2835_isp_node *node,
  				   struct vchiq_mmal_port *port)
  {
-@@ -324,6 +362,7 @@ static void setup_mmal_port_format(struct bcm2835_isp_node *node,
+@@ -324,6 +362,7 @@ static void setup_mmal_port_format(struc
  	port->es.video.crop.height = q_data->height;
  	port->es.video.crop.x = 0;
  	port->es.video.crop.y = 0;
@@ -646,7 +642,7 @@ index 4d24aec7203d..5cca8bdd1d65 100644
  };
  
  static int setup_mmal_port(struct bcm2835_isp_node *node)
-@@ -827,6 +866,9 @@ static int populate_qdata_fmt(struct v4l2_format *f,
+@@ -827,6 +866,9 @@ static int populate_qdata_fmt(struct v4l
  		/* All parameters should have been set correctly by try_fmt */
  		q_data->bytesperline = f->fmt.pix.bytesperline;
  		q_data->sizeimage = f->fmt.pix.sizeimage;
@@ -656,7 +652,7 @@ index 4d24aec7203d..5cca8bdd1d65 100644
  	} else {
  		v4l2_dbg(1, debug, &dev->v4l2_dev,
  			 "%s: Setting meta format for fmt: %08x, size %u\n",
-@@ -838,6 +880,9 @@ static int populate_qdata_fmt(struct v4l2_format *f,
+@@ -838,6 +880,9 @@ static int populate_qdata_fmt(struct v4l
  		q_data->height = 0;
  		q_data->bytesperline = 0;
  		q_data->sizeimage = f->fmt.meta.buffersize;
@@ -666,7 +662,7 @@ index 4d24aec7203d..5cca8bdd1d65 100644
  	}
  
  	v4l2_dbg(1, debug, &dev->v4l2_dev,
-@@ -901,7 +946,7 @@ static int bcm2835_isp_node_g_fmt(struct file *file, void *priv,
+@@ -901,7 +946,7 @@ static int bcm2835_isp_node_g_fmt(struct
  		f->fmt.pix.pixelformat = q_data->fmt->fourcc;
  		f->fmt.pix.bytesperline = q_data->bytesperline;
  		f->fmt.pix.sizeimage = q_data->sizeimage;
@@ -675,7 +671,7 @@ index 4d24aec7203d..5cca8bdd1d65 100644
  	}
  
  	return 0;
-@@ -968,13 +1013,29 @@ static int bcm2835_isp_node_try_fmt(struct file *file, void *priv,
+@@ -968,13 +1013,29 @@ static int bcm2835_isp_node_try_fmt(stru
  		fmt = get_default_format(node);
  
  	if (!node_is_stats(node)) {
@@ -706,7 +702,7 @@ index 4d24aec7203d..5cca8bdd1d65 100644
  		f->fmt.pix.bytesperline = get_bytesperline(f->fmt.pix.width,
  							   fmt);
  		f->fmt.pix.field = V4L2_FIELD_NONE;
-@@ -1299,6 +1360,7 @@ static int register_node(struct bcm2835_isp_dev *dev,
+@@ -1299,6 +1360,7 @@ static int register_node(struct bcm2835_
  					       node->q_data.width,
  					       node->q_data.height,
  					       node->q_data.fmt);
@@ -714,6 +710,3 @@ index 4d24aec7203d..5cca8bdd1d65 100644
  
  	queue->io_modes = VB2_MMAP | VB2_DMABUF;
  	queue->drv_priv = node;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0359-staging-rpivid-Fix-crash-when-CMA-alloc-fails.patch b/root/target/linux/bcm27xx/patches-5.15/950-0347-staging-rpivid-Fix-crash-when-CMA-alloc-fails.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0359-staging-rpivid-Fix-crash-when-CMA-alloc-fails.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0347-staging-rpivid-Fix-crash-when-CMA-alloc-fails.patch
index dcfbbba3..16c390eb 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0359-staging-rpivid-Fix-crash-when-CMA-alloc-fails.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0347-staging-rpivid-Fix-crash-when-CMA-alloc-fails.patch
@@ -1,7 +1,7 @@
-From 4ed6a2dcdb777ba81d5e7cc01f0af8811be33485 Mon Sep 17 00:00:00 2001
+From 50d296f352b740cd7e78442533147d6a61bc6cde Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Mon, 8 Feb 2021 16:01:37 +0000
-Subject: [PATCH 359/634] staging: rpivid: Fix crash when CMA alloc fails
+Subject: [PATCH 347/828] staging: rpivid: Fix crash when CMA alloc fails
 
 If realloc to increase coeff size fails then attempt to re-allocate
 the original size.  If that also fails then flag a fatal error to abort
@@ -13,8 +13,6 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  drivers/staging/media/rpivid/rpivid_h265.c | 44 +++++++++++++++++++++-
  2 files changed, 45 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid.h b/drivers/staging/media/rpivid/rpivid.h
-index faafe936b878..0e8280b803a3 100644
 --- a/drivers/staging/media/rpivid/rpivid.h
 +++ b/drivers/staging/media/rpivid/rpivid.h
 @@ -88,6 +88,9 @@ struct rpivid_ctx {
@@ -27,11 +25,9 @@ index faafe936b878..0e8280b803a3 100644
  
  	struct v4l2_ctrl_handler	hdl;
  	struct v4l2_ctrl		**ctrls;
-diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
-index fc3caed58187..e6b07920aa8c 100644
 --- a/drivers/staging/media/rpivid/rpivid_h265.c
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
-@@ -73,10 +73,18 @@ static void gptr_free(struct rpivid_dev *const dev,
+@@ -73,10 +73,18 @@ static void gptr_free(struct rpivid_dev
  	gptr->attrs = 0;
  }
  
@@ -51,7 +47,7 @@ index fc3caed58187..e6b07920aa8c 100644
  	if (size == gptr->size)
  		return 0;
  
-@@ -88,7 +96,21 @@ static int gptr_realloc_new(struct rpivid_dev * const dev,
+@@ -88,7 +96,21 @@ static int gptr_realloc_new(struct rpivi
  	gptr->size = size;
  	gptr->ptr = dma_alloc_attrs(dev->dev, gptr->size,
  				    &gptr->addr, GFP_KERNEL, gptr->attrs);
@@ -74,7 +70,7 @@ index fc3caed58187..e6b07920aa8c 100644
  }
  
  /* floor(log2(x)) */
-@@ -2020,6 +2042,12 @@ static void phase1_thread(struct rpivid_dev *const dev, void *v)
+@@ -2020,6 +2042,12 @@ static void phase1_thread(struct rpivid_
  	return;
  
  fail:
@@ -87,7 +83,7 @@ index fc3caed58187..e6b07920aa8c 100644
  	dec_env_delete(de);
  	xtrace_fin(dev, de);
  	v4l2_m2m_buf_done_and_job_finish(dev->m2m_dev, ctx->fh.m2m_ctx,
-@@ -2093,6 +2121,9 @@ static void phase1_claimed(struct rpivid_dev *const dev, void *v)
+@@ -2093,6 +2121,9 @@ static void phase1_claimed(struct rpivid
  
  	xtrace_in(dev, de);
  
@@ -97,7 +93,7 @@ index fc3caed58187..e6b07920aa8c 100644
  	de->pu_base_vc = pu_gptr->addr;
  	de->pu_stride =
  		ALIGN_DOWN(pu_gptr->size / de->pic_height_in_ctbs_y, 64);
-@@ -2116,6 +2147,14 @@ static void phase1_claimed(struct rpivid_dev *const dev, void *v)
+@@ -2116,6 +2147,14 @@ static void phase1_claimed(struct rpivid
  	apb_write_vc_addr_final(dev, RPI_CFBASE, de->cmd_copy_gptr->addr);
  
  	xtrace_ok(dev, de);
@@ -112,7 +108,7 @@ index fc3caed58187..e6b07920aa8c 100644
  }
  
  static void dec_state_delete(struct rpivid_ctx *const ctx)
-@@ -2186,6 +2225,7 @@ static int rpivid_h265_start(struct rpivid_ctx *ctx)
+@@ -2186,6 +2225,7 @@ static int rpivid_h265_start(struct rpiv
  	v4l2_info(&dev->v4l2_dev, "%s: (%dx%d)\n", __func__,
  		  ctx->dst_fmt.width, ctx->dst_fmt.height);
  
@@ -120,6 +116,3 @@ index fc3caed58187..e6b07920aa8c 100644
  	ctx->dec0 = NULL;
  	ctx->state = kzalloc(sizeof(*ctx->state), GFP_KERNEL);
  	if (!ctx->state) {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0360-media-i2c-imx477-Remove-auto-frame-length-adjusting.patch b/root/target/linux/bcm27xx/patches-5.15/950-0348-media-i2c-imx477-Remove-auto-frame-length-adjusting.patch
similarity index 89%
rename from root/target/linux/bcm27xx/patches-5.15/0360-media-i2c-imx477-Remove-auto-frame-length-adjusting.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0348-media-i2c-imx477-Remove-auto-frame-length-adjusting.patch
index 0a9b5ea8..a919be71 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0360-media-i2c-imx477-Remove-auto-frame-length-adjusting.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0348-media-i2c-imx477-Remove-auto-frame-length-adjusting.patch
@@ -1,7 +1,7 @@
-From a2e2fe479c1c7a0a923191e0439cd87bd3f788ae Mon Sep 17 00:00:00 2001
+From a418f9679f087998354670b38900e2a8d376d5b3 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Wed, 10 Feb 2021 10:18:53 +0000
-Subject: [PATCH 360/634] media: i2c: imx477: Remove auto frame length
+Subject: [PATCH 348/828] media: i2c: imx477: Remove auto frame length
  adjusting
 
 The V4L2_CID_EXPOSURE_AUTO_PRIORITY was used to let the sensor control
@@ -14,8 +14,6 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  drivers/media/i2c/imx477.c | 83 +++-----------------------------------
  1 file changed, 6 insertions(+), 77 deletions(-)
 
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index 07a1e023ade8..217780b88ad1 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
 @@ -1082,8 +1082,6 @@ struct imx477 {
@@ -27,7 +25,7 @@ index 07a1e023ade8..217780b88ad1 100644
  
  	/* Current mode */
  	const struct imx477_mode *mode;
-@@ -1280,66 +1278,14 @@ static int imx477_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+@@ -1280,66 +1278,14 @@ static int imx477_open(struct v4l2_subde
  	return 0;
  }
  
@@ -97,7 +95,7 @@ index 07a1e023ade8..217780b88ad1 100644
  	exposure_def = min(exposure_max, imx477->exposure->val);
  	__v4l2_ctrl_modify_range(imx477->exposure, imx477->exposure->minimum,
  				 exposure_max, imx477->exposure->step,
-@@ -1353,14 +1299,8 @@ static int imx477_set_ctrl(struct v4l2_ctrl *ctrl)
+@@ -1353,14 +1299,8 @@ static int imx477_set_ctrl(struct v4l2_c
  	struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
  	int ret = 0;
  
@@ -113,7 +111,7 @@ index 07a1e023ade8..217780b88ad1 100644
  
  	/*
  	 * Applying V4L2 control value only happens
-@@ -1375,14 +1315,8 @@ static int imx477_set_ctrl(struct v4l2_ctrl *ctrl)
+@@ -1375,14 +1315,8 @@ static int imx477_set_ctrl(struct v4l2_c
  				       IMX477_REG_VALUE_16BIT, ctrl->val);
  		break;
  	case V4L2_CID_EXPOSURE:
@@ -130,7 +128,7 @@ index 07a1e023ade8..217780b88ad1 100644
  		break;
  	case V4L2_CID_DIGITAL_GAIN:
  		ret = imx477_write_reg(imx477, IMX477_REG_DIGITAL_GAIN,
-@@ -2005,11 +1939,6 @@ static int imx477_init_controls(struct imx477 *imx477)
+@@ -2005,11 +1939,6 @@ static int imx477_init_controls(struct i
  			  IMX477_DGTL_GAIN_MIN, IMX477_DGTL_GAIN_MAX,
  			  IMX477_DGTL_GAIN_STEP, IMX477_DGTL_GAIN_DEFAULT);
  
@@ -142,6 +140,3 @@ index 07a1e023ade8..217780b88ad1 100644
  	imx477->hflip = v4l2_ctrl_new_std(ctrl_hdlr, &imx477_ctrl_ops,
  					  V4L2_CID_HFLIP, 0, 1, 1, 0);
  	if (imx477->hflip)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0361-media-i2c-imx477-Add-very-long-exposure-control-to-t.patch b/root/target/linux/bcm27xx/patches-5.15/950-0349-media-i2c-imx477-Add-very-long-exposure-control-to-t.patch
similarity index 87%
rename from root/target/linux/bcm27xx/patches-5.15/0361-media-i2c-imx477-Add-very-long-exposure-control-to-t.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0349-media-i2c-imx477-Add-very-long-exposure-control-to-t.patch
index 919eb0ba..03d60c64 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0361-media-i2c-imx477-Add-very-long-exposure-control-to-t.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0349-media-i2c-imx477-Add-very-long-exposure-control-to-t.patch
@@ -1,7 +1,7 @@
-From c3a593bcec409687d870e63a2ef5b730a1f2d90d Mon Sep 17 00:00:00 2001
+From 9149bbcd831f94750da7fb0be9ab99335d5c834b Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Wed, 10 Feb 2021 10:50:32 +0000
-Subject: [PATCH 361/634] media: i2c: imx477: Add very long exposure control to
+Subject: [PATCH 349/828] media: i2c: imx477: Add very long exposure control to
  the driver
 
 Add support for very long exposures by using the exposure multiplier
@@ -18,8 +18,6 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  drivers/media/i2c/imx477.c | 47 +++++++++++++++++++++++++++++++++-----
  1 file changed, 41 insertions(+), 6 deletions(-)
 
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index 217780b88ad1..7907d5142d17 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
 @@ -44,6 +44,10 @@
@@ -43,7 +41,7 @@ index 217780b88ad1..7907d5142d17 100644
  };
  
  static inline struct imx477 *to_imx477(struct v4l2_subdev *_sd)
-@@ -1285,13 +1292,33 @@ static void imx477_adjust_exposure_range(struct imx477 *imx477,
+@@ -1285,13 +1292,33 @@ static void imx477_adjust_exposure_range
  
  	/* Honour the VBLANK limits when setting exposure. */
  	exposure_max = imx477->mode->height + imx477->vblank->val -
@@ -78,7 +76,7 @@ index 217780b88ad1..7907d5142d17 100644
  static int imx477_set_ctrl(struct v4l2_ctrl *ctrl)
  {
  	struct imx477 *imx477 =
-@@ -1299,6 +1326,10 @@ static int imx477_set_ctrl(struct v4l2_ctrl *ctrl)
+@@ -1299,6 +1326,10 @@ static int imx477_set_ctrl(struct v4l2_c
  	struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
  	int ret = 0;
  
@@ -89,7 +87,7 @@ index 217780b88ad1..7907d5142d17 100644
  	if (ctrl->id == V4L2_CID_VBLANK)
  		imx477_adjust_exposure_range(imx477, ctrl);
  
-@@ -1316,7 +1347,8 @@ static int imx477_set_ctrl(struct v4l2_ctrl *ctrl)
+@@ -1316,7 +1347,8 @@ static int imx477_set_ctrl(struct v4l2_c
  		break;
  	case V4L2_CID_EXPOSURE:
  		ret = imx477_write_reg(imx477, IMX477_REG_EXPOSURE,
@@ -99,7 +97,7 @@ index 217780b88ad1..7907d5142d17 100644
  		break;
  	case V4L2_CID_DIGITAL_GAIN:
  		ret = imx477_write_reg(imx477, IMX477_REG_DIGITAL_GAIN,
-@@ -1350,9 +1382,8 @@ static int imx477_set_ctrl(struct v4l2_ctrl *ctrl)
+@@ -1350,9 +1382,8 @@ static int imx477_set_ctrl(struct v4l2_c
  				       imx477->vflip->val << 1);
  		break;
  	case V4L2_CID_VBLANK:
@@ -111,7 +109,7 @@ index 217780b88ad1..7907d5142d17 100644
  		break;
  	default:
  		dev_info(&client->dev,
-@@ -1521,9 +1552,13 @@ static void imx477_set_framing_limits(struct imx477 *imx477)
+@@ -1521,9 +1552,13 @@ static void imx477_set_framing_limits(st
  	frm_length_default =
  		     imx477_get_frame_length(mode, &mode->timeperframe_default);
  
@@ -126,6 +124,3 @@ index 217780b88ad1..7907d5142d17 100644
  				 1, frm_length_default - mode->height);
  
  	/* Setting this will adjust the exposure limits as well. */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0362-media-i2c-imx290-Fix-up-exposure-calcuations-and-ran.patch b/root/target/linux/bcm27xx/patches-5.15/950-0350-media-i2c-imx290-Fix-up-exposure-calcuations-and-ran.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0362-media-i2c-imx290-Fix-up-exposure-calcuations-and-ran.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0350-media-i2c-imx290-Fix-up-exposure-calcuations-and-ran.patch
index 76f9a3a2..fd737b92 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0362-media-i2c-imx290-Fix-up-exposure-calcuations-and-ran.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0350-media-i2c-imx290-Fix-up-exposure-calcuations-and-ran.patch
@@ -1,7 +1,7 @@
-From bd1742e3377992df66501047d32097d891ff28c0 Mon Sep 17 00:00:00 2001
+From 96a8c5204ef7b24be8047677c949c98b532ea21b Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Wed, 17 Feb 2021 18:08:12 +0000
-Subject: [PATCH 362/634] media: i2c: imx290: Fix up exposure calcuations and
+Subject: [PATCH 350/828] media: i2c: imx290: Fix up exposure calcuations and
  ranges
 
 Should now correspond exactly to the datasheet.
@@ -11,8 +11,6 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/i2c/imx290.c | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 401afc4dc67d..36e9261af23d 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -50,7 +50,7 @@ enum imx290_clk_index {
@@ -24,7 +22,7 @@ index 401afc4dc67d..36e9261af23d 100644
  #define IMX290_EXPOSURE_STEP 1
  #define IMX290_EXPOSURE_LOW 0x3020
  #define IMX290_PGCTRL 0x308c
-@@ -584,7 +584,7 @@ static int imx290_set_gain(struct imx290 *imx290, u32 value)
+@@ -584,7 +584,7 @@ static int imx290_set_gain(struct imx290
  static int imx290_set_exposure(struct imx290 *imx290, u32 value)
  {
  	u32 exposure = (imx290->current_mode->height + imx290->vblank->val) -
@@ -33,7 +31,7 @@ index 401afc4dc67d..36e9261af23d 100644
  	int ret;
  
  	ret = imx290_write_buffered_reg(imx290, IMX290_EXPOSURE_LOW, 3,
-@@ -855,10 +855,10 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,
+@@ -855,10 +855,10 @@ static int imx290_set_fmt(struct v4l2_su
  		}
  		if (imx290->exposure)
  			__v4l2_ctrl_modify_range(imx290->exposure,
@@ -47,7 +45,7 @@ index 401afc4dc67d..36e9261af23d 100644
  	}
  
  	*format = fmt->format;
-@@ -1345,9 +1345,9 @@ static int imx290_probe(struct i2c_client *client)
+@@ -1345,9 +1345,9 @@ static int imx290_probe(struct i2c_clien
  	imx290->exposure = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
  					     V4L2_CID_EXPOSURE,
  					     IMX290_EXPOSURE_MIN,
@@ -59,6 +57,3 @@ index 401afc4dc67d..36e9261af23d 100644
  
  	imx290->hflip = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
  					  V4L2_CID_HFLIP, 0, 1, 1, 0);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0363-media-i2c-imx290-Handle-exposure-correctly-when-vbla.patch b/root/target/linux/bcm27xx/patches-5.15/950-0351-media-i2c-imx290-Handle-exposure-correctly-when-vbla.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0363-media-i2c-imx290-Handle-exposure-correctly-when-vbla.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0351-media-i2c-imx290-Handle-exposure-correctly-when-vbla.patch
index 1f9e9d9d..482b7242 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0363-media-i2c-imx290-Handle-exposure-correctly-when-vbla.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0351-media-i2c-imx290-Handle-exposure-correctly-when-vbla.patch
@@ -1,7 +1,7 @@
-From 16d44df8f2b81d12f58f661e0a420da4528feaa7 Mon Sep 17 00:00:00 2001
+From 0fc6dce34cce94465ae49b11cb2528ef64885d54 Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Thu, 18 Feb 2021 11:58:29 +0000
-Subject: [PATCH 363/634] media: i2c: imx290: Handle exposure correctly when
+Subject: [PATCH 351/828] media: i2c: imx290: Handle exposure correctly when
  vblank changes
 
 When vblank changes we must modify the exposure range. Also, with this
@@ -13,11 +13,9 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/i2c/imx290.c | 18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 36e9261af23d..836d3684c273 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
-@@ -618,6 +618,24 @@ static int imx290_set_vmax(struct imx290 *imx290, u32 val)
+@@ -618,6 +618,24 @@ static int imx290_set_vmax(struct imx290
  	if (ret)
  		dev_err(imx290->dev, "Unable to write vmax\n");
  
@@ -42,6 +40,3 @@ index 36e9261af23d..836d3684c273 100644
  	return ret;
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0364-media-i2c-imx477-Fix-crop-height-for-2028x1080-mode.patch b/root/target/linux/bcm27xx/patches-5.15/950-0352-media-i2c-imx477-Fix-crop-height-for-2028x1080-mode.patch
similarity index 64%
rename from root/target/linux/bcm27xx/patches-5.15/0364-media-i2c-imx477-Fix-crop-height-for-2028x1080-mode.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0352-media-i2c-imx477-Fix-crop-height-for-2028x1080-mode.patch
index f7a660ed..2c9a4e3f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0364-media-i2c-imx477-Fix-crop-height-for-2028x1080-mode.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0352-media-i2c-imx477-Fix-crop-height-for-2028x1080-mode.patch
@@ -1,7 +1,7 @@
-From c63af37bafdb4adbea2ccb0ec7a30e57c911fd8f Mon Sep 17 00:00:00 2001
+From 86e9090c980519dd752b4d72b74de520cbc215f8 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Thu, 18 Feb 2021 15:05:57 +0000
-Subject: [PATCH 364/634] media: i2c: imx477: Fix crop height for 2028x1080
+Subject: [PATCH 352/828] media: i2c: imx477: Fix crop height for 2028x1080
  mode
 
 The crop height for this mode was set at 2600 lines, it should be 2160
@@ -12,11 +12,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  drivers/media/i2c/imx477.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index 7907d5142d17..27ee391eee49 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
-@@ -955,7 +955,7 @@ static const struct imx477_mode supported_modes_12bit[] = {
+@@ -955,7 +955,7 @@ static const struct imx477_mode supporte
  			.left = IMX477_PIXEL_ARRAY_LEFT,
  			.top = IMX477_PIXEL_ARRAY_TOP + 440,
  			.width = 4056,
@@ -25,6 +23,3 @@ index 7907d5142d17..27ee391eee49 100644
  		},
  		.timeperframe_min = {
  			.numerator = 100,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0365-media-i2c-imx477-Replace-existing-1012x760-mode.patch b/root/target/linux/bcm27xx/patches-5.15/950-0353-media-i2c-imx477-Replace-existing-1012x760-mode.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0365-media-i2c-imx477-Replace-existing-1012x760-mode.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0353-media-i2c-imx477-Replace-existing-1012x760-mode.patch
index ef2a4873..f0ef63c5 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0365-media-i2c-imx477-Replace-existing-1012x760-mode.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0353-media-i2c-imx477-Replace-existing-1012x760-mode.patch
@@ -1,7 +1,7 @@
-From 6a321dee845014817cd390575f25b19b58b90d54 Mon Sep 17 00:00:00 2001
+From a5a080d875edb4bcd104c38cdfc8a60446a625d4 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Thu, 18 Feb 2021 15:23:11 +0000
-Subject: [PATCH 365/634] media: i2c: imx477: Replace existing 1012x760 mode
+Subject: [PATCH 353/828] media: i2c: imx477: Replace existing 1012x760 mode
 
 The existing 1012x760 120 fps mode has significant IQ problem using
 the internal sensor scaler. Replace this mode with a 1332x990 120 fps
@@ -13,11 +13,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  drivers/media/i2c/imx477.c | 97 ++++++++++++++++++++------------------
  1 file changed, 50 insertions(+), 47 deletions(-)
 
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index 27ee391eee49..178ddc43bb73 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
-@@ -770,7 +770,7 @@ static const struct imx477_reg mode_2028x1080_regs[] = {
+@@ -770,7 +770,7 @@ static const struct imx477_reg mode_2028
  };
  
  /* 4x4 binned. 120fps */
@@ -26,7 +24,7 @@ index 27ee391eee49..178ddc43bb73 100644
  	{0x420b, 0x01},
  	{0x990c, 0x00},
  	{0x990d, 0x08},
-@@ -786,28 +786,31 @@ static const struct imx477_reg mode_1012x760_regs[] = {
+@@ -786,28 +786,31 @@ static const struct imx477_reg mode_1012
  	{0x0112, 0x0a},
  	{0x0113, 0x0a},
  	{0x0114, 0x01},
@@ -66,7 +64,7 @@ index 27ee391eee49..178ddc43bb73 100644
  	{0x0900, 0x01},
  	{0x0901, 0x22},
  	{0x0902, 0x02},
-@@ -831,29 +834,29 @@ static const struct imx477_reg mode_1012x760_regs[] = {
+@@ -831,29 +834,29 @@ static const struct imx477_reg mode_1012
  	{0x936d, 0x5f},
  	{0x9304, 0x03},
  	{0x9305, 0x80},
@@ -114,7 +112,7 @@ index 27ee391eee49..178ddc43bb73 100644
  	{0x0301, 0x05},
  	{0x0303, 0x02},
  	{0x0305, 0x02},
-@@ -870,21 +873,21 @@ static const struct imx477_reg mode_1012x760_regs[] = {
+@@ -870,21 +873,21 @@ static const struct imx477_reg mode_1012
  	{0x0822, 0x00},
  	{0x0823, 0x00},
  	{0x080a, 0x00},
@@ -145,7 +143,7 @@ index 27ee391eee49..178ddc43bb73 100644
  	{0xe04c, 0x00},
  	{0xe04d, 0x5f},
  	{0xe04e, 0x00},
-@@ -893,7 +896,7 @@ static const struct imx477_reg mode_1012x760_regs[] = {
+@@ -893,7 +896,7 @@ static const struct imx477_reg mode_1012
  	{0x3e37, 0x00},
  	{0x3f50, 0x00},
  	{0x3f56, 0x00},
@@ -154,7 +152,7 @@ index 27ee391eee49..178ddc43bb73 100644
  };
  
  /* Mode configs */
-@@ -974,9 +977,9 @@ static const struct imx477_mode supported_modes_12bit[] = {
+@@ -974,9 +977,9 @@ static const struct imx477_mode supporte
  
  static const struct imx477_mode supported_modes_10bit[] = {
  	{
@@ -167,7 +165,7 @@ index 27ee391eee49..178ddc43bb73 100644
  		.line_length_pix = 0x1460,
  		.crop = {
  			/*
-@@ -987,10 +990,10 @@ static const struct imx477_mode supported_modes_10bit[] = {
+@@ -987,10 +990,10 @@ static const struct imx477_mode supporte
  			 * rectangle once the driver is expanded to represent
  			 * its processing blocks with multiple subdevs.
  			 */
@@ -182,7 +180,7 @@ index 27ee391eee49..178ddc43bb73 100644
  		},
  		.timeperframe_min = {
  			.numerator = 100,
-@@ -998,11 +1001,11 @@ static const struct imx477_mode supported_modes_10bit[] = {
+@@ -998,11 +1001,11 @@ static const struct imx477_mode supporte
  		},
  		.timeperframe_default = {
  			.numerator = 100,
@@ -197,6 +195,3 @@ index 27ee391eee49..178ddc43bb73 100644
  		}
  	}
  };
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0366-media-i2c-imx477-Remove-internal-v4l2_mbus_framefmt-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0354-media-i2c-imx477-Remove-internal-v4l2_mbus_framefmt-.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0366-media-i2c-imx477-Remove-internal-v4l2_mbus_framefmt-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0354-media-i2c-imx477-Remove-internal-v4l2_mbus_framefmt-.patch
index cb04af6e..90690f2b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0366-media-i2c-imx477-Remove-internal-v4l2_mbus_framefmt-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0354-media-i2c-imx477-Remove-internal-v4l2_mbus_framefmt-.patch
@@ -1,7 +1,7 @@
-From 1ae9f998b9f760779d5b3b8e54aef6223ca16df1 Mon Sep 17 00:00:00 2001
+From f868864667fdef0baf2905fafc78a01d82cf9528 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Fri, 19 Feb 2021 10:30:49 +0000
-Subject: [PATCH 366/634] media: i2c: imx477: Remove internal
+Subject: [PATCH 354/828] media: i2c: imx477: Remove internal
  v4l2_mbus_framefmt from the state
 
 The only field in this struct that is used is the format code, so
@@ -17,8 +17,6 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  drivers/media/i2c/imx477.c | 19 ++++---------------
  1 file changed, 4 insertions(+), 15 deletions(-)
 
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index 178ddc43bb73..74e8d892d4a6 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
 @@ -1073,7 +1073,7 @@ struct imx477 {
@@ -30,7 +28,7 @@ index 178ddc43bb73..74e8d892d4a6 100644
  
  	struct clk *xclk;
  	u32 xclk_freq;
-@@ -1235,21 +1235,9 @@ static u32 imx477_get_format_code(struct imx477 *imx477, u32 code)
+@@ -1235,21 +1235,9 @@ static u32 imx477_get_format_code(struct
  
  static void imx477_set_default_format(struct imx477 *imx477)
  {
@@ -53,7 +51,7 @@ index 178ddc43bb73..74e8d892d4a6 100644
  }
  
  static int imx477_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
-@@ -1520,7 +1508,7 @@ static int imx477_get_pad_format(struct v4l2_subdev *sd,
+@@ -1520,7 +1508,7 @@ static int imx477_get_pad_format(struct
  			imx477_update_image_pad_format(imx477, imx477->mode,
  						       fmt);
  			fmt->format.code =
@@ -62,7 +60,7 @@ index 178ddc43bb73..74e8d892d4a6 100644
  		} else {
  			imx477_update_metadata_pad_format(fmt);
  		}
-@@ -1611,6 +1599,7 @@ static int imx477_set_pad_format(struct v4l2_subdev *sd,
+@@ -1611,6 +1599,7 @@ static int imx477_set_pad_format(struct
  			*framefmt = fmt->format;
  		} else {
  			imx477->mode = mode;
@@ -70,6 +68,3 @@ index 178ddc43bb73..74e8d892d4a6 100644
  			imx477_set_framing_limits(imx477);
  		}
  	} else {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0367-media-i2c-imx477-Remove-unused-function-parameter.patch b/root/target/linux/bcm27xx/patches-5.15/950-0355-media-i2c-imx477-Remove-unused-function-parameter.patch
similarity index 67%
rename from root/target/linux/bcm27xx/patches-5.15/0367-media-i2c-imx477-Remove-unused-function-parameter.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0355-media-i2c-imx477-Remove-unused-function-parameter.patch
index d063552e..b495815c 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0367-media-i2c-imx477-Remove-unused-function-parameter.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0355-media-i2c-imx477-Remove-unused-function-parameter.patch
@@ -1,7 +1,7 @@
-From 6bd8e5d75e93aedd04d19c192eeb3fc8076275a6 Mon Sep 17 00:00:00 2001
+From 823c29a55882753b7147640583f9a87821fb43f5 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Fri, 19 Feb 2021 11:06:40 +0000
-Subject: [PATCH 367/634] media: i2c: imx477: Remove unused function parameter
+Subject: [PATCH 355/828] media: i2c: imx477: Remove unused function parameter
 
 The struct imx477 *ctrl parameter is not used in the function
 imx477_adjust_exposure_range(), so remove it.
@@ -11,11 +11,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  drivers/media/i2c/imx477.c | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index 74e8d892d4a6..31e48512c165 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
-@@ -1276,8 +1276,7 @@ static int imx477_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+@@ -1276,8 +1276,7 @@ static int imx477_open(struct v4l2_subde
  	return 0;
  }
  
@@ -25,7 +23,7 @@ index 74e8d892d4a6..31e48512c165 100644
  {
  	int exposure_max, exposure_def;
  
-@@ -1322,7 +1321,7 @@ static int imx477_set_ctrl(struct v4l2_ctrl *ctrl)
+@@ -1322,7 +1321,7 @@ static int imx477_set_ctrl(struct v4l2_c
  	 * and adjust if necessary.
  	 */
  	if (ctrl->id == V4L2_CID_VBLANK)
@@ -34,6 +32,3 @@ index 74e8d892d4a6..31e48512c165 100644
  
  	/*
  	 * Applying V4L2 control value only happens
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0368-media-bcm2835-unicam-Fix-bug-in-buffer-swapping-logi.patch b/root/target/linux/bcm27xx/patches-5.15/950-0356-media-bcm2835-unicam-Fix-bug-in-buffer-swapping-logi.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0368-media-bcm2835-unicam-Fix-bug-in-buffer-swapping-logi.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0356-media-bcm2835-unicam-Fix-bug-in-buffer-swapping-logi.patch
index 652efe73..2ee3d27b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0368-media-bcm2835-unicam-Fix-bug-in-buffer-swapping-logi.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0356-media-bcm2835-unicam-Fix-bug-in-buffer-swapping-logi.patch
@@ -1,7 +1,7 @@
-From d6c12d405d72ff7e8d565aee5f4988c2b780e615 Mon Sep 17 00:00:00 2001
+From 74d9fb1e3ef595f5aa03cc59572d3807e4a729ae Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Fri, 5 Mar 2021 15:40:45 +0000
-Subject: [PATCH 368/634] media: bcm2835-unicam: Fix bug in buffer swapping
+Subject: [PATCH 356/828] media: bcm2835-unicam: Fix bug in buffer swapping
  logic
 
 If multiple sets of interrupts occur simultaneously, it may be unsafe
@@ -17,11 +17,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  .../media/platform/bcm2835/bcm2835-unicam.c   | 21 ++++++++++++++++---
  1 file changed, 18 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index a8b3f5433f04..234f0eaf9c8c 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -798,6 +798,7 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -798,6 +798,7 @@ static irqreturn_t unicam_isr(int irq, v
  	unsigned int sequence = unicam->sequence;
  	unsigned int i;
  	u32 ista, sta;
@@ -29,17 +27,16 @@ index a8b3f5433f04..234f0eaf9c8c 100644
  	u64 ts;
  
  	sta = reg_read(unicam, UNICAM_STA);
-@@ -814,13 +815,19 @@ static irqreturn_t unicam_isr(int irq, void *dev)
- 	if (!(sta & (UNICAM_IS | UNICAM_PI0)))
+@@ -815,12 +816,18 @@ static irqreturn_t unicam_isr(int irq, v
  		return IRQ_HANDLED;
  
-+	/*
+ 	/*
 +	 * Look for either the Frame End interrupt or the Packet Capture status
 +	 * to signal a frame end.
 +	 */
 +	fe = (ista & UNICAM_FEI || sta & UNICAM_PI0);
 +
- 	/*
++	/*
  	 * We must run the frame end handler first. If we have a valid next_frm
  	 * and we get a simultaneout FE + FS interrupt, running the FS handler
  	 * first would null out the next_frm ptr and we would have lost the
@@ -50,7 +47,7 @@ index a8b3f5433f04..234f0eaf9c8c 100644
  		/*
  		 * Ensure we have swapped buffers already as we can't
  		 * stop the peripheral. If no buffer is available, use a
-@@ -831,7 +838,15 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -831,7 +838,15 @@ static irqreturn_t unicam_isr(int irq, v
  			if (!unicam->node[i].streaming)
  				continue;
  
@@ -67,7 +64,7 @@ index a8b3f5433f04..234f0eaf9c8c 100644
  				unicam_process_buffer_complete(&unicam->node[i],
  							       sequence);
  			unicam->node[i].cur_frm = unicam->node[i].next_frm;
-@@ -868,7 +883,7 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -868,7 +883,7 @@ static irqreturn_t unicam_isr(int irq, v
  	 * where the HW does not actually swap it if the new frame has
  	 * already started.
  	 */
@@ -76,6 +73,3 @@ index a8b3f5433f04..234f0eaf9c8c 100644
  		for (i = 0; i < ARRAY_SIZE(unicam->node); i++) {
  			if (!unicam->node[i].streaming)
  				continue;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0369-Assign-crypto-aliases-to-different-AES-implementatio.patch b/root/target/linux/bcm27xx/patches-5.15/950-0357-Assign-crypto-aliases-to-different-AES-implementatio.patch
similarity index 87%
rename from root/target/linux/bcm27xx/patches-5.15/0369-Assign-crypto-aliases-to-different-AES-implementatio.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0357-Assign-crypto-aliases-to-different-AES-implementatio.patch
index c3d9d184..bb739a7d 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0369-Assign-crypto-aliases-to-different-AES-implementatio.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0357-Assign-crypto-aliases-to-different-AES-implementatio.patch
@@ -1,7 +1,7 @@
-From 44a86b4d32b2b3c9eeed9eeed073b36f0fabdbcc Mon Sep 17 00:00:00 2001
+From f67c685e35b4ce1d3e488aa114c8ca91b6157baa Mon Sep 17 00:00:00 2001
 From: Ben Avison <bavison@riscosopen.org>
 Date: Mon, 8 Mar 2021 15:32:25 +0000
-Subject: [PATCH 369/634] Assign crypto aliases to different AES implementation
+Subject: [PATCH 357/828] Assign crypto aliases to different AES implementation
  modules
 
 The kernel modules aes-neon-blk and aes-neon-bs perform poorly, at least on
@@ -48,8 +48,6 @@ Signed-off-by: Ben Avison <bavison@riscosopen.org>
  arch/arm64/crypto/aes-neonbs-glue.c |  5 -----
  3 files changed, 12 insertions(+), 7 deletions(-)
 
-diff --git a/arch/arm64/crypto/aes-cipher-glue.c b/arch/arm64/crypto/aes-cipher-glue.c
-index 8caf6dfefce8..2c5772889bdf 100644
 --- a/arch/arm64/crypto/aes-cipher-glue.c
 +++ b/arch/arm64/crypto/aes-cipher-glue.c
 @@ -9,6 +9,16 @@
@@ -69,11 +67,9 @@ index 8caf6dfefce8..2c5772889bdf 100644
  asmlinkage void __aes_arm64_encrypt(u32 *rk, u8 *out, const u8 *in, int rounds);
  asmlinkage void __aes_arm64_decrypt(u32 *rk, u8 *out, const u8 *in, int rounds);
  
-diff --git a/arch/arm64/crypto/aes-glue.c b/arch/arm64/crypto/aes-glue.c
-index 17e735931a0c..445082aff0b8 100644
 --- a/arch/arm64/crypto/aes-glue.c
 +++ b/arch/arm64/crypto/aes-glue.c
-@@ -57,17 +57,17 @@ MODULE_DESCRIPTION("AES-ECB/CBC/CTR/XTS using ARMv8 Crypto Extensions");
+@@ -57,17 +57,17 @@ MODULE_DESCRIPTION("AES-ECB/CBC/CTR/XTS
  #define aes_mac_update		neon_aes_mac_update
  MODULE_DESCRIPTION("AES-ECB/CBC/CTR/XTS using ARMv8 NEON");
  #endif
@@ -93,8 +89,6 @@ index 17e735931a0c..445082aff0b8 100644
  
  MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
  MODULE_LICENSE("GPL v2");
-diff --git a/arch/arm64/crypto/aes-neonbs-glue.c b/arch/arm64/crypto/aes-neonbs-glue.c
-index fb507d569922..cc52829d426a 100644
 --- a/arch/arm64/crypto/aes-neonbs-glue.c
 +++ b/arch/arm64/crypto/aes-neonbs-glue.c
 @@ -18,11 +18,6 @@
@@ -109,6 +103,3 @@ index fb507d569922..cc52829d426a 100644
  asmlinkage void aesbs_convert_key(u8 out[], u32 const rk[], int rounds);
  
  asmlinkage void aesbs_ecb_encrypt(u8 out[], u8 const in[], u8 const rk[],
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0370-media-v4l2_m2m-In-buffered-mode-run-jobs-if-either-p.patch b/root/target/linux/bcm27xx/patches-5.15/950-0358-media-v4l2_m2m-In-buffered-mode-run-jobs-if-either-p.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0370-media-v4l2_m2m-In-buffered-mode-run-jobs-if-either-p.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0358-media-v4l2_m2m-In-buffered-mode-run-jobs-if-either-p.patch
index 37add069..ef7f37e5 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0370-media-v4l2_m2m-In-buffered-mode-run-jobs-if-either-p.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0358-media-v4l2_m2m-In-buffered-mode-run-jobs-if-either-p.patch
@@ -1,7 +1,7 @@
-From ea446a6f1ef0ed7ef6f471197d3f0965b0bb5dee Mon Sep 17 00:00:00 2001
+From 6dd673a9ad45c668727086d342c5c8799bb426c8 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Mon, 1 Feb 2021 18:48:47 +0000
-Subject: [PATCH 370/634] media/v4l2_m2m: In buffered mode run jobs if either
+Subject: [PATCH 358/828] media/v4l2_m2m: In buffered mode run jobs if either
  port is streaming
 
 In order to get the intended behaviour of the stateful video
@@ -15,11 +15,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/v4l2-core/v4l2-mem2mem.c | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
-index e7f4bf5bc8dd..ebd2a952f24b 100644
 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c
 +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
-@@ -301,9 +301,10 @@ static void __v4l2_m2m_try_queue(struct v4l2_m2m_dev *m2m_dev,
+@@ -301,9 +301,10 @@ static void __v4l2_m2m_try_queue(struct
  
  	dprintk("Trying to schedule a job for m2m_ctx: %p\n", m2m_ctx);
  
@@ -33,6 +31,3 @@ index e7f4bf5bc8dd..ebd2a952f24b 100644
  		return;
  	}
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0371-staging-bcm2835-codec-Correct-logging-of-size_t-to-z.patch b/root/target/linux/bcm27xx/patches-5.15/950-0359-staging-bcm2835-codec-Correct-logging-of-size_t-to-z.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0371-staging-bcm2835-codec-Correct-logging-of-size_t-to-z.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0359-staging-bcm2835-codec-Correct-logging-of-size_t-to-z.patch
index ea975b22..2e811d1e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0371-staging-bcm2835-codec-Correct-logging-of-size_t-to-z.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0359-staging-bcm2835-codec-Correct-logging-of-size_t-to-z.patch
@@ -1,7 +1,7 @@
-From b568da19374a7f47e263388fc58811e1a7a83a5c Mon Sep 17 00:00:00 2001
+From 3ee048b4ffa97e577a64ff1b8bc78328d6e4c596 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Mon, 1 Feb 2021 18:55:37 +0000
-Subject: [PATCH 371/634] staging/bcm2835-codec: Correct logging of size_t to
+Subject: [PATCH 359/828] staging/bcm2835-codec: Correct logging of size_t to
  %zu
 
 Fixes: "staging/bcm2835-codec: Log the number of excess supported formats"
@@ -12,11 +12,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c  | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 94691ab7175a..0c4d8bf77b91 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -2837,7 +2837,7 @@ static int bcm2835_codec_get_supported_fmts(struct bcm2835_codec_dev *dev)
+@@ -2837,7 +2837,7 @@ static int bcm2835_codec_get_supported_f
  	if (ret) {
  		if (ret == MMAL_MSG_STATUS_ENOSPC) {
  			v4l2_err(&dev->v4l2_dev,
@@ -25,7 +23,7 @@ index 94691ab7175a..0c4d8bf77b91 100644
  				 __func__, param_size / sizeof(u32),
  				 MAX_SUPPORTED_ENCODINGS);
  			num_encodings = MAX_SUPPORTED_ENCODINGS;
-@@ -2883,7 +2883,7 @@ static int bcm2835_codec_get_supported_fmts(struct bcm2835_codec_dev *dev)
+@@ -2883,7 +2883,7 @@ static int bcm2835_codec_get_supported_f
  	if (ret) {
  		if (ret == MMAL_MSG_STATUS_ENOSPC) {
  			v4l2_err(&dev->v4l2_dev,
@@ -34,6 +32,3 @@ index 94691ab7175a..0c4d8bf77b91 100644
  				 __func__, param_size / sizeof(u32),
  				 MAX_SUPPORTED_ENCODINGS);
  			num_encodings = MAX_SUPPORTED_ENCODINGS;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0372-staging-bcm2835-codec-Add-support-for-pixel-aspect-r.patch b/root/target/linux/bcm27xx/patches-5.15/950-0360-staging-bcm2835-codec-Add-support-for-pixel-aspect-r.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0372-staging-bcm2835-codec-Add-support-for-pixel-aspect-r.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0360-staging-bcm2835-codec-Add-support-for-pixel-aspect-r.patch
index ad6094de..6c108ce8 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0372-staging-bcm2835-codec-Add-support-for-pixel-aspect-r.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0360-staging-bcm2835-codec-Add-support-for-pixel-aspect-r.patch
@@ -1,7 +1,7 @@
-From 9ad9291d0a51d604f1d2f72be3597b73e9cb859e Mon Sep 17 00:00:00 2001
+From 956e7685d2dd408b2f5d7c57abf48aeac01c4e9a Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 2 Feb 2021 15:50:18 +0000
-Subject: [PATCH 372/634] staging/bcm2835-codec: Add support for pixel aspect
+Subject: [PATCH 360/828] staging/bcm2835-codec: Add support for pixel aspect
  ratio
 
 If the format is detected by the driver and a V4L2_EVENT_SOURCE_CHANGE
@@ -12,8 +12,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../bcm2835-codec/bcm2835-v4l2-codec.c        | 31 +++++++++++++++++++
  1 file changed, 31 insertions(+)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 0c4d8bf77b91..46f659e55f18 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -602,6 +602,7 @@ struct bcm2835_codec_q_data {
@@ -24,7 +22,7 @@ index 0c4d8bf77b91..46f659e55f18 100644
  
  	unsigned int		sizeimage;
  	unsigned int		sequence;
-@@ -981,6 +982,9 @@ static void handle_fmt_changed(struct bcm2835_codec_ctx *ctx,
+@@ -981,6 +982,9 @@ static void handle_fmt_changed(struct bc
  	if (format->es.video.color_space)
  		color_mmal2v4l(ctx, format->es.video.color_space);
  
@@ -34,7 +32,7 @@ index 0c4d8bf77b91..46f659e55f18 100644
  	queue_res_chg_event(ctx);
  }
  
-@@ -1657,6 +1661,29 @@ static int vidioc_g_parm(struct file *file, void *priv,
+@@ -1657,6 +1661,29 @@ static int vidioc_g_parm(struct file *fi
  	return 0;
  }
  
@@ -64,7 +62,7 @@ index 0c4d8bf77b91..46f659e55f18 100644
  static int vidioc_subscribe_evt(struct v4l2_fh *fh,
  				const struct v4l2_event_subscription *sub)
  {
-@@ -2082,6 +2109,8 @@ static const struct v4l2_ioctl_ops bcm2835_codec_ioctl_ops = {
+@@ -2082,6 +2109,8 @@ static const struct v4l2_ioctl_ops bcm28
  	.vidioc_g_parm		= vidioc_g_parm,
  	.vidioc_s_parm		= vidioc_s_parm,
  
@@ -73,7 +71,7 @@ index 0c4d8bf77b91..46f659e55f18 100644
  	.vidioc_subscribe_event = vidioc_subscribe_evt,
  	.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
  
-@@ -2640,6 +2669,8 @@ static int bcm2835_codec_open(struct file *file)
+@@ -2640,6 +2669,8 @@ static int bcm2835_codec_open(struct fil
  			      ctx->q_data[V4L2_M2M_DST].crop_width,
  			      ctx->q_data[V4L2_M2M_DST].height,
  			      ctx->q_data[V4L2_M2M_DST].fmt);
@@ -82,6 +80,3 @@ index 0c4d8bf77b91..46f659e55f18 100644
  
  	ctx->colorspace = V4L2_COLORSPACE_REC709;
  	ctx->bitrate = 10 * 1000 * 1000;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0373-staging-bcm2835-codec-Implement-additional-g_selecti.patch b/root/target/linux/bcm27xx/patches-5.15/950-0361-staging-bcm2835-codec-Implement-additional-g_selecti.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0373-staging-bcm2835-codec-Implement-additional-g_selecti.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0361-staging-bcm2835-codec-Implement-additional-g_selecti.patch
index c3932ee7..1741cb5b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0373-staging-bcm2835-codec-Implement-additional-g_selecti.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0361-staging-bcm2835-codec-Implement-additional-g_selecti.patch
@@ -1,7 +1,7 @@
-From 07e1de4daa4a3f43be6649cc7ce03a28703fe065 Mon Sep 17 00:00:00 2001
+From 6dc7d9abe664a8b279507c4b8b246b05e6393b7a Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 2 Feb 2021 16:46:39 +0000
-Subject: [PATCH 373/634] staging/bcm2835-codec: Implement additional
+Subject: [PATCH 361/828] staging/bcm2835-codec: Implement additional
  g_selection calls for decode
 
 v4l_cropcap calls our vidioc_g_pixelaspect function to get the pixel
@@ -16,11 +16,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c      | 8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 46f659e55f18..7aa6c53e279e 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -1517,6 +1517,14 @@ static int vidioc_g_selection(struct file *file, void *priv,
+@@ -1517,6 +1517,14 @@ static int vidioc_g_selection(struct fil
  			s->r.width = q_data->crop_width;
  			s->r.height = q_data->crop_height;
  			break;
@@ -35,6 +33,3 @@ index 46f659e55f18..7aa6c53e279e 100644
  		default:
  			return -EINVAL;
  		}
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0374-staging-bcm2835-codec-Add-VC-1-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0362-staging-bcm2835-codec-Add-VC-1-support.patch
similarity index 66%
rename from root/target/linux/bcm27xx/patches-5.15/0374-staging-bcm2835-codec-Add-VC-1-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0362-staging-bcm2835-codec-Add-VC-1-support.patch
index 0f6d38f3..2a9117f9 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0374-staging-bcm2835-codec-Add-VC-1-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0362-staging-bcm2835-codec-Add-VC-1-support.patch
@@ -1,7 +1,7 @@
-From 673a52c7d313bc7ee7c585da22705f0966bb8dcc Mon Sep 17 00:00:00 2001
+From dbaed01f8461a3aca1e0e6561e45a5614a88751a Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 10 Mar 2021 19:07:48 +0000
-Subject: [PATCH 374/634] staging/bcm2835-codec: Add VC-1 support.
+Subject: [PATCH 362/828] staging/bcm2835-codec: Add VC-1 support.
 
 Providing the relevant licence has been purchased, then Pi0-3
 can decode VC-1.
@@ -11,11 +11,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c       | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 7aa6c53e279e..5729a8a7d94e 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -576,7 +576,12 @@ static const struct bcm2835_codec_fmt supported_formats[] = {
+@@ -576,7 +576,12 @@ static const struct bcm2835_codec_fmt su
  		.depth			= 0,
  		.flags			= V4L2_FMT_FLAG_COMPRESSED,
  		.mmal_fmt		= MMAL_ENCODING_VP8,
@@ -29,6 +27,3 @@ index 7aa6c53e279e..5729a8a7d94e 100644
  };
  
  struct bcm2835_codec_fmt_list {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0375-hack-fixup-bcm2835-unicam.patch b/root/target/linux/bcm27xx/patches-5.15/950-0363-hack-fixup-bcm2835-unicam.patch
similarity index 66%
rename from root/target/linux/bcm27xx/patches-5.15/0375-hack-fixup-bcm2835-unicam.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0363-hack-fixup-bcm2835-unicam.patch
index 71b4ba13..1af3df62 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0375-hack-fixup-bcm2835-unicam.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0363-hack-fixup-bcm2835-unicam.patch
@@ -1,14 +1,12 @@
-From 8d32fa30406f394188729bd2bff2a28119fa1f48 Mon Sep 17 00:00:00 2001
+From d1293d72b708274b4addc2081e516d7c0432d2cb Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Wed, 17 Mar 2021 12:45:53 +0000
-Subject: [PATCH 375/634] hack: fixup bcm2835-unicam
+Subject: [PATCH 363/828] hack: fixup bcm2835-unicam
 
 ---
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 234f0eaf9c8c..db99d1562904 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -72,6 +72,9 @@
@@ -21,6 +19,3 @@ index 234f0eaf9c8c..db99d1562904 100644
  #include "vc4-regs-unicam.h"
  
  #define UNICAM_MODULE_NAME	"unicam"
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0376-media-i2c-add-ov9281-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0364-media-i2c-add-ov9281-driver.patch
similarity index 98%
rename from root/target/linux/bcm27xx/patches-5.15/0376-media-i2c-add-ov9281-driver.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0364-media-i2c-add-ov9281-driver.patch
index f7193e95..53c4230b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0376-media-i2c-add-ov9281-driver.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0364-media-i2c-add-ov9281-driver.patch
@@ -1,7 +1,7 @@
-From 40689682d5ca6077bf09c0c95f420eb6663242d8 Mon Sep 17 00:00:00 2001
+From 724a9b43d903229a70f99ceb5052eac1bcf4d352 Mon Sep 17 00:00:00 2001
 From: Zefa Chen <zefa.chen@rock-chips.com>
 Date: Fri, 17 May 2019 18:23:03 +0800
-Subject: [PATCH 376/634] media: i2c: add ov9281 driver.
+Subject: [PATCH 364/828] media: i2c: add ov9281 driver.
 
 Change-Id: I7b77250bbc56d2f861450cf77271ad15f9b88ab1
 Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
@@ -12,8 +12,6 @@ Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
  3 files changed, 1183 insertions(+)
  create mode 100644 drivers/media/i2c/ov9281.c
 
-diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index a27c1bc63d7d..f85824ec1064 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
 @@ -1164,6 +1164,17 @@ config VIDEO_OV9640
@@ -34,8 +32,6 @@ index a27c1bc63d7d..f85824ec1064 100644
  config VIDEO_OV9650
  	tristate "OmniVision OV9650/OV9652 sensor support"
  	depends on I2C && VIDEO_V4L2
-diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
-index d3442a07e1f4..39209dc647fd 100644
 --- a/drivers/media/i2c/Makefile
 +++ b/drivers/media/i2c/Makefile
 @@ -84,6 +84,7 @@ obj-$(CONFIG_VIDEO_OV772X) += ov772x.o
@@ -46,9 +42,6 @@ index d3442a07e1f4..39209dc647fd 100644
  obj-$(CONFIG_VIDEO_OV9282) += ov9282.o
  obj-$(CONFIG_VIDEO_OV9640) += ov9640.o
  obj-$(CONFIG_VIDEO_OV9650) += ov9650.o
-diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-new file mode 100644
-index 000000000000..6d1d3ddc3970
 --- /dev/null
 +++ b/drivers/media/i2c/ov9281.c
 @@ -0,0 +1,1171 @@
@@ -1223,6 +1216,3 @@ index 000000000000..6d1d3ddc3970
 +
 +MODULE_DESCRIPTION("OmniVision ov9281 sensor driver");
 +MODULE_LICENSE("GPL v2");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0377-media-i2c-ov9281-fix-mclk-issue-when-probe-multiple-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0365-media-i2c-ov9281-fix-mclk-issue-when-probe-multiple-.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0377-media-i2c-ov9281-fix-mclk-issue-when-probe-multiple-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0365-media-i2c-ov9281-fix-mclk-issue-when-probe-multiple-.patch
index c7c77ea6..2aee44d9 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0377-media-i2c-ov9281-fix-mclk-issue-when-probe-multiple-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0365-media-i2c-ov9281-fix-mclk-issue-when-probe-multiple-.patch
@@ -1,7 +1,7 @@
-From eabf31ac838edfa612eefe051397e7145338c952 Mon Sep 17 00:00:00 2001
+From 294e27e5f2595d7f1b11b89d73e0e246d8323500 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 14 Apr 2020 15:47:09 +0100
-Subject: [PATCH 377/634] media: i2c: ov9281: fix mclk issue when probe
+Subject: [PATCH 365/828] media: i2c: ov9281: fix mclk issue when probe
  multiple camera.
 
 Takes the ov9281 part only from the Rockchip's patch.
@@ -12,8 +12,6 @@ Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
  drivers/media/i2c/ov9281.c | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
-diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-index 6d1d3ddc3970..68142ec69c5c 100644
 --- a/drivers/media/i2c/ov9281.c
 +++ b/drivers/media/i2c/ov9281.c
 @@ -3,6 +3,7 @@
@@ -33,7 +31,7 @@ index 6d1d3ddc3970..68142ec69c5c 100644
  
  #ifndef V4L2_CID_DIGITAL_GAIN
  #define V4L2_CID_DIGITAL_GAIN		V4L2_CID_GAIN
-@@ -676,6 +677,12 @@ static int __ov9281_power_on(struct ov9281 *ov9281)
+@@ -676,6 +677,12 @@ static int __ov9281_power_on(struct ov92
  			dev_err(dev, "could not set pins\n");
  	}
  
@@ -46,7 +44,7 @@ index 6d1d3ddc3970..68142ec69c5c 100644
  	ret = clk_prepare_enable(ov9281->xvclk);
  	if (ret < 0) {
  		dev_err(dev, "Failed to enable xvclk\n");
-@@ -1008,13 +1015,6 @@ static int ov9281_probe(struct i2c_client *client,
+@@ -1008,13 +1015,6 @@ static int ov9281_probe(struct i2c_clien
  		dev_err(dev, "Failed to get xvclk\n");
  		return -EINVAL;
  	}
@@ -60,6 +58,3 @@ index 6d1d3ddc3970..68142ec69c5c 100644
  
  	ov9281->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);
  	if (IS_ERR(ov9281->reset_gpio))
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0378-media-i2c-ov9281-add-enum_frame_interval-function-fo.patch b/root/target/linux/bcm27xx/patches-5.15/950-0366-media-i2c-ov9281-add-enum_frame_interval-function-fo.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0378-media-i2c-ov9281-add-enum_frame_interval-function-fo.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0366-media-i2c-ov9281-add-enum_frame_interval-function-fo.patch
index 27c3a69d..dad7c122 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0378-media-i2c-ov9281-add-enum_frame_interval-function-fo.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0366-media-i2c-ov9281-add-enum_frame_interval-function-fo.patch
@@ -1,7 +1,7 @@
-From d02fd392378a4ed1c38d0355d45099c622364268 Mon Sep 17 00:00:00 2001
+From e06284f54c253ce1a17eac42ce60dfeefacfbf99 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 14 Apr 2020 15:51:50 +0100
-Subject: [PATCH 378/634] media: i2c: ov9281: add enum_frame_interval function
+Subject: [PATCH 366/828] media: i2c: ov9281: add enum_frame_interval function
  for iq tool 2.2 and hal3
 
 Adds the ov9281 parts of the Rockchip patch adding enum_frame_interval to
@@ -13,8 +13,6 @@ Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
  drivers/media/i2c/ov9281.c | 31 ++++++++++++++++++++++++++-----
  1 file changed, 26 insertions(+), 5 deletions(-)
 
-diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-index 68142ec69c5c..52bba5dff953 100644
 --- a/drivers/media/i2c/ov9281.c
 +++ b/drivers/media/i2c/ov9281.c
 @@ -4,6 +4,7 @@
@@ -43,7 +41,7 @@ index 68142ec69c5c..52bba5dff953 100644
  	u32 hts_def;
  	u32 vts_def;
  	u32 exp_def;
-@@ -246,7 +247,10 @@ static const struct ov9281_mode supported_modes[] = {
+@@ -246,7 +247,10 @@ static const struct ov9281_mode supporte
  	{
  		.width = 1280,
  		.height = 800,
@@ -55,7 +53,7 @@ index 68142ec69c5c..52bba5dff953 100644
  		.exp_def = 0x0320,
  		.hts_def = 0x0b60,//0x2d8*4
  		.vts_def = 0x038e,
-@@ -483,8 +487,7 @@ static int OV9281_g_frame_interval(struct v4l2_subdev *sd,
+@@ -483,8 +487,7 @@ static int OV9281_g_frame_interval(struc
  	const struct ov9281_mode *mode = ov9281->cur_mode;
  
  	mutex_lock(&ov9281->mutex);
@@ -65,7 +63,7 @@ index 68142ec69c5c..52bba5dff953 100644
  	mutex_unlock(&ov9281->mutex);
  
  	return 0;
-@@ -778,6 +781,23 @@ static int ov9281_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+@@ -778,6 +781,23 @@ static int ov9281_open(struct v4l2_subde
  }
  #endif
  
@@ -89,7 +87,7 @@ index 68142ec69c5c..52bba5dff953 100644
  static const struct dev_pm_ops ov9281_pm_ops = {
  	SET_RUNTIME_PM_OPS(ov9281_runtime_suspend,
  			   ov9281_runtime_resume, NULL)
-@@ -805,6 +825,7 @@ static const struct v4l2_subdev_video_ops ov9281_video_ops = {
+@@ -805,6 +825,7 @@ static const struct v4l2_subdev_video_op
  static const struct v4l2_subdev_pad_ops ov9281_pad_ops = {
  	.enum_mbus_code = ov9281_enum_mbus_code,
  	.enum_frame_size = ov9281_enum_frame_sizes,
@@ -97,6 +95,3 @@ index 68142ec69c5c..52bba5dff953 100644
  	.get_fmt = ov9281_get_fmt,
  	.set_fmt = ov9281_set_fmt,
  };
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0379-media-i2c-ov9281-Fixup-for-recent-kernel-releases-an.patch b/root/target/linux/bcm27xx/patches-5.15/950-0367-media-i2c-ov9281-Fixup-for-recent-kernel-releases-an.patch
similarity index 92%
rename from root/target/linux/bcm27xx/patches-5.15/0379-media-i2c-ov9281-Fixup-for-recent-kernel-releases-an.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0367-media-i2c-ov9281-Fixup-for-recent-kernel-releases-an.patch
index 92cd8ff7..8f031d7c 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0379-media-i2c-ov9281-Fixup-for-recent-kernel-releases-an.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0367-media-i2c-ov9281-Fixup-for-recent-kernel-releases-an.patch
@@ -1,7 +1,7 @@
-From 0eda869aecb1305b1f8d997bcc7ae9db58144fcf Mon Sep 17 00:00:00 2001
+From 82acfed0ef9df25ff85e206576ce35594f3b9bff Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 14 Apr 2020 16:12:33 +0100
-Subject: [PATCH 379/634] media: i2c: ov9281: Fixup for recent kernel releases,
+Subject: [PATCH 367/828] media: i2c: ov9281: Fixup for recent kernel releases,
  and remove custom code
 
 The Rockchip driver was based on a 4.4 kernel, and had several custom
@@ -15,8 +15,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/ov9281.c | 361 +++++++++++++------------------------
  1 file changed, 122 insertions(+), 239 deletions(-)
 
-diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-index 52bba5dff953..b28dbe6d08c3 100644
 --- a/drivers/media/i2c/ov9281.c
 +++ b/drivers/media/i2c/ov9281.c
 @@ -1,6 +1,11 @@
@@ -114,7 +112,7 @@ index 52bba5dff953..b28dbe6d08c3 100644
  	struct v4l2_subdev	subdev;
  	struct media_pad	pad;
  	struct v4l2_ctrl_handler ctrl_handler;
-@@ -124,21 +127,10 @@ struct ov9281 {
+@@ -124,23 +127,12 @@ struct ov9281 {
  	bool			streaming;
  	bool			power_on;
  	const struct ov9281_mode *cur_mode;
@@ -126,17 +124,19 @@ index 52bba5dff953..b28dbe6d08c3 100644
  
  #define to_ov9281(sd) container_of(sd, struct ov9281, subdev)
  
--/*
-- * Xclk 24Mhz
+ /*
+  * Xclk 24Mhz
 - */
 -static const struct regval ov9281_global_regs[] = {
 -	{REG_NULL, 0x00},
 -};
 -
- /*
-  * Xclk 24Mhz
+-/*
+- * Xclk 24Mhz
   * max_framerate 120fps
-@@ -247,13 +239,15 @@ static const struct ov9281_mode supported_modes[] = {
+  * mipi_datarate per lane 800Mbps
+  */
+@@ -247,13 +239,15 @@ static const struct ov9281_mode supporte
  	{
  		.width = 1280,
  		.height = 800,
@@ -157,7 +157,7 @@ index 52bba5dff953..b28dbe6d08c3 100644
  		.reg_list = ov9281_1280x800_regs,
  	},
  };
-@@ -389,22 +383,28 @@ static int ov9281_set_fmt(struct v4l2_subdev *sd,
+@@ -389,22 +383,28 @@ static int ov9281_set_fmt(struct v4l2_su
  	fmt->format.width = mode->width;
  	fmt->format.height = mode->height;
  	fmt->format.field = V4L2_FIELD_NONE;
@@ -191,7 +191,7 @@ index 52bba5dff953..b28dbe6d08c3 100644
  	}
  
  	mutex_unlock(&ov9281->mutex);
-@@ -421,17 +421,21 @@ static int ov9281_get_fmt(struct v4l2_subdev *sd,
+@@ -421,17 +421,21 @@ static int ov9281_get_fmt(struct v4l2_su
  
  	mutex_lock(&ov9281->mutex);
  	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
@@ -218,7 +218,7 @@ index 52bba5dff953..b28dbe6d08c3 100644
  	}
  	mutex_unlock(&ov9281->mutex);
  
-@@ -442,7 +446,7 @@ static int ov9281_enum_mbus_code(struct v4l2_subdev *sd,
+@@ -442,7 +446,7 @@ static int ov9281_enum_mbus_code(struct
  				 struct v4l2_subdev_pad_config *cfg,
  				 struct v4l2_subdev_mbus_code_enum *code)
  {
@@ -227,22 +227,23 @@ index 52bba5dff953..b28dbe6d08c3 100644
  		return -EINVAL;
  	code->code = MEDIA_BUS_FMT_Y10_1X10;
  
-@@ -480,88 +484,56 @@ static int ov9281_enable_test_pattern(struct ov9281 *ov9281, u32 pattern)
+@@ -480,88 +484,56 @@ static int ov9281_enable_test_pattern(st
  				OV9281_REG_VALUE_08BIT, val);
  }
  
 -static int OV9281_g_frame_interval(struct v4l2_subdev *sd,
 -				   struct v4l2_subdev_frame_interval *fi)
-+static const struct v4l2_rect *
-+__ov9281_get_pad_crop(struct ov9281 *ov9281, struct v4l2_subdev_pad_config *cfg,
-+		      unsigned int pad, enum v4l2_subdev_format_whence which)
- {
+-{
 -	struct ov9281 *ov9281 = to_ov9281(sd);
 -	const struct ov9281_mode *mode = ov9281->cur_mode;
 -
 -	mutex_lock(&ov9281->mutex);
 -	fi->interval = mode->max_fps;
 -	mutex_unlock(&ov9281->mutex);
++static const struct v4l2_rect *
++__ov9281_get_pad_crop(struct ov9281 *ov9281, struct v4l2_subdev_pad_config *cfg,
++		      unsigned int pad, enum v4l2_subdev_format_whence which)
++{
 +	switch (which) {
 +	case V4L2_SUBDEV_FORMAT_TRY:
 +		return v4l2_subdev_get_try_crop(&ov9281->subdev, cfg, pad);
@@ -351,7 +352,7 @@ index 52bba5dff953..b28dbe6d08c3 100644
  
  static int __ov9281_start_stream(struct ov9281 *ov9281)
  {
-@@ -643,12 +615,6 @@ static int ov9281_s_power(struct v4l2_subdev *sd, int on)
+@@ -643,12 +615,6 @@ static int ov9281_s_power(struct v4l2_su
  			pm_runtime_put_noidle(&client->dev);
  			goto unlock_and_return;
  		}
@@ -364,7 +365,7 @@ index 52bba5dff953..b28dbe6d08c3 100644
  		ov9281->power_on = true;
  	} else {
  		pm_runtime_put(&client->dev);
-@@ -673,18 +639,12 @@ static int __ov9281_power_on(struct ov9281 *ov9281)
+@@ -673,18 +639,12 @@ static int __ov9281_power_on(struct ov92
  	u32 delay_us;
  	struct device *dev = &ov9281->client->dev;
  
@@ -385,7 +386,7 @@ index 52bba5dff953..b28dbe6d08c3 100644
  
  	ret = clk_prepare_enable(ov9281->xvclk);
  	if (ret < 0) {
-@@ -722,20 +682,11 @@ static int __ov9281_power_on(struct ov9281 *ov9281)
+@@ -722,20 +682,11 @@ disable_clk:
  
  static void __ov9281_power_off(struct ov9281 *ov9281)
  {
@@ -406,7 +407,7 @@ index 52bba5dff953..b28dbe6d08c3 100644
  	regulator_bulk_disable(OV9281_NUM_SUPPLIES, ov9281->supplies);
  }
  
-@@ -759,7 +710,6 @@ static int ov9281_runtime_suspend(struct device *dev)
+@@ -759,7 +710,6 @@ static int ov9281_runtime_suspend(struct
  	return 0;
  }
  
@@ -414,7 +415,7 @@ index 52bba5dff953..b28dbe6d08c3 100644
  static int ov9281_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
  {
  	struct ov9281 *ov9281 = to_ov9281(sd);
-@@ -773,61 +723,42 @@ static int ov9281_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+@@ -773,61 +723,42 @@ static int ov9281_open(struct v4l2_subde
  	try_fmt->height = def_mode->height;
  	try_fmt->code = MEDIA_BUS_FMT_Y10_1X10;
  	try_fmt->field = V4L2_FIELD_NONE;
@@ -483,7 +484,7 @@ index 52bba5dff953..b28dbe6d08c3 100644
  };
  
  static const struct v4l2_subdev_ops ov9281_subdev_ops = {
-@@ -868,7 +799,8 @@ static int ov9281_set_ctrl(struct v4l2_ctrl *ctrl)
+@@ -868,7 +799,8 @@ static int ov9281_set_ctrl(struct v4l2_c
  	case V4L2_CID_ANALOGUE_GAIN:
  		ret = ov9281_write_reg(ov9281->client, OV9281_REG_GAIN_H,
  				       OV9281_REG_VALUE_08BIT,
@@ -493,7 +494,7 @@ index 52bba5dff953..b28dbe6d08c3 100644
  		ret |= ov9281_write_reg(ov9281->client, OV9281_REG_GAIN_L,
  				       OV9281_REG_VALUE_08BIT,
  				       ctrl->val & OV9281_GAIN_L_MASK);
-@@ -922,31 +854,34 @@ static int ov9281_initialize_controls(struct ov9281 *ov9281)
+@@ -922,31 +854,34 @@ static int ov9281_initialize_controls(st
  
  	h_blank = mode->hts_def - mode->width;
  	ov9281->hblank = v4l2_ctrl_new_std(handler, NULL, V4L2_CID_HBLANK,
@@ -525,15 +526,16 @@ index 52bba5dff953..b28dbe6d08c3 100644
 -				V4L2_CID_ANALOGUE_GAIN, OV9281_GAIN_MIN,
 -				OV9281_GAIN_MAX, OV9281_GAIN_STEP,
 -				OV9281_GAIN_DEFAULT);
-+					      V4L2_CID_ANALOGUE_GAIN,
-+					      OV9281_GAIN_MIN, OV9281_GAIN_MAX,
-+					      OV9281_GAIN_STEP,
-+					      OV9281_GAIN_DEFAULT);
- 
+-
 -	ov9281->test_pattern = v4l2_ctrl_new_std_menu_items(handler,
 -				&ov9281_ctrl_ops, V4L2_CID_TEST_PATTERN,
 -				ARRAY_SIZE(ov9281_test_pattern_menu) - 1,
 -				0, 0, ov9281_test_pattern_menu);
++					      V4L2_CID_ANALOGUE_GAIN,
++					      OV9281_GAIN_MIN, OV9281_GAIN_MAX,
++					      OV9281_GAIN_STEP,
++					      OV9281_GAIN_DEFAULT);
++
 +	ov9281->test_pattern =
 +		v4l2_ctrl_new_std_menu_items(handler, &ov9281_ctrl_ops,
 +					     V4L2_CID_TEST_PATTERN,
@@ -542,7 +544,7 @@ index 52bba5dff953..b28dbe6d08c3 100644
  
  	if (handler->error) {
  		ret = handler->error;
-@@ -1000,34 +935,14 @@ static int ov9281_probe(struct i2c_client *client,
+@@ -1000,34 +935,14 @@ static int ov9281_probe(struct i2c_clien
  			const struct i2c_device_id *id)
  {
  	struct device *dev = &client->dev;
@@ -577,7 +579,7 @@ index 52bba5dff953..b28dbe6d08c3 100644
  	ov9281->client = client;
  	ov9281->cur_mode = &supported_modes[0];
  
-@@ -1037,31 +952,15 @@ static int ov9281_probe(struct i2c_client *client,
+@@ -1037,31 +952,15 @@ static int ov9281_probe(struct i2c_clien
  		return -EINVAL;
  	}
  
@@ -612,7 +614,7 @@ index 52bba5dff953..b28dbe6d08c3 100644
  	ret = ov9281_configure_regulators(ov9281);
  	if (ret) {
  		dev_err(dev, "Failed to get power regulators\n");
-@@ -1084,26 +983,16 @@ static int ov9281_probe(struct i2c_client *client,
+@@ -1084,26 +983,16 @@ static int ov9281_probe(struct i2c_clien
  	if (ret)
  		goto err_power_off;
  
@@ -643,7 +645,7 @@ index 52bba5dff953..b28dbe6d08c3 100644
  		 OV9281_NAME, dev_name(sd->dev));
  	ret = v4l2_async_register_subdev_sensor(sd);
  	if (ret) {
-@@ -1118,9 +1007,7 @@ static int ov9281_probe(struct i2c_client *client,
+@@ -1118,9 +1007,7 @@ static int ov9281_probe(struct i2c_clien
  	return 0;
  
  err_clean_entity:
@@ -653,7 +655,7 @@ index 52bba5dff953..b28dbe6d08c3 100644
  err_power_off:
  	__ov9281_power_off(ov9281);
  err_free_handler:
-@@ -1137,9 +1024,7 @@ static int ov9281_remove(struct i2c_client *client)
+@@ -1137,9 +1024,7 @@ static int ov9281_remove(struct i2c_clie
  	struct ov9281 *ov9281 = to_ov9281(sd);
  
  	v4l2_async_unregister_subdev(sd);
@@ -663,7 +665,7 @@ index 52bba5dff953..b28dbe6d08c3 100644
  	v4l2_ctrl_handler_free(&ov9281->ctrl_handler);
  	mutex_destroy(&ov9281->mutex);
  
-@@ -1151,13 +1036,11 @@ static int ov9281_remove(struct i2c_client *client)
+@@ -1151,13 +1036,11 @@ static int ov9281_remove(struct i2c_clie
  	return 0;
  }
  
@@ -677,6 +679,3 @@ index 52bba5dff953..b28dbe6d08c3 100644
  
  static const struct i2c_device_id ov9281_match_id[] = {
  	{ "ovti,ov9281", 0 },
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0380-media-i2c-ov9281-Read-chip-ID-via-2-reads.patch b/root/target/linux/bcm27xx/patches-5.15/950-0368-media-i2c-ov9281-Read-chip-ID-via-2-reads.patch
similarity index 79%
rename from root/target/linux/bcm27xx/patches-5.15/0380-media-i2c-ov9281-Read-chip-ID-via-2-reads.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0368-media-i2c-ov9281-Read-chip-ID-via-2-reads.patch
index 901fa4d1..c4384a71 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0380-media-i2c-ov9281-Read-chip-ID-via-2-reads.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0368-media-i2c-ov9281-Read-chip-ID-via-2-reads.patch
@@ -1,7 +1,7 @@
-From c2fc9931dbc1410fd2e689bb5eb66f4e288dac55 Mon Sep 17 00:00:00 2001
+From 63b24cc980bf9fc21157d4dd854cba4b2844b0bd Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Mon, 6 Jul 2020 17:51:32 +0100
-Subject: [PATCH 380/634] media: i2c: ov9281: Read chip ID via 2 reads
+Subject: [PATCH 368/828] media: i2c: ov9281: Read chip ID via 2 reads
 
 Vision Components have made an OV9281 module which blocks reading
 back the majority of registers to comply with NDAs, and in doing
@@ -15,11 +15,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/ov9281.c | 14 +++++++++-----
  1 file changed, 9 insertions(+), 5 deletions(-)
 
-diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-index b28dbe6d08c3..837b37198bb4 100644
 --- a/drivers/media/i2c/ov9281.c
 +++ b/drivers/media/i2c/ov9281.c
-@@ -904,13 +904,17 @@ static int ov9281_check_sensor_id(struct ov9281 *ov9281,
+@@ -904,13 +904,17 @@ static int ov9281_check_sensor_id(struct
  				  struct i2c_client *client)
  {
  	struct device *dev = &ov9281->client->dev;
@@ -42,6 +40,3 @@ index b28dbe6d08c3..837b37198bb4 100644
  		return -ENODEV;
  	}
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0381-media-i2c-ov9281-Add-support-for-8-bit-readout.patch b/root/target/linux/bcm27xx/patches-5.15/950-0369-media-i2c-ov9281-Add-support-for-8-bit-readout.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0381-media-i2c-ov9281-Add-support-for-8-bit-readout.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0369-media-i2c-ov9281-Add-support-for-8-bit-readout.patch
index eb924bcb..f6c2ab13 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0381-media-i2c-ov9281-Add-support-for-8-bit-readout.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0369-media-i2c-ov9281-Add-support-for-8-bit-readout.patch
@@ -1,7 +1,7 @@
-From 83a8c45e32197b8cc483234fe469b34f92472b41 Mon Sep 17 00:00:00 2001
+From 0ab07340f05af0bcea8b4b313db453f5e971d3ce Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 7 Jul 2020 18:29:10 +0100
-Subject: [PATCH 381/634] media: i2c: ov9281: Add support for 8 bit readout
+Subject: [PATCH 369/828] media: i2c: ov9281: Add support for 8 bit readout
 
 The sensor supports 8 bit mode as well as 10bit, so add the
 relevant code to allow selection of this.
@@ -11,8 +11,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/ov9281.c | 66 ++++++++++++++++++++++++++++++--------
  1 file changed, 52 insertions(+), 14 deletions(-)
 
-diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-index 837b37198bb4..05cf78416bc7 100644
 --- a/drivers/media/i2c/ov9281.c
 +++ b/drivers/media/i2c/ov9281.c
 @@ -29,11 +29,12 @@
@@ -59,7 +57,7 @@ index 837b37198bb4..05cf78416bc7 100644
  	{0x030e, 0x02},
  	{0x3001, 0x00},
  	{0x3004, 0x00},
-@@ -168,7 +170,6 @@ static const struct regval ov9281_1280x800_regs[] = {
+@@ -168,7 +170,6 @@ static const struct regval ov9281_1280x8
  	{0x3620, 0x6f},
  	{0x3632, 0x56},
  	{0x3633, 0x78},
@@ -67,7 +65,7 @@ index 837b37198bb4..05cf78416bc7 100644
  	{0x3666, 0x00},
  	{0x366f, 0x5a},
  	{0x3680, 0x84},
-@@ -235,6 +236,18 @@ static const struct regval ov9281_1280x800_regs[] = {
+@@ -235,6 +236,18 @@ static const struct regval ov9281_1280x8
  	{REG_NULL, 0x00},
  };
  
@@ -86,7 +84,7 @@ index 837b37198bb4..05cf78416bc7 100644
  static const struct ov9281_mode supported_modes[] = {
  	{
  		.width = 1280,
-@@ -374,12 +387,13 @@ static int ov9281_set_fmt(struct v4l2_subdev *sd,
+@@ -374,12 +387,13 @@ static int ov9281_set_fmt(struct v4l2_su
  {
  	struct ov9281 *ov9281 = to_ov9281(sd);
  	const struct ov9281_mode *mode;
@@ -102,7 +100,7 @@ index 837b37198bb4..05cf78416bc7 100644
  	fmt->format.width = mode->width;
  	fmt->format.height = mode->height;
  	fmt->format.field = V4L2_FIELD_NONE;
-@@ -396,6 +410,7 @@ static int ov9281_set_fmt(struct v4l2_subdev *sd,
+@@ -396,6 +410,7 @@ static int ov9281_set_fmt(struct v4l2_su
  		*v4l2_subdev_get_try_format(sd, cfg, fmt->pad) = fmt->format;
  	} else {
  		ov9281->cur_mode = mode;
@@ -110,7 +108,7 @@ index 837b37198bb4..05cf78416bc7 100644
  		h_blank = mode->hts_def - mode->width;
  		__v4l2_ctrl_modify_range(ov9281->hblank, h_blank,
  					 h_blank, 1, h_blank);
-@@ -405,6 +420,11 @@ static int ov9281_set_fmt(struct v4l2_subdev *sd,
+@@ -405,6 +420,11 @@ static int ov9281_set_fmt(struct v4l2_su
  					 OV9281_VTS_MAX - mode->height,
  					 1, vblank_def);
  		__v4l2_ctrl_s_ctrl(ov9281->vblank, vblank_def);
@@ -122,7 +120,7 @@ index 837b37198bb4..05cf78416bc7 100644
  	}
  
  	mutex_unlock(&ov9281->mutex);
-@@ -425,7 +445,7 @@ static int ov9281_get_fmt(struct v4l2_subdev *sd,
+@@ -425,7 +445,7 @@ static int ov9281_get_fmt(struct v4l2_su
  	} else {
  		fmt->format.width = mode->width;
  		fmt->format.height = mode->height;
@@ -131,7 +129,7 @@ index 837b37198bb4..05cf78416bc7 100644
  		fmt->format.field = V4L2_FIELD_NONE;
  		fmt->format.colorspace = V4L2_COLORSPACE_SRGB;
  		fmt->format.ycbcr_enc =
-@@ -446,9 +466,16 @@ static int ov9281_enum_mbus_code(struct v4l2_subdev *sd,
+@@ -446,9 +466,16 @@ static int ov9281_enum_mbus_code(struct
  				 struct v4l2_subdev_pad_config *cfg,
  				 struct v4l2_subdev_mbus_code_enum *code)
  {
@@ -150,7 +148,7 @@ index 837b37198bb4..05cf78416bc7 100644
  
  	return 0;
  }
-@@ -460,7 +487,8 @@ static int ov9281_enum_frame_sizes(struct v4l2_subdev *sd,
+@@ -460,7 +487,8 @@ static int ov9281_enum_frame_sizes(struc
  	if (fse->index >= ARRAY_SIZE(supported_modes))
  		return -EINVAL;
  
@@ -160,7 +158,7 @@ index 837b37198bb4..05cf78416bc7 100644
  		return -EINVAL;
  
  	fse->min_width  = supported_modes[fse->index].width;
-@@ -543,6 +571,13 @@ static int __ov9281_start_stream(struct ov9281 *ov9281)
+@@ -543,6 +571,13 @@ static int __ov9281_start_stream(struct
  	if (ret)
  		return ret;
  
@@ -174,7 +172,7 @@ index 837b37198bb4..05cf78416bc7 100644
  	/* In case these controls are set before streaming */
  	mutex_unlock(&ov9281->mutex);
  	ret = v4l2_ctrl_handler_setup(&ov9281->ctrl_handler);
-@@ -849,8 +884,11 @@ static int ov9281_initialize_controls(struct ov9281 *ov9281)
+@@ -849,8 +884,11 @@ static int ov9281_initialize_controls(st
  	if (ctrl)
  		ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
  
@@ -188,6 +186,3 @@ index 837b37198bb4..05cf78416bc7 100644
  
  	h_blank = mode->hts_def - mode->width;
  	ov9281->hblank = v4l2_ctrl_new_std(handler, NULL, V4L2_CID_HBLANK,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0382-media-ov9281-Add-1280x720-and-640x480-modes.patch b/root/target/linux/bcm27xx/patches-5.15/950-0370-media-ov9281-Add-1280x720-and-640x480-modes.patch
similarity index 87%
rename from root/target/linux/bcm27xx/patches-5.15/0382-media-ov9281-Add-1280x720-and-640x480-modes.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0370-media-ov9281-Add-1280x720-and-640x480-modes.patch
index 6ceac52e..5aa2efbd 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0382-media-ov9281-Add-1280x720-and-640x480-modes.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0370-media-ov9281-Add-1280x720-and-640x480-modes.patch
@@ -1,7 +1,7 @@
-From 942dfbc97fd31e1768c5b36c00d34835f2c6fb30 Mon Sep 17 00:00:00 2001
+From c2ead98437d94788de4a1f0a7f4bdb168ca1d2b3 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Sun, 22 Nov 2020 11:01:08 +0000
-Subject: [PATCH 382/634] media: ov9281: Add 1280x720 and 640x480 modes
+Subject: [PATCH 370/828] media: ov9281: Add 1280x720 and 640x480 modes
 
 Breaks out common register set and adds the different registers
 for 1280x720 (cropped) and 640x480 (skipped) modes
@@ -11,8 +11,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/ov9281.c | 146 ++++++++++++++++++++++++++++++++-----
  1 file changed, 126 insertions(+), 20 deletions(-)
 
-diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-index 05cf78416bc7..132cbf6aad8a 100644
 --- a/drivers/media/i2c/ov9281.c
 +++ b/drivers/media/i2c/ov9281.c
 @@ -139,7 +139,7 @@ struct ov9281 {
@@ -24,7 +22,7 @@ index 05cf78416bc7..132cbf6aad8a 100644
  	{0x0103, 0x01},
  	{0x0302, 0x32},
  	{0x030e, 0x02},
-@@ -177,13 +177,35 @@ static const struct regval ov9281_1280x800_regs[] = {
+@@ -177,13 +177,35 @@ static const struct regval ov9281_1280x8
  	{0x372d, 0x22},
  	{0x3731, 0x80},
  	{0x3732, 0x30},
@@ -61,7 +59,7 @@ index 05cf78416bc7..132cbf6aad8a 100644
  	{0x3800, 0x00},
  	{0x3801, 0x00},
  	{0x3802, 0x00},
-@@ -208,31 +230,83 @@ static const struct regval ov9281_1280x800_regs[] = {
+@@ -208,31 +230,83 @@ static const struct regval ov9281_1280x8
  	{0x3815, 0x11},
  	{0x3820, 0x40},
  	{0x3821, 0x00},
@@ -163,7 +161,7 @@ index 05cf78416bc7..132cbf6aad8a 100644
  	{REG_NULL, 0x00},
  };
  
-@@ -263,6 +337,34 @@ static const struct ov9281_mode supported_modes[] = {
+@@ -263,6 +337,34 @@ static const struct ov9281_mode supporte
  		},
  		.reg_list = ov9281_1280x800_regs,
  	},
@@ -198,7 +196,7 @@ index 05cf78416bc7..132cbf6aad8a 100644
  };
  
  static const s64 link_freq_menu_items[] = {
-@@ -567,6 +669,10 @@ static int __ov9281_start_stream(struct ov9281 *ov9281)
+@@ -567,6 +669,10 @@ static int __ov9281_start_stream(struct
  {
  	int ret;
  
@@ -209,6 +207,3 @@ index 05cf78416bc7..132cbf6aad8a 100644
  	ret = ov9281_write_array(ov9281->client, ov9281->cur_mode->reg_list);
  	if (ret)
  		return ret;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0383-Fixed-picture-line-bug-in-all-ov9281-modes.patch b/root/target/linux/bcm27xx/patches-5.15/950-0371-Fixed-picture-line-bug-in-all-ov9281-modes.patch
similarity index 61%
rename from root/target/linux/bcm27xx/patches-5.15/0383-Fixed-picture-line-bug-in-all-ov9281-modes.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0371-Fixed-picture-line-bug-in-all-ov9281-modes.patch
index a43b26e9..fc6651f0 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0383-Fixed-picture-line-bug-in-all-ov9281-modes.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0371-Fixed-picture-line-bug-in-all-ov9281-modes.patch
@@ -1,18 +1,16 @@
-From 458a1aa472ff770981138b7ea0c4711d11b9370b Mon Sep 17 00:00:00 2001
+From 9304a59a5224e9990944887f9cb3e1014cad64e1 Mon Sep 17 00:00:00 2001
 From: Mathias Anhalt <mathiasanhalt@web.de>
 Date: Sun, 24 Jan 2021 15:15:01 +0100
-Subject: [PATCH 383/634] Fixed picture line bug in all ov9281 modes
+Subject: [PATCH 371/828] Fixed picture line bug in all ov9281 modes
 
 Signed-off-by: Mathias Anhalt <mathiasanhalt@web.de>
 ---
  drivers/media/i2c/ov9281.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-index 132cbf6aad8a..eff9bc356326 100644
 --- a/drivers/media/i2c/ov9281.c
 +++ b/drivers/media/i2c/ov9281.c
-@@ -205,7 +205,7 @@ static const struct regval ov9281_common_regs[] = {
+@@ -205,7 +205,7 @@ static const struct regval ov9281_common
  };
  
  static const struct regval ov9281_1280x800_regs[] = {
@@ -21,7 +19,7 @@ index 132cbf6aad8a..eff9bc356326 100644
  	{0x3800, 0x00},
  	{0x3801, 0x00},
  	{0x3802, 0x00},
-@@ -241,7 +241,7 @@ static const struct regval ov9281_1280x800_regs[] = {
+@@ -241,7 +241,7 @@ static const struct regval ov9281_1280x8
  };
  
  static const struct regval ov9281_1280x720_regs[] = {
@@ -30,7 +28,7 @@ index 132cbf6aad8a..eff9bc356326 100644
  	{0x3800, 0x00},
  	{0x3801, 0x00},
  	{0x3802, 0x00},
-@@ -277,6 +277,7 @@ static const struct regval ov9281_1280x720_regs[] = {
+@@ -277,6 +277,7 @@ static const struct regval ov9281_1280x7
  };
  
  static const struct regval ov9281_640x400_regs[] = {
@@ -38,6 +36,3 @@ index 132cbf6aad8a..eff9bc356326 100644
  	{0x3800, 0x00},
  	{0x3801, 0x00},
  	{0x3802, 0x00},
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0384-Added-hflip-and-vflip-controls-to-ov9281.patch b/root/target/linux/bcm27xx/patches-5.15/950-0372-Added-hflip-and-vflip-controls-to-ov9281.patch
similarity index 84%
rename from root/target/linux/bcm27xx/patches-5.15/0384-Added-hflip-and-vflip-controls-to-ov9281.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0372-Added-hflip-and-vflip-controls-to-ov9281.patch
index 13e318d1..1d07b7d0 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0384-Added-hflip-and-vflip-controls-to-ov9281.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0372-Added-hflip-and-vflip-controls-to-ov9281.patch
@@ -1,15 +1,13 @@
-From c023482e2016912e0f7f95930526495511850d2c Mon Sep 17 00:00:00 2001
+From 82742456857e637aa8b336f3fcffd4dcd6080951 Mon Sep 17 00:00:00 2001
 From: Mathias Anhalt <mathiasanhalt@web.de>
 Date: Wed, 3 Feb 2021 20:34:09 +0100
-Subject: [PATCH 384/634] Added hflip and vflip controls to ov9281
+Subject: [PATCH 372/828] Added hflip and vflip controls to ov9281
 
 Signed-off-by: Mathias Anhalt <mathiasanhalt@web.de>
 ---
  drivers/media/i2c/ov9281.c | 58 +++++++++++++++++++++++++++++++++++++-
  1 file changed, 57 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-index eff9bc356326..8d799b8b53c6 100644
 --- a/drivers/media/i2c/ov9281.c
 +++ b/drivers/media/i2c/ov9281.c
 @@ -40,6 +40,10 @@
@@ -32,7 +30,7 @@ index eff9bc356326..8d799b8b53c6 100644
  	struct v4l2_ctrl	*pixel_rate;
  	struct v4l2_ctrl	*test_pattern;
  	struct mutex		mutex;
-@@ -615,6 +621,42 @@ static int ov9281_enable_test_pattern(struct ov9281 *ov9281, u32 pattern)
+@@ -615,6 +621,42 @@ static int ov9281_enable_test_pattern(st
  				OV9281_REG_VALUE_08BIT, val);
  }
  
@@ -75,7 +73,7 @@ index eff9bc356326..8d799b8b53c6 100644
  static const struct v4l2_rect *
  __ov9281_get_pad_crop(struct ov9281 *ov9281, struct v4l2_subdev_pad_config *cfg,
  		      unsigned int pad, enum v4l2_subdev_format_whence which)
-@@ -933,6 +975,12 @@ static int ov9281_set_ctrl(struct v4l2_ctrl *ctrl)
+@@ -933,6 +975,12 @@ static int ov9281_set_ctrl(struct v4l2_c
  		return 0;
  
  	switch (ctrl->id) {
@@ -88,7 +86,7 @@ index eff9bc356326..8d799b8b53c6 100644
  	case V4L2_CID_EXPOSURE:
  		/* 4 least significant bits of expsoure are fractional part */
  		ret = ov9281_write_reg(ov9281->client, OV9281_REG_EXPOSURE,
-@@ -981,7 +1029,7 @@ static int ov9281_initialize_controls(struct ov9281 *ov9281)
+@@ -981,7 +1029,7 @@ static int ov9281_initialize_controls(st
  
  	handler = &ov9281->ctrl_handler;
  	mode = ov9281->cur_mode;
@@ -97,7 +95,7 @@ index eff9bc356326..8d799b8b53c6 100644
  	if (ret)
  		return ret;
  	handler->lock = &ov9281->mutex;
-@@ -1022,6 +1070,14 @@ static int ov9281_initialize_controls(struct ov9281 *ov9281)
+@@ -1022,6 +1070,14 @@ static int ov9281_initialize_controls(st
  					      OV9281_GAIN_STEP,
  					      OV9281_GAIN_DEFAULT);
  
@@ -112,6 +110,3 @@ index eff9bc356326..8d799b8b53c6 100644
  	ov9281->test_pattern =
  		v4l2_ctrl_new_std_menu_items(handler, &ov9281_ctrl_ops,
  					     V4L2_CID_TEST_PATTERN,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0385-media-ov5647-Fix-return-codes-from-ov5647_write-ov56.patch b/root/target/linux/bcm27xx/patches-5.15/950-0373-media-ov5647-Fix-return-codes-from-ov5647_write-ov56.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0385-media-ov5647-Fix-return-codes-from-ov5647_write-ov56.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0373-media-ov5647-Fix-return-codes-from-ov5647_write-ov56.patch
index 2a1f3bb4..3030ae02 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0385-media-ov5647-Fix-return-codes-from-ov5647_write-ov56.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0373-media-ov5647-Fix-return-codes-from-ov5647_write-ov56.patch
@@ -1,7 +1,7 @@
-From f4fb1d497b631bb0025d2e8271f9924a57859796 Mon Sep 17 00:00:00 2001
+From 098db1e933ceceb405a1c92154d97f65c045588d Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.org>
 Date: Wed, 15 Jan 2020 13:40:38 +0000
-Subject: [PATCH 385/634] media: ov5647: Fix return codes from
+Subject: [PATCH 373/828] media: ov5647: Fix return codes from
  ov5647_write/ov5647_read functions.
 
 Previously they were returning positive non-zero codes for success,
@@ -16,11 +16,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  drivers/media/i2c/ov5647.c | 38 ++++++++++++++++++++++++++++++++------
  1 file changed, 32 insertions(+), 6 deletions(-)
 
-diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index d346d18ce629..c5c68ec75473 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
-@@ -587,7 +587,13 @@ static int ov5647_write16(struct v4l2_subdev *sd, u16 reg, u16 val)
+@@ -587,7 +587,13 @@ static int ov5647_write16(struct v4l2_su
  	int ret;
  
  	ret = i2c_master_send(client, data, 4);
@@ -35,7 +33,7 @@ index d346d18ce629..c5c68ec75473 100644
  		dev_dbg(&client->dev, "%s: i2c write error, reg: %x\n",
  			__func__, reg);
  		return ret;
-@@ -603,10 +609,17 @@ static int ov5647_write(struct v4l2_subdev *sd, u16 reg, u8 val)
+@@ -603,10 +609,17 @@ static int ov5647_write(struct v4l2_subd
  	int ret;
  
  	ret = i2c_master_send(client, data, 3);
@@ -55,7 +53,7 @@ index d346d18ce629..c5c68ec75473 100644
  	}
  
  	return 0;
-@@ -619,17 +632,30 @@ static int ov5647_read(struct v4l2_subdev *sd, u16 reg, u8 *val)
+@@ -619,17 +632,30 @@ static int ov5647_read(struct v4l2_subde
  	int ret;
  
  	ret = i2c_master_send(client, data_w, 2);
@@ -89,6 +87,3 @@ index d346d18ce629..c5c68ec75473 100644
  	}
  
  	return 0;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0386-media-i2c-ov5647-Parse-and-register-properties.patch b/root/target/linux/bcm27xx/patches-5.15/950-0374-media-i2c-ov5647-Parse-and-register-properties.patch
similarity index 75%
rename from root/target/linux/bcm27xx/patches-5.15/0386-media-i2c-ov5647-Parse-and-register-properties.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0374-media-i2c-ov5647-Parse-and-register-properties.patch
index f3d7269d..d79a57e1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0386-media-i2c-ov5647-Parse-and-register-properties.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0374-media-i2c-ov5647-Parse-and-register-properties.patch
@@ -1,7 +1,7 @@
-From 8e7820617c3e2cd87f21a95c84f1b6f54b8122ce Mon Sep 17 00:00:00 2001
+From c7348009bf80b03ff6ad58c2ec7bdb607531bb3f Mon Sep 17 00:00:00 2001
 From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 Date: Sat, 4 Jul 2020 01:45:08 +0300
-Subject: [PATCH 386/634] media: i2c: ov5647: Parse and register properties
+Subject: [PATCH 374/828] media: i2c: ov5647: Parse and register properties
 
 Parse device properties and register controls for them using the V4L2
 fwnode properties helpers.
@@ -11,11 +11,9 @@ Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  drivers/media/i2c/ov5647.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index c5c68ec75473..9158f44ec822 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
-@@ -1291,10 +1291,11 @@ static const struct v4l2_ctrl_ops ov5647_ctrl_ops = {
+@@ -1291,10 +1291,11 @@ static const struct v4l2_ctrl_ops ov5647
  	.s_ctrl = ov5647_s_ctrl,
  };
  
@@ -28,7 +26,7 @@ index c5c68ec75473..9158f44ec822 100644
  
  	v4l2_ctrl_handler_init(&sensor->ctrls, 8);
  
-@@ -1340,6 +1341,11 @@ static int ov5647_init_controls(struct ov5647 *sensor)
+@@ -1340,6 +1341,11 @@ static int ov5647_init_controls(struct o
  					   sensor->mode->vts -
  					   sensor->mode->format.height);
  
@@ -40,7 +38,7 @@ index c5c68ec75473..9158f44ec822 100644
  	if (sensor->ctrls.error)
  		goto handler_free;
  
-@@ -1426,7 +1432,7 @@ static int ov5647_probe(struct i2c_client *client)
+@@ -1426,7 +1432,7 @@ static int ov5647_probe(struct i2c_clien
  
  	sensor->mode = OV5647_DEFAULT_MODE;
  
@@ -49,6 +47,3 @@ index c5c68ec75473..9158f44ec822 100644
  	if (ret)
  		goto mutex_destroy;
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0387-clk-raspberrypi-Also-support-HEVC-clock.patch b/root/target/linux/bcm27xx/patches-5.15/950-0375-clk-raspberrypi-Also-support-HEVC-clock.patch
similarity index 60%
rename from root/target/linux/bcm27xx/patches-5.15/0387-clk-raspberrypi-Also-support-HEVC-clock.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0375-clk-raspberrypi-Also-support-HEVC-clock.patch
index 23fcdfad..cf4ef22d 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0387-clk-raspberrypi-Also-support-HEVC-clock.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0375-clk-raspberrypi-Also-support-HEVC-clock.patch
@@ -1,18 +1,16 @@
-From 3add72e3b7f3abef17273519aed82fb02d0b369c Mon Sep 17 00:00:00 2001
+From 44464a54f3599b683423fca38d59d21f40d8bc5f Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Mon, 22 Feb 2021 18:47:19 +0000
-Subject: [PATCH 387/634] clk-raspberrypi: Also support HEVC clock
+Subject: [PATCH 375/828] clk-raspberrypi: Also support HEVC clock
 
 Signed-off-by: Dom Cobley <popcornmix@gmail.com>
 ---
  drivers/clk/bcm/clk-raspberrypi.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 19f4e3b7b190..1e1bee7f43ed 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
-@@ -271,6 +271,7 @@ static int raspberrypi_discover_clocks(struct raspberrypi_clk *rpi,
+@@ -271,6 +271,7 @@ static int raspberrypi_discover_clocks(s
  		case RPI_FIRMWARE_CORE_CLK_ID:
  		case RPI_FIRMWARE_M2MC_CLK_ID:
  		case RPI_FIRMWARE_V3D_CLK_ID:
@@ -20,6 +18,3 @@ index 19f4e3b7b190..1e1bee7f43ed 100644
  		case RPI_FIRMWARE_PIXEL_BVB_CLK_ID:
  			hw = raspberrypi_clk_register(rpi, clks->parent,
  						      clks->id);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0388-rpivid-Request-maximum-hevc-clock.patch b/root/target/linux/bcm27xx/patches-5.15/950-0376-rpivid-Request-maximum-hevc-clock.patch
similarity index 71%
rename from root/target/linux/bcm27xx/patches-5.15/0388-rpivid-Request-maximum-hevc-clock.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0376-rpivid-Request-maximum-hevc-clock.patch
index 913a1ad3..21650fb7 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0388-rpivid-Request-maximum-hevc-clock.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0376-rpivid-Request-maximum-hevc-clock.patch
@@ -1,7 +1,7 @@
-From 5bee2922512516d8ba3ea4d009cb40975d2230f0 Mon Sep 17 00:00:00 2001
+From b27f90cba569d38878e5a464243c93a634ad97cf Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Mon, 22 Feb 2021 18:50:50 +0000
-Subject: [PATCH 388/634] rpivid: Request maximum hevc clock
+Subject: [PATCH 376/828] rpivid: Request maximum hevc clock
 
 Query maximum and minimum clock from driver
 and use those
@@ -11,11 +11,9 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  drivers/staging/media/rpivid/rpivid_video.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid_video.c b/drivers/staging/media/rpivid/rpivid_video.c
-index 3b9e51ca05b3..b377c17dfb21 100644
 --- a/drivers/staging/media/rpivid/rpivid_video.c
 +++ b/drivers/staging/media/rpivid/rpivid_video.c
-@@ -490,6 +490,7 @@ static int rpivid_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -490,6 +490,7 @@ static int rpivid_start_streaming(struct
  {
  	struct rpivid_ctx *ctx = vb2_get_drv_priv(vq);
  	struct rpivid_dev *dev = ctx->dev;
@@ -23,7 +21,7 @@ index 3b9e51ca05b3..b377c17dfb21 100644
  	int ret = 0;
  
  	if (ctx->src_fmt.pixelformat != V4L2_PIX_FMT_HEVC_SLICE)
-@@ -498,7 +499,7 @@ static int rpivid_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -498,7 +499,7 @@ static int rpivid_start_streaming(struct
  	if (V4L2_TYPE_IS_OUTPUT(vq->type) && dev->dec_ops->start)
  		ret = dev->dec_ops->start(ctx);
  
@@ -32,7 +30,7 @@ index 3b9e51ca05b3..b377c17dfb21 100644
  	if (ret) {
  		dev_err(dev->dev, "Failed to set clock rate\n");
  		goto out;
-@@ -519,12 +520,18 @@ static void rpivid_stop_streaming(struct vb2_queue *vq)
+@@ -519,12 +520,18 @@ static void rpivid_stop_streaming(struct
  {
  	struct rpivid_ctx *ctx = vb2_get_drv_priv(vq);
  	struct rpivid_dev *dev = ctx->dev;
@@ -51,6 +49,3 @@ index 3b9e51ca05b3..b377c17dfb21 100644
  	clk_disable_unprepare(dev->clock);
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0389-staging-bcm2835-camera-Add-support-for-DMABUFs.patch b/root/target/linux/bcm27xx/patches-5.15/950-0377-staging-bcm2835-camera-Add-support-for-DMABUFs.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0389-staging-bcm2835-camera-Add-support-for-DMABUFs.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0377-staging-bcm2835-camera-Add-support-for-DMABUFs.patch
index c06b1ea2..577ddee3 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0389-staging-bcm2835-camera-Add-support-for-DMABUFs.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0377-staging-bcm2835-camera-Add-support-for-DMABUFs.patch
@@ -1,7 +1,7 @@
-From f1253364f46146fdc700c212c0dd8ed6ab38174e Mon Sep 17 00:00:00 2001
+From b7cf3d550a53c3b1731a2b957f37229851ffe4cf Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 17 Mar 2021 12:34:57 +0000
-Subject: [PATCH 389/634] staging/bcm2835-camera: Add support for DMABUFs
+Subject: [PATCH 377/828] staging/bcm2835-camera: Add support for DMABUFs
 
 DMABUFs are all handled by videobuf2, so there is no reason not
 to enable support for them.
@@ -16,11 +16,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-index 5d14ddb28339..0a8721eaa6d3 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-@@ -1453,6 +1453,7 @@ static const struct v4l2_ioctl_ops camera0_ioctl_ops = {
+@@ -1453,6 +1453,7 @@ static const struct v4l2_ioctl_ops camer
  	.vidioc_querybuf = vb2_ioctl_querybuf,
  	.vidioc_qbuf = vb2_ioctl_qbuf,
  	.vidioc_dqbuf = vb2_ioctl_dqbuf,
@@ -28,7 +26,7 @@ index 5d14ddb28339..0a8721eaa6d3 100644
  	.vidioc_enum_framesizes = vidioc_enum_framesizes,
  	.vidioc_enum_frameintervals = vidioc_enum_frameintervals,
  	.vidioc_g_parm        = vidioc_g_parm,
-@@ -1934,7 +1935,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev)
+@@ -1934,7 +1935,7 @@ static int bcm2835_mmal_probe(struct pla
  		q = &dev->capture.vb_vidq;
  		memset(q, 0, sizeof(*q));
  		q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -37,6 +35,3 @@ index 5d14ddb28339..0a8721eaa6d3 100644
  		q->drv_priv = dev;
  		q->buf_struct_size = sizeof(struct vb2_mmal_buffer);
  		q->ops = &bm2835_mmal_video_qops;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0390-staging-fbtft-Add-minipitft13-variant.patch b/root/target/linux/bcm27xx/patches-5.15/950-0378-staging-fbtft-Add-minipitft13-variant.patch
similarity index 84%
rename from root/target/linux/bcm27xx/patches-5.15/0390-staging-fbtft-Add-minipitft13-variant.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0378-staging-fbtft-Add-minipitft13-variant.patch
index 32921936..5423cfab 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0390-staging-fbtft-Add-minipitft13-variant.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0378-staging-fbtft-Add-minipitft13-variant.patch
@@ -1,7 +1,7 @@
-From b587812004d1b7a8588a80f7daaa1a4d8b34a931 Mon Sep 17 00:00:00 2001
+From dd270ca299c466da6adecffe1bef2c639f040325 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Fri, 19 Feb 2021 10:25:01 +0000
-Subject: [PATCH 390/634] staging: fbtft: Add minipitft13 variant
+Subject: [PATCH 378/828] staging: fbtft: Add minipitft13 variant
 
 The Adafruit Mini-PiTFT13 display needs offsets applying when rotated,
 so use the "variant" mechanism to select a custom set_addr_win method
@@ -14,8 +14,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/staging/fbtft/fb_st7789v.c | 44 +++++++++++++++++++++++++++++-
  1 file changed, 43 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/staging/fbtft/fb_st7789v.c b/drivers/staging/fbtft/fb_st7789v.c
-index abe9395a0aef..b707c94d6a49 100644
 --- a/drivers/staging/fbtft/fb_st7789v.c
 +++ b/drivers/staging/fbtft/fb_st7789v.c
 @@ -75,6 +75,11 @@ enum st7789v_command {
@@ -30,7 +28,7 @@ index abe9395a0aef..b707c94d6a49 100644
  
  static irqreturn_t panel_te_handler(int irq, void *data)
  {
-@@ -259,6 +264,22 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
+@@ -261,6 +266,22 @@ static int write_vmem(struct fbtft_par *
  	return ret;
  }
  
@@ -53,7 +51,7 @@ index abe9395a0aef..b707c94d6a49 100644
  /**
   * set_var() - apply LCD properties like rotation and BGR mode
   *
-@@ -269,20 +290,32 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
+@@ -271,20 +292,32 @@ static int write_vmem(struct fbtft_par *
  static int set_var(struct fbtft_par *par)
  {
  	u8 madctl_par = 0;
@@ -86,7 +84,7 @@ index abe9395a0aef..b707c94d6a49 100644
  		break;
  	default:
  		return -EINVAL;
-@@ -380,7 +413,16 @@ static struct fbtft_display display = {
+@@ -382,7 +415,16 @@ static struct fbtft_display display = {
  	},
  };
  
@@ -104,6 +102,3 @@ index abe9395a0aef..b707c94d6a49 100644
  
  MODULE_ALIAS("spi:" DRVNAME);
  MODULE_ALIAS("platform:" DRVNAME);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0391-dwc-otg-fix-clang-Wignored-attributes-warning.patch b/root/target/linux/bcm27xx/patches-5.15/950-0379-dwc-otg-fix-clang-Wignored-attributes-warning.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0391-dwc-otg-fix-clang-Wignored-attributes-warning.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0379-dwc-otg-fix-clang-Wignored-attributes-warning.patch
index 8d60190f..915a3be3 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0391-dwc-otg-fix-clang-Wignored-attributes-warning.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0379-dwc-otg-fix-clang-Wignored-attributes-warning.patch
@@ -1,15 +1,13 @@
-From c8a0bfcb97e78ea5c05555827feb8fcd07195b61 Mon Sep 17 00:00:00 2001
+From e0e4fd59f468589ab3810d051e495206877e3341 Mon Sep 17 00:00:00 2001
 From: Jo Henke <37883863+jo-he@users.noreply.github.com>
 Date: Tue, 6 Apr 2021 11:21:35 +0000
-Subject: [PATCH 391/634] dwc-otg: fix clang -Wignored-attributes warning
+Subject: [PATCH 379/828] dwc-otg: fix clang -Wignored-attributes warning
 
 warning: attribute declaration must precede definition
 ---
  drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h
-index 537cc237b4bc..86b4aaf977fb 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h
 @@ -255,17 +255,17 @@ struct fiq_dma_info {
@@ -36,6 +34,3 @@ index 537cc237b4bc..86b4aaf977fb 100644
  
  /**
   * struct fiq_hs_isoc_info - USB2.0 isochronous data
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0392-dwc-otg-fix-clang-Wsometimes-uninitialized-warning.patch b/root/target/linux/bcm27xx/patches-5.15/950-0380-dwc-otg-fix-clang-Wsometimes-uninitialized-warning.patch
similarity index 63%
rename from root/target/linux/bcm27xx/patches-5.15/0392-dwc-otg-fix-clang-Wsometimes-uninitialized-warning.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0380-dwc-otg-fix-clang-Wsometimes-uninitialized-warning.patch
index 6896ab39..818bca7e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0392-dwc-otg-fix-clang-Wsometimes-uninitialized-warning.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0380-dwc-otg-fix-clang-Wsometimes-uninitialized-warning.patch
@@ -1,18 +1,16 @@
-From 70d14890d30606fa74e33cc299bc5ececd96bf77 Mon Sep 17 00:00:00 2001
+From e59cb44fbec24bbec1e412bf848ddf16f3f1933d Mon Sep 17 00:00:00 2001
 From: Jo Henke <37883863+jo-he@users.noreply.github.com>
 Date: Tue, 6 Apr 2021 11:38:28 +0000
-Subject: [PATCH 392/634] dwc-otg: fix clang -Wsometimes-uninitialized warning
+Subject: [PATCH 380/828] dwc-otg: fix clang -Wsometimes-uninitialized warning
 
 warning: variable 'retval' is used uninitialized whenever 'if' condition is false
 ---
  drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c
-index 799ab14b9eda..e1c1e3804095 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c
-@@ -805,7 +805,7 @@ static int32_t dwc_otg_handle_pwrdn_session_change(dwc_otg_core_if_t * core_if)
+@@ -805,7 +805,7 @@ static int32_t dwc_otg_handle_pwrdn_sess
   */
  static uint32_t dwc_otg_handle_pwrdn_stschng_intr(dwc_otg_device_t *otg_dev)
  {
@@ -21,6 +19,3 @@ index 799ab14b9eda..e1c1e3804095 100644
  	gpwrdn_data_t gpwrdn = {.d32 = 0 };
  	gpwrdn_data_t gpwrdn_temp = {.d32 = 0 };
  	dwc_otg_core_if_t *core_if = otg_dev->core_if;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0393-dwc-otg-fix-clang-Wpointer-bool-conversion-warning.patch b/root/target/linux/bcm27xx/patches-5.15/950-0381-dwc-otg-fix-clang-Wpointer-bool-conversion-warning.patch
similarity index 68%
rename from root/target/linux/bcm27xx/patches-5.15/0393-dwc-otg-fix-clang-Wpointer-bool-conversion-warning.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0381-dwc-otg-fix-clang-Wpointer-bool-conversion-warning.patch
index f3a789a2..e184e8b8 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0393-dwc-otg-fix-clang-Wpointer-bool-conversion-warning.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0381-dwc-otg-fix-clang-Wpointer-bool-conversion-warning.patch
@@ -1,7 +1,7 @@
-From f794ae6f311859b1adf092b318a3946d65e74b46 Mon Sep 17 00:00:00 2001
+From 9a7b676f8ec8207e1b5be97a011c4c2cb44ce388 Mon Sep 17 00:00:00 2001
 From: Jo Henke <37883863+jo-he@users.noreply.github.com>
 Date: Tue, 6 Apr 2021 11:45:14 +0000
-Subject: [PATCH 393/634] dwc-otg: fix clang -Wpointer-bool-conversion warning
+Subject: [PATCH 381/828] dwc-otg: fix clang -Wpointer-bool-conversion warning
 
 warning: address of array 'desc->wMaxPacketSize' will always evaluate to 'true'
 
@@ -11,11 +11,9 @@ be accessed via the UGETW macro.
  drivers/usb/host/dwc_otg/dwc_otg_pcd.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd.c b/drivers/usb/host/dwc_otg/dwc_otg_pcd.c
-index 9dabbe5c9791..2ffd4f11d0bf 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_pcd.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd.c
-@@ -1487,7 +1487,7 @@ int dwc_otg_pcd_ep_enable(dwc_otg_pcd_t * pcd,
+@@ -1487,7 +1487,7 @@ int dwc_otg_pcd_ep_enable(dwc_otg_pcd_t
  	num = UE_GET_ADDR(desc->bEndpointAddress);
  	dir = UE_GET_DIR(desc->bEndpointAddress);
  
@@ -24,6 +22,3 @@ index 9dabbe5c9791..2ffd4f11d0bf 100644
  		DWC_WARN("bad maxpacketsize\n");
  		retval = -DWC_E_INVALID;
  		goto out;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0394-staging-vcsm-cma-Fix-memory-leak-from-not-detaching-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0382-staging-vcsm-cma-Fix-memory-leak-from-not-detaching-.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0394-staging-vcsm-cma-Fix-memory-leak-from-not-detaching-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0382-staging-vcsm-cma-Fix-memory-leak-from-not-detaching-.patch
index 5e20ae83..d8e99dbc 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0394-staging-vcsm-cma-Fix-memory-leak-from-not-detaching-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0382-staging-vcsm-cma-Fix-memory-leak-from-not-detaching-.patch
@@ -1,7 +1,7 @@
-From 685ff8207fa8ca247ab221b8b389c76188cafb47 Mon Sep 17 00:00:00 2001
+From d84da5c4120e98b2cc3d1565dcdfd22e5e643221 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 4 Nov 2020 18:54:20 +0000
-Subject: [PATCH 394/634] staging: vcsm-cma: Fix memory leak from not detaching
+Subject: [PATCH 382/828] staging: vcsm-cma: Fix memory leak from not detaching
  dmabuf
 
 When importing there was a missing call to detach the buffer,
@@ -16,11 +16,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../staging/vc04_services/vc-sm-cma/vc_sm.c   | 22 ++-----------------
  1 file changed, 2 insertions(+), 20 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
-index 40ce67f06fac..88c4df822922 100644
 --- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
-@@ -237,6 +237,7 @@ static void vc_sm_add_resource(struct vc_sm_privdata_t *privdata,
+@@ -237,6 +237,7 @@ static void vc_sm_add_resource(struct vc
  
  /*
   * Cleans up imported dmabuf.
@@ -28,7 +26,7 @@ index 40ce67f06fac..88c4df822922 100644
   */
  static void vc_sm_clean_up_dmabuf(struct vc_sm_buffer *buffer)
  {
-@@ -244,7 +245,6 @@ static void vc_sm_clean_up_dmabuf(struct vc_sm_buffer *buffer)
+@@ -244,7 +245,6 @@ static void vc_sm_clean_up_dmabuf(struct
  		return;
  
  	/* Handle cleaning up imported dmabufs */
@@ -36,7 +34,7 @@ index 40ce67f06fac..88c4df822922 100644
  	if (buffer->import.sgt) {
  		dma_buf_unmap_attachment(buffer->import.attach,
  					 buffer->import.sgt,
-@@ -255,7 +255,6 @@ static void vc_sm_clean_up_dmabuf(struct vc_sm_buffer *buffer)
+@@ -255,7 +255,6 @@ static void vc_sm_clean_up_dmabuf(struct
  		dma_buf_detach(buffer->dma_buf, buffer->import.attach);
  		buffer->import.attach = NULL;
  	}
@@ -44,11 +42,10 @@ index 40ce67f06fac..88c4df822922 100644
  }
  
  /*
-@@ -672,23 +671,6 @@ int vc_sm_import_dmabuf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma)
- 	return buf->import.dma_buf->ops->mmap(buf->import.dma_buf, vma);
+@@ -673,23 +672,6 @@ int vc_sm_import_dmabuf_mmap(struct dma_
  }
  
--static
+ static
 -void vc_sm_import_dma_buf_release(struct dma_buf *dmabuf)
 -{
 -	struct vc_sm_buffer *buf = dmabuf->priv;
@@ -65,10 +62,11 @@ index 40ce67f06fac..88c4df822922 100644
 -	vc_sm_release_resource(buf);
 -}
 -
- static
+-static
  int vc_sm_import_dma_buf_begin_cpu_access(struct dma_buf *dmabuf,
  					  enum dma_data_direction direction)
-@@ -717,7 +699,7 @@ static const struct dma_buf_ops dma_buf_import_ops = {
+ {
+@@ -717,7 +699,7 @@ static const struct dma_buf_ops dma_buf_
  	.map_dma_buf = vc_sm_import_map_dma_buf,
  	.unmap_dma_buf = vc_sm_import_unmap_dma_buf,
  	.mmap = vc_sm_import_dmabuf_mmap,
@@ -77,6 +75,3 @@ index 40ce67f06fac..88c4df822922 100644
  	.attach = vc_sm_import_dma_buf_attach,
  	.detach = vc_sm_import_dma_buf_detatch,
  	.begin_cpu_access = vc_sm_import_dma_buf_begin_cpu_access,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0395-clk-Introduce-a-clock-request-API.patch b/root/target/linux/bcm27xx/patches-5.15/950-0383-clk-Introduce-a-clock-request-API.patch
similarity index 87%
rename from root/target/linux/bcm27xx/patches-5.15/0395-clk-Introduce-a-clock-request-API.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0383-clk-Introduce-a-clock-request-API.patch
index 1d0682ff..b8cd8050 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0395-clk-Introduce-a-clock-request-API.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0383-clk-Introduce-a-clock-request-API.patch
@@ -1,7 +1,7 @@
-From 403461ed7d429bd97e506c026da32cb2b369a2d8 Mon Sep 17 00:00:00 2001
+From 187d21a84089cd0adcd6543a1738082b3f257973 Mon Sep 17 00:00:00 2001
 From: Maxime Ripard <maxime@cerno.tech>
 Date: Tue, 13 Apr 2021 11:00:01 +0200
-Subject: [PATCH 395/634] clk: Introduce a clock request API
+Subject: [PATCH 383/828] clk: Introduce a clock request API
 
 It's not unusual to find clocks being shared across multiple devices
 that need to change the rate depending on what the device is doing at a
@@ -45,8 +45,6 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  include/linux/clk.h |   4 ++
  2 files changed, 125 insertions(+)
 
-diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
-index 65508eb89ec9..0898c0f8959f 100644
 --- a/drivers/clk/clk.c
 +++ b/drivers/clk/clk.c
 @@ -77,12 +77,14 @@ struct clk_core {
@@ -77,7 +75,7 @@ index 65508eb89ec9..0898c0f8959f 100644
  /***           runtime pm          ***/
  static int clk_pm_runtime_get(struct clk_core *core)
  {
-@@ -1434,10 +1442,14 @@ unsigned long clk_hw_round_rate(struct clk_hw *hw, unsigned long rate)
+@@ -1452,10 +1460,14 @@ unsigned long clk_hw_round_rate(struct c
  {
  	int ret;
  	struct clk_rate_request req;
@@ -92,7 +90,7 @@ index 65508eb89ec9..0898c0f8959f 100644
  	ret = clk_core_round_rate_nolock(hw->core, &req);
  	if (ret)
  		return 0;
-@@ -1458,6 +1470,7 @@ EXPORT_SYMBOL_GPL(clk_hw_round_rate);
+@@ -1476,6 +1488,7 @@ EXPORT_SYMBOL_GPL(clk_hw_round_rate);
  long clk_round_rate(struct clk *clk, unsigned long rate)
  {
  	struct clk_rate_request req;
@@ -100,7 +98,7 @@ index 65508eb89ec9..0898c0f8959f 100644
  	int ret;
  
  	if (!clk)
-@@ -1471,6 +1484,9 @@ long clk_round_rate(struct clk *clk, unsigned long rate)
+@@ -1489,6 +1502,9 @@ long clk_round_rate(struct clk *clk, uns
  	clk_core_get_boundaries(clk->core, &req.min_rate, &req.max_rate);
  	req.rate = rate;
  
@@ -110,7 +108,7 @@ index 65508eb89ec9..0898c0f8959f 100644
  	ret = clk_core_round_rate_nolock(clk->core, &req);
  
  	if (clk->exclusive_count)
-@@ -1938,6 +1954,7 @@ static struct clk_core *clk_calc_new_rates(struct clk_core *core,
+@@ -1956,6 +1972,7 @@ static struct clk_core *clk_calc_new_rat
  	unsigned long new_rate;
  	unsigned long min_rate;
  	unsigned long max_rate;
@@ -118,7 +116,7 @@ index 65508eb89ec9..0898c0f8959f 100644
  	int p_index = 0;
  	long ret;
  
-@@ -1952,6 +1969,9 @@ static struct clk_core *clk_calc_new_rates(struct clk_core *core,
+@@ -1970,6 +1987,9 @@ static struct clk_core *clk_calc_new_rat
  
  	clk_core_get_boundaries(core, &min_rate, &max_rate);
  
@@ -128,7 +126,7 @@ index 65508eb89ec9..0898c0f8959f 100644
  	/* find the closest rate and parent clk/rate */
  	if (clk_core_can_round(core)) {
  		struct clk_rate_request req;
-@@ -2148,6 +2168,7 @@ static unsigned long clk_core_req_round_rate_nolock(struct clk_core *core,
+@@ -2166,6 +2186,7 @@ static unsigned long clk_core_req_round_
  {
  	int ret, cnt;
  	struct clk_rate_request req;
@@ -136,7 +134,7 @@ index 65508eb89ec9..0898c0f8959f 100644
  
  	lockdep_assert_held(&prepare_lock);
  
-@@ -2162,6 +2183,9 @@ static unsigned long clk_core_req_round_rate_nolock(struct clk_core *core,
+@@ -2180,6 +2201,9 @@ static unsigned long clk_core_req_round_
  	clk_core_get_boundaries(core, &req.min_rate, &req.max_rate);
  	req.rate = req_rate;
  
@@ -146,7 +144,7 @@ index 65508eb89ec9..0898c0f8959f 100644
  	ret = clk_core_round_rate_nolock(core, &req);
  
  	/* restore the protection */
-@@ -2255,6 +2279,9 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
+@@ -2273,6 +2297,9 @@ int clk_set_rate(struct clk *clk, unsign
  
  	ret = clk_core_set_rate_nolock(clk->core, rate);
  
@@ -156,11 +154,10 @@ index 65508eb89ec9..0898c0f8959f 100644
  	if (clk->exclusive_count)
  		clk_core_rate_protect(clk->core);
  
-@@ -2420,6 +2447,99 @@ int clk_set_max_rate(struct clk *clk, unsigned long rate)
- }
+@@ -2445,6 +2472,99 @@ int clk_set_max_rate(struct clk *clk, un
  EXPORT_SYMBOL_GPL(clk_set_max_rate);
  
-+/**
+ /**
 + * clk_request_start - Request a rate to be enforced temporarily
 + * @clk: the clk to act on
 + * @rate: the new rate asked for
@@ -253,10 +250,11 @@ index 65508eb89ec9..0898c0f8959f 100644
 +}
 +EXPORT_SYMBOL_GPL(clk_request_done);
 +
- /**
++/**
   * clk_get_parent - return the parent of a clk
   * @clk: the clk whose parent gets returned
-@@ -3851,6 +3971,7 @@ __clk_register(struct device *dev, struct device_node *np, struct clk_hw *hw)
+  *
+@@ -3916,6 +4036,7 @@ __clk_register(struct device *dev, struc
  		goto fail_parents;
  
  	INIT_HLIST_HEAD(&core->clks);
@@ -264,8 +262,6 @@ index 65508eb89ec9..0898c0f8959f 100644
  
  	/*
  	 * Don't call clk_hw_create_clk() here because that would pin the
-diff --git a/include/linux/clk.h b/include/linux/clk.h
-index 266e8de3cb51..2aa52140d8a9 100644
 --- a/include/linux/clk.h
 +++ b/include/linux/clk.h
 @@ -15,6 +15,7 @@
@@ -286,6 +282,3 @@ index 266e8de3cb51..2aa52140d8a9 100644
  #else /* !CONFIG_HAVE_CLK */
  
  static inline struct clk *clk_get(struct device *dev, const char *id)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0396-bcm2835-unicam-Switch-to-new-clock-api.patch b/root/target/linux/bcm27xx/patches-5.15/950-0384-bcm2835-unicam-Switch-to-new-clock-api.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0396-bcm2835-unicam-Switch-to-new-clock-api.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0384-bcm2835-unicam-Switch-to-new-clock-api.patch
index e90f4b4a..4eb9644d 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0396-bcm2835-unicam-Switch-to-new-clock-api.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0384-bcm2835-unicam-Switch-to-new-clock-api.patch
@@ -1,15 +1,13 @@
-From 3499aef8047bc1dab76ea05cf6ce2367f100ad31 Mon Sep 17 00:00:00 2001
+From c58701b09f3e29875ff7b1410420568be5bac012 Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Tue, 13 Apr 2021 16:48:35 +0100
-Subject: [PATCH 396/634] bcm2835-unicam: Switch to new clock api
+Subject: [PATCH 384/828] bcm2835-unicam: Switch to new clock api
 
 Signed-off-by: Dom Cobley <popcornmix@gmail.com>
 ---
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 13 ++++++-------
  1 file changed, 6 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index db99d1562904..a603891986b9 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -429,6 +429,8 @@ struct unicam_device {
@@ -21,7 +19,7 @@ index db99d1562904..a603891986b9 100644
  	/* clock status for error handling */
  	bool clocks_enabled;
  	/* V4l2 device */
-@@ -1694,8 +1696,8 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -1694,8 +1696,8 @@ static int unicam_start_streaming(struct
  	unicam_dbg(1, dev, "Running with %u data lanes\n",
  		   dev->active_data_lanes);
  
@@ -32,7 +30,7 @@ index db99d1562904..a603891986b9 100644
  		unicam_err(dev, "failed to set up VPU clock\n");
  		goto err_pm_put;
  	}
-@@ -1751,8 +1753,7 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -1751,8 +1753,7 @@ err_disable_unicam:
  	unicam_disable(dev);
  	clk_disable_unprepare(dev->clock);
  err_vpu_clock:
@@ -42,7 +40,7 @@ index db99d1562904..a603891986b9 100644
  	clk_disable_unprepare(dev->vpu_clock);
  err_pm_put:
  	unicam_runtime_put(dev);
-@@ -1782,9 +1783,7 @@ static void unicam_stop_streaming(struct vb2_queue *vq)
+@@ -1782,9 +1783,7 @@ static void unicam_stop_streaming(struct
  		unicam_disable(dev);
  
  		if (dev->clocks_enabled) {
@@ -53,6 +51,3 @@ index db99d1562904..a603891986b9 100644
  			clk_disable_unprepare(dev->vpu_clock);
  			clk_disable_unprepare(dev->clock);
  			dev->clocks_enabled = false;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0397-rpivid-Switch-to-new-clock-api.patch b/root/target/linux/bcm27xx/patches-5.15/950-0385-rpivid-Switch-to-new-clock-api.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0397-rpivid-Switch-to-new-clock-api.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0385-rpivid-Switch-to-new-clock-api.patch
index cc163df5..e13b4be3 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0397-rpivid-Switch-to-new-clock-api.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0385-rpivid-Switch-to-new-clock-api.patch
@@ -1,7 +1,7 @@
-From b52839b8820eb009df7768dc927f46379541ef12 Mon Sep 17 00:00:00 2001
+From aed19eb7b2d20b806c70352caa076fba8e1247cf Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Mon, 19 Apr 2021 19:30:26 +0100
-Subject: [PATCH 397/634] rpivid: Switch to new clock api
+Subject: [PATCH 385/828] rpivid: Switch to new clock api
 
 Signed-off-by: Dom Cobley <popcornmix@gmail.com>
 ---
@@ -9,8 +9,6 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  drivers/staging/media/rpivid/rpivid_video.c | 11 +++--------
  2 files changed, 4 insertions(+), 8 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid.h b/drivers/staging/media/rpivid/rpivid.h
-index 0e8280b803a3..f85cf9d08926 100644
 --- a/drivers/staging/media/rpivid/rpivid.h
 +++ b/drivers/staging/media/rpivid/rpivid.h
 @@ -172,6 +172,7 @@ struct rpivid_dev {
@@ -21,11 +19,9 @@ index 0e8280b803a3..f85cf9d08926 100644
  
  	struct rpivid_hw_irq_ctrl ic_active1;
  	struct rpivid_hw_irq_ctrl ic_active2;
-diff --git a/drivers/staging/media/rpivid/rpivid_video.c b/drivers/staging/media/rpivid/rpivid_video.c
-index b377c17dfb21..def891a86e55 100644
 --- a/drivers/staging/media/rpivid/rpivid_video.c
 +++ b/drivers/staging/media/rpivid/rpivid_video.c
-@@ -499,8 +499,8 @@ static int rpivid_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -499,8 +499,8 @@ static int rpivid_start_streaming(struct
  	if (V4L2_TYPE_IS_OUTPUT(vq->type) && dev->dec_ops->start)
  		ret = dev->dec_ops->start(ctx);
  
@@ -36,7 +32,7 @@ index b377c17dfb21..def891a86e55 100644
  		dev_err(dev->dev, "Failed to set clock rate\n");
  		goto out;
  	}
-@@ -520,18 +520,13 @@ static void rpivid_stop_streaming(struct vb2_queue *vq)
+@@ -520,18 +520,13 @@ static void rpivid_stop_streaming(struct
  {
  	struct rpivid_ctx *ctx = vb2_get_drv_priv(vq);
  	struct rpivid_dev *dev = ctx->dev;
@@ -56,6 +52,3 @@ index b377c17dfb21..def891a86e55 100644
  	clk_disable_unprepare(dev->clock);
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0398-rpivid-Only-clk_request_done-once.patch b/root/target/linux/bcm27xx/patches-5.15/950-0386-rpivid-Only-clk_request_done-once.patch
similarity index 63%
rename from root/target/linux/bcm27xx/patches-5.15/0398-rpivid-Only-clk_request_done-once.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0386-rpivid-Only-clk_request_done-once.patch
index 7997ec05..a35cd32c 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0398-rpivid-Only-clk_request_done-once.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0386-rpivid-Only-clk_request_done-once.patch
@@ -1,7 +1,7 @@
-From 676e10614333c9952c87cbdb98e798b7a13c1aef Mon Sep 17 00:00:00 2001
+From 06aecb19a287b6b6d2c2c41a031bb75c748d4554 Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Tue, 20 Apr 2021 13:34:18 +0100
-Subject: [PATCH 398/634] rpivid: Only clk_request_done once
+Subject: [PATCH 386/828] rpivid: Only clk_request_done once
 
 Fixes: 25486f49bfe2e3ae13b90478d1eebd91413136ad
 Signed-off-by: Dom Cobley <popcornmix@gmail.com>
@@ -9,11 +9,9 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  drivers/staging/media/rpivid/rpivid_video.c | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid_video.c b/drivers/staging/media/rpivid/rpivid_video.c
-index def891a86e55..37c8f62649d6 100644
 --- a/drivers/staging/media/rpivid/rpivid_video.c
 +++ b/drivers/staging/media/rpivid/rpivid_video.c
-@@ -526,7 +526,11 @@ static void rpivid_stop_streaming(struct vb2_queue *vq)
+@@ -526,7 +526,11 @@ static void rpivid_stop_streaming(struct
  
  	rpivid_queue_cleanup(vq, VB2_BUF_STATE_ERROR);
  
@@ -26,6 +24,3 @@ index def891a86e55..37c8f62649d6 100644
  	clk_disable_unprepare(dev->clock);
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0399-dwc_otg-fix-an-undeclared-variable.patch b/root/target/linux/bcm27xx/patches-5.15/950-0387-dwc_otg-fix-an-undeclared-variable-Replace-an-undecl.patch
similarity index 68%
rename from root/target/linux/bcm27xx/patches-5.15/0399-dwc_otg-fix-an-undeclared-variable.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0387-dwc_otg-fix-an-undeclared-variable-Replace-an-undecl.patch
index 4b72ad52..e02ac413 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0399-dwc_otg-fix-an-undeclared-variable.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0387-dwc_otg-fix-an-undeclared-variable-Replace-an-undecl.patch
@@ -1,7 +1,7 @@
-From d9add7cdbabe9d88523ff0b096ef93ae3c946cce Mon Sep 17 00:00:00 2001
+From fdb50a9171113b4f9fc7c1d04ec018ec945d9d9c Mon Sep 17 00:00:00 2001
 From: wangzx <593074943@qq.com>
 Date: Tue, 20 Apr 2021 22:33:26 +0800
-Subject: [PATCH 399/634] dwc_otg: fix an undeclared variable Replace an
+Subject: [PATCH 387/828] dwc_otg: fix an undeclared variable Replace an
  undeclared variable used by DWC_DEBUGPL with the real endpoint address.
  DWC_DEBUGPL does nothing with DEBUG undefined so it did not go wrong before.
  Signed-off-by: Zixuan Wang <wangzixuan@sjtu.edu.cn>
@@ -10,11 +10,9 @@ Subject: [PATCH 399/634] dwc_otg: fix an undeclared variable Replace an
  drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
-index 50c8705185ad..2ee27450c6f6 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
-@@ -1026,7 +1026,8 @@ static void endpoint_reset(struct usb_hcd *hcd, struct usb_host_endpoint *ep)
+@@ -1026,7 +1026,8 @@ static void endpoint_reset(struct usb_hc
  	dwc_irqflags_t flags;
  	dwc_otg_hcd_t *dwc_otg_hcd = hcd_to_dwc_otg_hcd(hcd);
  
@@ -24,6 +22,3 @@ index 50c8705185ad..2ee27450c6f6 100644
  
  	DWC_SPINLOCK_IRQSAVE(dwc_otg_hcd->lock, &flags);
  	if (ep->hcpriv) {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0400-drm-panel-jdi-lt070me05000-Use-gpiod_set_value_cansl.patch b/root/target/linux/bcm27xx/patches-5.15/950-0388-drm-panel-jdi-lt070me05000-Use-gpiod_set_value_cansl.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0400-drm-panel-jdi-lt070me05000-Use-gpiod_set_value_cansl.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0388-drm-panel-jdi-lt070me05000-Use-gpiod_set_value_cansl.patch
index c0c8fa4c..1856a938 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0400-drm-panel-jdi-lt070me05000-Use-gpiod_set_value_cansl.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0388-drm-panel-jdi-lt070me05000-Use-gpiod_set_value_cansl.patch
@@ -1,7 +1,7 @@
-From e44ed351c352f24a77818ae7185a5020ec440926 Mon Sep 17 00:00:00 2001
+From 598038f576cb619dfc4164e513b14b78aed79635 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 15 Apr 2021 17:30:35 +0100
-Subject: [PATCH 400/634] drm/panel: jdi-lt070me05000: Use
+Subject: [PATCH 388/828] drm/panel: jdi-lt070me05000: Use
  gpiod_set_value_cansleep
 
 There is no reason why the control GPIOs for the panel can not
@@ -16,11 +16,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
 
-diff --git a/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c b/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
-index 733010b5e4f5..7fb4d98e166d 100644
 --- a/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
 +++ b/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
-@@ -205,11 +205,11 @@ static int jdi_panel_unprepare(struct drm_panel *panel)
+@@ -205,11 +205,11 @@ static int jdi_panel_unprepare(struct dr
  	if (ret < 0)
  		dev_err(dev, "regulator disable failed, %d\n", ret);
  
@@ -35,7 +33,7 @@ index 733010b5e4f5..7fb4d98e166d 100644
  
  	jdi->prepared = false;
  
-@@ -233,13 +233,13 @@ static int jdi_panel_prepare(struct drm_panel *panel)
+@@ -233,13 +233,13 @@ static int jdi_panel_prepare(struct drm_
  
  	msleep(20);
  
@@ -52,7 +50,7 @@ index 733010b5e4f5..7fb4d98e166d 100644
  	usleep_range(10, 20);
  
  	ret = jdi_panel_init(jdi);
-@@ -263,11 +263,11 @@ static int jdi_panel_prepare(struct drm_panel *panel)
+@@ -263,11 +263,11 @@ poweroff:
  	if (ret < 0)
  		dev_err(dev, "regulator disable failed, %d\n", ret);
  
@@ -67,6 +65,3 @@ index 733010b5e4f5..7fb4d98e166d 100644
  
  	return ret;
  }
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0401-clk-requests-Ignore-if-the-pointer-is-null.patch b/root/target/linux/bcm27xx/patches-5.15/950-0389-clk-requests-Ignore-if-the-pointer-is-null.patch
similarity index 55%
rename from root/target/linux/bcm27xx/patches-5.15/0401-clk-requests-Ignore-if-the-pointer-is-null.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0389-clk-requests-Ignore-if-the-pointer-is-null.patch
index a030ca1e..30e2612f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0401-clk-requests-Ignore-if-the-pointer-is-null.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0389-clk-requests-Ignore-if-the-pointer-is-null.patch
@@ -1,18 +1,16 @@
-From 4cc73465decfa96f1042b005da313e1ff6b26be6 Mon Sep 17 00:00:00 2001
+From 667b13963a20d4790f1c49ffe8a841aead6a3ba2 Mon Sep 17 00:00:00 2001
 From: Maxime Ripard <maxime@cerno.tech>
 Date: Wed, 21 Apr 2021 12:14:44 +0200
-Subject: [PATCH 401/634] clk: requests: Ignore if the pointer is null
+Subject: [PATCH 389/828] clk: requests: Ignore if the pointer is null
 
 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 ---
  drivers/clk/clk.c | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
-index 0898c0f8959f..5a659cd1fccf 100644
 --- a/drivers/clk/clk.c
 +++ b/drivers/clk/clk.c
-@@ -2517,6 +2517,9 @@ void clk_request_done(struct clk_request *req)
+@@ -2541,6 +2541,9 @@ void clk_request_done(struct clk_request
  {
  	struct clk_core *core = req->clk->core;
  
@@ -22,6 +20,3 @@ index 0898c0f8959f..5a659cd1fccf 100644
  	clk_prepare_lock();
  
  	list_del(&req->list);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0402-clk-requests-Dereference-the-request-pointer-after-t.patch b/root/target/linux/bcm27xx/patches-5.15/950-0390-clk-requests-Dereference-the-request-pointer-after-t.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0402-clk-requests-Dereference-the-request-pointer-after-t.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0390-clk-requests-Dereference-the-request-pointer-after-t.patch
index 2b55e48d..8d2402e5 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0402-clk-requests-Dereference-the-request-pointer-after-t.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0390-clk-requests-Dereference-the-request-pointer-after-t.patch
@@ -1,7 +1,7 @@
-From 509be6584d717c5011f13890bd6a3ae015cf6366 Mon Sep 17 00:00:00 2001
+From 10cc1796f8986a0b41c01b14828c4767cda95b70 Mon Sep 17 00:00:00 2001
 From: Maxime Ripard <maxime@cerno.tech>
 Date: Thu, 22 Apr 2021 10:45:37 +0200
-Subject: [PATCH 402/634] clk: requests: Dereference the request pointer after
+Subject: [PATCH 390/828] clk: requests: Dereference the request pointer after
  the check
 
 The current code will first dereference the req pointer and then test if
@@ -13,11 +13,9 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  drivers/clk/clk.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
-index 5a659cd1fccf..438c5f8f0b1e 100644
 --- a/drivers/clk/clk.c
 +++ b/drivers/clk/clk.c
-@@ -2515,10 +2515,11 @@ EXPORT_SYMBOL_GPL(clk_request_start);
+@@ -2539,10 +2539,11 @@ EXPORT_SYMBOL_GPL(clk_request_start);
   */
  void clk_request_done(struct clk_request *req)
  {
@@ -30,6 +28,3 @@ index 5a659cd1fccf..438c5f8f0b1e 100644
  
  	clk_prepare_lock();
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0403-staging-bcm2835-codec-Fix-support-for-levels-4.1-and.patch b/root/target/linux/bcm27xx/patches-5.15/950-0391-staging-bcm2835-codec-Fix-support-for-levels-4.1-and.patch
similarity index 71%
rename from root/target/linux/bcm27xx/patches-5.15/0403-staging-bcm2835-codec-Fix-support-for-levels-4.1-and.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0391-staging-bcm2835-codec-Fix-support-for-levels-4.1-and.patch
index f1ce9e95..ac95aab1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0403-staging-bcm2835-codec-Fix-support-for-levels-4.1-and.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0391-staging-bcm2835-codec-Fix-support-for-levels-4.1-and.patch
@@ -1,7 +1,7 @@
-From 828c0b37ed4c7de924004ee67132b5ff91c004fc Mon Sep 17 00:00:00 2001
+From 30f723fe4ef7acfbe524f054b20caa8a2f7c1fc6 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 25 Mar 2021 18:28:40 +0000
-Subject: [PATCH 403/634] staging/bcm2835-codec: Fix support for levels 4.1 and
+Subject: [PATCH 391/828] staging/bcm2835-codec: Fix support for levels 4.1 and
  4.2
 
 The driver said it supported H264 levels 4.1 and 4.2, but
@@ -14,11 +14,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c  | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 5729a8a7d94e..4622057e71cb 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -1789,6 +1789,17 @@ static int bcm2835_codec_set_level_profile(struct bcm2835_codec_ctx *ctx,
+@@ -1789,6 +1789,17 @@ static int bcm2835_codec_set_level_profi
  		case V4L2_MPEG_VIDEO_H264_LEVEL_4_0:
  			param.level = MMAL_VIDEO_LEVEL_H264_4;
  			break;
@@ -36,6 +34,3 @@ index 5729a8a7d94e..4622057e71cb 100644
  		default:
  			/* Should never get here */
  			break;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0404-staging-bcm2835-codec-Set-the-colourspace-appropriat.patch b/root/target/linux/bcm27xx/patches-5.15/950-0392-staging-bcm2835-codec-Set-the-colourspace-appropriat.patch
similarity index 84%
rename from root/target/linux/bcm27xx/patches-5.15/0404-staging-bcm2835-codec-Set-the-colourspace-appropriat.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0392-staging-bcm2835-codec-Set-the-colourspace-appropriat.patch
index c9d8782b..d0a3446f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0404-staging-bcm2835-codec-Set-the-colourspace-appropriat.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0392-staging-bcm2835-codec-Set-the-colourspace-appropriat.patch
@@ -1,7 +1,7 @@
-From 10c9ee88973657b0f99b26367453b284319d2b56 Mon Sep 17 00:00:00 2001
+From f940229b0fe0c7be6dc9851abe6179be857a62da Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 4 Feb 2021 19:08:23 +0000
-Subject: [PATCH 404/634] staging/bcm2835-codec: Set the colourspace
+Subject: [PATCH 392/828] staging/bcm2835-codec: Set the colourspace
  appropriately for RGB formats
 
 Video decode supports YUV and RGB formats. YUV needs to report SMPTE170M
@@ -12,16 +12,16 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../bcm2835-codec/bcm2835-v4l2-codec.c        | 51 +++++++++++++------
  1 file changed, 36 insertions(+), 15 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 4622057e71cb..08429a42c847 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -930,23 +930,43 @@ static void send_eos_event(struct bcm2835_codec_ctx *ctx)
+@@ -930,23 +930,43 @@ static void send_eos_event(struct bcm283
  	v4l2_event_queue_fh(&ctx->fh, &ev);
  }
  
 -static void color_mmal2v4l(struct bcm2835_codec_ctx *ctx, u32 mmal_color_space)
--{
++static void color_mmal2v4l(struct bcm2835_codec_ctx *ctx, u32 encoding,
++			   u32 color_space)
+ {
 -	switch (mmal_color_space) {
 -	case MMAL_COLOR_SPACE_ITUR_BT601:
 -		ctx->colorspace = V4L2_COLORSPACE_REC709;
@@ -29,11 +29,13 @@ index 4622057e71cb..08429a42c847 100644
 -		ctx->ycbcr_enc = V4L2_YCBCR_ENC_601;
 -		ctx->quant = V4L2_QUANTIZATION_LIM_RANGE;
 -		break;
-+static void color_mmal2v4l(struct bcm2835_codec_ctx *ctx, u32 encoding,
-+			   u32 color_space)
-+{
 +	int is_rgb;
-+
+ 
+-	case MMAL_COLOR_SPACE_ITUR_BT709:
+-		ctx->colorspace = V4L2_COLORSPACE_REC709;
+-		ctx->xfer_func = V4L2_XFER_FUNC_709;
+-		ctx->ycbcr_enc = V4L2_YCBCR_ENC_709;
+-		ctx->quant = V4L2_QUANTIZATION_LIM_RANGE;
 +	switch (encoding) {
 +	case MMAL_ENCODING_I420:
 +	case MMAL_ENCODING_YV12:
@@ -48,12 +50,7 @@ index 4622057e71cb..08429a42c847 100644
 +		case MMAL_COLOR_SPACE_ITUR_BT601:
 +			ctx->colorspace = V4L2_COLORSPACE_SMPTE170M;
 +			break;
- 
--	case MMAL_COLOR_SPACE_ITUR_BT709:
--		ctx->colorspace = V4L2_COLORSPACE_REC709;
--		ctx->xfer_func = V4L2_XFER_FUNC_709;
--		ctx->ycbcr_enc = V4L2_YCBCR_ENC_709;
--		ctx->quant = V4L2_QUANTIZATION_LIM_RANGE;
++
 +		case MMAL_COLOR_SPACE_ITUR_BT709:
 +			ctx->colorspace = V4L2_COLORSPACE_REC709;
 +			break;
@@ -74,7 +71,7 @@ index 4622057e71cb..08429a42c847 100644
  }
  
  static void handle_fmt_changed(struct bcm2835_codec_ctx *ctx,
-@@ -985,7 +1005,8 @@ static void handle_fmt_changed(struct bcm2835_codec_ctx *ctx,
+@@ -985,7 +1005,8 @@ static void handle_fmt_changed(struct bc
  	q_data->height = format->es.video.height;
  	q_data->sizeimage = format->buffer_size_min;
  	if (format->es.video.color_space)
@@ -84,6 +81,3 @@ index 4622057e71cb..08429a42c847 100644
  
  	q_data->aspect_ratio.numerator = format->es.video.par.num;
  	q_data->aspect_ratio.denominator = format->es.video.par.den;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0405-staging-bcm2835-codec-Pass-corrupt-frame-flag.patch b/root/target/linux/bcm27xx/patches-5.15/950-0393-staging-bcm2835-codec-Pass-corrupt-frame-flag.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0405-staging-bcm2835-codec-Pass-corrupt-frame-flag.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0393-staging-bcm2835-codec-Pass-corrupt-frame-flag.patch
index c7e3a7eb..244447c9 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0405-staging-bcm2835-codec-Pass-corrupt-frame-flag.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0393-staging-bcm2835-codec-Pass-corrupt-frame-flag.patch
@@ -1,7 +1,7 @@
-From fe7ad7f65f8ecf91eefbb9f625f17f683fb465de Mon Sep 17 00:00:00 2001
+From bbdee755c83eee7679700735a9d39fcaaba75433 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 9 Dec 2020 18:53:56 +0000
-Subject: [PATCH 405/634] staging/bcm2835-codec: Pass corrupt frame flag.
+Subject: [PATCH 393/828] staging/bcm2835-codec: Pass corrupt frame flag.
 
 MMAL has the flag MMAL_BUFFER_HEADER_FLAG_CORRUPTED but that
 wasn't being passed through, so add it.
@@ -11,11 +11,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c        | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 08429a42c847..3ed9f47a37fe 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -1019,6 +1019,7 @@ static void op_buffer_cb(struct vchiq_mmal_instance *instance,
+@@ -1019,6 +1019,7 @@ static void op_buffer_cb(struct vchiq_mm
  			 struct mmal_buffer *mmal_buf)
  {
  	struct bcm2835_codec_ctx *ctx = port->cb_ctx;
@@ -23,7 +21,7 @@ index 08429a42c847..3ed9f47a37fe 100644
  	struct m2m_mmal_buffer *buf;
  	struct vb2_v4l2_buffer *vb2;
  
-@@ -1075,6 +1076,9 @@ static void op_buffer_cb(struct vchiq_mmal_instance *instance,
+@@ -1075,6 +1076,9 @@ static void op_buffer_cb(struct vchiq_mm
  		vb2->flags |= V4L2_BUF_FLAG_LAST;
  	}
  
@@ -33,7 +31,7 @@ index 08429a42c847..3ed9f47a37fe 100644
  	/* vb2 timestamps in nsecs, mmal in usecs */
  	vb2->vb2_buf.timestamp = mmal_buf->pts * 1000;
  
-@@ -1082,7 +1086,7 @@ static void op_buffer_cb(struct vchiq_mmal_instance *instance,
+@@ -1082,7 +1086,7 @@ static void op_buffer_cb(struct vchiq_mm
  	if (mmal_buf->mmal_flags & MMAL_BUFFER_HEADER_FLAG_KEYFRAME)
  		vb2->flags |= V4L2_BUF_FLAG_KEYFRAME;
  
@@ -42,6 +40,3 @@ index 08429a42c847..3ed9f47a37fe 100644
  	ctx->num_op_buffers++;
  
  	v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: done %d output buffers\n",
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0406-staging-bcm2835-camera-Add-support-for-H264-levels-4.patch b/root/target/linux/bcm27xx/patches-5.15/950-0394-staging-bcm2835-camera-Add-support-for-H264-levels-4.patch
similarity index 75%
rename from root/target/linux/bcm27xx/patches-5.15/0406-staging-bcm2835-camera-Add-support-for-H264-levels-4.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0394-staging-bcm2835-camera-Add-support-for-H264-levels-4.patch
index dd3ea244..15f933fd 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0406-staging-bcm2835-camera-Add-support-for-H264-levels-4.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0394-staging-bcm2835-camera-Add-support-for-H264-levels-4.patch
@@ -1,7 +1,7 @@
-From 2f25eb162c5eed2b6be739886c3959ee725ca5ac Mon Sep 17 00:00:00 2001
+From d6713f80a6d56dcaa9b5d9d86c7a518dc8abe8c7 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 25 Mar 2021 18:34:50 +0000
-Subject: [PATCH 406/634] staging/bcm2835-camera: Add support for H264 levels
+Subject: [PATCH 394/828] staging/bcm2835-camera: Add support for H264 levels
  4.1 and 4.2
 
 Whilst the hardware can't achieve the limits of level 4.2 under
@@ -14,11 +14,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../vc04_services/bcm2835-camera/controls.c   | 19 +++++++++++++++++--
  1 file changed, 17 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-index f73daa38fa66..f3480a5c5170 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-@@ -709,6 +709,8 @@ static int ctrl_set_video_encode_profile_level(struct bm2835_mmal_dev *dev,
+@@ -709,6 +709,8 @@ static int ctrl_set_video_encode_profile
  		case V4L2_MPEG_VIDEO_H264_LEVEL_3_1:
  		case V4L2_MPEG_VIDEO_H264_LEVEL_3_2:
  		case V4L2_MPEG_VIDEO_H264_LEVEL_4_0:
@@ -27,7 +25,7 @@ index f73daa38fa66..f3480a5c5170 100644
  			dev->capture.enc_level = ctrl->val;
  			break;
  		default:
-@@ -774,6 +776,17 @@ static int ctrl_set_video_encode_profile_level(struct bm2835_mmal_dev *dev,
+@@ -774,6 +776,17 @@ static int ctrl_set_video_encode_profile
  		case V4L2_MPEG_VIDEO_H264_LEVEL_4_0:
  			param.level = MMAL_VIDEO_LEVEL_H264_4;
  			break;
@@ -45,7 +43,7 @@ index f73daa38fa66..f3480a5c5170 100644
  		default:
  			/* Should never get here */
  			break;
-@@ -1224,8 +1237,10 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
+@@ -1224,8 +1237,10 @@ static const struct bm2835_mmal_v4l2_ctr
  			 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_0) |
  			 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_1) |
  			 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_2) |
@@ -58,6 +56,3 @@ index f73daa38fa66..f3480a5c5170 100644
  		.def = V4L2_MPEG_VIDEO_H264_LEVEL_4_0,
  		.step = 1,
  		.imenu = NULL,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0407-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0395-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0407-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0395-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch
index ca064674..e86966eb 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0407-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0395-staging-bcm2835-codec-Do-not-update-crop-from-S_FMT-.patch
@@ -1,7 +1,7 @@
-From 56fc14b757ef30db83406389d75a9ff1862f7956 Mon Sep 17 00:00:00 2001
+From 1e945ea35e174ec5d107b38d57c9b2209cf0c9eb Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 15 Apr 2021 11:07:55 +0100
-Subject: [PATCH 407/634] staging/bcm2835-codec: Do not update crop from S_FMT
+Subject: [PATCH 395/828] staging/bcm2835-codec: Do not update crop from S_FMT
  after res change
 
 During decode, setting the CAPTURE queue format was setting the crop
@@ -18,11 +18,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c       | 7 +++++++
  1 file changed, 7 insertions(+)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 3ed9f47a37fe..a97666a1a4be 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -999,6 +999,13 @@ static void handle_fmt_changed(struct bcm2835_codec_ctx *ctx,
+@@ -999,6 +999,13 @@ static void handle_fmt_changed(struct bc
  
  	q_data->crop_width = format->es.video.crop.width;
  	q_data->crop_height = format->es.video.crop.height;
@@ -36,6 +34,3 @@ index 3ed9f47a37fe..a97666a1a4be 100644
  	q_data->bytesperline = get_bytesperline(format->es.video.width,
  						q_data->fmt);
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0408-staging-bcm2835-isp-Fix-compiler-warning.patch b/root/target/linux/bcm27xx/patches-5.15/950-0396-staging-bcm2835-isp-Fix-compiler-warning.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0408-staging-bcm2835-isp-Fix-compiler-warning.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0396-staging-bcm2835-isp-Fix-compiler-warning.patch
index e57fbc6a..0fa6b9e3 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0408-staging-bcm2835-isp-Fix-compiler-warning.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0396-staging-bcm2835-isp-Fix-compiler-warning.patch
@@ -1,7 +1,7 @@
-From 95496e4e3155673ee49f1444cdfb1a057922aabb Mon Sep 17 00:00:00 2001
+From 7a739a1283cbabd6b0f5a0e8acf13f724bd345be Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Fri, 23 Apr 2021 16:16:49 +0100
-Subject: [PATCH 408/634] staging/bcm2835-isp: Fix compiler warning
+Subject: [PATCH 396/828] staging/bcm2835-isp: Fix compiler warning
 
 The result of dividing a u32 by a size_t is an unsigned int on arm32
 and a long unsigned int on arm64. Use "%zu" (the size_t format) to
@@ -12,11 +12,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-index 5cca8bdd1d65..08dce8bba9bb 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -1235,7 +1235,7 @@ static int bcm2835_isp_get_supported_fmts(struct bcm2835_isp_node *node)
+@@ -1235,7 +1235,7 @@ static int bcm2835_isp_get_supported_fmt
  	if (ret) {
  		if (ret == MMAL_MSG_STATUS_ENOSPC) {
  			v4l2_err(&dev->v4l2_dev,
@@ -25,6 +23,3 @@ index 5cca8bdd1d65..08dce8bba9bb 100644
  				 __func__, param_size / sizeof(u32),
  				 MAX_SUPPORTED_ENCODINGS);
  			num_encodings = MAX_SUPPORTED_ENCODINGS;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0409-gpio-poweroff-Remember-the-old-poweroff-handler.patch b/root/target/linux/bcm27xx/patches-5.15/950-0397-gpio-poweroff-Remember-the-old-poweroff-handler.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0409-gpio-poweroff-Remember-the-old-poweroff-handler.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0397-gpio-poweroff-Remember-the-old-poweroff-handler.patch
index 2926e684..a430d7cf 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0409-gpio-poweroff-Remember-the-old-poweroff-handler.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0397-gpio-poweroff-Remember-the-old-poweroff-handler.patch
@@ -1,7 +1,7 @@
-From 150a9169e7eaa9be013517767945730c1bbdfd9a Mon Sep 17 00:00:00 2001
+From d1ab52067c7e66a23d5c23197dc14f66ec97db84 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Tue, 27 Apr 2021 08:59:01 +0100
-Subject: [PATCH 409/634] gpio-poweroff: Remember the old poweroff handler
+Subject: [PATCH 397/828] gpio-poweroff: Remember the old poweroff handler
 
 Keeping a copy of the old poweroff handler allows it to be restored
 should this module be unloaded, but also provides a fallback if the
@@ -14,8 +14,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/power/reset/gpio-poweroff.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c
-index e5dca66360a7..81e7acb8acb5 100644
 --- a/drivers/power/reset/gpio-poweroff.c
 +++ b/drivers/power/reset/gpio-poweroff.c
 @@ -24,6 +24,7 @@ static struct gpio_desc *reset_gpio;
@@ -26,7 +24,7 @@ index e5dca66360a7..81e7acb8acb5 100644
  
  static void gpio_poweroff_do_poweroff(void)
  {
-@@ -43,6 +44,9 @@ static void gpio_poweroff_do_poweroff(void)
+@@ -43,6 +44,9 @@ static void gpio_poweroff_do_poweroff(vo
  	/* give it some time */
  	mdelay(timeout);
  
@@ -36,7 +34,7 @@ index e5dca66360a7..81e7acb8acb5 100644
  	WARN_ON(1);
  }
  
-@@ -83,6 +87,7 @@ static int gpio_poweroff_probe(struct platform_device *pdev)
+@@ -83,6 +87,7 @@ static int gpio_poweroff_probe(struct pl
  		gpiod_export_link(&pdev->dev, "poweroff-gpio", reset_gpio);
  	}
  
@@ -44,7 +42,7 @@ index e5dca66360a7..81e7acb8acb5 100644
  	pm_power_off = &gpio_poweroff_do_poweroff;
  	return 0;
  }
-@@ -90,7 +95,7 @@ static int gpio_poweroff_probe(struct platform_device *pdev)
+@@ -90,7 +95,7 @@ static int gpio_poweroff_probe(struct pl
  static int gpio_poweroff_remove(struct platform_device *pdev)
  {
  	if (pm_power_off == &gpio_poweroff_do_poweroff)
@@ -53,6 +51,3 @@ index e5dca66360a7..81e7acb8acb5 100644
  
  	gpiod_unexport(reset_gpio);
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0410-media-i2c-ov5647-Correct-pixel-array-offset.patch b/root/target/linux/bcm27xx/patches-5.15/950-0398-media-i2c-ov5647-Correct-pixel-array-offset.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0410-media-i2c-ov5647-Correct-pixel-array-offset.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0398-media-i2c-ov5647-Correct-pixel-array-offset.patch
index 5a83d819..69e91590 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0410-media-i2c-ov5647-Correct-pixel-array-offset.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0398-media-i2c-ov5647-Correct-pixel-array-offset.patch
@@ -1,7 +1,7 @@
-From fe3a6c96f418d76aa67e81311e5c338eaf0dc9ef Mon Sep 17 00:00:00 2001
+From dca84d178812e9d8e6d32ce70ad1d09451019f5b Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Tue, 11 May 2021 12:52:26 +0100
-Subject: [PATCH 410/634] media: i2c: ov5647: Correct pixel array offset
+Subject: [PATCH 398/828] media: i2c: ov5647: Correct pixel array offset
 
 The top offset in the pixel array is actually 6 (see page 3-1 of the
 OV5647 data sheet).
@@ -12,8 +12,6 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/i2c/ov5647.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index 9158f44ec822..4228e98e7975 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -68,7 +68,7 @@
@@ -25,6 +23,3 @@ index 9158f44ec822..4228e98e7975 100644
  #define OV5647_PIXEL_ARRAY_WIDTH	2592U
  #define OV5647_PIXEL_ARRAY_HEIGHT	1944U
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0411-media-i2c-ov5647-Correct-minimum-VBLANK-value.patch b/root/target/linux/bcm27xx/patches-5.15/950-0399-media-i2c-ov5647-Correct-minimum-VBLANK-value.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0411-media-i2c-ov5647-Correct-minimum-VBLANK-value.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0399-media-i2c-ov5647-Correct-minimum-VBLANK-value.patch
index 9f0e899c..edf0743a 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0411-media-i2c-ov5647-Correct-minimum-VBLANK-value.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0399-media-i2c-ov5647-Correct-minimum-VBLANK-value.patch
@@ -1,7 +1,7 @@
-From 7d328aaa6fdfbb4e5fdb5f271cdb7b63bbeb4c8a Mon Sep 17 00:00:00 2001
+From 53129a4e3b6b7b91af2dc6af3c57a9dd735317dc Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Tue, 11 May 2021 12:57:22 +0100
-Subject: [PATCH 411/634] media: i2c: ov5647: Correct minimum VBLANK value
+Subject: [PATCH 399/828] media: i2c: ov5647: Correct minimum VBLANK value
 
 Trial and error reveals that the minimum vblank value appears to be 24
 (the OV5647 data sheet does not give any clues). This fixes streaming
@@ -13,8 +13,6 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/i2c/ov5647.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index 4228e98e7975..62adb70df488 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -72,7 +72,7 @@
@@ -26,6 +24,3 @@ index 4228e98e7975..62adb70df488 100644
  #define OV5647_VTS_MAX			32767
  
  #define OV5647_EXPOSURE_MIN		4
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0412-media-i2c-ov5647-Fix-v4l2-compliance-failure-subscri.patch b/root/target/linux/bcm27xx/patches-5.15/950-0400-media-i2c-ov5647-Fix-v4l2-compliance-failure-subscri.patch
similarity index 67%
rename from root/target/linux/bcm27xx/patches-5.15/0412-media-i2c-ov5647-Fix-v4l2-compliance-failure-subscri.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0400-media-i2c-ov5647-Fix-v4l2-compliance-failure-subscri.patch
index e88bf484..664483e2 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0412-media-i2c-ov5647-Fix-v4l2-compliance-failure-subscri.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0400-media-i2c-ov5647-Fix-v4l2-compliance-failure-subscri.patch
@@ -1,7 +1,7 @@
-From 36c1afdf192e388cc126ee90489f67f7badf3688 Mon Sep 17 00:00:00 2001
+From f758a073110ff863f17a9daa211edbcd57e0ed3f Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Wed, 12 May 2021 07:39:21 +0100
-Subject: [PATCH 412/634] media: i2c: ov5647: Fix v4l2-compliance failure
+Subject: [PATCH 400/828] media: i2c: ov5647: Fix v4l2-compliance failure
  subscribing to events
 
 Fixes the following v4l2-compliance failure:
@@ -13,11 +13,9 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/i2c/ov5647.c | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index 62adb70df488..4b6f4962e644 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
-@@ -879,6 +879,8 @@ static const struct v4l2_subdev_core_ops ov5647_subdev_core_ops = {
+@@ -879,6 +879,8 @@ static const struct v4l2_subdev_core_ops
  	.g_register		= ov5647_sensor_get_register,
  	.s_register		= ov5647_sensor_set_register,
  #endif
@@ -26,6 +24,3 @@ index 62adb70df488..4b6f4962e644 100644
  };
  
  static const struct v4l2_rect *
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0413-media-rpivid-Remove-the-need-to-have-num_entry_point.patch b/root/target/linux/bcm27xx/patches-5.15/950-0401-media-rpivid-Remove-the-need-to-have-num_entry_point.patch
similarity index 93%
rename from root/target/linux/bcm27xx/patches-5.15/0413-media-rpivid-Remove-the-need-to-have-num_entry_point.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0401-media-rpivid-Remove-the-need-to-have-num_entry_point.patch
index 87484adf..1b797eab 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0413-media-rpivid-Remove-the-need-to-have-num_entry_point.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0401-media-rpivid-Remove-the-need-to-have-num_entry_point.patch
@@ -1,7 +1,7 @@
-From 7702b406435812b1c363e522352e0c3ab1455e52 Mon Sep 17 00:00:00 2001
+From 14e3ed402cf35f27ad986abcd181b862cab6d202 Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Thu, 21 May 2020 11:49:37 +0100
-Subject: [PATCH 413/634] media: rpivid: Remove the need to have
+Subject: [PATCH 401/828] media: rpivid: Remove the need to have
  num_entry_points set
 
 VAAPI H265 has num entry points but never sets it. Allow a VAAPI
@@ -16,8 +16,6 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  drivers/staging/media/rpivid/rpivid_h265.c | 699 +++++++++++----------
  1 file changed, 365 insertions(+), 334 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
-index e6b07920aa8c..434a366ecfc2 100644
 --- a/drivers/staging/media/rpivid/rpivid_h265.c
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
 @@ -202,8 +202,17 @@ struct rpivid_dec_env {
@@ -82,7 +80,7 @@ index e6b07920aa8c..434a366ecfc2 100644
  };
  
  static inline int clip_int(const int x, const int lo, const int hi)
-@@ -319,15 +329,16 @@ static int ctb_to_tile(unsigned int ctb, unsigned int *bd, int num)
+@@ -319,15 +329,16 @@ static int ctb_to_tile(unsigned int ctb,
  	return i - 1;
  }
  
@@ -107,7 +105,7 @@ index e6b07920aa8c..434a366ecfc2 100644
  }
  
  static void aux_q_free(struct rpivid_ctx *const ctx,
-@@ -532,6 +543,15 @@ static void write_prob(struct rpivid_dec_env *const de,
+@@ -532,6 +543,15 @@ static void write_prob(struct rpivid_dec
  		p1_apb_write(de, 0x1000 + i,
  			     dst[i] + (dst[i + 1] << 8) + (dst[i + 2] << 16) +
  				     (dst[i + 3] << 24));
@@ -123,7 +121,7 @@ index e6b07920aa8c..434a366ecfc2 100644
  }
  
  static void write_scaling_factors(struct rpivid_dec_env *const de)
-@@ -552,8 +572,8 @@ static inline __u32 dma_to_axi_addr(dma_addr_t a)
+@@ -552,8 +572,8 @@ static inline __u32 dma_to_axi_addr(dma_
  static void write_bitstream(struct rpivid_dec_env *const de,
  			    const struct rpivid_dec_state *const s)
  {
@@ -134,7 +132,7 @@ index e6b07920aa8c..434a366ecfc2 100644
  	// Whether that is the correct behaviour or not is not clear in the
  	// spec.
  	const int rpi_use_emu = 1;
-@@ -579,78 +599,26 @@ static void write_bitstream(struct rpivid_dec_env *const de,
+@@ -579,78 +599,26 @@ static void write_bitstream(struct rpivi
  
  //////////////////////////////////////////////////////////////////////////////
  
@@ -199,7 +197,19 @@ index e6b07920aa8c..434a366ecfc2 100644
 -
 -	if (do_bte)
 -		p1_apb_write(de, RPI_BEGINTILEEND, endx + (endy << 16));
--
++	u32 x = (s->max_num_merge_cand << 0) |
++		(s->nb_refs[L0] << 4) |
++		(s->nb_refs[L1] << 8) |
++		(s->sh->slice_type << 12);
++
++	if (s->sh->flags & V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_SAO_LUMA)
++		x |= BIT(14);
++	if (s->sh->flags & V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_SAO_CHROMA)
++		x |= BIT(15);
++	if (s->sh->slice_type == HEVC_SLICE_B &&
++	    (s->sh->flags & V4L2_HEVC_SLICE_PARAMS_FLAG_MVD_L1_ZERO))
++		x |= BIT(16);
+ 
 -	write_slice(de, s, slice_w, slice_h);
 -
 -	if (reset_qp_y) {
@@ -215,24 +225,11 @@ index e6b07920aa8c..434a366ecfc2 100644
 -			     ((tile_y == s->num_tile_rows - 1) << 18));
 -
 -	p1_apb_write(de, RPI_CONTROL, (ctb_col << 0) + (ctb_row << 16));
-+	u32 x = (s->max_num_merge_cand << 0) |
-+		(s->nb_refs[L0] << 4) |
-+		(s->nb_refs[L1] << 8) |
-+		(s->sh->slice_type << 12);
-+
-+	if (s->sh->flags & V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_SAO_LUMA)
-+		x |= BIT(14);
-+	if (s->sh->flags & V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_SAO_CHROMA)
-+		x |= BIT(15);
-+	if (s->sh->slice_type == HEVC_SLICE_B &&
-+	    (s->sh->flags & V4L2_HEVC_SLICE_PARAMS_FLAG_MVD_L1_ZERO))
-+		x |= BIT(16);
-+
 +	return x;
  }
  
  //////////////////////////////////////////////////////////////////////////////
-@@ -934,197 +902,256 @@ static void pre_slice_decode(struct rpivid_dec_env *const de,
+@@ -934,197 +902,256 @@ static void pre_slice_decode(struct rpiv
  		       (sh->slice_cb_qp_offset & 31)); // CMD_QPOFF
  }
  
@@ -264,12 +261,7 @@ index e6b07920aa8c..434a366ecfc2 100644
 -static void wpp_end_previous_slice(struct rpivid_dec_env *const de,
 -				   const struct rpivid_dec_state *const s,
 -				   int ctb_addr_ts)
-+static void write_slice(struct rpivid_dec_env *const de,
-+			const struct rpivid_dec_state *const s,
-+			const u32 slice_const,
-+			const unsigned int ctb_col,
-+			const unsigned int ctb_row)
- {
+-{
 -	int new_x = s->sh->slice_segment_addr % de->pic_width_in_ctbs_y;
 -	int new_y = s->sh->slice_segment_addr / de->pic_width_in_ctbs_y;
 -	int last_x =
@@ -284,6 +276,12 @@ index e6b07920aa8c..434a366ecfc2 100644
 -	if (new_x == 2 || (de->pic_width_in_ctbs_y == 2 &&
 -			   de->wpp_entry_y < new_y))
 -		p1_apb_write(de, RPI_TRANSFER, PROB_BACKUP);
++static void write_slice(struct rpivid_dec_env *const de,
++			const struct rpivid_dec_state *const s,
++			const u32 slice_const,
++			const unsigned int ctb_col,
++			const unsigned int ctb_row)
++{
 +	const unsigned int cs = (1 << s->log2_ctb_size);
 +	const unsigned int w_last = s->sps.pic_width_in_luma_samples & (cs - 1);
 +	const unsigned int h_last = s->sps.pic_height_in_luma_samples & (cs - 1);
@@ -310,6 +308,12 @@ index e6b07920aa8c..434a366ecfc2 100644
  			    const struct rpivid_dec_state *const s,
 -			    const int do_bte,
 -			    const int reset_qp_y, const int ctb_addr_ts)
+-{
+-	int ctb_size = 1 << s->log2_ctb_size;
+-	int ctb_addr_rs = s->ctb_addr_ts_to_rs[ctb_addr_ts];
+-
+-	int ctb_col = de->wpp_entry_x = ctb_addr_rs % de->pic_width_in_ctbs_y;
+-	int ctb_row = de->wpp_entry_y = ctb_addr_rs / de->pic_width_in_ctbs_y;
 +			    const bool do_bte,
 +			    const bool reset_qp_y,
 +			    const u32 pause_mode,
@@ -319,19 +323,14 @@ index e6b07920aa8c..434a366ecfc2 100644
 +			    const unsigned int ctb_row,
 +			    const unsigned int slice_qp,
 +			    const u32 slice_const)
- {
--	int ctb_size = 1 << s->log2_ctb_size;
--	int ctb_addr_rs = s->ctb_addr_ts_to_rs[ctb_addr_ts];
--
--	int ctb_col = de->wpp_entry_x = ctb_addr_rs % de->pic_width_in_ctbs_y;
--	int ctb_row = de->wpp_entry_y = ctb_addr_rs / de->pic_width_in_ctbs_y;
--
--	int endx = de->pic_width_in_ctbs_y - 1;
--	int endy = ctb_row;
++{
 +	const unsigned int endx = s->col_bd[tile_x + 1] - 1;
 +	const unsigned int endy = (pause_mode == PAUSE_MODE_WPP) ?
 +		ctb_row : s->row_bd[tile_y + 1] - 1;
  
+-	int endx = de->pic_width_in_ctbs_y - 1;
+-	int endy = ctb_row;
+-
 -	u8 slice_w = ctb_to_slice_w_h(ctb_col, ctb_size,
 -				      s->sps.pic_width_in_luma_samples,
 -				      s->col_bd, s->num_tile_columns);
@@ -441,11 +440,12 @@ index e6b07920aa8c..434a366ecfc2 100644
 -			     const struct rpivid_dec_state *const s,
 -			     const struct v4l2_ctrl_hevc_slice_params *sh,
 -			     int ctb_addr_ts)
-+			     const struct rpivid_dec_state *const s)
- {
+-{
 -	int i, reset_qp_y = 1;
 -	int indep = !s->dependent_slice_segment_flag;
 -	int ctb_col = s->sh->slice_segment_addr % de->pic_width_in_ctbs_y;
++			     const struct rpivid_dec_state *const s)
++{
 +	bool reset_qp_y = true;
 +	const bool indep = !s->dependent_slice_segment_flag;
  
@@ -472,14 +472,14 @@ index e6b07920aa8c..434a366ecfc2 100644
 +	new_entry_point(de, s, indep, reset_qp_y, PAUSE_MODE_WPP,
 +			0, 0, s->start_ctb_x, s->start_ctb_y,
 +			s->slice_qp, slice_reg_const(s));
-+
-+	if (s->frame_end) {
-+		wpp_entry_fill(de, s, s->ctb_height - 1);
  
 -	for (i = 0; i < s->sh->num_entry_point_offsets; i++) {
 -		int ctb_addr_rs = s->ctb_addr_ts_to_rs[ctb_addr_ts];
 -		int ctb_row = ctb_addr_rs / de->pic_width_in_ctbs_y;
 -		int last_x = de->pic_width_in_ctbs_y - 1;
++	if (s->frame_end) {
++		wpp_entry_fill(de, s, s->ctb_height - 1);
++
 +		if (de->entry_ctb_x < 2 && s->ctb_width > 2)
 +			wpp_pause(de, s->ctb_height - 1);
  
@@ -623,7 +623,7 @@ index e6b07920aa8c..434a366ecfc2 100644
  	}
  }
  
-@@ -1132,13 +1159,12 @@ static void decode_slice(struct rpivid_dec_env *const de,
+@@ -1132,13 +1159,12 @@ static void decode_slice(struct rpivid_d
  // Scaling factors
  
  static void expand_scaling_list(const unsigned int size_id,
@@ -638,7 +638,7 @@ index e6b07920aa8c..434a366ecfc2 100644
  	switch (size_id) {
  	case 0:
  		memcpy(dst0, src0, 16);
-@@ -1199,24 +1225,20 @@ static void populate_scaling_factors(const struct rpivid_run *const run,
+@@ -1199,24 +1225,20 @@ static void populate_scaling_factors(con
  	unsigned int mid;
  
  	for (mid = 0; mid < 6; mid++)
@@ -668,7 +668,7 @@ index e6b07920aa8c..434a366ecfc2 100644
  					    scaling_factor_offsets[3][mid],
  				    sl->scaling_list_32x32[mid],
  				    sl->scaling_list_dc_coef_32x32[mid]);
-@@ -1228,8 +1250,6 @@ static void free_ps_info(struct rpivid_dec_state *const s)
+@@ -1228,8 +1250,6 @@ static void free_ps_info(struct rpivid_d
  	s->ctb_addr_rs_to_ts = NULL;
  	kfree(s->ctb_addr_ts_to_rs);
  	s->ctb_addr_ts_to_rs = NULL;
@@ -677,7 +677,7 @@ index e6b07920aa8c..434a366ecfc2 100644
  
  	kfree(s->col_bd);
  	s->col_bd = NULL;
-@@ -1237,10 +1257,52 @@ static void free_ps_info(struct rpivid_dec_state *const s)
+@@ -1237,10 +1257,52 @@ static void free_ps_info(struct rpivid_d
  	s->row_bd = NULL;
  }
  
@@ -732,43 +732,64 @@ index e6b07920aa8c..434a366ecfc2 100644
  	unsigned int i;
  
  	free_ps_info(s);
-@@ -1259,104 +1321,49 @@ static int updated_ps(struct rpivid_dec_state *const s)
+@@ -1259,104 +1321,49 @@ static int updated_ps(struct rpivid_dec_
  
  	// Inferred parameters
  
--	if (!(s->pps.flags & V4L2_HEVC_PPS_FLAG_TILES_ENABLED)) {
++	s->ctb_addr_rs_to_ts = kmalloc_array(s->ctb_size,
++					     sizeof(*s->ctb_addr_rs_to_ts),
++					     GFP_KERNEL);
++	s->ctb_addr_ts_to_rs = kmalloc_array(s->ctb_size,
++					     sizeof(*s->ctb_addr_ts_to_rs),
++					     GFP_KERNEL);
++
+ 	if (!(s->pps.flags & V4L2_HEVC_PPS_FLAG_TILES_ENABLED)) {
 -		s->num_tile_columns = 1;
 -		s->num_tile_rows = 1;
 -		s->column_width[0] = s->ctb_width;
 -		s->row_height[0] = s->ctb_height;
--	} else {
++		s->tile_width = 1;
++		s->tile_height = 1;
+ 	} else {
 -		s->num_tile_columns = s->pps.num_tile_columns_minus1 + 1;
 -		s->num_tile_rows = s->pps.num_tile_rows_minus1 + 1;
 -		for (i = 0; i < s->num_tile_columns; ++i)
 -			s->column_width[i] = s->pps.column_width_minus1[i] + 1;
 -		for (i = 0; i < s->num_tile_rows; ++i)
 -			s->row_height[i] = s->pps.row_height_minus1[i] + 1;
--	}
--
++		s->tile_width = s->pps.num_tile_columns_minus1 + 1;
++		s->tile_height = s->pps.num_tile_rows_minus1 + 1;
+ 	}
+ 
 -	s->col_bd = kmalloc((s->num_tile_columns + 1) * sizeof(*s->col_bd),
--			    GFP_KERNEL);
++	s->col_bd = kmalloc((s->tile_width + 1) * sizeof(*s->col_bd),
+ 			    GFP_KERNEL);
 -	s->row_bd = kmalloc((s->num_tile_rows + 1) * sizeof(*s->row_bd),
--			    GFP_KERNEL);
--
--	s->col_bd[0] = 0;
++	s->row_bd = kmalloc((s->tile_height + 1) * sizeof(*s->row_bd),
+ 			    GFP_KERNEL);
+ 
+ 	s->col_bd[0] = 0;
 -	for (i = 0; i < s->num_tile_columns; i++)
 -		s->col_bd[i + 1] = s->col_bd[i] + s->column_width[i];
--
--	s->row_bd[0] = 0;
++	for (i = 1; i < s->tile_width; i++)
++		s->col_bd[i] = s->col_bd[i - 1] +
++			s->pps.column_width_minus1[i - 1] + 1;
++	s->col_bd[s->tile_width] = s->ctb_width;
+ 
+ 	s->row_bd[0] = 0;
 -	for (i = 0; i < s->num_tile_rows; i++)
 -		s->row_bd[i + 1] = s->row_bd[i] + s->row_height[i];
--
- 	s->ctb_addr_rs_to_ts = kmalloc_array(s->ctb_size,
- 					     sizeof(*s->ctb_addr_rs_to_ts),
- 					     GFP_KERNEL);
- 	s->ctb_addr_ts_to_rs = kmalloc_array(s->ctb_size,
- 					     sizeof(*s->ctb_addr_ts_to_rs),
- 					     GFP_KERNEL);
++	for (i = 1; i < s->tile_height; i++)
++		s->row_bd[i] = s->row_bd[i - 1] +
++			s->pps.row_height_minus1[i - 1] + 1;
++	s->row_bd[s->tile_height] = s->ctb_height;
+ 
+-	s->ctb_addr_rs_to_ts = kmalloc_array(s->ctb_size,
+-					     sizeof(*s->ctb_addr_rs_to_ts),
+-					     GFP_KERNEL);
+-	s->ctb_addr_ts_to_rs = kmalloc_array(s->ctb_size,
+-					     sizeof(*s->ctb_addr_ts_to_rs),
+-					     GFP_KERNEL);
 -	s->tile_id = kmalloc_array(s->ctb_size, sizeof(*s->tile_id),
 -				   GFP_KERNEL);
 -
@@ -785,47 +806,26 @@ index e6b07920aa8c..434a366ecfc2 100644
 -				break;
 -			}
 -		}
- 
+-
 -		for (i = 0; i < s->num_tile_rows; i++) {
 -			if (tb_y < s->row_bd[i + 1]) {
 -				tile_y = i;
 -				break;
 -			}
 -		}
-+	if (!(s->pps.flags & V4L2_HEVC_PPS_FLAG_TILES_ENABLED)) {
-+		s->tile_width = 1;
-+		s->tile_height = 1;
-+	} else {
-+		s->tile_width = s->pps.num_tile_columns_minus1 + 1;
-+		s->tile_height = s->pps.num_tile_rows_minus1 + 1;
-+	}
- 
+-
 -		for (i = 0; i < tile_x; i++)
 -			val += s->row_height[tile_y] * s->column_width[i];
 -		for (i = 0; i < tile_y; i++)
 -			val += s->ctb_width * s->row_height[i];
-+	s->col_bd = kmalloc((s->tile_width + 1) * sizeof(*s->col_bd),
-+			    GFP_KERNEL);
-+	s->row_bd = kmalloc((s->tile_height + 1) * sizeof(*s->row_bd),
-+			    GFP_KERNEL);
- 
+-
 -		val += (tb_y - s->row_bd[tile_y]) * s->column_width[tile_x] +
 -		       tb_x - s->col_bd[tile_x];
-+	s->col_bd[0] = 0;
-+	for (i = 1; i < s->tile_width; i++)
-+		s->col_bd[i] = s->col_bd[i - 1] +
-+			s->pps.column_width_minus1[i - 1] + 1;
-+	s->col_bd[s->tile_width] = s->ctb_width;
- 
+-
 -		s->ctb_addr_rs_to_ts[ctb_addr_rs] = val;
 -		s->ctb_addr_ts_to_rs[val] = ctb_addr_rs;
 -	}
-+	s->row_bd[0] = 0;
-+	for (i = 1; i < s->tile_height; i++)
-+		s->row_bd[i] = s->row_bd[i - 1] +
-+			s->pps.row_height_minus1[i - 1] + 1;
-+	s->row_bd[s->tile_height] = s->ctb_height;
- 
+-
 -	for (j = 0, tile_id = 0; j < s->num_tile_rows; j++)
 -		for (i = 0; i < s->num_tile_columns; i++, tile_id++)
 -			for (y = s->row_bd[j]; y < s->row_bd[j + 1]; y++)
@@ -843,10 +843,7 @@ index e6b07920aa8c..434a366ecfc2 100644
 -static int frame_end(struct rpivid_dev *const dev,
 -		     struct rpivid_dec_env *const de,
 -		     const struct rpivid_dec_state *const s)
-+static int write_cmd_buffer(struct rpivid_dev *const dev,
-+			    struct rpivid_dec_env *const de,
-+			    const struct rpivid_dec_state *const s)
- {
+-{
 -	const unsigned int last_x = s->col_bd[s->num_tile_columns] - 1;
 -	const unsigned int last_y = s->row_bd[s->num_tile_rows] - 1;
 -	size_t cmd_size;
@@ -857,13 +854,17 @@ index e6b07920aa8c..434a366ecfc2 100644
 -	}
 -	p1_apb_write(de, RPI_STATUS, 1 + (last_x << 5) + (last_y << 18));
 -
++static int write_cmd_buffer(struct rpivid_dev *const dev,
++			    struct rpivid_dec_env *const de,
++			    const struct rpivid_dec_state *const s)
++{
  	// Copy commands out to dma buf
 -	cmd_size = de->cmd_len * sizeof(de->cmd_fifo[0]);
 +	const size_t cmd_size = de->cmd_len * sizeof(de->cmd_fifo[0]);
  
  	if (!de->cmd_copy_gptr->ptr || cmd_size > de->cmd_copy_gptr->size) {
  		size_t cmd_alloc = round_up_size(cmd_size);
-@@ -1521,18 +1528,19 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1521,18 +1528,19 @@ static void rpivid_h265_setup(struct rpi
  	struct rpivid_q_aux *dpb_q_aux[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
  	struct rpivid_dec_state *const s = ctx->state;
  	struct vb2_queue *vq;
@@ -886,7 +887,7 @@ index e6b07920aa8c..434a366ecfc2 100644
  	slice_temporal_mvp = (sh->flags &
  		   V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_TEMPORAL_MVP_ENABLED);
  
-@@ -1662,6 +1670,13 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1662,6 +1670,13 @@ static void rpivid_h265_setup(struct rpi
  				  s->sps.pic_height_in_luma_samples);
  			goto fail;
  		}
@@ -900,7 +901,7 @@ index e6b07920aa8c..434a366ecfc2 100644
  
  		// Fill in ref planes with our address s.t. if we mess
  		// up refs somehow then we still have a valid address
-@@ -1760,15 +1775,24 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1760,15 +1775,24 @@ static void rpivid_h265_setup(struct rpi
  	if (s->sps.flags & V4L2_HEVC_SPS_FLAG_SCALING_LIST_ENABLED)
  		populate_scaling_factors(run, de, s);
  
@@ -929,7 +930,7 @@ index e6b07920aa8c..434a366ecfc2 100644
  
  	// Frame end
  	memset(dpb_q_aux, 0,
-@@ -1776,8 +1800,9 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1776,8 +1800,9 @@ static void rpivid_h265_setup(struct rpi
  	/*
  	 * Need Aux ents for all (ref) DPB ents if temporal MV could
  	 * be enabled for any pic
@@ -941,7 +942,7 @@ index e6b07920aa8c..434a366ecfc2 100644
  	 */
  	use_aux = ((s->sps.flags &
  		  V4L2_HEVC_SPS_FLAG_SPS_TEMPORAL_MVP_ENABLED) != 0);
-@@ -1795,7 +1820,7 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1795,7 +1820,7 @@ static void rpivid_h265_setup(struct rpi
  	}
  
  	//        v4l2_info(&dev->v4l2_dev, "rpivid_h265_end of frame\n");
@@ -950,7 +951,7 @@ index e6b07920aa8c..434a366ecfc2 100644
  		goto fail;
  
  	for (i = 0; i < sh->num_active_dpb_entries; ++i) {
-@@ -1876,6 +1901,7 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1876,6 +1901,7 @@ static void rpivid_h265_setup(struct rpi
  	}
  
  	de->state = RPIVID_DECODE_PHASE1;
@@ -958,7 +959,7 @@ index e6b07920aa8c..434a366ecfc2 100644
  	return;
  
  fail:
-@@ -1883,6 +1909,7 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1883,6 +1909,7 @@ fail:
  		// Actual error reporting happens in Trigger
  		de->state = s->frame_end ? RPIVID_DECODE_ERROR_DONE :
  					   RPIVID_DECODE_ERROR_CONTINUE;
@@ -966,7 +967,7 @@ index e6b07920aa8c..434a366ecfc2 100644
  }
  
  //////////////////////////////////////////////////////////////////////////////
-@@ -2210,6 +2237,10 @@ static int rpivid_h265_start(struct rpivid_ctx *ctx)
+@@ -2210,6 +2237,10 @@ static int rpivid_h265_start(struct rpiv
  	size_t pu_alloc;
  	size_t coeff_alloc;
  
@@ -977,6 +978,3 @@ index e6b07920aa8c..434a366ecfc2 100644
  	// Generate a sanitised WxH for memory alloc
  	// Assume HD if unset
  	if (w == 0)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0414-media-rpivid-Convert-to-MPLANE.patch b/root/target/linux/bcm27xx/patches-5.15/950-0402-media-rpivid-Convert-to-MPLANE.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0414-media-rpivid-Convert-to-MPLANE.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0402-media-rpivid-Convert-to-MPLANE.patch
index f244dd41..b0532a69 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0414-media-rpivid-Convert-to-MPLANE.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0402-media-rpivid-Convert-to-MPLANE.patch
@@ -1,7 +1,7 @@
-From f042d69c611f2f837b062fe3c744f508a1e202c4 Mon Sep 17 00:00:00 2001
+From 46d5b8d2c5b9836cec159735572d16f98fc3f96e Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Thu, 11 Mar 2021 12:51:00 +0000
-Subject: [PATCH 414/634] media: rpivid: Convert to MPLANE
+Subject: [PATCH 402/828] media: rpivid: Convert to MPLANE
 
 Use multi-planar interface rather than single plane interface. This
 allows dmabufs holding compressed data to be resized.
@@ -15,11 +15,9 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  drivers/staging/media/rpivid/rpivid_video.h |  4 +-
  5 files changed, 52 insertions(+), 55 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid.c b/drivers/staging/media/rpivid/rpivid.c
-index 4e28c9d91192..08c838fcb577 100644
 --- a/drivers/staging/media/rpivid/rpivid.c
 +++ b/drivers/staging/media/rpivid/rpivid.c
-@@ -283,7 +283,7 @@ static const struct video_device rpivid_video_device = {
+@@ -283,7 +283,7 @@ static const struct video_device rpivid_
  	.ioctl_ops	= &rpivid_ioctl_ops,
  	.minor		= -1,
  	.release	= video_device_release_empty,
@@ -28,8 +26,6 @@ index 4e28c9d91192..08c838fcb577 100644
  };
  
  static const struct v4l2_m2m_ops rpivid_m2m_ops = {
-diff --git a/drivers/staging/media/rpivid/rpivid.h b/drivers/staging/media/rpivid/rpivid.h
-index f85cf9d08926..1987a11dd0be 100644
 --- a/drivers/staging/media/rpivid/rpivid.h
 +++ b/drivers/staging/media/rpivid/rpivid.h
 @@ -85,8 +85,8 @@ struct rpivid_ctx {
@@ -43,11 +39,9 @@ index f85cf9d08926..1987a11dd0be 100644
  	int dst_fmt_set;
  	// fatal_err is set if an error has occurred s.t. decode cannot
  	// continue (such as running out of CMA)
-diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
-index 434a366ecfc2..4244532fca77 100644
 --- a/drivers/staging/media/rpivid/rpivid_h265.c
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
-@@ -1613,7 +1613,7 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1613,7 +1613,7 @@ static void rpivid_h265_setup(struct rpi
  		de->cmd_copy_gptr = ctx->cmdbufs + 0;
  
  		de->frame_c_offset = ctx->dst_fmt.height * 128;
@@ -56,7 +50,7 @@ index 434a366ecfc2..4244532fca77 100644
  		de->frame_addr =
  			vb2_dma_contig_plane_dma_addr(&run->dst->vb2_buf, 0);
  		de->frame_aux = NULL;
-@@ -1654,11 +1654,11 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1654,11 +1654,11 @@ static void rpivid_h265_setup(struct rpi
  			goto fail;
  		}
  		if (run->dst->planes[0].length <
@@ -70,7 +64,7 @@ index 434a366ecfc2..4244532fca77 100644
  			goto fail;
  		}
  
-@@ -1812,7 +1812,8 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1812,7 +1812,8 @@ static void rpivid_h265_setup(struct rpi
  	// slices. If this changes we will need idx mapping code.
  	// Uses sh so here rather than trigger
  
@@ -80,11 +74,9 @@ index 434a366ecfc2..4244532fca77 100644
  
  	if (!vq) {
  		v4l2_err(&dev->v4l2_dev, "VQ gone!\n");
-diff --git a/drivers/staging/media/rpivid/rpivid_video.c b/drivers/staging/media/rpivid/rpivid_video.c
-index 37c8f62649d6..30fa77652790 100644
 --- a/drivers/staging/media/rpivid/rpivid_video.c
 +++ b/drivers/staging/media/rpivid/rpivid_video.c
-@@ -42,25 +42,27 @@ static inline unsigned int constrain2x(unsigned int x, unsigned int y)
+@@ -42,25 +42,27 @@ static inline unsigned int constrain2x(u
  			(x > y * 2) ? y : x;
  }
  
@@ -118,7 +110,7 @@ index 37c8f62649d6..30fa77652790 100644
  
  	switch (pix_fmt->pixelformat) {
  	/* For column formats set bytesperline to column height (stride2) */
-@@ -112,8 +114,9 @@ int rpivid_prepare_dst_format(struct v4l2_pix_format *pix_fmt)
+@@ -112,8 +114,9 @@ int rpivid_prepare_dst_format(struct v4l
  	pix_fmt->height = height;
  
  	pix_fmt->field = V4L2_FIELD_NONE;
@@ -130,7 +122,7 @@ index 37c8f62649d6..30fa77652790 100644
  	return 0;
  }
  
-@@ -222,12 +225,12 @@ static u32 pixelformat_from_sps(const struct v4l2_ctrl_hevc_sps * const sps,
+@@ -222,12 +225,12 @@ static u32 pixelformat_from_sps(const st
  	return pf;
  }
  
@@ -145,7 +137,7 @@ index 37c8f62649d6..30fa77652790 100644
  		.width = sps->pic_width_in_luma_samples,
  		.height = sps->pic_height_in_luma_samples,
  		.pixelformat = pixelformat_from_sps(sps, 0)
-@@ -267,7 +270,7 @@ static int rpivid_g_fmt_vid_cap(struct file *file, void *priv,
+@@ -267,7 +270,7 @@ static int rpivid_g_fmt_vid_cap(struct f
  
  	if (!ctx->dst_fmt_set)
  		ctx->dst_fmt = rpivid_hevc_default_dst_fmt(ctx);
@@ -154,7 +146,7 @@ index 37c8f62649d6..30fa77652790 100644
  	return 0;
  }
  
-@@ -276,12 +279,12 @@ static int rpivid_g_fmt_vid_out(struct file *file, void *priv,
+@@ -276,12 +279,12 @@ static int rpivid_g_fmt_vid_out(struct f
  {
  	struct rpivid_ctx *ctx = rpivid_file2ctx(file);
  
@@ -170,7 +162,7 @@ index 37c8f62649d6..30fa77652790 100644
  {
  	d->colorspace   = s->colorspace;
  	d->xfer_func    = s->xfer_func;
-@@ -298,12 +301,8 @@ static int rpivid_try_fmt_vid_cap(struct file *file, void *priv,
+@@ -298,12 +301,8 @@ static int rpivid_try_fmt_vid_cap(struct
  	u32 pixelformat;
  	int i;
  
@@ -184,7 +176,7 @@ index 37c8f62649d6..30fa77652790 100644
  			break;
  	}
  
-@@ -317,23 +316,20 @@ static int rpivid_try_fmt_vid_cap(struct file *file, void *priv,
+@@ -317,23 +316,20 @@ static int rpivid_try_fmt_vid_cap(struct
  
  	// We don't have any way of finding out colourspace so believe
  	// anything we are told - take anything set in src as a default
@@ -215,7 +207,7 @@ index 37c8f62649d6..30fa77652790 100644
  	}
  	return 0;
  }
-@@ -353,7 +349,7 @@ static int rpivid_s_fmt_vid_cap(struct file *file, void *priv,
+@@ -353,7 +349,7 @@ static int rpivid_s_fmt_vid_cap(struct f
  	if (ret)
  		return ret;
  
@@ -224,7 +216,7 @@ index 37c8f62649d6..30fa77652790 100644
  	ctx->dst_fmt_set = 1;
  
  	return 0;
-@@ -374,14 +370,14 @@ static int rpivid_s_fmt_vid_out(struct file *file, void *priv,
+@@ -374,14 +370,14 @@ static int rpivid_s_fmt_vid_out(struct f
  	if (ret)
  		return ret;
  
@@ -241,7 +233,7 @@ index 37c8f62649d6..30fa77652790 100644
  	return 0;
  }
  
-@@ -389,14 +385,14 @@ const struct v4l2_ioctl_ops rpivid_ioctl_ops = {
+@@ -389,14 +385,14 @@ const struct v4l2_ioctl_ops rpivid_ioctl
  	.vidioc_querycap		= rpivid_querycap,
  
  	.vidioc_enum_fmt_vid_cap	= rpivid_enum_fmt_vid_cap,
@@ -262,7 +254,7 @@ index 37c8f62649d6..30fa77652790 100644
  
  	.vidioc_reqbufs			= v4l2_m2m_ioctl_reqbufs,
  	.vidioc_querybuf		= v4l2_m2m_ioctl_querybuf,
-@@ -421,7 +417,7 @@ static int rpivid_queue_setup(struct vb2_queue *vq, unsigned int *nbufs,
+@@ -421,7 +417,7 @@ static int rpivid_queue_setup(struct vb2
  			      struct device *alloc_devs[])
  {
  	struct rpivid_ctx *ctx = vb2_get_drv_priv(vq);
@@ -271,7 +263,7 @@ index 37c8f62649d6..30fa77652790 100644
  
  	if (V4L2_TYPE_IS_OUTPUT(vq->type))
  		pix_fmt = &ctx->src_fmt;
-@@ -429,10 +425,10 @@ static int rpivid_queue_setup(struct vb2_queue *vq, unsigned int *nbufs,
+@@ -429,10 +425,10 @@ static int rpivid_queue_setup(struct vb2
  		pix_fmt = &ctx->dst_fmt;
  
  	if (*nplanes) {
@@ -284,7 +276,7 @@ index 37c8f62649d6..30fa77652790 100644
  		*nplanes = 1;
  	}
  
-@@ -471,17 +467,17 @@ static int rpivid_buf_prepare(struct vb2_buffer *vb)
+@@ -471,17 +467,17 @@ static int rpivid_buf_prepare(struct vb2
  {
  	struct vb2_queue *vq = vb->vb2_queue;
  	struct rpivid_ctx *ctx = vb2_get_drv_priv(vq);
@@ -305,7 +297,7 @@ index 37c8f62649d6..30fa77652790 100644
  
  	return 0;
  }
-@@ -567,7 +563,7 @@ int rpivid_queue_init(void *priv, struct vb2_queue *src_vq,
+@@ -567,7 +563,7 @@ int rpivid_queue_init(void *priv, struct
  	struct rpivid_ctx *ctx = priv;
  	int ret;
  
@@ -314,7 +306,7 @@ index 37c8f62649d6..30fa77652790 100644
  	src_vq->io_modes = VB2_MMAP | VB2_DMABUF;
  	src_vq->drv_priv = ctx;
  	src_vq->buf_struct_size = sizeof(struct rpivid_buffer);
-@@ -584,7 +580,7 @@ int rpivid_queue_init(void *priv, struct vb2_queue *src_vq,
+@@ -584,7 +580,7 @@ int rpivid_queue_init(void *priv, struct
  	if (ret)
  		return ret;
  
@@ -323,11 +315,9 @@ index 37c8f62649d6..30fa77652790 100644
  	dst_vq->io_modes = VB2_MMAP | VB2_DMABUF;
  	dst_vq->drv_priv = ctx;
  	dst_vq->buf_struct_size = sizeof(struct rpivid_buffer);
-diff --git a/drivers/staging/media/rpivid/rpivid_video.h b/drivers/staging/media/rpivid/rpivid_video.h
-index 9c4f3fb2f9f6..5c0fd9c8a6d7 100644
 --- a/drivers/staging/media/rpivid/rpivid_video.h
 +++ b/drivers/staging/media/rpivid/rpivid_video.h
-@@ -24,7 +24,7 @@ extern const struct v4l2_ioctl_ops rpivid_ioctl_ops;
+@@ -24,7 +24,7 @@ extern const struct v4l2_ioctl_ops rpivi
  
  int rpivid_queue_init(void *priv, struct vb2_queue *src_vq,
  		      struct vb2_queue *dst_vq);
@@ -337,6 +327,3 @@ index 9c4f3fb2f9f6..5c0fd9c8a6d7 100644
 +int rpivid_prepare_dst_format(struct v4l2_pix_format_mplane *pix_fmt);
  
  #endif
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0415-media-rpivid-Add-an-enable-count-to-irq-claim-Qs.patch b/root/target/linux/bcm27xx/patches-5.15/950-0403-media-rpivid-Add-an-enable-count-to-irq-claim-Qs.patch
similarity index 82%
rename from root/target/linux/bcm27xx/patches-5.15/0415-media-rpivid-Add-an-enable-count-to-irq-claim-Qs.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0403-media-rpivid-Add-an-enable-count-to-irq-claim-Qs.patch
index 6393e10f..d3cd016d 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0415-media-rpivid-Add-an-enable-count-to-irq-claim-Qs.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0403-media-rpivid-Add-an-enable-count-to-irq-claim-Qs.patch
@@ -1,7 +1,7 @@
-From 6ef4d7b04600df3184e5f9dc879617fc2460137a Mon Sep 17 00:00:00 2001
+From 787c4918de2fea3f4892e2f5701b5fc4030de80c Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Thu, 11 Mar 2021 18:43:15 +0000
-Subject: [PATCH 415/634] media: rpivid: Add an enable count to irq claim Qs
+Subject: [PATCH 403/828] media: rpivid: Add an enable count to irq claim Qs
 
 Add an enable count to the irq Q structures to allow the irq logic to
 block further callbacks if resources associated with the irq are not
@@ -14,8 +14,6 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  drivers/staging/media/rpivid/rpivid_hw.h |   3 +
  3 files changed, 85 insertions(+), 38 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid.h b/drivers/staging/media/rpivid/rpivid.h
-index 1987a11dd0be..544bc9411a91 100644
 --- a/drivers/staging/media/rpivid/rpivid.h
 +++ b/drivers/staging/media/rpivid/rpivid.h
 @@ -151,6 +151,8 @@ struct rpivid_hw_irq_ctrl {
@@ -27,11 +25,9 @@ index 1987a11dd0be..544bc9411a91 100644
  	/* Thread CB requested */
  	bool thread_reqed;
  };
-diff --git a/drivers/staging/media/rpivid/rpivid_hw.c b/drivers/staging/media/rpivid/rpivid_hw.c
-index 5f86bbed8c1c..ada6107ab675 100644
 --- a/drivers/staging/media/rpivid/rpivid_hw.c
 +++ b/drivers/staging/media/rpivid/rpivid_hw.c
-@@ -42,35 +42,62 @@ static void pre_irq(struct rpivid_dev *dev, struct rpivid_hw_irq_ent *ient,
+@@ -42,35 +42,62 @@ static void pre_irq(struct rpivid_dev *d
  	ient->cb = cb;
  	ient->v = v;
  
@@ -111,7 +107,7 @@ index 5f86bbed8c1c..ada6107ab675 100644
  	}
  }
  
-@@ -84,7 +111,7 @@ static void pre_thread(struct rpivid_dev *dev,
+@@ -84,7 +111,7 @@ static void pre_thread(struct rpivid_dev
  	ient->v = v;
  	ictl->irq = ient;
  	ictl->thread_reqed = true;
@@ -120,7 +116,7 @@ index 5f86bbed8c1c..ada6107ab675 100644
  }
  
  // Called in irq context
-@@ -96,17 +123,10 @@ static void do_irq(struct rpivid_dev * const dev,
+@@ -96,17 +123,10 @@ static void do_irq(struct rpivid_dev * c
  
  	spin_lock_irqsave(&ictl->lock, flags);
  	ient = ictl->irq;
@@ -140,7 +136,7 @@ index 5f86bbed8c1c..ada6107ab675 100644
  }
  
  static void do_claim(struct rpivid_dev * const dev,
-@@ -127,7 +147,7 @@ static void do_claim(struct rpivid_dev * const dev,
+@@ -127,7 +147,7 @@ static void do_claim(struct rpivid_dev *
  		ictl->tail->next = ient;
  		ictl->tail = ient;
  		ient = NULL;
@@ -149,7 +145,7 @@ index 5f86bbed8c1c..ada6107ab675 100644
  		// Empty Q but other activity in progress so Q
  		ictl->claim = ient;
  		ictl->tail = ient;
-@@ -135,16 +155,34 @@ static void do_claim(struct rpivid_dev * const dev,
+@@ -135,16 +155,34 @@ static void do_claim(struct rpivid_dev *
  	} else {
  		// Nothing else going on - schedule immediately and
  		// prevent anything else scheduling claims
@@ -189,7 +185,7 @@ index 5f86bbed8c1c..ada6107ab675 100644
  }
  
  static void ictl_init(struct rpivid_hw_irq_ctrl * const ictl)
-@@ -154,6 +192,8 @@ static void ictl_init(struct rpivid_hw_irq_ctrl * const ictl)
+@@ -154,6 +192,8 @@ static void ictl_init(struct rpivid_hw_i
  	ictl->tail = NULL;
  	ictl->irq = NULL;
  	ictl->no_sched = 0;
@@ -198,7 +194,7 @@ index 5f86bbed8c1c..ada6107ab675 100644
  }
  
  static void ictl_uninit(struct rpivid_hw_irq_ctrl * const ictl)
-@@ -203,11 +243,7 @@ static void do_thread(struct rpivid_dev * const dev,
+@@ -203,11 +243,7 @@ static void do_thread(struct rpivid_dev
  
  	spin_unlock_irqrestore(&ictl->lock, flags);
  
@@ -211,7 +207,7 @@ index 5f86bbed8c1c..ada6107ab675 100644
  }
  
  static irqreturn_t rpivid_irq_thread(int irq, void *data)
-@@ -231,6 +267,12 @@ void rpivid_hw_irq_active1_thread(struct rpivid_dev *dev,
+@@ -231,6 +267,12 @@ void rpivid_hw_irq_active1_thread(struct
  	pre_thread(dev, ient, thread_cb, ctx, &dev->ic_active1);
  }
  
@@ -224,11 +220,9 @@ index 5f86bbed8c1c..ada6107ab675 100644
  void rpivid_hw_irq_active1_claim(struct rpivid_dev *dev,
  				 struct rpivid_hw_irq_ent *ient,
  				 rpivid_irq_callback ready_cb, void *ctx)
-diff --git a/drivers/staging/media/rpivid/rpivid_hw.h b/drivers/staging/media/rpivid/rpivid_hw.h
-index cf4cc8be8a55..ec73a2332b73 100644
 --- a/drivers/staging/media/rpivid/rpivid_hw.h
 +++ b/drivers/staging/media/rpivid/rpivid_hw.h
-@@ -272,6 +272,9 @@ static inline void apb_write_vc_len(const struct rpivid_dev * const dev,
+@@ -272,6 +272,9 @@ static inline void apb_write_vc_len(cons
  		ARG_IC_ICTRL_ACTIVE1_INT_SET    |\
  		ARG_IC_ICTRL_ACTIVE2_INT_SET)
  
@@ -238,6 +232,3 @@ index cf4cc8be8a55..ec73a2332b73 100644
  /* Auto release once all CBs called */
  void rpivid_hw_irq_active1_claim(struct rpivid_dev *dev,
  				 struct rpivid_hw_irq_ent *ient,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0416-RFC-media-Add-media_request_-pin-unpin-API.patch b/root/target/linux/bcm27xx/patches-5.15/950-0404-RFC-media-Add-media_request_-pin-unpin-API.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0416-RFC-media-Add-media_request_-pin-unpin-API.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0404-RFC-media-Add-media_request_-pin-unpin-API.patch
index 09f29f8c..83c94283 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0416-RFC-media-Add-media_request_-pin-unpin-API.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0404-RFC-media-Add-media_request_-pin-unpin-API.patch
@@ -1,7 +1,7 @@
-From d4aab144db0ff8409335bde0e34f55b35bd03f6c Mon Sep 17 00:00:00 2001
+From 0c367a915cdafd7dc158ad2d61cfa211ec6fb129 Mon Sep 17 00:00:00 2001
 From: Ezequiel Garcia <ezequiel@collabora.com>
 Date: Sun, 21 Mar 2021 16:38:54 -0300
-Subject: [PATCH 416/634] RFC: media: Add media_request_{pin,unpin} API
+Subject: [PATCH 404/828] RFC: media: Add media_request_{pin,unpin} API
 
 This is probably not the API we will want to add, but it
 should show what semantics are needed by drivers.
@@ -23,11 +23,9 @@ Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
  include/media/media-request.h | 12 ++++++++++++
  2 files changed, 47 insertions(+)
 
-diff --git a/drivers/media/mc/mc-request.c b/drivers/media/mc/mc-request.c
-index addb8f2d8939..ee5b77a1a2f3 100644
 --- a/drivers/media/mc/mc-request.c
 +++ b/drivers/media/mc/mc-request.c
-@@ -505,3 +505,38 @@ void media_request_object_complete(struct media_request_object *obj)
+@@ -505,3 +505,38 @@ unlock:
  		media_request_put(req);
  }
  EXPORT_SYMBOL_GPL(media_request_object_complete);
@@ -66,11 +64,9 @@ index addb8f2d8939..ee5b77a1a2f3 100644
 +		media_request_put(req);
 +}
 +EXPORT_SYMBOL_GPL(media_request_unpin);
-diff --git a/include/media/media-request.h b/include/media/media-request.h
-index 3cd25a2717ce..0de5c2c94188 100644
 --- a/include/media/media-request.h
 +++ b/include/media/media-request.h
-@@ -189,6 +189,10 @@ static inline void media_request_get(struct media_request *req)
+@@ -189,6 +189,10 @@ static inline void media_request_get(str
   */
  void media_request_put(struct media_request *req);
  
@@ -81,7 +77,7 @@ index 3cd25a2717ce..0de5c2c94188 100644
  /**
   * media_request_get_by_fd - Get a media request by fd
   *
-@@ -228,6 +232,14 @@ static inline void media_request_put(struct media_request *req)
+@@ -228,6 +232,14 @@ static inline void media_request_put(str
  {
  }
  
@@ -96,6 +92,3 @@ index 3cd25a2717ce..0de5c2c94188 100644
  static inline struct media_request *
  media_request_get_by_fd(struct media_device *mdev, int request_fd)
  {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0417-media-rpivid-Add-a-Pass0-to-accumulate-slices-and-re.patch b/root/target/linux/bcm27xx/patches-5.15/950-0405-media-rpivid-Add-a-Pass0-to-accumulate-slices-and-re.patch
similarity index 88%
rename from root/target/linux/bcm27xx/patches-5.15/0417-media-rpivid-Add-a-Pass0-to-accumulate-slices-and-re.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0405-media-rpivid-Add-a-Pass0-to-accumulate-slices-and-re.patch
index 4d47fa4f..e5d98ea8 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0417-media-rpivid-Add-a-Pass0-to-accumulate-slices-and-re.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0405-media-rpivid-Add-a-Pass0-to-accumulate-slices-and-re.patch
@@ -1,7 +1,7 @@
-From fd59ede6682a0b7e377a380f4e3eb2ae25998efc Mon Sep 17 00:00:00 2001
+From 38fbe7901ea1169baf9579d3f712d7326366ba47 Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Thu, 11 Mar 2021 19:08:00 +0000
-Subject: [PATCH 417/634] media: rpivid: Add a Pass0 to accumulate slices and
+Subject: [PATCH 405/828] media: rpivid: Add a Pass0 to accumulate slices and
  rework job finish
 
 Due to overheads in assembling controls and requests it is worth having
@@ -27,11 +27,9 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  drivers/staging/media/rpivid/rpivid_hw.c   |   8 +-
  6 files changed, 374 insertions(+), 131 deletions(-)
 
-diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
-index ebd2a952f24b..2256f43f8a82 100644
 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c
 +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
-@@ -492,8 +492,6 @@ void v4l2_m2m_job_finish(struct v4l2_m2m_dev *m2m_dev,
+@@ -492,8 +492,6 @@ void v4l2_m2m_job_finish(struct v4l2_m2m
  	 * holding capture buffers. Those should use
  	 * v4l2_m2m_buf_done_and_job_finish() instead.
  	 */
@@ -40,11 +38,9 @@ index ebd2a952f24b..2256f43f8a82 100644
  	spin_lock_irqsave(&m2m_dev->job_spinlock, flags);
  	schedule_next = _v4l2_m2m_job_finish(m2m_dev, m2m_ctx);
  	spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags);
-diff --git a/drivers/staging/media/rpivid/rpivid.c b/drivers/staging/media/rpivid/rpivid.c
-index 08c838fcb577..56a6f87a8bbd 100644
 --- a/drivers/staging/media/rpivid/rpivid.c
 +++ b/drivers/staging/media/rpivid/rpivid.c
-@@ -79,17 +79,24 @@ static const struct rpivid_control rpivid_ctrls[] = {
+@@ -79,17 +79,24 @@ static const struct rpivid_control rpivi
  
  #define rpivid_ctrls_COUNT	ARRAY_SIZE(rpivid_ctrls)
  
@@ -71,8 +67,6 @@ index 08c838fcb577..56a6f87a8bbd 100644
  static int rpivid_init_ctrls(struct rpivid_dev *dev, struct rpivid_ctx *ctx)
  {
  	struct v4l2_ctrl_handler *hdl = &ctx->hdl;
-diff --git a/drivers/staging/media/rpivid/rpivid.h b/drivers/staging/media/rpivid/rpivid.h
-index 544bc9411a91..992098099039 100644
 --- a/drivers/staging/media/rpivid/rpivid.h
 +++ b/drivers/staging/media/rpivid/rpivid.h
 @@ -24,6 +24,10 @@
@@ -102,7 +96,7 @@ index 544bc9411a91..992098099039 100644
  
  struct rpivid_gptr {
  	size_t size;
-@@ -79,7 +83,6 @@ typedef void (*rpivid_irq_callback)(struct rpivid_dev *dev, void *ctx);
+@@ -79,7 +83,6 @@ typedef void (*rpivid_irq_callback)(stru
  struct rpivid_q_aux;
  #define RPIVID_AUX_ENT_COUNT VB2_MAX_FRAME
  
@@ -145,8 +139,6 @@ index 544bc9411a91..992098099039 100644
  void *rpivid_find_control_data(struct rpivid_ctx *ctx, u32 id);
  
  #endif
-diff --git a/drivers/staging/media/rpivid/rpivid_dec.c b/drivers/staging/media/rpivid/rpivid_dec.c
-index d81aa46de017..fa8af01d753b 100644
 --- a/drivers/staging/media/rpivid/rpivid_dec.c
 +++ b/drivers/staging/media/rpivid/rpivid_dec.c
 @@ -21,8 +21,8 @@
@@ -206,8 +198,6 @@ index d81aa46de017..fa8af01d753b 100644
 +	v4l2_m2m_buf_done_and_job_finish(dev->m2m_dev, ctx->fh.m2m_ctx,
 +					 VB2_BUF_STATE_ERROR);
  }
-diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
-index 4244532fca77..a2cb2b547c50 100644
 --- a/drivers/staging/media/rpivid/rpivid_h265.c
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
 @@ -22,6 +22,8 @@
@@ -271,7 +261,7 @@ index 4244532fca77..a2cb2b547c50 100644
  static inline int clip_int(const int x, const int lo, const int hi)
  {
  	return x < lo ? lo : x > hi ? hi : x;
-@@ -298,15 +316,48 @@ static inline int clip_int(const int x, const int lo, const int hi)
+@@ -298,15 +316,48 @@ static inline int clip_int(const int x,
  static int p1_z;
  #endif
  
@@ -310,15 +300,14 @@ index 4244532fca77..a2cb2b547c50 100644
  // ???? u16 addr - put in u32
 -static int p1_apb_write(struct rpivid_dec_env *const de, const u16 addr,
 -			const u32 data)
--{
++static void p1_apb_write(struct rpivid_dec_env *const de, const u16 addr,
++			 const u32 data)
+ {
 -	if (de->cmd_len == de->cmd_max)
 -		de->cmd_fifo =
 -			krealloc(de->cmd_fifo,
 -				 (de->cmd_max *= 2) * sizeof(struct rpi_cmd),
 -				 GFP_KERNEL);
-+static void p1_apb_write(struct rpivid_dec_env *const de, const u16 addr,
-+			 const u32 data)
-+{
 +	if (de->cmd_len >= de->cmd_max) {
 +		v4l2_err(&de->ctx->dev->v4l2_dev,
 +			 "%s: Overflow @ %d\n", __func__, de->cmd_len);
@@ -328,7 +317,7 @@ index 4244532fca77..a2cb2b547c50 100644
  	de->cmd_fifo[de->cmd_len].addr = addr;
  	de->cmd_fifo[de->cmd_len].data = data;
  
-@@ -316,8 +367,7 @@ static int p1_apb_write(struct rpivid_dec_env *const de, const u16 addr,
+@@ -316,8 +367,7 @@ static int p1_apb_write(struct rpivid_de
  			  de->cmd_len, addr, data);
  	}
  #endif
@@ -346,7 +335,7 @@ index 4244532fca77..a2cb2b547c50 100644
  static void write_prob(struct rpivid_dec_env *const de,
  		       const struct rpivid_dec_state *const s)
  {
-@@ -554,6 +605,7 @@ static void write_prob(struct rpivid_dec_env *const de,
+@@ -554,6 +605,7 @@ static void write_prob(struct rpivid_dec
  	p1_apb_write(de, RPI_TRANSFER, PROB_BACKUP);
  }
  
@@ -354,7 +343,7 @@ index 4244532fca77..a2cb2b547c50 100644
  static void write_scaling_factors(struct rpivid_dec_env *const de)
  {
  	int i;
-@@ -569,8 +621,9 @@ static inline __u32 dma_to_axi_addr(dma_addr_t a)
+@@ -569,8 +621,9 @@ static inline __u32 dma_to_axi_addr(dma_
  	return (__u32)(a >> 6);
  }
  
@@ -366,7 +355,7 @@ index 4244532fca77..a2cb2b547c50 100644
  {
  	// Note that FFmpeg V4L2 does not remove emulation prevention bytes,
  	// so this is matched in the configuration here.
-@@ -584,6 +637,13 @@ static void write_bitstream(struct rpivid_dec_env *const de,
+@@ -584,6 +637,13 @@ static void write_bitstream(struct rpivi
  	if (s->src_addr != 0) {
  		addr = s->src_addr + offset;
  	} else {
@@ -380,7 +369,7 @@ index 4244532fca77..a2cb2b547c50 100644
  		memcpy(de->bit_copy_gptr->ptr + de->bit_copy_len,
  		       s->src_buf + offset, len);
  		addr = de->bit_copy_gptr->addr + de->bit_copy_len;
-@@ -595,6 +655,7 @@ static void write_bitstream(struct rpivid_dec_env *const de,
+@@ -595,6 +655,7 @@ static void write_bitstream(struct rpivi
  	p1_apb_write(de, RPI_BFNUM, len);
  	p1_apb_write(de, RPI_BFCONTROL, offset + (1 << 7)); // Stop
  	p1_apb_write(de, RPI_BFCONTROL, offset + (rpi_use_emu << 6));
@@ -388,7 +377,7 @@ index 4244532fca77..a2cb2b547c50 100644
  }
  
  //////////////////////////////////////////////////////////////////////////////
-@@ -623,6 +684,7 @@ static u32 slice_reg_const(const struct rpivid_dec_state *const s)
+@@ -623,6 +684,7 @@ static u32 slice_reg_const(const struct
  
  //////////////////////////////////////////////////////////////////////////////
  
@@ -396,7 +385,7 @@ index 4244532fca77..a2cb2b547c50 100644
  static void new_slice_segment(struct rpivid_dec_env *const de,
  			      const struct rpivid_dec_state *const s)
  {
-@@ -706,6 +768,7 @@ static void msg_slice(struct rpivid_dec_env *const de, const u16 msg)
+@@ -706,6 +768,7 @@ static void msg_slice(struct rpivid_dec_
  	de->slice_msgs[de->num_slice_msgs++] = msg;
  }
  
@@ -404,7 +393,7 @@ index 4244532fca77..a2cb2b547c50 100644
  static void program_slicecmds(struct rpivid_dec_env *const de,
  			      const int sliceid)
  {
-@@ -902,6 +965,7 @@ static void pre_slice_decode(struct rpivid_dec_env *const de,
+@@ -902,6 +965,7 @@ static void pre_slice_decode(struct rpiv
  		       (sh->slice_cb_qp_offset & 31)); // CMD_QPOFF
  }
  
@@ -412,7 +401,7 @@ index 4244532fca77..a2cb2b547c50 100644
  static void write_slice(struct rpivid_dec_env *const de,
  			const struct rpivid_dec_state *const s,
  			const u32 slice_const,
-@@ -927,6 +991,7 @@ static void write_slice(struct rpivid_dec_env *const de,
+@@ -927,6 +991,7 @@ static void write_slice(struct rpivid_de
   * N.B. This can be called to fill in data from the previous slice so must not
   * use any state data that may change from slice to slice (e.g. qp)
   */
@@ -420,7 +409,7 @@ index 4244532fca77..a2cb2b547c50 100644
  static void new_entry_point(struct rpivid_dec_env *const de,
  			    const struct rpivid_dec_state *const s,
  			    const bool do_bte,
-@@ -977,6 +1042,7 @@ static void new_entry_point(struct rpivid_dec_env *const de,
+@@ -977,6 +1042,7 @@ static void new_entry_point(struct rpivi
  //////////////////////////////////////////////////////////////////////////////
  // Wavefront mode
  
@@ -428,7 +417,7 @@ index 4244532fca77..a2cb2b547c50 100644
  static void wpp_pause(struct rpivid_dec_env *const de, int ctb_row)
  {
  	p1_apb_write(de, RPI_STATUS, (ctb_row << 18) | 0x25);
-@@ -987,12 +1053,19 @@ static void wpp_pause(struct rpivid_dec_env *const de, int ctb_row)
+@@ -987,12 +1053,19 @@ static void wpp_pause(struct rpivid_dec_
  	p1_apb_write(de, RPI_CONTROL, (ctb_row << 16) + 2);
  }
  
@@ -451,7 +440,7 @@ index 4244532fca77..a2cb2b547c50 100644
  	while (de->entry_ctb_y < last_y) {
  		/* wpp_entry_x/y set by wpp_entry_point */
  		if (s->ctb_width > 2)
-@@ -1010,12 +1083,21 @@ static void wpp_entry_fill(struct rpivid_dec_env *const de,
+@@ -1010,12 +1083,21 @@ static void wpp_entry_fill(struct rpivid
  				0, 0, 0, de->entry_ctb_y + 1,
  				de->entry_qp, de->entry_slice);
  	}
@@ -476,7 +465,7 @@ index 4244532fca77..a2cb2b547c50 100644
  
  	if (de->entry_ctb_x < 2 &&
  	    (de->entry_ctb_y < s->start_ctb_y || s->start_ctb_x > 2) &&
-@@ -1026,21 +1108,38 @@ static void wpp_end_previous_slice(struct rpivid_dec_env *const de,
+@@ -1026,21 +1108,38 @@ static void wpp_end_previous_slice(struc
  	if (s->start_ctb_x == 2 ||
  	    (s->ctb_width == 2 && de->entry_ctb_y < s->start_ctb_y))
  		p1_apb_write(de, RPI_TRANSFER, PROB_BACKUP);
@@ -520,7 +509,7 @@ index 4244532fca77..a2cb2b547c50 100644
  
  	if (!s->start_ts || indep || s->ctb_width == 1)
  		write_prob(de, s);
-@@ -1056,7 +1155,13 @@ static void wpp_decode_slice(struct rpivid_dec_env *const de,
+@@ -1056,7 +1155,13 @@ static void wpp_decode_slice(struct rpiv
  			s->slice_qp, slice_reg_const(s));
  
  	if (s->frame_end) {
@@ -535,7 +524,7 @@ index 4244532fca77..a2cb2b547c50 100644
  
  		if (de->entry_ctb_x < 2 && s->ctb_width > 2)
  			wpp_pause(de, s->ctb_height - 1);
-@@ -1065,25 +1170,32 @@ static void wpp_decode_slice(struct rpivid_dec_env *const de,
+@@ -1065,25 +1170,32 @@ static void wpp_decode_slice(struct rpiv
  			     1 | ((s->ctb_width - 1) << 5) |
  				((s->ctb_height - 1) << 18));
  	}
@@ -573,7 +562,7 @@ index 4244532fca77..a2cb2b547c50 100644
  		p1_apb_write(de, RPI_STATUS,
  			     2 | (last_x << 5) | (last_y << 18));
  		p1_apb_write(de, RPI_TRANSFER, PROB_RELOAD);
-@@ -1098,33 +1210,55 @@ static void tile_entry_fill(struct rpivid_dec_env *const de,
+@@ -1098,33 +1210,55 @@ static void tile_entry_fill(struct rpivi
  				t_x, t_y, s->col_bd[t_x], s->row_bd[t_y],
  				de->entry_qp, de->entry_slice);
  	}
@@ -613,15 +602,15 @@ index 4244532fca77..a2cb2b547c50 100644
  	unsigned int tile_x = ctb_to_tile_x(s, s->start_ctb_x);
  	unsigned int tile_y = ctb_to_tile_y(s, s->start_ctb_y);
 +	int rv;
-+
+ 
+-	if (s->start_ts)
+-		end_previous_slice(de, s);
 +	if (s->start_ts) {
 +		rv = end_previous_slice(de, s);
 +		if (rv)
 +			return rv;
 +	}
- 
--	if (s->start_ts)
--		end_previous_slice(de, s);
++
 +	rv = cmds_check_space(de,
 +			      CMDS_WRITE_BITSTREAM +
 +				CMDS_WRITE_PROB +
@@ -639,7 +628,7 @@ index 4244532fca77..a2cb2b547c50 100644
  
  	reset_qp_y = !s->start_ts ||
  		!s->dependent_slice_segment_flag ||
-@@ -1146,13 +1280,16 @@ static void decode_slice(struct rpivid_dec_env *const de,
+@@ -1146,13 +1280,16 @@ static void decode_slice(struct rpivid_d
  	 * when it will be known where this slice finishes
  	 */
  	if (s->frame_end) {
@@ -659,7 +648,7 @@ index 4244532fca77..a2cb2b547c50 100644
  }
  
  //////////////////////////////////////////////////////////////////////////////
-@@ -1524,7 +1661,7 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1524,7 +1661,7 @@ static void rpivid_h265_setup(struct rpi
  	struct rpivid_dev *const dev = ctx->dev;
  	const struct v4l2_ctrl_hevc_slice_params *const sh =
  						run->h265.slice_params;
@@ -668,7 +657,7 @@ index 4244532fca77..a2cb2b547c50 100644
  	struct rpivid_q_aux *dpb_q_aux[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
  	struct rpivid_dec_state *const s = ctx->state;
  	struct vb2_queue *vq;
-@@ -1532,11 +1669,12 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1532,11 +1669,12 @@ static void rpivid_h265_setup(struct rpi
  	unsigned int prev_rs;
  	unsigned int i;
  	int use_aux;
@@ -682,7 +671,7 @@ index 4244532fca77..a2cb2b547c50 100644
  
  	s->frame_end =
  		((run->src->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF) == 0);
-@@ -1608,9 +1746,9 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1608,9 +1746,9 @@ static void rpivid_h265_setup(struct rpi
  		de->cmd_len = 0;
  		de->dpbno_col = ~0U;
  
@@ -694,7 +683,7 @@ index 4244532fca77..a2cb2b547c50 100644
  
  		de->frame_c_offset = ctx->dst_fmt.height * 128;
  		de->frame_stride = ctx->dst_fmt.plane_fmt[0].bytesperline * 128;
-@@ -1727,6 +1865,9 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1727,6 +1865,9 @@ static void rpivid_h265_setup(struct rpi
  			bits_alloc = wxh < 983040 ? wxh * 3 / 4 :
  				wxh < 983040 * 2 ? 983040 * 3 / 4 :
  				wxh * 3 / 8;
@@ -704,7 +693,7 @@ index 4244532fca77..a2cb2b547c50 100644
  			bits_alloc = round_up_size(bits_alloc);
  
  			if (gptr_alloc(dev, de->bit_copy_gptr,
-@@ -1743,18 +1884,35 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1743,18 +1884,35 @@ static void rpivid_h265_setup(struct rpi
  		}
  	}
  
@@ -747,7 +736,7 @@ index 4244532fca77..a2cb2b547c50 100644
  	s->sh = sh;
  	s->slice_qp = 26 + s->pps.init_qp_minus26 + s->sh->slice_qp_delta;
  	s->max_num_merge_cand = sh->slice_type == HEVC_SLICE_I ?
-@@ -1785,9 +1943,11 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1785,9 +1943,11 @@ static void rpivid_h265_setup(struct rpi
  	s->prev_ctb_y = prev_rs / de->pic_width_in_ctbs_y;
  
  	if ((s->pps.flags & V4L2_HEVC_PPS_FLAG_ENTROPY_CODING_SYNC_ENABLED))
@@ -761,7 +750,7 @@ index 4244532fca77..a2cb2b547c50 100644
  
  	if (!s->frame_end) {
  		xtrace_ok(dev, de);
-@@ -1945,29 +2105,28 @@ static int check_status(const struct rpivid_dev *const dev)
+@@ -1945,29 +2105,28 @@ static int check_status(const struct rpi
  	return -1;
  }
  
@@ -804,7 +793,7 @@ index 4244532fca77..a2cb2b547c50 100644
  }
  
  static void phase2_claimed(struct rpivid_dev *const dev, void *v)
-@@ -2023,7 +2182,7 @@ static void phase2_claimed(struct rpivid_dev *const dev, void *v)
+@@ -2023,7 +2182,7 @@ static void phase2_claimed(struct rpivid
  	//	   de->ctx->colmvbuf.addr, de->ctx->colmvbuf.addr +
  	//	   de->ctx->colmvbuf.size);
  
@@ -813,7 +802,7 @@ index 4244532fca77..a2cb2b547c50 100644
  
  	apb_write_final(dev, RPI_NUMROWS, de->pic_height_in_ctbs_y);
  
-@@ -2032,6 +2191,39 @@ static void phase2_claimed(struct rpivid_dev *const dev, void *v)
+@@ -2032,6 +2191,39 @@ static void phase2_claimed(struct rpivid
  
  static void phase1_claimed(struct rpivid_dev *const dev, void *v);
  
@@ -853,7 +842,7 @@ index 4244532fca77..a2cb2b547c50 100644
  static void phase1_thread(struct rpivid_dev *const dev, void *v)
  {
  	struct rpivid_dec_env *const de = v;
-@@ -2076,15 +2268,12 @@ static void phase1_thread(struct rpivid_dev *const dev, void *v)
+@@ -2076,15 +2268,12 @@ fail:
  			 __func__);
  		ctx->fatal_err = 1;
  	}
@@ -871,7 +860,7 @@ index 4244532fca77..a2cb2b547c50 100644
  {
  	struct rpivid_dec_env *const de = v;
  	struct rpivid_ctx *const ctx = de->ctx;
-@@ -2092,6 +2281,7 @@ static void cb_phase1(struct rpivid_dev *const dev, void *v)
+@@ -2092,6 +2281,7 @@ static void cb_phase1(struct rpivid_dev
  	xtrace_in(dev, de);
  
  	de->p1_status = check_status(dev);
@@ -879,7 +868,7 @@ index 4244532fca77..a2cb2b547c50 100644
  	if (de->p1_status != 0) {
  		v4l2_info(&dev->v4l2_dev, "%s: Post wait: %#x\n",
  			  __func__, de->p1_status);
-@@ -2105,24 +2295,17 @@ static void cb_phase1(struct rpivid_dev *const dev, void *v)
+@@ -2105,24 +2295,17 @@ static void cb_phase1(struct rpivid_dev
  		return;
  	}
  
@@ -910,7 +899,7 @@ index 4244532fca77..a2cb2b547c50 100644
  	}
  
  	rpivid_hw_irq_active2_claim(dev, &de->irq_ent, phase2_claimed, de);
-@@ -2131,11 +2314,8 @@ static void cb_phase1(struct rpivid_dev *const dev, void *v)
+@@ -2131,11 +2314,8 @@ static void cb_phase1(struct rpivid_dev
  	return;
  
  fail:
@@ -923,7 +912,7 @@ index 4244532fca77..a2cb2b547c50 100644
  }
  
  static void phase1_claimed(struct rpivid_dev *const dev, void *v)
-@@ -2160,6 +2340,10 @@ static void phase1_claimed(struct rpivid_dev *const dev, void *v)
+@@ -2160,6 +2340,10 @@ static void phase1_claimed(struct rpivid
  	de->coeff_stride =
  		ALIGN_DOWN(coeff_gptr->size / de->pic_height_in_ctbs_y, 64);
  
@@ -934,7 +923,7 @@ index 4244532fca77..a2cb2b547c50 100644
  	apb_write_vc_addr(dev, RPI_PUWBASE, de->pu_base_vc);
  	apb_write_vc_len(dev, RPI_PUWSTRIDE, de->pu_stride);
  	apb_write_vc_addr(dev, RPI_COEFFWBASE, de->coeff_base_vc);
-@@ -2169,7 +2353,7 @@ static void phase1_claimed(struct rpivid_dev *const dev, void *v)
+@@ -2169,7 +2353,7 @@ static void phase1_claimed(struct rpivid
  	apb_write(dev, RPI_CFNUM, de->cmd_len);
  
  	// Claim irq
@@ -943,7 +932,7 @@ index 4244532fca77..a2cb2b547c50 100644
  
  	// And start the h/w
  	apb_write_vc_addr_final(dev, RPI_CFBASE, de->cmd_copy_gptr->addr);
-@@ -2178,11 +2362,8 @@ static void phase1_claimed(struct rpivid_dev *const dev, void *v)
+@@ -2178,11 +2362,8 @@ static void phase1_claimed(struct rpivid
  	return;
  
  fail:
@@ -956,7 +945,7 @@ index 4244532fca77..a2cb2b547c50 100644
  }
  
  static void dec_state_delete(struct rpivid_ctx *const ctx)
-@@ -2315,7 +2496,9 @@ static void rpivid_h265_trigger(struct rpivid_ctx *ctx)
+@@ -2315,7 +2496,9 @@ static void rpivid_h265_trigger(struct r
  	case RPIVID_DECODE_SLICE_CONTINUE:
  		v4l2_m2m_buf_done_and_job_finish(dev->m2m_dev, ctx->fh.m2m_ctx,
  						 VB2_BUF_STATE_DONE);
@@ -966,7 +955,7 @@ index 4244532fca77..a2cb2b547c50 100644
  	default:
  		v4l2_err(&dev->v4l2_dev, "%s: Unexpected state: %d\n", __func__,
  			 de->state);
-@@ -2329,14 +2512,59 @@ static void rpivid_h265_trigger(struct rpivid_ctx *ctx)
+@@ -2329,14 +2512,59 @@ static void rpivid_h265_trigger(struct r
  		v4l2_m2m_buf_done_and_job_finish(dev->m2m_dev, ctx->fh.m2m_ctx,
  						 VB2_BUF_STATE_ERROR);
  		break;
@@ -1028,11 +1017,9 @@ index 4244532fca77..a2cb2b547c50 100644
  }
  
  struct rpivid_dec_ops rpivid_dec_ops_h265 = {
-diff --git a/drivers/staging/media/rpivid/rpivid_hw.c b/drivers/staging/media/rpivid/rpivid_hw.c
-index ada6107ab675..396263bb352e 100644
 --- a/drivers/staging/media/rpivid/rpivid_hw.c
 +++ b/drivers/staging/media/rpivid/rpivid_hw.c
-@@ -185,14 +185,14 @@ static void do_enable_claim(struct rpivid_dev * const dev,
+@@ -185,14 +185,14 @@ static void do_enable_claim(struct rpivi
  	sched_cb(dev, ictl, ient);
  }
  
@@ -1049,7 +1036,7 @@ index ada6107ab675..396263bb352e 100644
  	ictl->thread_reqed = false;
  }
  
-@@ -308,8 +308,8 @@ int rpivid_hw_probe(struct rpivid_dev *dev)
+@@ -308,8 +308,8 @@ int rpivid_hw_probe(struct rpivid_dev *d
  	int irq_dec;
  	int ret = 0;
  
@@ -1060,6 +1047,3 @@ index ada6107ab675..396263bb352e 100644
  
  	res = platform_get_resource_byname(dev->pdev, IORESOURCE_MEM, "intc");
  	if (!res)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0418-media-rpivid-Map-cmd-buffer-directly.patch b/root/target/linux/bcm27xx/patches-5.15/950-0406-media-rpivid-Map-cmd-buffer-directly.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0418-media-rpivid-Map-cmd-buffer-directly.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0406-media-rpivid-Map-cmd-buffer-directly.patch
index 83820e07..204fbace 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0418-media-rpivid-Map-cmd-buffer-directly.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0406-media-rpivid-Map-cmd-buffer-directly.patch
@@ -1,7 +1,7 @@
-From 03f36eab98ae6f4818e136c8edd7615aafd69198 Mon Sep 17 00:00:00 2001
+From 8afacccbc29d5cc8938246a66038a997f7fb2dde Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Mon, 29 Mar 2021 17:42:16 +0100
-Subject: [PATCH 418/634] media: rpivid: Map cmd buffer directly
+Subject: [PATCH 406/828] media: rpivid: Map cmd buffer directly
 
 It is unnecessary to have a separate dmabuf to hold the cmd buffer.
 Map it directly from the kmalloc.
@@ -13,8 +13,6 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  drivers/staging/media/rpivid/rpivid_hw.c   |  2 +
  3 files changed, 25 insertions(+), 28 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid.h b/drivers/staging/media/rpivid/rpivid.h
-index 992098099039..ede92c9ef7d9 100644
 --- a/drivers/staging/media/rpivid/rpivid.h
 +++ b/drivers/staging/media/rpivid/rpivid.h
 @@ -114,7 +114,6 @@ struct rpivid_ctx {
@@ -34,8 +32,6 @@ index 992098099039..ede92c9ef7d9 100644
  	struct rpivid_hw_irq_ctrl ic_active1;
  	struct rpivid_hw_irq_ctrl ic_active2;
  };
-diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
-index a2cb2b547c50..9eb87045b841 100644
 --- a/drivers/staging/media/rpivid/rpivid_h265.c
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
 @@ -227,6 +227,9 @@ struct rpivid_dec_env {
@@ -56,7 +52,7 @@ index a2cb2b547c50..9eb87045b841 100644
  
  #define SLICE_MSGS_MAX (2 * HEVC_MAX_REFS * 8 + 3)
  	u16 slice_msgs[SLICE_MSGS_MAX];
-@@ -1499,22 +1501,17 @@ static int write_cmd_buffer(struct rpivid_dev *const dev,
+@@ -1499,22 +1501,17 @@ static int write_cmd_buffer(struct rpivi
  			    struct rpivid_dec_env *const de,
  			    const struct rpivid_dec_state *const s)
  {
@@ -88,7 +84,7 @@ index a2cb2b547c50..9eb87045b841 100644
  	return 0;
  }
  
-@@ -1551,6 +1548,12 @@ static void dec_env_delete(struct rpivid_dec_env *const de)
+@@ -1551,6 +1548,12 @@ static void dec_env_delete(struct rpivid
  	struct rpivid_ctx * const ctx = de->ctx;
  	unsigned long lock_flags;
  
@@ -101,7 +97,7 @@ index a2cb2b547c50..9eb87045b841 100644
  	aux_q_release(ctx, &de->frame_aux);
  	aux_q_release(ctx, &de->col_aux);
  
-@@ -1603,7 +1606,8 @@ static int dec_env_init(struct rpivid_ctx *const ctx)
+@@ -1603,7 +1606,8 @@ static int dec_env_init(struct rpivid_ct
  
  		de->ctx = ctx;
  		de->decode_order = i;
@@ -111,7 +107,7 @@ index a2cb2b547c50..9eb87045b841 100644
  		de->cmd_fifo = kmalloc_array(de->cmd_max,
  					     sizeof(struct rpi_cmd),
  					     GFP_KERNEL);
-@@ -1748,7 +1752,6 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1748,7 +1752,6 @@ static void rpivid_h265_setup(struct rpi
  
  		de->bit_copy_gptr = ctx->bitbufs + ctx->p1idx;
  		de->bit_copy_len = 0;
@@ -119,7 +115,7 @@ index a2cb2b547c50..9eb87045b841 100644
  
  		de->frame_c_offset = ctx->dst_fmt.height * 128;
  		de->frame_stride = ctx->dst_fmt.plane_fmt[0].bytesperline * 128;
-@@ -2356,7 +2359,7 @@ static void phase1_claimed(struct rpivid_dev *const dev, void *v)
+@@ -2356,7 +2359,7 @@ static void phase1_claimed(struct rpivid
  	rpivid_hw_irq_active1_irq(dev, &de->irq_ent, phase1_cb, de);
  
  	// And start the h/w
@@ -128,7 +124,7 @@ index a2cb2b547c50..9eb87045b841 100644
  
  	xtrace_ok(dev, de);
  	return;
-@@ -2400,8 +2403,6 @@ static void rpivid_h265_stop(struct rpivid_ctx *ctx)
+@@ -2400,8 +2403,6 @@ static void rpivid_h265_stop(struct rpiv
  
  	for (i = 0; i != ARRAY_SIZE(ctx->bitbufs); ++i)
  		gptr_free(dev, ctx->bitbufs + i);
@@ -137,7 +133,7 @@ index a2cb2b547c50..9eb87045b841 100644
  	for (i = 0; i != ARRAY_SIZE(ctx->pu_bufs); ++i)
  		gptr_free(dev, ctx->pu_bufs + i);
  	for (i = 0; i != ARRAY_SIZE(ctx->coeff_bufs); ++i)
-@@ -2451,13 +2452,6 @@ static int rpivid_h265_start(struct rpivid_ctx *ctx)
+@@ -2451,13 +2452,6 @@ static int rpivid_h265_start(struct rpiv
  		goto fail;
  	}
  
@@ -151,11 +147,9 @@ index a2cb2b547c50..9eb87045b841 100644
  	// Finger in the air PU & Coeff alloc
  	// Will be realloced if too small
  	coeff_alloc = round_up_size(wxh);
-diff --git a/drivers/staging/media/rpivid/rpivid_hw.c b/drivers/staging/media/rpivid/rpivid_hw.c
-index 396263bb352e..2bb86d564b33 100644
 --- a/drivers/staging/media/rpivid/rpivid_hw.c
 +++ b/drivers/staging/media/rpivid/rpivid_hw.c
-@@ -331,6 +331,8 @@ int rpivid_hw_probe(struct rpivid_dev *dev)
+@@ -331,6 +331,8 @@ int rpivid_hw_probe(struct rpivid_dev *d
  	if (IS_ERR(dev->clock))
  		return PTR_ERR(dev->clock);
  
@@ -164,6 +158,3 @@ index 396263bb352e..2bb86d564b33 100644
  	// Disable IRQs & reset anything pending
  	irq_write(dev, 0,
  		  ARG_IC_ICTRL_ACTIVE1_EN_SET | ARG_IC_ICTRL_ACTIVE2_EN_SET);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0419-media-rpivid-Improve-values-returned-when-setting-ou.patch b/root/target/linux/bcm27xx/patches-5.15/950-0407-media-rpivid-Improve-values-returned-when-setting-ou.patch
similarity index 86%
rename from root/target/linux/bcm27xx/patches-5.15/0419-media-rpivid-Improve-values-returned-when-setting-ou.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0407-media-rpivid-Improve-values-returned-when-setting-ou.patch
index 1ef18b74..1d484cff 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0419-media-rpivid-Improve-values-returned-when-setting-ou.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0407-media-rpivid-Improve-values-returned-when-setting-ou.patch
@@ -1,7 +1,7 @@
-From 2e3d40f7db563489d9c4f4d31ef23a632e94f825 Mon Sep 17 00:00:00 2001
+From e5c2c2b862bd13698e2e18ac38b3fb3206db21b5 Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Thu, 1 Apr 2021 16:20:58 +0100
-Subject: [PATCH 419/634] media: rpivid: Improve values returned when setting
+Subject: [PATCH 407/828] media: rpivid: Improve values returned when setting
  output format
 
 Guess a better value for the compressed bitstream buffer size
@@ -13,8 +13,6 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  drivers/staging/media/rpivid/rpivid_video.h |  4 ++
  3 files changed, 70 insertions(+), 61 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
-index 9eb87045b841..ee5a48f26912 100644
 --- a/drivers/staging/media/rpivid/rpivid_h265.c
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
 @@ -18,6 +18,7 @@
@@ -25,7 +23,7 @@ index 9eb87045b841..ee5a48f26912 100644
  
  #define DEBUG_TRACE_P1_CMD 0
  #define DEBUG_TRACE_EXECUTION 0
-@@ -115,41 +116,9 @@ static int gptr_realloc_new(struct rpivid_dev * const dev,
+@@ -115,41 +116,9 @@ static int gptr_realloc_new(struct rpivi
  	return 0;
  }
  
@@ -68,7 +66,7 @@ index 9eb87045b841..ee5a48f26912 100644
  }
  
  #define NUM_SCALING_FACTORS 4064 /* Not a typo = 0xbe0 + 0x400 */
-@@ -332,7 +301,7 @@ static int cmds_check_space(struct rpivid_dec_env *const de, unsigned int n)
+@@ -332,7 +301,7 @@ static int cmds_check_space(struct rpivi
  	if (de->cmd_len + n <= de->cmd_max)
  		return 0;
  
@@ -77,7 +75,7 @@ index 9eb87045b841..ee5a48f26912 100644
  
  	a = krealloc(de->cmd_fifo, newmax * sizeof(struct rpi_cmd),
  		     GFP_KERNEL);
-@@ -1855,23 +1824,10 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1855,23 +1824,10 @@ static void rpivid_h265_setup(struct rpi
  		 * slice as we can use the src buf directly
  		 */
  		if (!s->frame_end && !de->bit_copy_gptr->ptr) {
@@ -104,7 +102,7 @@ index 9eb87045b841..ee5a48f26912 100644
  
  			if (gptr_alloc(dev, de->bit_copy_gptr,
  				       bits_alloc,
-@@ -2454,17 +2410,15 @@ static int rpivid_h265_start(struct rpivid_ctx *ctx)
+@@ -2454,17 +2410,15 @@ static int rpivid_h265_start(struct rpiv
  
  	// Finger in the air PU & Coeff alloc
  	// Will be realloced if too small
@@ -126,11 +124,9 @@ index 9eb87045b841..ee5a48f26912 100644
  			goto fail;
  	}
  	aux_q_init(ctx);
-diff --git a/drivers/staging/media/rpivid/rpivid_video.c b/drivers/staging/media/rpivid/rpivid_video.c
-index 30fa77652790..3d882a6853a5 100644
 --- a/drivers/staging/media/rpivid/rpivid_video.c
 +++ b/drivers/staging/media/rpivid/rpivid_video.c
-@@ -42,18 +42,69 @@ static inline unsigned int constrain2x(unsigned int x, unsigned int y)
+@@ -42,18 +42,69 @@ static inline unsigned int constrain2x(u
  			(x > y * 2) ? y : x;
  }
  
@@ -205,11 +201,9 @@ index 30fa77652790..3d882a6853a5 100644
  	return 0;
  }
  
-diff --git a/drivers/staging/media/rpivid/rpivid_video.h b/drivers/staging/media/rpivid/rpivid_video.h
-index 5c0fd9c8a6d7..a3b228556497 100644
 --- a/drivers/staging/media/rpivid/rpivid_video.h
 +++ b/drivers/staging/media/rpivid/rpivid_video.h
-@@ -24,6 +24,10 @@ extern const struct v4l2_ioctl_ops rpivid_ioctl_ops;
+@@ -24,6 +24,10 @@ extern const struct v4l2_ioctl_ops rpivi
  
  int rpivid_queue_init(void *priv, struct vb2_queue *src_vq,
  		      struct vb2_queue *dst_vq);
@@ -220,6 +214,3 @@ index 5c0fd9c8a6d7..a3b228556497 100644
  int rpivid_prepare_src_format(struct v4l2_pix_format_mplane *pix_fmt);
  int rpivid_prepare_dst_format(struct v4l2_pix_format_mplane *pix_fmt);
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0420-media-rpivid-Improve-stream_on-off-conformance-clock.patch b/root/target/linux/bcm27xx/patches-5.15/950-0408-media-rpivid-Improve-stream_on-off-conformance-clock.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0420-media-rpivid-Improve-stream_on-off-conformance-clock.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0408-media-rpivid-Improve-stream_on-off-conformance-clock.patch
index e70f7561..48b1b0a7 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0420-media-rpivid-Improve-stream_on-off-conformance-clock.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0408-media-rpivid-Improve-stream_on-off-conformance-clock.patch
@@ -1,7 +1,7 @@
-From f341023a4cde353845f10fdb79e92919d421b501 Mon Sep 17 00:00:00 2001
+From b8337680abf3693fc7a4e4ac289b79507f0ce506 Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Sat, 3 Apr 2021 16:27:03 +0100
-Subject: [PATCH 420/634] media: rpivid: Improve stream_on/off conformance &
+Subject: [PATCH 408/828] media: rpivid: Improve stream_on/off conformance &
  clock setup
 
 Fix stream on & off such that failures leave the driver in the correct
@@ -16,11 +16,9 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  drivers/staging/media/rpivid/rpivid_video.c | 103 +++++++++++++++-----
  4 files changed, 101 insertions(+), 26 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid.c b/drivers/staging/media/rpivid/rpivid.c
-index 56a6f87a8bbd..0cd7891d0c48 100644
 --- a/drivers/staging/media/rpivid/rpivid.c
 +++ b/drivers/staging/media/rpivid/rpivid.c
-@@ -212,9 +212,12 @@ static int rpivid_open(struct file *file)
+@@ -212,9 +212,12 @@ static int rpivid_open(struct file *file
  	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
  	if (!ctx) {
  		mutex_unlock(&dev->dev_mutex);
@@ -34,7 +32,7 @@ index 56a6f87a8bbd..0cd7891d0c48 100644
  	v4l2_fh_init(&ctx->fh, video_devdata(file));
  	file->private_data = &ctx->fh;
  	ctx->dev = dev;
-@@ -245,7 +248,9 @@ static int rpivid_open(struct file *file)
+@@ -245,7 +248,9 @@ static int rpivid_open(struct file *file
  err_ctrls:
  	v4l2_ctrl_handler_free(&ctx->hdl);
  err_free:
@@ -44,7 +42,7 @@ index 56a6f87a8bbd..0cd7891d0c48 100644
  	mutex_unlock(&dev->dev_mutex);
  
  	return ret;
-@@ -266,6 +271,7 @@ static int rpivid_release(struct file *file)
+@@ -266,6 +271,7 @@ static int rpivid_release(struct file *f
  	kfree(ctx->ctrls);
  
  	v4l2_fh_exit(&ctx->fh);
@@ -52,8 +50,6 @@ index 56a6f87a8bbd..0cd7891d0c48 100644
  
  	kfree(ctx);
  
-diff --git a/drivers/staging/media/rpivid/rpivid.h b/drivers/staging/media/rpivid/rpivid.h
-index ede92c9ef7d9..4e249033424e 100644
 --- a/drivers/staging/media/rpivid/rpivid.h
 +++ b/drivers/staging/media/rpivid/rpivid.h
 @@ -84,6 +84,11 @@ struct rpivid_q_aux;
@@ -96,11 +92,9 @@ index ede92c9ef7d9..4e249033424e 100644
  
  	int			cache_align;
  
-diff --git a/drivers/staging/media/rpivid/rpivid_hw.c b/drivers/staging/media/rpivid/rpivid_hw.c
-index 2bb86d564b33..e7d1793105c5 100644
 --- a/drivers/staging/media/rpivid/rpivid_hw.c
 +++ b/drivers/staging/media/rpivid/rpivid_hw.c
-@@ -359,6 +359,7 @@ int rpivid_hw_probe(struct rpivid_dev *dev)
+@@ -359,6 +359,7 @@ int rpivid_hw_probe(struct rpivid_dev *d
  void rpivid_hw_remove(struct rpivid_dev *dev)
  {
  	// IRQ auto freed on unload so no need to do it here
@@ -108,8 +102,6 @@ index 2bb86d564b33..e7d1793105c5 100644
  	ictl_uninit(&dev->ic_active1);
  	ictl_uninit(&dev->ic_active2);
  }
-diff --git a/drivers/staging/media/rpivid/rpivid_video.c b/drivers/staging/media/rpivid/rpivid_video.c
-index 3d882a6853a5..705015890e71 100644
 --- a/drivers/staging/media/rpivid/rpivid_video.c
 +++ b/drivers/staging/media/rpivid/rpivid_video.c
 @@ -18,6 +18,7 @@
@@ -120,7 +112,7 @@ index 3d882a6853a5..705015890e71 100644
  #include "rpivid_video.h"
  #include "rpivid_dec.h"
  
-@@ -533,33 +534,85 @@ static int rpivid_buf_prepare(struct vb2_buffer *vb)
+@@ -533,33 +534,85 @@ static int rpivid_buf_prepare(struct vb2
  	return 0;
  }
  
@@ -220,7 +212,7 @@ index 3d882a6853a5..705015890e71 100644
  	return ret;
  }
  
-@@ -568,17 +621,19 @@ static void rpivid_stop_streaming(struct vb2_queue *vq)
+@@ -568,17 +621,19 @@ static void rpivid_stop_streaming(struct
  	struct rpivid_ctx *ctx = vb2_get_drv_priv(vq);
  	struct rpivid_dev *dev = ctx->dev;
  
@@ -248,7 +240,7 @@ index 3d882a6853a5..705015890e71 100644
  }
  
  static void rpivid_buf_queue(struct vb2_buffer *vb)
-@@ -622,7 +677,7 @@ int rpivid_queue_init(void *priv, struct vb2_queue *src_vq,
+@@ -622,7 +677,7 @@ int rpivid_queue_init(void *priv, struct
  	src_vq->ops = &rpivid_qops;
  	src_vq->mem_ops = &vb2_dma_contig_memops;
  	src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
@@ -257,7 +249,7 @@ index 3d882a6853a5..705015890e71 100644
  	src_vq->dev = ctx->dev->dev;
  	src_vq->supports_requests = true;
  	src_vq->requires_requests = true;
-@@ -639,7 +694,7 @@ int rpivid_queue_init(void *priv, struct vb2_queue *src_vq,
+@@ -639,7 +694,7 @@ int rpivid_queue_init(void *priv, struct
  	dst_vq->ops = &rpivid_qops;
  	dst_vq->mem_ops = &vb2_dma_contig_memops;
  	dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
@@ -266,6 +258,3 @@ index 3d882a6853a5..705015890e71 100644
  	dst_vq->dev = ctx->dev->dev;
  
  	return vb2_queue_init(dst_vq);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0421-media-rpivid-Improve-SPS-PPS-error-handling-validati.patch b/root/target/linux/bcm27xx/patches-5.15/950-0409-media-rpivid-Improve-SPS-PPS-error-handling-validati.patch
similarity index 84%
rename from root/target/linux/bcm27xx/patches-5.15/0421-media-rpivid-Improve-SPS-PPS-error-handling-validati.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0409-media-rpivid-Improve-SPS-PPS-error-handling-validati.patch
index 9b8ca376..b07645d5 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0421-media-rpivid-Improve-SPS-PPS-error-handling-validati.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0409-media-rpivid-Improve-SPS-PPS-error-handling-validati.patch
@@ -1,7 +1,7 @@
-From 2c7938a3a02738ff8c707ae0a9080c0b05089b48 Mon Sep 17 00:00:00 2001
+From 3662607e23df636a3e88bcb4e012f416bbb55934 Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Thu, 8 Apr 2021 18:34:09 +0100
-Subject: [PATCH 421/634] media: rpivid: Improve SPS/PPS error
+Subject: [PATCH 409/828] media: rpivid: Improve SPS/PPS error
  handling/validation
 
 Move size and width checking from bitstream processing to control
@@ -14,11 +14,9 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  drivers/staging/media/rpivid/rpivid_h265.c | 132 ++++++++++++++++++---
  3 files changed, 121 insertions(+), 22 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid.c b/drivers/staging/media/rpivid/rpivid.c
-index 0cd7891d0c48..9d93ed757ebc 100644
 --- a/drivers/staging/media/rpivid/rpivid.c
 +++ b/drivers/staging/media/rpivid/rpivid.c
-@@ -38,12 +38,14 @@ static const struct rpivid_control rpivid_ctrls[] = {
+@@ -38,12 +38,14 @@ static const struct rpivid_control rpivi
  	{
  		.cfg = {
  			.id	= V4L2_CID_MPEG_VIDEO_HEVC_SPS,
@@ -33,7 +31,7 @@ index 0cd7891d0c48..9d93ed757ebc 100644
  		},
  		.required	= true,
  	},
-@@ -119,7 +121,7 @@ static int rpivid_init_ctrls(struct rpivid_dev *dev, struct rpivid_ctx *ctx)
+@@ -119,7 +121,7 @@ static int rpivid_init_ctrls(struct rpiv
  
  	for (i = 0; i < rpivid_ctrls_COUNT; i++) {
  		ctrl = v4l2_ctrl_new_custom(hdl, &rpivid_ctrls[i].cfg,
@@ -42,7 +40,7 @@ index 0cd7891d0c48..9d93ed757ebc 100644
  		if (hdl->error) {
  			v4l2_err(&dev->v4l2_dev,
  				 "Failed to create new custom control id=%#x\n",
-@@ -191,6 +193,7 @@ static int rpivid_request_validate(struct media_request *req)
+@@ -191,6 +193,7 @@ static int rpivid_request_validate(struc
  		if (!ctrl_test) {
  			v4l2_info(&ctx->dev->v4l2_dev,
  				  "Missing required codec control\n");
@@ -50,8 +48,6 @@ index 0cd7891d0c48..9d93ed757ebc 100644
  			return -ENOENT;
  		}
  	}
-diff --git a/drivers/staging/media/rpivid/rpivid.h b/drivers/staging/media/rpivid/rpivid.h
-index 4e249033424e..c4bc72d512ab 100644
 --- a/drivers/staging/media/rpivid/rpivid.h
 +++ b/drivers/staging/media/rpivid/rpivid.h
 @@ -185,7 +185,7 @@ struct rpivid_dev {
@@ -74,11 +70,9 @@ index 4e249033424e..c4bc72d512ab 100644
  
  struct v4l2_ctrl *rpivid_find_ctrl(struct rpivid_ctx *ctx, u32 id);
  void *rpivid_find_control_data(struct rpivid_ctx *ctx, u32 id);
-diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
-index ee5a48f26912..bb280b215a2e 100644
 --- a/drivers/staging/media/rpivid/rpivid_h265.c
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
-@@ -1432,9 +1432,13 @@ static int updated_ps(struct rpivid_dec_state *const s)
+@@ -1432,9 +1432,13 @@ static int updated_ps(struct rpivid_dec_
  	s->ctb_addr_rs_to_ts = kmalloc_array(s->ctb_size,
  					     sizeof(*s->ctb_addr_rs_to_ts),
  					     GFP_KERNEL);
@@ -92,7 +86,7 @@ index ee5a48f26912..bb280b215a2e 100644
  
  	if (!(s->pps.flags & V4L2_HEVC_PPS_FLAG_TILES_ENABLED)) {
  		s->tile_width = 1;
-@@ -1446,8 +1450,12 @@ static int updated_ps(struct rpivid_dec_state *const s)
+@@ -1446,8 +1450,12 @@ static int updated_ps(struct rpivid_dec_
  
  	s->col_bd = kmalloc((s->tile_width + 1) * sizeof(*s->col_bd),
  			    GFP_KERNEL);
@@ -105,7 +99,7 @@ index ee5a48f26912..bb280b215a2e 100644
  
  	s->col_bd[0] = 0;
  	for (i = 1; i < s->tile_width; i++)
-@@ -1462,8 +1470,13 @@ static int updated_ps(struct rpivid_dec_state *const s)
+@@ -1462,8 +1470,13 @@ static int updated_ps(struct rpivid_dec_
  	s->row_bd[s->tile_height] = s->ctb_height;
  
  	fill_rs_to_ts(s);
@@ -120,7 +114,7 @@ index ee5a48f26912..bb280b215a2e 100644
  }
  
  static int write_cmd_buffer(struct rpivid_dev *const dev,
-@@ -1694,7 +1707,9 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1694,7 +1707,9 @@ static void rpivid_h265_setup(struct rpi
  			memcpy(&s->pps, run->h265.pps, sizeof(s->pps));
  
  			/* Recalc stuff as required */
@@ -131,7 +125,7 @@ index ee5a48f26912..bb280b215a2e 100644
  		}
  
  		de = dec_env_new(ctx);
-@@ -1772,22 +1787,6 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1772,22 +1787,6 @@ static void rpivid_h265_setup(struct rpi
  			goto fail;
  		}
  
@@ -154,7 +148,7 @@ index ee5a48f26912..bb280b215a2e 100644
  		// Fill in ref planes with our address s.t. if we mess
  		// up refs somehow then we still have a valid address
  		// entry
-@@ -2515,9 +2514,104 @@ static void rpivid_h265_trigger(struct rpivid_ctx *ctx)
+@@ -2515,9 +2514,104 @@ static void rpivid_h265_trigger(struct r
  	}
  }
  
@@ -260,6 +254,3 @@ index ee5a48f26912..bb280b215a2e 100644
 +	.try_ctrl = try_ctrl_pps,
 +};
 +
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0422-bcm2835-Allow-compressed-frames-to-set-sizeimage-438.patch b/root/target/linux/bcm27xx/patches-5.15/950-0410-bcm2835-Allow-compressed-frames-to-set-sizeimage-438.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0422-bcm2835-Allow-compressed-frames-to-set-sizeimage-438.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0410-bcm2835-Allow-compressed-frames-to-set-sizeimage-438.patch
index 84e5f346..515c8cf8 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0422-bcm2835-Allow-compressed-frames-to-set-sizeimage-438.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0410-bcm2835-Allow-compressed-frames-to-set-sizeimage-438.patch
@@ -1,7 +1,7 @@
-From c92d54168ae57264ed6df3ab915f35960583088a Mon Sep 17 00:00:00 2001
+From 74a2315a26f5541aa9849bb0b421beb672e5121e Mon Sep 17 00:00:00 2001
 From: jc-kynesim <jc@kynesim.co.uk>
 Date: Fri, 11 Jun 2021 15:14:31 +0100
-Subject: [PATCH 422/634] bcm2835: Allow compressed frames to set sizeimage
+Subject: [PATCH 410/828] bcm2835: Allow compressed frames to set sizeimage
  (#4386)
 
 Allow the user to set sizeimage in TRY_FMT and S_FMT if the format
@@ -12,11 +12,9 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  .../bcm2835-codec/bcm2835-v4l2-codec.c          | 17 ++++++++++++++---
  1 file changed, 14 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index a97666a1a4be..c3ba5c25a2ab 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -1291,6 +1291,8 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
+@@ -1291,6 +1291,8 @@ static int vidioc_g_fmt_vid_cap(struct f
  static int vidioc_try_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
  			  struct bcm2835_codec_fmt *fmt)
  {
@@ -25,7 +23,7 @@ index a97666a1a4be..c3ba5c25a2ab 100644
  	/*
  	 * The V4L2 specification requires the driver to correct the format
  	 * struct if any of the dimensions is unsupported
-@@ -1319,9 +1321,18 @@ static int vidioc_try_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
+@@ -1319,9 +1321,18 @@ static int vidioc_try_fmt(struct bcm2835
  	f->fmt.pix_mp.num_planes = 1;
  	f->fmt.pix_mp.plane_fmt[0].bytesperline =
  		get_bytesperline(f->fmt.pix_mp.width, fmt);
@@ -47,6 +45,3 @@ index a97666a1a4be..c3ba5c25a2ab 100644
  	memset(f->fmt.pix_mp.plane_fmt[0].reserved, 0,
  	       sizeof(f->fmt.pix_mp.plane_fmt[0].reserved));
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0423-media-i2c-imx477-Fix-for-long-exposure-limit-calcula.patch b/root/target/linux/bcm27xx/patches-5.15/950-0411-media-i2c-imx477-Fix-for-long-exposure-limit-calcula.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0423-media-i2c-imx477-Fix-for-long-exposure-limit-calcula.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0411-media-i2c-imx477-Fix-for-long-exposure-limit-calcula.patch
index 770d80ad..9c41e1cb 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0423-media-i2c-imx477-Fix-for-long-exposure-limit-calcula.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0411-media-i2c-imx477-Fix-for-long-exposure-limit-calcula.patch
@@ -1,7 +1,7 @@
-From 99586791c9dfd07f7fe864ea18f73b5c5ca31250 Mon Sep 17 00:00:00 2001
+From b5281a12a843d19a58f7e002a5f97ebd90f96d05 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Fri, 11 Jun 2021 12:47:07 +0100
-Subject: [PATCH 423/634] media: i2c: imx477: Fix for long exposure limit
+Subject: [PATCH 411/828] media: i2c: imx477: Fix for long exposure limit
  calculations
 
 Do not scale IMX477_EXPOSURE_OFFSET with the long exposure factor during
@@ -13,11 +13,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  drivers/media/i2c/imx477.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index 31e48512c165..07ccdf738883 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
-@@ -1282,7 +1282,7 @@ static void imx477_adjust_exposure_range(struct imx477 *imx477)
+@@ -1282,7 +1282,7 @@ static void imx477_adjust_exposure_range
  
  	/* Honour the VBLANK limits when setting exposure. */
  	exposure_max = imx477->mode->height + imx477->vblank->val -
@@ -26,6 +24,3 @@ index 31e48512c165..07ccdf738883 100644
  	exposure_def = min(exposure_max, imx477->exposure->val);
  	__v4l2_ctrl_modify_range(imx477->exposure, imx477->exposure->minimum,
  				 exposure_max, imx477->exposure->step,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0424-clk-bcm2835-Pass-DT-node-to-rpi_firmware_get.patch b/root/target/linux/bcm27xx/patches-5.15/950-0412-clk-bcm2835-Pass-DT-node-to-rpi_firmware_get.patch
similarity index 66%
rename from root/target/linux/bcm27xx/patches-5.15/0424-clk-bcm2835-Pass-DT-node-to-rpi_firmware_get.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0412-clk-bcm2835-Pass-DT-node-to-rpi_firmware_get.patch
index 45f8d38b..c6e34526 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0424-clk-bcm2835-Pass-DT-node-to-rpi_firmware_get.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0412-clk-bcm2835-Pass-DT-node-to-rpi_firmware_get.patch
@@ -1,7 +1,7 @@
-From 37c1ec02ab1bdb4aff5873a5e3679758036689f4 Mon Sep 17 00:00:00 2001
+From 20167dcb7be05680fd6fd521a609fe9c8ef0052b Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Thu, 8 Jul 2021 09:37:10 +0100
-Subject: [PATCH 424/634] clk: bcm2835: Pass DT node to rpi_firmware_get
+Subject: [PATCH 412/828] clk: bcm2835: Pass DT node to rpi_firmware_get
 
 The fw_node pointer has already been retrieved, and using it allows
 us to remove a downstream patch to the firmware driver.
@@ -11,11 +11,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/clk/bcm/clk-bcm2835.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index 961acade005f..e4dfbe2cf50e 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -2339,7 +2339,7 @@ static int bcm2835_clk_probe(struct platform_device *pdev)
+@@ -2339,7 +2339,7 @@ static int bcm2835_clk_probe(struct plat
  
  	fw_node = of_parse_phandle(dev->of_node, "firmware", 0);
  	if (fw_node) {
@@ -24,6 +22,3 @@ index 961acade005f..e4dfbe2cf50e 100644
  		if (!fw)
  			return -EPROBE_DEFER;
  		cprman->fw = fw;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0425-bcm2835-pcm.c-Support-multichannel-audio.patch b/root/target/linux/bcm27xx/patches-5.15/950-0413-bcm2835-pcm.c-Support-multichannel-audio.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0425-bcm2835-pcm.c-Support-multichannel-audio.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0413-bcm2835-pcm.c-Support-multichannel-audio.patch
index 611585bf..cb0a95d1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0425-bcm2835-pcm.c-Support-multichannel-audio.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0413-bcm2835-pcm.c-Support-multichannel-audio.patch
@@ -1,17 +1,15 @@
-From ab4d600847818591f23f82d7e0588f254b664a93 Mon Sep 17 00:00:00 2001
+From e252667b1dbb43e9be5cbea3403993f957449cc6 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 30 Apr 2019 19:15:30 +0100
-Subject: [PATCH 425/634] bcm2835-pcm.c: Support multichannel audio
+Subject: [PATCH 413/828] bcm2835-pcm.c: Support multichannel audio
 
 ---
  .../vc04_services/bcm2835-audio/bcm2835-pcm.c       | 13 +++++++------
  1 file changed, 7 insertions(+), 6 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
-index f2ef1d641e70..5e9a6e28c4c6 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
-@@ -31,15 +31,16 @@ static const struct snd_pcm_hardware snd_bcm2835_playback_spdif_hw = {
+@@ -31,15 +31,16 @@ static const struct snd_pcm_hardware snd
  		 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
  		 SNDRV_PCM_INFO_SYNC_APPLPTR | SNDRV_PCM_INFO_BATCH),
  	.formats = SNDRV_PCM_FMTBIT_S16_LE,
@@ -34,6 +32,3 @@ index f2ef1d641e70..5e9a6e28c4c6 100644
  	.periods_min = 1,
  	.periods_max = 128,
  };
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0426-bcm2835-pcm-Fix-up-multichannel-pcm-audio.patch b/root/target/linux/bcm27xx/patches-5.15/950-0414-bcm2835-pcm-Fix-up-multichannel-pcm-audio.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0426-bcm2835-pcm-Fix-up-multichannel-pcm-audio.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0414-bcm2835-pcm-Fix-up-multichannel-pcm-audio.patch
index 5a9273c0..42f6ec22 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0426-bcm2835-pcm-Fix-up-multichannel-pcm-audio.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0414-bcm2835-pcm-Fix-up-multichannel-pcm-audio.patch
@@ -1,7 +1,7 @@
-From c7d54af713a92d91427b36bb6322020f2dd86676 Mon Sep 17 00:00:00 2001
+From 7de24f69425eedcd2723954785b257ecaaf85374 Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Tue, 27 Oct 2020 12:24:14 +0000
-Subject: [PATCH 426/634] bcm2835-pcm: Fix up multichannel pcm audio
+Subject: [PATCH 414/828] bcm2835-pcm: Fix up multichannel pcm audio
 
 Fixes: a9c1660ff5f02d048c5f31abf1fd1108ccf9ef87
 Signed-off-by: Dom Cobley <popcornmix@gmail.com>
@@ -9,11 +9,9 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  .../vc04_services/bcm2835-audio/bcm2835-pcm.c       | 13 ++++++-------
  1 file changed, 6 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
-index 5e9a6e28c4c6..f2ef1d641e70 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
-@@ -31,16 +31,15 @@ static const struct snd_pcm_hardware snd_bcm2835_playback_spdif_hw = {
+@@ -31,16 +31,15 @@ static const struct snd_pcm_hardware snd
  		 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
  		 SNDRV_PCM_INFO_SYNC_APPLPTR | SNDRV_PCM_INFO_BATCH),
  	.formats = SNDRV_PCM_FMTBIT_S16_LE,
@@ -36,6 +34,3 @@ index 5e9a6e28c4c6..f2ef1d641e70 100644
  	.periods_min = 1,
  	.periods_max = 128,
  };
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0427-media-i2c-imx290-Support-60fps-in-2-lane-operation.patch b/root/target/linux/bcm27xx/patches-5.15/950-0415-media-i2c-imx290-Support-60fps-in-2-lane-operation.patch
similarity index 85%
rename from root/target/linux/bcm27xx/patches-5.15/0427-media-i2c-imx290-Support-60fps-in-2-lane-operation.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0415-media-i2c-imx290-Support-60fps-in-2-lane-operation.patch
index 05697083..97222a03 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0427-media-i2c-imx290-Support-60fps-in-2-lane-operation.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0415-media-i2c-imx290-Support-60fps-in-2-lane-operation.patch
@@ -1,7 +1,7 @@
-From c26e0c5079e8be1b963dffec71f851c86c664717 Mon Sep 17 00:00:00 2001
+From 5e3cd8165443db33ba83d69f10090a82437a3d37 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 17 Jun 2021 12:05:25 +0100
-Subject: [PATCH 427/634] media: i2c: imx290: Support 60fps in 2 lane operation
+Subject: [PATCH 415/828] media: i2c: imx290: Support 60fps in 2 lane operation
 
 Commit "97589ad61c73 media: i2c: imx290: Add support for 2 data lanes"
 added support for running in two lane mode (instead of 4), but
@@ -24,8 +24,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/imx290.c | 163 ++++++++++++++++++++++---------------
  1 file changed, 97 insertions(+), 66 deletions(-)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 836d3684c273..af75e10593fa 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -46,8 +46,7 @@ enum imx290_clk_index {
@@ -52,7 +50,7 @@ index 836d3684c273..af75e10593fa 100644
  
  	/* Clock setup can vary. Index as enum imx290_clk_index */
  	const struct imx290_regval *clk_data[2];
-@@ -242,8 +244,9 @@ static const struct imx290_regval imx290_74_250mhz_clock_1080p[] = {
+@@ -242,8 +244,9 @@ static const struct imx290_regval imx290
  	{ 0x3480, 0x92 },
  };
  
@@ -63,7 +61,7 @@ index 836d3684c273..af75e10593fa 100644
  	{ 0x3007, 0x00 },
  	{ 0x303a, 0x0c },
  	{ 0x3414, 0x0a },
-@@ -253,8 +256,36 @@ static const struct imx290_regval imx290_1080p_settings[] = {
+@@ -253,8 +256,36 @@ static const struct imx290_regval imx290
  	{ 0x3419, 0x04 },
  	{ 0x3012, 0x64 },
  	{ 0x3013, 0x00 },
@@ -100,7 +98,7 @@ index 836d3684c273..af75e10593fa 100644
  	{ 0x3446, 0x57 },
  	{ 0x3447, 0x00 },
  	{ 0x3448, 0x37 },
-@@ -297,8 +328,9 @@ static const struct imx290_regval imx290_74_250mhz_clock_720p[] = {
+@@ -297,8 +328,9 @@ static const struct imx290_regval imx290
  	{ 0x3480, 0x92 },
  };
  
@@ -111,7 +109,7 @@ index 836d3684c273..af75e10593fa 100644
  	{ 0x3007, 0x10 },
  	{ 0x303a, 0x06 },
  	{ 0x3414, 0x04 },
-@@ -308,8 +340,36 @@ static const struct imx290_regval imx290_720p_settings[] = {
+@@ -308,8 +340,36 @@ static const struct imx290_regval imx290
  	{ 0x3419, 0x02 },
  	{ 0x3012, 0x64 },
  	{ 0x3013, 0x00 },
@@ -148,7 +146,7 @@ index 836d3684c273..af75e10593fa 100644
  	{ 0x3446, 0x4f },
  	{ 0x3447, 0x00 },
  	{ 0x3448, 0x2f },
-@@ -389,7 +449,7 @@ static const struct imx290_mode imx290_modes_2lanes[] = {
+@@ -389,7 +449,7 @@ static const struct imx290_mode imx290_m
  	{
  		.width = 1920,
  		.height = 1080,
@@ -157,7 +155,7 @@ index 836d3684c273..af75e10593fa 100644
  		.vmax = 0x0465,
  		.link_freq_index = FREQ_INDEX_1080P,
  		.crop = {
-@@ -398,8 +458,10 @@ static const struct imx290_mode imx290_modes_2lanes[] = {
+@@ -398,8 +458,10 @@ static const struct imx290_mode imx290_m
  			.width = 1920,
  			.height = 1080,
  		},
@@ -170,7 +168,7 @@ index 836d3684c273..af75e10593fa 100644
  		.clk_data = {
  			[CLK_37_125] = imx290_37_125mhz_clock_1080p,
  			[CLK_74_25] = imx290_74_250mhz_clock_1080p,
-@@ -409,7 +471,7 @@ static const struct imx290_mode imx290_modes_2lanes[] = {
+@@ -409,7 +471,7 @@ static const struct imx290_mode imx290_m
  	{
  		.width = 1280,
  		.height = 720,
@@ -179,7 +177,7 @@ index 836d3684c273..af75e10593fa 100644
  		.vmax = 0x02ee,
  		.link_freq_index = FREQ_INDEX_720P,
  		.crop = {
-@@ -418,8 +480,10 @@ static const struct imx290_mode imx290_modes_2lanes[] = {
+@@ -418,8 +480,10 @@ static const struct imx290_mode imx290_m
  			.width = 1280,
  			.height = 720,
  		},
@@ -192,7 +190,7 @@ index 836d3684c273..af75e10593fa 100644
  		.clk_data = {
  			[CLK_37_125] = imx290_37_125mhz_clock_1080p,
  			[CLK_74_25] = imx290_74_250mhz_clock_1080p,
-@@ -441,8 +505,10 @@ static const struct imx290_mode imx290_modes_4lanes[] = {
+@@ -441,8 +505,10 @@ static const struct imx290_mode imx290_m
  			.width = 1920,
  			.height = 1080,
  		},
@@ -205,7 +203,7 @@ index 836d3684c273..af75e10593fa 100644
  		.clk_data = {
  			[CLK_37_125] = imx290_37_125mhz_clock_720p,
  			[CLK_74_25] = imx290_74_250mhz_clock_720p,
-@@ -461,8 +527,10 @@ static const struct imx290_mode imx290_modes_4lanes[] = {
+@@ -461,8 +527,10 @@ static const struct imx290_mode imx290_m
  			.width = 1280,
  			.height = 720,
  		},
@@ -218,7 +216,7 @@ index 836d3684c273..af75e10593fa 100644
  		.clk_data = {
  			[CLK_37_125] = imx290_37_125mhz_clock_720p,
  			[CLK_74_25] = imx290_74_250mhz_clock_720p,
-@@ -1016,8 +1084,18 @@ static int imx290_start_streaming(struct imx290 *imx290)
+@@ -1016,8 +1084,18 @@ static int imx290_start_streaming(struct
  	}
  
  	/* Apply default values of current mode */
@@ -239,7 +237,7 @@ index 836d3684c273..af75e10593fa 100644
  	if (ret < 0) {
  		dev_err(imx290->dev, "Could not set current mode\n");
  		return ret;
-@@ -1080,49 +1158,6 @@ static int imx290_get_regulators(struct device *dev, struct imx290 *imx290)
+@@ -1080,49 +1158,6 @@ static int imx290_get_regulators(struct
  				       imx290->supplies);
  }
  
@@ -289,7 +287,7 @@ index 836d3684c273..af75e10593fa 100644
  static int imx290_power_on(struct device *dev)
  {
  	struct v4l2_subdev *sd = dev_get_drvdata(dev);
-@@ -1146,9 +1181,6 @@ static int imx290_power_on(struct device *dev)
+@@ -1146,9 +1181,6 @@ static int imx290_power_on(struct device
  	gpiod_set_value_cansleep(imx290->rst_gpio, 0);
  	usleep_range(30000, 31000);
  
@@ -299,7 +297,7 @@ index 836d3684c273..af75e10593fa 100644
  	return 0;
  }
  
-@@ -1271,8 +1303,7 @@ static int imx290_probe(struct i2c_client *client)
+@@ -1271,8 +1303,7 @@ static int imx290_probe(struct i2c_clien
  		ret = -EINVAL;
  		goto free_err;
  	}
@@ -309,6 +307,3 @@ index 836d3684c273..af75e10593fa 100644
  
  	dev_dbg(dev, "Using %u data lanes\n", imx290->nlanes);
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0428-media-i2c-imx290-Fix-the-pixel-rate-at-148.5Mpix-s.patch b/root/target/linux/bcm27xx/patches-5.15/950-0416-media-i2c-imx290-Fix-the-pixel-rate-at-148.5Mpix-s.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0428-media-i2c-imx290-Fix-the-pixel-rate-at-148.5Mpix-s.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0416-media-i2c-imx290-Fix-the-pixel-rate-at-148.5Mpix-s.patch
index 7d21183c..346c4082 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0428-media-i2c-imx290-Fix-the-pixel-rate-at-148.5Mpix-s.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0416-media-i2c-imx290-Fix-the-pixel-rate-at-148.5Mpix-s.patch
@@ -1,7 +1,7 @@
-From 9426dcbe695b8b795ac74e1759aa0b766fe21f68 Mon Sep 17 00:00:00 2001
+From 42d31aa3af358f376e5a97fbb72d529f2e5e4a91 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 17 Jun 2021 13:00:39 +0100
-Subject: [PATCH 428/634] media: i2c: imx290: Fix the pixel rate at 148.5Mpix/s
+Subject: [PATCH 416/828] media: i2c: imx290: Fix the pixel rate at 148.5Mpix/s
 
 Whilst the datasheet lists the link frequency changing between
 1080p and 720p modes, reality is that with the default blanking
@@ -20,11 +20,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/imx290.c | 16 +---------------
  1 file changed, 1 insertion(+), 15 deletions(-)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index af75e10593fa..6b990e8c6bff 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
-@@ -853,23 +853,9 @@ static inline u8 imx290_get_link_freq_index(struct imx290 *imx290)
+@@ -853,23 +853,9 @@ static inline u8 imx290_get_link_freq_in
  	return imx290->current_mode->link_freq_index;
  }
  
@@ -49,6 +47,3 @@ index af75e10593fa..6b990e8c6bff 100644
  }
  
  static int imx290_set_fmt(struct v4l2_subdev *sd,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0429-media-i2c-imx290-Fix-clock-setup-register-assignment.patch b/root/target/linux/bcm27xx/patches-5.15/950-0417-media-i2c-imx290-Fix-clock-setup-register-assignment.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0429-media-i2c-imx290-Fix-clock-setup-register-assignment.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0417-media-i2c-imx290-Fix-clock-setup-register-assignment.patch
index 09acb043..8882bd77 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0429-media-i2c-imx290-Fix-clock-setup-register-assignment.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0417-media-i2c-imx290-Fix-clock-setup-register-assignment.patch
@@ -1,7 +1,7 @@
-From 3fbbb4876421f6ce5ede141327632654bbcd081c Mon Sep 17 00:00:00 2001
+From fb4570982a9aec13a160e59e68092a7bc0c2db78 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 17 Jun 2021 17:27:46 +0100
-Subject: [PATCH 429/634] media: i2c: imx290: Fix clock setup register
+Subject: [PATCH 417/828] media: i2c: imx290: Fix clock setup register
  assignments
 
 When the clock setups were added for the alternate external clocks,
@@ -17,11 +17,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/imx290.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 6b990e8c6bff..7aee4a30bcdd 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
-@@ -485,10 +485,10 @@ static const struct imx290_mode imx290_modes_2lanes[] = {
+@@ -485,10 +485,10 @@ static const struct imx290_mode imx290_m
  		.lane_data = imx290_720p_2lane_settings,
  		.lane_data_size = ARRAY_SIZE(imx290_720p_2lane_settings),
  		.clk_data = {
@@ -35,7 +33,7 @@ index 6b990e8c6bff..7aee4a30bcdd 100644
  	},
  };
  
-@@ -510,10 +510,10 @@ static const struct imx290_mode imx290_modes_4lanes[] = {
+@@ -510,10 +510,10 @@ static const struct imx290_mode imx290_m
  		.lane_data = imx290_1080p_4lane_settings,
  		.lane_data_size = ARRAY_SIZE(imx290_1080p_4lane_settings),
  		.clk_data = {
@@ -49,6 +47,3 @@ index 6b990e8c6bff..7aee4a30bcdd 100644
  	},
  	{
  		.width = 1280,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0430-media-rpivid-Fix-H265-aux-ent-reuse-of-the-same-slot.patch b/root/target/linux/bcm27xx/patches-5.15/950-0418-media-rpivid-Fix-H265-aux-ent-reuse-of-the-same-slot.patch
similarity index 85%
rename from root/target/linux/bcm27xx/patches-5.15/0430-media-rpivid-Fix-H265-aux-ent-reuse-of-the-same-slot.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0418-media-rpivid-Fix-H265-aux-ent-reuse-of-the-same-slot.patch
index 06cb93f4..9382dad3 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0430-media-rpivid-Fix-H265-aux-ent-reuse-of-the-same-slot.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0418-media-rpivid-Fix-H265-aux-ent-reuse-of-the-same-slot.patch
@@ -1,7 +1,7 @@
-From e5c7b582ecf2c610e9654e48b9f1b3f4bcacfe91 Mon Sep 17 00:00:00 2001
+From 10b916bf2e2466af46892852a2dffb6b3b7c07fb Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Thu, 24 Jun 2021 14:43:49 +0100
-Subject: [PATCH 430/634] media: rpivid: Fix H265 aux ent reuse of the same
+Subject: [PATCH 418/828] media: rpivid: Fix H265 aux ent reuse of the same
  slot
 
 It is legitimate, though unusual, for an aux ent associated with a slot
@@ -20,11 +20,9 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  drivers/staging/media/rpivid/rpivid_h265.c | 75 ++++++++++++++--------
  1 file changed, 49 insertions(+), 26 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
-index bb280b215a2e..a5a0e31bd5ba 100644
 --- a/drivers/staging/media/rpivid/rpivid_h265.c
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
-@@ -371,7 +371,8 @@ static void aux_q_free(struct rpivid_ctx *const ctx,
+@@ -371,7 +371,8 @@ static void aux_q_free(struct rpivid_ctx
  	kfree(aq);
  }
  
@@ -34,7 +32,7 @@ index bb280b215a2e..a5a0e31bd5ba 100644
  {
  	struct rpivid_dev *const dev = ctx->dev;
  	struct rpivid_q_aux *const aq = kzalloc(sizeof(*aq), GFP_KERNEL);
-@@ -379,11 +380,17 @@ static struct rpivid_q_aux *aux_q_alloc(struct rpivid_ctx *const ctx)
+@@ -379,11 +380,17 @@ static struct rpivid_q_aux *aux_q_alloc(
  	if (!aq)
  		return NULL;
  
@@ -53,7 +51,7 @@ index bb280b215a2e..a5a0e31bd5ba 100644
  	return aq;
  
  fail:
-@@ -398,22 +405,38 @@ static struct rpivid_q_aux *aux_q_new(struct rpivid_ctx *const ctx,
+@@ -398,22 +405,38 @@ static struct rpivid_q_aux *aux_q_new(st
  	unsigned long lockflags;
  
  	spin_lock_irqsave(&ctx->aux_lock, lockflags);
@@ -101,7 +99,7 @@ index bb280b215a2e..a5a0e31bd5ba 100644
  	return aq;
  }
  
-@@ -436,21 +459,21 @@ static void aux_q_release(struct rpivid_ctx *const ctx,
+@@ -436,21 +459,21 @@ static void aux_q_release(struct rpivid_
  			  struct rpivid_q_aux **const paq)
  {
  	struct rpivid_q_aux *const aq = *paq;
@@ -134,7 +132,7 @@ index bb280b215a2e..a5a0e31bd5ba 100644
  }
  
  static void aux_q_init(struct rpivid_ctx *const ctx)
-@@ -1958,12 +1981,12 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1958,12 +1981,12 @@ static void rpivid_h265_setup(struct rpi
  		}
  
  		if (use_aux) {
@@ -151,6 +149,3 @@ index bb280b215a2e..a5a0e31bd5ba 100644
  		}
  
  		de->ref_addrs[i] =
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0431-media-i2c-ov9281-Remove-override-of-subdev-name.patch b/root/target/linux/bcm27xx/patches-5.15/950-0419-media-i2c-ov9281-Remove-override-of-subdev-name.patch
similarity index 71%
rename from root/target/linux/bcm27xx/patches-5.15/0431-media-i2c-ov9281-Remove-override-of-subdev-name.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0419-media-i2c-ov9281-Remove-override-of-subdev-name.patch
index 38b4a515..288a7605 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0431-media-i2c-ov9281-Remove-override-of-subdev-name.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0419-media-i2c-ov9281-Remove-override-of-subdev-name.patch
@@ -1,7 +1,7 @@
-From ba03680995fa38a25abe43a9338b9fa3457a2bcf Mon Sep 17 00:00:00 2001
+From 9bce5a09d4e303e8ee84f016520eeefe47b1b315 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Mon, 28 Jun 2021 10:49:04 +0100
-Subject: [PATCH 431/634] media: i2c: ov9281: Remove override of subdev name
+Subject: [PATCH 419/828] media: i2c: ov9281: Remove override of subdev name
 
 From the original Rockchip driver, the subdev was renamed
 from the default to being "mov9281 <dev_name>" whereas the
@@ -15,11 +15,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/ov9281.c | 2 --
  1 file changed, 2 deletions(-)
 
-diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-index 8d799b8b53c6..5f1b83d77473 100644
 --- a/drivers/media/i2c/ov9281.c
 +++ b/drivers/media/i2c/ov9281.c
-@@ -1197,8 +1197,6 @@ static int ov9281_probe(struct i2c_client *client,
+@@ -1197,8 +1197,6 @@ static int ov9281_probe(struct i2c_clien
  	if (ret < 0)
  		goto err_power_off;
  
@@ -28,6 +26,3 @@ index 8d799b8b53c6..5f1b83d77473 100644
  	ret = v4l2_async_register_subdev_sensor(sd);
  	if (ret) {
  		dev_err(dev, "v4l2 async register subdev failed\n");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0432-staging-vc04_services-isp-Set-the-YUV420-YVU420-form.patch b/root/target/linux/bcm27xx/patches-5.15/950-0420-staging-vc04_services-isp-Set-the-YUV420-YVU420-form.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0432-staging-vc04_services-isp-Set-the-YUV420-YVU420-form.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0420-staging-vc04_services-isp-Set-the-YUV420-YVU420-form.patch
index 99783a75..b97b8399 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0432-staging-vc04_services-isp-Set-the-YUV420-YVU420-form.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0420-staging-vc04_services-isp-Set-the-YUV420-YVU420-form.patch
@@ -1,7 +1,7 @@
-From 80bda8d88ea297a8891b3d942f50e2c850307db4 Mon Sep 17 00:00:00 2001
+From 739088837c3d6b601133a96fbb8325fe9ee85120 Mon Sep 17 00:00:00 2001
 From: Naushir Patuck <naush@raspberrypi.com>
 Date: Tue, 29 Jun 2021 12:50:58 +0100
-Subject: [PATCH 432/634] staging: vc04_services: isp: Set the YUV420/YVU420
+Subject: [PATCH 420/828] staging: vc04_services: isp: Set the YUV420/YVU420
  format stride to 64 bytes
 
 The bcm2835 ISP requires the base address of all input/output planes to have 32
@@ -17,11 +17,9 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
-index 7541fb316cb9..f6d6c88d13ba 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
-@@ -48,7 +48,7 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -48,7 +48,7 @@ static const struct bcm2835_isp_fmt supp
  		/* YUV formats */
  		.fourcc		    = V4L2_PIX_FMT_YUV420,
  		.depth		    = 8,
@@ -30,7 +28,7 @@ index 7541fb316cb9..f6d6c88d13ba 100644
  		.mmal_fmt	    = MMAL_ENCODING_I420,
  		.size_multiplier_x2 = 3,
  		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-@@ -57,7 +57,7 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
+@@ -57,7 +57,7 @@ static const struct bcm2835_isp_fmt supp
  	}, {
  		.fourcc		    = V4L2_PIX_FMT_YVU420,
  		.depth		    = 8,
@@ -39,6 +37,3 @@ index 7541fb316cb9..f6d6c88d13ba 100644
  		.mmal_fmt	    = MMAL_ENCODING_YV12,
  		.size_multiplier_x2 = 3,
  		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0433-Documentation-devicetree-Add-documentation-for-imx37.patch b/root/target/linux/bcm27xx/patches-5.15/950-0421-Documentation-devicetree-Add-documentation-for-imx37.patch
similarity index 88%
rename from root/target/linux/bcm27xx/patches-5.15/0433-Documentation-devicetree-Add-documentation-for-imx37.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0421-Documentation-devicetree-Add-documentation-for-imx37.patch
index 3d2274eb..db3fc558 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0433-Documentation-devicetree-Add-documentation-for-imx37.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0421-Documentation-devicetree-Add-documentation-for-imx37.patch
@@ -1,7 +1,7 @@
-From 4d489535702f7032b7a67e0788949c68a032c4b0 Mon Sep 17 00:00:00 2001
+From c9e11aed198570f9896e0699ba8e5bc8010599d4 Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Tue, 29 Jun 2021 14:38:23 +0100
-Subject: [PATCH 433/634] Documentation: devicetree: Add documentation for
+Subject: [PATCH 421/828] Documentation: devicetree: Add documentation for
  imx378 sensor
 
 The imx378 sensor is compatible with the imx477 and shares common
@@ -14,9 +14,6 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  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 e237578c96b6..b1510287b546 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -17527,6 +17527,7 @@ M:	Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.com>
+@@ -17528,6 +17528,7 @@ M:	Raspberry Pi Kernel Maintenance <kern
  L:	linux-media@vger.kernel.org
  S:	Maintained
  T:	git git://linuxtv.org/media_tree.git
@@ -145,6 +140,3 @@ index e237578c96b6..b1510287b546 100644
  F:	Documentation/devicetree/bindings/media/i2c/imx477.yaml
  F:	drivers/media/i2c/imx477.c
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0434-media-i2c-imx477-Extend-driver-to-support-imx378-sen.patch b/root/target/linux/bcm27xx/patches-5.15/950-0422-media-i2c-imx477-Extend-driver-to-support-imx378-sen.patch
similarity index 85%
rename from root/target/linux/bcm27xx/patches-5.15/0434-media-i2c-imx477-Extend-driver-to-support-imx378-sen.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0422-media-i2c-imx477-Extend-driver-to-support-imx378-sen.patch
index e0e52068..c000b84b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0434-media-i2c-imx477-Extend-driver-to-support-imx378-sen.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0422-media-i2c-imx477-Extend-driver-to-support-imx378-sen.patch
@@ -1,7 +1,7 @@
-From 9de7611f36918d3497636f7e64c0580797eed365 Mon Sep 17 00:00:00 2001
+From a2628daa5ca26228c97f00b567e21abb4b6ddd17 Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Tue, 29 Jun 2021 14:43:01 +0100
-Subject: [PATCH 434/634] media: i2c: imx477: Extend driver to support imx378
+Subject: [PATCH 422/828] media: i2c: imx477: Extend driver to support imx378
  sensor
 
 The imx378 sensor is almost identical to the imx477 and can be
@@ -14,8 +14,6 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/i2c/imx477.c | 68 +++++++++++++++++++++++++++++++++-----
  2 files changed, 60 insertions(+), 10 deletions(-)
 
-diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index f85824ec1064..b42a28687509 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
 @@ -823,7 +823,7 @@ config VIDEO_IMX477
@@ -27,8 +25,6 @@ index f85824ec1064..b42a28687509 100644
  
  	  To compile this driver as a module, choose M here: the
  	  module will be called imx477.
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index 07ccdf738883..bc0fb02a159e 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
 @@ -12,6 +12,7 @@
@@ -47,7 +43,7 @@ index 07ccdf738883..bc0fb02a159e 100644
  
  #define IMX477_REG_MODE_SELECT		0x0100
  #define IMX477_MODE_STANDBY		0x00
-@@ -1069,6 +1071,11 @@ static const char * const imx477_supply_name[] = {
+@@ -1069,6 +1071,11 @@ static const char * const imx477_supply_
  #define IMX477_XCLR_MIN_DELAY_US	8000
  #define IMX477_XCLR_DELAY_RANGE_US	1000
  
@@ -69,7 +65,7 @@ index 07ccdf738883..bc0fb02a159e 100644
  };
  
  static inline struct imx477 *to_imx477(struct v4l2_subdev *_sd)
-@@ -1673,11 +1683,18 @@ static int imx477_start_streaming(struct imx477 *imx477)
+@@ -1673,11 +1683,18 @@ static int imx477_start_streaming(struct
  {
  	struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
  	const struct imx477_reg_list *reg_list;
@@ -88,7 +84,7 @@ index 07ccdf738883..bc0fb02a159e 100644
  		if (ret) {
  			dev_err(&client->dev, "%s failed to set common settings\n",
  				__func__);
-@@ -1863,7 +1880,7 @@ static int imx477_get_regulators(struct imx477 *imx477)
+@@ -1863,7 +1880,7 @@ static int imx477_get_regulators(struct
  }
  
  /* Verify chip ID */
@@ -97,7 +93,7 @@ index 07ccdf738883..bc0fb02a159e 100644
  {
  	struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
  	int ret;
-@@ -1873,16 +1890,18 @@ static int imx477_identify_module(struct imx477 *imx477)
+@@ -1873,16 +1890,18 @@ static int imx477_identify_module(struct
  			      IMX477_REG_VALUE_16BIT, &val);
  	if (ret) {
  		dev_err(&client->dev, "failed to read chip id %x, with error %d\n",
@@ -119,7 +115,7 @@ index 07ccdf738883..bc0fb02a159e 100644
  	return 0;
  }
  
-@@ -2078,10 +2097,39 @@ static int imx477_check_hwcfg(struct device *dev)
+@@ -2078,10 +2097,39 @@ error_out:
  	return ret;
  }
  
@@ -159,7 +155,7 @@ index 07ccdf738883..bc0fb02a159e 100644
  	int ret;
  
  	imx477 = devm_kzalloc(&client->dev, sizeof(*imx477), GFP_KERNEL);
-@@ -2090,6 +2138,12 @@ static int imx477_probe(struct i2c_client *client)
+@@ -2090,6 +2138,12 @@ static int imx477_probe(struct i2c_clien
  
  	v4l2_i2c_subdev_init(&imx477->sd, client, &imx477_subdev_ops);
  
@@ -172,7 +168,7 @@ index 07ccdf738883..bc0fb02a159e 100644
  	/* Check the hardware configuration in device tree */
  	if (imx477_check_hwcfg(dev))
  		return -EINVAL;
-@@ -2126,7 +2180,7 @@ static int imx477_probe(struct i2c_client *client)
+@@ -2126,7 +2180,7 @@ static int imx477_probe(struct i2c_clien
  	if (ret)
  		return ret;
  
@@ -181,7 +177,7 @@ index 07ccdf738883..bc0fb02a159e 100644
  	if (ret)
  		goto error_power_off;
  
-@@ -2198,10 +2252,6 @@ static int imx477_remove(struct i2c_client *client)
+@@ -2198,10 +2252,6 @@ static int imx477_remove(struct i2c_clie
  	return 0;
  }
  
@@ -192,6 +188,3 @@ index 07ccdf738883..bc0fb02a159e 100644
  MODULE_DEVICE_TABLE(of, imx477_dt_ids);
  
  static const struct dev_pm_ops imx477_pm_ops = {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0435-dt-bindings-clk-raspberrypi-Remove-unused-property.patch b/root/target/linux/bcm27xx/patches-5.15/950-0423-dt-bindings-clk-raspberrypi-Remove-unused-property.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0435-dt-bindings-clk-raspberrypi-Remove-unused-property.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0423-dt-bindings-clk-raspberrypi-Remove-unused-property.patch
index 174d9a4f..2e344c81 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0435-dt-bindings-clk-raspberrypi-Remove-unused-property.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0423-dt-bindings-clk-raspberrypi-Remove-unused-property.patch
@@ -1,7 +1,7 @@
-From 952adf3aaf98562d7c06da6c6706f154605f43a3 Mon Sep 17 00:00:00 2001
+From af6514ec2fd87019a14111fd593dae2980a772ce Mon Sep 17 00:00:00 2001
 From: Maxime Ripard <maxime@cerno.tech>
 Date: Wed, 23 Jun 2021 11:47:38 +0200
-Subject: [PATCH 435/634] dt-bindings: clk: raspberrypi: Remove unused property
+Subject: [PATCH 423/828] dt-bindings: clk: raspberrypi: Remove unused property
 
 The raspberrypi,firmware property has been documented as required in the
 binding but was never actually used in the final version of the binding.
@@ -12,8 +12,6 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  .../bindings/clock/raspberrypi,firmware-clocks.yaml        | 7 -------
  1 file changed, 7 deletions(-)
 
-diff --git a/Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml b/Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml
-index d37bc311321d..2047e25700c6 100644
 --- a/Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml
 +++ b/Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml
 @@ -16,15 +16,9 @@ properties:
@@ -40,6 +38,3 @@ index d37bc311321d..2047e25700c6 100644
          #clock-cells = <1>;
      };
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0436-dt-bindings-display-vc4-Add-phandle-to-the-firmware.patch b/root/target/linux/bcm27xx/patches-5.15/950-0424-dt-bindings-display-vc4-Add-phandle-to-the-firmware.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0436-dt-bindings-display-vc4-Add-phandle-to-the-firmware.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0424-dt-bindings-display-vc4-Add-phandle-to-the-firmware.patch
index cc0548e7..e8da3f61 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0436-dt-bindings-display-vc4-Add-phandle-to-the-firmware.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0424-dt-bindings-display-vc4-Add-phandle-to-the-firmware.patch
@@ -1,7 +1,7 @@
-From 87acf1cdb2f032f79db742cbd16a65ee7b9543e2 Mon Sep 17 00:00:00 2001
+From 12795909c4956c70c1d3a1517c620b27d51974ea Mon Sep 17 00:00:00 2001
 From: Maxime Ripard <maxime@cerno.tech>
 Date: Wed, 23 Jun 2021 11:48:35 +0200
-Subject: [PATCH 436/634] dt-bindings: display: vc4: Add phandle to the
+Subject: [PATCH 424/828] dt-bindings: display: vc4: Add phandle to the
  firmware
 
 The vc4 driver will need to tell the firmware that it takes over the
@@ -15,8 +15,6 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  .../devicetree/bindings/display/brcm,bcm2835-vc4.yaml        | 5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml
-index 49a5e041aa49..eac739a812f5 100644
 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml
 @@ -21,6 +21,11 @@ properties:
@@ -31,6 +29,3 @@ index 49a5e041aa49..eac739a812f5 100644
  required:
    - compatible
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0438-bcm2711_thermal-Don-t-clamp-temperature-at-zero.patch b/root/target/linux/bcm27xx/patches-5.15/950-0425-bcm2711_thermal-Don-t-clamp-temperature-at-zero.patch
similarity index 65%
rename from root/target/linux/bcm27xx/patches-5.15/0438-bcm2711_thermal-Don-t-clamp-temperature-at-zero.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0425-bcm2711_thermal-Don-t-clamp-temperature-at-zero.patch
index 46958da2..40cc1ff3 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0438-bcm2711_thermal-Don-t-clamp-temperature-at-zero.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0425-bcm2711_thermal-Don-t-clamp-temperature-at-zero.patch
@@ -1,7 +1,7 @@
-From 472896bc0ba7e5e6fc1a23cfd34d426d08332921 Mon Sep 17 00:00:00 2001
+From b49dea974d69bda9954d307f248d1a1881189420 Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Thu, 8 Jul 2021 13:48:11 +0100
-Subject: [PATCH 438/634] bcm2711_thermal: Don't clamp temperature at zero
+Subject: [PATCH 425/828] bcm2711_thermal: Don't clamp temperature at zero
 
 The temperature sensor is valid below zero and the linux framework is happy with it.
 
@@ -11,11 +11,9 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  drivers/thermal/broadcom/bcm2711_thermal.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/thermal/broadcom/bcm2711_thermal.c b/drivers/thermal/broadcom/bcm2711_thermal.c
-index 1ec57d9ecf53..011b2789e2df 100644
 --- a/drivers/thermal/broadcom/bcm2711_thermal.c
 +++ b/drivers/thermal/broadcom/bcm2711_thermal.c
-@@ -52,7 +52,7 @@ static int bcm2711_get_temp(void *data, int *temp)
+@@ -52,7 +52,7 @@ static int bcm2711_get_temp(void *data,
  	/* Convert a HW code to a temperature reading (millidegree celsius) */
  	t = slope * val + offset;
  
@@ -24,6 +22,3 @@ index 1ec57d9ecf53..011b2789e2df 100644
  
  	return 0;
  }
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0439-media-bcm2835-unicam-Forward-input-status-from-subde.patch b/root/target/linux/bcm27xx/patches-5.15/950-0426-media-bcm2835-unicam-Forward-input-status-from-subde.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0439-media-bcm2835-unicam-Forward-input-status-from-subde.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0426-media-bcm2835-unicam-Forward-input-status-from-subde.patch
index 0b80111e..870dabcf 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0439-media-bcm2835-unicam-Forward-input-status-from-subde.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0426-media-bcm2835-unicam-Forward-input-status-from-subde.patch
@@ -1,7 +1,7 @@
-From 67abf2883edf8b845620e84b8919766b5e89d54e Mon Sep 17 00:00:00 2001
+From 72d8cfb2a24d07b0d0ee25a30f7074d88cc4cf39 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jakub=20Van=C4=9Bk?= <linuxtardis@gmail.com>
 Date: Wed, 7 Jul 2021 22:48:20 +0200
-Subject: [PATCH 439/634] media: bcm2835-unicam: Forward input status from
+Subject: [PATCH 426/828] media: bcm2835-unicam: Forward input status from
  subdevice
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -26,11 +26,9 @@ Signed-off-by: Jakub Vaněk <linuxtardis@gmail.com>
  drivers/media/platform/bcm2835/bcm2835-unicam.c | 9 +++++++++
  1 file changed, 9 insertions(+)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index a603891986b9..cf5d16103d56 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -1809,6 +1809,7 @@ static int unicam_enum_input(struct file *file, void *priv,
+@@ -1809,6 +1809,7 @@ static int unicam_enum_input(struct file
  {
  	struct unicam_node *node = video_drvdata(file);
  	struct unicam_device *dev = node->dev;
@@ -38,7 +36,7 @@ index a603891986b9..cf5d16103d56 100644
  
  	if (inp->index != 0)
  		return -EINVAL;
-@@ -1825,6 +1826,14 @@ static int unicam_enum_input(struct file *file, void *priv,
+@@ -1825,6 +1826,14 @@ static int unicam_enum_input(struct file
  		inp->capabilities = 0;
  		inp->std = 0;
  	}
@@ -53,6 +51,3 @@ index a603891986b9..cf5d16103d56 100644
  	snprintf(inp->name, sizeof(inp->name), "Camera 0");
  	return 0;
  }
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0440-media-v4l2-subdev-add-subdev-wide-state-struct.patch b/root/target/linux/bcm27xx/patches-5.15/950-0427-media-v4l2-subdev-add-subdev-wide-state-struct.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0440-media-v4l2-subdev-add-subdev-wide-state-struct.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0427-media-v4l2-subdev-add-subdev-wide-state-struct.patch
index 08b65227..494457fc 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0440-media-v4l2-subdev-add-subdev-wide-state-struct.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0427-media-v4l2-subdev-add-subdev-wide-state-struct.patch
@@ -1,7 +1,7 @@
-From 0b30ef5e75904e17a345f260542727e8ee5a191c Mon Sep 17 00:00:00 2001
+From 39d9373b329f605e9c64e6a3be84015d96e21520 Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Thu, 15 Jul 2021 15:55:22 +0100
-Subject: [PATCH 440/634] media: v4l2-subdev: add subdev-wide state struct
+Subject: [PATCH 427/828] media: v4l2-subdev: add subdev-wide state struct
 
 Signed-off-by: Dom Cobley <popcornmix@gmail.com>
 ---
@@ -15,11 +15,9 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  .../bcm2835-isp/bcm2835-v4l2-isp.c            |  4 +--
  8 files changed, 86 insertions(+), 44 deletions(-)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 7aee4a30bcdd..c09b5a22e1a8 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
-@@ -988,12 +988,13 @@ static int imx290_write_current_format(struct imx290 *imx290)
+@@ -988,12 +988,13 @@ static int imx290_write_current_format(s
  }
  
  static const struct v4l2_rect *
@@ -35,7 +33,7 @@ index 7aee4a30bcdd..c09b5a22e1a8 100644
  	case V4L2_SUBDEV_FORMAT_ACTIVE:
  		return &imx290->current_mode->crop;
  	}
-@@ -1002,7 +1003,7 @@ __imx290_get_pad_crop(struct imx290 *imx290, struct v4l2_subdev_pad_config *cfg,
+@@ -1002,7 +1003,7 @@ __imx290_get_pad_crop(struct imx290 *imx
  }
  
  static int imx290_get_selection(struct v4l2_subdev *sd,
@@ -44,7 +42,7 @@ index 7aee4a30bcdd..c09b5a22e1a8 100644
  				struct v4l2_subdev_selection *sel)
  {
  	switch (sel->target) {
-@@ -1010,7 +1011,7 @@ static int imx290_get_selection(struct v4l2_subdev *sd,
+@@ -1010,7 +1011,7 @@ static int imx290_get_selection(struct v
  		struct imx290 *imx290 = to_imx290(sd);
  
  		mutex_lock(&imx290->lock);
@@ -53,11 +51,9 @@ index 7aee4a30bcdd..c09b5a22e1a8 100644
  						sel->which);
  		mutex_unlock(&imx290->lock);
  
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index bc0fb02a159e..f550ff0d8b72 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
-@@ -1254,9 +1254,9 @@ static int imx477_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+@@ -1254,9 +1254,9 @@ static int imx477_open(struct v4l2_subde
  {
  	struct imx477 *imx477 = to_imx477(sd);
  	struct v4l2_mbus_framefmt *try_fmt_img =
@@ -69,7 +65,7 @@ index bc0fb02a159e..f550ff0d8b72 100644
  	struct v4l2_rect *try_crop;
  
  	mutex_lock(&imx477->mutex);
-@@ -1275,7 +1275,7 @@ static int imx477_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+@@ -1275,7 +1275,7 @@ static int imx477_open(struct v4l2_subde
  	try_fmt_meta->field = V4L2_FIELD_NONE;
  
  	/* Initialize try_crop */
@@ -78,7 +74,7 @@ index bc0fb02a159e..f550ff0d8b72 100644
  	try_crop->left = IMX477_PIXEL_ARRAY_LEFT;
  	try_crop->top = IMX477_PIXEL_ARRAY_TOP;
  	try_crop->width = IMX477_PIXEL_ARRAY_WIDTH;
-@@ -1403,7 +1403,7 @@ static const struct v4l2_ctrl_ops imx477_ctrl_ops = {
+@@ -1403,7 +1403,7 @@ static const struct v4l2_ctrl_ops imx477
  };
  
  static int imx477_enum_mbus_code(struct v4l2_subdev *sd,
@@ -87,7 +83,7 @@ index bc0fb02a159e..f550ff0d8b72 100644
  				 struct v4l2_subdev_mbus_code_enum *code)
  {
  	struct imx477 *imx477 = to_imx477(sd);
-@@ -1428,7 +1428,7 @@ static int imx477_enum_mbus_code(struct v4l2_subdev *sd,
+@@ -1428,7 +1428,7 @@ static int imx477_enum_mbus_code(struct
  }
  
  static int imx477_enum_frame_size(struct v4l2_subdev *sd,
@@ -96,7 +92,7 @@ index bc0fb02a159e..f550ff0d8b72 100644
  				  struct v4l2_subdev_frame_size_enum *fse)
  {
  	struct imx477 *imx477 = to_imx477(sd);
-@@ -1494,7 +1494,7 @@ static void imx477_update_metadata_pad_format(struct v4l2_subdev_format *fmt)
+@@ -1494,7 +1494,7 @@ static void imx477_update_metadata_pad_f
  }
  
  static int imx477_get_pad_format(struct v4l2_subdev *sd,
@@ -105,7 +101,7 @@ index bc0fb02a159e..f550ff0d8b72 100644
  				 struct v4l2_subdev_format *fmt)
  {
  	struct imx477 *imx477 = to_imx477(sd);
-@@ -1506,7 +1506,8 @@ static int imx477_get_pad_format(struct v4l2_subdev *sd,
+@@ -1506,7 +1506,8 @@ static int imx477_get_pad_format(struct
  
  	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
  		struct v4l2_mbus_framefmt *try_fmt =
@@ -115,7 +111,7 @@ index bc0fb02a159e..f550ff0d8b72 100644
  		/* update the code which could change due to vflip or hflip: */
  		try_fmt->code = fmt->pad == IMAGE_PAD ?
  				imx477_get_format_code(imx477, try_fmt->code) :
-@@ -1574,7 +1575,7 @@ static void imx477_set_framing_limits(struct imx477 *imx477)
+@@ -1574,7 +1575,7 @@ static void imx477_set_framing_limits(st
  }
  
  static int imx477_set_pad_format(struct v4l2_subdev *sd,
@@ -124,7 +120,7 @@ index bc0fb02a159e..f550ff0d8b72 100644
  				 struct v4l2_subdev_format *fmt)
  {
  	struct v4l2_mbus_framefmt *framefmt;
-@@ -1603,7 +1604,7 @@ static int imx477_set_pad_format(struct v4l2_subdev *sd,
+@@ -1603,7 +1604,7 @@ static int imx477_set_pad_format(struct
  					      fmt->format.height);
  		imx477_update_image_pad_format(imx477, mode, fmt);
  		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
@@ -133,7 +129,7 @@ index bc0fb02a159e..f550ff0d8b72 100644
  							      fmt->pad);
  			*framefmt = fmt->format;
  		} else {
-@@ -1613,7 +1614,7 @@ static int imx477_set_pad_format(struct v4l2_subdev *sd,
+@@ -1613,7 +1614,7 @@ static int imx477_set_pad_format(struct
  		}
  	} else {
  		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
@@ -142,7 +138,7 @@ index bc0fb02a159e..f550ff0d8b72 100644
  							      fmt->pad);
  			*framefmt = fmt->format;
  		} else {
-@@ -1628,12 +1629,13 @@ static int imx477_set_pad_format(struct v4l2_subdev *sd,
+@@ -1628,12 +1629,13 @@ static int imx477_set_pad_format(struct
  }
  
  static const struct v4l2_rect *
@@ -158,7 +154,7 @@ index bc0fb02a159e..f550ff0d8b72 100644
  	case V4L2_SUBDEV_FORMAT_ACTIVE:
  		return &imx477->mode->crop;
  	}
-@@ -1642,7 +1644,7 @@ __imx477_get_pad_crop(struct imx477 *imx477, struct v4l2_subdev_pad_config *cfg,
+@@ -1642,7 +1644,7 @@ __imx477_get_pad_crop(struct imx477 *imx
  }
  
  static int imx477_get_selection(struct v4l2_subdev *sd,
@@ -167,7 +163,7 @@ index bc0fb02a159e..f550ff0d8b72 100644
  				struct v4l2_subdev_selection *sel)
  {
  	switch (sel->target) {
-@@ -1650,7 +1652,7 @@ static int imx477_get_selection(struct v4l2_subdev *sd,
+@@ -1650,7 +1652,7 @@ static int imx477_get_selection(struct v
  		struct imx477 *imx477 = to_imx477(sd);
  
  		mutex_lock(&imx477->mutex);
@@ -176,11 +172,9 @@ index bc0fb02a159e..f550ff0d8b72 100644
  						sel->which);
  		mutex_unlock(&imx477->mutex);
  
-diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c
-index 30c3d2640386..4543556d3d52 100644
 --- a/drivers/media/i2c/irs1125.c
 +++ b/drivers/media/i2c/irs1125.c
-@@ -562,8 +562,8 @@ static const struct v4l2_subdev_video_ops irs1125_subdev_video_ops = {
+@@ -562,8 +562,8 @@ static const struct v4l2_subdev_video_op
  };
  
  static int irs1125_enum_mbus_code(struct v4l2_subdev *sd,
@@ -191,7 +185,7 @@ index 30c3d2640386..4543556d3d52 100644
  {
  	if (code->index > 0)
  		return -EINVAL;
-@@ -574,7 +574,7 @@ static int irs1125_enum_mbus_code(struct v4l2_subdev *sd,
+@@ -574,7 +574,7 @@ static int irs1125_enum_mbus_code(struct
  }
  
  static int irs1125_set_get_fmt(struct v4l2_subdev *sd,
@@ -200,7 +194,7 @@ index 30c3d2640386..4543556d3d52 100644
  			       struct v4l2_subdev_format *format)
  {
  	struct v4l2_mbus_framefmt *fmt = &format->format;
-@@ -930,7 +930,7 @@ static int irs1125_detect(struct v4l2_subdev *sd)
+@@ -930,7 +930,7 @@ static int irs1125_detect(struct v4l2_su
  static int irs1125_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
  {
  	struct v4l2_mbus_framefmt *format =
@@ -209,11 +203,9 @@ index 30c3d2640386..4543556d3d52 100644
  
  	format->code = MEDIA_BUS_FMT_Y12_1X12;
  	format->width = IRS1125_WINDOW_WIDTH_DEF;
-diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-index 5f1b83d77473..c89dc98ad708 100644
 --- a/drivers/media/i2c/ov9281.c
 +++ b/drivers/media/i2c/ov9281.c
-@@ -491,7 +491,7 @@ ov9281_find_best_fit(struct v4l2_subdev_format *fmt)
+@@ -491,7 +491,7 @@ ov9281_find_best_fit(struct v4l2_subdev_
  }
  
  static int ov9281_set_fmt(struct v4l2_subdev *sd,
@@ -222,7 +214,7 @@ index 5f1b83d77473..c89dc98ad708 100644
  			  struct v4l2_subdev_format *fmt)
  {
  	struct ov9281 *ov9281 = to_ov9281(sd);
-@@ -516,7 +516,7 @@ static int ov9281_set_fmt(struct v4l2_subdev *sd,
+@@ -516,7 +516,7 @@ static int ov9281_set_fmt(struct v4l2_su
  		V4L2_MAP_XFER_FUNC_DEFAULT(fmt->format.colorspace);
  
  	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
@@ -231,7 +223,7 @@ index 5f1b83d77473..c89dc98ad708 100644
  	} else {
  		ov9281->cur_mode = mode;
  		ov9281->code = fmt->format.code;
-@@ -542,7 +542,7 @@ static int ov9281_set_fmt(struct v4l2_subdev *sd,
+@@ -542,7 +542,7 @@ static int ov9281_set_fmt(struct v4l2_su
  }
  
  static int ov9281_get_fmt(struct v4l2_subdev *sd,
@@ -240,7 +232,7 @@ index 5f1b83d77473..c89dc98ad708 100644
  			  struct v4l2_subdev_format *fmt)
  {
  	struct ov9281 *ov9281 = to_ov9281(sd);
-@@ -550,7 +550,8 @@ static int ov9281_get_fmt(struct v4l2_subdev *sd,
+@@ -550,7 +550,8 @@ static int ov9281_get_fmt(struct v4l2_su
  
  	mutex_lock(&ov9281->mutex);
  	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
@@ -250,7 +242,7 @@ index 5f1b83d77473..c89dc98ad708 100644
  	} else {
  		fmt->format.width = mode->width;
  		fmt->format.height = mode->height;
-@@ -572,7 +573,7 @@ static int ov9281_get_fmt(struct v4l2_subdev *sd,
+@@ -572,7 +573,7 @@ static int ov9281_get_fmt(struct v4l2_su
  }
  
  static int ov9281_enum_mbus_code(struct v4l2_subdev *sd,
@@ -259,7 +251,7 @@ index 5f1b83d77473..c89dc98ad708 100644
  				 struct v4l2_subdev_mbus_code_enum *code)
  {
  	switch (code->index) {
-@@ -590,7 +591,7 @@ static int ov9281_enum_mbus_code(struct v4l2_subdev *sd,
+@@ -590,7 +591,7 @@ static int ov9281_enum_mbus_code(struct
  }
  
  static int ov9281_enum_frame_sizes(struct v4l2_subdev *sd,
@@ -268,7 +260,7 @@ index 5f1b83d77473..c89dc98ad708 100644
  				   struct v4l2_subdev_frame_size_enum *fse)
  {
  	if (fse->index >= ARRAY_SIZE(supported_modes))
-@@ -658,12 +659,14 @@ static int ov9281_set_ctrl_vflip(struct ov9281 *ov9281, int value)
+@@ -658,12 +659,14 @@ static int ov9281_set_ctrl_vflip(struct
  }
  
  static const struct v4l2_rect *
@@ -285,7 +277,7 @@ index 5f1b83d77473..c89dc98ad708 100644
  	case V4L2_SUBDEV_FORMAT_ACTIVE:
  		return &ov9281->cur_mode->crop;
  	}
-@@ -672,7 +675,7 @@ __ov9281_get_pad_crop(struct ov9281 *ov9281, struct v4l2_subdev_pad_config *cfg,
+@@ -672,7 +675,7 @@ __ov9281_get_pad_crop(struct ov9281 *ov9
  }
  
  static int ov9281_get_selection(struct v4l2_subdev *sd,
@@ -294,7 +286,7 @@ index 5f1b83d77473..c89dc98ad708 100644
  				struct v4l2_subdev_selection *sel)
  {
  	switch (sel->target) {
-@@ -680,7 +683,7 @@ static int ov9281_get_selection(struct v4l2_subdev *sd,
+@@ -680,7 +683,7 @@ static int ov9281_get_selection(struct v
  		struct ov9281 *ov9281 = to_ov9281(sd);
  
  		mutex_lock(&ov9281->mutex);
@@ -303,7 +295,7 @@ index 5f1b83d77473..c89dc98ad708 100644
  						sel->which);
  		mutex_unlock(&ov9281->mutex);
  
-@@ -898,7 +901,7 @@ static int ov9281_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+@@ -898,7 +901,7 @@ static int ov9281_open(struct v4l2_subde
  {
  	struct ov9281 *ov9281 = to_ov9281(sd);
  	struct v4l2_mbus_framefmt *try_fmt =
@@ -312,8 +304,6 @@ index 5f1b83d77473..c89dc98ad708 100644
  	const struct ov9281_mode *def_mode = &supported_modes[0];
  
  	mutex_lock(&ov9281->mutex);
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index cf5d16103d56..f1ea1c2da6c3 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -446,7 +446,7 @@ struct unicam_device {
@@ -325,7 +315,7 @@ index cf5d16103d56..f1ea1c2da6c3 100644
  
  	enum v4l2_mbus_type bus_type;
  	/*
-@@ -597,7 +597,7 @@ static int __subdev_get_format(struct unicam_device *dev,
+@@ -597,7 +597,7 @@ static int __subdev_get_format(struct un
  	};
  	int ret;
  
@@ -334,7 +324,7 @@ index cf5d16103d56..f1ea1c2da6c3 100644
  			       &sd_fmt);
  	if (ret < 0)
  		return ret;
-@@ -621,7 +621,7 @@ static int __subdev_set_format(struct unicam_device *dev,
+@@ -621,7 +621,7 @@ static int __subdev_set_format(struct un
  
  	sd_fmt.format = *fmt;
  
@@ -343,7 +333,7 @@ index cf5d16103d56..f1ea1c2da6c3 100644
  			       &sd_fmt);
  	if (ret < 0)
  		return ret;
-@@ -1097,7 +1097,7 @@ static int unicam_try_fmt_vid_cap(struct file *file, void *priv,
+@@ -1097,7 +1097,7 @@ static int unicam_try_fmt_vid_cap(struct
  	 */
  	mbus_fmt->field = V4L2_FIELD_NONE;
  
@@ -352,7 +342,7 @@ index cf5d16103d56..f1ea1c2da6c3 100644
  			       &sd_fmt);
  	if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV)
  		return ret;
-@@ -1119,7 +1119,7 @@ static int unicam_try_fmt_vid_cap(struct file *file, void *priv,
+@@ -1119,7 +1119,7 @@ static int unicam_try_fmt_vid_cap(struct
  			mbus_fmt->code = fmt->code;
  
  			ret = v4l2_subdev_call(dev->sensor, pad, set_fmt,
@@ -361,7 +351,7 @@ index cf5d16103d56..f1ea1c2da6c3 100644
  			if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV)
  				return ret;
  
-@@ -2329,8 +2329,8 @@ static void unicam_release(struct kref *kref)
+@@ -2329,8 +2329,8 @@ static void unicam_release(struct kref *
  	v4l2_ctrl_handler_free(&unicam->ctrl_handler);
  	media_device_cleanup(&unicam->mdev);
  
@@ -372,7 +362,7 @@ index cf5d16103d56..f1ea1c2da6c3 100644
  
  	kfree(unicam);
  }
-@@ -2592,8 +2592,8 @@ static int unicam_probe_complete(struct unicam_device *unicam)
+@@ -2592,8 +2592,8 @@ static int unicam_probe_complete(struct
  
  	unicam->v4l2_dev.notify = unicam_notify;
  
@@ -383,11 +373,9 @@ index cf5d16103d56..f1ea1c2da6c3 100644
  		return -ENOMEM;
  
  	unicam->sensor_embedded_data = (unicam->sensor->entity.num_pads >= 2);
-diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
-index d596bc040005..6ef44cfbb648 100644
 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
 +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
-@@ -214,6 +214,12 @@ rkisp1_isp_get_pad_fmt(struct rkisp1_isp *isp,
+@@ -214,6 +214,12 @@ rkisp1_isp_get_pad_fmt(struct rkisp1_isp
  	struct v4l2_subdev_state state = {
  		.pads = isp->pad_cfg
  		};
@@ -400,7 +388,7 @@ index d596bc040005..6ef44cfbb648 100644
  	if (which == V4L2_SUBDEV_FORMAT_TRY)
  		return v4l2_subdev_get_try_format(&isp->sd, sd_state, pad);
  	else
-@@ -228,6 +234,12 @@ rkisp1_isp_get_pad_crop(struct rkisp1_isp *isp,
+@@ -228,6 +234,12 @@ rkisp1_isp_get_pad_crop(struct rkisp1_is
  	struct v4l2_subdev_state state = {
  		.pads = isp->pad_cfg
  		};
@@ -413,7 +401,7 @@ index d596bc040005..6ef44cfbb648 100644
  	if (which == V4L2_SUBDEV_FORMAT_TRY)
  		return v4l2_subdev_get_try_crop(&isp->sd, sd_state, pad);
  	else
-@@ -1053,6 +1065,12 @@ int rkisp1_isp_register(struct rkisp1_device *rkisp1)
+@@ -1053,6 +1065,12 @@ int rkisp1_isp_register(struct rkisp1_de
  	struct v4l2_subdev_state state = {
  		.pads = rkisp1->isp.pad_cfg
  		};
@@ -426,11 +414,9 @@ index d596bc040005..6ef44cfbb648 100644
  	struct rkisp1_isp *isp = &rkisp1->isp;
  	struct media_pad *pads = isp->pads;
  	struct v4l2_subdev *sd = &isp->sd;
-diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
-index 2070f4b06705..1b9f62cbf5d4 100644
 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
 +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
-@@ -186,6 +186,12 @@ rkisp1_rsz_get_pad_fmt(struct rkisp1_resizer *rsz,
+@@ -186,6 +186,12 @@ rkisp1_rsz_get_pad_fmt(struct rkisp1_res
  	struct v4l2_subdev_state state = {
  		.pads = rsz->pad_cfg
  		};
@@ -443,7 +429,7 @@ index 2070f4b06705..1b9f62cbf5d4 100644
  	if (which == V4L2_SUBDEV_FORMAT_TRY)
  		return v4l2_subdev_get_try_format(&rsz->sd, sd_state, pad);
  	else
-@@ -200,6 +206,12 @@ rkisp1_rsz_get_pad_crop(struct rkisp1_resizer *rsz,
+@@ -200,6 +206,12 @@ rkisp1_rsz_get_pad_crop(struct rkisp1_re
  	struct v4l2_subdev_state state = {
  		.pads = rsz->pad_cfg
  		};
@@ -456,7 +442,7 @@ index 2070f4b06705..1b9f62cbf5d4 100644
  	if (which == V4L2_SUBDEV_FORMAT_TRY)
  		return v4l2_subdev_get_try_crop(&rsz->sd, sd_state, pad);
  	else
-@@ -791,6 +803,12 @@ static int rkisp1_rsz_register(struct rkisp1_resizer *rsz)
+@@ -791,6 +803,12 @@ static int rkisp1_rsz_register(struct rk
  	struct v4l2_subdev_state state = {
  		.pads = rsz->pad_cfg
  		};
@@ -469,11 +455,9 @@ index 2070f4b06705..1b9f62cbf5d4 100644
  	static const char * const dev_names[] = {
  		RKISP1_RSZ_MP_DEV_NAME,
  		RKISP1_RSZ_SP_DEV_NAME
-diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-index 08dce8bba9bb..00b044e7d77e 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -1463,7 +1463,7 @@ static int register_node(struct bcm2835_isp_dev *dev,
+@@ -1463,7 +1463,7 @@ queue_cleanup:
  }
  
  /* Unregister one of the /dev/video<N> nodes associated with the ISP. */
@@ -482,7 +466,7 @@ index 08dce8bba9bb..00b044e7d77e 100644
  {
  	struct bcm2835_isp_dev *dev = node_get_dev(node);
  
-@@ -1666,7 +1666,7 @@ static int bcm2835_isp_remove(struct platform_device *pdev)
+@@ -1666,7 +1666,7 @@ static int bcm2835_isp_remove(struct pla
  	media_controller_unregister(dev);
  
  	for (i = 0; i < BCM2835_ISP_NUM_NODES; i++)
@@ -491,6 +475,3 @@ index 08dce8bba9bb..00b044e7d77e 100644
  
  	v4l2_device_unregister(&dev->v4l2_dev);
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0428-drm-vc4-Adopt-the-dma-configuration-from-the-HVS-or-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0428-drm-vc4-Adopt-the-dma-configuration-from-the-HVS-or-.patch
new file mode 100644
index 00000000..b083614e
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0428-drm-vc4-Adopt-the-dma-configuration-from-the-HVS-or-.patch
@@ -0,0 +1,54 @@
+From 62ee3fb1df901304655927080e80fde99023d288 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Tue, 19 May 2020 14:54:28 +0100
+Subject: [PATCH 428/828] drm/vc4: Adopt the dma configuration from the HVS or
+ V3D component
+
+vc4_drv isn't necessarily under the /soc node in DT as it is a
+virtual device, but it is the one that does the allocations.
+The DMA addresses are consumed by primarily the HVS or V3D, and
+those require VideoCore cache alias address mapping, and so will be
+under /soc.
+
+During probe find the a suitable device node for HVS or V3D,
+and adopt the DMA configuration of that node.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_drv.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_drv.c
++++ b/drivers/gpu/drm/vc4/vc4_drv.c
+@@ -216,6 +216,14 @@ static void vc4_match_add_drivers(struct
+ 	}
+ }
+ 
++const struct of_device_id vc4_dma_range_matches[] = {
++	{ .compatible = "brcm,bcm2835-hvs" },
++	{ .compatible = "brcm,bcm2835-v3d" },
++	{ .compatible = "brcm,cygnus-v3d" },
++	{ .compatible = "brcm,vc4-v3d" },
++	{}
++};
++
+ static int vc4_drm_bind(struct device *dev)
+ {
+ 	struct platform_device *pdev = to_platform_device(dev);
+@@ -234,6 +242,16 @@ static int vc4_drm_bind(struct device *d
+ 		vc4_drm_driver.driver_features &= ~DRIVER_RENDER;
+ 	of_node_put(node);
+ 
++	node = of_find_matching_node_and_match(NULL, vc4_dma_range_matches,
++					       NULL);
++	if (node) {
++		ret = of_dma_configure(dev, node, true);
++		of_node_put(node);
++
++		if (ret)
++			return ret;
++	}
++
+ 	vc4 = devm_drm_dev_alloc(dev, &vc4_drm_driver, struct vc4_dev, base);
+ 	if (IS_ERR(vc4))
+ 		return PTR_ERR(vc4);
diff --git a/root/target/linux/bcm27xx/patches-5.15/0442-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch b/root/target/linux/bcm27xx/patches-5.15/950-0429-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0442-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0429-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch
index 97c53831..67578a29 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0442-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0429-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch
@@ -1,7 +1,7 @@
-From 1ed907cd7acfdf67eacd9dc0602bd640f95dd4b9 Mon Sep 17 00:00:00 2001
+From 1d9aea1272bd633a5b4968a16870034bcded5c9a Mon Sep 17 00:00:00 2001
 From: Joerg Quinten <aBUGSworstnightmare@gmail.com>
 Date: Fri, 18 Jun 2021 13:02:29 +0200
-Subject: [PATCH 442/634] Support RPi DPI interface in mode6 for 18-bit color
+Subject: [PATCH 429/828] Support RPi DPI interface in mode6 for 18-bit color
 
 A matching media bus format was added and an overlay for using it,
 both with FB and VC4 was added as well.
@@ -15,8 +15,6 @@ Signed-off-by: Joerg Quinten <aBUGSworstnightmare@gmail.com>
  include/uapi/linux/media-bus-format.h         |  4 +-
  5 files changed, 124 insertions(+), 1 deletion(-)
 
-diff --git a/Documentation/devicetree/bindings/display/panel/panel-simple.yaml b/Documentation/devicetree/bindings/display/panel/panel-simple.yaml
-index 335776c45474..6637cb1243c3 100644
 --- a/Documentation/devicetree/bindings/display/panel/panel-simple.yaml
 +++ b/Documentation/devicetree/bindings/display/panel/panel-simple.yaml
 @@ -162,6 +162,8 @@ properties:
@@ -28,11 +26,9 @@ index 335776c45474..6637cb1243c3 100644
          # Innolux AT070TN92 7.0" WQVGA TFT LCD panel
        - innolux,at070tn92
          # Innolux G070Y2-L01 7" WVGA (800x480) TFT LCD panel
-diff --git a/Documentation/userspace-api/media/v4l/subdev-formats.rst b/Documentation/userspace-api/media/v4l/subdev-formats.rst
-index e7a2fac30ae4..6e143e47d967 100644
 --- a/Documentation/userspace-api/media/v4l/subdev-formats.rst
 +++ b/Documentation/userspace-api/media/v4l/subdev-formats.rst
-@@ -912,6 +912,43 @@ The following tables list existing packed RGB formats.
+@@ -912,6 +912,43 @@ The following tables list existing packe
        - g\ :sub:`5`
        - g\ :sub:`4`
        - g\ :sub:`3`
@@ -76,7 +72,7 @@ index e7a2fac30ae4..6e143e47d967 100644
      * .. _MEDIA-BUS-FMT-RGB666-1X18:
  
        - MEDIA_BUS_FMT_RGB666_1X18
-@@ -986,6 +1023,43 @@ The following tables list existing packed RGB formats.
+@@ -986,6 +1023,43 @@ The following tables list existing packe
        - g\ :sub:`2`
        - g\ :sub:`1`
        - g\ :sub:`0`
@@ -120,11 +116,9 @@ index e7a2fac30ae4..6e143e47d967 100644
      * .. _MEDIA-BUS-FMT-RGB666-1X24_CPADHI:
  
        - MEDIA_BUS_FMT_RGB666_1X24_CPADHI
-diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
-index 9b6c4e6c38a1..66e79eb801b6 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2471,6 +2471,38 @@ static const struct panel_desc innolux_at043tn24 = {
+@@ -2472,6 +2472,38 @@ static const struct panel_desc innolux_a
  	.bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
  };
  
@@ -163,21 +157,19 @@ index 9b6c4e6c38a1..66e79eb801b6 100644
  static const struct drm_display_mode innolux_at070tn92_mode = {
  	.clock = 33333,
  	.hdisplay = 800,
-@@ -4657,6 +4689,9 @@ static const struct of_device_id platform_of_match[] = {
- 	}, {
+@@ -4659,6 +4691,9 @@ static const struct of_device_id platfor
  		.compatible = "innolux,at043tn24",
  		.data = &innolux_at043tn24,
-+	}, {
+ 	}, {
 +		.compatible = "innolux,at056tn53v1",
 +		.data = &innolux_at056tn53v1,
- 	}, {
++	}, {
  		.compatible = "innolux,at070tn92",
  		.data = &innolux_at070tn92,
-diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c
-index a90f2545baee..afb446f49e9c 100644
+ 	}, {
 --- a/drivers/gpu/drm/vc4/vc4_dpi.c
 +++ b/drivers/gpu/drm/vc4/vc4_dpi.c
-@@ -165,10 +165,20 @@ static void vc4_dpi_encoder_enable(struct drm_encoder *encoder)
+@@ -165,10 +165,20 @@ static void vc4_dpi_encoder_enable(struc
  			dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_2,
  					       DPI_FORMAT);
  			break;
@@ -198,8 +190,6 @@ index a90f2545baee..afb446f49e9c 100644
  		case MEDIA_BUS_FMT_RGB565_1X16:
  			dpi_c |= VC4_SET_FIELD(DPI_FORMAT_16BIT_565_RGB_3,
  					       DPI_FORMAT);
-diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
-index aa56d7f54784..6ad34f88c7dd 100644
 --- a/include/uapi/linux/media-bus-format.h
 +++ b/include/uapi/linux/media-bus-format.h
 @@ -34,7 +34,7 @@
@@ -222,6 +212,3 @@ index aa56d7f54784..6ad34f88c7dd 100644
  #define MEDIA_BUS_FMT_RGB666_1X24_CPADHI	0x1015
  #define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG		0x1010
  #define MEDIA_BUS_FMT_BGR888_1X24		0x1013
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0430-drm-vc4-plane-Add-support-for-DRM_FORMAT_P030.patch b/root/target/linux/bcm27xx/patches-5.15/950-0430-drm-vc4-plane-Add-support-for-DRM_FORMAT_P030.patch
new file mode 100644
index 00000000..49970e34
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0430-drm-vc4-plane-Add-support-for-DRM_FORMAT_P030.patch
@@ -0,0 +1,216 @@
+From 5258b0a1d026355da0bac598c325ad527acde442 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 15 Dec 2021 10:17:38 +0100
+Subject: [PATCH 430/828] drm/vc4: plane: Add support for DRM_FORMAT_P030
+
+The P030 format, used with the DRM_FORMAT_MOD_BROADCOM_SAND128 modifier,
+is a format output by the video decoder on the BCM2711.
+
+Add native support to the KMS planes for that format.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+Link: https://lore.kernel.org/r/20211215091739.135042-3-maxime@cerno.tech
+---
+ drivers/gpu/drm/vc4/vc4_plane.c | 127 ++++++++++++++++++++++++--------
+ 1 file changed, 96 insertions(+), 31 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_plane.c
++++ b/drivers/gpu/drm/vc4/vc4_plane.c
+@@ -33,6 +33,7 @@ static const struct hvs_format {
+ 	u32 hvs; /* HVS_FORMAT_* */
+ 	u32 pixel_order;
+ 	u32 pixel_order_hvs5;
++	bool hvs5_only;
+ } hvs_formats[] = {
+ 	{
+ 		.drm = DRM_FORMAT_XRGB8888,
+@@ -128,6 +129,12 @@ static const struct hvs_format {
+ 		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_2PLANE,
+ 		.pixel_order = HVS_PIXEL_ORDER_XYCRCB,
+ 	},
++	{
++		.drm = DRM_FORMAT_P030,
++		.hvs = HVS_PIXEL_FORMAT_YCBCR_10BIT,
++		.pixel_order = HVS_PIXEL_ORDER_XYCBCR,
++		.hvs5_only = true,
++	},
+ };
+ 
+ static const struct hvs_format *vc4_get_hvs_format(u32 drm_format)
+@@ -762,47 +769,90 @@ static int vc4_plane_mode_set(struct drm
+ 	case DRM_FORMAT_MOD_BROADCOM_SAND128:
+ 	case DRM_FORMAT_MOD_BROADCOM_SAND256: {
+ 		uint32_t param = fourcc_mod_broadcom_param(fb->modifier);
+-		u32 tile_w, tile, x_off, pix_per_tile;
+-
+-		hvs_format = HVS_PIXEL_FORMAT_H264;
+-
+-		switch (base_format_mod) {
+-		case DRM_FORMAT_MOD_BROADCOM_SAND64:
+-			tiling = SCALER_CTL0_TILING_64B;
+-			tile_w = 64;
+-			break;
+-		case DRM_FORMAT_MOD_BROADCOM_SAND128:
+-			tiling = SCALER_CTL0_TILING_128B;
+-			tile_w = 128;
+-			break;
+-		case DRM_FORMAT_MOD_BROADCOM_SAND256:
+-			tiling = SCALER_CTL0_TILING_256B_OR_T;
+-			tile_w = 256;
+-			break;
+-		default:
+-			break;
+-		}
+ 
+ 		if (param > SCALER_TILE_HEIGHT_MASK) {
+-			DRM_DEBUG_KMS("SAND height too large (%d)\n", param);
++			DRM_DEBUG_KMS("SAND height too large (%d)\n",
++				      param);
+ 			return -EINVAL;
+ 		}
+ 
+-		pix_per_tile = tile_w / fb->format->cpp[0];
+-		tile = vc4_state->src_x / pix_per_tile;
+-		x_off = vc4_state->src_x % pix_per_tile;
++		if (fb->format->format == DRM_FORMAT_P030) {
++			hvs_format = HVS_PIXEL_FORMAT_YCBCR_10BIT;
++			tiling = SCALER_CTL0_TILING_128B;
++		} else {
++			hvs_format = HVS_PIXEL_FORMAT_H264;
++
++			switch (base_format_mod) {
++			case DRM_FORMAT_MOD_BROADCOM_SAND64:
++				tiling = SCALER_CTL0_TILING_64B;
++				break;
++			case DRM_FORMAT_MOD_BROADCOM_SAND128:
++				tiling = SCALER_CTL0_TILING_128B;
++				break;
++			case DRM_FORMAT_MOD_BROADCOM_SAND256:
++				tiling = SCALER_CTL0_TILING_256B_OR_T;
++				break;
++			default:
++				return -EINVAL;
++			}
++		}
+ 
+ 		/* Adjust the base pointer to the first pixel to be scanned
+ 		 * out.
++		 *
++		 * For P030, y_ptr [31:4] is the 128bit word for the start pixel
++		 * y_ptr [3:0] is the pixel (0-11) contained within that 128bit
++		 * word that should be taken as the first pixel.
++		 * Ditto uv_ptr [31:4] vs [3:0], however [3:0] contains the
++		 * element within the 128bit word, eg for pixel 3 the value
++		 * should be 6.
+ 		 */
+ 		for (i = 0; i < num_planes; i++) {
++			u32 tile_w, tile, x_off, pix_per_tile;
++
++			if (fb->format->format == DRM_FORMAT_P030) {
++				/*
++				 * Spec says: bits [31:4] of the given address
++				 * should point to the 128-bit word containing
++				 * the desired starting pixel, and bits[3:0]
++				 * should be between 0 and 11, indicating which
++				 * of the 12-pixels in that 128-bit word is the
++				 * first pixel to be used
++				 */
++				u32 remaining_pixels = vc4_state->src_x % 96;
++				u32 aligned = remaining_pixels / 12;
++				u32 last_bits = remaining_pixels % 12;
++
++				x_off = aligned * 16 + last_bits;
++				tile_w = 128;
++				pix_per_tile = 96;
++			} else {
++				switch (base_format_mod) {
++				case DRM_FORMAT_MOD_BROADCOM_SAND64:
++					tile_w = 64;
++					break;
++				case DRM_FORMAT_MOD_BROADCOM_SAND128:
++					tile_w = 128;
++					break;
++				case DRM_FORMAT_MOD_BROADCOM_SAND256:
++					tile_w = 256;
++					break;
++				default:
++					return -EINVAL;
++				}
++				pix_per_tile = tile_w / fb->format->cpp[0];
++				x_off = (vc4_state->src_x % pix_per_tile) /
++					(i ? h_subsample : 1) *
++					fb->format->cpp[i];
++			}
++
++			tile = vc4_state->src_x / pix_per_tile;
++
+ 			vc4_state->offsets[i] += param * tile_w * tile;
+ 			vc4_state->offsets[i] += src_y /
+ 						 (i ? v_subsample : 1) *
+ 						 tile_w;
+-			vc4_state->offsets[i] += x_off /
+-						 (i ? h_subsample : 1) *
+-						 fb->format->cpp[i];
++			vc4_state->offsets[i] += x_off & ~(i ? 1 : 0);
+ 		}
+ 
+ 		pitch0 = VC4_SET_FIELD(param, SCALER_TILE_HEIGHT);
+@@ -955,7 +1005,8 @@ static int vc4_plane_mode_set(struct drm
+ 
+ 	/* Pitch word 1/2 */
+ 	for (i = 1; i < num_planes; i++) {
+-		if (hvs_format != HVS_PIXEL_FORMAT_H264) {
++		if (hvs_format != HVS_PIXEL_FORMAT_H264 &&
++		    hvs_format != HVS_PIXEL_FORMAT_YCBCR_10BIT) {
+ 			vc4_dlist_write(vc4_state,
+ 					VC4_SET_FIELD(fb->pitches[i],
+ 						      SCALER_SRC_PITCH));
+@@ -1315,6 +1366,13 @@ static bool vc4_format_mod_supported(str
+ 		default:
+ 			return false;
+ 		}
++	case DRM_FORMAT_P030:
++		switch (fourcc_mod_broadcom_mod(modifier)) {
++		case DRM_FORMAT_MOD_BROADCOM_SAND128:
++			return true;
++		default:
++			return false;
++		}
+ 	case DRM_FORMAT_RGBX1010102:
+ 	case DRM_FORMAT_BGRX1010102:
+ 	case DRM_FORMAT_RGBA1010102:
+@@ -1347,8 +1405,11 @@ struct drm_plane *vc4_plane_init(struct
+ 	struct drm_plane *plane = NULL;
+ 	struct vc4_plane *vc4_plane;
+ 	u32 formats[ARRAY_SIZE(hvs_formats)];
++	int num_formats = 0;
+ 	int ret = 0;
+ 	unsigned i;
++	bool hvs5 = of_device_is_compatible(dev->dev->of_node,
++					    "brcm,bcm2711-vc5");
+ 	static const uint64_t modifiers[] = {
+ 		DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED,
+ 		DRM_FORMAT_MOD_BROADCOM_SAND128,
+@@ -1363,13 +1424,17 @@ struct drm_plane *vc4_plane_init(struct
+ 	if (!vc4_plane)
+ 		return ERR_PTR(-ENOMEM);
+ 
+-	for (i = 0; i < ARRAY_SIZE(hvs_formats); i++)
+-		formats[i] = hvs_formats[i].drm;
++	for (i = 0; i < ARRAY_SIZE(hvs_formats); i++) {
++		if (!hvs_formats[i].hvs5_only || hvs5) {
++			formats[num_formats] = hvs_formats[i].drm;
++			num_formats++;
++		}
++	}
+ 
+ 	plane = &vc4_plane->base;
+ 	ret = drm_universal_plane_init(dev, plane, 0,
+ 				       &vc4_plane_funcs,
+-				       formats, ARRAY_SIZE(formats),
++				       formats, num_formats,
+ 				       modifiers, type, NULL);
+ 	if (ret)
+ 		return ERR_PTR(ret);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0431-drm-vc4-plane-Add-support-for-YUV-color-encodings-an.patch b/root/target/linux/bcm27xx/patches-5.15/950-0431-drm-vc4-plane-Add-support-for-YUV-color-encodings-an.patch
new file mode 100644
index 00000000..f05ddb4f
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0431-drm-vc4-plane-Add-support-for-YUV-color-encodings-an.patch
@@ -0,0 +1,158 @@
+From 637de1e2570bd143e55160bf9fa3f77d312728d8 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 15 Dec 2021 10:17:39 +0100
+Subject: [PATCH 431/828] drm/vc4: plane: Add support for YUV color encodings
+ and ranges
+
+The BT601/BT709 color encoding and limited vs full
+range properties were not being exposed, defaulting
+always to BT601 limited range.
+
+Expose the parameters and set the registers appropriately.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+Link: https://lore.kernel.org/r/20211215091739.135042-4-maxime@cerno.tech
+---
+ drivers/gpu/drm/vc4/vc4_plane.c | 71 +++++++++++++++++++++++++++++++--
+ drivers/gpu/drm/vc4/vc4_regs.h  | 19 ++++++---
+ 2 files changed, 82 insertions(+), 8 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_plane.c
++++ b/drivers/gpu/drm/vc4/vc4_plane.c
+@@ -623,6 +623,51 @@ static int vc4_plane_allocate_lbm(struct
+ 	return 0;
+ }
+ 
++/*
++ * The colorspace conversion matrices are held in 3 entries in the dlist.
++ * Create an array of them, with entries for each full and limited mode, and
++ * each supported colorspace.
++ */
++static const u32 colorspace_coeffs[2][DRM_COLOR_ENCODING_MAX][3] = {
++	{
++		/* Limited range */
++		{
++			/* BT601 */
++			SCALER_CSC0_ITR_R_601_5,
++			SCALER_CSC1_ITR_R_601_5,
++			SCALER_CSC2_ITR_R_601_5,
++		}, {
++			/* BT709 */
++			SCALER_CSC0_ITR_R_709_3,
++			SCALER_CSC1_ITR_R_709_3,
++			SCALER_CSC2_ITR_R_709_3,
++		}, {
++			/* BT2020 */
++			SCALER_CSC0_ITR_R_2020,
++			SCALER_CSC1_ITR_R_2020,
++			SCALER_CSC2_ITR_R_2020,
++		}
++	}, {
++		/* Full range */
++		{
++			/* JFIF */
++			SCALER_CSC0_JPEG_JFIF,
++			SCALER_CSC1_JPEG_JFIF,
++			SCALER_CSC2_JPEG_JFIF,
++		}, {
++			/* BT709 */
++			SCALER_CSC0_ITR_R_709_3_FR,
++			SCALER_CSC1_ITR_R_709_3_FR,
++			SCALER_CSC2_ITR_R_709_3_FR,
++		}, {
++			/* BT2020 */
++			SCALER_CSC0_ITR_R_2020_FR,
++			SCALER_CSC1_ITR_R_2020_FR,
++			SCALER_CSC2_ITR_R_2020_FR,
++		}
++	}
++};
++
+ /* Writes out a full display list for an active plane to the plane's
+  * private dlist state.
+  */
+@@ -1017,9 +1062,20 @@ static int vc4_plane_mode_set(struct drm
+ 
+ 	/* Colorspace conversion words */
+ 	if (vc4_state->is_yuv) {
+-		vc4_dlist_write(vc4_state, SCALER_CSC0_ITR_R_601_5);
+-		vc4_dlist_write(vc4_state, SCALER_CSC1_ITR_R_601_5);
+-		vc4_dlist_write(vc4_state, SCALER_CSC2_ITR_R_601_5);
++		enum drm_color_encoding color_encoding = state->color_encoding;
++		enum drm_color_range color_range = state->color_range;
++		const u32 *ccm;
++
++		if (color_encoding >= DRM_COLOR_ENCODING_MAX)
++			color_encoding = DRM_COLOR_YCBCR_BT601;
++		if (color_range >= DRM_COLOR_RANGE_MAX)
++			color_range = DRM_COLOR_YCBCR_LIMITED_RANGE;
++
++		ccm = colorspace_coeffs[color_range][color_encoding];
++
++		vc4_dlist_write(vc4_state, ccm[0]);
++		vc4_dlist_write(vc4_state, ccm[1]);
++		vc4_dlist_write(vc4_state, ccm[2]);
+ 	}
+ 
+ 	vc4_state->lbm_offset = 0;
+@@ -1448,6 +1504,15 @@ struct drm_plane *vc4_plane_init(struct
+ 					   DRM_MODE_REFLECT_X |
+ 					   DRM_MODE_REFLECT_Y);
+ 
++	drm_plane_create_color_properties(plane,
++					  BIT(DRM_COLOR_YCBCR_BT601) |
++					  BIT(DRM_COLOR_YCBCR_BT709) |
++					  BIT(DRM_COLOR_YCBCR_BT2020),
++					  BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) |
++					  BIT(DRM_COLOR_YCBCR_FULL_RANGE),
++					  DRM_COLOR_YCBCR_BT709,
++					  DRM_COLOR_YCBCR_LIMITED_RANGE);
++
+ 	return plane;
+ }
+ 
+--- a/drivers/gpu/drm/vc4/vc4_regs.h
++++ b/drivers/gpu/drm/vc4/vc4_regs.h
+@@ -975,7 +975,10 @@ enum hvs_pixel_format {
+ #define SCALER_CSC0_COEF_CR_OFS_SHIFT		0
+ #define SCALER_CSC0_ITR_R_601_5			0x00f00000
+ #define SCALER_CSC0_ITR_R_709_3			0x00f00000
++#define SCALER_CSC0_ITR_R_2020			0x00f00000
+ #define SCALER_CSC0_JPEG_JFIF			0x00000000
++#define SCALER_CSC0_ITR_R_709_3_FR		0x00000000
++#define SCALER_CSC0_ITR_R_2020_FR		0x00000000
+ 
+ /* S2.8 contribution of Cb to Green */
+ #define SCALER_CSC1_COEF_CB_GRN_MASK		VC4_MASK(31, 22)
+@@ -990,8 +993,11 @@ enum hvs_pixel_format {
+ #define SCALER_CSC1_COEF_CR_BLU_MASK		VC4_MASK(1, 0)
+ #define SCALER_CSC1_COEF_CR_BLU_SHIFT		0
+ #define SCALER_CSC1_ITR_R_601_5			0xe73304a8
+-#define SCALER_CSC1_ITR_R_709_3			0xf2b784a8
+-#define SCALER_CSC1_JPEG_JFIF			0xea34a400
++#define SCALER_CSC1_ITR_R_709_3			0xf27784a8
++#define SCALER_CSC1_ITR_R_2020			0xf43594a8
++#define SCALER_CSC1_JPEG_JFIF			0xea349400
++#define SCALER_CSC1_ITR_R_709_3_FR		0xf4388400
++#define SCALER_CSC1_ITR_R_2020_FR		0xf5b6d400
+ 
+ /* S2.8 contribution of Cb to Red */
+ #define SCALER_CSC2_COEF_CB_RED_MASK		VC4_MASK(29, 20)
+@@ -1002,9 +1008,12 @@ enum hvs_pixel_format {
+ /* S2.8 contribution of Cb to Blue */
+ #define SCALER_CSC2_COEF_CB_BLU_MASK		VC4_MASK(19, 10)
+ #define SCALER_CSC2_COEF_CB_BLU_SHIFT		10
+-#define SCALER_CSC2_ITR_R_601_5			0x00066204
+-#define SCALER_CSC2_ITR_R_709_3			0x00072a1c
+-#define SCALER_CSC2_JPEG_JFIF			0x000599c5
++#define SCALER_CSC2_ITR_R_601_5			0x00066604
++#define SCALER_CSC2_ITR_R_709_3			0x00072e1d
++#define SCALER_CSC2_ITR_R_2020			0x0006b624
++#define SCALER_CSC2_JPEG_JFIF			0x00059dc6
++#define SCALER_CSC2_ITR_R_709_3_FR		0x00064ddb
++#define SCALER_CSC2_ITR_R_2020_FR		0x0005e5e2
+ 
+ #define SCALER_TPZ0_VERT_RECALC			BIT(31)
+ #define SCALER_TPZ0_SCALE_MASK			VC4_MASK(28, 8)
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0432-drm-vc4-Add-FKMS-as-an-acceptable-node-for-dma-range.patch b/root/target/linux/bcm27xx/patches-5.15/950-0432-drm-vc4-Add-FKMS-as-an-acceptable-node-for-dma-range.patch
new file mode 100644
index 00000000..051f332b
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0432-drm-vc4-Add-FKMS-as-an-acceptable-node-for-dma-range.patch
@@ -0,0 +1,27 @@
+From 8821d5d370f9b0abc34f56aba657e2bd4fdc4abb Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Tue, 19 May 2020 16:20:30 +0100
+Subject: [PATCH 432/828] drm/vc4: Add FKMS as an acceptable node for dma
+ ranges.
+
+Under FKMS, the firmware (via FKMS) also requires the VideoCore cache
+aliases for image planes, as defined by the dma-ranges under /soc.
+
+Add rpi-firmware-kms to the list of acceptable nodes to look for
+to copy dma config from.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_drv.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_drv.c
++++ b/drivers/gpu/drm/vc4/vc4_drv.c
+@@ -218,6 +218,7 @@ static void vc4_match_add_drivers(struct
+ 
+ const struct of_device_id vc4_dma_range_matches[] = {
+ 	{ .compatible = "brcm,bcm2835-hvs" },
++	{ .compatible = "raspberrypi,rpi-firmware-kms" },
+ 	{ .compatible = "brcm,bcm2835-v3d" },
+ 	{ .compatible = "brcm,cygnus-v3d" },
+ 	{ .compatible = "brcm,vc4-v3d" },
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0433-drm-vc4-A-present-but-empty-dmas-disables-audio.patch b/root/target/linux/bcm27xx/patches-5.15/950-0433-drm-vc4-A-present-but-empty-dmas-disables-audio.patch
new file mode 100644
index 00000000..db10c082
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0433-drm-vc4-A-present-but-empty-dmas-disables-audio.patch
@@ -0,0 +1,33 @@
+From 184ae944edf14f1e83b9f75127eeaa84ced4c250 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.org>
+Date: Wed, 31 Jul 2019 17:36:34 +0100
+Subject: [PATCH 433/828] drm/vc4: A present but empty dmas disables audio
+
+Overlays are unable to remove properties in the base DTB, but they
+can overwrite them. Allow a present but empty 'dmas' property
+to also disable the HDMI audio interface.
+
+See: https://github.com/raspberrypi/linux/issues/2489
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.org>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -1692,10 +1692,12 @@ static int vc4_hdmi_audio_init(struct vc
+ 	const __be32 *addr;
+ 	int index;
+ 	int ret;
++	int len;
+ 
+-	if (!of_find_property(dev->of_node, "dmas", NULL)) {
++	if (!of_find_property(dev->of_node, "dmas", &len) ||
++	    len == 0) {
+ 		dev_warn(dev,
+-			 "'dmas' DT property is missing, no HDMI audio\n");
++			 "'dmas' DT property is missing or empty, no HDMI audio\n");
+ 		return 0;
+ 	}
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0434-drm-vc4-Add-debugfs-node-that-dumps-the-current-disp.patch b/root/target/linux/bcm27xx/patches-5.15/950-0434-drm-vc4-Add-debugfs-node-that-dumps-the-current-disp.patch
new file mode 100644
index 00000000..eef811bc
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0434-drm-vc4-Add-debugfs-node-that-dumps-the-current-disp.patch
@@ -0,0 +1,70 @@
+From 143ef801742d89d546a368d56f245106557a7e02 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Tue, 6 Oct 2020 18:44:42 +0100
+Subject: [PATCH 434/828] drm/vc4: Add debugfs node that dumps the current
+ display lists
+
+This allows easy analysis of display lists when debugging.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_hvs.c | 41 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 41 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_hvs.c
++++ b/drivers/gpu/drm/vc4/vc4_hvs.c
+@@ -95,6 +95,45 @@ static int vc4_hvs_debugfs_underrun(stru
+ 	return 0;
+ }
+ 
++static int vc4_hvs_debugfs_dlist(struct seq_file *m, void *data)
++{
++	struct drm_info_node *node = m->private;
++	struct drm_device *dev = node->minor->dev;
++	struct vc4_dev *vc4 = to_vc4_dev(dev);
++	struct drm_printer p = drm_seq_file_printer(m);
++	unsigned int next_entry_start = 0;
++	unsigned int i, j;
++	u32 dlist_word, dispstat;
++
++	for (i = 0; i < SCALER_CHANNELS_COUNT; i++) {
++		dispstat = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTATX(i)),
++					 SCALER_DISPSTATX_MODE);
++		if (dispstat == SCALER_DISPSTATX_MODE_DISABLED ||
++		    dispstat == SCALER_DISPSTATX_MODE_EOF) {
++			drm_printf(&p, "HVS chan %u disabled\n", i);
++			continue;
++		}
++
++		drm_printf(&p, "HVS chan %u:\n", i);
++
++		for (j = HVS_READ(SCALER_DISPLISTX(i)); j < 256; j++) {
++			dlist_word = readl((u32 __iomem *)vc4->hvs->dlist + j);
++			drm_printf(&p, "dlist: %02d: 0x%08x\n", j,
++				   dlist_word);
++			if (!next_entry_start ||
++			    next_entry_start == j) {
++				if (dlist_word & SCALER_CTL0_END)
++					break;
++				next_entry_start = j +
++					VC4_GET_FIELD(dlist_word,
++						      SCALER_CTL0_SIZE);
++			}
++		}
++	}
++
++	return 0;
++}
++
+ /* The filter kernel is composed of dwords each containing 3 9-bit
+  * signed integers packed next to each other.
+  */
+@@ -689,6 +728,8 @@ static int vc4_hvs_bind(struct device *d
+ 	vc4_debugfs_add_regset32(drm, "hvs_regs", &hvs->regset);
+ 	vc4_debugfs_add_file(drm, "hvs_underrun", vc4_hvs_debugfs_underrun,
+ 			     NULL);
++	vc4_debugfs_add_file(drm, "hvs_dlists", vc4_hvs_debugfs_dlist,
++			     NULL);
+ 
+ 	return 0;
+ }
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0435-drm-vc4-Add-all-the-HDMI-registers-into-the-debugfs-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0435-drm-vc4-Add-all-the-HDMI-registers-into-the-debugfs-.patch
new file mode 100644
index 00000000..21980487
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0435-drm-vc4-Add-all-the-HDMI-registers-into-the-debugfs-.patch
@@ -0,0 +1,95 @@
+From a3c746663157aaecaeef5c4ed09359a841892a11 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 21 Oct 2020 18:34:56 +0100
+Subject: [PATCH 435/828] drm/vc4: Add all the HDMI registers into the debugfs
+ dumps
+
+The vc5 HDMI registers hadn't been added into the debugfs
+register sets, therefore weren't dumped on request.
+Add them in.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 39 ++++++++++++++++++++++++++++++++++
+ drivers/gpu/drm/vc4/vc4_hdmi.h |  8 +++++++
+ 2 files changed, 47 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -112,6 +112,12 @@ static int vc4_hdmi_debugfs_regs(struct
+ 
+ 	drm_print_regset32(&p, &vc4_hdmi->hdmi_regset);
+ 	drm_print_regset32(&p, &vc4_hdmi->hd_regset);
++	drm_print_regset32(&p, &vc4_hdmi->cec_regset);
++	drm_print_regset32(&p, &vc4_hdmi->csc_regset);
++	drm_print_regset32(&p, &vc4_hdmi->dvp_regset);
++	drm_print_regset32(&p, &vc4_hdmi->phy_regset);
++	drm_print_regset32(&p, &vc4_hdmi->ram_regset);
++	drm_print_regset32(&p, &vc4_hdmi->rm_regset);
+ 
+ 	return 0;
+ }
+@@ -2361,6 +2367,7 @@ static int vc5_hdmi_init_resources(struc
+ 	struct platform_device *pdev = vc4_hdmi->pdev;
+ 	struct device *dev = &pdev->dev;
+ 	struct resource *res;
++	int ret;
+ 
+ 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hdmi");
+ 	if (!res)
+@@ -2457,6 +2464,38 @@ static int vc5_hdmi_init_resources(struc
+ 		return PTR_ERR(vc4_hdmi->reset);
+ 	}
+ 
++	ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->hdmi_regset, VC4_HDMI);
++	if (ret)
++		return ret;
++
++	ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->hd_regset, VC4_HD);
++	if (ret)
++		return ret;
++
++	ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->cec_regset, VC5_CEC);
++	if (ret)
++		return ret;
++
++	ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->csc_regset, VC5_CSC);
++	if (ret)
++		return ret;
++
++	ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->dvp_regset, VC5_DVP);
++	if (ret)
++		return ret;
++
++	ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->phy_regset, VC5_PHY);
++	if (ret)
++		return ret;
++
++	ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->ram_regset, VC5_RAM);
++	if (ret)
++		return ret;
++
++	ret = vc4_hdmi_build_regset(vc4_hdmi, &vc4_hdmi->rm_regset, VC5_RM);
++	if (ret)
++		return ret;
++
+ 	return 0;
+ }
+ 
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
+@@ -216,6 +216,14 @@ struct vc4_hdmi {
+ 	 * the scrambler on? Protected by @mutex.
+ 	 */
+ 	bool scdc_enabled;
++
++	/* VC5 debugfs regset */
++	struct debugfs_regset32 cec_regset;
++	struct debugfs_regset32 csc_regset;
++	struct debugfs_regset32 dvp_regset;
++	struct debugfs_regset32 phy_regset;
++	struct debugfs_regset32 ram_regset;
++	struct debugfs_regset32 rm_regset;
+ };
+ 
+ static inline struct vc4_hdmi *
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0436-drm-vc4-Add-the-2711-HVS-as-a-suitable-DMA-node.patch b/root/target/linux/bcm27xx/patches-5.15/950-0436-drm-vc4-Add-the-2711-HVS-as-a-suitable-DMA-node.patch
new file mode 100644
index 00000000..bba0a033
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0436-drm-vc4-Add-the-2711-HVS-as-a-suitable-DMA-node.patch
@@ -0,0 +1,24 @@
+From 31ad73a275c160b54ab6713fc3983430d5ab3ce6 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 26 Oct 2020 12:38:27 +0000
+Subject: [PATCH 436/828] drm/vc4: Add the 2711 HVS as a suitable DMA node
+
+With vc4-drv node not being under /soc on Pi4, we need to
+adopt the correct DMA parameters from a suitable sub-component.
+Add "brcm,bcm2711-hvs" to that list of components.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_drv.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_drv.c
++++ b/drivers/gpu/drm/vc4/vc4_drv.c
+@@ -218,6 +218,7 @@ static void vc4_match_add_drivers(struct
+ 
+ const struct of_device_id vc4_dma_range_matches[] = {
+ 	{ .compatible = "brcm,bcm2835-hvs" },
++	{ .compatible = "brcm,bcm2711-hvs" },
+ 	{ .compatible = "raspberrypi,rpi-firmware-kms" },
+ 	{ .compatible = "brcm,bcm2835-v3d" },
+ 	{ .compatible = "brcm,cygnus-v3d" },
diff --git a/root/target/linux/bcm27xx/patches-5.15/0450-vc4_hdmi-Report-that-3d-stereo-is-allowed.patch b/root/target/linux/bcm27xx/patches-5.15/950-0437-vc4_hdmi-Report-that-3d-stereo-is-allowed.patch
similarity index 59%
rename from root/target/linux/bcm27xx/patches-5.15/0450-vc4_hdmi-Report-that-3d-stereo-is-allowed.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0437-vc4_hdmi-Report-that-3d-stereo-is-allowed.patch
index 5f4f63aa..9c6d9bce 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0450-vc4_hdmi-Report-that-3d-stereo-is-allowed.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0437-vc4_hdmi-Report-that-3d-stereo-is-allowed.patch
@@ -1,18 +1,16 @@
-From 7b52818553ad85013df470f8b19eec6615971980 Mon Sep 17 00:00:00 2001
+From 5e50037975a2cd335f23fbc3776df5da73d4dc31 Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Mon, 9 Nov 2020 19:49:32 +0000
-Subject: [PATCH 450/634] vc4_hdmi: Report that 3d/stereo is allowed
+Subject: [PATCH 437/828] vc4_hdmi: Report that 3d/stereo is allowed
 
 Signed-off-by: Dom Cobley <popcornmix@gmail.com>
 ---
  drivers/gpu/drm/vc4/vc4_hdmi.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 6826103aef37..876833d25558 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -398,6 +398,7 @@ static int vc4_hdmi_connector_init(struct drm_device *dev,
+@@ -398,6 +398,7 @@ static int vc4_hdmi_connector_init(struc
  
  	connector->interlace_allowed = 1;
  	connector->doublescan_allowed = 0;
@@ -20,6 +18,3 @@ index 6826103aef37..876833d25558 100644
  
  	if (vc4_hdmi->variant->supports_hdr)
  		drm_connector_attach_hdr_output_metadata_property(connector);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0438-vc4-Clear-unused-infoframe-packet-RAM-registers.patch b/root/target/linux/bcm27xx/patches-5.15/950-0438-vc4-Clear-unused-infoframe-packet-RAM-registers.patch
new file mode 100644
index 00000000..55a2c880
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0438-vc4-Clear-unused-infoframe-packet-RAM-registers.patch
@@ -0,0 +1,45 @@
+From e23f93eaaa307e455df919334bbdbe4e748f6100 Mon Sep 17 00:00:00 2001
+From: Dom Cobley <popcornmix@gmail.com>
+Date: Tue, 10 Nov 2020 20:04:08 +0000
+Subject: [PATCH 438/828] vc4: Clear unused infoframe packet RAM registers
+
+Using a hdmi analyser the bytes in packet ram
+registers beyond the length were visible in the
+infoframes and it flagged the checksum as invalid.
+
+Zeroing unused words of packet RAM avoids this
+
+Signed-off-by: Dom Cobley <popcornmix@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -436,9 +436,11 @@ static void vc4_hdmi_write_infoframe(str
+ 	const struct vc4_hdmi_register *ram_packet_start =
+ 		&vc4_hdmi->variant->registers[HDMI_RAM_PACKET_START];
+ 	u32 packet_reg = ram_packet_start->offset + VC4_HDMI_PACKET_STRIDE * packet_id;
++	u32 packet_reg_next = ram_packet_start->offset +
++		VC4_HDMI_PACKET_STRIDE * (packet_id + 1);
+ 	void __iomem *base = __vc4_hdmi_get_field_base(vc4_hdmi,
+ 						       ram_packet_start->reg);
+-	uint8_t buffer[VC4_HDMI_PACKET_STRIDE];
++	uint8_t buffer[VC4_HDMI_PACKET_STRIDE] = {};
+ 	unsigned long flags;
+ 	ssize_t len, i;
+ 	int ret;
+@@ -474,6 +476,13 @@ static void vc4_hdmi_write_infoframe(str
+ 		packet_reg += 4;
+ 	}
+ 
++	/*
++	 * clear remainder of packet ram as it's included in the
++	 * infoframe and triggers a checksum error on hdmi analyser
++	 */
++	for (; packet_reg < packet_reg_next; packet_reg += 4)
++		writel(0, base + packet_reg);
++
+ 	HDMI_WRITE(HDMI_RAM_PACKET_CONFIG,
+ 		   HDMI_READ(HDMI_RAM_PACKET_CONFIG) | BIT(packet_id));
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0439-drm-vc4-Change-the-default-DPI-format-to-being-18bpp.patch b/root/target/linux/bcm27xx/patches-5.15/950-0439-drm-vc4-Change-the-default-DPI-format-to-being-18bpp.patch
new file mode 100644
index 00000000..c22ee2f9
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0439-drm-vc4-Change-the-default-DPI-format-to-being-18bpp.patch
@@ -0,0 +1,34 @@
+From c7f05ea7fe98493f90580056324a7a272e7ee002 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Fri, 12 Feb 2021 17:31:37 +0000
+Subject: [PATCH 439/828] drm/vc4: Change the default DPI format to being
+ 18bpp, not 24.
+
+DPI hasn't really been used up until now, so the default has
+been meaningless.
+In theory we should be able to pass the desired format for the
+adjacent bridge chip through, but framework seems to be missing
+for that.
+
+As the main device to use DPI is the VGA666 or Adafruit Kippah,
+both of which use RGB666, change the default to being RGB666 instead
+of RGB888.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dpi.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_dpi.c
++++ b/drivers/gpu/drm/vc4/vc4_dpi.c
+@@ -188,8 +188,8 @@ static void vc4_dpi_encoder_enable(struc
+ 			break;
+ 		}
+ 	} else {
+-		/* Default to 24bit if no connector found. */
+-		dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB, DPI_FORMAT);
++		/* Default to 18bit if no connector found. */
++		dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1, DPI_FORMAT);
+ 	}
+ 
+ 	if (mode->flags & DRM_MODE_FLAG_NHSYNC)
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0440-vc4-drm-Avoid-full-hdmi-audio-fifo-writes.patch b/root/target/linux/bcm27xx/patches-5.15/950-0440-vc4-drm-Avoid-full-hdmi-audio-fifo-writes.patch
new file mode 100644
index 00000000..b7f5974c
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0440-vc4-drm-Avoid-full-hdmi-audio-fifo-writes.patch
@@ -0,0 +1,32 @@
+From 53ef659e8b14c5d445184244e37423ecdb4fb27b Mon Sep 17 00:00:00 2001
+From: Dom Cobley <popcornmix@gmail.com>
+Date: Sun, 24 Jan 2021 15:44:10 +0000
+Subject: [PATCH 440/828] vc4/drm: Avoid full hdmi audio fifo writes
+
+We are getting occasional VC4_HD_MAI_CTL_ERRORF in
+HDMI_MAI_CTL which seem to correspond with audio dropouts.
+
+Reduce the threshold where we deassert DREQ to avoid the fifo overfilling
+
+Signed-off-by: Dom Cobley <popcornmix@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -1612,10 +1612,10 @@ static int vc4_hdmi_audio_prepare(struct
+ 
+ 	/* Set the MAI threshold */
+ 	HDMI_WRITE(HDMI_MAI_THR,
+-		   VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICHIGH) |
+-		   VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICLOW) |
+-		   VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_DREQHIGH) |
+-		   VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_DREQLOW));
++		   VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_PANICHIGH) |
++		   VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_PANICLOW) |
++		   VC4_SET_FIELD(0x06, VC4_HD_MAI_THR_DREQHIGH) |
++		   VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_DREQLOW));
+ 
+ 	HDMI_WRITE(HDMI_MAI_CONFIG,
+ 		   VC4_HDMI_MAI_CONFIG_BIT_REVERSE |
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0441-vc4-drm-vc4_plane-Remove-subpixel-positioning-check.patch b/root/target/linux/bcm27xx/patches-5.15/950-0441-vc4-drm-vc4_plane-Remove-subpixel-positioning-check.patch
new file mode 100644
index 00000000..5b8410b5
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0441-vc4-drm-vc4_plane-Remove-subpixel-positioning-check.patch
@@ -0,0 +1,62 @@
+From 5d4bde204737781158b325ed1a0c273f7b2ff3a0 Mon Sep 17 00:00:00 2001
+From: Dom Cobley <popcornmix@gmail.com>
+Date: Mon, 15 Mar 2021 13:28:06 +0000
+Subject: [PATCH 441/828] vc4/drm: vc4_plane: Remove subpixel positioning check
+
+There is little harm in ignoring fractional coordinates
+(they just get truncated).
+
+Without this:
+modetest -M vc4 -F tiles,gradient -s 32:1920x1080-60 -P89@74:1920x1080*.1.1@XR24
+
+is rejected. We have the same issue in Kodi when trying to
+use zoom options on video.
+
+Note: even if all coordinates are fully integer. e.g.
+src:[0,0,1920,1080] dest:[-10,-10,1940,1100]
+
+it will still get rejected as drm_atomic_helper_check_plane_state
+uses drm_rect_clip_scaled which transforms this to fractional src coords
+
+Signed-off-by: Dom Cobley <popcornmix@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_plane.c | 21 ++++++++-------------
+ 1 file changed, 8 insertions(+), 13 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_plane.c
++++ b/drivers/gpu/drm/vc4/vc4_plane.c
+@@ -339,7 +339,6 @@ static int vc4_plane_setup_clipping_and_
+ 	struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
+ 	struct drm_framebuffer *fb = state->fb;
+ 	struct drm_gem_cma_object *bo = drm_fb_cma_get_gem_obj(fb, 0);
+-	u32 subpixel_src_mask = (1 << 16) - 1;
+ 	int num_planes = fb->format->num_planes;
+ 	struct drm_crtc_state *crtc_state;
+ 	u32 h_subsample = fb->format->hsub;
+@@ -361,18 +360,14 @@ static int vc4_plane_setup_clipping_and_
+ 	for (i = 0; i < num_planes; i++)
+ 		vc4_state->offsets[i] = bo->paddr + fb->offsets[i];
+ 
+-	/* We don't support subpixel source positioning for scaling. */
+-	if ((state->src.x1 & subpixel_src_mask) ||
+-	    (state->src.x2 & subpixel_src_mask) ||
+-	    (state->src.y1 & subpixel_src_mask) ||
+-	    (state->src.y2 & subpixel_src_mask)) {
+-		return -EINVAL;
+-	}
+-
+-	vc4_state->src_x = state->src.x1 >> 16;
+-	vc4_state->src_y = state->src.y1 >> 16;
+-	vc4_state->src_w[0] = (state->src.x2 - state->src.x1) >> 16;
+-	vc4_state->src_h[0] = (state->src.y2 - state->src.y1) >> 16;
++	/* We don't support subpixel source positioning for scaling,
++	 * but fractional coordinates can be generated by clipping
++	 * so just round for now
++	 */
++	vc4_state->src_x = DIV_ROUND_CLOSEST(state->src.x1, 1<<16);
++	vc4_state->src_y = DIV_ROUND_CLOSEST(state->src.y1, 1<<16);
++	vc4_state->src_w[0] = DIV_ROUND_CLOSEST(state->src.x2, 1<<16) - vc4_state->src_x;
++	vc4_state->src_h[0] = DIV_ROUND_CLOSEST(state->src.y2, 1<<16) - vc4_state->src_y;
+ 
+ 	vc4_state->crtc_x = state->dst.x1;
+ 	vc4_state->crtc_y = state->dst.y1;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0442-drm-vc4-hdmi-Convert-to-the-new-clock-request-API.patch b/root/target/linux/bcm27xx/patches-5.15/950-0442-drm-vc4-hdmi-Convert-to-the-new-clock-request-API.patch
new file mode 100644
index 00000000..d571ed97
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0442-drm-vc4-hdmi-Convert-to-the-new-clock-request-API.patch
@@ -0,0 +1,42 @@
+From c823043198083a07f40adde40738ef0613222623 Mon Sep 17 00:00:00 2001
+From: Dom Cobley <popcornmix@gmail.com>
+Date: Tue, 13 Apr 2021 14:10:03 +0100
+Subject: [PATCH 442/828] drm/vc4: hdmi: Convert to the new clock request API
+
+The new clock request API allows us to increase the rate of the
+core clock as required during mode set while decreasing it when
+we're done, resulting in a better power-efficiency.
+
+Signed-off-by: Dom Cobley <popcornmix@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_kms.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -345,6 +345,7 @@ static void vc4_atomic_commit_tail(struc
+ 	struct drm_crtc *crtc;
+ 	struct vc4_hvs_state *old_hvs_state;
+ 	unsigned int channel;
++	struct clk_request *core_req;
+ 	int i;
+ 
+ 	old_hvs_state = vc4_hvs_get_old_global_state(state);
+@@ -389,7 +390,7 @@ static void vc4_atomic_commit_tail(struc
+ 						500000000,
+ 						new_hvs_state->core_clock_rate);
+ 
+-		clk_set_min_rate(hvs->core_clk, core_rate);
++		core_req = clk_request_start(hvs->core_clk, core_rate);
+ 	}
+ 
+ 	drm_atomic_helper_commit_modeset_disables(dev, state);
+@@ -417,7 +418,7 @@ static void vc4_atomic_commit_tail(struc
+ 		drm_dbg(dev, "Running the core clock at %lu Hz\n",
+ 			new_hvs_state->core_clock_rate);
+ 
+-		clk_set_min_rate(hvs->core_clk, new_hvs_state->core_clock_rate);
++		clk_request_done(core_req);
+ 	}
+ }
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0443-drm-vc4-Correct-pixel-order-for-DSI0.patch b/root/target/linux/bcm27xx/patches-5.15/950-0443-drm-vc4-Correct-pixel-order-for-DSI0.patch
new file mode 100644
index 00000000..78756418
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0443-drm-vc4-Correct-pixel-order-for-DSI0.patch
@@ -0,0 +1,27 @@
+From c39d706801ccff780438934958483592f0049f2c Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 11 Feb 2021 18:37:04 +0000
+Subject: [PATCH 443/828] drm/vc4: Correct pixel order for DSI0
+
+For slightly unknown reasons, dsi0 takes a different pixel format
+to dsi1, and that has to be set in the pixel valve.
+
+Amend the setup accordingly.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -317,7 +317,8 @@ static void vc4_crtc_config_pv(struct dr
+ 	u32 pixel_rep = (mode->flags & DRM_MODE_FLAG_DBLCLK) ? 2 : 1;
+ 	bool is_dsi = (vc4_encoder->type == VC4_ENCODER_TYPE_DSI0 ||
+ 		       vc4_encoder->type == VC4_ENCODER_TYPE_DSI1);
+-	u32 format = is_dsi ? PV_CONTROL_FORMAT_DSIV_24 : PV_CONTROL_FORMAT_24;
++	bool is_dsi1 = vc4_encoder->type == VC4_ENCODER_TYPE_DSI1;
++	u32 format = is_dsi1 ? PV_CONTROL_FORMAT_DSIV_24 : PV_CONTROL_FORMAT_24;
+ 	u8 ppc = pv_data->pixels_per_clock;
+ 	bool debug_dump_regs = false;
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0444-drm-vc4-Register-dsi0-as-the-correct-vc4-encoder-typ.patch b/root/target/linux/bcm27xx/patches-5.15/950-0444-drm-vc4-Register-dsi0-as-the-correct-vc4-encoder-typ.patch
new file mode 100644
index 00000000..5af89ae5
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0444-drm-vc4-Register-dsi0-as-the-correct-vc4-encoder-typ.patch
@@ -0,0 +1,29 @@
+From 1555581f306c217067d3005d6717e0fc9f4581d1 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 8 Feb 2021 11:22:01 +0000
+Subject: [PATCH 444/828] drm/vc4: Register dsi0 as the correct vc4 encoder
+ type
+
+vc4_dsi was registering both dsi0 and dsi1 as VC4_ENCODER_TYPE_DSI1
+which seemed to work OK for a single DSI display, but fails
+if there are two DSI displays connected.
+
+Update to register the correct type.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dsi.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_dsi.c
++++ b/drivers/gpu/drm/vc4/vc4_dsi.c
+@@ -1510,7 +1510,8 @@ static int vc4_dsi_bind(struct device *d
+ 		return -ENOMEM;
+ 
+ 	INIT_LIST_HEAD(&dsi->bridge_chain);
+-	vc4_dsi_encoder->base.type = VC4_ENCODER_TYPE_DSI1;
++	vc4_dsi_encoder->base.type = dsi->variant->port ?
++			VC4_ENCODER_TYPE_DSI1 : VC4_ENCODER_TYPE_DSI0;
+ 	vc4_dsi_encoder->dsi = dsi;
+ 	dsi->encoder = &vc4_dsi_encoder->base.base;
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0445-drm-vc4-Fix-dsi0-interrupt-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0445-drm-vc4-Fix-dsi0-interrupt-support.patch
new file mode 100644
index 00000000..c6308936
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0445-drm-vc4-Fix-dsi0-interrupt-support.patch
@@ -0,0 +1,188 @@
+From de53479a8100390d76420f52a79abbea2dd9313a Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 10 Feb 2021 18:46:22 +0000
+Subject: [PATCH 445/828] drm/vc4: Fix dsi0 interrupt support.
+
+DSI0 seemingly had very little or no testing as a load of
+the register mappings were incorrect/missing, so host
+transfers always timed out due to enabling/checking incorrect
+bits in the interrupt enable and status registers.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dsi.c | 111 ++++++++++++++++++++++++++--------
+ 1 file changed, 85 insertions(+), 26 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_dsi.c
++++ b/drivers/gpu/drm/vc4/vc4_dsi.c
+@@ -181,8 +181,50 @@
+ 
+ #define DSI0_TXPKT_PIX_FIFO		0x20 /* AKA PIX_FIFO */
+ 
+-#define DSI0_INT_STAT		0x24
+-#define DSI0_INT_EN		0x28
++#define DSI0_INT_STAT			0x24
++#define DSI0_INT_EN			0x28
++# define DSI0_INT_FIFO_ERR		BIT(25)
++# define DSI0_INT_CMDC_DONE_MASK	VC4_MASK(24, 23)
++# define DSI0_INT_CMDC_DONE_SHIFT	23
++#  define DSI0_INT_CMDC_DONE_NO_REPEAT		1
++#  define DSI0_INT_CMDC_DONE_REPEAT		3
++# define DSI0_INT_PHY_DIR_RTF		BIT(22)
++# define DSI0_INT_PHY_D1_ULPS		BIT(21)
++# define DSI0_INT_PHY_D1_STOP		BIT(20)
++# define DSI0_INT_PHY_RXLPDT		BIT(19)
++# define DSI0_INT_PHY_RXTRIG		BIT(18)
++# define DSI0_INT_PHY_D0_ULPS		BIT(17)
++# define DSI0_INT_PHY_D0_LPDT		BIT(16)
++# define DSI0_INT_PHY_D0_FTR		BIT(15)
++# define DSI0_INT_PHY_D0_STOP		BIT(14)
++/* Signaled when the clock lane enters the given state. */
++# define DSI0_INT_PHY_CLK_ULPS		BIT(13)
++# define DSI0_INT_PHY_CLK_HS		BIT(12)
++# define DSI0_INT_PHY_CLK_FTR		BIT(11)
++/* Signaled on timeouts */
++# define DSI0_INT_PR_TO			BIT(10)
++# define DSI0_INT_TA_TO			BIT(9)
++# define DSI0_INT_LPRX_TO		BIT(8)
++# define DSI0_INT_HSTX_TO		BIT(7)
++/* Contention on a line when trying to drive the line low */
++# define DSI0_INT_ERR_CONT_LP1		BIT(6)
++# define DSI0_INT_ERR_CONT_LP0		BIT(5)
++/* Control error: incorrect line state sequence on data lane 0. */
++# define DSI0_INT_ERR_CONTROL		BIT(4)
++# define DSI0_INT_ERR_SYNC_ESC		BIT(3)
++# define DSI0_INT_RX2_PKT		BIT(2)
++# define DSI0_INT_RX1_PKT		BIT(1)
++# define DSI0_INT_CMD_PKT		BIT(0)
++
++#define DSI0_INTERRUPTS_ALWAYS_ENABLED	(DSI0_INT_ERR_SYNC_ESC | \
++					 DSI0_INT_ERR_CONTROL |	 \
++					 DSI0_INT_ERR_CONT_LP0 | \
++					 DSI0_INT_ERR_CONT_LP1 | \
++					 DSI0_INT_HSTX_TO |	 \
++					 DSI0_INT_LPRX_TO |	 \
++					 DSI0_INT_TA_TO |	 \
++					 DSI0_INT_PR_TO)
++
+ # define DSI1_INT_PHY_D3_ULPS		BIT(30)
+ # define DSI1_INT_PHY_D3_STOP		BIT(29)
+ # define DSI1_INT_PHY_D2_ULPS		BIT(28)
+@@ -894,6 +936,9 @@ static void vc4_dsi_encoder_enable(struc
+ 
+ 		DSI_PORT_WRITE(PHY_AFEC0, afec0);
+ 
++		/* AFEC reset hold time */
++		mdelay(1);
++
+ 		DSI_PORT_WRITE(PHY_AFEC1,
+ 			       VC4_SET_FIELD(6,  DSI0_PHY_AFEC1_IDR_DLANE1) |
+ 			       VC4_SET_FIELD(6,  DSI0_PHY_AFEC1_IDR_DLANE0) |
+@@ -1060,12 +1105,9 @@ static void vc4_dsi_encoder_enable(struc
+ 		DSI_PORT_WRITE(CTRL, DSI_PORT_READ(CTRL) | DSI1_CTRL_EN);
+ 
+ 	/* Bring AFE out of reset. */
+-	if (dsi->variant->port == 0) {
+-	} else {
+-		DSI_PORT_WRITE(PHY_AFEC0,
+-			       DSI_PORT_READ(PHY_AFEC0) &
+-			       ~DSI1_PHY_AFEC0_RESET);
+-	}
++	DSI_PORT_WRITE(PHY_AFEC0,
++		       DSI_PORT_READ(PHY_AFEC0) &
++		       ~DSI_PORT_BIT(PHY_AFEC0_RESET));
+ 
+ 	vc4_dsi_ulps(dsi, false);
+ 
+@@ -1184,13 +1226,28 @@ static ssize_t vc4_dsi_host_transfer(str
+ 	/* Enable the appropriate interrupt for the transfer completion. */
+ 	dsi->xfer_result = 0;
+ 	reinit_completion(&dsi->xfer_completion);
+-	DSI_PORT_WRITE(INT_STAT, DSI1_INT_TXPKT1_DONE | DSI1_INT_PHY_DIR_RTF);
+-	if (msg->rx_len) {
+-		DSI_PORT_WRITE(INT_EN, (DSI1_INTERRUPTS_ALWAYS_ENABLED |
+-					DSI1_INT_PHY_DIR_RTF));
++	if (dsi->variant->port == 0) {
++		DSI_PORT_WRITE(INT_STAT,
++			       DSI0_INT_CMDC_DONE_MASK | DSI1_INT_PHY_DIR_RTF);
++		if (msg->rx_len) {
++			DSI_PORT_WRITE(INT_EN, (DSI0_INTERRUPTS_ALWAYS_ENABLED |
++						DSI0_INT_PHY_DIR_RTF));
++		} else {
++			DSI_PORT_WRITE(INT_EN,
++				       (DSI0_INTERRUPTS_ALWAYS_ENABLED |
++					VC4_SET_FIELD(DSI0_INT_CMDC_DONE_NO_REPEAT,
++						      DSI0_INT_CMDC_DONE)));
++		}
+ 	} else {
+-		DSI_PORT_WRITE(INT_EN, (DSI1_INTERRUPTS_ALWAYS_ENABLED |
+-					DSI1_INT_TXPKT1_DONE));
++		DSI_PORT_WRITE(INT_STAT,
++			       DSI1_INT_TXPKT1_DONE | DSI1_INT_PHY_DIR_RTF);
++		if (msg->rx_len) {
++			DSI_PORT_WRITE(INT_EN, (DSI1_INTERRUPTS_ALWAYS_ENABLED |
++						DSI1_INT_PHY_DIR_RTF));
++		} else {
++			DSI_PORT_WRITE(INT_EN, (DSI1_INTERRUPTS_ALWAYS_ENABLED |
++						DSI1_INT_TXPKT1_DONE));
++		}
+ 	}
+ 
+ 	/* Send the packet. */
+@@ -1207,7 +1264,7 @@ static ssize_t vc4_dsi_host_transfer(str
+ 		ret = dsi->xfer_result;
+ 	}
+ 
+-	DSI_PORT_WRITE(INT_EN, DSI1_INTERRUPTS_ALWAYS_ENABLED);
++	DSI_PORT_WRITE(INT_EN, DSI_PORT_BIT(INTERRUPTS_ALWAYS_ENABLED));
+ 
+ 	if (ret)
+ 		goto reset_fifo_and_return;
+@@ -1253,7 +1310,7 @@ reset_fifo_and_return:
+ 		       DSI_PORT_BIT(CTRL_RESET_FIFOS));
+ 
+ 	DSI_PORT_WRITE(TXPKT1C, 0);
+-	DSI_PORT_WRITE(INT_EN, DSI1_INTERRUPTS_ALWAYS_ENABLED);
++	DSI_PORT_WRITE(INT_EN, DSI_PORT_BIT(INTERRUPTS_ALWAYS_ENABLED));
+ 	return ret;
+ }
+ 
+@@ -1390,26 +1447,28 @@ static irqreturn_t vc4_dsi_irq_handler(i
+ 	DSI_PORT_WRITE(INT_STAT, stat);
+ 
+ 	dsi_handle_error(dsi, &ret, stat,
+-			 DSI1_INT_ERR_SYNC_ESC, "LPDT sync");
++			 DSI_PORT_BIT(INT_ERR_SYNC_ESC), "LPDT sync");
+ 	dsi_handle_error(dsi, &ret, stat,
+-			 DSI1_INT_ERR_CONTROL, "data lane 0 sequence");
++			 DSI_PORT_BIT(INT_ERR_CONTROL), "data lane 0 sequence");
+ 	dsi_handle_error(dsi, &ret, stat,
+-			 DSI1_INT_ERR_CONT_LP0, "LP0 contention");
++			 DSI_PORT_BIT(INT_ERR_CONT_LP0), "LP0 contention");
+ 	dsi_handle_error(dsi, &ret, stat,
+-			 DSI1_INT_ERR_CONT_LP1, "LP1 contention");
++			 DSI_PORT_BIT(INT_ERR_CONT_LP1), "LP1 contention");
+ 	dsi_handle_error(dsi, &ret, stat,
+-			 DSI1_INT_HSTX_TO, "HSTX timeout");
++			 DSI_PORT_BIT(INT_HSTX_TO), "HSTX timeout");
+ 	dsi_handle_error(dsi, &ret, stat,
+-			 DSI1_INT_LPRX_TO, "LPRX timeout");
++			 DSI_PORT_BIT(INT_LPRX_TO), "LPRX timeout");
+ 	dsi_handle_error(dsi, &ret, stat,
+-			 DSI1_INT_TA_TO, "turnaround timeout");
++			 DSI_PORT_BIT(INT_TA_TO), "turnaround timeout");
+ 	dsi_handle_error(dsi, &ret, stat,
+-			 DSI1_INT_PR_TO, "peripheral reset timeout");
++			 DSI_PORT_BIT(INT_PR_TO), "peripheral reset timeout");
+ 
+-	if (stat & (DSI1_INT_TXPKT1_DONE | DSI1_INT_PHY_DIR_RTF)) {
++	if (stat & ((dsi->variant->port ? DSI1_INT_TXPKT1_DONE :
++					  DSI0_INT_CMDC_DONE_MASK) |
++		    DSI_PORT_BIT(INT_PHY_DIR_RTF))) {
+ 		complete(&dsi->xfer_completion);
+ 		ret = IRQ_HANDLED;
+-	} else if (stat & DSI1_INT_HSTX_TO) {
++	} else if (stat & DSI_PORT_BIT(INT_HSTX_TO)) {
+ 		complete(&dsi->xfer_completion);
+ 		dsi->xfer_result = -ETIMEDOUT;
+ 		ret = IRQ_HANDLED;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0446-drm-vc4-Add-correct-stop-condition-to-vc4_dsi_encode.patch b/root/target/linux/bcm27xx/patches-5.15/950-0446-drm-vc4-Add-correct-stop-condition-to-vc4_dsi_encode.patch
new file mode 100644
index 00000000..8e31dfd3
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0446-drm-vc4-Add-correct-stop-condition-to-vc4_dsi_encode.patch
@@ -0,0 +1,30 @@
+From 57ed67ff4907a45342462766c79db725613ef66a Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 15 Apr 2021 16:18:16 +0100
+Subject: [PATCH 446/828] drm/vc4: Add correct stop condition to
+ vc4_dsi_encoder_disable iteration
+
+vc4_dsi_encoder_disable is partially an open coded version of
+drm_bridge_chain_disable, but it missed a termination condition
+in the loop for ->disable which meant that no post_disable
+calls were made.
+
+Add in the termination clause.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dsi.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_dsi.c
++++ b/drivers/gpu/drm/vc4/vc4_dsi.c
+@@ -803,6 +803,9 @@ static void vc4_dsi_encoder_disable(stru
+ 	list_for_each_entry_reverse(iter, &dsi->bridge_chain, chain_node) {
+ 		if (iter->funcs->disable)
+ 			iter->funcs->disable(iter);
++
++		if (iter == dsi->bridge)
++			break;
+ 	}
+ 
+ 	vc4_dsi_ulps(dsi, true);
diff --git a/root/target/linux/bcm27xx/patches-5.15/0462-drm-atomic-Don-t-fixup-modes-that-haven-t-been-reset.patch b/root/target/linux/bcm27xx/patches-5.15/950-0447-drm-atomic-Don-t-fixup-modes-that-haven-t-been-reset.patch
similarity index 66%
rename from root/target/linux/bcm27xx/patches-5.15/0462-drm-atomic-Don-t-fixup-modes-that-haven-t-been-reset.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0447-drm-atomic-Don-t-fixup-modes-that-haven-t-been-reset.patch
index cf7f0c70..e84713c4 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0462-drm-atomic-Don-t-fixup-modes-that-haven-t-been-reset.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0447-drm-atomic-Don-t-fixup-modes-that-haven-t-been-reset.patch
@@ -1,18 +1,16 @@
-From 06650d73dfad967df17f0d55f5e5e1a71cf5d52b Mon Sep 17 00:00:00 2001
+From 672a2c61f2dc7eb337e4abde4b3d2779e26c67dc Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 7 Jan 2021 16:30:55 +0000
-Subject: [PATCH 462/634] drm/atomic: Don't fixup modes that haven't been reset
+Subject: [PATCH 447/828] drm/atomic: Don't fixup modes that haven't been reset
 
 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 ---
  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 2c0c6ec92820..92d98f7029a3 100644
 --- a/drivers/gpu/drm/drm_atomic_helper.c
 +++ b/drivers/gpu/drm/drm_atomic_helper.c
-@@ -431,6 +431,11 @@ mode_fixup(struct drm_atomic_state *state)
+@@ -431,6 +431,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 2c0c6ec92820..92d98f7029a3 100644
  		/*
  		 * Each encoder has at most one connector (since we always steal
  		 * it away), so we won't call ->mode_fixup twice.
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0464-clk-Always-clamp-the-rounded-rate.patch b/root/target/linux/bcm27xx/patches-5.15/950-0448-clk-Always-clamp-the-rounded-rate.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0464-clk-Always-clamp-the-rounded-rate.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0448-clk-Always-clamp-the-rounded-rate.patch
index 0cf377c4..089c28aa 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0464-clk-Always-clamp-the-rounded-rate.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0448-clk-Always-clamp-the-rounded-rate.patch
@@ -1,7 +1,7 @@
-From b4f75524394dfa1e29b100bbffc1e31b29e8eb4f Mon Sep 17 00:00:00 2001
+From 12e7e9e42fb9b5d057f717ec3738dc8c62394c60 Mon Sep 17 00:00:00 2001
 From: Maxime Ripard <maxime@cerno.tech>
 Date: Wed, 5 May 2021 15:35:34 +0200
-Subject: [PATCH 464/634] clk: Always clamp the rounded rate
+Subject: [PATCH 448/828] clk: Always clamp the rounded rate
 
 The current core while setting the min and max rate properly in the
 clk_request structure will not make sure that the requested rate is
@@ -15,11 +15,9 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  drivers/clk/clk.c | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
-index 438c5f8f0b1e..03717d1392c8 100644
 --- a/drivers/clk/clk.c
 +++ b/drivers/clk/clk.c
-@@ -1337,6 +1337,8 @@ static int clk_core_determine_round_nolock(struct clk_core *core,
+@@ -1355,6 +1355,8 @@ static int clk_core_determine_round_nolo
  	if (!core)
  		return 0;
  
@@ -28,6 +26,3 @@ index 438c5f8f0b1e..03717d1392c8 100644
  	/*
  	 * At this point, core protection will be disabled
  	 * - if the provider is not protected at all
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0449-drm-vc4-Increase-the-core-clock-based-on-HVS-load.patch b/root/target/linux/bcm27xx/patches-5.15/950-0449-drm-vc4-Increase-the-core-clock-based-on-HVS-load.patch
new file mode 100644
index 00000000..84047fb6
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0449-drm-vc4-Increase-the-core-clock-based-on-HVS-load.patch
@@ -0,0 +1,57 @@
+From 8be8d9b28f65100c81a833ba379ec181a02bc8cc Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Wed, 26 May 2021 16:13:02 +0200
+Subject: [PATCH 449/828] drm/vc4: Increase the core clock based on HVS load
+
+Depending on a given HVS output (HVS to PixelValves) and input (planes
+attached to a channel) load, the HVS needs for the core clock to be
+raised above its boot time default.
+
+Failing to do so will result in a vblank timeout and a stalled display
+pipeline.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_drv.h |  1 +
+ drivers/gpu/drm/vc4/vc4_kms.c | 13 +++++++++++++
+ 2 files changed, 14 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_drv.h
++++ b/drivers/gpu/drm/vc4/vc4_drv.h
+@@ -321,6 +321,7 @@ struct vc4_hvs {
+ 	u32 __iomem *dlist;
+ 
+ 	struct clk *core_clk;
++	struct clk_request *core_req;
+ 
+ 	/* Memory manager for CRTCs to allocate space in the display
+ 	 * list.  Units are dwords.
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -391,6 +391,11 @@ static void vc4_atomic_commit_tail(struc
+ 						new_hvs_state->core_clock_rate);
+ 
+ 		core_req = clk_request_start(hvs->core_clk, core_rate);
++		/*
++		 * And remove the previous one based on the HVS
++		 * requirements if any.
++		 */
++               clk_request_done(hvs->core_req);
+ 	}
+ 
+ 	drm_atomic_helper_commit_modeset_disables(dev, state);
+@@ -418,6 +423,14 @@ static void vc4_atomic_commit_tail(struc
+ 		drm_dbg(dev, "Running the core clock at %lu Hz\n",
+ 			new_hvs_state->core_clock_rate);
+ 
++		/*
++		 * Request a clock rate based on the current HVS
++		 * requirements.
++		 */
++		hvs->core_req = clk_request_start(hvs->core_clk,
++						  new_hvs_state->core_clock_rate);
++
++		/* And drop the temporary request */
+ 		clk_request_done(core_req);
+ 	}
+ }
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0450-drm-vc4-hdmi-Simplify-the-connector-state-retrieval.patch b/root/target/linux/bcm27xx/patches-5.15/950-0450-drm-vc4-hdmi-Simplify-the-connector-state-retrieval.patch
new file mode 100644
index 00000000..0c354027
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0450-drm-vc4-hdmi-Simplify-the-connector-state-retrieval.patch
@@ -0,0 +1,51 @@
+From fed6b600f9b025030788c39505ffb06e02802394 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Wed, 27 Oct 2021 14:38:50 +0100
+Subject: [PATCH 450/828] drm/vc4: hdmi: Simplify the connector state retrieval
+
+When we have the entire DRM state, retrieving the connector state only
+requires the drm_connector pointer. Fortunately for us, we have
+allocated it as a part of the vc4_hdmi structure, so we can retrieve get
+a pointer by simply accessing our field in that structure.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 21 +++------------------
+ 1 file changed, 3 insertions(+), 18 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -1002,30 +1002,15 @@ static void vc4_hdmi_recenter_fifo(struc
+ 		  "VC4_HDMI_FIFO_CTL_RECENTER_DONE");
+ }
+ 
+-static struct drm_connector_state *
+-vc4_hdmi_encoder_get_connector_state(struct drm_encoder *encoder,
+-				     struct drm_atomic_state *state)
+-{
+-	struct drm_connector_state *conn_state;
+-	struct drm_connector *connector;
+-	unsigned int i;
+-
+-	for_each_new_connector_in_state(state, connector, conn_state, i) {
+-		if (conn_state->best_encoder == encoder)
+-			return conn_state;
+-	}
+-
+-	return NULL;
+-}
+-
+ static void vc4_hdmi_encoder_pre_crtc_configure(struct drm_encoder *encoder,
+ 						struct drm_atomic_state *state)
+ {
++	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
++	struct drm_connector *connector = &vc4_hdmi->connector;
+ 	struct drm_connector_state *conn_state =
+-		vc4_hdmi_encoder_get_connector_state(encoder, state);
++		drm_atomic_get_new_connector_state(state, connector);
+ 	struct vc4_hdmi_connector_state *vc4_conn_state =
+ 		conn_state_to_vc4_hdmi_conn_state(conn_state);
+-	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
+ 	struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode;
+ 	unsigned long pixel_rate = vc4_conn_state->pixel_rate;
+ 	unsigned long bvb_rate, hsm_rate;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0451-drm-vc4-Fix-timings-for-interlaced-modes.patch b/root/target/linux/bcm27xx/patches-5.15/950-0451-drm-vc4-Fix-timings-for-interlaced-modes.patch
new file mode 100644
index 00000000..8a808623
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0451-drm-vc4-Fix-timings-for-interlaced-modes.patch
@@ -0,0 +1,83 @@
+From 579561548b80dd9f28465a6b558deeffe7f6f498 Mon Sep 17 00:00:00 2001
+From: kFYatek <4499762+kFYatek@users.noreply.github.com>
+Date: Wed, 23 Jun 2021 01:11:26 +0200
+Subject: [PATCH 451/828] drm/vc4: Fix timings for interlaced modes
+
+Increase the number of post-sync blanking lines on odd fields instead of
+decreasing it on even fields. This makes the total number of lines
+properly match the modelines.
+
+Additionally fix the value of PV_VCONTROL_ODD_DELAY, which did not take
+pixels_per_clock into account, causing some displays to invert the
+fields when driven by bcm2711.
+
+Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c |  7 ++++---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 12 ++++++------
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -344,7 +344,8 @@ static void vc4_crtc_config_pv(struct dr
+ 				 PV_HORZB_HACTIVE));
+ 
+ 	CRTC_WRITE(PV_VERTA,
+-		   VC4_SET_FIELD(mode->crtc_vtotal - mode->crtc_vsync_end,
++		   VC4_SET_FIELD(mode->crtc_vtotal - mode->crtc_vsync_end +
++				 interlace,
+ 				 PV_VERTA_VBP) |
+ 		   VC4_SET_FIELD(mode->crtc_vsync_end - mode->crtc_vsync_start,
+ 				 PV_VERTA_VSYNC));
+@@ -356,7 +357,7 @@ static void vc4_crtc_config_pv(struct dr
+ 	if (interlace) {
+ 		CRTC_WRITE(PV_VERTA_EVEN,
+ 			   VC4_SET_FIELD(mode->crtc_vtotal -
+-					 mode->crtc_vsync_end - 1,
++					 mode->crtc_vsync_end,
+ 					 PV_VERTA_VBP) |
+ 			   VC4_SET_FIELD(mode->crtc_vsync_end -
+ 					 mode->crtc_vsync_start,
+@@ -376,7 +377,7 @@ static void vc4_crtc_config_pv(struct dr
+ 			   PV_VCONTROL_CONTINUOUS |
+ 			   (is_dsi ? PV_VCONTROL_DSI : 0) |
+ 			   PV_VCONTROL_INTERLACE |
+-			   VC4_SET_FIELD(mode->htotal * pixel_rep / 2,
++			   VC4_SET_FIELD(mode->htotal * pixel_rep / (2 * ppc),
+ 					 PV_VCONTROL_ODD_DELAY));
+ 		CRTC_WRITE(PV_VSYNCD_EVEN, 0);
+ 	} else {
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -840,12 +840,12 @@ static void vc4_hdmi_set_timings(struct
+ 				   VC4_HDMI_VERTA_VFP) |
+ 		     VC4_SET_FIELD(mode->crtc_vdisplay, VC4_HDMI_VERTA_VAL));
+ 	u32 vertb = (VC4_SET_FIELD(0, VC4_HDMI_VERTB_VSPO) |
+-		     VC4_SET_FIELD(mode->crtc_vtotal - mode->crtc_vsync_end,
++		     VC4_SET_FIELD(mode->crtc_vtotal - mode->crtc_vsync_end +
++				   interlaced,
+ 				   VC4_HDMI_VERTB_VBP));
+ 	u32 vertb_even = (VC4_SET_FIELD(0, VC4_HDMI_VERTB_VSPO) |
+ 			  VC4_SET_FIELD(mode->crtc_vtotal -
+-					mode->crtc_vsync_end -
+-					interlaced,
++					mode->crtc_vsync_end,
+ 					VC4_HDMI_VERTB_VBP));
+ 	unsigned long flags;
+ 
+@@ -891,12 +891,12 @@ static void vc5_hdmi_set_timings(struct
+ 				   VC5_HDMI_VERTA_VFP) |
+ 		     VC4_SET_FIELD(mode->crtc_vdisplay, VC5_HDMI_VERTA_VAL));
+ 	u32 vertb = (VC4_SET_FIELD(0, VC5_HDMI_VERTB_VSPO) |
+-		     VC4_SET_FIELD(mode->crtc_vtotal - mode->crtc_vsync_end,
++		     VC4_SET_FIELD(mode->crtc_vtotal - mode->crtc_vsync_end +
++				   interlaced,
+ 				   VC4_HDMI_VERTB_VBP));
+ 	u32 vertb_even = (VC4_SET_FIELD(0, VC5_HDMI_VERTB_VSPO) |
+ 			  VC4_SET_FIELD(mode->crtc_vtotal -
+-					mode->crtc_vsync_end -
+-					interlaced,
++					mode->crtc_vsync_end,
+ 					VC4_HDMI_VERTB_VBP));
+ 	unsigned long flags;
+ 	unsigned char gcp;
diff --git a/root/target/linux/bcm27xx/patches-5.15/0468-dwc_otg-Update-NetBSD-usb.h-header-licence.patch b/root/target/linux/bcm27xx/patches-5.15/950-0452-dwc_otg-Update-NetBSD-usb.h-header-licence.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0468-dwc_otg-Update-NetBSD-usb.h-header-licence.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0452-dwc_otg-Update-NetBSD-usb.h-header-licence.patch
index c5c5a9a1..04283579 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0468-dwc_otg-Update-NetBSD-usb.h-header-licence.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0452-dwc_otg-Update-NetBSD-usb.h-header-licence.patch
@@ -1,7 +1,7 @@
-From 6f1e491841b9aefe338491f9da0a4afc40bf09ef Mon Sep 17 00:00:00 2001
+From 383c598d56d36211db23875900a60247a1e29749 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Mon, 5 Jul 2021 19:38:21 +0100
-Subject: [PATCH 468/634] dwc_otg: Update NetBSD usb.h header licence
+Subject: [PATCH 452/828] dwc_otg: Update NetBSD usb.h header licence
 
 NetBSD have changed their licensing requirements such that the 2-clause
 licence is preferred. Update usb.h in the downstream dwc_otg code
@@ -15,8 +15,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/usb/host/dwc_common_port/usb.h | 7 -------
  1 file changed, 7 deletions(-)
 
-diff --git a/drivers/usb/host/dwc_common_port/usb.h b/drivers/usb/host/dwc_common_port/usb.h
-index f78593575736..b1cedb1876b7 100644
 --- a/drivers/usb/host/dwc_common_port/usb.h
 +++ b/drivers/usb/host/dwc_common_port/usb.h
 @@ -14,13 +14,6 @@
@@ -33,6 +31,3 @@ index f78593575736..b1cedb1876b7 100644
   *
   * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
   * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0453-drm-vc4-Fix-margin-calculations-for-the-right-bottom.patch b/root/target/linux/bcm27xx/patches-5.15/950-0453-drm-vc4-Fix-margin-calculations-for-the-right-bottom.patch
new file mode 100644
index 00000000..29e7a8bb
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0453-drm-vc4-Fix-margin-calculations-for-the-right-bottom.patch
@@ -0,0 +1,38 @@
+From fcba4c4461df48830e3b2169820ecbd7294fb9a9 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 12 Jul 2021 12:27:59 +0100
+Subject: [PATCH 453/828] drm/vc4: Fix margin calculations for the right/bottom
+ edges
+
+The calculations clipped the right/bottom edge of the clipped
+range based on the left/top margins.
+
+Fixes: 666e73587f90 ("drm/vc4: Take margin setup into account when updating planes")
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_plane.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_plane.c
++++ b/drivers/gpu/drm/vc4/vc4_plane.c
+@@ -310,16 +310,16 @@ static int vc4_plane_margins_adj(struct
+ 					       adjhdisplay,
+ 					       crtc_state->mode.hdisplay);
+ 	vc4_pstate->crtc_x += left;
+-	if (vc4_pstate->crtc_x > crtc_state->mode.hdisplay - left)
+-		vc4_pstate->crtc_x = crtc_state->mode.hdisplay - left;
++	if (vc4_pstate->crtc_x > crtc_state->mode.hdisplay - right)
++		vc4_pstate->crtc_x = crtc_state->mode.hdisplay - right;
+ 
+ 	adjvdisplay = crtc_state->mode.vdisplay - (top + bottom);
+ 	vc4_pstate->crtc_y = DIV_ROUND_CLOSEST(vc4_pstate->crtc_y *
+ 					       adjvdisplay,
+ 					       crtc_state->mode.vdisplay);
+ 	vc4_pstate->crtc_y += top;
+-	if (vc4_pstate->crtc_y > crtc_state->mode.vdisplay - top)
+-		vc4_pstate->crtc_y = crtc_state->mode.vdisplay - top;
++	if (vc4_pstate->crtc_y > crtc_state->mode.vdisplay - bottom)
++		vc4_pstate->crtc_y = crtc_state->mode.vdisplay - bottom;
+ 
+ 	vc4_pstate->crtc_w = DIV_ROUND_CLOSEST(vc4_pstate->crtc_w *
+ 					       adjhdisplay,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0454-drm-vc4-Fix-timings-for-VEC-modes.patch b/root/target/linux/bcm27xx/patches-5.15/950-0454-drm-vc4-Fix-timings-for-VEC-modes.patch
new file mode 100644
index 00000000..6038b8b2
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0454-drm-vc4-Fix-timings-for-VEC-modes.patch
@@ -0,0 +1,148 @@
+From a404f8c35948ec03d0460c471ba1e7f875308cf7 Mon Sep 17 00:00:00 2001
+From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
+Date: Thu, 15 Jul 2021 01:07:30 +0200
+Subject: [PATCH 454/828] drm/vc4: Fix timings for VEC modes
+
+This commit fixes vertical timings of the VEC (composite output) modes
+to accurately represent the 525-line ("NTSC") and 625-line ("PAL") ITU-R
+standards.
+
+Previous timings were actually defined as 502 and 601 lines, resulting
+in non-standard 62.69 Hz and 52 Hz signals being generated,
+respectively.
+
+Changes to vc4_crtc.c have also been made, to make the PixelValve
+vertical timings accurately correspond to the DRM modeline in interlaced
+modes. The resulting VERTA/VERTB register values have been verified
+against the reference values set by the Raspberry Pi firmware.
+
+Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c | 70 +++++++++++++++++++++-------------
+ drivers/gpu/drm/vc4/vc4_vec.c  |  4 +-
+ 2 files changed, 45 insertions(+), 29 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -318,8 +318,14 @@ static void vc4_crtc_config_pv(struct dr
+ 	bool is_dsi = (vc4_encoder->type == VC4_ENCODER_TYPE_DSI0 ||
+ 		       vc4_encoder->type == VC4_ENCODER_TYPE_DSI1);
+ 	bool is_dsi1 = vc4_encoder->type == VC4_ENCODER_TYPE_DSI1;
++	bool is_vec = vc4_encoder->type == VC4_ENCODER_TYPE_VEC;
+ 	u32 format = is_dsi1 ? PV_CONTROL_FORMAT_DSIV_24 : PV_CONTROL_FORMAT_24;
+ 	u8 ppc = pv_data->pixels_per_clock;
++
++	u16 vert_bp = mode->crtc_vtotal - mode->crtc_vsync_end;
++	u16 vert_sync = mode->crtc_vsync_end - mode->crtc_vsync_start;
++	u16 vert_fp = mode->crtc_vsync_start - mode->crtc_vdisplay;
++
+ 	bool debug_dump_regs = false;
+ 
+ 	if (debug_dump_regs) {
+@@ -343,49 +349,59 @@ static void vc4_crtc_config_pv(struct dr
+ 		   VC4_SET_FIELD(mode->hdisplay * pixel_rep / ppc,
+ 				 PV_HORZB_HACTIVE));
+ 
+-	CRTC_WRITE(PV_VERTA,
+-		   VC4_SET_FIELD(mode->crtc_vtotal - mode->crtc_vsync_end +
+-				 interlace,
+-				 PV_VERTA_VBP) |
+-		   VC4_SET_FIELD(mode->crtc_vsync_end - mode->crtc_vsync_start,
+-				 PV_VERTA_VSYNC));
+-	CRTC_WRITE(PV_VERTB,
+-		   VC4_SET_FIELD(mode->crtc_vsync_start - mode->crtc_vdisplay,
+-				 PV_VERTB_VFP) |
+-		   VC4_SET_FIELD(mode->crtc_vdisplay, PV_VERTB_VACTIVE));
+-
+ 	if (interlace) {
++		bool odd_field_first = false;
++		u32 field_delay = mode->htotal * pixel_rep / (2 * ppc);
++		u16 vert_bp_even = vert_bp;
++		u16 vert_fp_even = vert_fp;
++
++		if (is_vec) {
++			/* VEC (composite output) */
++			++field_delay;
++			if (mode->htotal == 858) {
++				/* 525-line mode (NTSC or PAL-M) */
++				odd_field_first = true;
++			}
++		}
++
++		if (odd_field_first)
++			++vert_fp_even;
++		else
++			++vert_bp;
++
+ 		CRTC_WRITE(PV_VERTA_EVEN,
+-			   VC4_SET_FIELD(mode->crtc_vtotal -
+-					 mode->crtc_vsync_end,
+-					 PV_VERTA_VBP) |
+-			   VC4_SET_FIELD(mode->crtc_vsync_end -
+-					 mode->crtc_vsync_start,
+-					 PV_VERTA_VSYNC));
++			   VC4_SET_FIELD(vert_bp_even, PV_VERTA_VBP) |
++			   VC4_SET_FIELD(vert_sync, PV_VERTA_VSYNC));
+ 		CRTC_WRITE(PV_VERTB_EVEN,
+-			   VC4_SET_FIELD(mode->crtc_vsync_start -
+-					 mode->crtc_vdisplay,
+-					 PV_VERTB_VFP) |
++			   VC4_SET_FIELD(vert_fp_even, PV_VERTB_VFP) |
+ 			   VC4_SET_FIELD(mode->crtc_vdisplay, PV_VERTB_VACTIVE));
+ 
+-		/* We set up first field even mode for HDMI.  VEC's
+-		 * NTSC mode would want first field odd instead, once
+-		 * we support it (to do so, set ODD_FIRST and put the
+-		 * delay in VSYNCD_EVEN instead).
++		/* We set up first field even mode for HDMI and VEC's PAL.
++		 * For NTSC, we need first field odd.
+ 		 */
+ 		CRTC_WRITE(PV_V_CONTROL,
+ 			   PV_VCONTROL_CONTINUOUS |
+ 			   (is_dsi ? PV_VCONTROL_DSI : 0) |
+ 			   PV_VCONTROL_INTERLACE |
+-			   VC4_SET_FIELD(mode->htotal * pixel_rep / (2 * ppc),
+-					 PV_VCONTROL_ODD_DELAY));
+-		CRTC_WRITE(PV_VSYNCD_EVEN, 0);
++			   (odd_field_first
++				   ? PV_VCONTROL_ODD_FIRST
++				   : VC4_SET_FIELD(field_delay,
++						   PV_VCONTROL_ODD_DELAY)));
++		CRTC_WRITE(PV_VSYNCD_EVEN,
++			   (odd_field_first ? field_delay : 0));
+ 	} else {
+ 		CRTC_WRITE(PV_V_CONTROL,
+ 			   PV_VCONTROL_CONTINUOUS |
+ 			   (is_dsi ? PV_VCONTROL_DSI : 0));
+ 	}
+ 
++	CRTC_WRITE(PV_VERTA,
++		   VC4_SET_FIELD(vert_bp, PV_VERTA_VBP) |
++		   VC4_SET_FIELD(vert_sync, PV_VERTA_VSYNC));
++	CRTC_WRITE(PV_VERTB,
++		   VC4_SET_FIELD(vert_fp, PV_VERTB_VFP) |
++		   VC4_SET_FIELD(mode->crtc_vdisplay, PV_VERTB_VACTIVE));
++
+ 	if (is_dsi)
+ 		CRTC_WRITE(PV_HACT_ACT, mode->hdisplay * pixel_rep);
+ 
+--- a/drivers/gpu/drm/vc4/vc4_vec.c
++++ b/drivers/gpu/drm/vc4/vc4_vec.c
+@@ -256,7 +256,7 @@ static void vc4_vec_ntsc_j_mode_set(stru
+ static const struct drm_display_mode ntsc_mode = {
+ 	DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 13500,
+ 		 720, 720 + 14, 720 + 14 + 64, 720 + 14 + 64 + 60, 0,
+-		 480, 480 + 3, 480 + 3 + 3, 480 + 3 + 3 + 16, 0,
++		 480, 480 + 7, 480 + 7 + 6, 525, 0,
+ 		 DRM_MODE_FLAG_INTERLACE)
+ };
+ 
+@@ -278,7 +278,7 @@ static void vc4_vec_pal_m_mode_set(struc
+ static const struct drm_display_mode pal_mode = {
+ 	DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 13500,
+ 		 720, 720 + 20, 720 + 20 + 64, 720 + 20 + 64 + 60, 0,
+-		 576, 576 + 2, 576 + 2 + 3, 576 + 2 + 3 + 20, 0,
++		 576, 576 + 4, 576 + 4 + 6, 625, 0,
+ 		 DRM_MODE_FLAG_INTERLACE)
+ };
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0455-drm-vc4-Refactor-VEC-TV-mode-setting.patch b/root/target/linux/bcm27xx/patches-5.15/950-0455-drm-vc4-Refactor-VEC-TV-mode-setting.patch
new file mode 100644
index 00000000..7ce22811
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0455-drm-vc4-Refactor-VEC-TV-mode-setting.patch
@@ -0,0 +1,167 @@
+From fb8717dae14c0787b8aa894ff075db8178d7706b Mon Sep 17 00:00:00 2001
+From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
+Date: Thu, 15 Jul 2021 01:07:49 +0200
+Subject: [PATCH 455/828] drm/vc4: Refactor VEC TV mode setting
+
+Change the mode_set function pointer logic to declarative config0,
+config1 and custom_freq fields, to make TV mode setting logic more
+concise and uniform.
+
+Additionally, remove the superfluous tv_mode field, which was redundant
+with the mode field in struct drm_tv_connector_state.
+
+Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_vec.c | 69 +++++++++++------------------------
+ 1 file changed, 22 insertions(+), 47 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_vec.c
++++ b/drivers/gpu/drm/vc4/vc4_vec.c
+@@ -170,8 +170,6 @@ struct vc4_vec {
+ 
+ 	struct clk *clock;
+ 
+-	const struct vc4_vec_tv_mode *tv_mode;
+-
+ 	struct debugfs_regset32 regset;
+ };
+ 
+@@ -211,7 +209,9 @@ enum vc4_vec_tv_mode_id {
+ 
+ struct vc4_vec_tv_mode {
+ 	const struct drm_display_mode *mode;
+-	void (*mode_set)(struct vc4_vec *vec);
++	u32 config0;
++	u32 config1;
++	u32 custom_freq;
+ };
+ 
+ static const struct debugfs_reg32 vec_regs[] = {
+@@ -241,18 +241,6 @@ static const struct debugfs_reg32 vec_re
+ 	VC4_REG32(VEC_DAC_MISC),
+ };
+ 
+-static void vc4_vec_ntsc_mode_set(struct vc4_vec *vec)
+-{
+-	VEC_WRITE(VEC_CONFIG0, VEC_CONFIG0_NTSC_STD | VEC_CONFIG0_PDEN);
+-	VEC_WRITE(VEC_CONFIG1, VEC_CONFIG1_C_CVBS_CVBS);
+-}
+-
+-static void vc4_vec_ntsc_j_mode_set(struct vc4_vec *vec)
+-{
+-	VEC_WRITE(VEC_CONFIG0, VEC_CONFIG0_NTSC_STD);
+-	VEC_WRITE(VEC_CONFIG1, VEC_CONFIG1_C_CVBS_CVBS);
+-}
+-
+ static const struct drm_display_mode ntsc_mode = {
+ 	DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 13500,
+ 		 720, 720 + 14, 720 + 14 + 64, 720 + 14 + 64 + 60, 0,
+@@ -260,21 +248,6 @@ static const struct drm_display_mode nts
+ 		 DRM_MODE_FLAG_INTERLACE)
+ };
+ 
+-static void vc4_vec_pal_mode_set(struct vc4_vec *vec)
+-{
+-	VEC_WRITE(VEC_CONFIG0, VEC_CONFIG0_PAL_BDGHI_STD);
+-	VEC_WRITE(VEC_CONFIG1, VEC_CONFIG1_C_CVBS_CVBS);
+-}
+-
+-static void vc4_vec_pal_m_mode_set(struct vc4_vec *vec)
+-{
+-	VEC_WRITE(VEC_CONFIG0, VEC_CONFIG0_PAL_BDGHI_STD);
+-	VEC_WRITE(VEC_CONFIG1,
+-		  VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ);
+-	VEC_WRITE(VEC_FREQ3_2, 0x223b);
+-	VEC_WRITE(VEC_FREQ1_0, 0x61d1);
+-}
+-
+ static const struct drm_display_mode pal_mode = {
+ 	DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 13500,
+ 		 720, 720 + 20, 720 + 20 + 64, 720 + 20 + 64 + 60, 0,
+@@ -285,19 +258,24 @@ static const struct drm_display_mode pal
+ static const struct vc4_vec_tv_mode vc4_vec_tv_modes[] = {
+ 	[VC4_VEC_TV_MODE_NTSC] = {
+ 		.mode = &ntsc_mode,
+-		.mode_set = vc4_vec_ntsc_mode_set,
++		.config0 = VEC_CONFIG0_NTSC_STD | VEC_CONFIG0_PDEN,
++		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
+ 	},
+ 	[VC4_VEC_TV_MODE_NTSC_J] = {
+ 		.mode = &ntsc_mode,
+-		.mode_set = vc4_vec_ntsc_j_mode_set,
++		.config0 = VEC_CONFIG0_NTSC_STD,
++		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
+ 	},
+ 	[VC4_VEC_TV_MODE_PAL] = {
+ 		.mode = &pal_mode,
+-		.mode_set = vc4_vec_pal_mode_set,
++		.config0 = VEC_CONFIG0_PAL_BDGHI_STD,
++		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
+ 	},
+ 	[VC4_VEC_TV_MODE_PAL_M] = {
+ 		.mode = &pal_mode,
+-		.mode_set = vc4_vec_pal_m_mode_set,
++		.config0 = VEC_CONFIG0_PAL_BDGHI_STD,
++		.config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ,
++		.custom_freq = 0x223b61d1,
+ 	},
+ };
+ 
+@@ -367,7 +345,6 @@ static struct drm_connector *vc4_vec_con
+ 	drm_object_attach_property(&connector->base,
+ 				   dev->mode_config.tv_mode_property,
+ 				   VC4_VEC_TV_MODE_NTSC);
+-	vec->tv_mode = &vc4_vec_tv_modes[VC4_VEC_TV_MODE_NTSC];
+ 
+ 	drm_connector_attach_encoder(connector, vec->encoder);
+ 
+@@ -400,6 +377,7 @@ static void vc4_vec_encoder_enable(struc
+ {
+ 	struct vc4_vec_encoder *vc4_vec_encoder = to_vc4_vec_encoder(encoder);
+ 	struct vc4_vec *vec = vc4_vec_encoder->vec;
++	unsigned int tv_mode = vec->connector->state->tv.mode;
+ 	int ret;
+ 
+ 	ret = pm_runtime_get_sync(&vec->pdev->dev);
+@@ -455,7 +433,15 @@ static void vc4_vec_encoder_enable(struc
+ 	/* Mask all interrupts. */
+ 	VEC_WRITE(VEC_MASK0, 0);
+ 
+-	vec->tv_mode->mode_set(vec);
++	VEC_WRITE(VEC_CONFIG0, vc4_vec_tv_modes[tv_mode].config0);
++	VEC_WRITE(VEC_CONFIG1, vc4_vec_tv_modes[tv_mode].config1);
++	if (vc4_vec_tv_modes[tv_mode].custom_freq != 0) {
++		VEC_WRITE(VEC_FREQ3_2,
++			  (vc4_vec_tv_modes[tv_mode].custom_freq >> 16) &
++			  0xffff);
++		VEC_WRITE(VEC_FREQ1_0,
++			  vc4_vec_tv_modes[tv_mode].custom_freq & 0xffff);
++	}
+ 
+ 	VEC_WRITE(VEC_DAC_MISC,
+ 		  VEC_DAC_MISC_VID_ACT | VEC_DAC_MISC_DAC_RST_N);
+@@ -470,16 +456,6 @@ static bool vc4_vec_encoder_mode_fixup(s
+ 	return true;
+ }
+ 
+-static void vc4_vec_encoder_atomic_mode_set(struct drm_encoder *encoder,
+-					struct drm_crtc_state *crtc_state,
+-					struct drm_connector_state *conn_state)
+-{
+-	struct vc4_vec_encoder *vc4_vec_encoder = to_vc4_vec_encoder(encoder);
+-	struct vc4_vec *vec = vc4_vec_encoder->vec;
+-
+-	vec->tv_mode = &vc4_vec_tv_modes[conn_state->tv.mode];
+-}
+-
+ static int vc4_vec_encoder_atomic_check(struct drm_encoder *encoder,
+ 					struct drm_crtc_state *crtc_state,
+ 					struct drm_connector_state *conn_state)
+@@ -500,7 +476,6 @@ static const struct drm_encoder_helper_f
+ 	.enable = vc4_vec_encoder_enable,
+ 	.mode_fixup = vc4_vec_encoder_mode_fixup,
+ 	.atomic_check = vc4_vec_encoder_atomic_check,
+-	.atomic_mode_set = vc4_vec_encoder_atomic_mode_set,
+ };
+ 
+ static const struct vc4_vec_variant bcm2835_vec_variant = {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0456-drm-vc4-Fix-definition-of-PAL-M-mode.patch b/root/target/linux/bcm27xx/patches-5.15/950-0456-drm-vc4-Fix-definition-of-PAL-M-mode.patch
new file mode 100644
index 00000000..5fbb14c4
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0456-drm-vc4-Fix-definition-of-PAL-M-mode.patch
@@ -0,0 +1,77 @@
+From c6ea419ab2315cca8e6cafc326e09f8adeafd64d Mon Sep 17 00:00:00 2001
+From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
+Date: Thu, 15 Jul 2021 01:07:53 +0200
+Subject: [PATCH 456/828] drm/vc4: Fix definition of PAL-M mode
+
+PAL-M is a Brazilian analog TV standard that uses a PAL-style chroma
+subcarrier at 3.575611[888111] MHz on top of 525-line (480i60) timings.
+This commit makes the driver actually use the proper VEC preset for this
+mode instead of just changing PAL subcarrier frequency.
+
+DRM mode constant names have also been changed, as they no longer
+correspond to the "NTSC" or "PAL" terms.
+
+Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_vec.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_vec.c
++++ b/drivers/gpu/drm/vc4/vc4_vec.c
+@@ -68,6 +68,7 @@
+ #define VEC_CONFIG0_STD_MASK		GENMASK(1, 0)
+ #define VEC_CONFIG0_NTSC_STD		0
+ #define VEC_CONFIG0_PAL_BDGHI_STD	1
++#define VEC_CONFIG0_PAL_M_STD		2
+ #define VEC_CONFIG0_PAL_N_STD		3
+ 
+ #define VEC_SCHPH			0x108
+@@ -241,14 +242,14 @@ static const struct debugfs_reg32 vec_re
+ 	VC4_REG32(VEC_DAC_MISC),
+ };
+ 
+-static const struct drm_display_mode ntsc_mode = {
++static const struct drm_display_mode drm_mode_480i = {
+ 	DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 13500,
+ 		 720, 720 + 14, 720 + 14 + 64, 720 + 14 + 64 + 60, 0,
+ 		 480, 480 + 7, 480 + 7 + 6, 525, 0,
+ 		 DRM_MODE_FLAG_INTERLACE)
+ };
+ 
+-static const struct drm_display_mode pal_mode = {
++static const struct drm_display_mode drm_mode_576i = {
+ 	DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 13500,
+ 		 720, 720 + 20, 720 + 20 + 64, 720 + 20 + 64 + 60, 0,
+ 		 576, 576 + 4, 576 + 4 + 6, 625, 0,
+@@ -257,25 +258,24 @@ static const struct drm_display_mode pal
+ 
+ static const struct vc4_vec_tv_mode vc4_vec_tv_modes[] = {
+ 	[VC4_VEC_TV_MODE_NTSC] = {
+-		.mode = &ntsc_mode,
++		.mode = &drm_mode_480i,
+ 		.config0 = VEC_CONFIG0_NTSC_STD | VEC_CONFIG0_PDEN,
+ 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
+ 	},
+ 	[VC4_VEC_TV_MODE_NTSC_J] = {
+-		.mode = &ntsc_mode,
++		.mode = &drm_mode_480i,
+ 		.config0 = VEC_CONFIG0_NTSC_STD,
+ 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
+ 	},
+ 	[VC4_VEC_TV_MODE_PAL] = {
+-		.mode = &pal_mode,
++		.mode = &drm_mode_576i,
+ 		.config0 = VEC_CONFIG0_PAL_BDGHI_STD,
+ 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
+ 	},
+ 	[VC4_VEC_TV_MODE_PAL_M] = {
+-		.mode = &pal_mode,
+-		.config0 = VEC_CONFIG0_PAL_BDGHI_STD,
+-		.config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ,
+-		.custom_freq = 0x223b61d1,
++		.mode = &drm_mode_480i,
++		.config0 = VEC_CONFIG0_PAL_M_STD,
++		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
+ 	},
+ };
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0457-drm-vc4-Add-support-for-more-analog-TV-standards.patch b/root/target/linux/bcm27xx/patches-5.15/950-0457-drm-vc4-Add-support-for-more-analog-TV-standards.patch
new file mode 100644
index 00000000..9a20d66d
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0457-drm-vc4-Add-support-for-more-analog-TV-standards.patch
@@ -0,0 +1,148 @@
+From d1f3a4af1e6ebcb9d58f8af1898f62291c2c4c31 Mon Sep 17 00:00:00 2001
+From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
+Date: Thu, 15 Jul 2021 01:07:58 +0200
+Subject: [PATCH 457/828] drm/vc4: Add support for more analog TV standards
+
+Add support for the following composite output modes (all of them are
+somewhat more obscure than the previously defined ones):
+
+- NTSC_443 - NTSC-style signal with the chroma subcarrier shifted to
+  4.43361875 MHz (the PAL subcarrier frequency). Never used for
+  broadcasting, but sometimes used as a hack to play NTSC content in PAL
+  regions (e.g. on VCRs).
+- PAL_N - PAL with alternative chroma subcarrier frequency,
+  3.58205625 MHz. Used as a broadcast standard in Argentina, Paraguay
+  and Uruguay to fit 576i50 with colour in 6 MHz channel raster.
+- PAL60 - 480i60 signal with PAL-style color at normal European PAL
+  frequency. Another non-standard, non-broadcast mode, used in similar
+  contexts as NTSC_443. Some displays support one but not the other.
+- SECAM - French frequency-modulated analog color standard; also have
+  been broadcast in Eastern Europe and various parts of Africa and Asia.
+  Uses the same 576i50 timings as PAL.
+
+Also added some comments explaining color subcarrier frequency
+registers.
+
+Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_vec.c | 63 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 63 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_vec.c
++++ b/drivers/gpu/drm/vc4/vc4_vec.c
+@@ -45,6 +45,7 @@
+ #define VEC_CONFIG0_YDEL(x)		((x) << 26)
+ #define VEC_CONFIG0_CDEL_MASK		GENMASK(25, 24)
+ #define VEC_CONFIG0_CDEL(x)		((x) << 24)
++#define VEC_CONFIG0_SECAM_STD		BIT(21)
+ #define VEC_CONFIG0_PBPR_FIL		BIT(18)
+ #define VEC_CONFIG0_CHROMA_GAIN_MASK	GENMASK(17, 16)
+ #define VEC_CONFIG0_CHROMA_GAIN_UNITY	(0 << 16)
+@@ -75,6 +76,27 @@
+ #define VEC_SOFT_RESET			0x10c
+ #define VEC_CLMP0_START			0x144
+ #define VEC_CLMP0_END			0x148
++
++/*
++ * These set the color subcarrier frequency
++ * if VEC_CONFIG1_CUSTOM_FREQ is enabled.
++ *
++ * VEC_FREQ1_0 contains the most significant 16-bit half-word,
++ * VEC_FREQ3_2 contains the least significant 16-bit half-word.
++ * 0x80000000 seems to be equivalent to the pixel clock
++ * (which itself is the VEC clock divided by 8).
++ *
++ * Reference values (with the default pixel clock of 13.5 MHz):
++ *
++ * NTSC  (3579545.[45] Hz)     - 0x21F07C1F
++ * PAL   (4433618.75 Hz)       - 0x2A098ACB
++ * PAL-M (3575611.[888111] Hz) - 0x21E6EFE3
++ * PAL-N (3582056.25 Hz)       - 0x21F69446
++ *
++ * NOTE: For SECAM, it is used as the Dr center frequency,
++ * regardless of whether VEC_CONFIG1_CUSTOM_FREQ is enabled or not;
++ * that is specified as 4406250 Hz, which corresponds to 0x29C71C72.
++ */
+ #define VEC_FREQ3_2			0x180
+ #define VEC_FREQ1_0			0x184
+ 
+@@ -117,6 +139,14 @@
+ 
+ #define VEC_INTERRUPT_CONTROL		0x190
+ #define VEC_INTERRUPT_STATUS		0x194
++
++/*
++ * Db center frequency for SECAM; the clock for this is the same as for
++ * VEC_FREQ3_2/VEC_FREQ1_0, which is used for Dr center frequency.
++ *
++ * This is specified as 4250000 Hz, which corresponds to 0x284BDA13.
++ * That is also the default value, so no need to set it explicitly.
++ */
+ #define VEC_FCW_SECAM_B			0x198
+ #define VEC_SECAM_GAIN_VAL		0x19c
+ 
+@@ -204,8 +234,12 @@ struct vc4_vec_connector {
+ enum vc4_vec_tv_mode_id {
+ 	VC4_VEC_TV_MODE_NTSC,
+ 	VC4_VEC_TV_MODE_NTSC_J,
++	VC4_VEC_TV_MODE_NTSC_443,
+ 	VC4_VEC_TV_MODE_PAL,
+ 	VC4_VEC_TV_MODE_PAL_M,
++	VC4_VEC_TV_MODE_PAL_N,
++	VC4_VEC_TV_MODE_PAL60,
++	VC4_VEC_TV_MODE_SECAM,
+ };
+ 
+ struct vc4_vec_tv_mode {
+@@ -267,6 +301,13 @@ static const struct vc4_vec_tv_mode vc4_
+ 		.config0 = VEC_CONFIG0_NTSC_STD,
+ 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
+ 	},
++	[VC4_VEC_TV_MODE_NTSC_443] = {
++		/* NTSC with PAL chroma frequency */
++		.mode = &drm_mode_480i,
++		.config0 = VEC_CONFIG0_NTSC_STD,
++		.config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ,
++		.custom_freq = 0x2a098acb,
++	},
+ 	[VC4_VEC_TV_MODE_PAL] = {
+ 		.mode = &drm_mode_576i,
+ 		.config0 = VEC_CONFIG0_PAL_BDGHI_STD,
+@@ -277,6 +318,24 @@ static const struct vc4_vec_tv_mode vc4_
+ 		.config0 = VEC_CONFIG0_PAL_M_STD,
+ 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
+ 	},
++	[VC4_VEC_TV_MODE_PAL_N] = {
++		.mode = &drm_mode_576i,
++		.config0 = VEC_CONFIG0_PAL_N_STD,
++		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
++	},
++	[VC4_VEC_TV_MODE_PAL60] = {
++		/* PAL-M with chroma frequency of regular PAL */
++		.mode = &drm_mode_480i,
++		.config0 = VEC_CONFIG0_PAL_M_STD,
++		.config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ,
++		.custom_freq = 0x2a098acb,
++	},
++	[VC4_VEC_TV_MODE_SECAM] = {
++		.mode = &drm_mode_576i,
++		.config0 = VEC_CONFIG0_SECAM_STD,
++		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
++		.custom_freq = 0x29c71c72,
++	},
+ };
+ 
+ static enum drm_connector_status
+@@ -499,8 +558,12 @@ static const struct of_device_id vc4_vec
+ static const char * const tv_mode_names[] = {
+ 	[VC4_VEC_TV_MODE_NTSC] = "NTSC",
+ 	[VC4_VEC_TV_MODE_NTSC_J] = "NTSC-J",
++	[VC4_VEC_TV_MODE_NTSC_443] = "NTSC-443",
+ 	[VC4_VEC_TV_MODE_PAL] = "PAL",
+ 	[VC4_VEC_TV_MODE_PAL_M] = "PAL-M",
++	[VC4_VEC_TV_MODE_PAL_N] = "PAL-N",
++	[VC4_VEC_TV_MODE_PAL60] = "PAL60",
++	[VC4_VEC_TV_MODE_SECAM] = "SECAM",
+ };
+ 
+ static int vc4_vec_bind(struct device *dev, struct device *master, void *data)
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0458-drm-vc4-Allow-setting-the-TV-norm-via-module-paramet.patch b/root/target/linux/bcm27xx/patches-5.15/950-0458-drm-vc4-Allow-setting-the-TV-norm-via-module-paramet.patch
new file mode 100644
index 00000000..6d829f02
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0458-drm-vc4-Allow-setting-the-TV-norm-via-module-paramet.patch
@@ -0,0 +1,144 @@
+From 10e46c539e6a0be91b1868ef93000ee033328fc1 Mon Sep 17 00:00:00 2001
+From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
+Date: Thu, 15 Jul 2021 01:08:01 +0200
+Subject: [PATCH 458/828] drm/vc4: Allow setting the TV norm via module
+ parameter
+
+Similar to the ch7006 and nouveau drivers, introduce a "tv_mode" module
+parameter that allow setting the TV norm by specifying vc4.tv_norm= on
+the kernel command line.
+
+If that is not specified, try inferring one of the most popular norms
+(PAL or NTSC) from the video mode specified on the command line. On
+Raspberry Pis, this causes the most common cases of the sdtv_mode
+setting in config.txt to be respected.
+
+Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_vec.c | 72 ++++++++++++++++++++++++++++-------
+ 1 file changed, 58 insertions(+), 14 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_vec.c
++++ b/drivers/gpu/drm/vc4/vc4_vec.c
+@@ -66,7 +66,7 @@
+ #define VEC_CONFIG0_YCDELAY		BIT(4)
+ #define VEC_CONFIG0_RAMPEN		BIT(2)
+ #define VEC_CONFIG0_YCDIS		BIT(2)
+-#define VEC_CONFIG0_STD_MASK		GENMASK(1, 0)
++#define VEC_CONFIG0_STD_MASK		(VEC_CONFIG0_SECAM_STD | GENMASK(1, 0))
+ #define VEC_CONFIG0_NTSC_STD		0
+ #define VEC_CONFIG0_PAL_BDGHI_STD	1
+ #define VEC_CONFIG0_PAL_M_STD		2
+@@ -185,6 +185,8 @@
+ #define VEC_DAC_MISC_DAC_RST_N		BIT(0)
+ 
+ 
++static char *vc4_vec_tv_norm;
++
+ struct vc4_vec_variant {
+ 	u32 dac_config;
+ };
+@@ -338,6 +340,44 @@ static const struct vc4_vec_tv_mode vc4_
+ 	},
+ };
+ 
++static const char * const tv_mode_names[] = {
++	[VC4_VEC_TV_MODE_NTSC] = "NTSC",
++	[VC4_VEC_TV_MODE_NTSC_J] = "NTSC-J",
++	[VC4_VEC_TV_MODE_NTSC_443] = "NTSC-443",
++	[VC4_VEC_TV_MODE_PAL] = "PAL",
++	[VC4_VEC_TV_MODE_PAL_M] = "PAL-M",
++	[VC4_VEC_TV_MODE_PAL_N] = "PAL-N",
++	[VC4_VEC_TV_MODE_PAL60] = "PAL60",
++	[VC4_VEC_TV_MODE_SECAM] = "SECAM",
++};
++
++enum vc4_vec_tv_mode_id
++vc4_vec_get_default_mode(struct drm_connector *connector)
++{
++	int i;
++
++	if (vc4_vec_tv_norm) {
++		for (i = 0; i < ARRAY_SIZE(tv_mode_names); i++)
++			if (strcmp(vc4_vec_tv_norm, tv_mode_names[i]) == 0)
++				return (enum vc4_vec_tv_mode_id) i;
++	} else if (connector->cmdline_mode.specified &&
++		   ((connector->cmdline_mode.refresh_specified &&
++		     (connector->cmdline_mode.refresh == 25 ||
++		      connector->cmdline_mode.refresh == 50)) ||
++		    (!connector->cmdline_mode.refresh_specified &&
++		     (connector->cmdline_mode.yres == 288 ||
++		      connector->cmdline_mode.yres == 576)))) {
++		/*
++		 * no explicitly specified TV norm; use PAL if a mode that
++		 * looks like PAL has been specified on the command line
++		 */
++		return VC4_VEC_TV_MODE_PAL;
++	}
++
++	/* in all other cases, default to NTSC */
++	return VC4_VEC_TV_MODE_NTSC;
++}
++
+ static enum drm_connector_status
+ vc4_vec_connector_detect(struct drm_connector *connector, bool force)
+ {
+@@ -367,11 +407,19 @@ static int vc4_vec_connector_get_modes(s
+ 	return 1;
+ }
+ 
++static void vc4_vec_connector_reset(struct drm_connector *connector)
++{
++	drm_atomic_helper_connector_reset(connector);
++	/* preserve TV standard */
++	if (connector->state)
++		connector->state->tv.mode = vc4_vec_get_default_mode(connector);
++}
++
+ static const struct drm_connector_funcs vc4_vec_connector_funcs = {
+ 	.detect = vc4_vec_connector_detect,
+ 	.fill_modes = drm_helper_probe_single_connector_modes,
+ 	.destroy = vc4_vec_connector_destroy,
+-	.reset = drm_atomic_helper_connector_reset,
++	.reset = vc4_vec_connector_reset,
+ 	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+ 	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+ };
+@@ -403,7 +451,7 @@ static struct drm_connector *vc4_vec_con
+ 
+ 	drm_object_attach_property(&connector->base,
+ 				   dev->mode_config.tv_mode_property,
+-				   VC4_VEC_TV_MODE_NTSC);
++				   vc4_vec_get_default_mode(connector));
+ 
+ 	drm_connector_attach_encoder(connector, vec->encoder);
+ 
+@@ -555,17 +603,6 @@ static const struct of_device_id vc4_vec
+ 	{ /* sentinel */ },
+ };
+ 
+-static const char * const tv_mode_names[] = {
+-	[VC4_VEC_TV_MODE_NTSC] = "NTSC",
+-	[VC4_VEC_TV_MODE_NTSC_J] = "NTSC-J",
+-	[VC4_VEC_TV_MODE_NTSC_443] = "NTSC-443",
+-	[VC4_VEC_TV_MODE_PAL] = "PAL",
+-	[VC4_VEC_TV_MODE_PAL_M] = "PAL-M",
+-	[VC4_VEC_TV_MODE_PAL_N] = "PAL-N",
+-	[VC4_VEC_TV_MODE_PAL60] = "PAL60",
+-	[VC4_VEC_TV_MODE_SECAM] = "SECAM",
+-};
+-
+ static int vc4_vec_bind(struct device *dev, struct device *master, void *data)
+ {
+ 	struct platform_device *pdev = to_platform_device(dev);
+@@ -674,3 +711,10 @@ struct platform_driver vc4_vec_driver =
+ 		.of_match_table = vc4_vec_dt_match,
+ 	},
+ };
++
++module_param_named(tv_norm, vc4_vec_tv_norm, charp, 0600);
++MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"
++		 "\t\tSupported: NTSC, NTSC-J, NTSC-443, PAL, PAL-M, PAL-N,\n"
++		 "\t\t\tPAL60, SECAM.\n"
++		 "\t\tDefault: PAL if a 50 Hz mode has been set via video=,\n"
++		 "\t\t\tNTSC otherwise");
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0459-drm-vc4-Refactor-mode-checking-logic.patch b/root/target/linux/bcm27xx/patches-5.15/950-0459-drm-vc4-Refactor-mode-checking-logic.patch
new file mode 100644
index 00000000..e87fd035
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0459-drm-vc4-Refactor-mode-checking-logic.patch
@@ -0,0 +1,85 @@
+From 6819c663e42c3774fa1593ddd3502eb999c89f74 Mon Sep 17 00:00:00 2001
+From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
+Date: Thu, 15 Jul 2021 01:08:05 +0200
+Subject: [PATCH 459/828] drm/vc4: Refactor mode checking logic
+
+Replace drm_encoder_helper_funcs::atomic_check with
+drm_connector_helper_funcs::atomic_check - the former is not called
+during drm_mode_obj_set_property_ioctl(). Set crtc_state->mode_changed
+if TV norm changes even without explicit mode change. This makes things
+like "xrandr --output Composite-1 --set mode PAL-M" work properly.
+
+Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_vec.c | 42 ++++++++++++++++++++++-------------
+ 1 file changed, 26 insertions(+), 16 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_vec.c
++++ b/drivers/gpu/drm/vc4/vc4_vec.c
+@@ -415,6 +415,31 @@ static void vc4_vec_connector_reset(stru
+ 		connector->state->tv.mode = vc4_vec_get_default_mode(connector);
+ }
+ 
++static int vc4_vec_connector_atomic_check(struct drm_connector *conn,
++					  struct drm_atomic_state *state)
++{
++	struct drm_connector_state *old_state =
++		drm_atomic_get_old_connector_state(state, conn);
++	struct drm_connector_state *new_state =
++		drm_atomic_get_new_connector_state(state, conn);
++
++	const struct vc4_vec_tv_mode *vec_mode =
++		&vc4_vec_tv_modes[new_state->tv.mode];
++
++	if (new_state->crtc) {
++		struct drm_crtc_state *crtc_state =
++			drm_atomic_get_new_crtc_state(state, new_state->crtc);
++
++		if (!drm_mode_equal(vec_mode->mode, &crtc_state->mode))
++			return -EINVAL;
++
++		if (old_state->tv.mode != new_state->tv.mode)
++			crtc_state->mode_changed = true;
++	}
++
++	return 0;
++}
++
+ static const struct drm_connector_funcs vc4_vec_connector_funcs = {
+ 	.detect = vc4_vec_connector_detect,
+ 	.fill_modes = drm_helper_probe_single_connector_modes,
+@@ -426,6 +451,7 @@ static const struct drm_connector_funcs
+ 
+ static const struct drm_connector_helper_funcs vc4_vec_connector_helper_funcs = {
+ 	.get_modes = vc4_vec_connector_get_modes,
++	.atomic_check = vc4_vec_connector_atomic_check,
+ };
+ 
+ static struct drm_connector *vc4_vec_connector_init(struct drm_device *dev,
+@@ -563,26 +589,10 @@ static bool vc4_vec_encoder_mode_fixup(s
+ 	return true;
+ }
+ 
+-static int vc4_vec_encoder_atomic_check(struct drm_encoder *encoder,
+-					struct drm_crtc_state *crtc_state,
+-					struct drm_connector_state *conn_state)
+-{
+-	const struct vc4_vec_tv_mode *vec_mode;
+-
+-	vec_mode = &vc4_vec_tv_modes[conn_state->tv.mode];
+-
+-	if (conn_state->crtc &&
+-	    !drm_mode_equal(vec_mode->mode, &crtc_state->adjusted_mode))
+-		return -EINVAL;
+-
+-	return 0;
+-}
+-
+ static const struct drm_encoder_helper_funcs vc4_vec_encoder_helper_funcs = {
+ 	.disable = vc4_vec_encoder_disable,
+ 	.enable = vc4_vec_encoder_enable,
+ 	.mode_fixup = vc4_vec_encoder_mode_fixup,
+-	.atomic_check = vc4_vec_encoder_atomic_check,
+ };
+ 
+ static const struct vc4_vec_variant bcm2835_vec_variant = {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0460-drm-vc4-Add-firmware-kms-mode.patch b/root/target/linux/bcm27xx/patches-5.15/950-0460-drm-vc4-Add-firmware-kms-mode.patch
new file mode 100644
index 00000000..892fd768
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0460-drm-vc4-Add-firmware-kms-mode.patch
@@ -0,0 +1,2498 @@
+From e516a44da9eb6c844eeaf2fb6a7886e9e4a0092e Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 7 Sep 2020 17:32:27 +0100
+Subject: [PATCH 460/828] drm/vc4: Add firmware-kms mode
+
+This is a squash of all firmware-kms related patches from previous
+branches, up to and including
+"drm/vc4: Set the possible crtcs mask correctly for planes with FKMS"
+plus a couple of minor fixups for the 5.9 branch.
+Please refer to earlier branches for full history.
+
+This patch includes work by Eric Anholt, James Hughes, Phil Elwell,
+Dave Stevenson, Dom Cobley, and Jonathon Bell.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+
+drm/vc4: Fixup firmware-kms after "drm/atomic: Pass the full state to CRTC atomic enable/disable"
+
+Prototype for those calls changed, so amend fkms (which isn't
+upstream) to match.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+
+drm/vc4: Fixup fkms for API change
+
+Atomic flush and check changed API, so fix up the downstream-only
+FKMS driver.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+
+drm/vc4: Make normalize_zpos conditional on using fkms
+
+Eric's view was that there was no point in having zpos
+support on vc4 as all the planes had the same functionality.
+
+Can be later squashed into (and fixes):
+drm/vc4: Add firmware-kms mode
+
+Signed-off-by: Dom Cobley <popcornmix@gmail.com>
+
+drm/vc4: FKMS: Change of Broadcast RGB mode needs a mode change
+
+The Broadcast RGB (aka HDMI limited/full range) property is only
+notified to the firmware on mode change, so this needs to be
+signalled when set.
+
+https://github.com/raspberrypi/firmware/issues/1580
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+
+vc4/drv: Only notify firmware of display done with kms
+
+fkms driver still wants firmware display to be active
+
+Signed-off-by: Dom Cobley <popcornmix@gmail.com>
+
+ydrm/vc4: fkms: Fix margin calculations for the right/bottom edges
+
+The calculations clipped the right/bottom edge of the clipped
+range based on the left/top margins.
+
+https://github.com/raspberrypi/linux/issues/4447
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+
+drm/vc4: fkms: Use new devm_rpi_firmware_get api
+
+drm/kms: Add allow_fb_modifiers
+
+Signed-off-by: Dom Cobley <popcornmix@gmail.com>
+---
+ drivers/gpu/drm/vc4/Makefile               |    1 +
+ drivers/gpu/drm/vc4/vc4_debugfs.c          |    2 +-
+ drivers/gpu/drm/vc4/vc4_drv.c              |   29 +-
+ drivers/gpu/drm/vc4/vc4_drv.h              |    7 +
+ drivers/gpu/drm/vc4/vc4_firmware_kms.c     | 1994 ++++++++++++++++++++
+ drivers/gpu/drm/vc4/vc4_kms.c              |   35 +-
+ drivers/gpu/drm/vc4/vc_image_types.h       |  175 ++
+ include/soc/bcm2835/raspberrypi-firmware.h |    6 +
+ 8 files changed, 2235 insertions(+), 14 deletions(-)
+ create mode 100644 drivers/gpu/drm/vc4/vc4_firmware_kms.c
+ create mode 100644 drivers/gpu/drm/vc4/vc_image_types.h
+
+--- a/drivers/gpu/drm/vc4/Makefile
++++ b/drivers/gpu/drm/vc4/Makefile
+@@ -9,6 +9,7 @@ vc4-y := \
+ 	vc4_dpi.o \
+ 	vc4_dsi.o \
+ 	vc4_fence.o \
++	vc4_firmware_kms.o \
+ 	vc4_kms.o \
+ 	vc4_gem.o \
+ 	vc4_hdmi.o \
+--- a/drivers/gpu/drm/vc4/vc4_debugfs.c
++++ b/drivers/gpu/drm/vc4/vc4_debugfs.c
+@@ -27,7 +27,7 @@ vc4_debugfs_init(struct drm_minor *minor
+ 	struct vc4_dev *vc4 = to_vc4_dev(minor->dev);
+ 	struct vc4_debugfs_info_entry *entry;
+ 
+-	if (!of_device_is_compatible(vc4->hvs->pdev->dev.of_node,
++	if (vc4->hvs && !of_device_is_compatible(vc4->hvs->pdev->dev.of_node,
+ 				     "brcm,bcm2711-vc5"))
+ 		debugfs_create_bool("hvs_load_tracker", S_IRUGO | S_IWUSR,
+ 				    minor->debugfs_root, &vc4->load_tracker_enabled);
+--- a/drivers/gpu/drm/vc4/vc4_drv.c
++++ b/drivers/gpu/drm/vc4/vc4_drv.c
+@@ -226,6 +226,18 @@ const struct of_device_id vc4_dma_range_
+ 	{}
+ };
+ 
++/*
++ * we need this helper function for determining presence of fkms
++ * before it's been bound
++ */
++static bool firmware_kms(void)
++{
++	return of_device_is_available(of_find_compatible_node(NULL, NULL,
++	       "raspberrypi,rpi-firmware-kms")) ||
++	       of_device_is_available(of_find_compatible_node(NULL, NULL,
++	       "raspberrypi,rpi-firmware-kms-2711"));
++}
++
+ static int vc4_drm_bind(struct device *dev)
+ {
+ 	struct platform_device *pdev = to_platform_device(dev);
+@@ -289,7 +301,7 @@ static int vc4_drm_bind(struct device *d
+ 	if (ret)
+ 		return ret;
+ 
+-	if (firmware) {
++	if (firmware && !firmware_kms()) {
+ 		ret = rpi_firmware_property(firmware,
+ 					    RPI_FIRMWARE_NOTIFY_DISPLAY_DONE,
+ 					    NULL, 0);
+@@ -303,16 +315,20 @@ static int vc4_drm_bind(struct device *d
+ 	if (ret)
+ 		return ret;
+ 
+-	ret = vc4_plane_create_additional_planes(drm);
+-	if (ret)
+-		goto unbind_all;
++	if (!vc4->firmware_kms) {
++		ret = vc4_plane_create_additional_planes(drm);
++		if (ret)
++			goto unbind_all;
++	}
+ 
+ 	ret = vc4_kms_load(drm);
+ 	if (ret < 0)
+ 		goto unbind_all;
+ 
+-	drm_for_each_crtc(crtc, drm)
+-		vc4_crtc_disable_at_boot(crtc);
++	if (!vc4->firmware_kms) {
++		drm_for_each_crtc(crtc, drm)
++			vc4_crtc_disable_at_boot(crtc);
++	}
+ 
+ 	ret = drm_dev_register(drm, 0);
+ 	if (ret < 0)
+@@ -359,6 +375,7 @@ static struct platform_driver *const com
+ 	&vc4_dsi_driver,
+ 	&vc4_txp_driver,
+ 	&vc4_crtc_driver,
++	&vc4_firmware_kms_driver,
+ 	&vc4_v3d_driver,
+ };
+ 
+--- a/drivers/gpu/drm/vc4/vc4_drv.h
++++ b/drivers/gpu/drm/vc4/vc4_drv.h
+@@ -76,11 +76,15 @@ struct vc4_dev {
+ 
+ 	unsigned int irq;
+ 
++	bool firmware_kms;
++	struct rpi_firmware *firmware;
++
+ 	struct vc4_hvs *hvs;
+ 	struct vc4_v3d *v3d;
+ 	struct vc4_dpi *dpi;
+ 	struct vc4_vec *vec;
+ 	struct vc4_txp *txp;
++	struct vc4_fkms *fkms;
+ 
+ 	struct vc4_hang_state *hang_state;
+ 
+@@ -896,6 +900,9 @@ extern struct platform_driver vc4_dsi_dr
+ /* vc4_fence.c */
+ extern const struct dma_fence_ops vc4_fence_ops;
+ 
++/* vc4_firmware_kms.c */
++extern struct platform_driver vc4_firmware_kms_driver;
++
+ /* vc4_gem.c */
+ int vc4_gem_init(struct drm_device *dev);
+ int vc4_submit_cl_ioctl(struct drm_device *dev, void *data,
+--- /dev/null
++++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
+@@ -0,0 +1,1994 @@
++// SPDX-License-Identifier: GPL-2.0-only
++/*
++ * Copyright (C) 2016 Broadcom
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++/**
++ * DOC: VC4 firmware KMS module.
++ *
++ * As a hack to get us from the current closed source driver world
++ * toward a totally open stack, implement KMS on top of the Raspberry
++ * Pi's firmware display stack.
++ */
++
++#include <drm/drm_atomic_helper.h>
++#include <drm/drm_crtc_helper.h>
++#include <drm/drm_drv.h>
++#include <drm/drm_fb_cma_helper.h>
++#include <drm/drm_fourcc.h>
++#include <drm/drm_gem_atomic_helper.h>
++#include <drm/drm_plane_helper.h>
++#include <drm/drm_probe_helper.h>
++#include <drm/drm_vblank.h>
++
++#include <linux/component.h>
++#include <linux/clk.h>
++#include <linux/debugfs.h>
++#include <linux/module.h>
++
++#include <soc/bcm2835/raspberrypi-firmware.h>
++
++#include "vc4_drv.h"
++#include "vc4_regs.h"
++#include "vc_image_types.h"
++
++int fkms_max_refresh_rate = 85;
++module_param(fkms_max_refresh_rate, int, 0644);
++MODULE_PARM_DESC(fkms_max_refresh_rate, "Max supported refresh rate");
++
++struct get_display_cfg {
++	u32  max_pixel_clock[2];  //Max pixel clock for each display
++};
++
++struct vc4_fkms {
++	struct get_display_cfg cfg;
++	bool bcm2711;
++};
++
++#define PLANES_PER_CRTC		8
++
++struct set_plane {
++	u8 display;
++	u8 plane_id;
++	u8 vc_image_type;
++	s8 layer;
++
++	u16 width;
++	u16 height;
++
++	u16 pitch;
++	u16 vpitch;
++
++	u32 src_x;	/* 16p16 */
++	u32 src_y;	/* 16p16 */
++
++	u32 src_w;	/* 16p16 */
++	u32 src_h;	/* 16p16 */
++
++	s16 dst_x;
++	s16 dst_y;
++
++	u16 dst_w;
++	u16 dst_h;
++
++	u8 alpha;
++	u8 num_planes;
++	u8 is_vu;
++	u8 color_encoding;
++
++	u32 planes[4];  /* DMA address of each plane */
++
++	u32 transform;
++};
++
++/* Values for the transform field */
++#define TRANSFORM_NO_ROTATE	0
++#define TRANSFORM_ROTATE_180	BIT(1)
++#define TRANSFORM_FLIP_HRIZ	BIT(16)
++#define TRANSFORM_FLIP_VERT	BIT(17)
++
++struct mailbox_set_plane {
++	struct rpi_firmware_property_tag_header tag;
++	struct set_plane plane;
++};
++
++struct mailbox_blank_display {
++	struct rpi_firmware_property_tag_header tag1;
++	u32 display;
++	struct rpi_firmware_property_tag_header tag2;
++	u32 blank;
++};
++
++struct mailbox_display_pwr {
++	struct rpi_firmware_property_tag_header tag1;
++	u32 display;
++	u32 state;
++};
++
++struct mailbox_get_edid {
++	struct rpi_firmware_property_tag_header tag1;
++	u32 block;
++	u32 display_number;
++	u8 edid[128];
++};
++
++struct set_timings {
++	u8 display;
++	u8 padding;
++	u16 video_id_code;
++
++	u32 clock;		/* in kHz */
++
++	u16 hdisplay;
++	u16 hsync_start;
++
++	u16 hsync_end;
++	u16 htotal;
++
++	u16 hskew;
++	u16 vdisplay;
++
++	u16 vsync_start;
++	u16 vsync_end;
++
++	u16 vtotal;
++	u16 vscan;
++
++	u16 vrefresh;
++	u16 padding2;
++
++	u32 flags;
++#define  TIMINGS_FLAGS_H_SYNC_POS	BIT(0)
++#define  TIMINGS_FLAGS_H_SYNC_NEG	0
++#define  TIMINGS_FLAGS_V_SYNC_POS	BIT(1)
++#define  TIMINGS_FLAGS_V_SYNC_NEG	0
++#define  TIMINGS_FLAGS_INTERLACE	BIT(2)
++
++#define TIMINGS_FLAGS_ASPECT_MASK	GENMASK(7, 4)
++#define TIMINGS_FLAGS_ASPECT_NONE	(0 << 4)
++#define TIMINGS_FLAGS_ASPECT_4_3	(1 << 4)
++#define TIMINGS_FLAGS_ASPECT_16_9	(2 << 4)
++#define TIMINGS_FLAGS_ASPECT_64_27	(3 << 4)
++#define TIMINGS_FLAGS_ASPECT_256_135	(4 << 4)
++
++/* Limited range RGB flag. Not set corresponds to full range. */
++#define TIMINGS_FLAGS_RGB_LIMITED	BIT(8)
++/* DVI monitor, therefore disable infoframes. Not set corresponds to HDMI. */
++#define TIMINGS_FLAGS_DVI		BIT(9)
++/* Double clock */
++#define TIMINGS_FLAGS_DBL_CLK		BIT(10)
++};
++
++struct mailbox_set_mode {
++	struct rpi_firmware_property_tag_header tag1;
++	struct set_timings timings;
++};
++
++static const struct vc_image_format {
++	u32 drm;	/* DRM_FORMAT_* */
++	u32 vc_image;	/* VC_IMAGE_* */
++	u32 is_vu;
++} vc_image_formats[] = {
++	{
++		.drm = DRM_FORMAT_XRGB8888,
++		.vc_image = VC_IMAGE_XRGB8888,
++	},
++	{
++		.drm = DRM_FORMAT_ARGB8888,
++		.vc_image = VC_IMAGE_ARGB8888,
++	},
++/*
++ *	FIXME: Need to resolve which DRM format goes to which vc_image format
++ *	for the remaining RGBA and RGBX formats.
++ *	{
++ *		.drm = DRM_FORMAT_ABGR8888,
++ *		.vc_image = VC_IMAGE_RGBA8888,
++ *	},
++ *	{
++ *		.drm = DRM_FORMAT_XBGR8888,
++ *		.vc_image = VC_IMAGE_RGBA8888,
++ *	},
++ */
++	{
++		.drm = DRM_FORMAT_RGB565,
++		.vc_image = VC_IMAGE_RGB565,
++	},
++	{
++		.drm = DRM_FORMAT_RGB888,
++		.vc_image = VC_IMAGE_BGR888,
++	},
++	{
++		.drm = DRM_FORMAT_BGR888,
++		.vc_image = VC_IMAGE_RGB888,
++	},
++	{
++		.drm = DRM_FORMAT_YUV422,
++		.vc_image = VC_IMAGE_YUV422PLANAR,
++	},
++	{
++		.drm = DRM_FORMAT_YUV420,
++		.vc_image = VC_IMAGE_YUV420,
++	},
++	{
++		.drm = DRM_FORMAT_YVU420,
++		.vc_image = VC_IMAGE_YUV420,
++		.is_vu = 1,
++	},
++	{
++		.drm = DRM_FORMAT_NV12,
++		.vc_image = VC_IMAGE_YUV420SP,
++	},
++	{
++		.drm = DRM_FORMAT_NV21,
++		.vc_image = VC_IMAGE_YUV420SP,
++		.is_vu = 1,
++	},
++	{
++		.drm = DRM_FORMAT_P030,
++		.vc_image = VC_IMAGE_YUV10COL,
++	},
++};
++
++static const struct vc_image_format *vc4_get_vc_image_fmt(u32 drm_format)
++{
++	unsigned int i;
++
++	for (i = 0; i < ARRAY_SIZE(vc_image_formats); i++) {
++		if (vc_image_formats[i].drm == drm_format)
++			return &vc_image_formats[i];
++	}
++
++	return NULL;
++}
++
++/* The firmware delivers a vblank interrupt to us through the SMI
++ * hardware, which has only this one register.
++ */
++#define SMICS 0x0
++#define SMIDSW0 0x14
++#define SMIDSW1 0x1C
++#define SMICS_INTERRUPTS (BIT(9) | BIT(10) | BIT(11))
++
++/* Flag to denote that the firmware is giving multiple display callbacks */
++#define SMI_NEW 0xabcd0000
++
++#define vc4_crtc vc4_kms_crtc
++#define to_vc4_crtc to_vc4_kms_crtc
++struct vc4_crtc {
++	struct drm_crtc base;
++	struct drm_encoder *encoder;
++	struct drm_connector *connector;
++	void __iomem *regs;
++
++	struct drm_pending_vblank_event *event;
++	bool vblank_enabled;
++	u32 display_number;
++	u32 display_type;
++};
++
++static inline struct vc4_crtc *to_vc4_crtc(struct drm_crtc *crtc)
++{
++	return container_of(crtc, struct vc4_crtc, base);
++}
++
++struct vc4_fkms_encoder {
++	struct drm_encoder base;
++	bool hdmi_monitor;
++	bool rgb_range_selectable;
++	int display_num;
++};
++
++static inline struct vc4_fkms_encoder *
++to_vc4_fkms_encoder(struct drm_encoder *encoder)
++{
++	return container_of(encoder, struct vc4_fkms_encoder, base);
++}
++
++/* "Broadcast RGB" property.
++ * Allows overriding of HDMI full or limited range RGB
++ */
++#define VC4_BROADCAST_RGB_AUTO 0
++#define VC4_BROADCAST_RGB_FULL 1
++#define VC4_BROADCAST_RGB_LIMITED 2
++
++/* VC4 FKMS connector KMS struct */
++struct vc4_fkms_connector {
++	struct drm_connector base;
++
++	/* Since the connector is attached to just the one encoder,
++	 * this is the reference to it so we can do the best_encoder()
++	 * hook.
++	 */
++	struct drm_encoder *encoder;
++	struct vc4_dev *vc4_dev;
++	u32 display_number;
++	u32 display_type;
++
++	struct drm_property *broadcast_rgb_property;
++};
++
++static inline struct vc4_fkms_connector *
++to_vc4_fkms_connector(struct drm_connector *connector)
++{
++	return container_of(connector, struct vc4_fkms_connector, base);
++}
++
++/* VC4 FKMS connector state */
++struct vc4_fkms_connector_state {
++	struct drm_connector_state base;
++
++	int broadcast_rgb;
++};
++
++#define to_vc4_fkms_connector_state(x) \
++			container_of(x, struct vc4_fkms_connector_state, base)
++
++static u32 vc4_get_display_type(u32 display_number)
++{
++	const u32 display_types[] = {
++		/* The firmware display (DispmanX) IDs map to specific types in
++		 * a fixed manner.
++		 */
++		DRM_MODE_ENCODER_DSI,	/* MAIN_LCD - DSI or DPI */
++		DRM_MODE_ENCODER_DSI,	/* AUX_LCD */
++		DRM_MODE_ENCODER_TMDS,	/* HDMI0 */
++		DRM_MODE_ENCODER_TVDAC,	/* VEC */
++		DRM_MODE_ENCODER_NONE,	/* FORCE_LCD */
++		DRM_MODE_ENCODER_NONE,	/* FORCE_TV */
++		DRM_MODE_ENCODER_NONE,	/* FORCE_OTHER */
++		DRM_MODE_ENCODER_TMDS,	/* HDMI1 */
++		DRM_MODE_ENCODER_NONE,	/* FORCE_TV2 */
++	};
++	return display_number > ARRAY_SIZE(display_types) - 1 ?
++			DRM_MODE_ENCODER_NONE : display_types[display_number];
++}
++
++/* Firmware's structure for making an FB mbox call. */
++struct fbinfo_s {
++	u32 xres, yres, xres_virtual, yres_virtual;
++	u32 pitch, bpp;
++	u32 xoffset, yoffset;
++	u32 base;
++	u32 screen_size;
++	u16 cmap[256];
++};
++
++struct vc4_fkms_plane {
++	struct drm_plane base;
++	struct fbinfo_s *fbinfo;
++	dma_addr_t fbinfo_bus_addr;
++	u32 pitch;
++	struct mailbox_set_plane mb;
++};
++
++static inline struct vc4_fkms_plane *to_vc4_fkms_plane(struct drm_plane *plane)
++{
++	return (struct vc4_fkms_plane *)plane;
++}
++
++static int vc4_plane_set_blank(struct drm_plane *plane, bool blank)
++{
++	struct vc4_dev *vc4 = to_vc4_dev(plane->dev);
++	struct vc4_fkms_plane *vc4_plane = to_vc4_fkms_plane(plane);
++	struct mailbox_set_plane blank_mb = {
++		.tag = { RPI_FIRMWARE_SET_PLANE, sizeof(struct set_plane), 0 },
++		.plane = {
++			.display = vc4_plane->mb.plane.display,
++			.plane_id = vc4_plane->mb.plane.plane_id,
++		}
++	};
++	static const char * const plane_types[] = {
++							"overlay",
++							"primary",
++							"cursor"
++						  };
++	int ret;
++
++	DRM_DEBUG_ATOMIC("[PLANE:%d:%s] %s plane %s",
++			 plane->base.id, plane->name, plane_types[plane->type],
++			 blank ? "blank" : "unblank");
++
++	if (blank)
++		ret = rpi_firmware_property_list(vc4->firmware, &blank_mb,
++						 sizeof(blank_mb));
++	else
++		ret = rpi_firmware_property_list(vc4->firmware, &vc4_plane->mb,
++						 sizeof(vc4_plane->mb));
++
++	WARN_ONCE(ret, "%s: firmware call failed. Please update your firmware",
++		  __func__);
++	return ret;
++}
++
++static void vc4_fkms_crtc_get_margins(struct drm_crtc_state *state,
++				      unsigned int *left, unsigned int *right,
++				      unsigned int *top, unsigned int *bottom)
++{
++	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(state);
++	struct drm_connector_state *conn_state;
++	struct drm_connector *conn;
++	int i;
++
++	*left = vc4_state->margins.left;
++	*right = vc4_state->margins.right;
++	*top = vc4_state->margins.top;
++	*bottom = vc4_state->margins.bottom;
++
++	/* We have to interate over all new connector states because
++	 * vc4_fkms_crtc_get_margins() might be called before
++	 * vc4_fkms_crtc_atomic_check() which means margins info in
++	 * vc4_crtc_state might be outdated.
++	 */
++	for_each_new_connector_in_state(state->state, conn, conn_state, i) {
++		if (conn_state->crtc != state->crtc)
++			continue;
++
++		*left = conn_state->tv.margins.left;
++		*right = conn_state->tv.margins.right;
++		*top = conn_state->tv.margins.top;
++		*bottom = conn_state->tv.margins.bottom;
++		break;
++	}
++}
++
++static int vc4_fkms_margins_adj(struct drm_plane_state *pstate,
++				struct set_plane *plane)
++{
++	unsigned int left, right, top, bottom;
++	int adjhdisplay, adjvdisplay;
++	struct drm_crtc_state *crtc_state;
++
++	crtc_state = drm_atomic_get_new_crtc_state(pstate->state,
++						   pstate->crtc);
++
++	vc4_fkms_crtc_get_margins(crtc_state, &left, &right, &top, &bottom);
++
++	if (!left && !right && !top && !bottom)
++		return 0;
++
++	if (left + right >= crtc_state->mode.hdisplay ||
++	    top + bottom >= crtc_state->mode.vdisplay)
++		return -EINVAL;
++
++	adjhdisplay = crtc_state->mode.hdisplay - (left + right);
++	plane->dst_x = DIV_ROUND_CLOSEST(plane->dst_x * adjhdisplay,
++					 (int)crtc_state->mode.hdisplay);
++	plane->dst_x += left;
++	if (plane->dst_x > (int)(crtc_state->mode.hdisplay - right))
++		plane->dst_x = crtc_state->mode.hdisplay - right;
++
++	adjvdisplay = crtc_state->mode.vdisplay - (top + bottom);
++	plane->dst_y = DIV_ROUND_CLOSEST(plane->dst_y * adjvdisplay,
++					 (int)crtc_state->mode.vdisplay);
++	plane->dst_y += top;
++	if (plane->dst_y > (int)(crtc_state->mode.vdisplay - bottom))
++		plane->dst_y = crtc_state->mode.vdisplay - bottom;
++
++	plane->dst_w = DIV_ROUND_CLOSEST(plane->dst_w * adjhdisplay,
++					 crtc_state->mode.hdisplay);
++	plane->dst_h = DIV_ROUND_CLOSEST(plane->dst_h * adjvdisplay,
++					 crtc_state->mode.vdisplay);
++
++	if (!plane->dst_w || !plane->dst_h)
++		return -EINVAL;
++
++	return 0;
++}
++
++static void vc4_plane_atomic_update(struct drm_plane *plane,
++				    struct drm_atomic_state *old_state)
++{
++	struct drm_plane_state *state = plane->state;
++
++	/*
++	 * Do NOT set now, as we haven't checked if the crtc is active or not.
++	 * Set from vc4_plane_set_blank instead.
++	 *
++	 * If the CRTC is on (or going to be on) and we're enabled,
++	 * then unblank.  Otherwise, stay blank until CRTC enable.
++	 */
++	if (state->crtc->state->active)
++		vc4_plane_set_blank(plane, false);
++}
++
++static void vc4_plane_atomic_disable(struct drm_plane *plane,
++				     struct drm_atomic_state *old_state)
++{
++	struct drm_plane_state *state = plane->state;
++	struct vc4_fkms_plane *vc4_plane = to_vc4_fkms_plane(plane);
++
++	DRM_DEBUG_ATOMIC("[PLANE:%d:%s] plane disable %dx%d@%d +%d,%d\n",
++			 plane->base.id, plane->name,
++			 state->crtc_w,
++			 state->crtc_h,
++			 vc4_plane->mb.plane.vc_image_type,
++			 state->crtc_x,
++			 state->crtc_y);
++	vc4_plane_set_blank(plane, true);
++}
++
++static bool plane_enabled(struct drm_plane_state *state)
++{
++	return state->fb && state->crtc;
++}
++
++static int vc4_plane_to_mb(struct drm_plane *plane,
++			   struct mailbox_set_plane *mb,
++			   struct drm_plane_state *state)
++{
++	struct drm_framebuffer *fb = state->fb;
++	struct drm_gem_cma_object *bo = drm_fb_cma_get_gem_obj(fb, 0);
++	const struct drm_format_info *drm_fmt = fb->format;
++	const struct vc_image_format *vc_fmt =
++					vc4_get_vc_image_fmt(drm_fmt->format);
++	int num_planes = fb->format->num_planes;
++	unsigned int rotation;
++
++	mb->plane.vc_image_type = vc_fmt->vc_image;
++	mb->plane.width = fb->width;
++	mb->plane.height = fb->height;
++	mb->plane.pitch = fb->pitches[0];
++	mb->plane.src_w = state->src_w;
++	mb->plane.src_h = state->src_h;
++	mb->plane.src_x = state->src_x;
++	mb->plane.src_y = state->src_y;
++	mb->plane.dst_w = state->crtc_w;
++	mb->plane.dst_h = state->crtc_h;
++	mb->plane.dst_x = state->crtc_x;
++	mb->plane.dst_y = state->crtc_y;
++	mb->plane.alpha = state->alpha >> 8;
++	mb->plane.layer = state->normalized_zpos ?
++					state->normalized_zpos : -127;
++	mb->plane.num_planes = num_planes;
++	mb->plane.is_vu = vc_fmt->is_vu;
++	mb->plane.planes[0] = bo->paddr + fb->offsets[0];
++
++	rotation = drm_rotation_simplify(state->rotation,
++					 DRM_MODE_ROTATE_0 |
++					 DRM_MODE_REFLECT_X |
++					 DRM_MODE_REFLECT_Y);
++
++	mb->plane.transform = TRANSFORM_NO_ROTATE;
++	if (rotation & DRM_MODE_REFLECT_X)
++		mb->plane.transform |= TRANSFORM_FLIP_HRIZ;
++	if (rotation & DRM_MODE_REFLECT_Y)
++		mb->plane.transform |= TRANSFORM_FLIP_VERT;
++
++	vc4_fkms_margins_adj(state, &mb->plane);
++
++	if (num_planes > 1) {
++		/* Assume this must be YUV */
++		/* Makes assumptions on the stride for the chroma planes as we
++		 * can't easily plumb in non-standard pitches.
++		 */
++		mb->plane.planes[1] = bo->paddr + fb->offsets[1];
++		if (num_planes > 2)
++			mb->plane.planes[2] = bo->paddr + fb->offsets[2];
++		else
++			mb->plane.planes[2] = 0;
++
++		/* Special case the YUV420 with U and V as line interleaved
++		 * planes as we have special handling for that case.
++		 */
++		if (num_planes == 3 &&
++		    (fb->offsets[2] - fb->offsets[1]) == fb->pitches[1])
++			mb->plane.vc_image_type = VC_IMAGE_YUV420_S;
++
++		switch (state->color_encoding) {
++		default:
++		case DRM_COLOR_YCBCR_BT601:
++			if (state->color_range == DRM_COLOR_YCBCR_LIMITED_RANGE)
++				mb->plane.color_encoding =
++						VC_IMAGE_YUVINFO_CSC_ITUR_BT601;
++			else
++				mb->plane.color_encoding =
++						VC_IMAGE_YUVINFO_CSC_JPEG_JFIF;
++			break;
++		case DRM_COLOR_YCBCR_BT709:
++			/* Currently no support for a full range BT709 */
++			mb->plane.color_encoding =
++						VC_IMAGE_YUVINFO_CSC_ITUR_BT709;
++			break;
++		case DRM_COLOR_YCBCR_BT2020:
++			/* Currently no support for a full range BT2020 */
++			mb->plane.color_encoding =
++					VC_IMAGE_YUVINFO_CSC_REC_2020;
++			break;
++		}
++	} else {
++		mb->plane.planes[1] = 0;
++		mb->plane.planes[2] = 0;
++	}
++	mb->plane.planes[3] = 0;
++
++	switch (fourcc_mod_broadcom_mod(fb->modifier)) {
++	case DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED:
++		switch (mb->plane.vc_image_type) {
++		case VC_IMAGE_XRGB8888:
++			mb->plane.vc_image_type = VC_IMAGE_TF_RGBX32;
++			break;
++		case VC_IMAGE_ARGB8888:
++			mb->plane.vc_image_type = VC_IMAGE_TF_RGBA32;
++			break;
++		case VC_IMAGE_RGB565:
++			mb->plane.vc_image_type = VC_IMAGE_TF_RGB565;
++			break;
++		}
++		break;
++	case DRM_FORMAT_MOD_BROADCOM_SAND128:
++		switch (mb->plane.vc_image_type) {
++		case VC_IMAGE_YUV420SP:
++			mb->plane.vc_image_type = VC_IMAGE_YUV_UV;
++			break;
++		/* VC_IMAGE_YUV10COL could be included in here, but it is only
++		 * valid as a SAND128 format, so the table at the top will have
++		 * already set the correct format.
++		 */
++		}
++		/* Note that the column pitch is passed across in lines, not
++		 * bytes.
++		 */
++		mb->plane.pitch = fourcc_mod_broadcom_param(fb->modifier);
++		break;
++	}
++
++	DRM_DEBUG_ATOMIC("[PLANE:%d:%s] plane update %dx%d@%d +dst(%d,%d, %d,%d) +src(%d,%d, %d,%d) 0x%08x/%08x/%08x/%d, alpha %u zpos %u\n",
++			 plane->base.id, plane->name,
++			 mb->plane.width,
++			 mb->plane.height,
++			 mb->plane.vc_image_type,
++			 state->crtc_x,
++			 state->crtc_y,
++			 state->crtc_w,
++			 state->crtc_h,
++			 mb->plane.src_x,
++			 mb->plane.src_y,
++			 mb->plane.src_w,
++			 mb->plane.src_h,
++			 mb->plane.planes[0],
++			 mb->plane.planes[1],
++			 mb->plane.planes[2],
++			 fb->pitches[0],
++			 state->alpha,
++			 state->normalized_zpos);
++
++	return 0;
++}
++
++static int vc4_plane_atomic_check(struct drm_plane *plane,
++				  struct drm_atomic_state *state)
++{
++	struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
++										 plane);
++	struct vc4_fkms_plane *vc4_plane = to_vc4_fkms_plane(plane);
++
++	if (!plane_enabled(new_plane_state))
++		return 0;
++
++	return vc4_plane_to_mb(plane, &vc4_plane->mb, new_plane_state);
++}
++
++/* Called during init to allocate the plane's atomic state. */
++static void vc4_plane_reset(struct drm_plane *plane)
++{
++	struct vc4_plane_state *vc4_state;
++
++	WARN_ON(plane->state);
++
++	vc4_state = kzalloc(sizeof(*vc4_state), GFP_KERNEL);
++	if (!vc4_state)
++		return;
++
++	__drm_atomic_helper_plane_reset(plane, &vc4_state->base);
++}
++
++static void vc4_plane_destroy(struct drm_plane *plane)
++{
++	drm_plane_cleanup(plane);
++}
++
++static bool vc4_fkms_format_mod_supported(struct drm_plane *plane,
++					  uint32_t format,
++					  uint64_t modifier)
++{
++	/* Support T_TILING for RGB formats only. */
++	switch (format) {
++	case DRM_FORMAT_XRGB8888:
++	case DRM_FORMAT_ARGB8888:
++	case DRM_FORMAT_RGB565:
++		switch (modifier) {
++		case DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED:
++		case DRM_FORMAT_MOD_LINEAR:
++			return true;
++		default:
++			return false;
++		}
++	case DRM_FORMAT_NV12:
++		switch (fourcc_mod_broadcom_mod(modifier)) {
++		case DRM_FORMAT_MOD_LINEAR:
++		case DRM_FORMAT_MOD_BROADCOM_SAND128:
++			return true;
++		default:
++			return false;
++		}
++	case DRM_FORMAT_P030:
++		switch (fourcc_mod_broadcom_mod(modifier)) {
++		case DRM_FORMAT_MOD_BROADCOM_SAND128:
++			return true;
++		default:
++			return false;
++		}
++	case DRM_FORMAT_NV21:
++	case DRM_FORMAT_RGB888:
++	case DRM_FORMAT_BGR888:
++	case DRM_FORMAT_YUV422:
++	case DRM_FORMAT_YUV420:
++	case DRM_FORMAT_YVU420:
++	default:
++		return (modifier == DRM_FORMAT_MOD_LINEAR);
++	}
++}
++
++static struct drm_plane_state *vc4_plane_duplicate_state(struct drm_plane *plane)
++{
++	struct vc4_plane_state *vc4_state;
++
++	if (WARN_ON(!plane->state))
++		return NULL;
++
++	vc4_state = kzalloc(sizeof(*vc4_state), GFP_KERNEL);
++	if (!vc4_state)
++		return NULL;
++
++	__drm_atomic_helper_plane_duplicate_state(plane, &vc4_state->base);
++
++	return &vc4_state->base;
++}
++
++static const struct drm_plane_funcs vc4_plane_funcs = {
++	.update_plane = drm_atomic_helper_update_plane,
++	.disable_plane = drm_atomic_helper_disable_plane,
++	.destroy = vc4_plane_destroy,
++	.set_property = NULL,
++	.reset = vc4_plane_reset,
++	.atomic_duplicate_state = vc4_plane_duplicate_state,
++	.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
++	.format_mod_supported = vc4_fkms_format_mod_supported,
++};
++
++static const struct drm_plane_helper_funcs vc4_plane_helper_funcs = {
++	.prepare_fb = drm_gem_plane_helper_prepare_fb,
++	.cleanup_fb = NULL,
++	.atomic_check = vc4_plane_atomic_check,
++	.atomic_update = vc4_plane_atomic_update,
++	.atomic_disable = vc4_plane_atomic_disable,
++};
++
++static struct drm_plane *vc4_fkms_plane_init(struct drm_device *dev,
++					     enum drm_plane_type type,
++					     u8 display_num,
++					     u8 plane_id)
++{
++	struct drm_plane *plane = NULL;
++	struct vc4_fkms_plane *vc4_plane;
++	u32 formats[ARRAY_SIZE(vc_image_formats)];
++	unsigned int default_zpos = 0;
++	u32 num_formats = 0;
++	int ret = 0;
++	static const uint64_t modifiers[] = {
++		DRM_FORMAT_MOD_LINEAR,
++		/* VC4_T_TILED should come after linear, because we
++		 * would prefer to scan out linear (less bus traffic).
++		 */
++		DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED,
++		DRM_FORMAT_MOD_BROADCOM_SAND128,
++		DRM_FORMAT_MOD_INVALID,
++	};
++	int i;
++
++	vc4_plane = devm_kzalloc(dev->dev, sizeof(*vc4_plane),
++				 GFP_KERNEL);
++	if (!vc4_plane) {
++		ret = -ENOMEM;
++		goto fail;
++	}
++
++	for (i = 0; i < ARRAY_SIZE(vc_image_formats); i++)
++		formats[num_formats++] = vc_image_formats[i].drm;
++
++	plane = &vc4_plane->base;
++	ret = drm_universal_plane_init(dev, plane, 0,
++				       &vc4_plane_funcs,
++				       formats, num_formats, modifiers,
++				       type, NULL);
++
++	/* FIXME: Do we need to be checking return values from all these calls?
++	 */
++	drm_plane_helper_add(plane, &vc4_plane_helper_funcs);
++
++	drm_plane_create_alpha_property(plane);
++	drm_plane_create_rotation_property(plane, DRM_MODE_ROTATE_0,
++					   DRM_MODE_ROTATE_0 |
++					   DRM_MODE_ROTATE_180 |
++					   DRM_MODE_REFLECT_X |
++					   DRM_MODE_REFLECT_Y);
++	drm_plane_create_color_properties(plane,
++					  BIT(DRM_COLOR_YCBCR_BT601) |
++					  BIT(DRM_COLOR_YCBCR_BT709) |
++					  BIT(DRM_COLOR_YCBCR_BT2020),
++					  BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) |
++					  BIT(DRM_COLOR_YCBCR_FULL_RANGE),
++					  DRM_COLOR_YCBCR_BT709,
++					  DRM_COLOR_YCBCR_LIMITED_RANGE);
++
++	/*
++	 * Default frame buffer setup is with FB on -127, and raspistill etc
++	 * tend to drop overlays on layer 2. Cursor plane was on layer +127.
++	 *
++	 * For F-KMS the mailbox call allows for a s8.
++	 * Remap zpos 0 to -127 for the background layer, but leave all the
++	 * other layers as requested by KMS.
++	 */
++	switch (type) {
++	default:
++	case DRM_PLANE_TYPE_PRIMARY:
++		default_zpos = 0;
++		break;
++	case DRM_PLANE_TYPE_OVERLAY:
++		default_zpos = 1;
++		break;
++	case DRM_PLANE_TYPE_CURSOR:
++		default_zpos = 2;
++		break;
++	}
++	drm_plane_create_zpos_property(plane, default_zpos, 0, 127);
++
++	/* Prepare the static elements of the mailbox structure */
++	vc4_plane->mb.tag.tag = RPI_FIRMWARE_SET_PLANE;
++	vc4_plane->mb.tag.buf_size = sizeof(struct set_plane);
++	vc4_plane->mb.tag.req_resp_size = 0;
++	vc4_plane->mb.plane.display = display_num;
++	vc4_plane->mb.plane.plane_id = plane_id;
++	vc4_plane->mb.plane.layer = default_zpos ? default_zpos : -127;
++
++	return plane;
++fail:
++	if (plane)
++		vc4_plane_destroy(plane);
++
++	return ERR_PTR(ret);
++}
++
++static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc)
++{
++	struct drm_device *dev = crtc->dev;
++	struct vc4_dev *vc4 = to_vc4_dev(dev);
++	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
++	struct drm_display_mode *mode = &crtc->state->adjusted_mode;
++	struct vc4_fkms_encoder *vc4_encoder =
++					to_vc4_fkms_encoder(vc4_crtc->encoder);
++	struct mailbox_set_mode mb = {
++		.tag1 = { RPI_FIRMWARE_SET_TIMING,
++			  sizeof(struct set_timings), 0},
++	};
++	union hdmi_infoframe frame;
++	int ret;
++
++	ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, vc4_crtc->connector, mode);
++	if (ret < 0) {
++		DRM_ERROR("couldn't fill AVI infoframe\n");
++		return;
++	}
++
++	DRM_DEBUG_KMS("Setting mode for display num %u mode name %s, clk %d, h(disp %d, start %d, end %d, total %d, skew %d) v(disp %d, start %d, end %d, total %d, scan %d), vrefresh %d, par %u, flags 0x%04x\n",
++		      vc4_crtc->display_number, mode->name, mode->clock,
++		      mode->hdisplay, mode->hsync_start, mode->hsync_end,
++		      mode->htotal, mode->hskew, mode->vdisplay,
++		      mode->vsync_start, mode->vsync_end, mode->vtotal,
++		      mode->vscan, drm_mode_vrefresh(mode),
++		      mode->picture_aspect_ratio, mode->flags);
++	mb.timings.display = vc4_crtc->display_number;
++
++	mb.timings.clock = mode->clock;
++	mb.timings.hdisplay = mode->hdisplay;
++	mb.timings.hsync_start = mode->hsync_start;
++	mb.timings.hsync_end = mode->hsync_end;
++	mb.timings.htotal = mode->htotal;
++	mb.timings.hskew = mode->hskew;
++	mb.timings.vdisplay = mode->vdisplay;
++	mb.timings.vsync_start = mode->vsync_start;
++	mb.timings.vsync_end = mode->vsync_end;
++	mb.timings.vtotal = mode->vtotal;
++	mb.timings.vscan = mode->vscan;
++	mb.timings.vrefresh = drm_mode_vrefresh(mode);
++	mb.timings.flags = 0;
++	if (mode->flags & DRM_MODE_FLAG_PHSYNC)
++		mb.timings.flags |= TIMINGS_FLAGS_H_SYNC_POS;
++	if (mode->flags & DRM_MODE_FLAG_PVSYNC)
++		mb.timings.flags |= TIMINGS_FLAGS_V_SYNC_POS;
++
++	switch (frame.avi.picture_aspect) {
++	default:
++	case HDMI_PICTURE_ASPECT_NONE:
++		mb.timings.flags |= TIMINGS_FLAGS_ASPECT_NONE;
++		break;
++	case HDMI_PICTURE_ASPECT_4_3:
++		mb.timings.flags |= TIMINGS_FLAGS_ASPECT_4_3;
++		break;
++	case HDMI_PICTURE_ASPECT_16_9:
++		mb.timings.flags |= TIMINGS_FLAGS_ASPECT_16_9;
++		break;
++	case HDMI_PICTURE_ASPECT_64_27:
++		mb.timings.flags |= TIMINGS_FLAGS_ASPECT_64_27;
++		break;
++	case HDMI_PICTURE_ASPECT_256_135:
++		mb.timings.flags |= TIMINGS_FLAGS_ASPECT_256_135;
++		break;
++	}
++
++	if (mode->flags & DRM_MODE_FLAG_INTERLACE)
++		mb.timings.flags |= TIMINGS_FLAGS_INTERLACE;
++	if (mode->flags & DRM_MODE_FLAG_DBLCLK)
++		mb.timings.flags |= TIMINGS_FLAGS_DBL_CLK;
++
++	mb.timings.video_id_code = frame.avi.video_code;
++
++	if (!vc4_encoder->hdmi_monitor) {
++		mb.timings.flags |= TIMINGS_FLAGS_DVI;
++	} else {
++		struct vc4_fkms_connector_state *conn_state =
++			to_vc4_fkms_connector_state(vc4_crtc->connector->state);
++
++		if (conn_state->broadcast_rgb == VC4_BROADCAST_RGB_AUTO) {
++			/* See CEA-861-E - 5.1 Default Encoding Parameters */
++			if (drm_default_rgb_quant_range(mode) ==
++					HDMI_QUANTIZATION_RANGE_LIMITED)
++				mb.timings.flags |= TIMINGS_FLAGS_RGB_LIMITED;
++		} else {
++			if (conn_state->broadcast_rgb ==
++						VC4_BROADCAST_RGB_LIMITED)
++				mb.timings.flags |= TIMINGS_FLAGS_RGB_LIMITED;
++
++			/* If not using the default range, then do not provide
++			 * a VIC as the HDMI spec requires that we do not
++			 * signal the opposite of the defined range in the AVI
++			 * infoframe.
++			 */
++			if (!!(mb.timings.flags & TIMINGS_FLAGS_RGB_LIMITED) !=
++			    (drm_default_rgb_quant_range(mode) ==
++					HDMI_QUANTIZATION_RANGE_LIMITED))
++				mb.timings.video_id_code = 0;
++		}
++	}
++
++	/*
++	 * FIXME: To implement
++	 * switch(mode->flag & DRM_MODE_FLAG_3D_MASK) {
++	 * case DRM_MODE_FLAG_3D_NONE:
++	 * case DRM_MODE_FLAG_3D_FRAME_PACKING:
++	 * case DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE:
++	 * case DRM_MODE_FLAG_3D_LINE_ALTERNATIVE:
++	 * case DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL:
++	 * case DRM_MODE_FLAG_3D_L_DEPTH:
++	 * case DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH:
++	 * case DRM_MODE_FLAG_3D_TOP_AND_BOTTOM:
++	 * case DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF:
++	 * }
++	 */
++
++	ret = rpi_firmware_property_list(vc4->firmware, &mb, sizeof(mb));
++}
++
++static void vc4_crtc_disable(struct drm_crtc *crtc,
++			     struct drm_atomic_state *state)
++{
++	struct drm_device *dev = crtc->dev;
++	struct drm_plane *plane;
++
++	DRM_DEBUG_KMS("[CRTC:%d] vblanks off.\n",
++		      crtc->base.id);
++	drm_crtc_vblank_off(crtc);
++
++	/* Always turn the planes off on CRTC disable. In DRM, planes
++	 * are enabled/disabled through the update/disable hooks
++	 * above, and the CRTC enable/disable independently controls
++	 * whether anything scans out at all, but the firmware doesn't
++	 * give us a CRTC-level control for that.
++	 */
++
++	drm_atomic_crtc_for_each_plane(plane, crtc)
++		vc4_plane_atomic_disable(plane, state);
++
++	/*
++	 * Make sure we issue a vblank event after disabling the CRTC if
++	 * someone was waiting it.
++	 */
++	if (crtc->state->event) {
++		unsigned long flags;
++
++		spin_lock_irqsave(&dev->event_lock, flags);
++		drm_crtc_send_vblank_event(crtc, crtc->state->event);
++		crtc->state->event = NULL;
++		spin_unlock_irqrestore(&dev->event_lock, flags);
++	}
++}
++
++static void vc4_crtc_consume_event(struct drm_crtc *crtc)
++{
++	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
++	struct drm_device *dev = crtc->dev;
++	unsigned long flags;
++
++	if (!crtc->state->event)
++		return;
++
++	crtc->state->event->pipe = drm_crtc_index(crtc);
++
++	WARN_ON(drm_crtc_vblank_get(crtc) != 0);
++
++	spin_lock_irqsave(&dev->event_lock, flags);
++	vc4_crtc->event = crtc->state->event;
++	crtc->state->event = NULL;
++	spin_unlock_irqrestore(&dev->event_lock, flags);
++}
++
++static void vc4_crtc_enable(struct drm_crtc *crtc,
++			    struct drm_atomic_state *state)
++{
++	struct drm_plane *plane;
++
++	DRM_DEBUG_KMS("[CRTC:%d] vblanks on.\n",
++		      crtc->base.id);
++	drm_crtc_vblank_on(crtc);
++	vc4_crtc_consume_event(crtc);
++
++	/* Unblank the planes (if they're supposed to be displayed). */
++	drm_atomic_crtc_for_each_plane(plane, crtc)
++		if (plane->state->fb)
++			vc4_plane_set_blank(plane, plane->state->visible);
++}
++
++static enum drm_mode_status
++vc4_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
++{
++	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
++	struct drm_device *dev = crtc->dev;
++	struct vc4_dev *vc4 = to_vc4_dev(dev);
++	struct vc4_fkms *fkms = vc4->fkms;
++
++	/* Do not allow doublescan modes from user space */
++	if (mode->flags & DRM_MODE_FLAG_DBLSCAN) {
++		DRM_DEBUG_KMS("[CRTC:%d] Doublescan mode rejected.\n",
++			      crtc->base.id);
++		return MODE_NO_DBLESCAN;
++	}
++
++	/* Disable refresh rates > defined threshold (default 85Hz) as limited
++	 * gain from them
++	 */
++	if (drm_mode_vrefresh(mode) > fkms_max_refresh_rate)
++		return MODE_BAD_VVALUE;
++
++	/* Limit the pixel clock based on the HDMI clock limits from the
++	 * firmware
++	 */
++	switch (vc4_crtc->display_number) {
++	case 2:	/* HDMI0 */
++		if (fkms->cfg.max_pixel_clock[0] &&
++		    mode->clock > fkms->cfg.max_pixel_clock[0])
++			return MODE_CLOCK_HIGH;
++		break;
++	case 7:	/* HDMI1 */
++		if (fkms->cfg.max_pixel_clock[1] &&
++		    mode->clock > fkms->cfg.max_pixel_clock[1])
++			return MODE_CLOCK_HIGH;
++		break;
++	}
++
++	/* Pi4 can't generate odd horizontal timings on HDMI, so reject modes
++	 * that would set them.
++	 */
++	if (fkms->bcm2711 &&
++	    (vc4_crtc->display_number == 2 || vc4_crtc->display_number == 7) &&
++	    !(mode->flags & DRM_MODE_FLAG_DBLCLK) &&
++	    ((mode->hdisplay |				/* active */
++	      (mode->hsync_start - mode->hdisplay) |	/* front porch */
++	      (mode->hsync_end - mode->hsync_start) |	/* sync pulse */
++	      (mode->htotal - mode->hsync_end)) & 1))	/* back porch */ {
++		DRM_DEBUG_KMS("[CRTC:%d] Odd timing rejected %u %u %u %u.\n",
++			      crtc->base.id, mode->hdisplay, mode->hsync_start,
++			      mode->hsync_end, mode->htotal);
++		return MODE_H_ILLEGAL;
++	}
++
++	return MODE_OK;
++}
++
++static int vc4_crtc_atomic_check(struct drm_crtc *crtc,
++				 struct drm_atomic_state *state)
++{
++	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
++									  crtc);
++	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state);
++	struct drm_connector *conn;
++	struct drm_connector_state *conn_state;
++	int i;
++
++	DRM_DEBUG_KMS("[CRTC:%d] crtc_atomic_check.\n", crtc->base.id);
++
++	for_each_new_connector_in_state(crtc_state->state, conn, conn_state, i) {
++		if (conn_state->crtc != crtc)
++			continue;
++
++		vc4_state->margins.left = conn_state->tv.margins.left;
++		vc4_state->margins.right = conn_state->tv.margins.right;
++		vc4_state->margins.top = conn_state->tv.margins.top;
++		vc4_state->margins.bottom = conn_state->tv.margins.bottom;
++		break;
++	}
++	return 0;
++}
++
++static void vc4_crtc_atomic_flush(struct drm_crtc *crtc,
++				  struct drm_atomic_state *state)
++{
++	struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state,
++									 crtc);
++
++	DRM_DEBUG_KMS("[CRTC:%d] crtc_atomic_flush.\n",
++		      crtc->base.id);
++	if (crtc->state->active && old_state->active && crtc->state->event)
++		vc4_crtc_consume_event(crtc);
++}
++
++static void vc4_crtc_handle_page_flip(struct vc4_crtc *vc4_crtc)
++{
++	struct drm_crtc *crtc = &vc4_crtc->base;
++	struct drm_device *dev = crtc->dev;
++	unsigned long flags;
++
++	spin_lock_irqsave(&dev->event_lock, flags);
++	if (vc4_crtc->event) {
++		drm_crtc_send_vblank_event(crtc, vc4_crtc->event);
++		vc4_crtc->event = NULL;
++		drm_crtc_vblank_put(crtc);
++	}
++	spin_unlock_irqrestore(&dev->event_lock, flags);
++}
++
++static irqreturn_t vc4_crtc_irq_handler(int irq, void *data)
++{
++	struct vc4_crtc **crtc_list = data;
++	int i;
++	u32 stat = readl(crtc_list[0]->regs + SMICS);
++	irqreturn_t ret = IRQ_NONE;
++	u32 chan;
++
++	if (stat & SMICS_INTERRUPTS) {
++		writel(0, crtc_list[0]->regs + SMICS);
++
++		chan = readl(crtc_list[0]->regs + SMIDSW0);
++
++		if ((chan & 0xFFFF0000) != SMI_NEW) {
++			/* Older firmware. Treat the one interrupt as vblank/
++			 * complete for all crtcs.
++			 */
++			for (i = 0; crtc_list[i]; i++) {
++				if (crtc_list[i]->vblank_enabled)
++					drm_crtc_handle_vblank(&crtc_list[i]->base);
++				vc4_crtc_handle_page_flip(crtc_list[i]);
++			}
++		} else {
++			if (chan & 1) {
++				writel(SMI_NEW, crtc_list[0]->regs + SMIDSW0);
++				if (crtc_list[0]->vblank_enabled)
++					drm_crtc_handle_vblank(&crtc_list[0]->base);
++				vc4_crtc_handle_page_flip(crtc_list[0]);
++			}
++
++			if (crtc_list[1]) {
++				/* Check for the secondary display too */
++				chan = readl(crtc_list[0]->regs + SMIDSW1);
++
++				if (chan & 1) {
++					writel(SMI_NEW, crtc_list[0]->regs + SMIDSW1);
++
++					if (crtc_list[1]->vblank_enabled)
++						drm_crtc_handle_vblank(&crtc_list[1]->base);
++					vc4_crtc_handle_page_flip(crtc_list[1]);
++				}
++			}
++		}
++
++		ret = IRQ_HANDLED;
++	}
++
++	return ret;
++}
++
++static int vc4_fkms_page_flip(struct drm_crtc *crtc,
++			      struct drm_framebuffer *fb,
++			      struct drm_pending_vblank_event *event,
++			      uint32_t flags,
++			      struct drm_modeset_acquire_ctx *ctx)
++{
++	if (flags & DRM_MODE_PAGE_FLIP_ASYNC) {
++		DRM_ERROR("Async flips aren't allowed\n");
++		return -EINVAL;
++	}
++
++	return drm_atomic_helper_page_flip(crtc, fb, event, flags, ctx);
++}
++
++static struct drm_crtc_state *
++vc4_fkms_crtc_duplicate_state(struct drm_crtc *crtc)
++{
++	struct vc4_crtc_state *vc4_state, *old_vc4_state;
++
++	vc4_state = kzalloc(sizeof(*vc4_state), GFP_KERNEL);
++	if (!vc4_state)
++		return NULL;
++
++	old_vc4_state = to_vc4_crtc_state(crtc->state);
++	vc4_state->margins = old_vc4_state->margins;
++
++	__drm_atomic_helper_crtc_duplicate_state(crtc, &vc4_state->base);
++	return &vc4_state->base;
++}
++
++static void
++vc4_fkms_crtc_reset(struct drm_crtc *crtc)
++{
++	if (crtc->state)
++		__drm_atomic_helper_crtc_destroy_state(crtc->state);
++
++	crtc->state = kzalloc(sizeof(*crtc->state), GFP_KERNEL);
++	if (crtc->state)
++		crtc->state->crtc = crtc;
++}
++
++static int vc4_fkms_enable_vblank(struct drm_crtc *crtc)
++{
++	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
++
++	DRM_DEBUG_KMS("[CRTC:%d] enable_vblank.\n",
++		      crtc->base.id);
++	vc4_crtc->vblank_enabled = true;
++
++	return 0;
++}
++
++static void vc4_fkms_disable_vblank(struct drm_crtc *crtc)
++{
++	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
++
++	DRM_DEBUG_KMS("[CRTC:%d] disable_vblank.\n",
++		      crtc->base.id);
++	vc4_crtc->vblank_enabled = false;
++}
++
++static const struct drm_crtc_funcs vc4_crtc_funcs = {
++	.set_config = drm_atomic_helper_set_config,
++	.destroy = drm_crtc_cleanup,
++	.page_flip = vc4_fkms_page_flip,
++	.set_property = NULL,
++	.cursor_set = NULL, /* handled by drm_mode_cursor_universal */
++	.cursor_move = NULL, /* handled by drm_mode_cursor_universal */
++	.reset = vc4_fkms_crtc_reset,
++	.atomic_duplicate_state = vc4_fkms_crtc_duplicate_state,
++	.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
++	.enable_vblank = vc4_fkms_enable_vblank,
++	.disable_vblank = vc4_fkms_disable_vblank,
++};
++
++static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = {
++	.mode_set_nofb = vc4_crtc_mode_set_nofb,
++	.mode_valid = vc4_crtc_mode_valid,
++	.atomic_check = vc4_crtc_atomic_check,
++	.atomic_flush = vc4_crtc_atomic_flush,
++	.atomic_enable = vc4_crtc_enable,
++	.atomic_disable = vc4_crtc_disable,
++};
++
++static const struct of_device_id vc4_firmware_kms_dt_match[] = {
++	{ .compatible = "raspberrypi,rpi-firmware-kms" },
++	{ .compatible = "raspberrypi,rpi-firmware-kms-2711",
++	  .data = (void *)1 },
++	{}
++};
++
++static enum drm_connector_status
++vc4_fkms_connector_detect(struct drm_connector *connector, bool force)
++{
++	DRM_DEBUG_KMS("connector detect.\n");
++	return connector_status_connected;
++}
++
++/* Queries the firmware to populate a drm_mode structure for this display */
++static int vc4_fkms_get_fw_mode(struct vc4_fkms_connector *fkms_connector,
++				struct drm_display_mode *mode)
++{
++	struct vc4_dev *vc4 = fkms_connector->vc4_dev;
++	struct set_timings timings = { 0 };
++	int ret;
++
++	timings.display = fkms_connector->display_number;
++
++	ret = rpi_firmware_property(vc4->firmware,
++				    RPI_FIRMWARE_GET_DISPLAY_TIMING, &timings,
++				    sizeof(timings));
++	if (ret || !timings.clock)
++		/* No mode returned - abort */
++		return -1;
++
++	/* Equivalent to DRM_MODE macro. */
++	memset(mode, 0, sizeof(*mode));
++	strncpy(mode->name, "FIXED_MODE", sizeof(mode->name));
++	mode->status = 0;
++	mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
++	mode->clock = timings.clock;
++	mode->hdisplay = timings.hdisplay;
++	mode->hsync_start = timings.hsync_start;
++	mode->hsync_end = timings.hsync_end;
++	mode->htotal = timings.htotal;
++	mode->hskew = 0;
++	mode->vdisplay = timings.vdisplay;
++	mode->vsync_start = timings.vsync_start;
++	mode->vsync_end = timings.vsync_end;
++	mode->vtotal = timings.vtotal;
++	mode->vscan = timings.vscan;
++
++	if (timings.flags & TIMINGS_FLAGS_H_SYNC_POS)
++		mode->flags |= DRM_MODE_FLAG_PHSYNC;
++	else
++		mode->flags |= DRM_MODE_FLAG_NHSYNC;
++
++	if (timings.flags & TIMINGS_FLAGS_V_SYNC_POS)
++		mode->flags |= DRM_MODE_FLAG_PVSYNC;
++	else
++		mode->flags |= DRM_MODE_FLAG_NVSYNC;
++
++	if (timings.flags & TIMINGS_FLAGS_INTERLACE)
++		mode->flags |= DRM_MODE_FLAG_INTERLACE;
++
++	return 0;
++}
++
++static int vc4_fkms_get_edid_block(void *data, u8 *buf, unsigned int block,
++				   size_t len)
++{
++	struct vc4_fkms_connector *fkms_connector =
++					(struct vc4_fkms_connector *)data;
++	struct vc4_dev *vc4 = fkms_connector->vc4_dev;
++	struct mailbox_get_edid mb = {
++		.tag1 = { RPI_FIRMWARE_GET_EDID_BLOCK_DISPLAY,
++			  128 + 8, 0 },
++		.block = block,
++		.display_number = fkms_connector->display_number,
++	};
++	int ret = 0;
++
++	ret = rpi_firmware_property_list(vc4->firmware, &mb, sizeof(mb));
++
++	if (!ret)
++		memcpy(buf, mb.edid, len);
++
++	return ret;
++}
++
++static int vc4_fkms_connector_get_modes(struct drm_connector *connector)
++{
++	struct vc4_fkms_connector *fkms_connector =
++					to_vc4_fkms_connector(connector);
++	struct drm_encoder *encoder = fkms_connector->encoder;
++	struct vc4_fkms_encoder *vc4_encoder = to_vc4_fkms_encoder(encoder);
++	struct drm_display_mode fw_mode;
++	struct drm_display_mode *mode;
++	struct edid *edid;
++	int num_modes;
++
++	if (!vc4_fkms_get_fw_mode(fkms_connector, &fw_mode)) {
++		drm_mode_debug_printmodeline(&fw_mode);
++		mode = drm_mode_duplicate(connector->dev,
++					  &fw_mode);
++		drm_mode_probed_add(connector, mode);
++		num_modes = 1;	/* 1 mode */
++	} else {
++		edid = drm_do_get_edid(connector, vc4_fkms_get_edid_block,
++				       fkms_connector);
++
++		/* FIXME: Can we do CEC?
++		 * cec_s_phys_addr_from_edid(vc4->hdmi->cec_adap, edid);
++		 * if (!edid)
++		 *	return -ENODEV;
++		 */
++
++		vc4_encoder->hdmi_monitor = drm_detect_hdmi_monitor(edid);
++
++		drm_connector_update_edid_property(connector, edid);
++		num_modes = drm_add_edid_modes(connector, edid);
++		kfree(edid);
++	}
++
++	return num_modes;
++}
++
++/* This is the DSI panel resolution. Use this as a default should the firmware
++ * not respond to our request for the timings.
++ */
++static const struct drm_display_mode lcd_mode = {
++	DRM_MODE("800x480", DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED,
++		 25979400 / 1000,
++		 800, 800 + 1, 800 + 1 + 2, 800 + 1 + 2 + 46, 0,
++		 480, 480 + 7, 480 + 7 + 2, 480 + 7 + 2 + 21, 0,
++		 0)
++};
++
++static int vc4_fkms_lcd_connector_get_modes(struct drm_connector *connector)
++{
++	struct vc4_fkms_connector *fkms_connector =
++					to_vc4_fkms_connector(connector);
++	struct drm_display_mode *mode;
++	struct drm_display_mode fw_mode;
++
++	if (!vc4_fkms_get_fw_mode(fkms_connector, &fw_mode) && fw_mode.clock)
++		mode = drm_mode_duplicate(connector->dev,
++					  &fw_mode);
++	else
++		mode = drm_mode_duplicate(connector->dev,
++					  &lcd_mode);
++
++	if (!mode) {
++		DRM_ERROR("Failed to create a new display mode\n");
++		return -ENOMEM;
++	}
++
++	drm_mode_probed_add(connector, mode);
++
++	/* We have one mode */
++	return 1;
++}
++
++static struct drm_encoder *
++vc4_fkms_connector_best_encoder(struct drm_connector *connector)
++{
++	struct vc4_fkms_connector *fkms_connector =
++		to_vc4_fkms_connector(connector);
++	DRM_DEBUG_KMS("best_connector.\n");
++	return fkms_connector->encoder;
++}
++
++static void vc4_fkms_connector_destroy(struct drm_connector *connector)
++{
++	DRM_DEBUG_KMS("[CONNECTOR:%d] destroy.\n",
++		      connector->base.id);
++	drm_connector_unregister(connector);
++	drm_connector_cleanup(connector);
++}
++
++/**
++ * vc4_connector_duplicate_state - duplicate connector state
++ * @connector: digital connector
++ *
++ * Allocates and returns a copy of the connector state (both common and
++ * digital connector specific) for the specified connector.
++ *
++ * Returns: The newly allocated connector state, or NULL on failure.
++ */
++struct drm_connector_state *
++vc4_connector_duplicate_state(struct drm_connector *connector)
++{
++	struct vc4_fkms_connector_state *state;
++
++	state = kmemdup(connector->state, sizeof(*state), GFP_KERNEL);
++	if (!state)
++		return NULL;
++
++	__drm_atomic_helper_connector_duplicate_state(connector, &state->base);
++	return &state->base;
++}
++
++/**
++ * vc4_connector_atomic_get_property - hook for connector->atomic_get_property.
++ * @connector: Connector to get the property for.
++ * @state: Connector state to retrieve the property from.
++ * @property: Property to retrieve.
++ * @val: Return value for the property.
++ *
++ * Returns the atomic property value for a digital connector.
++ */
++int vc4_connector_atomic_get_property(struct drm_connector *connector,
++				      const struct drm_connector_state *state,
++				      struct drm_property *property,
++				      uint64_t *val)
++{
++	struct vc4_fkms_connector *fkms_connector =
++					to_vc4_fkms_connector(connector);
++	struct vc4_fkms_connector_state *vc4_conn_state =
++					to_vc4_fkms_connector_state(state);
++
++	if (property == fkms_connector->broadcast_rgb_property) {
++		*val = vc4_conn_state->broadcast_rgb;
++	} else {
++		DRM_DEBUG_ATOMIC("Unknown property [PROP:%d:%s]\n",
++				 property->base.id, property->name);
++		return -EINVAL;
++	}
++
++	return 0;
++}
++
++/**
++ * vc4_connector_atomic_set_property - hook for connector->atomic_set_property.
++ * @connector: Connector to set the property for.
++ * @state: Connector state to set the property on.
++ * @property: Property to set.
++ * @val: New value for the property.
++ *
++ * Sets the atomic property value for a digital connector.
++ */
++int vc4_connector_atomic_set_property(struct drm_connector *connector,
++				      struct drm_connector_state *state,
++				      struct drm_property *property,
++				      uint64_t val)
++{
++	struct vc4_fkms_connector *fkms_connector =
++					to_vc4_fkms_connector(connector);
++	struct vc4_fkms_connector_state *vc4_conn_state =
++					to_vc4_fkms_connector_state(state);
++
++	if (property == fkms_connector->broadcast_rgb_property) {
++		vc4_conn_state->broadcast_rgb = val;
++		return 0;
++	}
++
++	DRM_DEBUG_ATOMIC("Unknown property [PROP:%d:%s]\n",
++			 property->base.id, property->name);
++	return -EINVAL;
++}
++
++int vc4_connector_atomic_check(struct drm_connector *connector,
++			       struct drm_atomic_state *state)
++{
++	struct drm_connector_state *old_state =
++		drm_atomic_get_old_connector_state(state, connector);
++	struct vc4_fkms_connector_state *vc4_old_state =
++					to_vc4_fkms_connector_state(old_state);
++	struct drm_connector_state *new_state =
++		drm_atomic_get_new_connector_state(state, connector);
++	struct vc4_fkms_connector_state *vc4_new_state =
++					to_vc4_fkms_connector_state(new_state);
++	struct drm_crtc *crtc = new_state->crtc;
++
++	if (!crtc)
++		return 0;
++
++	if (vc4_old_state->broadcast_rgb != vc4_new_state->broadcast_rgb) {
++		struct drm_crtc_state *crtc_state;
++
++		crtc_state = drm_atomic_get_crtc_state(state, crtc);
++		if (IS_ERR(crtc_state))
++			return PTR_ERR(crtc_state);
++
++		crtc_state->mode_changed = true;
++	}
++	return 0;
++}
++
++static void vc4_hdmi_connector_reset(struct drm_connector *connector)
++{
++	drm_atomic_helper_connector_reset(connector);
++	drm_atomic_helper_connector_tv_reset(connector);
++}
++
++static const struct drm_connector_funcs vc4_fkms_connector_funcs = {
++	.detect = vc4_fkms_connector_detect,
++	.fill_modes = drm_helper_probe_single_connector_modes,
++	.destroy = vc4_fkms_connector_destroy,
++	.reset = vc4_hdmi_connector_reset,
++	.atomic_duplicate_state = vc4_connector_duplicate_state,
++	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
++	.atomic_get_property = vc4_connector_atomic_get_property,
++	.atomic_set_property = vc4_connector_atomic_set_property,
++};
++
++static const struct drm_connector_helper_funcs vc4_fkms_connector_helper_funcs = {
++	.get_modes = vc4_fkms_connector_get_modes,
++	.best_encoder = vc4_fkms_connector_best_encoder,
++	.atomic_check = vc4_connector_atomic_check,
++};
++
++static const struct drm_connector_helper_funcs vc4_fkms_lcd_conn_helper_funcs = {
++	.get_modes = vc4_fkms_lcd_connector_get_modes,
++	.best_encoder = vc4_fkms_connector_best_encoder,
++};
++
++static const struct drm_prop_enum_list broadcast_rgb_names[] = {
++	{ VC4_BROADCAST_RGB_AUTO, "Automatic" },
++	{ VC4_BROADCAST_RGB_FULL, "Full" },
++	{ VC4_BROADCAST_RGB_LIMITED, "Limited 16:235" },
++};
++
++static void
++vc4_attach_broadcast_rgb_property(struct vc4_fkms_connector *fkms_connector)
++{
++	struct drm_device *dev = fkms_connector->base.dev;
++	struct drm_property *prop;
++
++	prop = fkms_connector->broadcast_rgb_property;
++	if (!prop) {
++		prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,
++						"Broadcast RGB",
++						broadcast_rgb_names,
++						ARRAY_SIZE(broadcast_rgb_names));
++		if (!prop)
++			return;
++
++		fkms_connector->broadcast_rgb_property = prop;
++	}
++
++	drm_object_attach_property(&fkms_connector->base.base, prop, 0);
++}
++
++static struct drm_connector *
++vc4_fkms_connector_init(struct drm_device *dev, struct drm_encoder *encoder,
++			u32 display_num)
++{
++	struct drm_connector *connector = NULL;
++	struct vc4_fkms_connector *fkms_connector;
++	struct vc4_fkms_connector_state *conn_state = NULL;
++	struct vc4_dev *vc4_dev = to_vc4_dev(dev);
++	int ret = 0;
++
++	DRM_DEBUG_KMS("connector_init, display_num %u\n", display_num);
++
++	fkms_connector = devm_kzalloc(dev->dev, sizeof(*fkms_connector),
++				      GFP_KERNEL);
++	if (!fkms_connector)
++		return ERR_PTR(-ENOMEM);
++
++	/*
++	 * Allocate enough memory to hold vc4_fkms_connector_state,
++	 */
++	conn_state = kzalloc(sizeof(*conn_state), GFP_KERNEL);
++	if (!conn_state) {
++		kfree(fkms_connector);
++		return ERR_PTR(-ENOMEM);
++	}
++
++	connector = &fkms_connector->base;
++
++	fkms_connector->encoder = encoder;
++	fkms_connector->display_number = display_num;
++	fkms_connector->display_type = vc4_get_display_type(display_num);
++	fkms_connector->vc4_dev = vc4_dev;
++
++	__drm_atomic_helper_connector_reset(connector,
++					    &conn_state->base);
++
++	if (fkms_connector->display_type == DRM_MODE_ENCODER_DSI) {
++		drm_connector_init(dev, connector, &vc4_fkms_connector_funcs,
++				   DRM_MODE_CONNECTOR_DSI);
++		drm_connector_helper_add(connector,
++					 &vc4_fkms_lcd_conn_helper_funcs);
++		connector->interlace_allowed = 0;
++	} else if (fkms_connector->display_type == DRM_MODE_ENCODER_TVDAC) {
++		drm_connector_init(dev, connector, &vc4_fkms_connector_funcs,
++				   DRM_MODE_CONNECTOR_Composite);
++		drm_connector_helper_add(connector,
++					 &vc4_fkms_lcd_conn_helper_funcs);
++		connector->interlace_allowed = 1;
++	} else {
++		drm_connector_init(dev, connector, &vc4_fkms_connector_funcs,
++				   DRM_MODE_CONNECTOR_HDMIA);
++		drm_connector_helper_add(connector,
++					 &vc4_fkms_connector_helper_funcs);
++		connector->interlace_allowed = 1;
++	}
++
++	ret = drm_mode_create_tv_margin_properties(dev);
++	if (ret)
++		goto fail;
++
++	drm_connector_attach_tv_margin_properties(connector);
++
++	connector->polled = (DRM_CONNECTOR_POLL_CONNECT |
++			     DRM_CONNECTOR_POLL_DISCONNECT);
++
++	connector->doublescan_allowed = 0;
++
++	vc4_attach_broadcast_rgb_property(fkms_connector);
++
++	drm_connector_attach_encoder(connector, encoder);
++
++	return connector;
++
++ fail:
++	if (connector)
++		vc4_fkms_connector_destroy(connector);
++
++	return ERR_PTR(ret);
++}
++
++static void vc4_fkms_encoder_destroy(struct drm_encoder *encoder)
++{
++	DRM_DEBUG_KMS("Encoder_destroy\n");
++	drm_encoder_cleanup(encoder);
++}
++
++static const struct drm_encoder_funcs vc4_fkms_encoder_funcs = {
++	.destroy = vc4_fkms_encoder_destroy,
++};
++
++static void vc4_fkms_display_power(struct drm_encoder *encoder, bool power)
++{
++	struct vc4_fkms_encoder *vc4_encoder = to_vc4_fkms_encoder(encoder);
++	struct vc4_dev *vc4 = to_vc4_dev(encoder->dev);
++
++	struct mailbox_display_pwr pwr = {
++		.tag1 = {RPI_FIRMWARE_SET_DISPLAY_POWER, 8, 0, },
++		.display = vc4_encoder->display_num,
++		.state = power ? 1 : 0,
++	};
++
++	rpi_firmware_property_list(vc4->firmware, &pwr, sizeof(pwr));
++}
++
++static void vc4_fkms_encoder_enable(struct drm_encoder *encoder)
++{
++	vc4_fkms_display_power(encoder, true);
++	DRM_DEBUG_KMS("Encoder_enable\n");
++}
++
++static void vc4_fkms_encoder_disable(struct drm_encoder *encoder)
++{
++	vc4_fkms_display_power(encoder, false);
++	DRM_DEBUG_KMS("Encoder_disable\n");
++}
++
++static const struct drm_encoder_helper_funcs vc4_fkms_encoder_helper_funcs = {
++	.enable = vc4_fkms_encoder_enable,
++	.disable = vc4_fkms_encoder_disable,
++};
++
++static int vc4_fkms_create_screen(struct device *dev, struct drm_device *drm,
++				  int display_idx, int display_ref,
++				  struct vc4_crtc **ret_crtc)
++{
++	struct vc4_dev *vc4 = to_vc4_dev(drm);
++	struct vc4_crtc *vc4_crtc;
++	struct vc4_fkms_encoder *vc4_encoder;
++	struct drm_crtc *crtc;
++	struct drm_plane *destroy_plane, *temp;
++	struct mailbox_blank_display blank = {
++		.tag1 = {RPI_FIRMWARE_FRAMEBUFFER_SET_DISPLAY_NUM, 4, 0, },
++		.display = display_idx,
++		.tag2 = { RPI_FIRMWARE_FRAMEBUFFER_BLANK, 4, 0, },
++		.blank = 1,
++	};
++	struct drm_plane *planes[PLANES_PER_CRTC];
++	int ret, i;
++
++	vc4_crtc = devm_kzalloc(dev, sizeof(*vc4_crtc), GFP_KERNEL);
++	if (!vc4_crtc)
++		return -ENOMEM;
++	crtc = &vc4_crtc->base;
++
++	vc4_crtc->display_number = display_ref;
++	vc4_crtc->display_type = vc4_get_display_type(display_ref);
++
++	/* Blank the firmware provided framebuffer */
++	rpi_firmware_property_list(vc4->firmware, &blank, sizeof(blank));
++
++	for (i = 0; i < PLANES_PER_CRTC; i++) {
++		planes[i] = vc4_fkms_plane_init(drm,
++						(i == 0) ?
++						  DRM_PLANE_TYPE_PRIMARY :
++						  (i == PLANES_PER_CRTC - 1) ?
++							DRM_PLANE_TYPE_CURSOR :
++							DRM_PLANE_TYPE_OVERLAY,
++						display_ref,
++						i + (display_idx * PLANES_PER_CRTC)
++					       );
++		if (IS_ERR(planes[i])) {
++			dev_err(dev, "failed to construct plane %u\n", i);
++			ret = PTR_ERR(planes[i]);
++			goto err;
++		}
++	}
++
++	drm_crtc_init_with_planes(drm, crtc, planes[0],
++				  planes[PLANES_PER_CRTC - 1], &vc4_crtc_funcs,
++				  NULL);
++	drm_crtc_helper_add(crtc, &vc4_crtc_helper_funcs);
++
++	/* Update the possible_crtcs mask for the overlay plane(s) */
++	for (i = 1; i < (PLANES_PER_CRTC - 1); i++)
++		planes[i]->possible_crtcs = drm_crtc_mask(crtc);
++
++	vc4_encoder = devm_kzalloc(dev, sizeof(*vc4_encoder), GFP_KERNEL);
++	if (!vc4_encoder)
++		return -ENOMEM;
++	vc4_crtc->encoder = &vc4_encoder->base;
++
++	vc4_encoder->display_num = display_ref;
++	vc4_encoder->base.possible_crtcs |= drm_crtc_mask(crtc);
++
++	drm_encoder_init(drm, &vc4_encoder->base, &vc4_fkms_encoder_funcs,
++			 vc4_crtc->display_type, NULL);
++	drm_encoder_helper_add(&vc4_encoder->base,
++			       &vc4_fkms_encoder_helper_funcs);
++
++	vc4_crtc->connector = vc4_fkms_connector_init(drm, &vc4_encoder->base,
++						      display_ref);
++	if (IS_ERR(vc4_crtc->connector)) {
++		ret = PTR_ERR(vc4_crtc->connector);
++		goto err_destroy_encoder;
++	}
++
++	*ret_crtc = vc4_crtc;
++
++	return 0;
++
++err_destroy_encoder:
++	vc4_fkms_encoder_destroy(vc4_crtc->encoder);
++	list_for_each_entry_safe(destroy_plane, temp,
++				 &drm->mode_config.plane_list, head) {
++		if (destroy_plane->possible_crtcs == 1 << drm_crtc_index(crtc))
++			destroy_plane->funcs->destroy(destroy_plane);
++	}
++err:
++	return ret;
++}
++
++static int vc4_fkms_bind(struct device *dev, struct device *master, void *data)
++{
++	struct platform_device *pdev = to_platform_device(dev);
++	struct drm_device *drm = dev_get_drvdata(master);
++	struct vc4_dev *vc4 = to_vc4_dev(drm);
++	struct device_node *firmware_node;
++	const struct of_device_id *match;
++	struct vc4_crtc **crtc_list;
++	u32 num_displays, display_num;
++	struct vc4_fkms *fkms;
++	int ret;
++	u32 display_id;
++
++	vc4->firmware_kms = true;
++
++	fkms = devm_kzalloc(dev, sizeof(*fkms), GFP_KERNEL);
++	if (!fkms)
++		return -ENOMEM;
++
++	match = of_match_device(vc4_firmware_kms_dt_match, dev);
++	if (!match)
++		return -ENODEV;
++	if (match->data)
++		fkms->bcm2711 = true;
++
++	firmware_node = of_parse_phandle(dev->of_node, "brcm,firmware", 0);
++	vc4->firmware = devm_rpi_firmware_get(&pdev->dev, firmware_node);
++	if (!vc4->firmware) {
++		DRM_DEBUG("Failed to get Raspberry Pi firmware reference.\n");
++		return -EPROBE_DEFER;
++	}
++	of_node_put(firmware_node);
++
++	ret = rpi_firmware_property(vc4->firmware,
++				    RPI_FIRMWARE_FRAMEBUFFER_GET_NUM_DISPLAYS,
++				    &num_displays, sizeof(u32));
++
++	/* If we fail to get the number of displays, then
++	 * assume old firmware that doesn't have the mailbox call, so just
++	 * set one display
++	 */
++	if (ret) {
++		num_displays = 1;
++		DRM_WARN("Unable to determine number of displays - assuming 1\n");
++		ret = 0;
++	}
++
++	ret = rpi_firmware_property(vc4->firmware,
++				    RPI_FIRMWARE_GET_DISPLAY_CFG,
++				    &fkms->cfg, sizeof(fkms->cfg));
++
++	if (ret)
++		return -EINVAL;
++	/* The firmware works in Hz. This will be compared against kHz, so div
++	 * 1000 now rather than multiple times later.
++	 */
++	fkms->cfg.max_pixel_clock[0] /= 1000;
++	fkms->cfg.max_pixel_clock[1] /= 1000;
++
++	/* Allocate a list, with space for a NULL on the end */
++	crtc_list = devm_kzalloc(dev, sizeof(crtc_list) * (num_displays + 1),
++				 GFP_KERNEL);
++	if (!crtc_list)
++		return -ENOMEM;
++
++	for (display_num = 0; display_num < num_displays; display_num++) {
++		display_id = display_num;
++		ret = rpi_firmware_property(vc4->firmware,
++					    RPI_FIRMWARE_FRAMEBUFFER_GET_DISPLAY_ID,
++					    &display_id, sizeof(display_id));
++		/* FIXME: Determine the correct error handling here.
++		 * Should we fail to create the one "screen" but keep the
++		 * others, or fail the whole thing?
++		 */
++		if (ret)
++			DRM_ERROR("Failed to get display id %u\n", display_num);
++
++		ret = vc4_fkms_create_screen(dev, drm, display_num, display_id,
++					     &crtc_list[display_num]);
++		if (ret)
++			DRM_ERROR("Oh dear, failed to create display %u\n",
++				  display_num);
++	}
++
++	if (num_displays > 0) {
++		/* Map the SMI interrupt reg */
++		crtc_list[0]->regs = vc4_ioremap_regs(pdev, 0);
++		if (IS_ERR(crtc_list[0]->regs))
++			DRM_ERROR("Oh dear, failed to map registers\n");
++
++		writel(0, crtc_list[0]->regs + SMICS);
++		ret = devm_request_irq(dev, platform_get_irq(pdev, 0),
++				       vc4_crtc_irq_handler, 0,
++				       "vc4 firmware kms", crtc_list);
++		if (ret)
++			DRM_ERROR("Oh dear, failed to register IRQ\n");
++	} else {
++		DRM_WARN("No displays found. Consider forcing hotplug if HDMI is attached\n");
++	}
++
++	vc4->fkms = fkms;
++
++	platform_set_drvdata(pdev, crtc_list);
++
++	return 0;
++}
++
++static void vc4_fkms_unbind(struct device *dev, struct device *master,
++			    void *data)
++{
++	struct platform_device *pdev = to_platform_device(dev);
++	struct vc4_crtc **crtc_list = dev_get_drvdata(dev);
++	int i;
++
++	for (i = 0; crtc_list[i]; i++) {
++		vc4_fkms_connector_destroy(crtc_list[i]->connector);
++		vc4_fkms_encoder_destroy(crtc_list[i]->encoder);
++		drm_crtc_cleanup(&crtc_list[i]->base);
++	}
++
++	platform_set_drvdata(pdev, NULL);
++}
++
++static const struct component_ops vc4_fkms_ops = {
++	.bind   = vc4_fkms_bind,
++	.unbind = vc4_fkms_unbind,
++};
++
++static int vc4_fkms_probe(struct platform_device *pdev)
++{
++	return component_add(&pdev->dev, &vc4_fkms_ops);
++}
++
++static int vc4_fkms_remove(struct platform_device *pdev)
++{
++	component_del(&pdev->dev, &vc4_fkms_ops);
++	return 0;
++}
++
++struct platform_driver vc4_firmware_kms_driver = {
++	.probe = vc4_fkms_probe,
++	.remove = vc4_fkms_remove,
++	.driver = {
++		.name = "vc4_firmware_kms",
++		.of_match_table = vc4_firmware_kms_dt_match,
++	},
++};
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -160,6 +160,9 @@ vc4_ctm_commit(struct vc4_dev *vc4, stru
+ 	struct vc4_ctm_state *ctm_state = to_vc4_ctm_state(vc4->ctm_manager.state);
+ 	struct drm_color_ctm *ctm = ctm_state->ctm;
+ 
++	if (vc4->firmware_kms)
++		return;
++
+ 	if (ctm_state->fifo) {
+ 		HVS_WRITE(SCALER_OLEDCOEF2,
+ 			  VC4_SET_FIELD(vc4_ctm_s31_32_to_s0_9(ctm->matrix[0]),
+@@ -359,7 +362,7 @@ static void vc4_atomic_commit_tail(struc
+ 	for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
+ 		struct vc4_crtc_state *vc4_crtc_state;
+ 
+-		if (!new_crtc_state->commit)
++		if (!new_crtc_state->commit || vc4->firmware_kms)
+ 			continue;
+ 
+ 		vc4_crtc_state = to_vc4_crtc_state(new_crtc_state);
+@@ -385,7 +388,7 @@ static void vc4_atomic_commit_tail(struc
+ 		old_hvs_state->fifo_state[channel].pending_commit = NULL;
+ 	}
+ 
+-	if (vc4->hvs->hvs5) {
++	if (vc4->hvs && vc4->hvs->hvs5) {
+ 		unsigned long core_rate = max_t(unsigned long,
+ 						500000000,
+ 						new_hvs_state->core_clock_rate);
+@@ -402,10 +405,12 @@ static void vc4_atomic_commit_tail(struc
+ 
+ 	vc4_ctm_commit(vc4, state);
+ 
+-	if (vc4->hvs->hvs5)
+-		vc5_hvs_pv_muxing_commit(vc4, state);
+-	else
+-		vc4_hvs_pv_muxing_commit(vc4, state);
++	if (!vc4->firmware_kms) {
++		if (vc4->hvs && vc4->hvs->hvs5)
++			vc5_hvs_pv_muxing_commit(vc4, state);
++		else
++			vc4_hvs_pv_muxing_commit(vc4, state);
++	}
+ 
+ 	drm_atomic_helper_commit_planes(dev, state, 0);
+ 
+@@ -419,7 +424,7 @@ static void vc4_atomic_commit_tail(struc
+ 
+ 	drm_atomic_helper_cleanup_planes(dev, state);
+ 
+-	if (vc4->hvs->hvs5) {
++	if (vc4->hvs && vc4->hvs->hvs5) {
+ 		drm_dbg(dev, "Running the core clock at %lu Hz\n",
+ 			new_hvs_state->core_clock_rate);
+ 
+@@ -437,11 +442,21 @@ static void vc4_atomic_commit_tail(struc
+ 
+ static int vc4_atomic_commit_setup(struct drm_atomic_state *state)
+ {
++	struct drm_device *dev = state->dev;
++	struct vc4_dev *vc4 = to_vc4_dev(dev);
+ 	struct drm_crtc_state *crtc_state;
+ 	struct vc4_hvs_state *hvs_state;
+ 	struct drm_crtc *crtc;
+ 	unsigned int i;
+ 
++	/* We know for sure we don't want an async update here. Set
++	 * state->legacy_cursor_update to false to prevent
++	 * drm_atomic_helper_setup_commit() from auto-completing
++	 * commit->flip_done.
++	 */
++	if (!vc4->firmware_kms)
++		state->legacy_cursor_update = false;
++
+ 	hvs_state = vc4_hvs_get_new_global_state(state);
+ 	if (WARN_ON(IS_ERR(hvs_state)))
+ 		return PTR_ERR(hvs_state);
+@@ -775,6 +790,7 @@ static int vc4_hvs_channels_obj_init(str
+ static int vc4_pv_muxing_atomic_check(struct drm_device *dev,
+ 				      struct drm_atomic_state *state)
+ {
++	struct vc4_dev *vc4 = to_vc4_dev(state->dev);
+ 	struct vc4_hvs_state *hvs_new_state;
+ 	struct drm_crtc_state *old_crtc_state, *new_crtc_state;
+ 	struct drm_crtc *crtc;
+@@ -798,6 +814,9 @@ static int vc4_pv_muxing_atomic_check(st
+ 		unsigned int matching_channels;
+ 		unsigned int channel;
+ 
++		if (vc4->firmware_kms)
++			continue;
++
+ 		/* Nothing to do here, let's skip it */
+ 		if (old_crtc_state->enable == new_crtc_state->enable)
+ 			continue;
+@@ -995,6 +1014,8 @@ int vc4_kms_load(struct drm_device *dev)
+ 	dev->mode_config.helper_private = &vc4_mode_config_helpers;
+ 	dev->mode_config.preferred_depth = 24;
+ 	dev->mode_config.async_page_flip = true;
++	if (vc4->firmware_kms)
++		dev->mode_config.normalize_zpos = true;
+ 
+ 	ret = vc4_ctm_obj_init(vc4);
+ 	if (ret)
+--- /dev/null
++++ b/drivers/gpu/drm/vc4/vc_image_types.h
+@@ -0,0 +1,175 @@
++
++/*
++ * Copyright (c) 2012, Broadcom Europe Ltd
++ *
++ * Values taken from vc_image_types.h released by Broadcom at
++ * https://github.com/raspberrypi/userland/blob/master/interface/vctypes/vc_image_types.h
++ * and vc_image_structs.h at
++ * https://github.com/raspberrypi/userland/blob/master/interface/vctypes/vc_image_structs.h
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++enum {
++	VC_IMAGE_MIN = 0, //bounds for error checking
++
++	VC_IMAGE_RGB565 = 1,
++	VC_IMAGE_1BPP,
++	VC_IMAGE_YUV420,
++	VC_IMAGE_48BPP,
++	VC_IMAGE_RGB888,
++	VC_IMAGE_8BPP,
++	/* 4bpp palettised image */
++	VC_IMAGE_4BPP,
++	/* A separated format of 16 colour/light shorts followed by 16 z
++	 * values
++	 */
++	VC_IMAGE_3D32,
++	/* 16 colours followed by 16 z values */
++	VC_IMAGE_3D32B,
++	/* A separated format of 16 material/colour/light shorts followed by
++	 * 16 z values
++	 */
++	VC_IMAGE_3D32MAT,
++	/* 32 bit format containing 18 bits of 6.6.6 RGB, 9 bits per short */
++	VC_IMAGE_RGB2X9,
++	/* 32-bit format holding 18 bits of 6.6.6 RGB */
++	VC_IMAGE_RGB666,
++	/* 4bpp palettised image with embedded palette */
++	VC_IMAGE_PAL4_OBSOLETE,
++	/* 8bpp palettised image with embedded palette */
++	VC_IMAGE_PAL8_OBSOLETE,
++	/* RGB888 with an alpha byte after each pixel */
++	VC_IMAGE_RGBA32,
++	/* a line of Y (32-byte padded), a line of U (16-byte padded), and a
++	 * line of V (16-byte padded)
++	 */
++	VC_IMAGE_YUV422,
++	/* RGB565 with a transparent patch */
++	VC_IMAGE_RGBA565,
++	/* Compressed (4444) version of RGBA32 */
++	VC_IMAGE_RGBA16,
++	/* VCIII codec format */
++	VC_IMAGE_YUV_UV,
++	/* VCIII T-format RGBA8888 */
++	VC_IMAGE_TF_RGBA32,
++	/* VCIII T-format RGBx8888 */
++	VC_IMAGE_TF_RGBX32,
++	/* VCIII T-format float */
++	VC_IMAGE_TF_FLOAT,
++	/* VCIII T-format RGBA4444 */
++	VC_IMAGE_TF_RGBA16,
++	/* VCIII T-format RGB5551 */
++	VC_IMAGE_TF_RGBA5551,
++	/* VCIII T-format RGB565 */
++	VC_IMAGE_TF_RGB565,
++	/* VCIII T-format 8-bit luma and 8-bit alpha */
++	VC_IMAGE_TF_YA88,
++	/* VCIII T-format 8 bit generic sample */
++	VC_IMAGE_TF_BYTE,
++	/* VCIII T-format 8-bit palette */
++	VC_IMAGE_TF_PAL8,
++	/* VCIII T-format 4-bit palette */
++	VC_IMAGE_TF_PAL4,
++	/* VCIII T-format Ericsson Texture Compressed */
++	VC_IMAGE_TF_ETC1,
++	/* RGB888 with R & B swapped */
++	VC_IMAGE_BGR888,
++	/* RGB888 with R & B swapped, but with no pitch, i.e. no padding after
++	 * each row of pixels
++	 */
++	VC_IMAGE_BGR888_NP,
++	/* Bayer image, extra defines which variant is being used */
++	VC_IMAGE_BAYER,
++	/* General wrapper for codec images e.g. JPEG from camera */
++	VC_IMAGE_CODEC,
++	/* VCIII codec format */
++	VC_IMAGE_YUV_UV32,
++	/* VCIII T-format 8-bit luma */
++	VC_IMAGE_TF_Y8,
++	/* VCIII T-format 8-bit alpha */
++	VC_IMAGE_TF_A8,
++	/* VCIII T-format 16-bit generic sample */
++	VC_IMAGE_TF_SHORT,
++	/* VCIII T-format 1bpp black/white */
++	VC_IMAGE_TF_1BPP,
++	VC_IMAGE_OPENGL,
++	/* VCIII-B0 HVS YUV 4:4:4 interleaved samples */
++	VC_IMAGE_YUV444I,
++	/* Y, U, & V planes separately (VC_IMAGE_YUV422 has them interleaved on
++	 * a per line basis)
++	 */
++	VC_IMAGE_YUV422PLANAR,
++	/* 32bpp with 8bit alpha at MS byte, with R, G, B (LS byte) */
++	VC_IMAGE_ARGB8888,
++	/* 32bpp with 8bit unused at MS byte, with R, G, B (LS byte) */
++	VC_IMAGE_XRGB8888,
++
++	/* interleaved 8 bit samples of Y, U, Y, V (4 flavours) */
++	VC_IMAGE_YUV422YUYV,
++	VC_IMAGE_YUV422YVYU,
++	VC_IMAGE_YUV422UYVY,
++	VC_IMAGE_YUV422VYUY,
++
++	/* 32bpp like RGBA32 but with unused alpha */
++	VC_IMAGE_RGBX32,
++	/* 32bpp, corresponding to RGBA with unused alpha */
++	VC_IMAGE_RGBX8888,
++	/* 32bpp, corresponding to BGRA with unused alpha */
++	VC_IMAGE_BGRX8888,
++
++	/* Y as a plane, then UV byte interleaved in plane with same pitch,
++	 * half height
++	 */
++	VC_IMAGE_YUV420SP,
++
++	/* Y, U, & V planes separately 4:4:4 */
++	VC_IMAGE_YUV444PLANAR,
++
++	/* T-format 8-bit U - same as TF_Y8 buf from U plane */
++	VC_IMAGE_TF_U8,
++	/* T-format 8-bit U - same as TF_Y8 buf from V plane */
++	VC_IMAGE_TF_V8,
++
++	/* YUV4:2:0 planar, 16bit values */
++	VC_IMAGE_YUV420_16,
++	/* YUV4:2:0 codec format, 16bit values */
++	VC_IMAGE_YUV_UV_16,
++	/* YUV4:2:0 with U,V in side-by-side format */
++	VC_IMAGE_YUV420_S,
++	/* 10-bit YUV 420 column image format */
++	VC_IMAGE_YUV10COL,
++	/* 32-bpp, 10-bit R/G/B, 2-bit Alpha */
++	VC_IMAGE_RGBA1010102,
++
++	VC_IMAGE_MAX,     /* bounds for error checking */
++	VC_IMAGE_FORCE_ENUM_16BIT = 0xffff,
++};
++
++enum {
++	/* Unknown or unset - defaults to BT601 interstitial */
++	VC_IMAGE_YUVINFO_UNSPECIFIED    = 0,
++
++	/* colour-space conversions data [4 bits] */
++
++	/* ITU-R BT.601-5 [SDTV] (compatible with VideoCore-II) */
++	VC_IMAGE_YUVINFO_CSC_ITUR_BT601      = 1,
++	/* ITU-R BT.709-3 [HDTV] */
++	VC_IMAGE_YUVINFO_CSC_ITUR_BT709      = 2,
++	/* JPEG JFIF */
++	VC_IMAGE_YUVINFO_CSC_JPEG_JFIF       = 3,
++	/* Title 47 Code of Federal Regulations (2003) 73.682 (a) (20) */
++	VC_IMAGE_YUVINFO_CSC_FCC             = 4,
++	/* Society of Motion Picture and Television Engineers 240M (1999) */
++	VC_IMAGE_YUVINFO_CSC_SMPTE_240M      = 5,
++	/* ITU-R BT.470-2 System M */
++	VC_IMAGE_YUVINFO_CSC_ITUR_BT470_2_M  = 6,
++	/* ITU-R BT.470-2 System B,G */
++	VC_IMAGE_YUVINFO_CSC_ITUR_BT470_2_BG = 7,
++	/* JPEG JFIF, but with 16..255 luma */
++	VC_IMAGE_YUVINFO_CSC_JPEG_JFIF_Y16_255 = 8,
++	/* Rec 2020 */
++	VC_IMAGE_YUVINFO_CSC_REC_2020        = 9,
++};
+--- a/include/soc/bcm2835/raspberrypi-firmware.h
++++ b/include/soc/bcm2835/raspberrypi-firmware.h
+@@ -73,6 +73,7 @@ enum rpi_firmware_property_tag {
+ 	RPI_FIRMWARE_GET_DISPMANX_RESOURCE_MEM_HANDLE =       0x00030014,
+ 	RPI_FIRMWARE_GET_EDID_BLOCK =                         0x00030020,
+ 	RPI_FIRMWARE_GET_CUSTOMER_OTP =                       0x00030021,
++	RPI_FIRMWARE_GET_EDID_BLOCK_DISPLAY =                 0x00030023,
+ 	RPI_FIRMWARE_GET_DOMAIN_STATE =                       0x00030030,
+ 	RPI_FIRMWARE_GET_THROTTLED =                          0x00030046,
+ 	RPI_FIRMWARE_GET_CLOCK_MEASURED =                     0x00030047,
+@@ -149,6 +150,11 @@ enum rpi_firmware_property_tag {
+ 
+ 	RPI_FIRMWARE_VCHIQ_INIT =                             0x00048010,
+ 
++	RPI_FIRMWARE_SET_PLANE =                              0x00048015,
++	RPI_FIRMWARE_GET_DISPLAY_TIMING =                     0x00040017,
++	RPI_FIRMWARE_SET_TIMING =                             0x00048017,
++	RPI_FIRMWARE_GET_DISPLAY_CFG =                        0x00040018,
++	RPI_FIRMWARE_SET_DISPLAY_POWER =		      0x00048019,
+ 	RPI_FIRMWARE_GET_COMMAND_LINE =                       0x00050001,
+ 	RPI_FIRMWARE_GET_DMA_CHANNELS =                       0x00060001,
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/0479-media-i2c-imx477-Fix-framerates-for-1332x990-mode.patch b/root/target/linux/bcm27xx/patches-5.15/950-0461-media-i2c-imx477-Fix-framerates-for-1332x990-mode.patch
similarity index 68%
rename from root/target/linux/bcm27xx/patches-5.15/0479-media-i2c-imx477-Fix-framerates-for-1332x990-mode.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0461-media-i2c-imx477-Fix-framerates-for-1332x990-mode.patch
index dd2de6eb..4b3bad02 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0479-media-i2c-imx477-Fix-framerates-for-1332x990-mode.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0461-media-i2c-imx477-Fix-framerates-for-1332x990-mode.patch
@@ -1,7 +1,7 @@
-From 61b2c30f93b66e4dd8bf89045f54aefd60d332f6 Mon Sep 17 00:00:00 2001
+From c41b0ad69173a20ddc34d6dc482b0693ae807c61 Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Tue, 20 Jul 2021 15:10:03 +0100
-Subject: [PATCH 479/634] media: i2c: imx477: Fix framerates for 1332x990 mode
+Subject: [PATCH 461/828] media: i2c: imx477: Fix framerates for 1332x990 mode
 
 The imx477 driver's line length for this mode had not been updated to
 the value supplied to us by the sensor manufacturer. With this
@@ -12,11 +12,9 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/i2c/imx477.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index f550ff0d8b72..ba03c68e64a0 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
-@@ -982,7 +982,7 @@ static const struct imx477_mode supported_modes_10bit[] = {
+@@ -982,7 +982,7 @@ static const struct imx477_mode supporte
  		/* 120fps. 2x2 binned and cropped */
  		.width = 1332,
  		.height = 990,
@@ -25,6 +23,3 @@ index f550ff0d8b72..ba03c68e64a0 100644
  		.crop = {
  			/*
  			 * FIXME: the analog crop rectangle is actually
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0481-ASoC-bcm-Compiler-warnings-in-audioinjector-octo.patch b/root/target/linux/bcm27xx/patches-5.15/950-0462-ASoC-bcm-Compiler-warnings-in-audioinjector-octo.patch
similarity index 79%
rename from root/target/linux/bcm27xx/patches-5.15/0481-ASoC-bcm-Compiler-warnings-in-audioinjector-octo.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0462-ASoC-bcm-Compiler-warnings-in-audioinjector-octo.patch
index 100c58cb..a1449a65 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0481-ASoC-bcm-Compiler-warnings-in-audioinjector-octo.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0462-ASoC-bcm-Compiler-warnings-in-audioinjector-octo.patch
@@ -1,7 +1,7 @@
-From 3a93b993e3915c8e2a9a67ac46897f760c1f3566 Mon Sep 17 00:00:00 2001
+From 2e4c40bbfa8a928319c9bfb531917dc906d828a6 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Tue, 27 Jul 2021 09:27:49 +0100
-Subject: [PATCH 481/634] ASoC: bcm: Compiler warnings in audioinjector-octo
+Subject: [PATCH 462/828] ASoC: bcm: Compiler warnings in audioinjector-octo
 
 Avoid compiler warnings by using the "fallthrough" pseudo-keyword in
 place of the old "/* fall through */" comment convention.
@@ -11,11 +11,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  sound/soc/bcm/audioinjector-octo-soundcard.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/sound/soc/bcm/audioinjector-octo-soundcard.c b/sound/soc/bcm/audioinjector-octo-soundcard.c
-index 47d622df3ec7..db507f341867 100644
 --- a/sound/soc/bcm/audioinjector-octo-soundcard.c
 +++ b/sound/soc/bcm/audioinjector-octo-soundcard.c
-@@ -143,40 +143,40 @@ static int audioinjector_octo_trigger(struct snd_pcm_substream *substream,
+@@ -143,40 +143,40 @@ static int audioinjector_octo_trigger(st
  	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
  		if (!non_stop_clocks)
  			break;
@@ -62,6 +60,3 @@ index 47d622df3ec7..db507f341867 100644
  		case 14700:
  			__assign_bit(0, mult, 1);
  			break;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0482-media-i2c-tc358743-Fix-compiler-warning.patch b/root/target/linux/bcm27xx/patches-5.15/950-0463-media-i2c-tc358743-Fix-compiler-warning.patch
similarity index 66%
rename from root/target/linux/bcm27xx/patches-5.15/0482-media-i2c-tc358743-Fix-compiler-warning.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0463-media-i2c-tc358743-Fix-compiler-warning.patch
index 2afe1167..8f91510a 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0482-media-i2c-tc358743-Fix-compiler-warning.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0463-media-i2c-tc358743-Fix-compiler-warning.patch
@@ -1,7 +1,7 @@
-From 4ecfdd7258196879edb69f087b02419e68d8dd4c Mon Sep 17 00:00:00 2001
+From dc178490c17b1c9c712437d9132bf7cdcbdc6c45 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Tue, 27 Jul 2021 11:17:08 +0100
-Subject: [PATCH 482/634] media: i2c: tc358743: Fix compiler warning
+Subject: [PATCH 463/828] media: i2c: tc358743: Fix compiler warning
 
 Avoid a compiler warning by using the "fallthrough" pseudo-keyword in
 place of the old "/* fall through */" comment convention.
@@ -11,11 +11,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/media/i2c/tc358743.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
-index da166e6a41d6..e3de5b213e05 100644
 --- a/drivers/media/i2c/tc358743.c
 +++ b/drivers/media/i2c/tc358743.c
-@@ -2008,7 +2008,7 @@ static int tc358743_probe_of(struct tc358743_state *state)
+@@ -2008,7 +2008,7 @@ static int tc358743_probe_of(struct tc35
  	switch (bps_pr_lane) {
  	default:
  		dev_warn(dev, "untested bps per lane: %u bps\n", bps_pr_lane);
@@ -24,6 +22,3 @@ index da166e6a41d6..e3de5b213e05 100644
  	case 594000000U:
  		state->pdata.lineinitcnt = 0xe80;
  		state->pdata.lptxtimecnt = 0x003;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0483-ASoC-bcm-Add-chipdip-dac-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0464-ASoC-bcm-Add-chipdip-dac-driver.patch
similarity index 94%
rename from root/target/linux/bcm27xx/patches-5.15/0483-ASoC-bcm-Add-chipdip-dac-driver.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0464-ASoC-bcm-Add-chipdip-dac-driver.patch
index 7efc32bd..46e2ae75 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0483-ASoC-bcm-Add-chipdip-dac-driver.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0464-ASoC-bcm-Add-chipdip-dac-driver.patch
@@ -1,7 +1,7 @@
-From 99443937f3c865dc484841b9e60143c165284f52 Mon Sep 17 00:00:00 2001
+From 67424e4fc2cd2fe3fe65da6738b560619de404c8 Mon Sep 17 00:00:00 2001
 From: "chipdip.lab" <43340836+chipdipru@users.noreply.github.com>
 Date: Mon, 26 Jul 2021 14:45:59 +0300
-Subject: [PATCH 483/634] ASoC: bcm: Add chipdip-dac driver
+Subject: [PATCH 464/828] ASoC: bcm: Add chipdip-dac driver
 
 Driver chipdip-dac.c added into sound/soc/bcm/, files
 sound/soc/bcm/Kconfig and sound/soc/bcm/Makefile updated.
@@ -14,8 +14,6 @@ Signed-off-by: Evgenij Sapunov <evgenij.sapunov@chipdip.ru>
  3 files changed, 283 insertions(+), 1 deletion(-)
  create mode 100644 sound/soc/bcm/chipdip-dac.c
 
-diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index 94c2a8e8ad2d..d65df373c39e 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
 @@ -27,6 +27,12 @@ config SND_BCM63XX_I2S_WHISTLER
@@ -31,11 +29,9 @@ index 94c2a8e8ad2d..d65df373c39e 100644
  config SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD
  	tristate "Support for Google voiceHAT soundcard"
  	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
-index 942464a729b3..1efb734f1c86 100644
 --- a/sound/soc/bcm/Makefile
 +++ b/sound/soc/bcm/Makefile
-@@ -47,6 +47,7 @@ snd-soc-fe-pi-audio-objs := fe-pi-audio.o
+@@ -47,6 +47,7 @@ snd-soc-fe-pi-audio-objs := fe-pi-audio.
  snd-soc-rpi-simple-soundcard-objs := rpi-simple-soundcard.o
  snd-soc-rpi-wm8804-soundcard-objs := rpi-wm8804-soundcard.o
  snd-soc-pifi-40-objs := pifi-40.o
@@ -43,15 +39,12 @@ index 942464a729b3..1efb734f1c86 100644
  
  obj-$(CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD)  += snd-soc-googlevoicehat-codec.o
  obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS) += snd-soc-hifiberry-dacplus.o
-@@ -78,4 +79,4 @@ obj-$(CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO) += snd-soc-fe-pi-audio.o
+@@ -78,4 +79,4 @@ obj-$(CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO
  obj-$(CONFIG_SND_RPI_SIMPLE_SOUNDCARD) += snd-soc-rpi-simple-soundcard.o
  obj-$(CONFIG_SND_RPI_WM8804_SOUNDCARD) += snd-soc-rpi-wm8804-soundcard.o
  obj-$(CONFIG_SND_BCM2708_SOC_PIFI_40) += snd-soc-pifi-40.o
 -
 +obj-$(CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC) += snd-soc-chipdip-dac.o
-diff --git a/sound/soc/bcm/chipdip-dac.c b/sound/soc/bcm/chipdip-dac.c
-new file mode 100644
-index 000000000000..6cb53692b3c5
 --- /dev/null
 +++ b/sound/soc/bcm/chipdip-dac.c
 @@ -0,0 +1,275 @@
@@ -330,6 +323,3 @@ index 000000000000..6cb53692b3c5
 +MODULE_AUTHOR("Evgenij Sapunov <evgenij.sapunov@chipdip.ru>");
 +MODULE_DESCRIPTION("ASoC Driver for ChipDip DAC");
 +MODULE_LICENSE("GPL v2");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0486-media-i2c-imx290-Add-fwnode-properties-controls.patch b/root/target/linux/bcm27xx/patches-5.15/950-0465-media-i2c-imx290-Add-fwnode-properties-controls.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0486-media-i2c-imx290-Add-fwnode-properties-controls.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0465-media-i2c-imx290-Add-fwnode-properties-controls.patch
index 2101e4ee..30cb7733 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0486-media-i2c-imx290-Add-fwnode-properties-controls.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0465-media-i2c-imx290-Add-fwnode-properties-controls.patch
@@ -1,7 +1,7 @@
-From 64dcb7d73ce9451d72d23d170843ce605f0de739 Mon Sep 17 00:00:00 2001
+From 22527b43dc12ddbcd4bf90330e3f9cf461bad3de Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 3 Aug 2021 11:25:59 +0100
-Subject: [PATCH 486/634] media: i2c: imx290: Add fwnode properties controls
+Subject: [PATCH 465/828] media: i2c: imx290: Add fwnode properties controls
 
 Add call to v4l2_ctrl_new_fwnode_properties to read and
 create the fwnode based controls.
@@ -11,11 +11,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/imx290.c | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index c09b5a22e1a8..4291c77f5a01 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
-@@ -1239,6 +1239,7 @@ static const struct of_device_id imx290_of_match[] = {
+@@ -1239,6 +1239,7 @@ static const struct of_device_id imx290_
  
  static int imx290_probe(struct i2c_client *client)
  {
@@ -23,7 +21,7 @@ index c09b5a22e1a8..4291c77f5a01 100644
  	struct device *dev = &client->dev;
  	struct fwnode_handle *endpoint;
  	/* Only CSI2 is supported for now: */
-@@ -1360,7 +1361,7 @@ static int imx290_probe(struct i2c_client *client)
+@@ -1360,7 +1361,7 @@ static int imx290_probe(struct i2c_clien
  	 */
  	imx290_entity_init_cfg(&imx290->sd, NULL);
  
@@ -32,7 +30,7 @@ index c09b5a22e1a8..4291c77f5a01 100644
  
  	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
  			  V4L2_CID_ANALOGUE_GAIN, 0, 100, 1, 0);
-@@ -1408,6 +1409,15 @@ static int imx290_probe(struct i2c_client *client)
+@@ -1408,6 +1409,15 @@ static int imx290_probe(struct i2c_clien
  				     ARRAY_SIZE(imx290_test_pattern_menu) - 1,
  				     0, 0, imx290_test_pattern_menu);
  
@@ -48,6 +46,3 @@ index c09b5a22e1a8..4291c77f5a01 100644
  	imx290->sd.ctrl_handler = &imx290->ctrls;
  
  	if (imx290->ctrls.error) {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0487-media-i2c-ov9281-Add-fwnode-properties-controls.patch b/root/target/linux/bcm27xx/patches-5.15/950-0466-media-i2c-ov9281-Add-fwnode-properties-controls.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0487-media-i2c-ov9281-Add-fwnode-properties-controls.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0466-media-i2c-ov9281-Add-fwnode-properties-controls.patch
index d7b82a8a..0f65179f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0487-media-i2c-ov9281-Add-fwnode-properties-controls.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0466-media-i2c-ov9281-Add-fwnode-properties-controls.patch
@@ -1,7 +1,7 @@
-From a689567efff7bf0d9e9ec0b2f6c342c3febf7b67 Mon Sep 17 00:00:00 2001
+From 2fe563da0c01a4a1ac9915abe6a6332ddc227562 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 3 Aug 2021 11:30:58 +0100
-Subject: [PATCH 487/634] media: i2c: ov9281: Add fwnode properties controls
+Subject: [PATCH 466/828] media: i2c: ov9281: Add fwnode properties controls
 
 Add call to v4l2_ctrl_new_fwnode_properties to read and
 create the fwnode based controls.
@@ -11,8 +11,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/ov9281.c | 13 ++++++++++++-
  1 file changed, 12 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-index c89dc98ad708..e4604746e930 100644
 --- a/drivers/media/i2c/ov9281.c
 +++ b/drivers/media/i2c/ov9281.c
 @@ -25,6 +25,7 @@
@@ -23,7 +21,7 @@ index c89dc98ad708..e4604746e930 100644
  #include <media/v4l2-subdev.h>
  
  #define OV9281_LINK_FREQ_400MHZ		400000000
-@@ -1023,6 +1024,7 @@ static const struct v4l2_ctrl_ops ov9281_ctrl_ops = {
+@@ -1023,6 +1024,7 @@ static const struct v4l2_ctrl_ops ov9281
  
  static int ov9281_initialize_controls(struct ov9281 *ov9281)
  {
@@ -31,7 +29,7 @@ index c89dc98ad708..e4604746e930 100644
  	const struct ov9281_mode *mode;
  	struct v4l2_ctrl_handler *handler;
  	struct v4l2_ctrl *ctrl;
-@@ -1032,7 +1034,7 @@ static int ov9281_initialize_controls(struct ov9281 *ov9281)
+@@ -1032,7 +1034,7 @@ static int ov9281_initialize_controls(st
  
  	handler = &ov9281->ctrl_handler;
  	mode = ov9281->cur_mode;
@@ -40,7 +38,7 @@ index c89dc98ad708..e4604746e930 100644
  	if (ret)
  		return ret;
  	handler->lock = &ov9281->mutex;
-@@ -1094,6 +1096,15 @@ static int ov9281_initialize_controls(struct ov9281 *ov9281)
+@@ -1094,6 +1096,15 @@ static int ov9281_initialize_controls(st
  		goto err_free_handler;
  	}
  
@@ -56,6 +54,3 @@ index c89dc98ad708..e4604746e930 100644
  	ov9281->subdev.ctrl_handler = handler;
  
  	return 0;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0488-media-i2c-ov7251-Add-fwnode-properties-controls.patch b/root/target/linux/bcm27xx/patches-5.15/950-0467-media-i2c-ov7251-Add-fwnode-properties-controls.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0488-media-i2c-ov7251-Add-fwnode-properties-controls.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0467-media-i2c-ov7251-Add-fwnode-properties-controls.patch
index a6dc35b2..21afd654 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0488-media-i2c-ov7251-Add-fwnode-properties-controls.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0467-media-i2c-ov7251-Add-fwnode-properties-controls.patch
@@ -1,7 +1,7 @@
-From 157ba6d66c9fe64c7c1e25562d1bb80bff5e003b Mon Sep 17 00:00:00 2001
+From a5fab0ce3679494be4bd9369a6114d3ae0bed901 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 3 Aug 2021 11:33:33 +0100
-Subject: [PATCH 488/634] media: i2c: ov7251: Add fwnode properties controls
+Subject: [PATCH 467/828] media: i2c: ov7251: Add fwnode properties controls
 
 Add call to v4l2_ctrl_new_fwnode_properties to read and
 create the fwnode based controls.
@@ -11,11 +11,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/media/i2c/ov7251.c | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/ov7251.c b/drivers/media/i2c/ov7251.c
-index ebb299f207e5..083a62b267f2 100644
 --- a/drivers/media/i2c/ov7251.c
 +++ b/drivers/media/i2c/ov7251.c
-@@ -1256,6 +1256,7 @@ static const struct v4l2_subdev_ops ov7251_subdev_ops = {
+@@ -1256,6 +1256,7 @@ static const struct v4l2_subdev_ops ov72
  
  static int ov7251_probe(struct i2c_client *client)
  {
@@ -23,7 +21,7 @@ index ebb299f207e5..083a62b267f2 100644
  	struct device *dev = &client->dev;
  	struct fwnode_handle *endpoint;
  	struct ov7251 *ov7251;
-@@ -1341,7 +1342,7 @@ static int ov7251_probe(struct i2c_client *client)
+@@ -1341,7 +1342,7 @@ static int ov7251_probe(struct i2c_clien
  
  	mutex_init(&ov7251->lock);
  
@@ -32,7 +30,7 @@ index ebb299f207e5..083a62b267f2 100644
  	ov7251->ctrls.lock = &ov7251->lock;
  
  	v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
-@@ -1377,6 +1378,15 @@ static int ov7251_probe(struct i2c_client *client)
+@@ -1377,6 +1378,15 @@ static int ov7251_probe(struct i2c_clien
  		goto free_ctrl;
  	}
  
@@ -48,6 +46,3 @@ index ebb299f207e5..083a62b267f2 100644
  	v4l2_i2c_subdev_init(&ov7251->sd, client, &ov7251_subdev_ops);
  	ov7251->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
  	ov7251->pad.flags = MEDIA_PAD_FL_SOURCE;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0489-media-v4l2-Remove-v4l2-ctrls.c.patch b/root/target/linux/bcm27xx/patches-5.15/950-0468-media-v4l2-Remove-v4l2-ctrls.c.patch
similarity index 99%
rename from root/target/linux/bcm27xx/patches-5.15/0489-media-v4l2-Remove-v4l2-ctrls.c.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0468-media-v4l2-Remove-v4l2-ctrls.c.patch
index ffbb7c26..704e7233 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0489-media-v4l2-Remove-v4l2-ctrls.c.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0468-media-v4l2-Remove-v4l2-ctrls.c.patch
@@ -1,7 +1,7 @@
-From 6b88db03b85a5c0905358a6a1cd14563abc93585 Mon Sep 17 00:00:00 2001
+From 5e8f6f4c6835241b1688aff335666a7331f82b69 Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Fri, 6 Aug 2021 10:47:11 +0100
-Subject: [PATCH 489/634] media: v4l2: Remove v4l2-ctrls.c
+Subject: [PATCH 468/828] media: v4l2: Remove v4l2-ctrls.c
 
 v4l2-ctrls.c has been split into 4 files v4l2-ctrls-*.c, the original
 is redundant, confusing and probably should have been removed by a
@@ -13,9 +13,6 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  1 file changed, 5046 deletions(-)
  delete mode 100644 drivers/media/v4l2-core/v4l2-ctrls.c
 
-diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
-deleted file mode 100644
-index b750ce3ae723..000000000000
 --- a/drivers/media/v4l2-core/v4l2-ctrls.c
 +++ /dev/null
 @@ -1,5046 +0,0 @@
@@ -5065,6 +5062,3 @@ index b750ce3ae723..000000000000
 -	return hdl->error;
 -}
 -EXPORT_SYMBOL(v4l2_ctrl_new_fwnode_properties);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0490-media-v4l2-Add-HEVC_SCALING_MATRIX-attribute-to-v4l2.patch b/root/target/linux/bcm27xx/patches-5.15/950-0469-media-v4l2-Add-HEVC_SCALING_MATRIX-attribute-to-v4l2.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0490-media-v4l2-Add-HEVC_SCALING_MATRIX-attribute-to-v4l2.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0469-media-v4l2-Add-HEVC_SCALING_MATRIX-attribute-to-v4l2.patch
index 966de812..de36883b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0490-media-v4l2-Add-HEVC_SCALING_MATRIX-attribute-to-v4l2.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0469-media-v4l2-Add-HEVC_SCALING_MATRIX-attribute-to-v4l2.patch
@@ -1,7 +1,7 @@
-From 769c4bee41efcc34c1572b488c66a0184a36328c Mon Sep 17 00:00:00 2001
+From 857d23824dbb54cdd64c37b4623721e96250b59c Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Fri, 6 Aug 2021 10:53:50 +0100
-Subject: [PATCH 490/634] media: v4l2: Add HEVC_SCALING_MATRIX attribute to
+Subject: [PATCH 469/828] media: v4l2: Add HEVC_SCALING_MATRIX attribute to
  v4l2-ctrl-*
 
 Add code to support V4L2_CID_MPEG_VIDEO_HEVC_SCALING_MATRIX to
@@ -14,11 +14,9 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  drivers/media/v4l2-core/v4l2-ctrls-defs.c | 4 ++++
  2 files changed, 10 insertions(+)
 
-diff --git a/drivers/media/v4l2-core/v4l2-ctrls-core.c b/drivers/media/v4l2-core/v4l2-ctrls-core.c
-index c4b5082849b6..b14eb8fb5bad 100644
 --- a/drivers/media/v4l2-core/v4l2-ctrls-core.c
 +++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c
-@@ -617,6 +617,9 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx,
+@@ -627,6 +627,9 @@ static int std_validate_compound(const s
  		zero_padding(*p_hevc_pps);
  		break;
  
@@ -28,7 +26,7 @@ index c4b5082849b6..b14eb8fb5bad 100644
  	case V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS:
  		p_hevc_decode_params = p;
  
-@@ -1240,6 +1243,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
+@@ -1250,6 +1253,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(s
  	case V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS:
  		elem_size = sizeof(struct v4l2_ctrl_hevc_slice_params);
  		break;
@@ -38,8 +36,6 @@ index c4b5082849b6..b14eb8fb5bad 100644
  	case V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS:
  		elem_size = sizeof(struct v4l2_ctrl_hevc_decode_params);
  		break;
-diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c b/drivers/media/v4l2-core/v4l2-ctrls-defs.c
-index 421300e13a41..eae300c58274 100644
 --- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c
 +++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c
 @@ -997,6 +997,7 @@ const char *v4l2_ctrl_get_name(u32 id)
@@ -50,7 +46,7 @@ index 421300e13a41..eae300c58274 100644
  	case V4L2_CID_MPEG_VIDEO_HEVC_DECODE_PARAMS:		return "HEVC Decode Parameters";
  	case V4L2_CID_MPEG_VIDEO_HEVC_DECODE_MODE:		return "HEVC Decode Mode";
  	case V4L2_CID_MPEG_VIDEO_HEVC_START_CODE:		return "HEVC Start Code";
-@@ -1490,6 +1491,9 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
+@@ -1490,6 +1491,9 @@ void v4l2_ctrl_fill(u32 id, const char *
  	case V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS:
  		*type = V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS;
  		break;
@@ -60,6 +56,3 @@ index 421300e13a41..eae300c58274 100644
  	case V4L2_CID_MPEG_VIDEO_HEVC_DECODE_PARAMS:
  		*type = V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS;
  		break;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0491-media-rpivid-Update-to-compile-with-new-hevc-decode-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0470-media-rpivid-Update-to-compile-with-new-hevc-decode-.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0491-media-rpivid-Update-to-compile-with-new-hevc-decode-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0470-media-rpivid-Update-to-compile-with-new-hevc-decode-.patch
index dcae6b9c..e6d8f6a8 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0491-media-rpivid-Update-to-compile-with-new-hevc-decode-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0470-media-rpivid-Update-to-compile-with-new-hevc-decode-.patch
@@ -1,7 +1,7 @@
-From 88ec138b439b79b20d0cfd32cd69b93e87267731 Mon Sep 17 00:00:00 2001
+From 6d26241c01c46260c0afd8d8abd81dd80de14b50 Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Thu, 5 Aug 2021 15:18:50 +0100
-Subject: [PATCH 491/634] media: rpivid: Update to compile with new hevc decode
+Subject: [PATCH 470/828] media: rpivid: Update to compile with new hevc decode
  params
 
 DPB entries have moved from slice params to the new decode params
@@ -16,25 +16,21 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  drivers/staging/media/rpivid/rpivid_h265.c | 35 ++++++++++++----------
  4 files changed, 30 insertions(+), 15 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid.c b/drivers/staging/media/rpivid/rpivid.c
-index 9d93ed757ebc..b364a62e8a3a 100644
 --- a/drivers/staging/media/rpivid/rpivid.c
 +++ b/drivers/staging/media/rpivid/rpivid.c
-@@ -55,6 +55,12 @@ static const struct rpivid_control rpivid_ctrls[] = {
- 		},
- 		.required	= false,
+@@ -57,6 +57,12 @@ static const struct rpivid_control rpivi
  	},
-+	{
-+		.cfg = {
+ 	{
+ 		.cfg = {
 +			.id	= V4L2_CID_MPEG_VIDEO_HEVC_DECODE_PARAMS,
 +		},
 +		.required	= true,
 +	},
- 	{
- 		.cfg = {
++	{
++		.cfg = {
  			.id	= V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS,
-diff --git a/drivers/staging/media/rpivid/rpivid.h b/drivers/staging/media/rpivid/rpivid.h
-index c4bc72d512ab..68e0b383b831 100644
+ 		},
+ 		.required	= true,
 --- a/drivers/staging/media/rpivid/rpivid.h
 +++ b/drivers/staging/media/rpivid/rpivid.h
 @@ -52,6 +52,7 @@ struct rpivid_h265_run {
@@ -45,8 +41,6 @@ index c4bc72d512ab..68e0b383b831 100644
  	const struct v4l2_ctrl_hevc_slice_params	*slice_params;
  	const struct v4l2_ctrl_hevc_scaling_matrix	*scaling_matrix;
  };
-diff --git a/drivers/staging/media/rpivid/rpivid_dec.c b/drivers/staging/media/rpivid/rpivid_dec.c
-index fa8af01d753b..e5137018a83f 100644
 --- a/drivers/staging/media/rpivid/rpivid_dec.c
 +++ b/drivers/staging/media/rpivid/rpivid_dec.c
 @@ -55,6 +55,9 @@ void rpivid_device_run(void *priv)
@@ -59,8 +53,6 @@ index fa8af01d753b..e5137018a83f 100644
  		run.h265.scaling_matrix =
  			rpivid_find_control_data(ctx,
  						 V4L2_CID_MPEG_VIDEO_HEVC_SCALING_MATRIX);
-diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
-index a5a0e31bd5ba..b630805dbef3 100644
 --- a/drivers/staging/media/rpivid/rpivid_h265.c
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
 @@ -252,6 +252,7 @@ struct rpivid_dec_state {
@@ -71,7 +63,7 @@ index a5a0e31bd5ba..b630805dbef3 100644
  	unsigned int nb_refs[2];
  	unsigned int slice_qp;
  	unsigned int max_num_merge_cand; // 0 if I-slice
-@@ -799,6 +800,7 @@ static void pre_slice_decode(struct rpivid_dec_env *const de,
+@@ -799,6 +800,7 @@ static void pre_slice_decode(struct rpiv
  			     const struct rpivid_dec_state *const s)
  {
  	const struct v4l2_ctrl_hevc_slice_params *const sh = s->sh;
@@ -79,7 +71,7 @@ index a5a0e31bd5ba..b630805dbef3 100644
  	int weighted_pred_flag, idx;
  	u16 cmd_slice;
  	unsigned int collocated_from_l0_flag;
-@@ -825,9 +827,9 @@ static void pre_slice_decode(struct rpivid_dec_env *const de,
+@@ -825,9 +827,9 @@ static void pre_slice_decode(struct rpiv
  	if (sh->slice_type == HEVC_SLICE_P || sh->slice_type == HEVC_SLICE_B) {
  		// Flag to say all reference pictures are from the past
  		const int no_backward_pred_flag =
@@ -91,7 +83,7 @@ index a5a0e31bd5ba..b630805dbef3 100644
  				     sh->slice_pic_order_cnt);
  		cmd_slice |= no_backward_pred_flag << 10;
  		msg_slice(de, cmd_slice);
-@@ -855,11 +857,11 @@ static void pre_slice_decode(struct rpivid_dec_env *const de,
+@@ -855,11 +857,11 @@ static void pre_slice_decode(struct rpiv
  
  			msg_slice(de,
  				  dpb_no |
@@ -105,7 +97,7 @@ index a5a0e31bd5ba..b630805dbef3 100644
  
  			if (weighted_pred_flag) {
  				const struct v4l2_hevc_pred_weight_table
-@@ -901,11 +903,11 @@ static void pre_slice_decode(struct rpivid_dec_env *const de,
+@@ -901,11 +903,11 @@ static void pre_slice_decode(struct rpiv
  			//          "L1[%d]=dpb[%d]\n", idx, dpb_no);
  			msg_slice(de,
  				  dpb_no |
@@ -119,7 +111,7 @@ index a5a0e31bd5ba..b630805dbef3 100644
  			if (weighted_pred_flag) {
  				const struct v4l2_hevc_pred_weight_table
  					*const w = &sh->pred_weight_table;
-@@ -1670,6 +1672,8 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1670,6 +1672,8 @@ static void rpivid_h265_setup(struct rpi
  	struct rpivid_dev *const dev = ctx->dev;
  	const struct v4l2_ctrl_hevc_slice_params *const sh =
  						run->h265.slice_params;
@@ -128,7 +120,7 @@ index a5a0e31bd5ba..b630805dbef3 100644
  //	const struct v4l2_hevc_pred_weight_table *pred_weight_table;
  	struct rpivid_q_aux *dpb_q_aux[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
  	struct rpivid_dec_state *const s = ctx->state;
-@@ -1895,6 +1899,7 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1895,6 +1899,7 @@ static void rpivid_h265_setup(struct rpi
  
  	// Pre calc a few things
  	s->sh = sh;
@@ -136,7 +128,7 @@ index a5a0e31bd5ba..b630805dbef3 100644
  	s->slice_qp = 26 + s->pps.init_qp_minus26 + s->sh->slice_qp_delta;
  	s->max_num_merge_cand = sh->slice_type == HEVC_SLICE_I ?
  					0 :
-@@ -1965,9 +1970,9 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1965,9 +1970,9 @@ static void rpivid_h265_setup(struct rpi
  	if (write_cmd_buffer(dev, de, s))
  		goto fail;
  
@@ -148,7 +140,7 @@ index a5a0e31bd5ba..b630805dbef3 100644
  		struct vb2_buffer *buf = buffer_index < 0 ?
  					NULL :
  					vb2_get_buffer(vq, buffer_index);
-@@ -1975,7 +1980,7 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1975,7 +1980,7 @@ static void rpivid_h265_setup(struct rpi
  		if (!buf) {
  			v4l2_warn(&dev->v4l2_dev,
  				  "Missing DPB ent %d, timestamp=%lld, index=%d\n",
@@ -157,7 +149,7 @@ index a5a0e31bd5ba..b630805dbef3 100644
  				  buffer_index);
  			continue;
  		}
-@@ -1985,7 +1990,7 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1985,7 +1990,7 @@ static void rpivid_h265_setup(struct rpi
  			if (!dpb_q_aux[i])
  				v4l2_warn(&dev->v4l2_dev,
  					  "Missing DPB AUX ent %d, timestamp=%lld, index=%d\n",
@@ -166,7 +158,7 @@ index a5a0e31bd5ba..b630805dbef3 100644
  					  buffer_index);
  		}
  
-@@ -2017,11 +2022,11 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -2017,11 +2022,11 @@ static void rpivid_h265_setup(struct rpi
  	}
  
  	if (de->dpbno_col != ~0U) {
@@ -180,7 +172,7 @@ index a5a0e31bd5ba..b630805dbef3 100644
  		} else {
  			// Standard requires that the col pic is
  			// constant for the duration of the pic
-@@ -2462,7 +2467,7 @@ static void rpivid_h265_trigger(struct rpivid_ctx *ctx)
+@@ -2462,7 +2467,7 @@ static void rpivid_h265_trigger(struct r
  	switch (!de ? RPIVID_DECODE_ERROR_CONTINUE : de->state) {
  	case RPIVID_DECODE_SLICE_START:
  		de->state = RPIVID_DECODE_SLICE_CONTINUE;
@@ -189,7 +181,7 @@ index a5a0e31bd5ba..b630805dbef3 100644
  	case RPIVID_DECODE_SLICE_CONTINUE:
  		v4l2_m2m_buf_done_and_job_finish(dev->m2m_dev, ctx->fh.m2m_ctx,
  						 VB2_BUF_STATE_DONE);
-@@ -2472,11 +2477,11 @@ static void rpivid_h265_trigger(struct rpivid_ctx *ctx)
+@@ -2472,11 +2477,11 @@ static void rpivid_h265_trigger(struct r
  	default:
  		v4l2_err(&dev->v4l2_dev, "%s: Unexpected state: %d\n", __func__,
  			 de->state);
@@ -203,6 +195,3 @@ index a5a0e31bd5ba..b630805dbef3 100644
  	case RPIVID_DECODE_ERROR_CONTINUE:
  		xtrace_fin(dev, de);
  		v4l2_m2m_buf_done_and_job_finish(dev->m2m_dev, ctx->fh.m2m_ctx,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0492-media-v4l2-Add-Greyworld-AWB-control-name.patch b/root/target/linux/bcm27xx/patches-5.15/950-0471-media-v4l2-Add-Greyworld-AWB-control-name.patch
similarity index 62%
rename from root/target/linux/bcm27xx/patches-5.15/0492-media-v4l2-Add-Greyworld-AWB-control-name.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0471-media-v4l2-Add-Greyworld-AWB-control-name.patch
index 75dfc6c4..d7f0c680 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0492-media-v4l2-Add-Greyworld-AWB-control-name.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0471-media-v4l2-Add-Greyworld-AWB-control-name.patch
@@ -1,7 +1,7 @@
-From bbb81decbe0bce002810d63d0e50b4a81c6ac0c4 Mon Sep 17 00:00:00 2001
+From 31b54dd9dd3f4c13796d51358276f5ea37b2c344 Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Fri, 6 Aug 2021 14:32:44 +0100
-Subject: [PATCH 492/634] media: v4l2: Add Greyworld AWB control name
+Subject: [PATCH 471/828] media: v4l2: Add Greyworld AWB control name
 
 Add name for greyworld to white_balance preset names.
 This patch previously applied to v4l2-ctrl.c but that was split
@@ -12,11 +12,9 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  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 eae300c58274..e085f330296a 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 eae300c58274..e085f330296a 100644
  		NULL,
  	};
  	static const char * const camera_iso_sensitivity_auto[] = {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0493-videodev2.h-add-V4L2_CTRL_FLAG_DYNAMIC_ARRAY.patch b/root/target/linux/bcm27xx/patches-5.15/950-0472-videodev2.h-add-V4L2_CTRL_FLAG_DYNAMIC_ARRAY.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0493-videodev2.h-add-V4L2_CTRL_FLAG_DYNAMIC_ARRAY.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0472-videodev2.h-add-V4L2_CTRL_FLAG_DYNAMIC_ARRAY.patch
index 80a23c03..b5858ae6 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0493-videodev2.h-add-V4L2_CTRL_FLAG_DYNAMIC_ARRAY.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0472-videodev2.h-add-V4L2_CTRL_FLAG_DYNAMIC_ARRAY.patch
@@ -1,7 +1,7 @@
-From 053324281da9876ebfdfd431dd54b5b39b2fc783 Mon Sep 17 00:00:00 2001
+From 3b3ff7bd1b1cf66e7c7935f1c75bcef7cedbb3e7 Mon Sep 17 00:00:00 2001
 From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
 Date: Wed, 14 Apr 2021 15:01:16 +0200
-Subject: [PATCH 493/634] videodev2.h: add V4L2_CTRL_FLAG_DYNAMIC_ARRAY
+Subject: [PATCH 472/828] videodev2.h: add V4L2_CTRL_FLAG_DYNAMIC_ARRAY
 
 Add a new flag that indicates that this control is a dynamically sized
 array. Also document this flag.
@@ -23,8 +23,6 @@ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  include/uapi/linux/videodev2.h                            | 1 +
  2 files changed, 9 insertions(+)
 
-diff --git a/Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst b/Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst
-index f9ecf6276129..819a70a26e18 100644
 --- a/Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst
 +++ b/Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst
 @@ -607,6 +607,14 @@ See also the examples in :ref:`control`.
@@ -42,8 +40,6 @@ index f9ecf6276129..819a70a26e18 100644
  
  Return Value
  ============
-diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 12f356c48616..272761a87020 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -1882,6 +1882,7 @@ struct v4l2_querymenu {
@@ -54,6 +50,3 @@ index 12f356c48616..272761a87020 100644
  
  /*  Query flags, to be ORed with the control ID */
  #define V4L2_CTRL_FLAG_NEXT_CTRL	0x80000000
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0494-v4l2-ctrls-add-support-for-dynamically-allocated-arr.patch b/root/target/linux/bcm27xx/patches-5.15/950-0473-v4l2-ctrls-add-support-for-dynamically-allocated-arr.patch
similarity index 86%
rename from root/target/linux/bcm27xx/patches-5.15/0494-v4l2-ctrls-add-support-for-dynamically-allocated-arr.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0473-v4l2-ctrls-add-support-for-dynamically-allocated-arr.patch
index eb1dcb35..b6946000 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0494-v4l2-ctrls-add-support-for-dynamically-allocated-arr.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0473-v4l2-ctrls-add-support-for-dynamically-allocated-arr.patch
@@ -1,7 +1,7 @@
-From 544ab7a7efc0470452eb8d71126c05b7dc80f6c5 Mon Sep 17 00:00:00 2001
+From a256dfd3e08a470fd4442ee485e8e82d411ff0f9 Mon Sep 17 00:00:00 2001
 From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
 Date: Thu, 15 Apr 2021 13:56:53 +0200
-Subject: [PATCH 494/634] v4l2-ctrls: add support for dynamically allocated
+Subject: [PATCH 473/828] v4l2-ctrls: add support for dynamically allocated
  arrays.
 
 Implement support for dynamically allocated arrays.
@@ -20,11 +20,9 @@ Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
  include/media/v4l2-ctrls.h                   |  42 ++++-
  5 files changed, 272 insertions(+), 71 deletions(-)
 
-diff --git a/drivers/media/v4l2-core/v4l2-ctrls-api.c b/drivers/media/v4l2-core/v4l2-ctrls-api.c
-index db9baa0bd05f..50d012ba3c02 100644
 --- a/drivers/media/v4l2-core/v4l2-ctrls-api.c
 +++ b/drivers/media/v4l2-core/v4l2-ctrls-api.c
-@@ -97,29 +97,47 @@ static int def_to_user(struct v4l2_ext_control *c, struct v4l2_ctrl *ctrl)
+@@ -97,29 +97,47 @@ static int def_to_user(struct v4l2_ext_c
  	return ptr_to_user(c, ctrl, ctrl->p_new);
  }
  
@@ -83,7 +81,7 @@ index db9baa0bd05f..50d012ba3c02 100644
  		break;
  	case V4L2_CTRL_TYPE_STRING:
  		size = c->size;
-@@ -127,32 +145,27 @@ static int user_to_ptr(struct v4l2_ext_control *c,
+@@ -127,32 +145,27 @@ static int user_to_ptr(struct v4l2_ext_c
  			return -ERANGE;
  		if (size > ctrl->maximum + 1)
  			size = ctrl->maximum + 1;
@@ -122,7 +120,7 @@ index db9baa0bd05f..50d012ba3c02 100644
  /*
   * VIDIOC_G/TRY/S_EXT_CTRLS implementation
   */
-@@ -254,7 +267,31 @@ static int prepare_ext_ctrls(struct v4l2_ctrl_handler *hdl,
+@@ -254,7 +267,31 @@ static int prepare_ext_ctrls(struct v4l2
  			have_clusters = true;
  		if (ctrl->cluster[0] != ctrl)
  			ref = find_ref_lock(hdl, ctrl->cluster[0]->id);
@@ -155,7 +153,7 @@ index db9baa0bd05f..50d012ba3c02 100644
  			unsigned int tot_size = ctrl->elems * ctrl->elem_size;
  
  			if (c->size < tot_size) {
-@@ -346,7 +383,7 @@ static int class_check(struct v4l2_ctrl_handler *hdl, u32 which)
+@@ -346,7 +383,7 @@ static int class_check(struct v4l2_ctrl_
   *
   * Note that v4l2_g_ext_ctrls_common() with 'which' set to
   * V4L2_CTRL_WHICH_REQUEST_VAL is only called if the request was
@@ -164,7 +162,7 @@ index db9baa0bd05f..50d012ba3c02 100644
   */
  int v4l2_g_ext_ctrls_common(struct v4l2_ctrl_handler *hdl,
  			    struct v4l2_ext_controls *cs,
-@@ -430,7 +467,9 @@ int v4l2_g_ext_ctrls_common(struct v4l2_ctrl_handler *hdl,
+@@ -430,7 +467,9 @@ int v4l2_g_ext_ctrls_common(struct v4l2_
  
  			if (is_default)
  				ret = def_to_user(cs->controls + idx, ref->ctrl);
@@ -175,7 +173,7 @@ index db9baa0bd05f..50d012ba3c02 100644
  				ret = req_to_user(cs->controls + idx, ref);
  			else if (is_volatile)
  				ret = new_to_user(cs->controls + idx, ref->ctrl);
-@@ -457,6 +496,17 @@ int v4l2_g_ext_ctrls(struct v4l2_ctrl_handler *hdl, struct video_device *vdev,
+@@ -457,6 +496,17 @@ int v4l2_g_ext_ctrls(struct v4l2_ctrl_ha
  }
  EXPORT_SYMBOL(v4l2_g_ext_ctrls);
  
@@ -193,7 +191,7 @@ index db9baa0bd05f..50d012ba3c02 100644
  /* Validate controls. */
  static int validate_ctrls(struct v4l2_ext_controls *cs,
  			  struct v4l2_ctrl_helper *helpers,
-@@ -872,6 +922,9 @@ int __v4l2_ctrl_s_ctrl_compound(struct v4l2_ctrl *ctrl,
+@@ -872,6 +922,9 @@ int __v4l2_ctrl_s_ctrl_compound(struct v
  	/* It's a driver bug if this happens. */
  	if (WARN_ON(ctrl->type != type))
  		return -EINVAL;
@@ -203,11 +201,9 @@ index db9baa0bd05f..50d012ba3c02 100644
  	memcpy(ctrl->p_new.p, p, ctrl->elems * ctrl->elem_size);
  	return set_ctrl(NULL, ctrl, 0);
  }
-diff --git a/drivers/media/v4l2-core/v4l2-ctrls-core.c b/drivers/media/v4l2-core/v4l2-ctrls-core.c
-index b14eb8fb5bad..0575866afc68 100644
 --- a/drivers/media/v4l2-core/v4l2-ctrls-core.c
 +++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c
-@@ -799,11 +799,12 @@ EXPORT_SYMBOL(v4l2_ctrl_notify);
+@@ -809,11 +809,12 @@ EXPORT_SYMBOL(v4l2_ctrl_notify);
  
  /* Copy the one value to another. */
  static void ptr_to_ptr(struct v4l2_ctrl *ctrl,
@@ -222,7 +218,7 @@ index b14eb8fb5bad..0575866afc68 100644
  }
  
  /* Copy the new value to the current value. */
-@@ -816,8 +817,11 @@ void new_to_cur(struct v4l2_fh *fh, struct v4l2_ctrl *ctrl, u32 ch_flags)
+@@ -826,8 +827,11 @@ void new_to_cur(struct v4l2_fh *fh, stru
  
  	/* has_changed is set by cluster_changed */
  	changed = ctrl->has_changed;
@@ -236,7 +232,7 @@ index b14eb8fb5bad..0575866afc68 100644
  
  	if (ch_flags & V4L2_EVENT_CTRL_CH_FLAGS) {
  		/* Note: CH_FLAGS is only set for auto clusters. */
-@@ -847,36 +851,122 @@ void cur_to_new(struct v4l2_ctrl *ctrl)
+@@ -857,36 +861,122 @@ void cur_to_new(struct v4l2_ctrl *ctrl)
  {
  	if (ctrl == NULL)
  		return;
@@ -370,7 +366,7 @@ index b14eb8fb5bad..0575866afc68 100644
  }
  
  /* Control range checking */
-@@ -918,17 +1008,6 @@ int check_range(enum v4l2_ctrl_type type,
+@@ -928,17 +1018,6 @@ int check_range(enum v4l2_ctrl_type type
  	}
  }
  
@@ -388,7 +384,7 @@ index b14eb8fb5bad..0575866afc68 100644
  /* Set the handler's error code if it wasn't set earlier already */
  static inline int handler_set_err(struct v4l2_ctrl_handler *hdl, int err)
  {
-@@ -973,6 +1052,8 @@ void v4l2_ctrl_handler_free(struct v4l2_ctrl_handler *hdl)
+@@ -983,6 +1062,8 @@ void v4l2_ctrl_handler_free(struct v4l2_
  	/* Free all nodes */
  	list_for_each_entry_safe(ref, next_ref, &hdl->ctrl_refs, node) {
  		list_del(&ref->node);
@@ -397,7 +393,7 @@ index b14eb8fb5bad..0575866afc68 100644
  		kfree(ref);
  	}
  	/* Free all controls owned by the handler */
-@@ -980,6 +1061,7 @@ void v4l2_ctrl_handler_free(struct v4l2_ctrl_handler *hdl)
+@@ -990,6 +1071,7 @@ void v4l2_ctrl_handler_free(struct v4l2_
  		list_del(&ctrl->node);
  		list_for_each_entry_safe(sev, next_sev, &ctrl->ev_subs, node)
  			list_del(&sev->node);
@@ -405,7 +401,7 @@ index b14eb8fb5bad..0575866afc68 100644
  		kvfree(ctrl);
  	}
  	kvfree(hdl->buckets);
-@@ -1095,7 +1177,7 @@ int handler_new_ref(struct v4l2_ctrl_handler *hdl,
+@@ -1105,7 +1187,7 @@ int handler_new_ref(struct v4l2_ctrl_han
  	if (hdl->error)
  		return hdl->error;
  
@@ -414,7 +410,7 @@ index b14eb8fb5bad..0575866afc68 100644
  		size_extra_req = ctrl->elems * ctrl->elem_size;
  	new_ref = kzalloc(sizeof(*new_ref) + size_extra_req, GFP_KERNEL);
  	if (!new_ref)
-@@ -1263,7 +1345,6 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
+@@ -1273,7 +1355,6 @@ static struct v4l2_ctrl *v4l2_ctrl_new(s
  			elem_size = sizeof(s32);
  		break;
  	}
@@ -422,7 +418,7 @@ index b14eb8fb5bad..0575866afc68 100644
  
  	/* Sanity checks */
  	if (id == 0 || name == NULL || !elem_size ||
-@@ -1284,17 +1365,33 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
+@@ -1294,17 +1375,33 @@ static struct v4l2_ctrl *v4l2_ctrl_new(s
  		handler_set_err(hdl, -EINVAL);
  		return NULL;
  	}
@@ -460,7 +456,7 @@ index b14eb8fb5bad..0575866afc68 100644
  		sz_extra += 2 * tot_ctrl_size;
  
  	if (type >= V4L2_CTRL_COMPOUND_TYPES && p_def.p_const)
-@@ -1323,7 +1420,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
+@@ -1333,7 +1430,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(s
  	ctrl->is_ptr = is_array || type >= V4L2_CTRL_COMPOUND_TYPES || ctrl->is_string;
  	ctrl->is_int = !ctrl->is_ptr && type != V4L2_CTRL_TYPE_INTEGER64;
  	ctrl->is_array = is_array;
@@ -470,7 +466,7 @@ index b14eb8fb5bad..0575866afc68 100644
  	ctrl->nr_of_dims = nr_of_dims;
  	if (nr_of_dims)
  		memcpy(ctrl->dims, dims, nr_of_dims * sizeof(dims[0]));
-@@ -1336,6 +1435,16 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
+@@ -1346,6 +1445,16 @@ static struct v4l2_ctrl *v4l2_ctrl_new(s
  	ctrl->cur.val = ctrl->val = def;
  	data = &ctrl[1];
  
@@ -487,7 +483,7 @@ index b14eb8fb5bad..0575866afc68 100644
  	if (!ctrl->is_int) {
  		ctrl->p_new.p = data;
  		ctrl->p_cur.p = data + tot_ctrl_size;
-@@ -1345,7 +1454,10 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
+@@ -1355,7 +1464,10 @@ static struct v4l2_ctrl *v4l2_ctrl_new(s
  	}
  
  	if (type >= V4L2_CTRL_COMPOUND_TYPES && p_def.p_const) {
@@ -499,7 +495,7 @@ index b14eb8fb5bad..0575866afc68 100644
  		memcpy(ctrl->p_def.p, p_def.p_const, elem_size);
  	}
  
-@@ -1355,6 +1467,7 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
+@@ -1365,6 +1477,7 @@ static struct v4l2_ctrl *v4l2_ctrl_new(s
  	}
  
  	if (handler_new_ref(hdl, ctrl, NULL, false, false)) {
@@ -507,7 +503,7 @@ index b14eb8fb5bad..0575866afc68 100644
  		kvfree(ctrl);
  		return NULL;
  	}
-@@ -1692,6 +1805,9 @@ static int cluster_changed(struct v4l2_ctrl *master)
+@@ -1702,6 +1815,9 @@ static int cluster_changed(struct v4l2_c
  			continue;
  		}
  
@@ -517,8 +513,6 @@ index b14eb8fb5bad..0575866afc68 100644
  		for (idx = 0; !ctrl_changed && idx < ctrl->elems; idx++)
  			ctrl_changed = !ctrl->type_ops->equal(ctrl, idx,
  				ctrl->p_cur, ctrl->p_new);
-diff --git a/drivers/media/v4l2-core/v4l2-ctrls-priv.h b/drivers/media/v4l2-core/v4l2-ctrls-priv.h
-index d4bf2c716f97..aba6176fab6c 100644
 --- a/drivers/media/v4l2-core/v4l2-ctrls-priv.h
 +++ b/drivers/media/v4l2-core/v4l2-ctrls-priv.h
 @@ -57,10 +57,9 @@ void cur_to_new(struct v4l2_ctrl *ctrl);
@@ -533,11 +527,9 @@ index d4bf2c716f97..aba6176fab6c 100644
  int handler_new_ref(struct v4l2_ctrl_handler *hdl,
  		    struct v4l2_ctrl *ctrl,
  		    struct v4l2_ctrl_ref **ctrl_ref,
-diff --git a/drivers/media/v4l2-core/v4l2-ctrls-request.c b/drivers/media/v4l2-core/v4l2-ctrls-request.c
-index 7d098f287fd9..c637049d7a2b 100644
 --- a/drivers/media/v4l2-core/v4l2-ctrls-request.c
 +++ b/drivers/media/v4l2-core/v4l2-ctrls-request.c
-@@ -143,7 +143,7 @@ v4l2_ctrl_request_hdl_ctrl_find(struct v4l2_ctrl_handler *hdl, u32 id)
+@@ -143,7 +143,7 @@ v4l2_ctrl_request_hdl_ctrl_find(struct v
  {
  	struct v4l2_ctrl_ref *ref = find_ref_lock(hdl, id);
  
@@ -546,7 +538,7 @@ index 7d098f287fd9..c637049d7a2b 100644
  }
  EXPORT_SYMBOL_GPL(v4l2_ctrl_request_hdl_ctrl_find);
  
-@@ -373,7 +373,7 @@ void v4l2_ctrl_request_complete(struct media_request *req,
+@@ -373,7 +373,7 @@ void v4l2_ctrl_request_complete(struct m
  			v4l2_ctrl_unlock(master);
  			continue;
  		}
@@ -555,7 +547,7 @@ index 7d098f287fd9..c637049d7a2b 100644
  			continue;
  
  		/* Copy the current control value into the request */
-@@ -442,7 +442,7 @@ int v4l2_ctrl_request_setup(struct media_request *req,
+@@ -442,7 +442,7 @@ int v4l2_ctrl_request_setup(struct media
  				struct v4l2_ctrl_ref *r =
  					find_ref(hdl, master->cluster[i]->id);
  
@@ -564,7 +556,7 @@ index 7d098f287fd9..c637049d7a2b 100644
  					have_new_data = true;
  					break;
  				}
-@@ -458,7 +458,11 @@ int v4l2_ctrl_request_setup(struct media_request *req,
+@@ -458,7 +458,11 @@ int v4l2_ctrl_request_setup(struct media
  				struct v4l2_ctrl_ref *r =
  					find_ref(hdl, master->cluster[i]->id);
  
@@ -577,7 +569,7 @@ index 7d098f287fd9..c637049d7a2b 100644
  				master->cluster[i]->is_new = 1;
  				r->req_done = true;
  			}
-@@ -490,6 +494,7 @@ int v4l2_ctrl_request_setup(struct media_request *req,
+@@ -490,6 +494,7 @@ int v4l2_ctrl_request_setup(struct media
  			break;
  	}
  
@@ -585,11 +577,9 @@ index 7d098f287fd9..c637049d7a2b 100644
  	media_request_object_put(obj);
  	return ret;
  }
-diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
-index 575b59fbac77..ebd9cef13309 100644
 --- a/include/media/v4l2-ctrls.h
 +++ b/include/media/v4l2-ctrls.h
-@@ -181,6 +181,8 @@ typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv);
+@@ -181,6 +181,8 @@ typedef void (*v4l2_ctrl_notify_fnc)(str
   *		and/or has type %V4L2_CTRL_TYPE_STRING. In other words, &struct
   *		v4l2_ext_control uses field p to point to the data.
   * @is_array: If set, then this control contains an N-dimensional array.
@@ -598,7 +588,7 @@ index 575b59fbac77..ebd9cef13309 100644
   * @has_volatiles: If set, then one or more members of the cluster are volatile.
   *		Drivers should never touch this flag.
   * @call_notify: If set, then call the handler's notify function whenever the
-@@ -201,6 +203,9 @@ typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv);
+@@ -201,6 +203,9 @@ typedef void (*v4l2_ctrl_notify_fnc)(str
   * @step:	The control's step value for non-menu controls.
   * @elems:	The number of elements in the N-dimensional array.
   * @elem_size:	The size in bytes of the control.
@@ -608,7 +598,7 @@ index 575b59fbac77..ebd9cef13309 100644
   * @dims:	The size of each dimension.
   * @nr_of_dims:The number of dimensions in @dims.
   * @menu_skip_mask: The control's skip mask for menu controls. This makes it
-@@ -219,15 +224,21 @@ typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv);
+@@ -219,15 +224,21 @@ typedef void (*v4l2_ctrl_notify_fnc)(str
   *		:math:`ceil(\frac{maximum - minimum}{step}) + 1`.
   *		Used only if the @type is %V4L2_CTRL_TYPE_INTEGER_MENU.
   * @flags:	The control's flags.
@@ -696,6 +686,3 @@ index 575b59fbac77..ebd9cef13309 100644
  	union v4l2_ctrl_ptr p_req;
  };
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0495-media-rpivid-Make-slice-ctrl-dynamic.patch b/root/target/linux/bcm27xx/patches-5.15/950-0474-media-rpivid-Make-slice-ctrl-dynamic.patch
similarity index 87%
rename from root/target/linux/bcm27xx/patches-5.15/0495-media-rpivid-Make-slice-ctrl-dynamic.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0474-media-rpivid-Make-slice-ctrl-dynamic.patch
index 37d7ffdd..dd2d30df 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0495-media-rpivid-Make-slice-ctrl-dynamic.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0474-media-rpivid-Make-slice-ctrl-dynamic.patch
@@ -1,7 +1,7 @@
-From 32891c49786a6a3e7f16a619d4179c0862194076 Mon Sep 17 00:00:00 2001
+From e7d8a28a06e3240a6ab6b97a00acd0c06030ba22 Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Thu, 29 Apr 2021 19:17:06 +0100
-Subject: [PATCH 495/634] media: rpivid: Make slice ctrl dynamic
+Subject: [PATCH 474/828] media: rpivid: Make slice ctrl dynamic
 
 Allows the user to submit a whole frames worth of slice headers in
 one lump along with a single bitstream dmabuf for the whole lot.
@@ -14,11 +14,9 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  drivers/staging/media/rpivid/rpivid_h265.c | 151 +++++++++++----------
  3 files changed, 99 insertions(+), 74 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid.c b/drivers/staging/media/rpivid/rpivid.c
-index b364a62e8a3a..ed629cddc123 100644
 --- a/drivers/staging/media/rpivid/rpivid.c
 +++ b/drivers/staging/media/rpivid/rpivid.c
-@@ -63,7 +63,11 @@ static const struct rpivid_control rpivid_ctrls[] = {
+@@ -63,7 +63,11 @@ static const struct rpivid_control rpivi
  	},
  	{
  		.cfg = {
@@ -30,8 +28,6 @@ index b364a62e8a3a..ed629cddc123 100644
  		},
  		.required	= true,
  	},
-diff --git a/drivers/staging/media/rpivid/rpivid_dec.c b/drivers/staging/media/rpivid/rpivid_dec.c
-index e5137018a83f..e05f668f216d 100644
 --- a/drivers/staging/media/rpivid/rpivid_dec.c
 +++ b/drivers/staging/media/rpivid/rpivid_dec.c
 @@ -46,22 +46,34 @@ void rpivid_device_run(void *priv)
@@ -72,8 +68,6 @@ index e5137018a83f..e05f668f216d 100644
  
  	default:
  		break;
-diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
-index b630805dbef3..72d4c2e20b5f 100644
 --- a/drivers/staging/media/rpivid/rpivid_h265.c
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
 @@ -245,7 +245,6 @@ struct rpivid_dec_state {
@@ -84,7 +78,7 @@ index b630805dbef3..72d4c2e20b5f 100644
  	bool slice_temporal_mvp;  /* Slice flag but constant for frame */
  
  	// Temp vars per run - don't actually need to persist
-@@ -740,7 +739,8 @@ static void new_slice_segment(struct rpivid_dec_env *const de,
+@@ -740,7 +739,8 @@ static void new_slice_segment(struct rpi
  				V4L2_HEVC_PPS_FLAG_CONSTRAINED_INTRA_PRED))
  						<< 24));
  
@@ -94,7 +88,7 @@ index b630805dbef3..72d4c2e20b5f 100644
  		write_scaling_factors(de);
  
  	if (!s->dependent_slice_segment_flag) {
-@@ -1111,7 +1111,8 @@ static int wpp_end_previous_slice(struct rpivid_dec_env *const de,
+@@ -1111,7 +1111,8 @@ static int wpp_end_previous_slice(struct
   * next chunk code simpler
   */
  static int wpp_decode_slice(struct rpivid_dec_env *const de,
@@ -104,7 +98,7 @@ index b630805dbef3..72d4c2e20b5f 100644
  {
  	bool reset_qp_y = true;
  	const bool indep = !s->dependent_slice_segment_flag;
-@@ -1150,7 +1151,7 @@ static int wpp_decode_slice(struct rpivid_dec_env *const de,
+@@ -1150,7 +1151,7 @@ static int wpp_decode_slice(struct rpivi
  			0, 0, s->start_ctb_x, s->start_ctb_y,
  			s->slice_qp, slice_reg_const(s));
  
@@ -113,7 +107,7 @@ index b630805dbef3..72d4c2e20b5f 100644
  		rv = wpp_entry_fill(de, s, s->ctb_height - 1);
  		if (rv)
  			return rv;
-@@ -1229,7 +1230,8 @@ static int end_previous_slice(struct rpivid_dec_env *const de,
+@@ -1229,7 +1230,8 @@ static int end_previous_slice(struct rpi
  }
  
  static int decode_slice(struct rpivid_dec_env *const de,
@@ -123,7 +117,7 @@ index b630805dbef3..72d4c2e20b5f 100644
  {
  	bool reset_qp_y;
  	unsigned int tile_x = ctb_to_tile_x(s, s->start_ctb_x);
-@@ -1275,7 +1277,7 @@ static int decode_slice(struct rpivid_dec_env *const de,
+@@ -1275,7 +1277,7 @@ static int decode_slice(struct rpivid_de
  	 * now, otherwise this will be done at the start of the next slice
  	 * when it will be known where this slice finishes
  	 */
@@ -132,7 +126,7 @@ index b630805dbef3..72d4c2e20b5f 100644
  		rv = tile_entry_fill(de, s,
  				     s->tile_width - 1,
  				     s->tile_height - 1);
-@@ -1670,11 +1672,13 @@ static u32 mk_config2(const struct rpivid_dec_state *const s)
+@@ -1670,11 +1672,13 @@ static u32 mk_config2(const struct rpivi
  static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
  {
  	struct rpivid_dev *const dev = ctx->dev;
@@ -149,7 +143,7 @@ index b630805dbef3..72d4c2e20b5f 100644
  	struct rpivid_q_aux *dpb_q_aux[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
  	struct rpivid_dec_state *const s = ctx->state;
  	struct vb2_queue *vq;
-@@ -1684,20 +1688,18 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1684,20 +1688,18 @@ static void rpivid_h265_setup(struct rpi
  	int use_aux;
  	int rv;
  	bool slice_temporal_mvp;
@@ -174,7 +168,7 @@ index b630805dbef3..72d4c2e20b5f 100644
  		switch (de->state) {
  		case RPIVID_DECODE_SLICE_CONTINUE:
  			// Expected state
-@@ -1830,7 +1832,7 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1830,7 +1832,7 @@ static void rpivid_h265_setup(struct rpi
  		de->rpi_config2 = mk_config2(s);
  		de->rpi_framesize = (s->sps.pic_height_in_luma_samples << 16) |
  				    s->sps.pic_width_in_luma_samples;
@@ -183,7 +177,7 @@ index b630805dbef3..72d4c2e20b5f 100644
  
  		if (s->sps.flags &
  		    V4L2_HEVC_SPS_FLAG_SPS_TEMPORAL_MVP_ENABLED) {
-@@ -1839,17 +1841,17 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1839,17 +1841,17 @@ static void rpivid_h265_setup(struct rpi
  
  		s->slice_idx = 0;
  
@@ -204,7 +198,7 @@ index b630805dbef3..72d4c2e20b5f 100644
  			size_t bits_alloc;
  			bits_alloc = rpivid_bit_buf_size(s->sps.pic_width_in_luma_samples,
  							 s->sps.pic_height_in_luma_samples,
-@@ -1873,21 +1875,7 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1873,21 +1875,7 @@ static void rpivid_h265_setup(struct rpi
  	s->src_addr = 0;
  	s->src_buf = NULL;
  
@@ -227,7 +221,7 @@ index b630805dbef3..72d4c2e20b5f 100644
  		s->src_addr = vb2_dma_contig_plane_dma_addr(&run->src->vb2_buf,
  							    0);
  	if (!s->src_addr)
-@@ -1898,44 +1886,65 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1898,44 +1886,65 @@ static void rpivid_h265_setup(struct rpi
  	}
  
  	// Pre calc a few things
@@ -264,6 +258,9 @@ index b630805dbef3..72d4c2e20b5f 100644
 +			  V4L2_HEVC_SLICE_PARAMS_FLAG_DEPENDENT_SLICE_SEGMENT) != 0);
 +
 +		s->nb_refs[0] = (sh->slice_type == HEVC_SLICE_I) ?
++					0 :
++					sh->num_ref_idx_l0_active_minus1 + 1;
++		s->nb_refs[1] = (sh->slice_type != HEVC_SLICE_B) ?
  					0 :
 -					(5 - sh->five_minus_max_num_merge_cand);
 -	// * SH DSS flag invented by me - but clearly needed
@@ -289,18 +286,14 @@ index b630805dbef3..72d4c2e20b5f 100644
 -	prev_rs = !s->start_ts ? 0 : s->ctb_addr_ts_to_rs[s->start_ts - 1];
 -	s->prev_ctb_x = prev_rs % de->pic_width_in_ctbs_y;
 -	s->prev_ctb_y = prev_rs / de->pic_width_in_ctbs_y;
--
++					sh->num_ref_idx_l1_active_minus1 + 1;
+ 
 -	if ((s->pps.flags & V4L2_HEVC_PPS_FLAG_ENTROPY_CODING_SYNC_ENABLED))
 -		rv = wpp_decode_slice(de, s);
 -	else
 -		rv = decode_slice(de, s);
 -	if (rv)
 -		goto fail;
-+					sh->num_ref_idx_l0_active_minus1 + 1;
-+		s->nb_refs[1] = (sh->slice_type != HEVC_SLICE_B) ?
-+					0 :
-+					sh->num_ref_idx_l1_active_minus1 + 1;
-+
 +		if (s->sps.flags & V4L2_HEVC_SPS_FLAG_SCALING_LIST_ENABLED)
 +			populate_scaling_factors(run, de, s);
 +
@@ -328,7 +321,7 @@ index b630805dbef3..72d4c2e20b5f 100644
  		xtrace_ok(dev, de);
  		return;
  	}
-@@ -2054,8 +2063,8 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -2054,8 +2063,8 @@ static void rpivid_h265_setup(struct rpi
  fail:
  	if (de)
  		// Actual error reporting happens in Trigger
@@ -339,6 +332,3 @@ index b630805dbef3..72d4c2e20b5f 100644
  	xtrace_fail(dev, de);
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0496-media-rpivid-Only-create-aux-entries-for-H265-if-nee.patch b/root/target/linux/bcm27xx/patches-5.15/950-0475-media-rpivid-Only-create-aux-entries-for-H265-if-nee.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0496-media-rpivid-Only-create-aux-entries-for-H265-if-nee.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0475-media-rpivid-Only-create-aux-entries-for-H265-if-nee.patch
index 88d6325a..7c746e8c 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0496-media-rpivid-Only-create-aux-entries-for-H265-if-nee.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0475-media-rpivid-Only-create-aux-entries-for-H265-if-nee.patch
@@ -1,7 +1,7 @@
-From 846f1cc6ec09c418c1257bd6f40a273a22e01d51 Mon Sep 17 00:00:00 2001
+From 644dd0de8a0a569b3ea18ba31bc9b9612b9a8f59 Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Thu, 6 May 2021 13:48:05 +0100
-Subject: [PATCH 496/634] media: rpivid: Only create aux entries for H265 if
+Subject: [PATCH 475/828] media: rpivid: Only create aux entries for H265 if
  needed
 
 Only create aux entries of mv info for frames where that info might
@@ -13,8 +13,6 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  drivers/staging/media/rpivid/rpivid_h265.c | 38 +++++++++++++---------
  1 file changed, 23 insertions(+), 15 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
-index 72d4c2e20b5f..e3a5c331ca10 100644
 --- a/drivers/staging/media/rpivid/rpivid_h265.c
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
 @@ -246,6 +246,8 @@ struct rpivid_dec_state {
@@ -26,7 +24,7 @@ index 72d4c2e20b5f..e3a5c331ca10 100644
  
  	// Temp vars per run - don't actually need to persist
  	u8 *src_buf;
-@@ -1657,7 +1659,7 @@ static u32 mk_config2(const struct rpivid_dec_state *const s)
+@@ -1657,7 +1659,7 @@ static u32 mk_config2(const struct rpivi
  		c |= BIT(13);
  	if (sps->flags & V4L2_HEVC_SPS_FLAG_STRONG_INTRA_SMOOTHING_ENABLED)
  		c |= BIT(14);
@@ -35,7 +33,7 @@ index 72d4c2e20b5f..e3a5c331ca10 100644
  		c |= BIT(15); /* Write motion vectors to external memory */
  	c |= (pps->log2_parallel_merge_level_minus2 + 2) << 16;
  	if (s->slice_temporal_mvp)
-@@ -1669,6 +1671,14 @@ static u32 mk_config2(const struct rpivid_dec_state *const s)
+@@ -1669,6 +1671,14 @@ static u32 mk_config2(const struct rpivi
  	return c;
  }
  
@@ -50,7 +48,7 @@ index 72d4c2e20b5f..e3a5c331ca10 100644
  static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
  {
  	struct rpivid_dev *const dev = ctx->dev;
-@@ -1685,7 +1695,6 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1685,7 +1695,6 @@ static void rpivid_h265_setup(struct rpi
  	struct rpivid_dec_env *de = ctx->dec0;
  	unsigned int prev_rs;
  	unsigned int i;
@@ -58,7 +56,7 @@ index 72d4c2e20b5f..e3a5c331ca10 100644
  	int rv;
  	bool slice_temporal_mvp;
  	bool frame_end;
-@@ -1828,6 +1837,16 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1828,6 +1837,16 @@ static void rpivid_h265_setup(struct rpi
  		 */
  		s->slice_temporal_mvp = slice_temporal_mvp;
  
@@ -75,7 +73,7 @@ index 72d4c2e20b5f..e3a5c331ca10 100644
  		// Phase 2 reg pre-calc
  		de->rpi_config2 = mk_config2(s);
  		de->rpi_framesize = (s->sps.pic_height_in_luma_samples << 16) |
-@@ -1952,15 +1971,6 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1952,15 +1971,6 @@ static void rpivid_h265_setup(struct rpi
  	// Frame end
  	memset(dpb_q_aux, 0,
  	       sizeof(*dpb_q_aux) * V4L2_HEVC_DPB_ENTRIES_NUM_MAX);
@@ -91,7 +89,7 @@ index 72d4c2e20b5f..e3a5c331ca10 100644
  
  	// Locate ref frames
  	// At least in the current implementation this is constant across all
-@@ -1994,7 +2004,7 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -1994,7 +2004,7 @@ static void rpivid_h265_setup(struct rpi
  			continue;
  		}
  
@@ -100,7 +98,7 @@ index 72d4c2e20b5f..e3a5c331ca10 100644
  			dpb_q_aux[i] = aux_q_ref_idx(ctx, buffer_index);
  			if (!dpb_q_aux[i])
  				v4l2_warn(&dev->v4l2_dev,
-@@ -2016,9 +2026,7 @@ static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
+@@ -2016,9 +2026,7 @@ static void rpivid_h265_setup(struct rpi
  	// now
  	aux_q_release(ctx, &s->frame_aux);
  
@@ -111,6 +109,3 @@ index 72d4c2e20b5f..e3a5c331ca10 100644
  		s->frame_aux = aux_q_new(ctx, run->dst->vb2_buf.index);
  
  		if (!s->frame_aux) {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0497-usb-xhci-workaround-for-bogus-SET_DEQ_PENDING-endpoi.patch b/root/target/linux/bcm27xx/patches-5.15/950-0476-usb-xhci-workaround-for-bogus-SET_DEQ_PENDING-endpoi.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0497-usb-xhci-workaround-for-bogus-SET_DEQ_PENDING-endpoi.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0476-usb-xhci-workaround-for-bogus-SET_DEQ_PENDING-endpoi.patch
index 4fb3492c..5f8ddecd 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0497-usb-xhci-workaround-for-bogus-SET_DEQ_PENDING-endpoi.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0476-usb-xhci-workaround-for-bogus-SET_DEQ_PENDING-endpoi.patch
@@ -1,7 +1,7 @@
-From 6a9c7ba5ba5ad5ec7dc91e66fb96cc3c5c357484 Mon Sep 17 00:00:00 2001
+From b94d8ced751bac36b5b0211ceb4a87c13de9b19d Mon Sep 17 00:00:00 2001
 From: Jonathan Bell <jonathan@raspberrypi.com>
 Date: Wed, 11 Aug 2021 15:33:57 +0100
-Subject: [PATCH 497/634] usb: xhci: workaround for bogus SET_DEQ_PENDING
+Subject: [PATCH 476/828] usb: xhci: workaround for bogus SET_DEQ_PENDING
  endpoint state
 
 See https://github.com/raspberrypi/linux/issues/3981
@@ -24,11 +24,9 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  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 311597bba80e..0b21b66b4510 100644
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
-@@ -670,9 +670,9 @@ static int xhci_move_dequeue_past_td(struct xhci_hcd *xhci,
+@@ -677,9 +677,9 @@ deq_found:
  	}
  
  	if ((ep->ep_state & SET_DEQ_PENDING)) {
@@ -41,6 +39,3 @@ index 311597bba80e..0b21b66b4510 100644
  	}
  
  	/* This function gets called from contexts where it cannot sleep */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0498-media-i2c-imx477-Allow-control-of-on-sensor-DPC.patch b/root/target/linux/bcm27xx/patches-5.15/950-0477-media-i2c-imx477-Allow-control-of-on-sensor-DPC.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0498-media-i2c-imx477-Allow-control-of-on-sensor-DPC.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0477-media-i2c-imx477-Allow-control-of-on-sensor-DPC.patch
index ec88434a..63150168 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0498-media-i2c-imx477-Allow-control-of-on-sensor-DPC.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0477-media-i2c-imx477-Allow-control-of-on-sensor-DPC.patch
@@ -1,7 +1,7 @@
-From 7e961d09676b6f42c1c86989e5734a5da5b0234b Mon Sep 17 00:00:00 2001
+From 5c9c793ef2c247e62fb8a350c8e2fa199640cfbd Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Wed, 8 Sep 2021 14:15:17 +0100
-Subject: [PATCH 498/634] media: i2c: imx477: Allow control of on-sensor DPC
+Subject: [PATCH 477/828] media: i2c: imx477: Allow control of on-sensor DPC
 
 A module parameter "dpc_enable" is added to allow the control of the
 sensor's on-board DPC (Defective Pixel Correction) function.
@@ -14,8 +14,6 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/i2c/imx477.c | 8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index ba03c68e64a0..96486a7f007c 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
 @@ -21,6 +21,10 @@
@@ -29,7 +27,7 @@ index ba03c68e64a0..96486a7f007c 100644
  #define IMX477_REG_VALUE_08BIT		1
  #define IMX477_REG_VALUE_16BIT		2
  
-@@ -1713,6 +1717,10 @@ static int imx477_start_streaming(struct imx477 *imx477)
+@@ -1713,6 +1717,10 @@ static int imx477_start_streaming(struct
  		return ret;
  	}
  
@@ -40,6 +38,3 @@ index ba03c68e64a0..96486a7f007c 100644
  	/* Apply customized values from user */
  	ret =  __v4l2_ctrl_handler_setup(imx477->sd.ctrl_handler);
  	if (ret)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0499-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch b/root/target/linux/bcm27xx/patches-5.15/950-0478-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0499-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0478-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch
index de1e88b0..4ec82c50 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0499-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0478-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch
@@ -1,7 +1,7 @@
-From 0886d0ede8df61901177b47674841b4367bcb01f Mon Sep 17 00:00:00 2001
+From f33fff3dfbd19bfa3003d441e0c83e73ef8bb5ba Mon Sep 17 00:00:00 2001
 From: Jonathan Bell <jonathan@raspberrypi.com>
 Date: Thu, 15 Apr 2021 13:15:14 +0100
-Subject: [PATCH 499/634] sound/usb: add device quirks for A4Tech FHD 1080p
+Subject: [PATCH 478/828] sound/usb: add device quirks for A4Tech FHD 1080p
  webcams
 
 These devices use a type of Sonix chipset that produces broken microphone
@@ -14,11 +14,9 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  sound/usb/quirks.c | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
-index 64e1c20311ed..47908f3ecc79 100644
 --- a/sound/usb/quirks.c
 +++ b/sound/usb/quirks.c
-@@ -1900,6 +1900,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
+@@ -1900,6 +1900,8 @@ static const struct usb_audio_quirk_flag
  		   QUIRK_FLAG_ALIGN_TRANSFER),
  	DEVICE_FLG(0x1224, 0x2a25, /* Jieli Technology USB PHY 2.0 */
  		   QUIRK_FLAG_GET_SAMPLE_RATE),
@@ -27,6 +25,3 @@ index 64e1c20311ed..47908f3ecc79 100644
  
  	/* Vendor matches */
  	VENDOR_FLG(0x045e, /* MS Lifecam */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0500-sound-usb-call-usb_autopm_get_interface-for-devices-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0479-sound-usb-call-usb_autopm_get_interface-for-devices-.patch
similarity index 79%
rename from root/target/linux/bcm27xx/patches-5.15/0500-sound-usb-call-usb_autopm_get_interface-for-devices-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0479-sound-usb-call-usb_autopm_get_interface-for-devices-.patch
index efb30146..338c64d1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0500-sound-usb-call-usb_autopm_get_interface-for-devices-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0479-sound-usb-call-usb_autopm_get_interface-for-devices-.patch
@@ -1,7 +1,7 @@
-From f3d4b7b2fa18e30cf359d604db8d2d03449a7cd6 Mon Sep 17 00:00:00 2001
+From 4ee84fb1739e19524abff659c5cea4480e9ee648 Mon Sep 17 00:00:00 2001
 From: Jonathan Bell <jonathan@raspberrypi.com>
 Date: Wed, 15 Sep 2021 17:56:45 +0100
-Subject: [PATCH 500/634] sound/usb: call usb_autopm_get_interface() for
+Subject: [PATCH 479/828] sound/usb: call usb_autopm_get_interface() for
  devices that should not be suspended
 
 Webcams with microphones are composite devices, and autosuspend is set
@@ -17,11 +17,9 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  sound/usb/card.c | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
-diff --git a/sound/usb/card.c b/sound/usb/card.c
-index 1764b9302d46..fbbe330a52e3 100644
 --- a/sound/usb/card.c
 +++ b/sound/usb/card.c
-@@ -817,8 +817,14 @@ static int usb_audio_probe(struct usb_interface *intf,
+@@ -817,8 +817,14 @@ static int usb_audio_probe(struct usb_in
  	if (ignore_ctl_error)
  		chip->quirk_flags |= QUIRK_FLAG_IGNORE_CTL_ERROR;
  
@@ -37,6 +35,3 @@ index 1764b9302d46..fbbe330a52e3 100644
  
  	/*
  	 * For devices with more than one control interface, we assume the
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0501-brcmfmac-Try-product-specific-clm_blob-names-first.patch b/root/target/linux/bcm27xx/patches-5.15/950-0480-brcmfmac-Try-product-specific-clm_blob-names-first.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0501-brcmfmac-Try-product-specific-clm_blob-names-first.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0480-brcmfmac-Try-product-specific-clm_blob-names-first.patch
index 62082b3e..20149f9a 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0501-brcmfmac-Try-product-specific-clm_blob-names-first.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0480-brcmfmac-Try-product-specific-clm_blob-names-first.patch
@@ -1,7 +1,7 @@
-From 0472e563446d94122441b919a244c943ae7a9891 Mon Sep 17 00:00:00 2001
+From 900742a8a47f34ba3df6cd9739cde0b22593e8a7 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Thu, 22 Jul 2021 14:34:42 +0100
-Subject: [PATCH 501/634] brcmfmac: Try product-specific clm_blob names first
+Subject: [PATCH 480/828] brcmfmac: Try product-specific clm_blob names first
 
 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 ---
@@ -13,8 +13,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c |  7 ++++++-
  6 files changed, 45 insertions(+), 8 deletions(-)
 
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
-index 3f5da3bb6aa5..ba3c58caac9f 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
 @@ -78,7 +78,7 @@ struct brcmf_bus_ops {
@@ -42,11 +40,9 @@ index 3f5da3bb6aa5..ba3c58caac9f 100644
  }
  
  static inline
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
-index e3758bd86acf..9047a0813ebf 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
-@@ -134,13 +134,23 @@ static int brcmf_c_process_clm_blob(struct brcmf_if *ifp)
+@@ -134,13 +134,23 @@ static int brcmf_c_process_clm_blob(stru
  	brcmf_dbg(TRACE, "Enter\n");
  
  	memset(clm_name, 0, sizeof(clm_name));
@@ -72,11 +68,9 @@ index e3758bd86acf..9047a0813ebf 100644
  	if (err) {
  		brcmf_info("no clm_blob available (err=%d), device may have limited channels available\n",
  			   err);
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
-index bce38ddfab9e..2452d9936402 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
-@@ -645,7 +645,7 @@ static int brcmf_fw_request_firmware(const struct firmware **fw,
+@@ -647,7 +647,7 @@ static int brcmf_fw_request_firmware(con
  		if (!alt_path)
  			goto fallback;
  
@@ -85,11 +79,9 @@ index bce38ddfab9e..2452d9936402 100644
  		kfree(alt_path);
  		if (ret == 0)
  			return ret;
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
-index 8b149996fc00..3a45391db33c 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
-@@ -1402,7 +1402,8 @@ static int brcmf_pcie_get_memdump(struct device *dev, void *data, size_t len)
+@@ -1381,7 +1381,8 @@ static int brcmf_pcie_get_memdump(struct
  }
  
  static
@@ -99,7 +91,7 @@ index 8b149996fc00..3a45391db33c 100644
  {
  	struct brcmf_bus *bus_if = dev_get_drvdata(dev);
  	struct brcmf_fw_request *fwreq;
-@@ -1410,6 +1411,10 @@ int brcmf_pcie_get_fwname(struct device *dev, const char *ext, u8 *fw_name)
+@@ -1389,6 +1390,10 @@ int brcmf_pcie_get_fwname(struct device
  		{ ext, fw_name },
  	};
  
@@ -110,11 +102,9 @@ index 8b149996fc00..3a45391db33c 100644
  	fwreq = brcmf_fw_alloc_request(bus_if->chip, bus_if->chiprev,
  				       brcmf_pcie_fwnames,
  				       ARRAY_SIZE(brcmf_pcie_fwnames),
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-index 60f4e689ef14..fd1a09228f9a 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-@@ -4135,14 +4135,24 @@ brcmf_sdio_watchdog(struct timer_list *t)
+@@ -4131,14 +4131,24 @@ brcmf_sdio_watchdog(struct timer_list *t
  }
  
  static
@@ -140,11 +130,9 @@ index 60f4e689ef14..fd1a09228f9a 100644
  	fwreq = brcmf_fw_alloc_request(bus_if->chip, bus_if->chiprev,
  				       brcmf_sdio_fwnames,
  				       ARRAY_SIZE(brcmf_sdio_fwnames),
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
-index 9fb68c2dc7e3..9bf2dbd30ded 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
-@@ -1155,7 +1155,8 @@ struct brcmf_usbdev *brcmf_usb_attach(struct brcmf_usbdev_info *devinfo,
+@@ -1155,7 +1155,8 @@ error:
  }
  
  static
@@ -154,7 +142,7 @@ index 9fb68c2dc7e3..9bf2dbd30ded 100644
  {
  	struct brcmf_bus *bus = dev_get_drvdata(dev);
  	struct brcmf_fw_request *fwreq;
-@@ -1163,6 +1164,10 @@ int brcmf_usb_get_fwname(struct device *dev, const char *ext, u8 *fw_name)
+@@ -1163,6 +1164,10 @@ int brcmf_usb_get_fwname(struct device *
  		{ ext, fw_name },
  	};
  
@@ -165,6 +153,3 @@ index 9fb68c2dc7e3..9bf2dbd30ded 100644
  	fwreq = brcmf_fw_alloc_request(bus->chip, bus->chiprev,
  				       brcmf_usb_fwnames,
  				       ARRAY_SIZE(brcmf_usb_fwnames),
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0502-staging-vchiq_arm-Add-36-bit-address-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0481-staging-vchiq_arm-Add-36-bit-address-support.patch
similarity index 84%
rename from root/target/linux/bcm27xx/patches-5.15/0502-staging-vchiq_arm-Add-36-bit-address-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0481-staging-vchiq_arm-Add-36-bit-address-support.patch
index d9c2bfd5..847665f0 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0502-staging-vchiq_arm-Add-36-bit-address-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0481-staging-vchiq_arm-Add-36-bit-address-support.patch
@@ -1,7 +1,7 @@
-From 6e8cee1e36dc0d6efeb1656ae652966b6f332c1b Mon Sep 17 00:00:00 2001
+From 127b9a749b367050cd1ba8b7614a8b7239176678 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Thu, 1 Nov 2018 17:31:37 +0000
-Subject: [PATCH 502/634] staging: vchiq_arm: Add 36-bit address support
+Subject: [PATCH 481/828] staging: vchiq_arm: Add 36-bit address support
 
 Conditional on a new compatible string, change the pagelist encoding
 such that the top 24 bits are the pfn, leaving 8 bits for run length
@@ -18,11 +18,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  .../interface/vchiq_arm/vchiq_arm.h           |   1 +
  2 files changed, 89 insertions(+), 38 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 45da87359cd2..6491a7497ad2 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -79,6 +79,11 @@ static struct vchiq_drvdata bcm2836_drvdata = {
+@@ -79,6 +79,11 @@ static struct vchiq_drvdata bcm2836_drvd
  	.cache_line_size = 64,
  };
  
@@ -57,7 +55,7 @@ index 45da87359cd2..6491a7497ad2 100644
  			     pagelistinfo->num_pages, pagelistinfo->dma_dir);
  	}
  
-@@ -291,7 +298,7 @@ create_pagelist(char *buf, char __user *ubuf,
+@@ -291,7 +298,7 @@ create_pagelist(char *buf, char __user *
  		count -= len;
  	}
  
@@ -66,7 +64,7 @@ index 45da87359cd2..6491a7497ad2 100644
  				 scatterlist,
  				 num_pages,
  				 pagelistinfo->dma_dir);
-@@ -305,25 +312,60 @@ create_pagelist(char *buf, char __user *ubuf,
+@@ -305,25 +312,60 @@ create_pagelist(char *buf, char __user *
  
  	/* Combine adjacent blocks for performance */
  	k = 0;
@@ -146,7 +144,7 @@ index 45da87359cd2..6491a7497ad2 100644
  	}
  
  	/* Partial cache lines (fragments) require special measures */
-@@ -367,7 +409,7 @@ free_pagelist(struct vchiq_pagelist_info *pagelistinfo,
+@@ -367,7 +409,7 @@ free_pagelist(struct vchiq_pagelist_info
  	 * NOTE: dma_unmap_sg must be called before the
  	 * cpu can touch any of the data/pages.
  	 */
@@ -155,7 +153,7 @@ index 45da87359cd2..6491a7497ad2 100644
  		     pagelistinfo->num_pages, pagelistinfo->dma_dir);
  	pagelistinfo->scatterlist_mapped = 0;
  
-@@ -425,6 +467,7 @@ free_pagelist(struct vchiq_pagelist_info *pagelistinfo,
+@@ -425,6 +467,7 @@ free_pagelist(struct vchiq_pagelist_info
  int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state *state)
  {
  	struct device *dev = &pdev->dev;
@@ -163,7 +161,7 @@ index 45da87359cd2..6491a7497ad2 100644
  	struct vchiq_drvdata *drvdata = platform_get_drvdata(pdev);
  	struct rpi_firmware *fw = drvdata->fw;
  	struct vchiq_slot_zero *vchiq_slot_zero;
-@@ -446,6 +489,24 @@ int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state *state)
+@@ -446,6 +489,24 @@ int vchiq_platform_init(struct platform_
  	g_cache_line_size = drvdata->cache_line_size;
  	g_fragments_size = 2 * g_cache_line_size;
  
@@ -188,7 +186,7 @@ index 45da87359cd2..6491a7497ad2 100644
  	/* Allocate space for the channels in coherent memory */
  	slot_mem_size = PAGE_ALIGN(TOTAL_SLOTS * VCHIQ_SLOT_SIZE);
  	frag_mem_size = PAGE_ALIGN(g_fragments_size * MAX_FRAGMENTS);
-@@ -458,13 +519,14 @@ int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state *state)
+@@ -458,13 +519,14 @@ int vchiq_platform_init(struct platform_
  	}
  
  	WARN_ON(((unsigned long)slot_mem & (PAGE_SIZE - 1)) != 0);
@@ -204,7 +202,7 @@ index 45da87359cd2..6491a7497ad2 100644
  	vchiq_slot_zero->platform_data[VCHIQ_PLATFORM_FRAGMENTS_COUNT_IDX] =
  		MAX_FRAGMENTS;
  
-@@ -498,7 +560,6 @@ int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state *state)
+@@ -498,7 +560,6 @@ int vchiq_platform_init(struct platform_
  	}
  
  	/* Send the base address of the slots to VideoCore */
@@ -212,7 +210,7 @@ index 45da87359cd2..6491a7497ad2 100644
  	err = rpi_firmware_property(fw, RPI_FIRMWARE_VCHIQ_INIT,
  				    &channelbase, sizeof(channelbase));
  	if (err || channelbase) {
-@@ -507,6 +568,8 @@ int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state *state)
+@@ -507,6 +568,8 @@ int vchiq_platform_init(struct platform_
  	}
  
  	g_dev = dev;
@@ -221,7 +219,7 @@ index 45da87359cd2..6491a7497ad2 100644
  	vchiq_log_info(vchiq_arm_log_level,
  		"vchiq_init - done (slots %pK, phys %pad)",
  		vchiq_slot_zero, &slot_phys);
-@@ -1749,6 +1812,7 @@ void vchiq_platform_conn_state_changed(struct vchiq_state *state,
+@@ -1768,6 +1831,7 @@ void vchiq_platform_conn_state_changed(s
  static const struct of_device_id vchiq_of_match[] = {
  	{ .compatible = "brcm,bcm2835-vchiq", .data = &bcm2835_drvdata },
  	{ .compatible = "brcm,bcm2836-vchiq", .data = &bcm2836_drvdata },
@@ -229,7 +227,7 @@ index 45da87359cd2..6491a7497ad2 100644
  	{},
  };
  MODULE_DEVICE_TABLE(of, vchiq_of_match);
-@@ -1781,22 +1845,8 @@ vchiq_register_child(struct platform_device *pdev, const char *name)
+@@ -1800,22 +1864,8 @@ vchiq_register_child(struct platform_dev
  
  	child->dev.of_node = np;
  
@@ -252,8 +250,6 @@ index 45da87359cd2..6491a7497ad2 100644
  	return child;
  }
  
-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 e8e39a154c74..b7653e8ce9e0 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
 @@ -61,6 +61,7 @@ struct vchiq_arm_state {
@@ -264,6 +260,3 @@ index e8e39a154c74..b7653e8ce9e0 100644
  	struct rpi_firmware *fw;
  };
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0503-staging-vchiq_arm-children-inherit-DMA-config.patch b/root/target/linux/bcm27xx/patches-5.15/950-0482-staging-vchiq_arm-children-inherit-DMA-config.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0503-staging-vchiq_arm-children-inherit-DMA-config.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0482-staging-vchiq_arm-children-inherit-DMA-config.patch
index f8c0240d..424391e1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0503-staging-vchiq_arm-children-inherit-DMA-config.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0482-staging-vchiq_arm-children-inherit-DMA-config.patch
@@ -1,7 +1,7 @@
-From 5cff3c9f634880032aab03bdebe497048c2fd6de Mon Sep 17 00:00:00 2001
+From 9753d564996fe7acf2d6fb597037cf4ee967a5c1 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Tue, 21 Jul 2020 17:34:09 +0100
-Subject: [PATCH 503/634] staging: vchiq_arm: children inherit DMA config
+Subject: [PATCH 482/828] staging: vchiq_arm: children inherit DMA config
 
 Although it is no longer necessary for vchiq's children to have a
 different DMA configuration to the parent, they do still need to
@@ -13,11 +13,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  .../vc04_services/interface/vchiq_arm/vchiq_arm.c      | 10 ++++++++++
  1 file changed, 10 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 6491a7497ad2..aa7444502037 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -1845,8 +1845,18 @@ vchiq_register_child(struct platform_device *pdev, const char *name)
+@@ -1864,8 +1864,18 @@ vchiq_register_child(struct platform_dev
  
  	child->dev.of_node = np;
  
@@ -36,6 +34,3 @@ index 6491a7497ad2..aa7444502037 100644
  	return child;
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0504-staging-vchiq_arm-Usa-a-DMA-pool-for-small-bulks.patch b/root/target/linux/bcm27xx/patches-5.15/950-0483-staging-vchiq_arm-Usa-a-DMA-pool-for-small-bulks.patch
similarity index 84%
rename from root/target/linux/bcm27xx/patches-5.15/0504-staging-vchiq_arm-Usa-a-DMA-pool-for-small-bulks.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0483-staging-vchiq_arm-Usa-a-DMA-pool-for-small-bulks.patch
index 218d3e1c..f5cd29c5 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0504-staging-vchiq_arm-Usa-a-DMA-pool-for-small-bulks.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0483-staging-vchiq_arm-Usa-a-DMA-pool-for-small-bulks.patch
@@ -1,7 +1,7 @@
-From 804a9cf2d1ba283f8c6a5e81c6c65774328c4ee4 Mon Sep 17 00:00:00 2001
+From b4e2c107179be2744b01d7f05ce39ba2ceabee5a Mon Sep 17 00:00:00 2001
 From: detule <ogjoneski@gmail.com>
 Date: Tue, 2 Oct 2018 04:10:08 -0400
-Subject: [PATCH 504/634] staging: vchiq_arm: Usa a DMA pool for small bulks
+Subject: [PATCH 483/828] staging: vchiq_arm: Usa a DMA pool for small bulks
 
 During a bulk transfer we request a DMA allocation to hold the
 scatter-gather list.  Most of the time, this allocation is small
@@ -18,8 +18,6 @@ Signed-off-by: Oliver Gjoneski <ogjoneski@gmail.com>
  .../interface/vchiq_arm/vchiq_arm.c           | 36 ++++++++++++++++---
  1 file changed, 32 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 aa7444502037..25c17ad9c7a3 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -22,6 +22,7 @@
@@ -55,7 +53,7 @@ index aa7444502037..25c17ad9c7a3 100644
  static unsigned int g_use_36bit_addrs = 0;
  static unsigned int g_fragments_size;
  static char *g_fragments_base;
-@@ -156,8 +161,14 @@ cleanup_pagelistinfo(struct vchiq_pagelist_info *pagelistinfo)
+@@ -156,8 +161,14 @@ cleanup_pagelistinfo(struct vchiq_pageli
  	if (pagelistinfo->pages_need_release)
  		unpin_user_pages(pagelistinfo->pages, pagelistinfo->num_pages);
  
@@ -72,7 +70,7 @@ index aa7444502037..25c17ad9c7a3 100644
  }
  
  /* There is a potential problem with partial cache lines (pages?)
-@@ -178,6 +189,7 @@ create_pagelist(char *buf, char __user *ubuf,
+@@ -178,6 +189,7 @@ create_pagelist(char *buf, char __user *
  	u32 *addrs;
  	unsigned int num_pages, offset, i, k;
  	int actual_pages;
@@ -80,7 +78,7 @@ index aa7444502037..25c17ad9c7a3 100644
  	size_t pagelist_size;
  	struct scatterlist *scatterlist, *sg;
  	int dma_buffers;
-@@ -207,8 +219,16 @@ create_pagelist(char *buf, char __user *ubuf,
+@@ -207,8 +219,16 @@ create_pagelist(char *buf, char __user *
  	/* Allocate enough storage to hold the page pointers and the page
  	 * list
  	 */
@@ -99,7 +97,7 @@ index aa7444502037..25c17ad9c7a3 100644
  
  	vchiq_log_trace(vchiq_arm_log_level, "%s - %pK", __func__, pagelist);
  
-@@ -229,6 +249,7 @@ create_pagelist(char *buf, char __user *ubuf,
+@@ -229,6 +249,7 @@ create_pagelist(char *buf, char __user *
  	pagelistinfo->pagelist = pagelist;
  	pagelistinfo->pagelist_buffer_size = pagelist_size;
  	pagelistinfo->dma_addr = dma_addr;
@@ -107,7 +105,7 @@ index aa7444502037..25c17ad9c7a3 100644
  	pagelistinfo->dma_dir =  (type == PAGELIST_WRITE) ?
  				  DMA_TO_DEVICE : DMA_FROM_DEVICE;
  	pagelistinfo->num_pages = num_pages;
-@@ -569,6 +590,13 @@ int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state *state)
+@@ -569,6 +590,13 @@ int vchiq_platform_init(struct platform_
  
  	g_dev = dev;
  	g_dma_dev = dma_dev ?: dev;
@@ -121,6 +119,3 @@ index aa7444502037..25c17ad9c7a3 100644
  
  	vchiq_log_info(vchiq_arm_log_level,
  		"vchiq_init - done (slots %pK, phys %pad)",
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0484-drm-vc4-Reset-HDMI-MISC_CONTROL-register.patch b/root/target/linux/bcm27xx/patches-5.15/950-0484-drm-vc4-Reset-HDMI-MISC_CONTROL-register.patch
new file mode 100644
index 00000000..c53603c9
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0484-drm-vc4-Reset-HDMI-MISC_CONTROL-register.patch
@@ -0,0 +1,69 @@
+From 7e12642236d7138169cb7cf9b3db15be7645d8b5 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 13 Sep 2021 17:30:18 +0100
+Subject: [PATCH 484/828] drm/vc4: Reset HDMI MISC_CONTROL register.
+
+The HDMI block can repeat pixels for double clocked modes,
+and the firmware is now configuring the block to do this as
+the PV is doing it incorrectly when at 2pixels/clock.
+If the kernel doesn't reset it then we end up with strange
+modes.
+
+Reset MISC_CONTROL.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c      | 8 ++++++++
+ drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 3 +++
+ 2 files changed, 11 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -78,6 +78,9 @@
+ #define VC5_HDMI_VERTB_VSPO_SHIFT		16
+ #define VC5_HDMI_VERTB_VSPO_MASK		VC4_MASK(29, 16)
+ 
++#define VC5_HDMI_MISC_CONTROL_PIXEL_REP_SHIFT	0
++#define VC5_HDMI_MISC_CONTROL_PIXEL_REP_MASK	VC4_MASK(3, 0)
++
+ #define VC5_HDMI_SCRAMBLER_CTL_ENABLE		BIT(0)
+ 
+ #define VC5_HDMI_DEEP_COLOR_CONFIG_1_INIT_PACK_PHASE_SHIFT	8
+@@ -962,6 +965,11 @@ static void vc5_hdmi_set_timings(struct
+ 	reg |= gcp_en ? VC5_HDMI_GCP_CONFIG_GCP_ENABLE : 0;
+ 	HDMI_WRITE(HDMI_GCP_CONFIG, reg);
+ 
++	reg = HDMI_READ(HDMI_MISC_CONTROL);
++	reg &= ~VC5_HDMI_MISC_CONTROL_PIXEL_REP_MASK;
++	reg |= VC4_SET_FIELD(0, VC5_HDMI_MISC_CONTROL_PIXEL_REP);
++	HDMI_WRITE(HDMI_MISC_CONTROL, reg);
++
+ 	HDMI_WRITE(HDMI_CLOCK_STOP, 0);
+ 
+ 	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+--- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
+@@ -125,6 +125,7 @@ enum vc4_hdmi_field {
+ 	HDMI_VERTB0,
+ 	HDMI_VERTB1,
+ 	HDMI_VID_CTL,
++	HDMI_MISC_CONTROL,
+ };
+ 
+ struct vc4_hdmi_register {
+@@ -235,6 +236,7 @@ static const struct vc4_hdmi_register __
+ 	VC4_HDMI_REG(HDMI_VERTB0, 0x0f0),
+ 	VC4_HDMI_REG(HDMI_VERTA1, 0x0f4),
+ 	VC4_HDMI_REG(HDMI_VERTB1, 0x0f8),
++	VC4_HDMI_REG(HDMI_MISC_CONTROL, 0x100),
+ 	VC4_HDMI_REG(HDMI_MAI_CHANNEL_MAP, 0x09c),
+ 	VC4_HDMI_REG(HDMI_MAI_CONFIG, 0x0a0),
+ 	VC4_HDMI_REG(HDMI_DEEP_COLOR_CONFIG_1, 0x170),
+@@ -315,6 +317,7 @@ static const struct vc4_hdmi_register __
+ 	VC4_HDMI_REG(HDMI_VERTB0, 0x0f0),
+ 	VC4_HDMI_REG(HDMI_VERTA1, 0x0f4),
+ 	VC4_HDMI_REG(HDMI_VERTB1, 0x0f8),
++	VC4_HDMI_REG(HDMI_MISC_CONTROL, 0x100),
+ 	VC4_HDMI_REG(HDMI_MAI_CHANNEL_MAP, 0x09c),
+ 	VC4_HDMI_REG(HDMI_MAI_CONFIG, 0x0a0),
+ 	VC4_HDMI_REG(HDMI_DEEP_COLOR_CONFIG_1, 0x170),
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0485-drm-vc4-Release-workaround-buffer-and-DMA-in-error-p.patch b/root/target/linux/bcm27xx/patches-5.15/950-0485-drm-vc4-Release-workaround-buffer-and-DMA-in-error-p.patch
new file mode 100644
index 00000000..f0fe86bb
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0485-drm-vc4-Release-workaround-buffer-and-DMA-in-error-p.patch
@@ -0,0 +1,145 @@
+From b3135cb82dc221de3acfe376279c2c55d395d82c Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Tue, 6 Jul 2021 18:53:28 +0100
+Subject: [PATCH 485/828] drm/vc4: Release workaround buffer and DMA in error
+ paths and unbind
+
+On Pi0-3 the driver allocates a buffer and requests a DMA channel
+because the ARM can't write to DSI1's registers directly.
+However unbind and the error paths in bind don't release the buffer or
+the DMA channel.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dsi.c | 51 ++++++++++++++++++++++++++---------
+ 1 file changed, 39 insertions(+), 12 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_dsi.c
++++ b/drivers/gpu/drm/vc4/vc4_dsi.c
+@@ -1612,7 +1612,7 @@ static int vc4_dsi_bind(struct device *d
+ 			if (ret != -EPROBE_DEFER)
+ 				DRM_ERROR("Failed to get DMA channel: %d\n",
+ 					  ret);
+-			return ret;
++			goto err_free_dma_mem;
+ 		}
+ 
+ 		/* Get the physical address of the device's registers.  The
+@@ -1641,7 +1641,7 @@ static int vc4_dsi_bind(struct device *d
+ 	if (ret) {
+ 		if (ret != -EPROBE_DEFER)
+ 			dev_err(dev, "Failed to get interrupt: %d\n", ret);
+-		return ret;
++		goto err_free_dma;
+ 	}
+ 
+ 	dsi->escape_clock = devm_clk_get(dev, "escape");
+@@ -1649,7 +1649,7 @@ static int vc4_dsi_bind(struct device *d
+ 		ret = PTR_ERR(dsi->escape_clock);
+ 		if (ret != -EPROBE_DEFER)
+ 			dev_err(dev, "Failed to get escape clock: %d\n", ret);
+-		return ret;
++		goto err_free_dma;
+ 	}
+ 
+ 	dsi->pll_phy_clock = devm_clk_get(dev, "phy");
+@@ -1657,7 +1657,7 @@ static int vc4_dsi_bind(struct device *d
+ 		ret = PTR_ERR(dsi->pll_phy_clock);
+ 		if (ret != -EPROBE_DEFER)
+ 			dev_err(dev, "Failed to get phy clock: %d\n", ret);
+-		return ret;
++		goto err_free_dma;
+ 	}
+ 
+ 	dsi->pixel_clock = devm_clk_get(dev, "pixel");
+@@ -1665,7 +1665,7 @@ static int vc4_dsi_bind(struct device *d
+ 		ret = PTR_ERR(dsi->pixel_clock);
+ 		if (ret != -EPROBE_DEFER)
+ 			dev_err(dev, "Failed to get pixel clock: %d\n", ret);
+-		return ret;
++		goto err_free_dma;
+ 	}
+ 
+ 	ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
+@@ -1680,33 +1680,37 @@ static int vc4_dsi_bind(struct device *d
+ 		if (ret == -ENODEV)
+ 			return 0;
+ 
+-		return ret;
++		goto err_free_dma;
+ 	}
+ 
+ 	if (panel) {
+ 		dsi->bridge = devm_drm_panel_bridge_add_typed(dev, panel,
+ 							      DRM_MODE_CONNECTOR_DSI);
+-		if (IS_ERR(dsi->bridge))
+-			return PTR_ERR(dsi->bridge);
++		if (IS_ERR(dsi->bridge)) {
++			ret = PTR_ERR(dsi->bridge);
++			goto err_free_dma;
++		}
+ 	}
+ 
+ 	/* The esc clock rate is supposed to always be 100Mhz. */
+ 	ret = clk_set_rate(dsi->escape_clock, 100 * 1000000);
+ 	if (ret) {
+ 		dev_err(dev, "Failed to set esc clock: %d\n", ret);
+-		return ret;
++		goto err_free_dma;
+ 	}
+ 
+ 	ret = vc4_dsi_init_phy_clocks(dsi);
+ 	if (ret)
+-		return ret;
++		goto err_free_dma;
+ 
+ 	drm_simple_encoder_init(drm, dsi->encoder, DRM_MODE_ENCODER_DSI);
+ 	drm_encoder_helper_add(dsi->encoder, &vc4_dsi_encoder_helper_funcs);
+ 
+ 	ret = drm_bridge_attach(dsi->encoder, dsi->bridge, NULL, 0);
+-	if (ret)
+-		return ret;
++	if (ret) {
++		dev_err(dev, "bridge attach failed: %d\n", ret);
++		goto err_free_dma;
++	}
+ 	/* Disable the atomic helper calls into the bridge.  We
+ 	 * manually call the bridge pre_enable / enable / etc. calls
+ 	 * from our driver, since we need to sequence them within the
+@@ -1719,6 +1723,19 @@ static int vc4_dsi_bind(struct device *d
+ 	pm_runtime_enable(dev);
+ 
+ 	return 0;
++
++err_free_dma:
++	if (dsi->reg_dma_chan) {
++		dma_release_channel(dsi->reg_dma_chan);
++		dsi->reg_dma_chan = NULL;
++	}
++err_free_dma_mem:
++	if (dsi->reg_dma_mem) {
++		dma_free_coherent(dev, 4, dsi->reg_dma_mem, dsi->reg_dma_paddr);
++		dsi->reg_dma_mem = NULL;
++	}
++
++	return ret;
+ }
+ 
+ static void vc4_dsi_unbind(struct device *dev, struct device *master,
+@@ -1735,6 +1752,16 @@ static void vc4_dsi_unbind(struct device
+ 	 */
+ 	list_splice_init(&dsi->bridge_chain, &dsi->encoder->bridge_chain);
+ 	drm_encoder_cleanup(dsi->encoder);
++
++	if (dsi->reg_dma_chan) {
++		dma_release_channel(dsi->reg_dma_chan);
++		dsi->reg_dma_chan = NULL;
++	}
++
++	if (dsi->reg_dma_mem) {
++		dma_free_coherent(dev, 4, dsi->reg_dma_mem, dsi->reg_dma_paddr);
++		dsi->reg_dma_mem = NULL;
++	}
+ }
+ 
+ static const struct component_ops vc4_dsi_ops = {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0486-drm-vc4-Correct-DSI-divider-calculations.patch b/root/target/linux/bcm27xx/patches-5.15/950-0486-drm-vc4-Correct-DSI-divider-calculations.patch
new file mode 100644
index 00000000..114c836d
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0486-drm-vc4-Correct-DSI-divider-calculations.patch
@@ -0,0 +1,35 @@
+From f7befcfce27bddb7045013f0cc25dc60f6ae743b Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Fri, 18 Jun 2021 21:52:28 +0100
+Subject: [PATCH 486/828] drm/vc4: Correct DSI divider calculations
+
+The divider calculations tried to find the divider
+just faster than the clock requested. However if
+it required a divider of 7 then the for loop
+aborted without handling the "error" case, and could
+end up with a clock lower than requested.
+
+Correct the loop so that we always have a clock greater
+than requested.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dsi.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_dsi.c
++++ b/drivers/gpu/drm/vc4/vc4_dsi.c
+@@ -850,11 +850,9 @@ static bool vc4_dsi_encoder_mode_fixup(s
+ 	/* Find what divider gets us a faster clock than the requested
+ 	 * pixel clock.
+ 	 */
+-	for (divider = 1; divider < 8; divider++) {
+-		if (parent_rate / divider < pll_clock) {
+-			divider--;
++	for (divider = 1; divider < 7; divider++) {
++		if (parent_rate / (divider + 1) < pll_clock)
+ 			break;
+-		}
+ 	}
+ 
+ 	/* Now that we've picked a PLL divider, calculate back to its
diff --git a/root/target/linux/bcm27xx/patches-5.15/0508-drm-panel-raspberrypi-touchscreen-Avoid-NULL-deref-i.patch b/root/target/linux/bcm27xx/patches-5.15/950-0487-drm-panel-raspberrypi-touchscreen-Avoid-NULL-deref-i.patch
similarity index 71%
rename from root/target/linux/bcm27xx/patches-5.15/0508-drm-panel-raspberrypi-touchscreen-Avoid-NULL-deref-i.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0487-drm-panel-raspberrypi-touchscreen-Avoid-NULL-deref-i.patch
index c27bf223..d06d616f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0508-drm-panel-raspberrypi-touchscreen-Avoid-NULL-deref-i.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0487-drm-panel-raspberrypi-touchscreen-Avoid-NULL-deref-i.patch
@@ -1,7 +1,7 @@
-From 0a40d31a627e592b76086e85b13906819cd24221 Mon Sep 17 00:00:00 2001
+From 6906538a69b5bafe0b891e5e73f27818137158c7 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 3 Sep 2021 17:47:37 +0100
-Subject: [PATCH 508/634] drm/panel/raspberrypi-touchscreen: Avoid NULL deref
+Subject: [PATCH 487/828] drm/panel/raspberrypi-touchscreen: Avoid NULL deref
  if not initialised
 
 If a call to rpi_touchscreen_i2c_write from rpi_touchscreen_probe
@@ -16,11 +16,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-index 07013bfddf42..f361cedac6ea 100644
 --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
 +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-@@ -257,7 +257,7 @@ static void rpi_touchscreen_i2c_write(struct rpi_touchscreen *ts,
+@@ -257,7 +257,7 @@ static void rpi_touchscreen_i2c_write(st
  
  	ret = i2c_smbus_write_byte_data(ts->i2c, reg, val);
  	if (ret)
@@ -29,6 +27,3 @@ index 07013bfddf42..f361cedac6ea 100644
  }
  
  static int rpi_touchscreen_write(struct rpi_touchscreen *ts, u16 reg, u32 val)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0509-drm-panel-raspberrypi-touchscreen-Initialise-the-bri.patch b/root/target/linux/bcm27xx/patches-5.15/950-0488-drm-panel-raspberrypi-touchscreen-Initialise-the-bri.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0509-drm-panel-raspberrypi-touchscreen-Initialise-the-bri.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0488-drm-panel-raspberrypi-touchscreen-Initialise-the-bri.patch
index 76d95ad6..7923bdc5 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0509-drm-panel-raspberrypi-touchscreen-Initialise-the-bri.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0488-drm-panel-raspberrypi-touchscreen-Initialise-the-bri.patch
@@ -1,7 +1,7 @@
-From cb2aae713bb2448a1e7ac9c39b5714a4b56ffa99 Mon Sep 17 00:00:00 2001
+From 44fd02629872ede2f8906bc8d2326f2e8c3dd996 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 3 Sep 2021 17:52:59 +0100
-Subject: [PATCH 509/634] drm/panel/raspberrypi-touchscreen: Initialise the
+Subject: [PATCH 488/828] drm/panel/raspberrypi-touchscreen: Initialise the
  bridge in prepare
 
 The panel has a prepare call which is before video starts, and an
@@ -14,11 +14,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 11 +++++++++--
  1 file changed, 9 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-index f361cedac6ea..bd15c2f2e247 100644
 --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
 +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-@@ -293,7 +293,7 @@ static int rpi_touchscreen_noop(struct drm_panel *panel)
+@@ -293,7 +293,7 @@ static int rpi_touchscreen_noop(struct d
  	return 0;
  }
  
@@ -27,7 +25,7 @@ index f361cedac6ea..bd15c2f2e247 100644
  {
  	struct rpi_touchscreen *ts = panel_to_ts(panel);
  	int i;
-@@ -324,6 +324,13 @@ static int rpi_touchscreen_enable(struct drm_panel *panel)
+@@ -324,6 +324,13 @@ static int rpi_touchscreen_enable(struct
  	rpi_touchscreen_write(ts, DSI_STARTDSI, 0x01);
  	msleep(100);
  
@@ -41,7 +39,7 @@ index f361cedac6ea..bd15c2f2e247 100644
  	/* Turn on the backlight. */
  	rpi_touchscreen_i2c_write(ts, REG_PWM, 255);
  
-@@ -378,7 +385,7 @@ static int rpi_touchscreen_get_modes(struct drm_panel *panel,
+@@ -378,7 +385,7 @@ static int rpi_touchscreen_get_modes(str
  static const struct drm_panel_funcs rpi_touchscreen_funcs = {
  	.disable = rpi_touchscreen_disable,
  	.unprepare = rpi_touchscreen_noop,
@@ -50,6 +48,3 @@ index f361cedac6ea..bd15c2f2e247 100644
  	.enable = rpi_touchscreen_enable,
  	.get_modes = rpi_touchscreen_get_modes,
  };
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0510-drm-panel-raspberrypi-touchscreen-Handle-I2C-errors.patch b/root/target/linux/bcm27xx/patches-5.15/950-0489-drm-panel-raspberrypi-touchscreen-Handle-I2C-errors.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0510-drm-panel-raspberrypi-touchscreen-Handle-I2C-errors.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0489-drm-panel-raspberrypi-touchscreen-Handle-I2C-errors.patch
index cd688bb2..5ab428e0 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0510-drm-panel-raspberrypi-touchscreen-Handle-I2C-errors.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0489-drm-panel-raspberrypi-touchscreen-Handle-I2C-errors.patch
@@ -1,7 +1,7 @@
-From 54cedf6b1795efeafb5b0c541df57498a4b32033 Mon Sep 17 00:00:00 2001
+From ffd7974468d50111c74f7848861d3258f1d91272 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 8 Sep 2021 14:21:38 +0100
-Subject: [PATCH 510/634] drm/panel/raspberrypi-touchscreen: Handle I2C errors.
+Subject: [PATCH 489/828] drm/panel/raspberrypi-touchscreen: Handle I2C errors.
 
 rpi_touchscreen_i2c_read returns any errors from i2c_transfer,
 or the 8 bit received value.
@@ -13,11 +13,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-index bd15c2f2e247..329341bcfa50 100644
 --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
 +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-@@ -296,13 +296,14 @@ static int rpi_touchscreen_noop(struct drm_panel *panel)
+@@ -296,13 +296,14 @@ static int rpi_touchscreen_noop(struct d
  static int rpi_touchscreen_prepare(struct drm_panel *panel)
  {
  	struct rpi_touchscreen *ts = panel_to_ts(panel);
@@ -34,6 +32,3 @@ index bd15c2f2e247..329341bcfa50 100644
  			break;
  	}
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0511-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch b/root/target/linux/bcm27xx/patches-5.15/950-0490-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
similarity index 79%
rename from root/target/linux/bcm27xx/patches-5.15/0511-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0490-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
index 77eec830..8c07375b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0511-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0490-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
@@ -1,7 +1,7 @@
-From f41f5b9e101b5a2c8545d23006a2c7e31ff1c9d1 Mon Sep 17 00:00:00 2001
+From 5f1a511727343527c54e35fbed2c3c75aa906e22 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 26 Mar 2021 17:06:36 +0000
-Subject: [PATCH 511/634] drm/panel-simple: Add a timing for the Raspberry Pi
+Subject: [PATCH 490/828] drm/panel-simple: Add a timing for the Raspberry Pi
  7" panel
 
 The Raspberry Pi 7" 800x480 panel uses a Toshiba TC358762 DSI
@@ -13,11 +13,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/gpu/drm/panel/panel-simple.c | 28 ++++++++++++++++++++++++++++
  1 file changed, 28 insertions(+)
 
-diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
-index 66e79eb801b6..c740d58a0316 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -3757,6 +3757,31 @@ static const struct panel_desc qishenglong_gopher2b_lcd = {
+@@ -3758,6 +3758,31 @@ static const struct panel_desc qishenglo
  	.connector_type = DRM_MODE_CONNECTOR_DPI,
  };
  
@@ -49,16 +47,13 @@ index 66e79eb801b6..c740d58a0316 100644
  static const struct display_timing rocktech_rk070er9427_timing = {
  	.pixelclock = { 26400000, 33300000, 46800000 },
  	.hactive = { 800, 800, 800 },
-@@ -4836,6 +4861,9 @@ static const struct of_device_id platform_of_match[] = {
- 	}, {
+@@ -4838,6 +4863,9 @@ static const struct of_device_id platfor
  		.compatible = "qishenglong,gopher2b-lcd",
  		.data = &qishenglong_gopher2b_lcd,
-+	}, {
+ 	}, {
 +		.compatible = "raspberrypi,7inch-dsi",
 +		.data = &raspberrypi_7inch,
- 	}, {
++	}, {
  		.compatible = "rocktech,rk070er9427",
  		.data = &rocktech_rk070er9427,
--- 
-2.33.1
-
+ 	}, {
diff --git a/root/target/linux/bcm27xx/patches-5.15/0512-Input-edt-ft54x6-Clean-up-timer-and-workqueue-on-rem.patch b/root/target/linux/bcm27xx/patches-5.15/950-0491-Input-edt-ft54x6-Clean-up-timer-and-workqueue-on-rem.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0512-Input-edt-ft54x6-Clean-up-timer-and-workqueue-on-rem.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0491-Input-edt-ft54x6-Clean-up-timer-and-workqueue-on-rem.patch
index de15eaf2..74aafde1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0512-Input-edt-ft54x6-Clean-up-timer-and-workqueue-on-rem.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0491-Input-edt-ft54x6-Clean-up-timer-and-workqueue-on-rem.patch
@@ -1,7 +1,7 @@
-From eb7de4f8ef3149c20d2c552ef66df667a62b18f5 Mon Sep 17 00:00:00 2001
+From a9d711bd5a3feaa9f1204630df2b5fe71a4d6680 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 8 Sep 2021 14:46:17 +0100
-Subject: [PATCH 512/634] Input: edt-ft54x6: Clean up timer and workqueue on
+Subject: [PATCH 491/828] Input: edt-ft54x6: Clean up timer and workqueue on
  remove
 
 If no interrupt is defined then a timer and workqueue are used
@@ -16,11 +16,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/input/touchscreen/edt-ft5x06.c | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
-index 339eae4ec7a8..aabd1246b788 100644
 --- a/drivers/input/touchscreen/edt-ft5x06.c
 +++ b/drivers/input/touchscreen/edt-ft5x06.c
-@@ -1301,6 +1301,10 @@ static int edt_ft5x06_ts_remove(struct i2c_client *client)
+@@ -1301,6 +1301,10 @@ static int edt_ft5x06_ts_remove(struct i
  {
  	struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client);
  
@@ -31,6 +29,3 @@ index 339eae4ec7a8..aabd1246b788 100644
  	edt_ft5x06_ts_teardown_debugfs(tsdata);
  
  	return 0;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0513-regulator-rpi-panel-Register-with-a-unique-backlight.patch b/root/target/linux/bcm27xx/patches-5.15/950-0492-regulator-rpi-panel-Register-with-a-unique-backlight.patch
similarity index 71%
rename from root/target/linux/bcm27xx/patches-5.15/0513-regulator-rpi-panel-Register-with-a-unique-backlight.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0492-regulator-rpi-panel-Register-with-a-unique-backlight.patch
index 54e89216..3363090f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0513-regulator-rpi-panel-Register-with-a-unique-backlight.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0492-regulator-rpi-panel-Register-with-a-unique-backlight.patch
@@ -1,7 +1,7 @@
-From a8b6888737eda943793632b108db473753d29370 Mon Sep 17 00:00:00 2001
+From 4bda7d3056351be11b16ec5a50181109cfdb091d Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 11 Feb 2021 18:46:06 +0000
-Subject: [PATCH 513/634] regulator: rpi-panel: Register with a unique
+Subject: [PATCH 492/828] regulator: rpi-panel: Register with a unique
  backlight name
 
 There's no reason why 2 Raspberry Pi DSI displays can't be
@@ -15,11 +15,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/regulator/rpi-panel-attiny-regulator.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/drivers/regulator/rpi-panel-attiny-regulator.c b/drivers/regulator/rpi-panel-attiny-regulator.c
-index ee46bfbf5eee..370b9ae363dd 100644
 --- a/drivers/regulator/rpi-panel-attiny-regulator.c
 +++ b/drivers/regulator/rpi-panel-attiny-regulator.c
-@@ -181,8 +181,7 @@ static int attiny_i2c_probe(struct i2c_client *i2c,
+@@ -217,8 +217,7 @@ static int attiny_i2c_probe(struct i2c_c
  
  	props.type = BACKLIGHT_RAW;
  	props.max_brightness = 0xff;
@@ -29,6 +27,3 @@ index ee46bfbf5eee..370b9ae363dd 100644
  					    &i2c->dev, regmap, &attiny_bl,
  					    &props);
  	if (IS_ERR(bl))
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0515-regulator-rpi-panel-Serialise-operations.patch b/root/target/linux/bcm27xx/patches-5.15/950-0494-regulator-rpi-panel-Serialise-operations.patch
similarity index 85%
rename from root/target/linux/bcm27xx/patches-5.15/0515-regulator-rpi-panel-Serialise-operations.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0494-regulator-rpi-panel-Serialise-operations.patch
index b36b670b..e1997cc6 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0515-regulator-rpi-panel-Serialise-operations.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0494-regulator-rpi-panel-Serialise-operations.patch
@@ -1,7 +1,7 @@
-From 560594d64641d193988d45fa4bc5a3017da026e5 Mon Sep 17 00:00:00 2001
+From be5a71a469dde4a8ab5a2021bdc3620daa640c00 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 8 Sep 2021 15:02:05 +0100
-Subject: [PATCH 515/634] regulator: rpi-panel: Serialise operations.
+Subject: [PATCH 494/828] regulator: rpi-panel: Serialise operations.
 
 The driver was using the regmap lock to serialise the
 individual accesses, but we really need to protect the
@@ -16,8 +16,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../regulator/rpi-panel-attiny-regulator.c    | 91 ++++++++++++++++---
  1 file changed, 80 insertions(+), 11 deletions(-)
 
-diff --git a/drivers/regulator/rpi-panel-attiny-regulator.c b/drivers/regulator/rpi-panel-attiny-regulator.c
-index 00fb69efcfa2..a4af7adad2b5 100644
 --- a/drivers/regulator/rpi-panel-attiny-regulator.c
 +++ b/drivers/regulator/rpi-panel-attiny-regulator.c
 @@ -27,18 +27,28 @@
@@ -49,7 +47,7 @@ index 00fb69efcfa2..a4af7adad2b5 100644
  	regmap_write(rdev->regmap, REG_POWERON, 1);
  	msleep(80);
  
-@@ -63,33 +73,49 @@ static int attiny_lcd_power_enable(struct regulator_dev *rdev)
+@@ -63,33 +73,49 @@ static int attiny_lcd_power_enable(struc
  	 */
  	regmap_write(rdev->regmap, REG_PORTA, BIT(2));
  
@@ -101,7 +99,7 @@ index 00fb69efcfa2..a4af7adad2b5 100644
  
  	for (i = 0; i < 10; i++) {
  		ret = regmap_read(rdev->regmap, REG_PORTB, &data);
-@@ -98,6 +124,8 @@ static int attiny_lcd_power_is_enabled(struct regulator_dev *rdev)
+@@ -98,6 +124,8 @@ static int attiny_lcd_power_is_enabled(s
  		usleep_range(10000, 12000);
  	}
  
@@ -110,7 +108,7 @@ index 00fb69efcfa2..a4af7adad2b5 100644
  	if (ret < 0)
  		return ret;
  
-@@ -125,10 +153,13 @@ static const struct regulator_desc attiny_regulator = {
+@@ -125,10 +153,13 @@ static const struct regulator_desc attin
  
  static int attiny_update_status(struct backlight_device *bl)
  {
@@ -125,7 +123,7 @@ index 00fb69efcfa2..a4af7adad2b5 100644
  	if (bl->props.power != FB_BLANK_UNBLANK ||
  	    bl->props.fb_blank != FB_BLANK_UNBLANK)
  		brightness = 0;
-@@ -139,20 +170,27 @@ static int attiny_update_status(struct backlight_device *bl)
+@@ -139,20 +170,27 @@ static int attiny_update_status(struct b
  			break;
  	}
  
@@ -154,7 +152,7 @@ index 00fb69efcfa2..a4af7adad2b5 100644
  	if (ret)
  		return ret;
  
-@@ -174,22 +212,30 @@ static int attiny_i2c_probe(struct i2c_client *i2c,
+@@ -174,22 +212,30 @@ static int attiny_i2c_probe(struct i2c_c
  	struct regulator_config config = { };
  	struct backlight_device *bl;
  	struct regulator_dev *rdev;
@@ -187,7 +185,7 @@ index 00fb69efcfa2..a4af7adad2b5 100644
  	}
  
  	switch (data) {
-@@ -198,7 +244,8 @@ static int attiny_i2c_probe(struct i2c_client *i2c,
+@@ -198,7 +244,8 @@ static int attiny_i2c_probe(struct i2c_c
  		break;
  	default:
  		dev_err(&i2c->dev, "Unknown Atmel firmware revision: 0x%02x\n", data);
@@ -197,7 +195,7 @@ index 00fb69efcfa2..a4af7adad2b5 100644
  	}
  
  	regmap_write(regmap, REG_POWERON, 0);
-@@ -208,23 +255,44 @@ static int attiny_i2c_probe(struct i2c_client *i2c,
+@@ -208,24 +255,45 @@ static int attiny_i2c_probe(struct i2c_c
  	config.regmap = regmap;
  	config.of_node = i2c->dev.of_node;
  	config.init_data = &attiny_regulator_default;
@@ -229,7 +227,7 @@ index 00fb69efcfa2..a4af7adad2b5 100644
  
  	bl->props.brightness = 0xff;
  
-+	return 0;
+ 	return 0;
 +
 +error:
 +	mutex_destroy(&state->lock);
@@ -243,10 +241,11 @@ index 00fb69efcfa2..a4af7adad2b5 100644
 +
 +	mutex_destroy(&state->lock);
 +
- 	return 0;
++	return 0;
  }
  
-@@ -240,6 +308,7 @@ static struct i2c_driver attiny_regulator_driver = {
+ static const struct of_device_id attiny_dt_ids[] = {
+@@ -240,6 +308,7 @@ static struct i2c_driver attiny_regulato
  		.of_match_table = of_match_ptr(attiny_dt_ids),
  	},
  	.probe = attiny_i2c_probe,
@@ -254,6 +253,3 @@ index 00fb69efcfa2..a4af7adad2b5 100644
  };
  
  module_i2c_driver(attiny_regulator_driver);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0516-regulator-rpi-panel-Ensure-the-backlight-is-off-duri.patch b/root/target/linux/bcm27xx/patches-5.15/950-0495-regulator-rpi-panel-Ensure-the-backlight-is-off-duri.patch
similarity index 63%
rename from root/target/linux/bcm27xx/patches-5.15/0516-regulator-rpi-panel-Ensure-the-backlight-is-off-duri.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0495-regulator-rpi-panel-Ensure-the-backlight-is-off-duri.patch
index b047703a..df4c46c9 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0516-regulator-rpi-panel-Ensure-the-backlight-is-off-duri.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0495-regulator-rpi-panel-Ensure-the-backlight-is-off-duri.patch
@@ -1,7 +1,7 @@
-From 0efbb1a1ed280e68a49a48f7daeb393688c25009 Mon Sep 17 00:00:00 2001
+From d7f777c36dd261a19dcf91443d169ba24aba70ab Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 8 Sep 2021 15:41:18 +0100
-Subject: [PATCH 516/634] regulator: rpi-panel: Ensure the backlight is off
+Subject: [PATCH 495/828] regulator: rpi-panel: Ensure the backlight is off
  during probe.
 
 The initial state of the Atmel is not defined, so ensure the
@@ -12,11 +12,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/regulator/rpi-panel-attiny-regulator.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/regulator/rpi-panel-attiny-regulator.c b/drivers/regulator/rpi-panel-attiny-regulator.c
-index a4af7adad2b5..b3629a1e0e50 100644
 --- a/drivers/regulator/rpi-panel-attiny-regulator.c
 +++ b/drivers/regulator/rpi-panel-attiny-regulator.c
-@@ -250,6 +250,7 @@ static int attiny_i2c_probe(struct i2c_client *i2c,
+@@ -250,6 +250,7 @@ static int attiny_i2c_probe(struct i2c_c
  
  	regmap_write(regmap, REG_POWERON, 0);
  	msleep(30);
@@ -24,6 +22,3 @@ index a4af7adad2b5..b3629a1e0e50 100644
  
  	config.dev = &i2c->dev;
  	config.regmap = regmap;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0517-regulator-rpi-panel-Convert-to-drive-lines-directly.patch b/root/target/linux/bcm27xx/patches-5.15/950-0496-regulator-rpi-panel-Convert-to-drive-lines-directly.patch
similarity index 92%
rename from root/target/linux/bcm27xx/patches-5.15/0517-regulator-rpi-panel-Convert-to-drive-lines-directly.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0496-regulator-rpi-panel-Convert-to-drive-lines-directly.patch
index 8b1f33af..8a008a11 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0517-regulator-rpi-panel-Convert-to-drive-lines-directly.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0496-regulator-rpi-panel-Convert-to-drive-lines-directly.patch
@@ -1,7 +1,7 @@
-From ddea03c444e13ea8aabae13b6f8f9b0c8311a7fe Mon Sep 17 00:00:00 2001
+From 20159b9cec78d0a4adf53c56b0d8aba44f22218b Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 9 Sep 2021 18:24:57 +0100
-Subject: [PATCH 517/634] regulator: rpi-panel: Convert to drive lines directly
+Subject: [PATCH 496/828] regulator: rpi-panel: Convert to drive lines directly
 
 The Atmel was doing a load of automatic sequencing of
 control lines, however it was combining the touch controller's
@@ -15,8 +15,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../regulator/rpi-panel-attiny-regulator.c    | 111 ++++++++++--------
  1 file changed, 60 insertions(+), 51 deletions(-)
 
-diff --git a/drivers/regulator/rpi-panel-attiny-regulator.c b/drivers/regulator/rpi-panel-attiny-regulator.c
-index b3629a1e0e50..995915ca4a9b 100644
 --- a/drivers/regulator/rpi-panel-attiny-regulator.c
 +++ b/drivers/regulator/rpi-panel-attiny-regulator.c
 @@ -21,11 +21,28 @@
@@ -50,7 +48,7 @@ index b3629a1e0e50..995915ca4a9b 100644
  
  struct attiny_lcd {
  	/* lock to serialise overall accesses to the Atmel */
-@@ -37,99 +54,91 @@ static const struct regmap_config attiny_regmap_config = {
+@@ -37,99 +54,91 @@ static const struct regmap_config attiny
  	.reg_bits = 8,
  	.val_bits = 8,
  	.disable_locking = 1,
@@ -64,12 +62,13 @@ index b3629a1e0e50..995915ca4a9b 100644
 -	struct mutex *lock = rdev_get_drvdata(rdev);
 -	unsigned int data;
 -	int ret, i;
--
++	struct attiny_lcd *state = rdev_get_drvdata(rdev);
+ 
 -	mutex_lock(lock);
 -
 -	regmap_write(rdev->regmap, REG_POWERON, 1);
 -	msleep(80);
-+	struct attiny_lcd *state = rdev_get_drvdata(rdev);
++	mutex_lock(&state->lock);
  
 -	/* Wait for nPWRDWN to go low to indicate poweron is done. */
 -	for (i = 0; i < 20; i++) {
@@ -81,8 +80,7 @@ index b3629a1e0e50..995915ca4a9b 100644
 -		usleep_range(10000, 12000);
 -	}
 -	usleep_range(10000, 12000);
-+	mutex_lock(&state->lock);
- 
+-
 -	if (ret)
 -		pr_err("%s: regmap_read_poll_timeout failed %d\n", __func__, ret);
 +	/* Ensure bridge, and tp stay in reset */
@@ -112,10 +110,10 @@ index b3629a1e0e50..995915ca4a9b 100644
 +	regmap_write(rdev->regmap, REG_WRITE_DATA_H, 0x00);
 +	usleep_range(5000, 8000);
 +	regmap_write(rdev->regmap, REG_WRITE_DATA_L, 0x00);
-+
-+	msleep(100);
  
 -	mutex_unlock(lock);
++	msleep(100);
++
 +	mutex_unlock(&state->lock);
  
  	return 0;
@@ -190,7 +188,7 @@ index b3629a1e0e50..995915ca4a9b 100644
  }
  
  static const struct regulator_init_data attiny_regulator_default = {
-@@ -256,7 +265,7 @@ static int attiny_i2c_probe(struct i2c_client *i2c,
+@@ -256,7 +265,7 @@ static int attiny_i2c_probe(struct i2c_c
  	config.regmap = regmap;
  	config.of_node = i2c->dev.of_node;
  	config.init_data = &attiny_regulator_default;
@@ -199,6 +197,3 @@ index b3629a1e0e50..995915ca4a9b 100644
  
  	rdev = devm_regulator_register(&i2c->dev, &attiny_regulator, &config);
  	if (IS_ERR(rdev)) {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0518-regulator-rpi-panel-Add-GPIO-control-for-panel-and-t.patch b/root/target/linux/bcm27xx/patches-5.15/950-0497-regulator-rpi-panel-Add-GPIO-control-for-panel-and-t.patch
similarity index 87%
rename from root/target/linux/bcm27xx/patches-5.15/0518-regulator-rpi-panel-Add-GPIO-control-for-panel-and-t.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0497-regulator-rpi-panel-Add-GPIO-control-for-panel-and-t.patch
index 56afd1c2..70fbd1b9 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0518-regulator-rpi-panel-Add-GPIO-control-for-panel-and-t.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0497-regulator-rpi-panel-Add-GPIO-control-for-panel-and-t.patch
@@ -1,7 +1,7 @@
-From e44dd3274964438633a06bd62eab90e5e6726df9 Mon Sep 17 00:00:00 2001
+From 23fcd3931e30b36101580b17100ea3bb915a5108 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 10 Sep 2021 13:50:28 +0100
-Subject: [PATCH 518/634] regulator: rpi-panel: Add GPIO control for panel and
+Subject: [PATCH 497/828] regulator: rpi-panel: Add GPIO control for panel and
  touch resets
 
 We need independent control of the resets for the panel&bridge,
@@ -15,8 +15,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../regulator/rpi-panel-attiny-regulator.c    | 115 +++++++++++++++---
  1 file changed, 97 insertions(+), 18 deletions(-)
 
-diff --git a/drivers/regulator/rpi-panel-attiny-regulator.c b/drivers/regulator/rpi-panel-attiny-regulator.c
-index 995915ca4a9b..998233f14085 100644
 --- a/drivers/regulator/rpi-panel-attiny-regulator.c
 +++ b/drivers/regulator/rpi-panel-attiny-regulator.c
 @@ -8,6 +8,7 @@
@@ -58,7 +56,7 @@ index 995915ca4a9b..998233f14085 100644
  };
  
  static const struct regmap_config attiny_regmap_config = {
-@@ -58,6 +79,17 @@ static const struct regmap_config attiny_regmap_config = {
+@@ -58,6 +79,17 @@ static const struct regmap_config attiny
  	.cache_type = REGCACHE_NONE,
  };
  
@@ -76,7 +74,7 @@ index 995915ca4a9b..998233f14085 100644
  static int attiny_lcd_power_enable(struct regulator_dev *rdev)
  {
  	struct attiny_lcd *state = rdev_get_drvdata(rdev);
-@@ -65,7 +97,7 @@ static int attiny_lcd_power_enable(struct regulator_dev *rdev)
+@@ -65,7 +97,7 @@ static int attiny_lcd_power_enable(struc
  	mutex_lock(&state->lock);
  
  	/* Ensure bridge, and tp stay in reset */
@@ -85,7 +83,7 @@ index 995915ca4a9b..998233f14085 100644
  	usleep_range(5000, 10000);
  
  	/* Default to the same orientation as the closed source
-@@ -73,26 +105,16 @@ static int attiny_lcd_power_enable(struct regulator_dev *rdev)
+@@ -73,26 +105,16 @@ static int attiny_lcd_power_enable(struc
  	 * configuration will be supported using VC4's plane
  	 * orientation bits.
  	 */
@@ -116,7 +114,7 @@ index 995915ca4a9b..998233f14085 100644
  	mutex_unlock(&state->lock);
  
  	return 0;
-@@ -106,11 +128,12 @@ static int attiny_lcd_power_disable(struct regulator_dev *rdev)
+@@ -106,11 +128,12 @@ static int attiny_lcd_power_disable(stru
  
  	regmap_write(rdev->regmap, REG_PWM, 0);
  	usleep_range(5000, 10000);
@@ -132,7 +130,7 @@ index 995915ca4a9b..998233f14085 100644
  	msleep(30);
  
  	mutex_unlock(&state->lock);
-@@ -211,6 +234,45 @@ static const struct backlight_ops attiny_bl = {
+@@ -211,6 +234,45 @@ static const struct backlight_ops attiny
  	.get_brightness	= attiny_get_brightness,
  };
  
@@ -178,7 +176,7 @@ index 995915ca4a9b..998233f14085 100644
  /*
   * I2C driver interface functions
   */
-@@ -289,6 +351,23 @@ static int attiny_i2c_probe(struct i2c_client *i2c,
+@@ -289,6 +351,23 @@ static int attiny_i2c_probe(struct i2c_c
  
  	bl->props.brightness = 0xff;
  
@@ -202,6 +200,3 @@ index 995915ca4a9b..998233f14085 100644
  	return 0;
  
  error:
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0519-staging-bcm2835-codec-Change-the-default-codec-res-t.patch b/root/target/linux/bcm27xx/patches-5.15/950-0498-staging-bcm2835-codec-Change-the-default-codec-res-t.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0519-staging-bcm2835-codec-Change-the-default-codec-res-t.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0498-staging-bcm2835-codec-Change-the-default-codec-res-t.patch
index d8848ada..572f1b53 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0519-staging-bcm2835-codec-Change-the-default-codec-res-t.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0498-staging-bcm2835-codec-Change-the-default-codec-res-t.patch
@@ -1,7 +1,7 @@
-From d2f46cea008719636fa78db4f162305d39fc9223 Mon Sep 17 00:00:00 2001
+From 65fa6ff62c0542a2caac6201f76607c64a11a7be Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 13 May 2021 11:56:21 +0100
-Subject: [PATCH 519/634] staging/bcm2835-codec: Change the default codec res
+Subject: [PATCH 498/828] staging/bcm2835-codec: Change the default codec res
  to 32x32
 
 In order to effectively guarantee that a V4L2_EVENT_SOURCE_CHANGE
@@ -14,11 +14,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../bcm2835-codec/bcm2835-v4l2-codec.c            | 15 +++++++++++++--
  1 file changed, 13 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index c3ba5c25a2ab..4c01bc42fa31 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -97,8 +97,19 @@ static const char * const components[] = {
+@@ -97,8 +97,19 @@ static const char * const components[] =
  #define MAX_W		1920
  #define MAX_H		1920
  #define BPL_ALIGN	32
@@ -40,6 +38,3 @@ index c3ba5c25a2ab..4c01bc42fa31 100644
  /*
   * The unanswered question - what is the maximum size of a compressed frame?
   * V4L2 mandates that the encoded frame must fit in a single buffer. Sizing
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0520-staging-vchiq-mmal-Add-buffer-flags-for-interlaced-v.patch b/root/target/linux/bcm27xx/patches-5.15/950-0499-staging-vchiq-mmal-Add-buffer-flags-for-interlaced-v.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0520-staging-vchiq-mmal-Add-buffer-flags-for-interlaced-v.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0499-staging-vchiq-mmal-Add-buffer-flags-for-interlaced-v.patch
index c6bb8de9..d3ea78c1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0520-staging-vchiq-mmal-Add-buffer-flags-for-interlaced-v.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0499-staging-vchiq-mmal-Add-buffer-flags-for-interlaced-v.patch
@@ -1,7 +1,7 @@
-From 34ec68babe2a0a1cb3358e18db32f18fedcab82e Mon Sep 17 00:00:00 2001
+From 3195cfdccc78d1f86822ba275c859c07aad18e00 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Sun, 10 Jan 2021 19:05:17 +0000
-Subject: [PATCH 520/634] staging/vchiq-mmal: Add buffer flags for interlaced
+Subject: [PATCH 499/828] staging/vchiq-mmal: Add buffer flags for interlaced
  video
 
 Add the buffer flags that the firmware uses to identify fields
@@ -12,8 +12,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../vc04_services/vchiq-mmal/mmal-msg.h       | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h
-index ab63835ce01c..883b77ffae25 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h
 @@ -253,6 +253,25 @@ struct mmal_msg_port_action_reply {
@@ -42,6 +40,3 @@ index ab63835ce01c..883b77ffae25 100644
  struct mmal_driver_buffer {
  	u32 magic;
  	u32 component_handle;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0521-staging-vchiq-mmal-Add-parameters-for-interlaced-vid.patch b/root/target/linux/bcm27xx/patches-5.15/950-0500-staging-vchiq-mmal-Add-parameters-for-interlaced-vid.patch
similarity index 85%
rename from root/target/linux/bcm27xx/patches-5.15/0521-staging-vchiq-mmal-Add-parameters-for-interlaced-vid.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0500-staging-vchiq-mmal-Add-parameters-for-interlaced-vid.patch
index 0e04a9e4..45f1cef5 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0521-staging-vchiq-mmal-Add-parameters-for-interlaced-vid.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0500-staging-vchiq-mmal-Add-parameters-for-interlaced-vid.patch
@@ -1,7 +1,7 @@
-From c002d5e4baf61839c92331cf4ebae8379798714d Mon Sep 17 00:00:00 2001
+From b6f7c2f0232c739235b5b94aac4b213266339652 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 5 Aug 2021 16:38:34 +0100
-Subject: [PATCH 521/634] staging/vchiq-mmal: Add parameters for interlaced
+Subject: [PATCH 500/828] staging/vchiq-mmal: Add parameters for interlaced
  video support
 
 Adds enum mmal_interlace_type and struct
@@ -13,8 +13,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../vchiq-mmal/mmal-parameters.h              | 37 +++++++++++++++++++
  1 file changed, 37 insertions(+)
 
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-index 79438d23912f..844a02bf9a22 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 @@ -809,6 +809,43 @@ struct mmal_parameter_displayregion {
@@ -61,6 +59,3 @@ index 79438d23912f..844a02bf9a22 100644
  #define MMAL_MAX_IMAGEFX_PARAMETERS 5
  
  struct mmal_parameter_imagefx_parameters {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0522-staging-bcm2835-codec-Add-support-for-decoding-inter.patch b/root/target/linux/bcm27xx/patches-5.15/950-0501-staging-bcm2835-codec-Add-support-for-decoding-inter.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0522-staging-bcm2835-codec-Add-support-for-decoding-inter.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0501-staging-bcm2835-codec-Add-support-for-decoding-inter.patch
index a2b0c6b5..45e1861d 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0522-staging-bcm2835-codec-Add-support-for-decoding-inter.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0501-staging-bcm2835-codec-Add-support-for-decoding-inter.patch
@@ -1,7 +1,7 @@
-From 258b3c7a37d8d08d57f737c60ad32ed765dfe6f0 Mon Sep 17 00:00:00 2001
+From e78e1fdfb9e6ba1a9c37ccdef7c48ebc195b16d7 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 18 Dec 2020 19:56:31 +0000
-Subject: [PATCH 522/634] staging/bcm2835-codec: Add support for decoding
+Subject: [PATCH 501/828] staging/bcm2835-codec: Add support for decoding
  interlaced streams
 
 The video decoder can support decoding interlaced streams, so add
@@ -15,8 +15,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../bcm2835-codec/bcm2835-v4l2-codec.c        | 84 +++++++++++++++++--
  1 file changed, 77 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 4c01bc42fa31..3f15c20bb952 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -619,6 +619,7 @@ struct bcm2835_codec_q_data {
@@ -27,7 +25,7 @@ index 4c01bc42fa31..3f15c20bb952 100644
  
  	unsigned int		sizeimage;
  	unsigned int		sequence;
-@@ -986,6 +987,10 @@ static void handle_fmt_changed(struct bcm2835_codec_ctx *ctx,
+@@ -986,6 +987,10 @@ static void handle_fmt_changed(struct bc
  	struct bcm2835_codec_q_data *q_data;
  	struct mmal_msg_event_format_changed *format =
  		(struct mmal_msg_event_format_changed *)mmal_buf->buffer;
@@ -38,7 +36,7 @@ index 4c01bc42fa31..3f15c20bb952 100644
  	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: Format changed: buff size min %u, rec %u, buff num min %u, rec %u\n",
  		 __func__,
  		 format->buffer_size_min,
-@@ -1029,6 +1034,30 @@ static void handle_fmt_changed(struct bcm2835_codec_ctx *ctx,
+@@ -1029,6 +1034,30 @@ static void handle_fmt_changed(struct bc
  	q_data->aspect_ratio.numerator = format->es.video.par.num;
  	q_data->aspect_ratio.denominator = format->es.video.par.den;
  
@@ -69,7 +67,7 @@ index 4c01bc42fa31..3f15c20bb952 100644
  	queue_res_chg_event(ctx);
  }
  
-@@ -1101,6 +1130,22 @@ static void op_buffer_cb(struct vchiq_mmal_instance *instance,
+@@ -1101,6 +1130,22 @@ static void op_buffer_cb(struct vchiq_mm
  	vb2->vb2_buf.timestamp = mmal_buf->pts * 1000;
  
  	vb2_set_plane_payload(&vb2->vb2_buf, 0, mmal_buf->length);
@@ -92,7 +90,7 @@ index 4c01bc42fa31..3f15c20bb952 100644
  	if (mmal_buf->mmal_flags & MMAL_BUFFER_HEADER_FLAG_KEYFRAME)
  		vb2->flags |= V4L2_BUF_FLAG_KEYFRAME;
  
-@@ -1272,7 +1317,7 @@ static int vidioc_g_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f)
+@@ -1272,7 +1317,7 @@ static int vidioc_g_fmt(struct bcm2835_c
  	f->fmt.pix_mp.width			= q_data->crop_width;
  	f->fmt.pix_mp.height			= q_data->height;
  	f->fmt.pix_mp.pixelformat		= q_data->fmt->fourcc;
@@ -101,7 +99,7 @@ index 4c01bc42fa31..3f15c20bb952 100644
  	f->fmt.pix_mp.colorspace		= ctx->colorspace;
  	f->fmt.pix_mp.plane_fmt[0].sizeimage	= q_data->sizeimage;
  	f->fmt.pix_mp.plane_fmt[0].bytesperline	= q_data->bytesperline;
-@@ -1347,7 +1392,33 @@ static int vidioc_try_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
+@@ -1347,7 +1392,33 @@ static int vidioc_try_fmt(struct bcm2835
  	memset(f->fmt.pix_mp.plane_fmt[0].reserved, 0,
  	       sizeof(f->fmt.pix_mp.plane_fmt[0].reserved));
  
@@ -136,7 +134,7 @@ index 4c01bc42fa31..3f15c20bb952 100644
  
  	return 0;
  }
-@@ -1430,6 +1501,8 @@ static int vidioc_s_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
+@@ -1430,6 +1501,8 @@ static int vidioc_s_fmt(struct bcm2835_c
  	ctx->ycbcr_enc = f->fmt.pix_mp.ycbcr_enc;
  	ctx->quant = f->fmt.pix_mp.quantization;
  
@@ -145,7 +143,7 @@ index 4c01bc42fa31..3f15c20bb952 100644
  	/* All parameters should have been set correctly by try_fmt */
  	q_data->bytesperline = f->fmt.pix_mp.plane_fmt[0].bytesperline;
  	q_data->sizeimage = f->fmt.pix_mp.plane_fmt[0].sizeimage;
-@@ -2429,11 +2502,6 @@ static int bcm2835_codec_buf_prepare(struct vb2_buffer *vb)
+@@ -2429,11 +2502,6 @@ static int bcm2835_codec_buf_prepare(str
  	if (V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) {
  		if (vbuf->field == V4L2_FIELD_ANY)
  			vbuf->field = V4L2_FIELD_NONE;
@@ -157,7 +155,7 @@ index 4c01bc42fa31..3f15c20bb952 100644
  	}
  
  	if (vb2_plane_size(vb, 0) < q_data->sizeimage) {
-@@ -2735,6 +2803,7 @@ static int bcm2835_codec_open(struct file *file)
+@@ -2735,6 +2803,7 @@ static int bcm2835_codec_open(struct fil
  			      ctx->q_data[V4L2_M2M_SRC].crop_width,
  			      ctx->q_data[V4L2_M2M_SRC].height,
  			      ctx->q_data[V4L2_M2M_SRC].fmt);
@@ -165,7 +163,7 @@ index 4c01bc42fa31..3f15c20bb952 100644
  
  	ctx->q_data[V4L2_M2M_DST].crop_width = DEFAULT_WIDTH;
  	ctx->q_data[V4L2_M2M_DST].crop_height = DEFAULT_HEIGHT;
-@@ -2749,6 +2818,7 @@ static int bcm2835_codec_open(struct file *file)
+@@ -2749,6 +2818,7 @@ static int bcm2835_codec_open(struct fil
  			      ctx->q_data[V4L2_M2M_DST].fmt);
  	ctx->q_data[V4L2_M2M_DST].aspect_ratio.numerator = 1;
  	ctx->q_data[V4L2_M2M_DST].aspect_ratio.denominator = 1;
@@ -173,6 +171,3 @@ index 4c01bc42fa31..3f15c20bb952 100644
  
  	ctx->colorspace = V4L2_COLORSPACE_REC709;
  	ctx->bitrate = 10 * 1000 * 1000;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0523-staging-bcm2835-codec-Correct-ENUM_FRAMESIZES-stepsi.patch b/root/target/linux/bcm27xx/patches-5.15/950-0502-staging-bcm2835-codec-Correct-ENUM_FRAMESIZES-stepsi.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0523-staging-bcm2835-codec-Correct-ENUM_FRAMESIZES-stepsi.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0502-staging-bcm2835-codec-Correct-ENUM_FRAMESIZES-stepsi.patch
index a97c8dba..b89e1ba5 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0523-staging-bcm2835-codec-Correct-ENUM_FRAMESIZES-stepsi.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0502-staging-bcm2835-codec-Correct-ENUM_FRAMESIZES-stepsi.patch
@@ -1,7 +1,7 @@
-From 5ceac8530fe6ddd8b4ed554988a29afc7d3f415b Mon Sep 17 00:00:00 2001
+From 6680e161e22d8b4f0552755a47a8aa91947daf7b Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 5 Aug 2021 15:11:23 +0100
-Subject: [PATCH 523/634] staging/bcm2835-codec: Correct ENUM_FRAMESIZES
+Subject: [PATCH 502/828] staging/bcm2835-codec: Correct ENUM_FRAMESIZES
  stepsize to 2
 
 Being YUV420 formats, the step size is always 2 to avoid part
@@ -12,11 +12,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c  | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 3f15c20bb952..96de610e8354 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -2222,10 +2222,10 @@ static int vidioc_enum_framesizes(struct file *file, void *fh,
+@@ -2222,10 +2222,10 @@ static int vidioc_enum_framesizes(struct
  
  	fsize->stepwise.min_width = MIN_W;
  	fsize->stepwise.max_width = MAX_W;
@@ -29,6 +27,3 @@ index 3f15c20bb952..96de610e8354 100644
  
  	return 0;
  }
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0524-staging-bcm2835-codec-Return-buffers-to-QUEUED-not-E.patch b/root/target/linux/bcm27xx/patches-5.15/950-0503-staging-bcm2835-codec-Return-buffers-to-QUEUED-not-E.patch
similarity index 71%
rename from root/target/linux/bcm27xx/patches-5.15/0524-staging-bcm2835-codec-Return-buffers-to-QUEUED-not-E.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0503-staging-bcm2835-codec-Return-buffers-to-QUEUED-not-E.patch
index 47b72dd6..c136a509 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0524-staging-bcm2835-codec-Return-buffers-to-QUEUED-not-E.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0503-staging-bcm2835-codec-Return-buffers-to-QUEUED-not-E.patch
@@ -1,7 +1,7 @@
-From 9ffe00ee65c020d262812070552ebfe2b9eb04d2 Mon Sep 17 00:00:00 2001
+From 37bbf972f84f44072972cda9c952b70d31b56cdf Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 5 Aug 2021 16:46:42 +0100
-Subject: [PATCH 524/634] staging/bcm2835-codec: Return buffers to QUEUED not
+Subject: [PATCH 503/828] staging/bcm2835-codec: Return buffers to QUEUED not
  ERROR state
 
 Should start_streaming fail, or buffers be queued during
@@ -13,11 +13,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c  | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 96de610e8354..d2b64a369ae8 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -1111,7 +1111,7 @@ static void op_buffer_cb(struct vchiq_mmal_instance *instance,
+@@ -1111,7 +1111,7 @@ static void op_buffer_cb(struct vchiq_mm
  		v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: Empty buffer - flags %04x",
  			 __func__, mmal_buf->mmal_flags);
  		if (!(mmal_buf->mmal_flags & MMAL_BUFFER_HEADER_FLAG_EOS)) {
@@ -26,7 +24,7 @@ index 96de610e8354..d2b64a369ae8 100644
  			if (!port->enabled)
  				complete(&ctx->frame_cmplt);
  			return;
-@@ -2683,7 +2683,7 @@ static void bcm2835_codec_stop_streaming(struct vb2_queue *q)
+@@ -2683,7 +2683,7 @@ static void bcm2835_codec_stop_streaming
  		v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: return buffer %p\n",
  			 __func__, vbuf);
  
@@ -35,6 +33,3 @@ index 96de610e8354..d2b64a369ae8 100644
  	}
  
  	/* Disable MMAL port - this will flush buffers back */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0525-staging-bcm2835_codec-Log-MMAL-flags-in-hex.patch b/root/target/linux/bcm27xx/patches-5.15/950-0504-staging-bcm2835_codec-Log-MMAL-flags-in-hex.patch
similarity index 66%
rename from root/target/linux/bcm27xx/patches-5.15/0525-staging-bcm2835_codec-Log-MMAL-flags-in-hex.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0504-staging-bcm2835_codec-Log-MMAL-flags-in-hex.patch
index e1e8914d..9ca91956 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0525-staging-bcm2835_codec-Log-MMAL-flags-in-hex.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0504-staging-bcm2835_codec-Log-MMAL-flags-in-hex.patch
@@ -1,7 +1,7 @@
-From eb511595aca6ec4d69c47b824b26f39ff36806b1 Mon Sep 17 00:00:00 2001
+From fbfbe1912439ff6cff73848a77f482011428441b Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 6 Aug 2021 13:43:48 +0100
-Subject: [PATCH 525/634] staging/bcm2835_codec: Log MMAL flags in hex
+Subject: [PATCH 504/828] staging/bcm2835_codec: Log MMAL flags in hex
 
 The flags is a bitmask, so it's far easier to interpret as hex
 data instead of decimal.
@@ -11,11 +11,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c    | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index d2b64a369ae8..202830aee5b6 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -1071,7 +1071,7 @@ static void op_buffer_cb(struct vchiq_mmal_instance *instance,
+@@ -1071,7 +1071,7 @@ static void op_buffer_cb(struct vchiq_mm
  	struct vb2_v4l2_buffer *vb2;
  
  	v4l2_dbg(2, debug, &ctx->dev->v4l2_dev,
@@ -24,6 +22,3 @@ index d2b64a369ae8..202830aee5b6 100644
  		 __func__, status, mmal_buf, mmal_buf->length,
  		 mmal_buf->mmal_flags, mmal_buf->pts);
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0526-staging-bcm2835-codec-Allow-custom-specified-strides.patch b/root/target/linux/bcm27xx/patches-5.15/950-0505-staging-bcm2835-codec-Allow-custom-specified-strides.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0526-staging-bcm2835-codec-Allow-custom-specified-strides.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0505-staging-bcm2835-codec-Allow-custom-specified-strides.patch
index c6f1ebb5..614f0da0 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0526-staging-bcm2835-codec-Allow-custom-specified-strides.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0505-staging-bcm2835-codec-Allow-custom-specified-strides.patch
@@ -1,7 +1,7 @@
-From 6b89bd21c1ded5736735fe88fb47df7f76a691a0 Mon Sep 17 00:00:00 2001
+From 6f000850cff53e00a710803bdab859976f1bab5b Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Sat, 11 Sep 2021 17:21:07 +0100
-Subject: [PATCH 526/634] staging: bcm2835-codec: Allow custom specified
+Subject: [PATCH 505/828] staging: bcm2835-codec: Allow custom specified
  strides/bytesperline.
 
 If the client provides a bytesperline value in try_fmt/s_fmt then
@@ -12,11 +12,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c      | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 202830aee5b6..8e6a3ab629fc 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -1347,7 +1347,7 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
+@@ -1347,7 +1347,7 @@ static int vidioc_g_fmt_vid_cap(struct f
  static int vidioc_try_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
  			  struct bcm2835_codec_fmt *fmt)
  {
@@ -25,7 +23,7 @@ index 202830aee5b6..8e6a3ab629fc 100644
  
  	/*
  	 * The V4L2 specification requires the driver to correct the format
-@@ -1375,8 +1375,12 @@ static int vidioc_try_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
+@@ -1375,8 +1375,12 @@ static int vidioc_try_fmt(struct bcm2835
  			f->fmt.pix_mp.height = ALIGN(f->fmt.pix_mp.height, 16);
  	}
  	f->fmt.pix_mp.num_planes = 1;
@@ -39,6 +37,3 @@ index 202830aee5b6..8e6a3ab629fc 100644
  	sizeimage = get_sizeimage(f->fmt.pix_mp.plane_fmt[0].bytesperline,
  				  f->fmt.pix_mp.width, f->fmt.pix_mp.height,
  				  fmt);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0527-staging-vchiq-mmal-Add-the-deinterlace-image-effects.patch b/root/target/linux/bcm27xx/patches-5.15/950-0506-staging-vchiq-mmal-Add-the-deinterlace-image-effects.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0527-staging-vchiq-mmal-Add-the-deinterlace-image-effects.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0506-staging-vchiq-mmal-Add-the-deinterlace-image-effects.patch
index 20ec58ea..751de84f 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0527-staging-vchiq-mmal-Add-the-deinterlace-image-effects.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0506-staging-vchiq-mmal-Add-the-deinterlace-image-effects.patch
@@ -1,7 +1,7 @@
-From d1115f50578762fe906447024dde8610650dfe96 Mon Sep 17 00:00:00 2001
+From 3c3d15348b4547f447a9375257642aaf7f1e7dc1 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 6 Aug 2021 15:44:21 +0100
-Subject: [PATCH 527/634] staging/vchiq-mmal: Add the deinterlace image effects
+Subject: [PATCH 506/828] staging/vchiq-mmal: Add the deinterlace image effects
  enums
 
 As we're wanting to wrap the image_fx component for deinterlacing,
@@ -12,8 +12,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-index 844a02bf9a22..622508dc6e27 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 @@ -398,6 +398,9 @@ enum mmal_parameter_imagefx {
@@ -26,6 +24,3 @@ index 844a02bf9a22..622508dc6e27 100644
  };
  
  enum MMAL_PARAM_FLICKERAVOID {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0528-staging-bcm2835_codec-Add-support-for-image_fx-to-de.patch b/root/target/linux/bcm27xx/patches-5.15/950-0507-staging-bcm2835_codec-Add-support-for-image_fx-to-de.patch
similarity index 86%
rename from root/target/linux/bcm27xx/patches-5.15/0528-staging-bcm2835_codec-Add-support-for-image_fx-to-de.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0507-staging-bcm2835_codec-Add-support-for-image_fx-to-de.patch
index 9e8ec171..207eccb8 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0528-staging-bcm2835_codec-Add-support-for-image_fx-to-de.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0507-staging-bcm2835_codec-Add-support-for-image_fx-to-de.patch
@@ -1,7 +1,7 @@
-From bcb9dc21cd909e15be12d62f80e1502af6703450 Mon Sep 17 00:00:00 2001
+From 35f44d711f70e2a00cfdd9fa8492ff77677d59cd Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Fri, 6 Aug 2021 15:37:16 +0100
-Subject: [PATCH 528/634] staging/bcm2835_codec: Add support for image_fx to
+Subject: [PATCH 507/828] staging/bcm2835_codec: Add support for image_fx to
  deinterlace
 
 Adds another /dev/video node wrapping image_fx doing deinterlace.
@@ -12,8 +12,6 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  .../bcm2835-codec/bcm2835-v4l2-codec.c        | 152 +++++++++++++++++-
  1 file changed, 150 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 8e6a3ab629fc..38b59aa21069 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -58,6 +58,10 @@ static int isp_video_nr = 12;
@@ -70,7 +68,7 @@ index 8e6a3ab629fc..38b59aa21069 100644
  };
  
  enum {
-@@ -1196,6 +1212,19 @@ static void vb2_to_mmal_buffer(struct m2m_mmal_buffer *buf,
+@@ -1196,6 +1212,19 @@ static void vb2_to_mmal_buffer(struct m2
  	do_div(pts, 1000);
  	buf->mmal.pts = pts;
  	buf->mmal.dts = MMAL_TIME_UNKNOWN;
@@ -90,7 +88,7 @@ index 8e6a3ab629fc..38b59aa21069 100644
  }
  
  /* device_run() - prepares and starts the device
-@@ -1396,7 +1425,7 @@ static int vidioc_try_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
+@@ -1396,7 +1425,7 @@ static int vidioc_try_fmt(struct bcm2835
  	memset(f->fmt.pix_mp.plane_fmt[0].reserved, 0,
  	       sizeof(f->fmt.pix_mp.plane_fmt[0].reserved));
  
@@ -99,7 +97,7 @@ index 8e6a3ab629fc..38b59aa21069 100644
  		switch (f->fmt.pix_mp.field) {
  		/*
  		 * All of this is pretty much guesswork as we'll set the
-@@ -1686,6 +1715,46 @@ static int vidioc_g_selection(struct file *file, void *priv,
+@@ -1686,6 +1715,46 @@ static int vidioc_g_selection(struct fil
  		break;
  	case ISP:
  		break;
@@ -146,7 +144,7 @@ index 8e6a3ab629fc..38b59aa21069 100644
  	}
  
  	return 0;
-@@ -1761,6 +1830,41 @@ static int vidioc_s_selection(struct file *file, void *priv,
+@@ -1761,6 +1830,41 @@ static int vidioc_s_selection(struct fil
  		break;
  	case ISP:
  		break;
@@ -188,7 +186,7 @@ index 8e6a3ab629fc..38b59aa21069 100644
  	}
  
  	return 0;
-@@ -2335,6 +2439,30 @@ static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx)
+@@ -2335,6 +2439,30 @@ static int bcm2835_codec_create_componen
  					      MMAL_PARAMETER_VIDEO_VALIDATE_TIMESTAMPS,
  					      &enable,
  					      sizeof(enable));
@@ -219,7 +217,7 @@ index 8e6a3ab629fc..38b59aa21069 100644
  	}
  
  	setup_mmal_port_format(ctx, &ctx->q_data[V4L2_M2M_SRC],
-@@ -3173,6 +3301,16 @@ static int bcm2835_codec_create(struct bcm2835_codec_driver *drv,
+@@ -3173,6 +3301,16 @@ static int bcm2835_codec_create(struct b
  		function = MEDIA_ENT_F_PROC_VIDEO_SCALER;
  		video_nr = isp_video_nr;
  		break;
@@ -236,7 +234,7 @@ index 8e6a3ab629fc..38b59aa21069 100644
  	default:
  		ret = -EINVAL;
  		goto unreg_dev;
-@@ -3268,6 +3406,10 @@ static int bcm2835_codec_probe(struct platform_device *pdev)
+@@ -3268,6 +3406,10 @@ static int bcm2835_codec_probe(struct pl
  	if (ret)
  		goto out;
  
@@ -247,7 +245,7 @@ index 8e6a3ab629fc..38b59aa21069 100644
  	/* Register the media device node */
  	if (media_device_register(mdev) < 0)
  		goto out;
-@@ -3277,6 +3419,10 @@ static int bcm2835_codec_probe(struct platform_device *pdev)
+@@ -3277,6 +3419,10 @@ static int bcm2835_codec_probe(struct pl
  	return 0;
  
  out:
@@ -258,7 +256,7 @@ index 8e6a3ab629fc..38b59aa21069 100644
  	if (drv->isp) {
  		bcm2835_codec_destroy(drv->isp);
  		drv->isp = NULL;
-@@ -3298,6 +3444,8 @@ static int bcm2835_codec_remove(struct platform_device *pdev)
+@@ -3298,6 +3444,8 @@ static int bcm2835_codec_remove(struct p
  
  	media_device_unregister(&drv->mdev);
  
@@ -267,6 +265,3 @@ index 8e6a3ab629fc..38b59aa21069 100644
  	bcm2835_codec_destroy(drv->isp);
  
  	bcm2835_codec_destroy(drv->encode);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0529-staging-bcm2835-v4l2_codec-Fix-for-encode-selection-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0508-staging-bcm2835-v4l2_codec-Fix-for-encode-selection-.patch
similarity index 65%
rename from root/target/linux/bcm27xx/patches-5.15/0529-staging-bcm2835-v4l2_codec-Fix-for-encode-selection-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0508-staging-bcm2835-v4l2_codec-Fix-for-encode-selection-.patch
index f718ec03..9981fd07 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0529-staging-bcm2835-v4l2_codec-Fix-for-encode-selection-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0508-staging-bcm2835-v4l2_codec-Fix-for-encode-selection-.patch
@@ -1,7 +1,7 @@
-From fc522a0e8a71ac2c536ca8c57e934b43ed743486 Mon Sep 17 00:00:00 2001
+From 804067e16742c577a0c2f93a3e1b401f6fba57c4 Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Tue, 14 Sep 2021 16:44:18 +0100
-Subject: [PATCH 529/634] staging/bcm2835-v4l2_codec: Fix for encode selection
+Subject: [PATCH 508/828] staging/bcm2835-v4l2_codec: Fix for encode selection
  API
 
 Matches correct behaviour from DECODE and DEINTERLACE
@@ -11,11 +11,9 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c    | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 38b59aa21069..8df0eb2b532a 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -1819,7 +1819,7 @@ static int vidioc_s_selection(struct file *file, void *priv,
+@@ -1819,7 +1819,7 @@ static int vidioc_s_selection(struct fil
  			s->r.top = 0;
  			s->r.left = 0;
  			s->r.width = min(s->r.width, q_data->crop_width);
@@ -24,6 +22,3 @@ index 38b59aa21069..8df0eb2b532a 100644
  			q_data->crop_width = s->r.width;
  			q_data->crop_height = s->r.height;
  			q_data->selection_set = true;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0530-Add-Raspberry-Pi-PoE-HAT-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0509-Add-Raspberry-Pi-PoE-HAT-support.patch
similarity index 91%
rename from root/target/linux/bcm27xx/patches-5.15/0530-Add-Raspberry-Pi-PoE-HAT-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0509-Add-Raspberry-Pi-PoE-HAT-support.patch
index 1a210762..35a7be10 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0530-Add-Raspberry-Pi-PoE-HAT-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0509-Add-Raspberry-Pi-PoE-HAT-support.patch
@@ -1,7 +1,7 @@
-From 9628b2a5295c04d62f8abb40f96e86fbdf6b8f68 Mon Sep 17 00:00:00 2001
+From a561f8b0e9298ef1282346b8df1f9640085bf396 Mon Sep 17 00:00:00 2001
 From: Serge Schneider <serge@raspberrypi.com>
 Date: Mon, 2 Dec 2019 14:48:05 +0000
-Subject: [PATCH 530/634] Add Raspberry Pi PoE+ HAT support
+Subject: [PATCH 509/828] Add Raspberry Pi PoE+ HAT support
 
 Signed-off-by: Serge Schneider <serge@raspberrypi.com>
 ---
@@ -12,8 +12,6 @@ Signed-off-by: Serge Schneider <serge@raspberrypi.com>
  4 files changed, 236 insertions(+), 1 deletion(-)
  create mode 100644 drivers/power/supply/rpi_poe_power.c
 
-diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
-index fcc7534edcb2..986c941aaa20 100644
 --- a/drivers/power/supply/Kconfig
 +++ b/drivers/power/supply/Kconfig
 @@ -28,6 +28,12 @@ config POWER_SUPPLY_HWMON
@@ -29,11 +27,9 @@ index fcc7534edcb2..986c941aaa20 100644
  
  config PDA_POWER
  	tristate "Generic PDA/phone power driver"
-diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile
-index 4e55a11aab79..44923a19dc61 100644
 --- a/drivers/power/supply/Makefile
 +++ b/drivers/power/supply/Makefile
-@@ -9,6 +9,7 @@ obj-$(CONFIG_POWER_SUPPLY)	+= power_supply.o
+@@ -9,6 +9,7 @@ obj-$(CONFIG_POWER_SUPPLY)	+= power_supp
  obj-$(CONFIG_POWER_SUPPLY_HWMON) += power_supply_hwmon.o
  obj-$(CONFIG_GENERIC_ADC_BATTERY)	+= generic-adc-battery.o
  
@@ -41,9 +37,6 @@ index 4e55a11aab79..44923a19dc61 100644
  obj-$(CONFIG_PDA_POWER)		+= pda_power.o
  obj-$(CONFIG_APM_POWER)		+= apm_power.o
  obj-$(CONFIG_AXP20X_POWER)	+= axp20x_usb_power.o
-diff --git a/drivers/power/supply/rpi_poe_power.c b/drivers/power/supply/rpi_poe_power.c
-new file mode 100644
-index 000000000000..0c96b2c1e8ab
 --- /dev/null
 +++ b/drivers/power/supply/rpi_poe_power.c
 @@ -0,0 +1,227 @@
@@ -274,8 +267,6 @@ index 000000000000..0c96b2c1e8ab
 +MODULE_ALIAS("platform:" DRVNAME);
 +MODULE_DESCRIPTION("Raspberry Pi PoE+ HAT power supply driver");
 +MODULE_LICENSE("GPL");
-diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index 7fdce4033b46..dd3bbc75e531 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
 @@ -92,7 +92,8 @@ enum rpi_firmware_property_tag {
@@ -288,6 +279,3 @@ index 7fdce4033b46..dd3bbc75e531 100644
  	RPI_FIRMWARE_NOTIFY_XHCI_RESET =                      0x00030058,
  	RPI_FIRMWARE_GET_REBOOT_FLAGS =                       0x00030064,
  	RPI_FIRMWARE_SET_REBOOT_FLAGS =                       0x00038064,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0532-ARM-dts-Restore-downstream-dtbs-to-Makefile.patch b/root/target/linux/bcm27xx/patches-5.15/950-0510-ARM-dts-Restore-downstream-dtbs-to-Makefile.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0532-ARM-dts-Restore-downstream-dtbs-to-Makefile.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0510-ARM-dts-Restore-downstream-dtbs-to-Makefile.patch
index e52032ff..f9853a6e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0532-ARM-dts-Restore-downstream-dtbs-to-Makefile.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0510-ARM-dts-Restore-downstream-dtbs-to-Makefile.patch
@@ -1,15 +1,13 @@
-From 8d1188d6db74ceeb582bfc1337a6c3fd159d7f5b Mon Sep 17 00:00:00 2001
+From bf1f6721de9071d5613fed4dd17a46c265ce1b24 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Wed, 22 Sep 2021 09:16:46 +0100
-Subject: [PATCH 532/634] ARM: dts: Restore downstream dtbs to Makefile
+Subject: [PATCH 510/828] ARM: dts: Restore downstream dtbs to Makefile
 
 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 ---
  arch/arm/boot/dts/Makefile | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index b2d1fb05a975..6eb4e78e562c 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -1,8 +1,18 @@
@@ -31,6 +29,3 @@ index b2d1fb05a975..6eb4e78e562c 100644
  	bcm2710-rpi-cm3.dtb \
  	bcm2711-rpi-cm4.dtb
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0533-media-rpivid-Avoid-returning-EINVAL-to-a-G_FMT-ioctl.patch b/root/target/linux/bcm27xx/patches-5.15/950-0511-media-rpivid-Avoid-returning-EINVAL-to-a-G_FMT-ioctl.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0533-media-rpivid-Avoid-returning-EINVAL-to-a-G_FMT-ioctl.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0511-media-rpivid-Avoid-returning-EINVAL-to-a-G_FMT-ioctl.patch
index 2af0418d..ee2e63df 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0533-media-rpivid-Avoid-returning-EINVAL-to-a-G_FMT-ioctl.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0511-media-rpivid-Avoid-returning-EINVAL-to-a-G_FMT-ioctl.patch
@@ -1,7 +1,7 @@
-From cc0209667eb013c1152393e860ee307b46651197 Mon Sep 17 00:00:00 2001
+From 7728b92a9788c92124d3510562016814b01a52a1 Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Wed, 1 Sep 2021 16:34:50 +0100
-Subject: [PATCH 533/634] media: rpivid: Avoid returning EINVAL to a G_FMT
+Subject: [PATCH 511/828] media: rpivid: Avoid returning EINVAL to a G_FMT
  ioctl
 
 V4L2 spec says that G/S/TRY_FMT IOCTLs should never return errors for
@@ -17,11 +17,9 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  drivers/staging/media/rpivid/rpivid_video.h |  3 +-
  4 files changed, 54 insertions(+), 51 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid.c b/drivers/staging/media/rpivid/rpivid.c
-index ed629cddc123..f78e5dee9303 100644
 --- a/drivers/staging/media/rpivid/rpivid.c
 +++ b/drivers/staging/media/rpivid/rpivid.c
-@@ -249,7 +249,6 @@ static int rpivid_open(struct file *file)
+@@ -249,7 +249,6 @@ static int rpivid_open(struct file *file
  	/* The only bit of format info that we can guess now is H265 src
  	 * Everything else we need more info for
  	 */
@@ -29,8 +27,6 @@ index ed629cddc123..f78e5dee9303 100644
  	rpivid_prepare_src_format(&ctx->src_fmt);
  
  	v4l2_fh_add(&ctx->fh);
-diff --git a/drivers/staging/media/rpivid/rpivid.h b/drivers/staging/media/rpivid/rpivid.h
-index 68e0b383b831..aa8448566c09 100644
 --- a/drivers/staging/media/rpivid/rpivid.h
 +++ b/drivers/staging/media/rpivid/rpivid.h
 @@ -35,8 +35,6 @@
@@ -42,8 +38,6 @@ index 68e0b383b831..aa8448566c09 100644
  enum rpivid_irq_status {
  	RPIVID_IRQ_NONE,
  	RPIVID_IRQ_ERROR,
-diff --git a/drivers/staging/media/rpivid/rpivid_video.c b/drivers/staging/media/rpivid/rpivid_video.c
-index 705015890e71..1efaa99a55f6 100644
 --- a/drivers/staging/media/rpivid/rpivid_video.c
 +++ b/drivers/staging/media/rpivid/rpivid_video.c
 @@ -27,6 +27,8 @@
@@ -55,7 +49,7 @@ index 705015890e71..1efaa99a55f6 100644
  #define RPIVID_MAX_WIDTH	4096U
  #define RPIVID_MAX_HEIGHT	4096U
  
-@@ -70,25 +72,22 @@ size_t rpivid_bit_buf_size(unsigned int w, unsigned int h, unsigned int bits_min
+@@ -70,25 +72,22 @@ size_t rpivid_bit_buf_size(unsigned int
  	return rpivid_round_up_size(bits_alloc);
  }
  
@@ -88,7 +82,7 @@ index 705015890e71..1efaa99a55f6 100644
  
  	if (!pix_fmt->plane_fmt[0].sizeimage ||
  	    pix_fmt->plane_fmt[0].sizeimage > SZ_32M) {
-@@ -98,6 +97,7 @@ int rpivid_prepare_src_format(struct v4l2_pix_format_mplane *pix_fmt)
+@@ -98,6 +97,7 @@ int rpivid_prepare_src_format(struct v4l
  	/* Set a minimum */
  	size = max_t(u32, SZ_4K, pix_fmt->plane_fmt[0].sizeimage);
  
@@ -96,7 +90,7 @@ index 705015890e71..1efaa99a55f6 100644
  	pix_fmt->width = w;
  	pix_fmt->height = h;
  	pix_fmt->num_planes = 1;
-@@ -105,22 +105,33 @@ int rpivid_prepare_src_format(struct v4l2_pix_format_mplane *pix_fmt)
+@@ -105,22 +105,33 @@ int rpivid_prepare_src_format(struct v4l
  	/* Zero bytes per line for encoded source. */
  	pix_fmt->plane_fmt[0].bytesperline = 0;
  	pix_fmt->plane_fmt[0].sizeimage = size;
@@ -135,7 +129,7 @@ index 705015890e71..1efaa99a55f6 100644
  
  		/* 16 aligned height - not sure we even need that */
  		height = ALIGN(height, 16);
-@@ -140,7 +151,7 @@ int rpivid_prepare_dst_format(struct v4l2_pix_format_mplane *pix_fmt)
+@@ -140,7 +151,7 @@ int rpivid_prepare_dst_format(struct v4l
  		/* width in pixels (3 pels = 4 bytes) rounded to 128 byte
  		 * columns
  		 */
@@ -144,7 +138,7 @@ index 705015890e71..1efaa99a55f6 100644
  
  		/* 16-aligned height. */
  		height = ALIGN(height, 16);
-@@ -157,9 +168,6 @@ int rpivid_prepare_dst_format(struct v4l2_pix_format_mplane *pix_fmt)
+@@ -157,9 +168,6 @@ int rpivid_prepare_dst_format(struct v4l
  		sizeimage = constrain2x(sizeimage,
  					bytesperline * width * 4 / 3);
  		break;
@@ -154,7 +148,7 @@ index 705015890e71..1efaa99a55f6 100644
  	}
  
  	pix_fmt->width = width;
-@@ -169,7 +177,6 @@ int rpivid_prepare_dst_format(struct v4l2_pix_format_mplane *pix_fmt)
+@@ -169,7 +177,6 @@ int rpivid_prepare_dst_format(struct v4l
  	pix_fmt->plane_fmt[0].bytesperline = bytesperline;
  	pix_fmt->plane_fmt[0].sizeimage = sizeimage;
  	pix_fmt->num_planes = 1;
@@ -162,7 +156,7 @@ index 705015890e71..1efaa99a55f6 100644
  }
  
  static int rpivid_querycap(struct file *file, void *priv,
-@@ -260,14 +267,13 @@ static u32 pixelformat_from_sps(const struct v4l2_ctrl_hevc_sps * const sps,
+@@ -260,14 +267,13 @@ static u32 pixelformat_from_sps(const st
  {
  	u32 pf = 0;
  
@@ -179,7 +173,7 @@ index 705015890e71..1efaa99a55f6 100644
  		if (sps->bit_depth_luma_minus8 == 0)
  			pf = V4L2_PIX_FMT_NV12_COL128;
  		else if (sps->bit_depth_luma_minus8 == 2)
-@@ -282,11 +288,14 @@ rpivid_hevc_default_dst_fmt(struct rpivid_ctx * const ctx)
+@@ -282,11 +288,14 @@ rpivid_hevc_default_dst_fmt(struct rpivi
  {
  	const struct v4l2_ctrl_hevc_sps * const sps =
  		rpivid_find_control_data(ctx, V4L2_CID_MPEG_VIDEO_HEVC_SPS);
@@ -199,7 +193,7 @@ index 705015890e71..1efaa99a55f6 100644
  
  	rpivid_prepare_dst_format(&pix_fmt);
  	return pix_fmt;
-@@ -315,14 +324,23 @@ static int rpivid_enum_fmt_vid_cap(struct file *file, void *priv,
+@@ -315,14 +324,23 @@ static int rpivid_enum_fmt_vid_cap(struc
  	return 0;
  }
  
@@ -226,7 +220,7 @@ index 705015890e71..1efaa99a55f6 100644
  	return 0;
  }
  
-@@ -358,31 +376,20 @@ static int rpivid_try_fmt_vid_cap(struct file *file, void *priv,
+@@ -358,31 +376,20 @@ static int rpivid_try_fmt_vid_cap(struct
  			break;
  	}
  
@@ -261,7 +255,7 @@ index 705015890e71..1efaa99a55f6 100644
  	return 0;
  }
  
-@@ -474,7 +481,7 @@ static int rpivid_queue_setup(struct vb2_queue *vq, unsigned int *nbufs,
+@@ -474,7 +481,7 @@ static int rpivid_queue_setup(struct vb2
  	if (V4L2_TYPE_IS_OUTPUT(vq->type))
  		pix_fmt = &ctx->src_fmt;
  	else
@@ -270,11 +264,9 @@ index 705015890e71..1efaa99a55f6 100644
  
  	if (*nplanes) {
  		if (sizes[0] < pix_fmt->plane_fmt[0].sizeimage)
-diff --git a/drivers/staging/media/rpivid/rpivid_video.h b/drivers/staging/media/rpivid/rpivid_video.h
-index a3b228556497..e22cc0e32aa3 100644
 --- a/drivers/staging/media/rpivid/rpivid_video.h
 +++ b/drivers/staging/media/rpivid/rpivid_video.h
-@@ -28,7 +28,6 @@ int rpivid_queue_init(void *priv, struct vb2_queue *src_vq,
+@@ -28,7 +28,6 @@ int rpivid_queue_init(void *priv, struct
  size_t rpivid_bit_buf_size(unsigned int w, unsigned int h, unsigned int bits_minus8);
  size_t rpivid_round_up_size(const size_t x);
  
@@ -283,6 +275,3 @@ index a3b228556497..e22cc0e32aa3 100644
 +void rpivid_prepare_src_format(struct v4l2_pix_format_mplane *pix_fmt);
  
  #endif
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0534-net-phy-lan87xx-Allow-more-time-for-link-detect.patch b/root/target/linux/bcm27xx/patches-5.15/950-0512-net-phy-lan87xx-Allow-more-time-for-link-detect.patch
similarity index 78%
rename from root/target/linux/bcm27xx/patches-5.15/0534-net-phy-lan87xx-Allow-more-time-for-link-detect.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0512-net-phy-lan87xx-Allow-more-time-for-link-detect.patch
index ce32e122..3b89317d 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0534-net-phy-lan87xx-Allow-more-time-for-link-detect.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0512-net-phy-lan87xx-Allow-more-time-for-link-detect.patch
@@ -1,7 +1,7 @@
-From 3e9c2e40ee0d45fc2dc5bf719d50adff235a757c Mon Sep 17 00:00:00 2001
+From bcaed04f0a8b543590f476498b9abb7e4680e844 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Wed, 22 Sep 2021 15:38:13 +0100
-Subject: [PATCH 534/634] net: phy: lan87xx: Allow more time for link detect
+Subject: [PATCH 512/828] net: phy: lan87xx: Allow more time for link detect
 
 With EDPWRDOWN set in idle, it must be cleared before checking for
 ENERGYON going high, indicating that a link is being established.
@@ -19,11 +19,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/net/phy/smsc.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
-index d8cac02a79b9..c168a7f95a25 100644
 --- a/drivers/net/phy/smsc.c
 +++ b/drivers/net/phy/smsc.c
-@@ -228,12 +228,12 @@ static int lan87xx_read_status(struct phy_device *phydev)
+@@ -228,12 +228,12 @@ static int lan87xx_read_status(struct ph
  		if (rc < 0)
  			return rc;
  
@@ -38,6 +36,3 @@ index d8cac02a79b9..c168a7f95a25 100644
  				  MII_LAN83C185_CTRL_STATUS);
  		if (rc < 0)
  			return rc;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0535-media-rpivid-Remove-unused-ctx-state-variable-and-de.patch b/root/target/linux/bcm27xx/patches-5.15/950-0513-media-rpivid-Remove-unused-ctx-state-variable-and-de.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0535-media-rpivid-Remove-unused-ctx-state-variable-and-de.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0513-media-rpivid-Remove-unused-ctx-state-variable-and-de.patch
index 2ef7176f..d7b9d714 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0535-media-rpivid-Remove-unused-ctx-state-variable-and-de.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0513-media-rpivid-Remove-unused-ctx-state-variable-and-de.patch
@@ -1,7 +1,7 @@
-From 88460f3ae7686670dae8bebbc65ef28aa780bdf8 Mon Sep 17 00:00:00 2001
+From d4f22ed39ac455ecb1317301fb612b9618fd35f8 Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Wed, 22 Sep 2021 18:57:19 +0100
-Subject: [PATCH 535/634] media: rpivid: Remove unused ctx state variable and
+Subject: [PATCH 513/828] media: rpivid: Remove unused ctx state variable and
  defines
 
 Remove unused ctx state tracking variable and associated defines.
@@ -12,11 +12,9 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  drivers/staging/media/rpivid/rpivid.h | 7 -------
  1 file changed, 7 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid.h b/drivers/staging/media/rpivid/rpivid.h
-index aa8448566c09..fe6cf1806410 100644
 --- a/drivers/staging/media/rpivid/rpivid.h
 +++ b/drivers/staging/media/rpivid/rpivid.h
-@@ -82,12 +82,6 @@ typedef void (*rpivid_irq_callback)(struct rpivid_dev *dev, void *ctx);
+@@ -82,12 +82,6 @@ typedef void (*rpivid_irq_callback)(stru
  struct rpivid_q_aux;
  #define RPIVID_AUX_ENT_COUNT VB2_MAX_FRAME
  
@@ -37,6 +35,3 @@ index aa8448566c09..fe6cf1806410 100644
  	struct clk_request		*clk_req;
  	int 				src_stream_on;
  	int 				dst_stream_on;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0536-media-rpivid-Ensure-IRQs-have-completed-before-unini.patch b/root/target/linux/bcm27xx/patches-5.15/950-0514-media-rpivid-Ensure-IRQs-have-completed-before-unini.patch
similarity index 85%
rename from root/target/linux/bcm27xx/patches-5.15/0536-media-rpivid-Ensure-IRQs-have-completed-before-unini.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0514-media-rpivid-Ensure-IRQs-have-completed-before-unini.patch
index d8ad8da4..bafb5633 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0536-media-rpivid-Ensure-IRQs-have-completed-before-unini.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0514-media-rpivid-Ensure-IRQs-have-completed-before-unini.patch
@@ -1,7 +1,7 @@
-From 673ac3906174682d7e83097c95478b3c4d824895 Mon Sep 17 00:00:00 2001
+From e077846abbd1d26fe91d8f2087344399dfe07d46 Mon Sep 17 00:00:00 2001
 From: John Cox <jc@kynesim.co.uk>
 Date: Wed, 22 Sep 2021 19:05:30 +0100
-Subject: [PATCH 536/634] media: rpivid: Ensure IRQs have completed before
+Subject: [PATCH 514/828] media: rpivid: Ensure IRQs have completed before
  uniniting context
 
 Before uniniting the decode context sync with the IRQ queues to ensure
@@ -15,11 +15,9 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  drivers/staging/media/rpivid/rpivid_h265.c | 58 ++++++++++++++++++++--
  1 file changed, 53 insertions(+), 5 deletions(-)
 
-diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
-index e3a5c331ca10..834e34a8373f 100644
 --- a/drivers/staging/media/rpivid/rpivid_h265.c
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
-@@ -2387,12 +2387,50 @@ static void dec_state_delete(struct rpivid_ctx *const ctx)
+@@ -2387,12 +2387,50 @@ static void dec_state_delete(struct rpiv
  	kfree(s);
  }
  
@@ -74,7 +72,7 @@ index e3a5c331ca10..834e34a8373f 100644
  
  	dec_env_uninit(ctx);
  	dec_state_delete(ctx);
-@@ -2409,6 +2447,16 @@ static void rpivid_h265_stop(struct rpivid_ctx *ctx)
+@@ -2409,6 +2447,16 @@ static void rpivid_h265_stop(struct rpiv
  		gptr_free(dev, ctx->coeff_bufs + i);
  }
  
@@ -91,7 +89,7 @@ index e3a5c331ca10..834e34a8373f 100644
  static int rpivid_h265_start(struct rpivid_ctx *ctx)
  {
  	struct rpivid_dev *const dev = ctx->dev;
-@@ -2470,7 +2518,7 @@ static int rpivid_h265_start(struct rpivid_ctx *ctx)
+@@ -2470,7 +2518,7 @@ static int rpivid_h265_start(struct rpiv
  	return 0;
  
  fail:
@@ -100,6 +98,3 @@ index e3a5c331ca10..834e34a8373f 100644
  	return -ENOMEM;
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0537-staging-bcm2835-codec-Allow-decode-res-changed-befor.patch b/root/target/linux/bcm27xx/patches-5.15/950-0515-staging-bcm2835-codec-Allow-decode-res-changed-befor.patch
similarity index 86%
rename from root/target/linux/bcm27xx/patches-5.15/0537-staging-bcm2835-codec-Allow-decode-res-changed-befor.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0515-staging-bcm2835-codec-Allow-decode-res-changed-befor.patch
index c6453b50..d2738121 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0537-staging-bcm2835-codec-Allow-decode-res-changed-befor.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0515-staging-bcm2835-codec-Allow-decode-res-changed-befor.patch
@@ -1,7 +1,7 @@
-From 9ce078ff86374fa7b333e28c948f117b5e5c45e1 Mon Sep 17 00:00:00 2001
+From eb6a1fd581a25fc74dd5806fccae42266e76033b Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 9 Oct 2020 10:40:27 +0100
-Subject: [PATCH 537/634] staging: bcm2835-codec: Allow decode res changed
+Subject: [PATCH 515/828] staging: bcm2835-codec: Allow decode res changed
  before STREAMON(CAPTURE)
 
 The V4L2 stateful video decoder API requires that you can STREAMON
@@ -16,11 +16,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../bcm2835-codec/bcm2835-v4l2-codec.c        | 137 +++++++++++++++---
  1 file changed, 117 insertions(+), 20 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 8df0eb2b532a..f8fe8effa06d 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -1498,6 +1498,7 @@ static int vidioc_s_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
+@@ -1498,6 +1498,7 @@ static int vidioc_s_fmt(struct bcm2835_c
  	struct vb2_queue *vq;
  	struct vchiq_mmal_port *port;
  	bool update_capture_port = false;
@@ -28,7 +26,7 @@ index 8df0eb2b532a..f8fe8effa06d 100644
  	int ret;
  
  	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev,	"Setting format for type %d, wxh: %dx%d, fmt: %08x, size %u\n",
-@@ -1575,6 +1576,24 @@ static int vidioc_s_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
+@@ -1575,6 +1576,24 @@ static int vidioc_s_fmt(struct bcm2835_c
  	if (!port)
  		return 0;
  
@@ -53,7 +51,7 @@ index 8df0eb2b532a..f8fe8effa06d 100644
  	setup_mmal_port_format(ctx, q_data, port);
  	ret = vchiq_mmal_port_set_format(ctx->dev->instance, port);
  	if (ret) {
-@@ -1589,6 +1608,14 @@ static int vidioc_s_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
+@@ -1589,6 +1608,14 @@ static int vidioc_s_fmt(struct bcm2835_c
  			 port->minimum_buffer.size);
  	}
  
@@ -68,7 +66,7 @@ index 8df0eb2b532a..f8fe8effa06d 100644
  	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev,	"Set format for type %d, wxh: %dx%d, fmt: %08x, size %u\n",
  		 f->type, q_data->crop_width, q_data->height,
  		 q_data->fmt->fourcc, q_data->sizeimage);
-@@ -2467,9 +2494,11 @@ static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx)
+@@ -2467,9 +2494,11 @@ static int bcm2835_codec_create_componen
  
  	setup_mmal_port_format(ctx, &ctx->q_data[V4L2_M2M_SRC],
  			       &ctx->component->input[0]);
@@ -80,7 +78,7 @@ index 8df0eb2b532a..f8fe8effa06d 100644
  
  	ret = vchiq_mmal_port_set_format(dev->instance,
  					 &ctx->component->input[0]);
-@@ -2724,6 +2753,24 @@ static void bcm2835_codec_buffer_cleanup(struct vb2_buffer *vb)
+@@ -2724,6 +2753,24 @@ static void bcm2835_codec_buffer_cleanup
  	bcm2835_codec_mmal_buf_cleanup(&buf->mmal);
  }
  
@@ -105,7 +103,7 @@ index 8df0eb2b532a..f8fe8effa06d 100644
  static int bcm2835_codec_start_streaming(struct vb2_queue *q,
  					 unsigned int count)
  {
-@@ -2731,7 +2778,7 @@ static int bcm2835_codec_start_streaming(struct vb2_queue *q,
+@@ -2731,7 +2778,7 @@ static int bcm2835_codec_start_streaming
  	struct bcm2835_codec_dev *dev = ctx->dev;
  	struct bcm2835_codec_q_data *q_data = get_q_data(ctx, q->type);
  	struct vchiq_mmal_port *port = get_port_data(ctx, q->type);
@@ -114,7 +112,7 @@ index 8df0eb2b532a..f8fe8effa06d 100644
  
  	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: type: %d count %d\n",
  		 __func__, q->type, count);
-@@ -2746,6 +2793,34 @@ static int bcm2835_codec_start_streaming(struct vb2_queue *q,
+@@ -2746,6 +2793,34 @@ static int bcm2835_codec_start_streaming
  		ctx->component_enabled = true;
  	}
  
@@ -149,7 +147,7 @@ index 8df0eb2b532a..f8fe8effa06d 100644
  	if (count < port->minimum_buffer.num)
  		count = port->minimum_buffer.num;
  
-@@ -2760,6 +2835,22 @@ static int bcm2835_codec_start_streaming(struct vb2_queue *q,
+@@ -2760,6 +2835,22 @@ static int bcm2835_codec_start_streaming
  				 __func__, ret);
  	}
  
@@ -172,7 +170,7 @@ index 8df0eb2b532a..f8fe8effa06d 100644
  	if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
  		/*
  		 * Create the EOS buffer.
-@@ -2771,7 +2862,6 @@ static int bcm2835_codec_start_streaming(struct vb2_queue *q,
+@@ -2771,7 +2862,6 @@ static int bcm2835_codec_start_streaming
  				      &q_data->eos_buffer.mmal);
  		q_data->eos_buffer_in_use = false;
  
@@ -180,7 +178,7 @@ index 8df0eb2b532a..f8fe8effa06d 100644
  		ret = vchiq_mmal_port_enable(dev->instance,
  					     port,
  					     ip_buffer_cb);
-@@ -2779,14 +2869,17 @@ static int bcm2835_codec_start_streaming(struct vb2_queue *q,
+@@ -2779,14 +2869,17 @@ static int bcm2835_codec_start_streaming
  			v4l2_err(&ctx->dev->v4l2_dev, "%s: Failed enabling i/p port, ret %d\n",
  				 __func__, ret);
  	} else {
@@ -205,7 +203,7 @@ index 8df0eb2b532a..f8fe8effa06d 100644
  	return ret;
  }
  
-@@ -2825,17 +2918,21 @@ static void bcm2835_codec_stop_streaming(struct vb2_queue *q)
+@@ -2825,17 +2918,21 @@ static void bcm2835_codec_stop_streaming
  			 __func__, V4L2_TYPE_IS_OUTPUT(q->type) ? "i/p" : "o/p",
  			 ret);
  
@@ -238,6 +236,3 @@ index 8df0eb2b532a..f8fe8effa06d 100644
  	}
  
  	/* If both ports disabled, then disable the component */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0538-staging-bcm2835-codec-Do-not-send-buffers-to-the-VPU.patch b/root/target/linux/bcm27xx/patches-5.15/950-0516-staging-bcm2835-codec-Do-not-send-buffers-to-the-VPU.patch
similarity index 91%
rename from root/target/linux/bcm27xx/patches-5.15/0538-staging-bcm2835-codec-Do-not-send-buffers-to-the-VPU.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0516-staging-bcm2835-codec-Do-not-send-buffers-to-the-VPU.patch
index 12264be4..d855648c 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0538-staging-bcm2835-codec-Do-not-send-buffers-to-the-VPU.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0516-staging-bcm2835-codec-Do-not-send-buffers-to-the-VPU.patch
@@ -1,7 +1,7 @@
-From 8a014fbf7a5f7d7a62bdd8d3698b43ade3268b37 Mon Sep 17 00:00:00 2001
+From 1db683dc94e3729a8da577f4ed67e902fff587e7 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 15 Sep 2021 17:44:19 +0100
-Subject: [PATCH 538/634] staging/bcm2835-codec: Do not send buffers to the VPU
+Subject: [PATCH 516/828] staging/bcm2835-codec: Do not send buffers to the VPU
  unless streaming
 
 With video decode we now enable both input and output ports on
@@ -15,8 +15,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../bcm2835-codec/bcm2835-v4l2-codec.c        | 64 +++++++++++--------
  1 file changed, 38 insertions(+), 26 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index f8fe8effa06d..4156018dbf7a 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -1244,35 +1244,47 @@ static void device_run(void *priv)
@@ -66,6 +64,13 @@ index f8fe8effa06d..4156018dbf7a 100644
 -		m2m = container_of(dst_buf, struct v4l2_m2m_buffer, vb);
 -		dst_m2m_buf = container_of(m2m, struct m2m_mmal_buffer, m2m);
 -		vb2_to_mmal_buffer(dst_m2m_buf, dst_buf);
+-
+-		ret = vchiq_mmal_submit_buffer(dev->instance,
+-					       &ctx->component->output[0],
+-					       &dst_m2m_buf->mmal);
+-		if (ret)
+-			v4l2_err(&ctx->dev->v4l2_dev, "%s: Failed submitting op buffer\n",
+-				 __func__);
 +	if (ctx->fh.m2m_ctx->cap_q_ctx.q.streaming) {
 +		dst_buf = v4l2_m2m_buf_remove(&ctx->fh.m2m_ctx->cap_q_ctx);
 +		if (dst_buf) {
@@ -73,13 +78,7 @@ index f8fe8effa06d..4156018dbf7a 100644
 +			dst_m2m_buf = container_of(m2m, struct m2m_mmal_buffer,
 +						   m2m);
 +			vb2_to_mmal_buffer(dst_m2m_buf, dst_buf);
- 
--		ret = vchiq_mmal_submit_buffer(dev->instance,
--					       &ctx->component->output[0],
--					       &dst_m2m_buf->mmal);
--		if (ret)
--			v4l2_err(&ctx->dev->v4l2_dev, "%s: Failed submitting op buffer\n",
--				 __func__);
++
 +			v4l2_dbg(3, debug, &ctx->dev->v4l2_dev,
 +				 "%s: Submitted op buffer\n", __func__);
 +			ret = vchiq_mmal_submit_buffer(dev->instance,
@@ -93,6 +92,3 @@ index f8fe8effa06d..4156018dbf7a 100644
  	}
  
  	v4l2_dbg(3, debug, &ctx->dev->v4l2_dev, "%s: Submitted src %p, dst %p\n",
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0539-staging-mmal-vchiq-Rationalise-included-headers.patch b/root/target/linux/bcm27xx/patches-5.15/950-0517-staging-mmal-vchiq-Rationalise-included-headers.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0539-staging-mmal-vchiq-Rationalise-included-headers.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0517-staging-mmal-vchiq-Rationalise-included-headers.patch
index a856a29d..596c1eb5 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0539-staging-mmal-vchiq-Rationalise-included-headers.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0517-staging-mmal-vchiq-Rationalise-included-headers.patch
@@ -1,7 +1,7 @@
-From 61177eac4f91c6c2f22b6c886e9e1b331026524f Mon Sep 17 00:00:00 2001
+From 9da9219369e0b3cadcba3fb666b282d2db9a37d2 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 15 Sep 2021 17:49:41 +0100
-Subject: [PATCH 539/634] staging/mmal-vchiq: Rationalise included headers
+Subject: [PATCH 517/828] staging/mmal-vchiq: Rationalise included headers
 
 The list of includes was slightly over generic, and wasn't
 in alphabetical order. Clean it up.
@@ -11,8 +11,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 9 ++++-----
  1 file changed, 4 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 c88393f22d87..e5ba3b067ae3 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -15,16 +15,15 @@
@@ -36,6 +34,3 @@ index c88393f22d87..e5ba3b067ae3 100644
  
  #include "mmal-common.h"
  #include "mmal-parameters.h"
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0540-staging-bcm2835-codec-Format-changed-should-trigger-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0518-staging-bcm2835-codec-Format-changed-should-trigger-.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0540-staging-bcm2835-codec-Format-changed-should-trigger-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0518-staging-bcm2835-codec-Format-changed-should-trigger-.patch
index 4d07ed63..9bcb82d6 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0540-staging-bcm2835-codec-Format-changed-should-trigger-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0518-staging-bcm2835-codec-Format-changed-should-trigger-.patch
@@ -1,7 +1,7 @@
-From ea60f8939fe973a50e8a219ddd89d87e7b99cb39 Mon Sep 17 00:00:00 2001
+From da0b449519fc6c2a45c0e48ebff4671f81e222a2 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 16 Sep 2021 16:32:53 +0100
-Subject: [PATCH 540/634] staging: bcm2835-codec: Format changed should trigger
+Subject: [PATCH 518/828] staging: bcm2835-codec: Format changed should trigger
  drain
 
 When a format changed event occurs, the spec says that it
@@ -20,11 +20,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 4156018dbf7a..73afe99268ff 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -1005,6 +1005,7 @@ static void handle_fmt_changed(struct bcm2835_codec_ctx *ctx,
+@@ -1005,6 +1005,7 @@ static void handle_fmt_changed(struct bc
  		(struct mmal_msg_event_format_changed *)mmal_buf->buffer;
  	struct mmal_parameter_video_interlace_type interlace;
  	int interlace_size = sizeof(interlace);
@@ -32,7 +30,7 @@ index 4156018dbf7a..73afe99268ff 100644
  	int ret;
  
  	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: Format changed: buff size min %u, rec %u, buff num min %u, rec %u\n",
-@@ -1074,6 +1075,10 @@ static void handle_fmt_changed(struct bcm2835_codec_ctx *ctx,
+@@ -1074,6 +1075,10 @@ static void handle_fmt_changed(struct bc
  		q_data->field = V4L2_FIELD_NONE;
  	}
  
@@ -43,6 +41,3 @@ index 4156018dbf7a..73afe99268ff 100644
  	queue_res_chg_event(ctx);
  }
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0541-staging-bcm2835-codec-Signal-the-firmware-to-stop-on.patch b/root/target/linux/bcm27xx/patches-5.15/950-0519-staging-bcm2835-codec-Signal-the-firmware-to-stop-on.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0541-staging-bcm2835-codec-Signal-the-firmware-to-stop-on.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0519-staging-bcm2835-codec-Signal-the-firmware-to-stop-on.patch
index a1818531..05dd3b1a 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0541-staging-bcm2835-codec-Signal-the-firmware-to-stop-on.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0519-staging-bcm2835-codec-Signal-the-firmware-to-stop-on.patch
@@ -1,7 +1,7 @@
-From 92c84f5ddf4f8e76878d973a3b03fdafb28071ec Mon Sep 17 00:00:00 2001
+From 963566c583165b8c4c003cc00df0ba2f0474328c Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 16 Sep 2021 16:39:07 +0100
-Subject: [PATCH 541/634] staging: bcm2835-codec: Signal the firmware to stop
+Subject: [PATCH 519/828] staging: bcm2835-codec: Signal the firmware to stop
  on all changes
 
 The firmware defaults to not stopping video decode if only the
@@ -15,11 +15,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../staging/vc04_services/vchiq-mmal/mmal-parameters.h |  3 +++
  2 files changed, 13 insertions(+)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 73afe99268ff..6c6e0ba34a0b 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -2483,6 +2483,16 @@ static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx)
+@@ -2483,6 +2483,16 @@ static int bcm2835_codec_create_componen
  					      MMAL_PARAMETER_VIDEO_VALIDATE_TIMESTAMPS,
  					      &enable,
  					      sizeof(enable));
@@ -36,8 +34,6 @@ index 73afe99268ff..6c6e0ba34a0b 100644
  	} else if (dev->role == DEINTERLACE) {
  		/* Select the default deinterlace algorithm. */
  		int half_framerate = 0;
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-index 622508dc6e27..21087496a481 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 @@ -682,6 +682,9 @@ enum mmal_parameter_video_type {
@@ -50,6 +46,3 @@ index 622508dc6e27..21087496a481 100644
  };
  
  /** Valid mirror modes */
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0542-staging-mmal-vchiq-Add-module-parameter-to-enable-lo.patch b/root/target/linux/bcm27xx/patches-5.15/950-0520-staging-mmal-vchiq-Add-module-parameter-to-enable-lo.patch
similarity index 86%
rename from root/target/linux/bcm27xx/patches-5.15/0542-staging-mmal-vchiq-Add-module-parameter-to-enable-lo.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0520-staging-mmal-vchiq-Add-module-parameter-to-enable-lo.patch
index 93cfe812..3f163285 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0542-staging-mmal-vchiq-Add-module-parameter-to-enable-lo.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0520-staging-mmal-vchiq-Add-module-parameter-to-enable-lo.patch
@@ -1,7 +1,7 @@
-From 3c1686dbfcf7979ed9f6b1d07876597cd14b4085 Mon Sep 17 00:00:00 2001
+From 6e5069f8ba6095cd0dc882157b61eb1c773277d9 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 15 Sep 2021 17:54:11 +0100
-Subject: [PATCH 542/634] staging/mmal-vchiq: Add module parameter to enable
+Subject: [PATCH 520/828] staging/mmal-vchiq: Add module parameter to enable
  logging.
 
 Adds a module parameter "debug" to enable various logging levels.
@@ -11,8 +11,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../vc04_services/vchiq-mmal/mmal-vchiq.c     | 156 ++++++++++--------
  1 file changed, 85 insertions(+), 71 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index e5ba3b067ae3..139ca5a733cd 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -31,6 +31,17 @@
@@ -33,7 +31,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  /*
   * maximum number of components supported.
   * This matches the maximum permitted by default on the VPU
-@@ -381,7 +392,8 @@ buffer_from_host(struct vchiq_mmal_instance *instance,
+@@ -381,7 +392,8 @@ buffer_from_host(struct vchiq_mmal_insta
  	if (!port->enabled)
  		return -EINVAL;
  
@@ -43,7 +41,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  
  	/* get context */
  	if (!buf->msg_context) {
-@@ -549,11 +561,11 @@ static void event_to_host_cb(struct vchiq_mmal_instance *instance,
+@@ -549,11 +561,11 @@ static void event_to_host_cb(struct vchi
  		msg_context->u.bulk.pts = MMAL_TIME_UNKNOWN;
  		msg_context->u.bulk.cmd = msg->u.event_to_host.cmd;
  
@@ -60,7 +58,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  	}
  
  	schedule_work(&msg_context->u.bulk.work);
-@@ -566,8 +578,8 @@ static void buffer_to_host_cb(struct vchiq_mmal_instance *instance,
+@@ -566,8 +578,8 @@ static void buffer_to_host_cb(struct vch
  	struct mmal_msg_context *msg_context;
  	u32 handle;
  
@@ -71,7 +69,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  
  	if (msg->u.buffer_from_host.drvbuf.magic == MMAL_MAGIC) {
  		handle = msg->u.buffer_from_host.drvbuf.client_context;
-@@ -837,42 +849,43 @@ static int send_synchronous_mmal_msg(struct vchiq_mmal_instance *instance,
+@@ -837,42 +849,43 @@ static int send_synchronous_mmal_msg(str
  
  static void dump_port_info(struct vchiq_mmal_port *port)
  {
@@ -82,29 +80,32 @@ index e5ba3b067ae3..139ca5a733cd 100644
 -	pr_debug("buffer minimum num:%d size:%d align:%d\n",
 -		 port->minimum_buffer.num,
 -		 port->minimum_buffer.size, port->minimum_buffer.alignment);
-+	pr_dbg_lvl(3, debug, "buffer minimum num:%d size:%d align:%d\n",
-+		   port->minimum_buffer.num,
-+		   port->minimum_buffer.size, port->minimum_buffer.alignment);
- 
+-
 -	pr_debug("buffer recommended num:%d size:%d align:%d\n",
 -		 port->recommended_buffer.num,
 -		 port->recommended_buffer.size,
 -		 port->recommended_buffer.alignment);
+-
+-	pr_debug("buffer current values num:%d size:%d align:%d\n",
+-		 port->current_buffer.num,
+-		 port->current_buffer.size, port->current_buffer.alignment);
+-
+-	pr_debug("elementary stream: type:%d encoding:0x%x variant:0x%x\n",
+-		 port->format.type,
+-		 port->format.encoding, port->format.encoding_variant);
++	pr_dbg_lvl(3, debug, "buffer minimum num:%d size:%d align:%d\n",
++		   port->minimum_buffer.num,
++		   port->minimum_buffer.size, port->minimum_buffer.alignment);
++
 +	pr_dbg_lvl(3, debug, "buffer recommended num:%d size:%d align:%d\n",
 +		   port->recommended_buffer.num,
 +		   port->recommended_buffer.size,
 +		   port->recommended_buffer.alignment);
- 
--	pr_debug("buffer current values num:%d size:%d align:%d\n",
--		 port->current_buffer.num,
--		 port->current_buffer.size, port->current_buffer.alignment);
++
 +	pr_dbg_lvl(3, debug, "buffer current values num:%d size:%d align:%d\n",
 +		   port->current_buffer.num,
 +		   port->current_buffer.size, port->current_buffer.alignment);
- 
--	pr_debug("elementary stream: type:%d encoding:0x%x variant:0x%x\n",
--		 port->format.type,
--		 port->format.encoding, port->format.encoding_variant);
++
 +	pr_dbg_lvl(3, debug, "elementary stream: type:%d encoding:0x%x variant:0x%x\n",
 +		   port->format.type,
 +		   port->format.encoding, port->format.encoding_variant);
@@ -144,7 +145,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  	}
  }
  
-@@ -903,7 +916,7 @@ static int port_info_set(struct vchiq_mmal_instance *instance,
+@@ -903,7 +916,7 @@ static int port_info_set(struct vchiq_mm
  	struct mmal_msg *rmsg;
  	struct vchiq_header *rmsg_handle;
  
@@ -153,7 +154,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  	if (!port)
  		return -1;
  	dump_port_info(port);
-@@ -946,8 +959,8 @@ static int port_info_set(struct vchiq_mmal_instance *instance,
+@@ -946,8 +959,8 @@ static int port_info_set(struct vchiq_mm
  	/* return operation status */
  	ret = -rmsg->u.port_info_get_reply.status;
  
@@ -164,7 +165,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  
  release_msg:
  	vchiq_release_message(instance->service_handle, rmsg_handle);
-@@ -1037,13 +1050,13 @@ static int port_info_get(struct vchiq_mmal_instance *instance,
+@@ -1037,13 +1050,13 @@ static int port_info_get(struct vchiq_mm
  	       rmsg->u.port_info_get_reply.extradata,
  	       port->format.extradata_size);
  
@@ -181,7 +182,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  
  	vchiq_release_message(instance->service_handle, rmsg_handle);
  
-@@ -1088,9 +1101,9 @@ static int create_component(struct vchiq_mmal_instance *instance,
+@@ -1088,9 +1101,9 @@ static int create_component(struct vchiq
  	component->outputs = rmsg->u.component_create_reply.output_num;
  	component->clocks = rmsg->u.component_create_reply.clock_num;
  
@@ -194,7 +195,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  
  release_msg:
  	vchiq_release_message(instance->service_handle, rmsg_handle);
-@@ -1259,10 +1272,9 @@ static int port_action_port(struct vchiq_mmal_instance *instance,
+@@ -1259,10 +1272,9 @@ static int port_action_port(struct vchiq
  
  	ret = -rmsg->u.port_action_reply.status;
  
@@ -208,7 +209,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  
  release_msg:
  	vchiq_release_message(instance->service_handle, rmsg_handle);
-@@ -1306,11 +1318,11 @@ static int port_action_handle(struct vchiq_mmal_instance *instance,
+@@ -1306,11 +1318,11 @@ static int port_action_handle(struct vch
  
  	ret = -rmsg->u.port_action_reply.status;
  
@@ -225,7 +226,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  
  release_msg:
  	vchiq_release_message(instance->service_handle, rmsg_handle);
-@@ -1349,9 +1361,9 @@ static int port_parameter_set(struct vchiq_mmal_instance *instance,
+@@ -1349,9 +1361,9 @@ static int port_parameter_set(struct vch
  
  	ret = -rmsg->u.port_parameter_set_reply.status;
  
@@ -238,7 +239,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  
  release_msg:
  	vchiq_release_message(instance->service_handle, rmsg_handle);
-@@ -1409,8 +1421,9 @@ static int port_parameter_get(struct vchiq_mmal_instance *instance,
+@@ -1409,8 +1421,9 @@ static int port_parameter_get(struct vch
  	/* Always report the size of the returned parameter to the caller */
  	*value_size = rmsg->u.port_parameter_get_reply.size;
  
@@ -250,7 +251,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  
  release_msg:
  	vchiq_release_message(instance->service_handle, rmsg_handle);
-@@ -1667,7 +1680,7 @@ int vchiq_mmal_port_connect_tunnel(struct vchiq_mmal_instance *instance,
+@@ -1667,7 +1680,7 @@ int vchiq_mmal_port_connect_tunnel(struc
  	if (!dst) {
  		/* do not make new connection */
  		ret = 0;
@@ -259,7 +260,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  		goto release_unlock;
  	}
  
-@@ -1685,14 +1698,14 @@ int vchiq_mmal_port_connect_tunnel(struct vchiq_mmal_instance *instance,
+@@ -1685,14 +1698,14 @@ int vchiq_mmal_port_connect_tunnel(struc
  	/* set new format */
  	ret = port_info_set(instance, dst);
  	if (ret) {
@@ -276,7 +277,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  		goto release_unlock;
  	}
  
-@@ -1701,9 +1714,9 @@ int vchiq_mmal_port_connect_tunnel(struct vchiq_mmal_instance *instance,
+@@ -1701,9 +1714,9 @@ int vchiq_mmal_port_connect_tunnel(struc
  				 MMAL_MSG_PORT_ACTION_TYPE_CONNECT,
  				 dst->component->handle, dst->handle);
  	if (ret < 0) {
@@ -289,7 +290,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  		goto release_unlock;
  	}
  	src->connected = dst;
-@@ -1728,7 +1741,8 @@ int vchiq_mmal_submit_buffer(struct vchiq_mmal_instance *instance,
+@@ -1728,7 +1741,8 @@ int vchiq_mmal_submit_buffer(struct vchi
  	 * videobuf2 won't let us have the dmabuf there.
  	 */
  	if (port->zero_copy && buffer->dma_buf && !buffer->vcsm_handle) {
@@ -299,7 +300,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  		ret = vc_sm_cma_import_dmabuf(buffer->dma_buf,
  					      &buffer->vcsm_handle);
  		if (ret) {
-@@ -1744,8 +1758,8 @@ int vchiq_mmal_submit_buffer(struct vchiq_mmal_instance *instance,
+@@ -1744,8 +1758,8 @@ int vchiq_mmal_submit_buffer(struct vchi
  			vc_sm_cma_free(buffer->vcsm_handle);
  			return ret;
  		}
@@ -310,7 +311,7 @@ index e5ba3b067ae3..139ca5a733cd 100644
  	}
  
  	ret = buffer_from_host(instance, port, buffer);
-@@ -1784,8 +1798,8 @@ int mmal_vchi_buffer_cleanup(struct mmal_buffer *buf)
+@@ -1784,8 +1798,8 @@ int mmal_vchi_buffer_cleanup(struct mmal
  	if (buf->vcsm_handle) {
  		int ret;
  
@@ -321,6 +322,3 @@ index e5ba3b067ae3..139ca5a733cd 100644
  		ret = vc_sm_cma_free(buf->vcsm_handle);
  		if (ret)
  			pr_err("%s: vcsm_free failed, ret %d\n", __func__, ret);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0543-staging-bcm2835-codec-Queue-flushed-buffers-instead-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0521-staging-bcm2835-codec-Queue-flushed-buffers-instead-.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0543-staging-bcm2835-codec-Queue-flushed-buffers-instead-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0521-staging-bcm2835-codec-Queue-flushed-buffers-instead-.patch
index 29d4fddb..f62b4db2 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0543-staging-bcm2835-codec-Queue-flushed-buffers-instead-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0521-staging-bcm2835-codec-Queue-flushed-buffers-instead-.patch
@@ -1,7 +1,7 @@
-From f9d7aa82524c9a1497b8a412650a1b68a2daa1c2 Mon Sep 17 00:00:00 2001
+From 272c57ddf7cf0c9b004ee3da1a26776536cff135 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 16 Sep 2021 16:46:58 +0100
-Subject: [PATCH 543/634] staging: bcm2835-codec: Queue flushed buffers instead
+Subject: [PATCH 521/828] staging: bcm2835-codec: Queue flushed buffers instead
  of completing
 
 When a buffer is returned on a port that is disabled, return it
@@ -13,11 +13,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c  | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 6c6e0ba34a0b..03c9ccb35ee1 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -926,7 +926,9 @@ static void ip_buffer_cb(struct vchiq_mmal_instance *instance,
+@@ -926,7 +926,9 @@ static void ip_buffer_cb(struct vchiq_mm
  
  	v4l2_dbg(3, debug, &ctx->dev->v4l2_dev, "%s: no error. Return buffer %p\n",
  		 __func__, &buf->m2m.vb.vb2_buf);
@@ -28,6 +26,3 @@ index 6c6e0ba34a0b..03c9ccb35ee1 100644
  
  	ctx->num_ip_buffers++;
  	v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: done %d input buffers\n",
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0544-staging-mmal-vchiq-Reset-buffers_with_vpu-on-port_en.patch b/root/target/linux/bcm27xx/patches-5.15/950-0522-staging-mmal-vchiq-Reset-buffers_with_vpu-on-port_en.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0544-staging-mmal-vchiq-Reset-buffers_with_vpu-on-port_en.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0522-staging-mmal-vchiq-Reset-buffers_with_vpu-on-port_en.patch
index 790200bc..45440f6a 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0544-staging-mmal-vchiq-Reset-buffers_with_vpu-on-port_en.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0522-staging-mmal-vchiq-Reset-buffers_with_vpu-on-port_en.patch
@@ -1,7 +1,7 @@
-From 92caad9ac73308a15209c741a5233d7bca7d36b3 Mon Sep 17 00:00:00 2001
+From 53072083cf5cf8086b7dc343cb09cb14cae68a41 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 21 Sep 2021 17:17:57 +0100
-Subject: [PATCH 544/634] staging: mmal-vchiq: Reset buffers_with_vpu on
+Subject: [PATCH 522/828] staging: mmal-vchiq: Reset buffers_with_vpu on
  port_enable
 
 Should we go through the timeout failure case with port_disable
@@ -18,11 +18,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  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 139ca5a733cd..87194606185a 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -1500,6 +1500,8 @@ static int port_enable(struct vchiq_mmal_instance *instance,
+@@ -1500,6 +1500,8 @@ static int port_enable(struct vchiq_mmal
  
  	port->enabled = 1;
  
@@ -31,6 +29,3 @@ index 139ca5a733cd..87194606185a 100644
  	if (port->buffer_cb) {
  		/* send buffer headers to videocore */
  		hdr_count = 1;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0545-staging-bcm2835_codec-Correct-flushing-code-for-refc.patch b/root/target/linux/bcm27xx/patches-5.15/950-0523-staging-bcm2835_codec-Correct-flushing-code-for-refc.patch
similarity index 75%
rename from root/target/linux/bcm27xx/patches-5.15/0545-staging-bcm2835_codec-Correct-flushing-code-for-refc.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0523-staging-bcm2835_codec-Correct-flushing-code-for-refc.patch
index 7c6227bb..e2c9e8de 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0545-staging-bcm2835_codec-Correct-flushing-code-for-refc.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0523-staging-bcm2835_codec-Correct-flushing-code-for-refc.patch
@@ -1,7 +1,7 @@
-From cd116837f064795dad603f1f2bd58d734b32b174 Mon Sep 17 00:00:00 2001
+From b2f458e5b6644673560f4b59e2b4b3c443acb324 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 22 Sep 2021 16:42:49 +0100
-Subject: [PATCH 545/634] staging: bcm2835_codec: Correct flushing code for
+Subject: [PATCH 523/828] staging: bcm2835_codec: Correct flushing code for
  refcounting
 
 Completions don't reference count, so setting the completion
@@ -15,11 +15,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../bcm2835-codec/bcm2835-v4l2-codec.c        | 20 ++++++++++++++-----
  1 file changed, 15 insertions(+), 5 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 03c9ccb35ee1..1b8611549f4f 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -934,7 +934,7 @@ static void ip_buffer_cb(struct vchiq_mmal_instance *instance,
+@@ -934,7 +934,7 @@ static void ip_buffer_cb(struct vchiq_mm
  	v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: done %d input buffers\n",
  		 __func__, ctx->num_ip_buffers);
  
@@ -28,7 +26,7 @@ index 03c9ccb35ee1..1b8611549f4f 100644
  		complete(&ctx->frame_cmplt);
  }
  
-@@ -1135,7 +1135,8 @@ static void op_buffer_cb(struct vchiq_mmal_instance *instance,
+@@ -1135,7 +1135,8 @@ static void op_buffer_cb(struct vchiq_mm
  			 __func__, mmal_buf->mmal_flags);
  		if (!(mmal_buf->mmal_flags & MMAL_BUFFER_HEADER_FLAG_EOS)) {
  			vb2_buffer_done(&vb2->vb2_buf, VB2_BUF_STATE_QUEUED);
@@ -38,7 +36,7 @@ index 03c9ccb35ee1..1b8611549f4f 100644
  				complete(&ctx->frame_cmplt);
  			return;
  		}
-@@ -1178,7 +1179,7 @@ static void op_buffer_cb(struct vchiq_mmal_instance *instance,
+@@ -1178,7 +1179,7 @@ static void op_buffer_cb(struct vchiq_mm
  	v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: done %d output buffers\n",
  		 __func__, ctx->num_op_buffers);
  
@@ -47,7 +45,7 @@ index 03c9ccb35ee1..1b8611549f4f 100644
  		complete(&ctx->frame_cmplt);
  }
  
-@@ -1596,6 +1597,8 @@ static int vidioc_s_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
+@@ -1596,6 +1597,8 @@ static int vidioc_s_fmt(struct bcm2835_c
  		return 0;
  
  	if (port->enabled) {
@@ -56,7 +54,7 @@ index 03c9ccb35ee1..1b8611549f4f 100644
  		/*
  		 * This should only ever happen with DECODE and the MMAL output
  		 * port that has been enabled for resolution changed events.
-@@ -1606,10 +1609,18 @@ static int vidioc_s_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
+@@ -1606,10 +1609,18 @@ static int vidioc_s_fmt(struct bcm2835_c
  			f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ||
  			atomic_read(&port->buffers_with_vpu));
  
@@ -75,7 +73,7 @@ index 03c9ccb35ee1..1b8611549f4f 100644
  		reenable_port = true;
  	}
  
-@@ -2787,7 +2798,7 @@ static void bcm2835_codec_flush_buffers(struct bcm2835_codec_ctx *ctx,
+@@ -2787,7 +2798,7 @@ static void bcm2835_codec_flush_buffers(
  {
  	int ret;
  
@@ -84,7 +82,7 @@ index 03c9ccb35ee1..1b8611549f4f 100644
  		v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: Waiting for buffers to be returned - %d outstanding\n",
  			 __func__, atomic_read(&port->buffers_with_vpu));
  		ret = wait_for_completion_timeout(&ctx->frame_cmplt,
-@@ -2796,7 +2807,6 @@ static void bcm2835_codec_flush_buffers(struct bcm2835_codec_ctx *ctx,
+@@ -2796,7 +2807,6 @@ static void bcm2835_codec_flush_buffers(
  			v4l2_err(&ctx->dev->v4l2_dev, "%s: Timeout waiting for buffers to be returned - %d outstanding\n",
  				 __func__,
  				 atomic_read(&port->buffers_with_vpu));
@@ -92,6 +90,3 @@ index 03c9ccb35ee1..1b8611549f4f 100644
  		}
  	}
  }
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0546-staging-bcm2835-codec-Ensure-all-ctrls-are-set-on-st.patch b/root/target/linux/bcm27xx/patches-5.15/950-0524-staging-bcm2835-codec-Ensure-all-ctrls-are-set-on-st.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0546-staging-bcm2835-codec-Ensure-all-ctrls-are-set-on-st.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0524-staging-bcm2835-codec-Ensure-all-ctrls-are-set-on-st.patch
index 41572b87..916ddc6b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0546-staging-bcm2835-codec-Ensure-all-ctrls-are-set-on-st.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0524-staging-bcm2835-codec-Ensure-all-ctrls-are-set-on-st.patch
@@ -1,7 +1,7 @@
-From bbcc379728853e36cbdf9b6130c758eed43f4932 Mon Sep 17 00:00:00 2001
+From 59cf6542c9ffa48ab2035d9f1b8bdc26336c37ed Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Mon, 20 Sep 2021 15:00:51 +0100
-Subject: [PATCH 546/634] staging: bcm2835-codec: Ensure all ctrls are set on
+Subject: [PATCH 524/828] staging: bcm2835-codec: Ensure all ctrls are set on
  streamon
 
 Currently the code was only setting some controls from
@@ -14,11 +14,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../bcm2835-codec/bcm2835-v4l2-codec.c        | 51 +++++++------------
  1 file changed, 19 insertions(+), 32 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 1b8611549f4f..f5eaff3e4612 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -2437,33 +2437,6 @@ static const struct v4l2_ioctl_ops bcm2835_codec_ioctl_ops = {
+@@ -2437,33 +2437,6 @@ static const struct v4l2_ioctl_ops bcm28
  	.vidioc_enum_framesizes = vidioc_enum_framesizes,
  };
  
@@ -52,7 +50,7 @@ index 1b8611549f4f..f5eaff3e4612 100644
  static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx)
  {
  	struct bcm2835_codec_dev *dev = ctx->dev;
-@@ -2567,9 +2540,6 @@ static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx)
+@@ -2567,9 +2540,6 @@ static int bcm2835_codec_create_componen
  				 ctx->q_data[V4L2_M2M_SRC].sizeimage,
  				 ctx->component->output[0].minimum_buffer.size);
  
@@ -62,7 +60,7 @@ index 1b8611549f4f..f5eaff3e4612 100644
  		/* Enable SPS Timing header so framerate information is encoded
  		 * in the H264 header.
  		 */
-@@ -2598,6 +2568,10 @@ static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx)
+@@ -2598,6 +2568,10 @@ static int bcm2835_codec_create_componen
  				 ctx->q_data[V4L2_M2M_DST].sizeimage,
  				 ctx->component->output[0].minimum_buffer.size);
  	}
@@ -73,7 +71,7 @@ index 1b8611549f4f..f5eaff3e4612 100644
  	v4l2_dbg(2, debug, &dev->v4l2_dev, "%s: component created as %s\n",
  		 __func__, components[dev->role]);
  
-@@ -3099,7 +3073,9 @@ static int bcm2835_codec_open(struct file *file)
+@@ -3099,7 +3073,9 @@ static int bcm2835_codec_open(struct fil
  	file->private_data = &ctx->fh;
  	ctx->dev = dev;
  	hdl = &ctx->hdl;
@@ -84,7 +82,7 @@ index 1b8611549f4f..f5eaff3e4612 100644
  		/* Encode controls */
  		v4l2_ctrl_handler_init(hdl, 9);
  
-@@ -3158,7 +3134,10 @@ static int bcm2835_codec_open(struct file *file)
+@@ -3158,7 +3134,10 @@ static int bcm2835_codec_open(struct fil
  		}
  		ctx->fh.ctrl_handler = hdl;
  		v4l2_ctrl_handler_setup(hdl);
@@ -96,7 +94,7 @@ index 1b8611549f4f..f5eaff3e4612 100644
  		v4l2_ctrl_handler_init(hdl, 1);
  
  		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
-@@ -3171,6 +3150,14 @@ static int bcm2835_codec_open(struct file *file)
+@@ -3171,6 +3150,14 @@ static int bcm2835_codec_open(struct fil
  		ctx->fh.ctrl_handler = hdl;
  		v4l2_ctrl_handler_setup(hdl);
  	}
@@ -111,6 +109,3 @@ index 1b8611549f4f..f5eaff3e4612 100644
  
  	ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(dev->m2m_dev, ctx, &queue_init);
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0547-staging-bcm2835-codec-Add-support-for-H-V-Flips-to-I.patch b/root/target/linux/bcm27xx/patches-5.15/950-0525-staging-bcm2835-codec-Add-support-for-H-V-Flips-to-I.patch
similarity index 81%
rename from root/target/linux/bcm27xx/patches-5.15/0547-staging-bcm2835-codec-Add-support-for-H-V-Flips-to-I.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0525-staging-bcm2835-codec-Add-support-for-H-V-Flips-to-I.patch
index 4bcf5da3..982241db 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0547-staging-bcm2835-codec-Add-support-for-H-V-Flips-to-I.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0525-staging-bcm2835-codec-Add-support-for-H-V-Flips-to-I.patch
@@ -1,7 +1,7 @@
-From e23a9d80ff01a8b015827139f1af6d3b6bc42272 Mon Sep 17 00:00:00 2001
+From 5379b062a73079380bfc90372dcfd9dc256719cc Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Mon, 20 Sep 2021 14:37:17 +0100
-Subject: [PATCH 547/634] staging: bcm2835-codec: Add support for H&V Flips to
+Subject: [PATCH 525/828] staging: bcm2835-codec: Add support for H&V Flips to
  ISP
 
 The ISP can do H & V flips whilst resizing or converting
@@ -12,8 +12,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../bcm2835-codec/bcm2835-v4l2-codec.c        | 48 +++++++++++++++++++
  1 file changed, 48 insertions(+)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index f5eaff3e4612..6078d6e2ace0 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -679,6 +679,9 @@ struct bcm2835_codec_ctx {
@@ -26,7 +24,7 @@ index f5eaff3e4612..6078d6e2ace0 100644
  	/* Source and destination queue data */
  	struct bcm2835_codec_q_data   q_data[2];
  	s32  bitrate;
-@@ -2202,6 +2205,34 @@ static int bcm2835_codec_s_ctrl(struct v4l2_ctrl *ctrl)
+@@ -2202,6 +2205,34 @@ static int bcm2835_codec_s_ctrl(struct v
  						    sizeof(mmal_bool));
  		break;
  	}
@@ -61,7 +59,7 @@ index f5eaff3e4612..6078d6e2ace0 100644
  
  	default:
  		v4l2_err(&ctx->dev->v4l2_dev, "Invalid control\n");
-@@ -3152,6 +3183,23 @@ static int bcm2835_codec_open(struct file *file)
+@@ -3152,6 +3183,23 @@ static int bcm2835_codec_open(struct fil
  	}
  	break;
  	case ISP:
@@ -85,6 +83,3 @@ index f5eaff3e4612..6078d6e2ace0 100644
  	case DEINTERLACE:
  	{
  		v4l2_ctrl_handler_init(hdl, 0);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0548-overlays-add-support-for-the-MLX90640-thermal-camera.patch b/root/target/linux/bcm27xx/patches-5.15/950-0526-overlays-add-support-for-the-MLX90640-thermal-camera.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0548-overlays-add-support-for-the-MLX90640-thermal-camera.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0526-overlays-add-support-for-the-MLX90640-thermal-camera.patch
index ac4572f3..371c46d0 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0548-overlays-add-support-for-the-MLX90640-thermal-camera.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0526-overlays-add-support-for-the-MLX90640-thermal-camera.patch
@@ -1,7 +1,7 @@
-From a30b4e6cd16adf8441ec456fec434664b340aed8 Mon Sep 17 00:00:00 2001
+From 71d53647792737d5d9a1f5917253fbfe149a3a89 Mon Sep 17 00:00:00 2001
 From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
 Date: Sun, 19 Sep 2021 13:30:43 +0200
-Subject: [PATCH 548/634] overlays: add support for the MLX90640 thermal camera
+Subject: [PATCH 526/828] overlays: add support for the MLX90640 thermal camera
 
 This allows using the video-i2c camera driver with MLX90640 thermal
 infrared sensors, connected to Raspberry Pi. CONFIG_VIDEO_V4L2_I2C
@@ -15,8 +15,6 @@ Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  3 files changed, 29 insertions(+)
  create mode 100644 arch/arm/boot/dts/overlays/mlx90640-overlay.dts
 
-diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 44aedc149ff0..5dc1f892934e 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -129,6 +129,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -27,11 +25,9 @@ index 44aedc149ff0..5dc1f892934e 100644
  	mmc.dtbo \
  	mpu6050.dtbo \
  	mz61581.dtbo \
-diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index eb2c9adfb1a8..06d1dfdbf1cd 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
-@@ -2152,6 +2152,12 @@ Params: krnbt                   Set to "on" to enable autoprobing of Bluetooth
+@@ -2152,6 +2152,12 @@ Params: krnbt                   Set to "
                                  driver without need of hciattach/btattach
  
  
@@ -44,9 +40,6 @@ index eb2c9adfb1a8..06d1dfdbf1cd 100644
  Name:   mmc
  Info:   Selects the bcm2835-mmc SD/MMC driver, optionally with overclock
  Load:   dtoverlay=mmc,<param>=<val>
-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 @@
@@ -72,6 +65,3 @@ index 000000000000..a2655ed82585
 +		};
 +	};
 +};
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0549-overlays-Add-generic-mcp2515-overlay.patch b/root/target/linux/bcm27xx/patches-5.15/950-0527-overlays-Add-generic-mcp2515-overlay.patch
similarity index 89%
rename from root/target/linux/bcm27xx/patches-5.15/0549-overlays-Add-generic-mcp2515-overlay.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0527-overlays-Add-generic-mcp2515-overlay.patch
index 25c307bc..a5f804c6 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0549-overlays-Add-generic-mcp2515-overlay.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0527-overlays-Add-generic-mcp2515-overlay.patch
@@ -1,7 +1,7 @@
-From 3a4f42d8c89d37fe004cef17e5d710608815bc81 Mon Sep 17 00:00:00 2001
+From cf2400d91383fc58b54534d421686004814af0fa Mon Sep 17 00:00:00 2001
 From: GabyPCgeeK <GabyPCgeeK@users.noreply.github.com>
 Date: Mon, 27 Sep 2021 04:43:21 -0400
-Subject: [PATCH 549/634] overlays: Add generic mcp2515 overlay
+Subject: [PATCH 527/828] overlays: Add generic mcp2515 overlay
 
 Can configure mcp2515 on spi0/1/2 without the need for multiple overlays.
 ---
@@ -11,8 +11,6 @@ Can configure mcp2515 on spi0/1/2 without the need for multiple overlays.
  3 files changed, 172 insertions(+)
  create mode 100644 arch/arm/boot/dts/overlays/mcp2515-overlay.dts
 
-diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 5dc1f892934e..65e8b3f7c7e8 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -113,6 +113,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -23,11 +21,9 @@ index 5dc1f892934e..65e8b3f7c7e8 100644
  	mcp2515-can0.dtbo \
  	mcp2515-can1.dtbo \
  	mcp251xfd.dtbo \
-diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 06d1dfdbf1cd..cda354151d79 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
-@@ -1977,6 +1977,21 @@ Params: s08-spi<n>-<m>-present  4-bit integer, bitmap indicating MCP23S08
+@@ -1977,6 +1977,21 @@ Params: s08-spi<n>-<m>-present  4-bit in
                                  or INTB output of MCP23S17 is connected.
  
  
@@ -49,9 +45,6 @@ index 06d1dfdbf1cd..cda354151d79 100644
  Name:   mcp2515-can0
  Info:   Configures the MCP2515 CAN controller on spi0.0
  Load:   dtoverlay=mcp2515-can0,<param>=<val>
-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 @@
@@ -211,6 +204,3 @@ index 000000000000..cda1fb0b1199
 +			<&mcp2515>, "interrupts:0";
 +	};
 +};
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0550-regulator-rpi-panel-Remove-get_brightness-hook.patch b/root/target/linux/bcm27xx/patches-5.15/950-0528-regulator-rpi-panel-Remove-get_brightness-hook.patch
similarity index 79%
rename from root/target/linux/bcm27xx/patches-5.15/0550-regulator-rpi-panel-Remove-get_brightness-hook.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0528-regulator-rpi-panel-Remove-get_brightness-hook.patch
index 60705616..c98de12a 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0550-regulator-rpi-panel-Remove-get_brightness-hook.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0528-regulator-rpi-panel-Remove-get_brightness-hook.patch
@@ -1,7 +1,7 @@
-From 81dda278c29bb42ac97b0d3bcca1e55181d6c331 Mon Sep 17 00:00:00 2001
+From 2c4e54dfbf229430d74d4a22f5c63c1004db6755 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 21 Sep 2021 15:32:50 +0100
-Subject: [PATCH 550/634] regulator: rpi-panel: Remove get_brightness hook
+Subject: [PATCH 528/828] regulator: rpi-panel: Remove get_brightness hook
 
 The driver was implementing a get_brightness function that
 tried to read back the PWM setting of the display to report
@@ -18,11 +18,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../regulator/rpi-panel-attiny-regulator.c    | 23 -------------------
  1 file changed, 23 deletions(-)
 
-diff --git a/drivers/regulator/rpi-panel-attiny-regulator.c b/drivers/regulator/rpi-panel-attiny-regulator.c
-index 998233f14085..8090b9a485b5 100644
 --- a/drivers/regulator/rpi-panel-attiny-regulator.c
 +++ b/drivers/regulator/rpi-panel-attiny-regulator.c
-@@ -207,31 +207,8 @@ static int attiny_update_status(struct backlight_device *bl)
+@@ -207,31 +207,8 @@ static int attiny_update_status(struct b
  	return ret;
  }
  
@@ -54,6 +52,3 @@ index 998233f14085..8090b9a485b5 100644
  };
  
  static int attiny_gpio_get_direction(struct gpio_chip *gc, unsigned int off)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0551-bcm2835_smi_dev-Fix-handling-of-word-odd-lengths.patch b/root/target/linux/bcm27xx/patches-5.15/950-0529-bcm2835_smi_dev-Fix-handling-of-word-odd-lengths.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0551-bcm2835_smi_dev-Fix-handling-of-word-odd-lengths.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0529-bcm2835_smi_dev-Fix-handling-of-word-odd-lengths.patch
index 0c6f2509..6ea93d54 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0551-bcm2835_smi_dev-Fix-handling-of-word-odd-lengths.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0529-bcm2835_smi_dev-Fix-handling-of-word-odd-lengths.patch
@@ -1,7 +1,7 @@
-From 2c9463f1adad6e30dd1fec001e34a7e9a9604315 Mon Sep 17 00:00:00 2001
+From 16fd6eea153ed10e08b3b441be9d1b4aca7cddf6 Mon Sep 17 00:00:00 2001
 From: madimario <madimario@users.noreply.github.com>
 Date: Tue, 28 Sep 2021 04:20:06 -0400
-Subject: [PATCH 551/634] bcm2835_smi_dev: Fix handling of word-odd lengths
+Subject: [PATCH 529/828] bcm2835_smi_dev: Fix handling of word-odd lengths
 
 The read and write functions did not use the correct pointer offset
 when dealing with an odd number of bytes after a DMA transfer. Also,
@@ -14,11 +14,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/char/broadcom/bcm2835_smi_dev.c | 21 ++++++++++++++-------
  1 file changed, 14 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/char/broadcom/bcm2835_smi_dev.c b/drivers/char/broadcom/bcm2835_smi_dev.c
-index 9db8f1e3db0f..34976fa4ed59 100644
 --- a/drivers/char/broadcom/bcm2835_smi_dev.c
 +++ b/drivers/char/broadcom/bcm2835_smi_dev.c
-@@ -191,6 +191,7 @@ bcm2835_read_file(struct file *f, char __user *user_ptr,
+@@ -191,6 +191,7 @@ bcm2835_read_file(struct file *f, char _
  		  size_t count, loff_t *offs)
  {
  	int odd_bytes;
@@ -26,7 +24,7 @@ index 9db8f1e3db0f..34976fa4ed59 100644
  
  	dev_dbg(inst->dev, "User reading %zu bytes from SMI.", count);
  	/* We don't want to DMA a number of bytes % 4 != 0 (32 bit FIFO) */
-@@ -199,6 +200,7 @@ bcm2835_read_file(struct file *f, char __user *user_ptr,
+@@ -199,6 +200,7 @@ bcm2835_read_file(struct file *f, char _
  	else
  		odd_bytes = count;
  	count -= odd_bytes;
@@ -34,7 +32,7 @@ index 9db8f1e3db0f..34976fa4ed59 100644
  	if (count) {
  		struct bcm2835_smi_bounce_info *bounce;
  
-@@ -209,15 +211,16 @@ bcm2835_read_file(struct file *f, char __user *user_ptr,
+@@ -209,15 +211,16 @@ bcm2835_read_file(struct file *f, char _
  			count = dma_bounce_user(DMA_DEV_TO_MEM, user_ptr,
  				count, bounce);
  	}
@@ -55,7 +53,7 @@ index 9db8f1e3db0f..34976fa4ed59 100644
  	}
  	return count;
  }
-@@ -227,6 +230,7 @@ bcm2835_write_file(struct file *f, const char __user *user_ptr,
+@@ -227,6 +230,7 @@ bcm2835_write_file(struct file *f, const
  		   size_t count, loff_t *offs)
  {
  	int odd_bytes;
@@ -63,7 +61,7 @@ index 9db8f1e3db0f..34976fa4ed59 100644
  
  	dev_dbg(inst->dev, "User writing %zu bytes to SMI.", count);
  	if (count > DMA_THRESHOLD_BYTES)
-@@ -234,6 +238,7 @@ bcm2835_write_file(struct file *f, const char __user *user_ptr,
+@@ -234,6 +238,7 @@ bcm2835_write_file(struct file *f, const
  	else
  		odd_bytes = count;
  	count -= odd_bytes;
@@ -71,7 +69,7 @@ index 9db8f1e3db0f..34976fa4ed59 100644
  	if (count) {
  		struct bcm2835_smi_bounce_info *bounce;
  
-@@ -245,14 +250,16 @@ bcm2835_write_file(struct file *f, const char __user *user_ptr,
+@@ -245,14 +250,16 @@ bcm2835_write_file(struct file *f, const
  				(char __user *)user_ptr,
  				count, bounce);
  	}
@@ -91,6 +89,3 @@ index 9db8f1e3db0f..34976fa4ed59 100644
  	}
  	return count;
  }
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0552-Revert-mmc-sdhci-iproc-Fix-vmmc-regulators-on-iProc.patch b/root/target/linux/bcm27xx/patches-5.15/950-0530-Revert-mmc-sdhci-iproc-Fix-vmmc-regulators-on-iProc.patch
similarity index 75%
rename from root/target/linux/bcm27xx/patches-5.15/0552-Revert-mmc-sdhci-iproc-Fix-vmmc-regulators-on-iProc.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0530-Revert-mmc-sdhci-iproc-Fix-vmmc-regulators-on-iProc.patch
index 2764e3a1..b84daeaa 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0552-Revert-mmc-sdhci-iproc-Fix-vmmc-regulators-on-iProc.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0530-Revert-mmc-sdhci-iproc-Fix-vmmc-regulators-on-iProc.patch
@@ -1,7 +1,7 @@
-From 85232208d715915b19d0d16b52f97b45401a18fb Mon Sep 17 00:00:00 2001
+From 3b0ab65dcf2680cf4882594eee172723d7801f2e Mon Sep 17 00:00:00 2001
 From: Juerg Haefliger <juergh@canonical.com>
 Date: Wed, 29 Sep 2021 11:39:46 +0200
-Subject: [PATCH 552/634] Revert "mmc: sdhci-iproc: Fix vmmc regulators on
+Subject: [PATCH 530/828] Revert "mmc: sdhci-iproc: Fix vmmc regulators on
  iProc"
 
 This reverts commit aed19399a01733dbad9be8bf026a4f7dd823b04f.
@@ -15,11 +15,9 @@ Signed-off-by: Juerg Haefliger <juergh@canonical.com>
  drivers/mmc/host/sdhci-iproc.c | 12 ------------
  1 file changed, 12 deletions(-)
 
-diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c
-index 37b0e1cfe7b7..032bf852397f 100644
 --- a/drivers/mmc/host/sdhci-iproc.c
 +++ b/drivers/mmc/host/sdhci-iproc.c
-@@ -173,17 +173,6 @@ static unsigned int sdhci_iproc_get_max_clock(struct sdhci_host *host)
+@@ -173,17 +173,6 @@ static unsigned int sdhci_iproc_get_max_
  		return pltfm_host->clock;
  }
  
@@ -37,7 +35,7 @@ index 37b0e1cfe7b7..032bf852397f 100644
  /*
   * There is a known bug on BCM2711's SDHCI core integration where the
   * controller will hang when the difference between the core clock and the bus
-@@ -218,7 +207,6 @@ static const struct sdhci_ops sdhci_iproc_32only_ops = {
+@@ -218,7 +207,6 @@ 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,
@@ -45,6 +43,3 @@ index 37b0e1cfe7b7..032bf852397f 100644
  	.set_bus_width = sdhci_set_bus_width,
  	.reset = sdhci_reset,
  	.set_uhs_signaling = sdhci_set_uhs_signaling,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0553-mmc-sdhci-iproc-Fix-vmmc-regulators-pre-bcm2711.patch b/root/target/linux/bcm27xx/patches-5.15/950-0531-mmc-sdhci-iproc-Fix-vmmc-regulators-pre-bcm2711.patch
similarity index 75%
rename from root/target/linux/bcm27xx/patches-5.15/0553-mmc-sdhci-iproc-Fix-vmmc-regulators-pre-bcm2711.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0531-mmc-sdhci-iproc-Fix-vmmc-regulators-pre-bcm2711.patch
index bbf014fd..1f0e71a8 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0553-mmc-sdhci-iproc-Fix-vmmc-regulators-pre-bcm2711.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0531-mmc-sdhci-iproc-Fix-vmmc-regulators-pre-bcm2711.patch
@@ -1,7 +1,7 @@
-From f3c58968269ef2c3c72246172ba4253a8d4c8a00 Mon Sep 17 00:00:00 2001
+From fcb0a88a6dc9dcf307064e16af12214cbbbdf4b3 Mon Sep 17 00:00:00 2001
 From: Juerg Haefliger <juergh@canonical.com>
 Date: Wed, 29 Sep 2021 11:42:23 +0200
-Subject: [PATCH 553/634] mmc: sdhci-iproc: Fix vmmc regulators (pre-bcm2711)
+Subject: [PATCH 531/828] mmc: sdhci-iproc: Fix vmmc regulators (pre-bcm2711)
 
 The Linux support for controlling card power via regulators appears to
 be contentious. I would argue that the default behaviour is contrary to
@@ -16,11 +16,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/mmc/host/sdhci-iproc.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c
-index 032bf852397f..499046ab8113 100644
 --- a/drivers/mmc/host/sdhci-iproc.c
 +++ b/drivers/mmc/host/sdhci-iproc.c
-@@ -207,6 +207,7 @@ static const struct sdhci_ops sdhci_iproc_32only_ops = {
+@@ -207,6 +207,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,
@@ -28,6 +26,3 @@ index 032bf852397f..499046ab8113 100644
  	.set_bus_width = sdhci_set_bus_width,
  	.reset = sdhci_reset,
  	.set_uhs_signaling = sdhci_set_uhs_signaling,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0554-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch b/root/target/linux/bcm27xx/patches-5.15/950-0532-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch
similarity index 89%
rename from root/target/linux/bcm27xx/patches-5.15/0554-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0532-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch
index d757d9dc..9c6b5f38 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0554-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0532-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch
@@ -1,7 +1,7 @@
-From 57e8a7a70b16e3ed4d7d5f65159a2da5ba616166 Mon Sep 17 00:00:00 2001
+From 224af545bb3f721bc67da7939c7ffb77a33a1e2e Mon Sep 17 00:00:00 2001
 From: Lee Jackson <info@arducam.com>
 Date: Fri, 27 Aug 2021 14:36:55 +0800
-Subject: [PATCH 554/634] dt-bindings: media: i2c: Add IMX519 CMOS sensor
+Subject: [PATCH 532/828] dt-bindings: media: i2c: Add IMX519 CMOS sensor
  binding
 
 Add YAML device tree binding for IMX519 CMOS image sensor, and
@@ -14,9 +14,6 @@ Signed-off-by: Lee Jackson <info@arducam.com>
  2 files changed, 121 insertions(+)
  create mode 100644 Documentation/devicetree/bindings/media/i2c/imx519.yaml
 
-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 @@
@@ -133,11 +130,9 @@ index 000000000000..717230a21764
 +    };
 +
 +...
-diff --git a/MAINTAINERS b/MAINTAINERS
-index b1510287b546..55cce0c59093 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -17531,6 +17531,14 @@ F:	Documentation/devicetree/bindings/media/i2c/imx378.yaml
+@@ -17532,6 +17532,14 @@ F:	Documentation/devicetree/bindings/med
  F:	Documentation/devicetree/bindings/media/i2c/imx477.yaml
  F:	drivers/media/i2c/imx477.c
  
@@ -152,6 +147,3 @@ index b1510287b546..55cce0c59093 100644
  SONY MEMORYSTICK SUBSYSTEM
  M:	Maxim Levitsky <maximlevitsky@gmail.com>
  M:	Alex Dubov <oakad@yahoo.com>
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0555-media-i2c-Add-driver-for-IMX519-sensor.patch b/root/target/linux/bcm27xx/patches-5.15/950-0533-media-i2c-Add-driver-for-IMX519-sensor.patch
similarity index 99%
rename from root/target/linux/bcm27xx/patches-5.15/0555-media-i2c-Add-driver-for-IMX519-sensor.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0533-media-i2c-Add-driver-for-IMX519-sensor.patch
index 5483e9d5..6ea17e46 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0555-media-i2c-Add-driver-for-IMX519-sensor.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0533-media-i2c-Add-driver-for-IMX519-sensor.patch
@@ -1,7 +1,7 @@
-From a85b65963283577b8a932edbadf36dfae1d6472b Mon Sep 17 00:00:00 2001
+From 2b20cd32e4b263274904508368f303dc70016f7e Mon Sep 17 00:00:00 2001
 From: Lee Jackson <info@arducam.com>
 Date: Fri, 27 Aug 2021 13:48:52 +0800
-Subject: [PATCH 555/634] media: i2c: Add driver for IMX519 sensor
+Subject: [PATCH 533/828] media: i2c: Add driver for IMX519 sensor
 
 Adds a driver for the 16MPix IMX519 CSI2 sensor.
 Whilst the sensor supports 2 or 4 CSI2 data lanes, this driver
@@ -23,8 +23,6 @@ Signed-off-by: Lee Jackson <info@arducam.com>
  3 files changed, 2036 insertions(+)
  create mode 100644 drivers/media/i2c/imx519.c
 
-diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index b42a28687509..4b9cbf1e81fb 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
 @@ -894,6 +894,17 @@ config VIDEO_IMX412
@@ -45,8 +43,6 @@ index b42a28687509..4b9cbf1e81fb 100644
  config VIDEO_OV02A10
  	tristate "OmniVision OV02A10 sensor support"
  	depends on VIDEO_V4L2 && I2C
-diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
-index 39209dc647fd..9f1210fa6243 100644
 --- a/drivers/media/i2c/Makefile
 +++ b/drivers/media/i2c/Makefile
 @@ -131,6 +131,7 @@ obj-$(CONFIG_VIDEO_IMX334)	+= imx334.o
@@ -57,9 +53,6 @@ index 39209dc647fd..9f1210fa6243 100644
  obj-$(CONFIG_VIDEO_MAX9286)	+= max9286.o
  obj-$(CONFIG_VIDEO_MAX9271_LIB)	+= max9271.o
  obj-$(CONFIG_VIDEO_RDACM20)	+= rdacm20.o
-diff --git a/drivers/media/i2c/imx519.c b/drivers/media/i2c/imx519.c
-new file mode 100644
-index 000000000000..5eaf1f28da35
 --- /dev/null
 +++ b/drivers/media/i2c/imx519.c
 @@ -0,0 +1,2024 @@
@@ -2087,6 +2080,3 @@ index 000000000000..5eaf1f28da35
 +MODULE_AUTHOR("Lee Jackson <info@arducam.com>");
 +MODULE_DESCRIPTION("Sony IMX519 sensor driver");
 +MODULE_LICENSE("GPL v2");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0556-media-i2c-imx519-Advertise-embedded-data-node-on-med.patch b/root/target/linux/bcm27xx/patches-5.15/950-0534-media-i2c-imx519-Advertise-embedded-data-node-on-med.patch
similarity index 89%
rename from root/target/linux/bcm27xx/patches-5.15/0556-media-i2c-imx519-Advertise-embedded-data-node-on-med.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0534-media-i2c-imx519-Advertise-embedded-data-node-on-med.patch
index 8af8a28a..b1ecd412 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0556-media-i2c-imx519-Advertise-embedded-data-node-on-med.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0534-media-i2c-imx519-Advertise-embedded-data-node-on-med.patch
@@ -1,7 +1,7 @@
-From 709fcba88ed523dca45a71a751d1ae3361c3cb4b Mon Sep 17 00:00:00 2001
+From 63445e21ecbc787d5a41e32425d222c61419431f Mon Sep 17 00:00:00 2001
 From: Arducam <admin@arducam.com>
 Date: Wed, 15 Sep 2021 09:02:08 +0800
-Subject: [PATCH 556/634] media: i2c: imx519: Advertise embedded data node on
+Subject: [PATCH 534/828] media: i2c: imx519: Advertise embedded data node on
  media pad 1
 
 This commit updates the imx519 driver to adverise support for embedded
@@ -16,8 +16,6 @@ Signed-off-by: Lee Jackson <info@arducam.com>
  drivers/media/i2c/imx519.c | 138 +++++++++++++++++++++++++++----------
  1 file changed, 103 insertions(+), 35 deletions(-)
 
-diff --git a/drivers/media/i2c/imx519.c b/drivers/media/i2c/imx519.c
-index 5eaf1f28da35..fe7e49a70367 100644
 --- a/drivers/media/i2c/imx519.c
 +++ b/drivers/media/i2c/imx519.c
 @@ -93,6 +93,16 @@
@@ -37,7 +35,7 @@ index 5eaf1f28da35..fe7e49a70367 100644
  /* IMX519 native and active pixel array size. */
  #define IMX519_NATIVE_WIDTH		4672U
  #define IMX519_NATIVE_HEIGHT		3648U
-@@ -970,7 +980,7 @@ static const char * const imx519_supply_name[] = {
+@@ -970,7 +980,7 @@ static const char * const imx519_supply_
  
  struct imx519 {
  	struct v4l2_subdev sd;
@@ -46,7 +44,7 @@ index 5eaf1f28da35..fe7e49a70367 100644
  
  	unsigned int fmt_code;
  
-@@ -1101,7 +1111,9 @@ static int imx519_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+@@ -1101,7 +1111,9 @@ static int imx519_open(struct v4l2_subde
  {
  	struct imx519 *imx519 = to_imx519(sd);
  	struct v4l2_mbus_framefmt *try_fmt_img =
@@ -57,7 +55,7 @@ index 5eaf1f28da35..fe7e49a70367 100644
  	struct v4l2_rect *try_crop;
  
  	mutex_lock(&imx519->mutex);
-@@ -1112,8 +1124,14 @@ static int imx519_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+@@ -1112,8 +1124,14 @@ static int imx519_open(struct v4l2_subde
  	try_fmt_img->code = imx519_get_format_code(imx519);
  	try_fmt_img->field = V4L2_FIELD_NONE;
  
@@ -73,7 +71,7 @@ index 5eaf1f28da35..fe7e49a70367 100644
  	try_crop->left = IMX519_PIXEL_ARRAY_LEFT;
  	try_crop->top = IMX519_PIXEL_ARRAY_TOP;
  	try_crop->width = IMX519_PIXEL_ARRAY_WIDTH;
-@@ -1246,10 +1264,20 @@ static int imx519_enum_mbus_code(struct v4l2_subdev *sd,
+@@ -1246,10 +1264,20 @@ static int imx519_enum_mbus_code(struct
  {
  	struct imx519 *imx519 = to_imx519(sd);
  
@@ -96,7 +94,7 @@ index 5eaf1f28da35..fe7e49a70367 100644
  
  	return 0;
  }
-@@ -1260,16 +1288,29 @@ static int imx519_enum_frame_size(struct v4l2_subdev *sd,
+@@ -1260,16 +1288,29 @@ static int imx519_enum_frame_size(struct
  {
  	struct imx519 *imx519 = to_imx519(sd);
  
@@ -133,7 +131,7 @@ index 5eaf1f28da35..fe7e49a70367 100644
  
  	return 0;
  }
-@@ -1294,13 +1335,21 @@ static void imx519_update_image_pad_format(struct imx519 *imx519,
+@@ -1294,13 +1335,21 @@ static void imx519_update_image_pad_form
  	imx519_reset_colorspace(&fmt->format);
  }
  
@@ -156,7 +154,7 @@ index 5eaf1f28da35..fe7e49a70367 100644
  		return -EINVAL;
  
  	mutex_lock(&imx519->mutex);
-@@ -1310,12 +1359,19 @@ static int imx519_get_pad_format(struct v4l2_subdev *sd,
+@@ -1310,12 +1359,19 @@ static int imx519_get_pad_format(struct
  			v4l2_subdev_get_try_format(&imx519->sd, sd_state,
  						   fmt->pad);
  		/* update the code which could change due to vflip or hflip: */
@@ -180,7 +178,7 @@ index 5eaf1f28da35..fe7e49a70367 100644
  	}
  
  	mutex_unlock(&imx519->mutex);
-@@ -1376,28 +1432,39 @@ static int imx519_set_pad_format(struct v4l2_subdev *sd,
+@@ -1376,28 +1432,39 @@ static int imx519_set_pad_format(struct
  	const struct imx519_mode *mode;
  	struct imx519 *imx519 = to_imx519(sd);
  
@@ -236,7 +234,7 @@ index 5eaf1f28da35..fe7e49a70367 100644
  	}
  
  	mutex_unlock(&imx519->mutex);
-@@ -1953,9 +2020,10 @@ static int imx519_probe(struct i2c_client *client)
+@@ -1953,9 +2020,10 @@ static int imx519_probe(struct i2c_clien
  	imx519->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
  
  	/* Initialize source pads */
@@ -249,6 +247,3 @@ index 5eaf1f28da35..fe7e49a70367 100644
  	if (ret) {
  		dev_err(dev, "failed to init entity pads: %d\n", ret);
  		goto error_handler_free;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0558-overlays-Add-imx519-overlay.dts.patch b/root/target/linux/bcm27xx/patches-5.15/950-0535-overlays-Add-imx519-overlay.dts.patch
similarity index 85%
rename from root/target/linux/bcm27xx/patches-5.15/0558-overlays-Add-imx519-overlay.dts.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0535-overlays-Add-imx519-overlay.dts.patch
index 2fd8936a..a270bf78 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0558-overlays-Add-imx519-overlay.dts.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0535-overlays-Add-imx519-overlay.dts.patch
@@ -1,7 +1,7 @@
-From 4d7d56f54acd2ad02635b8688acf37c5f53fcd0c Mon Sep 17 00:00:00 2001
+From 6fd9641be85116bfd000aa34703dfc46e6a71281 Mon Sep 17 00:00:00 2001
 From: Lee Jackson <info@arducam.com>
 Date: Fri, 27 Aug 2021 14:45:43 +0800
-Subject: [PATCH 558/634] overlays: Add imx519-overlay.dts
+Subject: [PATCH 535/828] overlays: Add imx519-overlay.dts
 
 Added overlays for enabling IMX519 and add the
 relevant information to the README.
@@ -14,8 +14,6 @@ Signed-off-by: Lee Jackson <info@arducam.com>
  3 files changed, 127 insertions(+)
  create mode 100644 arch/arm/boot/dts/overlays/imx519-overlay.dts
 
-diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 65e8b3f7c7e8..d10ff5c61a12 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -98,6 +98,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -26,11 +24,9 @@ index 65e8b3f7c7e8..d10ff5c61a12 100644
  	iqaudio-codec.dtbo \
  	iqaudio-dac.dtbo \
  	iqaudio-dacplus.dtbo \
-diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index cda354151d79..aa2271cd6c29 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
-@@ -1738,6 +1738,17 @@ Params: rotation                Mounting rotation of the camera sensor (0 or
+@@ -1738,6 +1738,17 @@ Params: rotation                Mounting
                                  2 = external, default external)
  
  
@@ -48,9 +44,6 @@ index cda354151d79..aa2271cd6c29 100644
  Name:   iqaudio-codec
  Info:   Configures the IQaudio Codec audio card
  Load:   dtoverlay=iqaudio-codec
-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..693c267af1f0
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/imx519-overlay.dts
 @@ -0,0 +1,115 @@
@@ -169,6 +162,3 @@ index 000000000000..693c267af1f0
 +		orientation = <&imx519>,"orientation:0";
 +	};
 +};
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0559-dtoverlays-Add-overlay-for-ST7735R-160x128-TinyDRM-d.patch b/root/target/linux/bcm27xx/patches-5.15/950-0536-dtoverlays-Add-overlay-for-ST7735R-160x128-TinyDRM-d.patch
similarity index 84%
rename from root/target/linux/bcm27xx/patches-5.15/0559-dtoverlays-Add-overlay-for-ST7735R-160x128-TinyDRM-d.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0536-dtoverlays-Add-overlay-for-ST7735R-160x128-TinyDRM-d.patch
index d255ea32..cda7b951 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0559-dtoverlays-Add-overlay-for-ST7735R-160x128-TinyDRM-d.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0536-dtoverlays-Add-overlay-for-ST7735R-160x128-TinyDRM-d.patch
@@ -1,7 +1,7 @@
-From f7edf70611ee12172be68b8194150067b0c0b71c Mon Sep 17 00:00:00 2001
+From dfe12b14d85fcd10ee92a8b15cfcbf6dff995f61 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Mon, 4 Oct 2021 14:15:38 +0100
-Subject: [PATCH 559/634] dtoverlays: Add overlay for ST7735R (160x128) TinyDRM
+Subject: [PATCH 536/828] dtoverlays: Add overlay for ST7735R (160x128) TinyDRM
  driver
 
 Adds an overlay to configure the TinyDRM driver for ST7735R
@@ -16,11 +16,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  3 files changed, 98 insertions(+)
  create mode 100644 arch/arm/boot/dts/overlays/adafruit-st7735r-overlay.dts
 
-diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index d10ff5c61a12..b36c618b01d0 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += overlay_map.dtb
+@@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += overlay_ma
  
  dtbo-$(CONFIG_ARCH_BCM2835) += \
  	act-led.dtbo \
@@ -28,11 +26,9 @@ index d10ff5c61a12..b36c618b01d0 100644
  	adafruit18.dtbo \
  	adau1977-adc.dtbo \
  	adau7002-simple.dtbo \
-diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index aa2271cd6c29..5064d8eb2040 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
-@@ -299,9 +299,23 @@ Params: activelow               Set to "on" to invert the sense of the LED
+@@ -299,9 +299,23 @@ Params: activelow               Set to "
                                  REQUIRED
  
  
@@ -56,9 +52,6 @@ index aa2271cd6c29..5064d8eb2040 100644
  Load:   dtoverlay=adafruit18,<param>=<val>
  Params: green                   Use the adafruit18_green variant.
          rotate                  Display rotation {0,90,180,270}
-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..bf186811ec5d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/adafruit-st7735r-overlay.dts
 @@ -0,0 +1,83 @@
@@ -145,6 +138,3 @@ index 000000000000..bf186811ec5d
 +			  <&backlight_pins>,"brcm,pins:0";
 +	};
 +};
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0560-dwc_otg-pay-attention-to-qh-interval-when-rescheduli.patch b/root/target/linux/bcm27xx/patches-5.15/950-0537-dwc_otg-pay-attention-to-qh-interval-when-rescheduli.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0560-dwc_otg-pay-attention-to-qh-interval-when-rescheduli.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0537-dwc_otg-pay-attention-to-qh-interval-when-rescheduli.patch
index 18708567..c5db4b98 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0560-dwc_otg-pay-attention-to-qh-interval-when-rescheduli.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0537-dwc_otg-pay-attention-to-qh-interval-when-rescheduli.patch
@@ -1,7 +1,7 @@
-From 932fe6bc01ad4ed61f13a64bf0e05579a677df44 Mon Sep 17 00:00:00 2001
+From 2a7d6c23f399e431438447fc3bbf885c62b3e9cd Mon Sep 17 00:00:00 2001
 From: Jonathan Bell <jonathan@raspberrypi.com>
 Date: Wed, 6 Oct 2021 15:27:53 +0100
-Subject: [PATCH 560/634] dwc_otg: pay attention to qh->interval when
+Subject: [PATCH 537/828] dwc_otg: pay attention to qh->interval when
  rescheduling periodic queues
 
 A regression introduced in https://github.com/raspberrypi/linux/pull/3887
@@ -16,11 +16,9 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
-index 4503af692aef..f51fad1e6b70 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
-@@ -691,7 +691,7 @@ int dwc_otg_hcd_qh_add(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
+@@ -691,7 +691,7 @@ int dwc_otg_hcd_qh_add(dwc_otg_hcd_t * h
  	} else {
  		/* If the QH wasn't in a schedule, then sched_frame is stale. */
  		qh->sched_frame = dwc_frame_num_inc(dwc_otg_hcd_get_frame_number(hcd),
@@ -29,6 +27,3 @@ index 4503af692aef..f51fad1e6b70 100644
  		status = schedule_periodic(hcd, qh);
  		qh->start_split_frame = qh->sched_frame;
  		if ( !hcd->periodic_qh_count ) {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0561-Hifiberry-DAC-ADCPro-DT-overlay-add-optional-headpho.patch b/root/target/linux/bcm27xx/patches-5.15/950-0538-Hifiberry-DAC-ADCPro-DT-overlay-add-optional-headpho.patch
similarity index 66%
rename from root/target/linux/bcm27xx/patches-5.15/0561-Hifiberry-DAC-ADCPro-DT-overlay-add-optional-headpho.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0538-Hifiberry-DAC-ADCPro-DT-overlay-add-optional-headpho.patch
index d307f72c..44dea73b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0561-Hifiberry-DAC-ADCPro-DT-overlay-add-optional-headpho.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0538-Hifiberry-DAC-ADCPro-DT-overlay-add-optional-headpho.patch
@@ -1,7 +1,7 @@
-From 01e9d566dfe18ee9c3c5a509f45603916acc57fd Mon Sep 17 00:00:00 2001
+From 747bb33460bad7d134c3f2ce44b59a919dfda928 Mon Sep 17 00:00:00 2001
 From: Joerg Schambacher <joerg@hifiberry.com>
 Date: Wed, 6 Oct 2021 17:19:58 +0200
-Subject: [PATCH 561/634] Hifiberry DAC+ADCPro DT overlay: add optional
+Subject: [PATCH 538/828] Hifiberry DAC+ADCPro DT overlay: add optional
  headphone amp
 
 This is a copy of the approach from our DAC+ driver.
@@ -13,11 +13,9 @@ Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
  .../boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts    | 5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
-index cafa2ccd7ff7..561cd84bbb79 100644
 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
-@@ -43,6 +43,11 @@ hb_adc: pcm186x@4a {
+@@ -43,6 +43,11 @@
  				clocks = <&dacpro_osc>;
  				status = "okay";
  			};
@@ -29,6 +27,3 @@ index cafa2ccd7ff7..561cd84bbb79 100644
  		};
  	};
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0562-Hifiberry-DAC-ADCPro-adding-optional-headphone-amp-c.patch b/root/target/linux/bcm27xx/patches-5.15/950-0539-Hifiberry-DAC-ADCPro-adding-optional-headphone-amp-c.patch
similarity index 85%
rename from root/target/linux/bcm27xx/patches-5.15/0562-Hifiberry-DAC-ADCPro-adding-optional-headphone-amp-c.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0539-Hifiberry-DAC-ADCPro-adding-optional-headphone-amp-c.patch
index 9fd3960d..1a66a27c 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0562-Hifiberry-DAC-ADCPro-adding-optional-headphone-amp-c.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0539-Hifiberry-DAC-ADCPro-adding-optional-headphone-amp-c.patch
@@ -1,7 +1,7 @@
-From 3fdb07342f48a8c3813e36b7e2487b178d7fe41d Mon Sep 17 00:00:00 2001
+From fe288af5e5d683d470852def3c0f0dd975d27755 Mon Sep 17 00:00:00 2001
 From: Joerg Schambacher <joerg@hifiberry.com>
 Date: Wed, 6 Oct 2021 17:21:07 +0200
-Subject: [PATCH 562/634] Hifiberry DAC+ADCPro: adding optional headphone amp
+Subject: [PATCH 539/828] Hifiberry DAC+ADCPro: adding optional headphone amp
  control
 
 This is a copy of the code and approach from our DAC+ driver.
@@ -14,11 +14,9 @@ Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
  sound/soc/bcm/hifiberry_dacplusadcpro.c | 74 ++++++++++++++++++++++++-
  2 files changed, 73 insertions(+), 4 deletions(-)
 
-diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index d65df373c39e..c85714895f1e 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
-@@ -79,7 +79,8 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO
+@@ -79,7 +79,8 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS
          tristate "Support for HifiBerry DAC+ADC PRO"
          depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
          select SND_SOC_PCM512x_I2C
@@ -28,8 +26,6 @@ index d65df373c39e..c85714895f1e 100644
          select COMMON_CLK_HIFIBERRY_DACPRO
          help
           Say Y or M if you want to add support for HifiBerry DAC+ADC PRO.
-diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c
-index 79eccdb4dc8c..517a70fba7d7 100644
 --- a/sound/soc/bcm/hifiberry_dacplusadcpro.c
 +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c
 @@ -4,8 +4,8 @@
@@ -51,7 +47,7 @@ index 79eccdb4dc8c..517a70fba7d7 100644
  
  #include <sound/core.h>
  #include <sound/pcm.h>
-@@ -468,6 +469,15 @@ static struct snd_soc_dai_link snd_rpi_hifiberry_dacplusadcpro_dai[] = {
+@@ -468,6 +469,15 @@ static struct snd_soc_dai_link snd_rpi_h
  },
  };
  
@@ -67,7 +63,7 @@ index 79eccdb4dc8c..517a70fba7d7 100644
  /* audio machine driver */
  static struct snd_soc_card snd_rpi_hifiberry_dacplusadcpro = {
  	.name         = "snd_rpi_hifiberry_dacplusadcpro",
-@@ -477,10 +487,68 @@ static struct snd_soc_card snd_rpi_hifiberry_dacplusadcpro = {
+@@ -477,10 +487,68 @@ static struct snd_soc_card snd_rpi_hifib
  	.num_links    = ARRAY_SIZE(snd_rpi_hifiberry_dacplusadcpro_dai),
  };
  
@@ -136,7 +132,7 @@ index 79eccdb4dc8c..517a70fba7d7 100644
  
  	snd_rpi_hifiberry_dacplusadcpro.dev = &pdev->dev;
  	if (pdev->dev.of_node) {
-@@ -531,7 +599,7 @@ static struct platform_driver snd_rpi_hifiberry_dacplusadcpro_driver = {
+@@ -531,7 +599,7 @@ static struct platform_driver snd_rpi_hi
  
  module_platform_driver(snd_rpi_hifiberry_dacplusadcpro_driver);
  
@@ -145,6 +141,3 @@ index 79eccdb4dc8c..517a70fba7d7 100644
  MODULE_AUTHOR("Daniel Matuschek <daniel@hifiberry.com>");
  MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+ADC");
  MODULE_LICENSE("GPL v2");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0564-drivers-gpio-Add-a-driver-that-wraps-the-PWM-API-as-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0540-drivers-gpio-Add-a-driver-that-wraps-the-PWM-API-as-.patch
similarity index 90%
rename from root/target/linux/bcm27xx/patches-5.15/0564-drivers-gpio-Add-a-driver-that-wraps-the-PWM-API-as-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0540-drivers-gpio-Add-a-driver-that-wraps-the-PWM-API-as-.patch
index 70ea5a29..8d12a492 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0564-drivers-gpio-Add-a-driver-that-wraps-the-PWM-API-as-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0540-drivers-gpio-Add-a-driver-that-wraps-the-PWM-API-as-.patch
@@ -1,7 +1,7 @@
-From 69a6c602381d23408200f60c6cb4bee5032730b6 Mon Sep 17 00:00:00 2001
+From d9bfc095253338bbbfddbd15681c64593219f91e Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 14 Oct 2021 11:09:18 +0100
-Subject: [PATCH 564/634] drivers/gpio: Add a driver that wraps the PWM API as
+Subject: [PATCH 540/828] drivers/gpio: Add a driver that wraps the PWM API as
  a GPIO controller
 
 For cases where spare PWM outputs are available, but are desired
@@ -16,8 +16,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  3 files changed, 153 insertions(+)
  create mode 100644 drivers/gpio/gpio-pwm.c
 
-diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
-index 43c30308b1d5..d5f139be431b 100644
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
 @@ -485,6 +485,14 @@ config GPIO_PMIC_EIC_SPRD
@@ -35,11 +33,9 @@ index 43c30308b1d5..d5f139be431b 100644
  config GPIO_PXA
  	bool "PXA GPIO support"
  	depends on ARCH_PXA || ARCH_MMP || COMPILE_TEST
-diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
-index 0900302c9ce0..0980f9b189ba 100644
 --- a/drivers/gpio/Makefile
 +++ b/drivers/gpio/Makefile
-@@ -121,6 +121,7 @@ obj-$(CONFIG_GPIO_PCI_IDIO_16)		+= gpio-pci-idio-16.o
+@@ -122,6 +122,7 @@ obj-$(CONFIG_GPIO_PCI_IDIO_16)		+= gpio-
  obj-$(CONFIG_GPIO_PISOSR)		+= gpio-pisosr.o
  obj-$(CONFIG_GPIO_PL061)		+= gpio-pl061.o
  obj-$(CONFIG_GPIO_PMIC_EIC_SPRD)	+= gpio-pmic-eic-sprd.o
@@ -47,9 +43,6 @@ index 0900302c9ce0..0980f9b189ba 100644
  obj-$(CONFIG_GPIO_PXA)			+= gpio-pxa.o
  obj-$(CONFIG_GPIO_RASPBERRYPI_EXP)	+= gpio-raspberrypi-exp.o
  obj-$(CONFIG_GPIO_RC5T583)		+= gpio-rc5t583.o
-diff --git a/drivers/gpio/gpio-pwm.c b/drivers/gpio/gpio-pwm.c
-new file mode 100644
-index 000000000000..89f5d6b353ab
 --- /dev/null
 +++ b/drivers/gpio/gpio-pwm.c
 @@ -0,0 +1,144 @@
@@ -197,6 +190,3 @@ index 000000000000..89f5d6b353ab
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.com>");
 +MODULE_DESCRIPTION("PWM GPIO driver");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0565-rtc-pcf85063-Always-clear-EXT_TEST-from-set_time.patch b/root/target/linux/bcm27xx/patches-5.15/950-0541-rtc-pcf85063-Always-clear-EXT_TEST-from-set_time.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0565-rtc-pcf85063-Always-clear-EXT_TEST-from-set_time.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0541-rtc-pcf85063-Always-clear-EXT_TEST-from-set_time.patch
index c1704b75..0ab2eef2 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0565-rtc-pcf85063-Always-clear-EXT_TEST-from-set_time.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0541-rtc-pcf85063-Always-clear-EXT_TEST-from-set_time.patch
@@ -1,7 +1,7 @@
-From 6e001d37fd11791af37f75cce2f15afd1625d2dc Mon Sep 17 00:00:00 2001
+From ea26b33638713c780c733f1bb782b90329d3b871 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Fri, 15 Oct 2021 11:45:36 +0100
-Subject: [PATCH 565/634] rtc: pcf85063: Always clear EXT_TEST from set_time
+Subject: [PATCH 541/828] rtc: pcf85063: Always clear EXT_TEST from set_time
 
 Power-on reset after the insertion of a battery does not always complete
 successfully, leading to corrupted register content. The EXT_TEST bit
@@ -16,8 +16,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/rtc/rtc-pcf85063.c | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/rtc/rtc-pcf85063.c b/drivers/rtc/rtc-pcf85063.c
-index 14da4ab30104..ea75b71a1f16 100644
 --- a/drivers/rtc/rtc-pcf85063.c
 +++ b/drivers/rtc/rtc-pcf85063.c
 @@ -34,6 +34,7 @@
@@ -28,7 +26,7 @@ index 14da4ab30104..ea75b71a1f16 100644
  
  #define PCF85063_REG_CTRL2		0x01
  #define PCF85063_CTRL2_AF		BIT(6)
-@@ -117,6 +118,7 @@ static int pcf85063_rtc_set_time(struct device *dev, struct rtc_time *tm)
+@@ -117,6 +118,7 @@ static int pcf85063_rtc_set_time(struct
  	 * reset state until all time/date registers are written
  	 */
  	rc = regmap_update_bits(pcf85063->regmap, PCF85063_REG_CTRL1,
@@ -36,6 +34,3 @@ index 14da4ab30104..ea75b71a1f16 100644
  				PCF85063_REG_CTRL1_STOP,
  				PCF85063_REG_CTRL1_STOP);
  	if (rc)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0566-char-vcio-Rewrite-as-a-firmware-node-child.patch b/root/target/linux/bcm27xx/patches-5.15/950-0542-char-vcio-Rewrite-as-a-firmware-node-child.patch
similarity index 91%
rename from root/target/linux/bcm27xx/patches-5.15/0566-char-vcio-Rewrite-as-a-firmware-node-child.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0542-char-vcio-Rewrite-as-a-firmware-node-child.patch
index 4f72a618..59bc9677 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0566-char-vcio-Rewrite-as-a-firmware-node-child.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0542-char-vcio-Rewrite-as-a-firmware-node-child.patch
@@ -1,7 +1,7 @@
-From d4e587bd5b05045a9f2ceaac6f045ec889ace3c7 Mon Sep 17 00:00:00 2001
+From b86c14122c781c53b6975f296259f1cc2f3ba700 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Mon, 11 Oct 2021 17:33:05 +0100
-Subject: [PATCH 566/634] char: vcio: Rewrite as a firmware node child
+Subject: [PATCH 542/828] char: vcio: Rewrite as a firmware node child
 
 The old vcio driver is a simple character device that manually locates
 the firmware driver. Initialising it before the firmware driver causes
@@ -24,8 +24,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/char/broadcom/vcio.c | 133 ++++++++++++++++-------------------
  1 file changed, 62 insertions(+), 71 deletions(-)
 
-diff --git a/drivers/char/broadcom/vcio.c b/drivers/char/broadcom/vcio.c
-index a39155a94fb7..ac314617229c 100644
 --- a/drivers/char/broadcom/vcio.c
 +++ b/drivers/char/broadcom/vcio.c
 @@ -1,6 +1,7 @@
@@ -76,7 +74,7 @@ index a39155a94fb7..ac314617229c 100644
  {
  	u32 *buf, size;
  	int ret;
-@@ -55,7 +52,7 @@ static int vcio_user_property_list(void *user)
+@@ -55,7 +52,7 @@ static int vcio_user_property_list(void
  	}
  
  	/* Strip off protocol encapsulation */
@@ -85,7 +83,7 @@ index a39155a94fb7..ac314617229c 100644
  	if (ret) {
  		kfree(buf);
  		return ret;
-@@ -87,9 +84,12 @@ static int vcio_device_release(struct inode *inode, struct file *file)
+@@ -87,9 +84,12 @@ static int vcio_device_release(struct in
  static long vcio_device_ioctl(struct file *file, unsigned int ioctl_num,
  			      unsigned long ioctl_param)
  {
@@ -99,7 +97,7 @@ index a39155a94fb7..ac314617229c 100644
  	default:
  		pr_err("unknown ioctl: %x\n", ioctl_num);
  		return -EINVAL;
-@@ -100,9 +100,12 @@ static long vcio_device_ioctl(struct file *file, unsigned int ioctl_num,
+@@ -100,9 +100,12 @@ static long vcio_device_ioctl(struct fil
  static long vcio_device_compat_ioctl(struct file *file, unsigned int ioctl_num,
  				     unsigned long ioctl_param)
  {
@@ -113,7 +111,7 @@ index a39155a94fb7..ac314617229c 100644
  	default:
  		pr_err("unknown ioctl: %x\n", ioctl_num);
  		return -EINVAL;
-@@ -119,77 +122,65 @@ const struct file_operations vcio_fops = {
+@@ -119,77 +122,65 @@ const struct file_operations vcio_fops =
  	.release = vcio_device_release,
  };
  
@@ -237,6 +235,3 @@ index a39155a94fb7..ac314617229c 100644
  MODULE_DESCRIPTION("Mailbox userspace access");
  MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:rpi-vcio");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0567-ARM-dts-Make-vcio-a-child-of-the-firmware-node.patch b/root/target/linux/bcm27xx/patches-5.15/950-0543-ARM-dts-Make-vcio-a-child-of-the-firmware-node.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0567-ARM-dts-Make-vcio-a-child-of-the-firmware-node.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0543-ARM-dts-Make-vcio-a-child-of-the-firmware-node.patch
index 38a71c15..f23a7332 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0567-ARM-dts-Make-vcio-a-child-of-the-firmware-node.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0543-ARM-dts-Make-vcio-a-child-of-the-firmware-node.patch
@@ -1,7 +1,7 @@
-From ddf1d8a1ec0ec64b6457ff808c40336fcf4dcce2 Mon Sep 17 00:00:00 2001
+From e7e380ce871747bc13457d8e07a17356cc36b315 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Tue, 12 Oct 2021 09:59:54 +0100
-Subject: [PATCH 567/634] ARM: dts: Make vcio a child of the firmware node
+Subject: [PATCH 543/828] ARM: dts: Make vcio a child of the firmware node
 
 In order to resolve a potential startup order bug, the vcio driver has
 been rewritten as a platform driver that depends on a DT node for
@@ -16,11 +16,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  arch/arm/boot/dts/bcm270x-rpi.dtsi | 6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi
-index 68a7e1c09db1..dc302248ae2a 100644
 --- a/arch/arm/boot/dts/bcm270x-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
-@@ -152,3 +152,9 @@ audio: bcm2835_audio {
+@@ -152,3 +152,9 @@
  		status = "disabled";
  	};
  };
@@ -30,6 +28,3 @@ index 68a7e1c09db1..dc302248ae2a 100644
 +		compatible = "raspberrypi,vcio";
 +	};
 +};
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0568-ARM-dts-bcm2835_audio-missing-firmware-reference.patch b/root/target/linux/bcm27xx/patches-5.15/950-0544-ARM-dts-bcm2835_audio-missing-firmware-reference.patch
similarity index 75%
rename from root/target/linux/bcm27xx/patches-5.15/0568-ARM-dts-bcm2835_audio-missing-firmware-reference.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0544-ARM-dts-bcm2835_audio-missing-firmware-reference.patch
index b7fdbf0e..fd01d662 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0568-ARM-dts-bcm2835_audio-missing-firmware-reference.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0544-ARM-dts-bcm2835_audio-missing-firmware-reference.patch
@@ -1,7 +1,7 @@
-From 3b887e6d0e49e1a4926c127e8845e6352aa58f29 Mon Sep 17 00:00:00 2001
+From 2c5dfbd043b5b3c946f16de483a4b46c79509b70 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Mon, 18 Oct 2021 11:12:42 +0100
-Subject: [PATCH 568/634] ARM: dts: bcm2835_audio missing firmware reference
+Subject: [PATCH 544/828] ARM: dts: bcm2835_audio missing firmware reference
 
 The firmware driver has been changed to count its clients. An earlier
 commit removed the downstream patch permitting the hacky technique of
@@ -17,11 +17,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  arch/arm/boot/dts/bcm270x-rpi.dtsi | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi
-index dc302248ae2a..efca67213816 100644
 --- a/arch/arm/boot/dts/bcm270x-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
-@@ -148,6 +148,7 @@ &vchiq {
+@@ -148,6 +148,7 @@
  	/* Onboard audio */
  	audio: bcm2835_audio {
  		compatible = "brcm,bcm2835-audio";
@@ -29,6 +27,3 @@ index dc302248ae2a..efca67213816 100644
  		brcm,pwm-channels = <8>;
  		status = "disabled";
  	};
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0569-ARM-dts-Delete-vestigial-vcsm-node.patch b/root/target/linux/bcm27xx/patches-5.15/950-0545-ARM-dts-Delete-vestigial-vcsm-node.patch
similarity index 64%
rename from root/target/linux/bcm27xx/patches-5.15/0569-ARM-dts-Delete-vestigial-vcsm-node.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0545-ARM-dts-Delete-vestigial-vcsm-node.patch
index af965035..4dc18058 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0569-ARM-dts-Delete-vestigial-vcsm-node.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0545-ARM-dts-Delete-vestigial-vcsm-node.patch
@@ -1,18 +1,16 @@
-From add56b1e89346af656682950ed992f938c3bb191 Mon Sep 17 00:00:00 2001
+From 1300d67da55c5e55af9bdad89560b15f45836fea Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Mon, 18 Oct 2021 11:13:35 +0100
-Subject: [PATCH 569/634] ARM: dts: Delete vestigial vcsm node
+Subject: [PATCH 545/828] ARM: dts: Delete vestigial vcsm node
 
 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 ---
  arch/arm/boot/dts/bcm270x-rpi.dtsi | 6 ------
  1 file changed, 6 deletions(-)
 
-diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi
-index efca67213816..57e7d5f60d3e 100644
 --- a/arch/arm/boot/dts/bcm270x-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
-@@ -65,12 +65,6 @@ fb: fb {
+@@ -65,12 +65,6 @@
  			status = "okay";
  		};
  
@@ -25,6 +23,3 @@ index efca67213816..57e7d5f60d3e 100644
  		/* External sound card */
  		sound: sound {
  			status = "disabled";
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0571-gpio-bcm-virt-Fix-the-get-method.patch b/root/target/linux/bcm27xx/patches-5.15/950-0546-gpio-bcm-virt-Fix-the-get-method.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0571-gpio-bcm-virt-Fix-the-get-method.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0546-gpio-bcm-virt-Fix-the-get-method.patch
index b8ec0182..31ccf51e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0571-gpio-bcm-virt-Fix-the-get-method.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0546-gpio-bcm-virt-Fix-the-get-method.patch
@@ -1,7 +1,7 @@
-From a91d93b66590d912b1551f707b083348c7af4836 Mon Sep 17 00:00:00 2001
+From 66297ecb8fd4cd69e3bd644ce64825a9d67208f7 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Tue, 19 Oct 2021 11:23:43 +0100
-Subject: [PATCH 571/634] gpio: bcm-virt: Fix the get() method
+Subject: [PATCH 546/828] gpio: bcm-virt: Fix the get() method
 
 The get() method does not understand the on-the-wire encoding of the
 remote GPIO states, thinking they are simple on/off bits when they are
@@ -16,11 +16,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/gpio/gpio-bcm-virt.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/gpio/gpio-bcm-virt.c b/drivers/gpio/gpio-bcm-virt.c
-index 49e28ad9760e..55c40190e88a 100644
 --- a/drivers/gpio/gpio-bcm-virt.c
 +++ b/drivers/gpio/gpio-bcm-virt.c
-@@ -49,7 +49,7 @@ static int brcmvirt_gpio_get(struct gpio_chip *gc, unsigned off)
+@@ -49,7 +49,7 @@ static int brcmvirt_gpio_get(struct gpio
  	unsigned v;
  	gpio = container_of(gc, struct brcmvirt_gpio, gc);
  	v = readl(gpio->ts_base + off);
@@ -29,6 +27,3 @@ index 49e28ad9760e..55c40190e88a 100644
  }
  
  static void brcmvirt_gpio_set(struct gpio_chip *gc, unsigned off, int val)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0574-media-i2c-imx219-Sensor-should-report-RAW-color-spac.patch b/root/target/linux/bcm27xx/patches-5.15/950-0547-media-i2c-imx219-Sensor-should-report-RAW-color-spac.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0574-media-i2c-imx219-Sensor-should-report-RAW-color-spac.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0547-media-i2c-imx219-Sensor-should-report-RAW-color-spac.patch
index cdcc8f80..6d301640 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0574-media-i2c-imx219-Sensor-should-report-RAW-color-spac.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0547-media-i2c-imx219-Sensor-should-report-RAW-color-spac.patch
@@ -1,7 +1,7 @@
-From 0056132bd43dcaf117ff674367dd23b640c99524 Mon Sep 17 00:00:00 2001
+From 9c4445274dc5899cd2c112038c9995b763e236f0 Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Thu, 21 Oct 2021 14:41:55 +0100
-Subject: [PATCH 574/634] media: i2c: imx219: Sensor should report RAW color
+Subject: [PATCH 547/828] media: i2c: imx219: Sensor should report RAW color
  space
 
 Tested on Raspberry Pi running libcamera.
@@ -11,11 +11,9 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/i2c/imx219.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
-index e10af3f74b38..7ef1f2b9b7a8 100644
 --- a/drivers/media/i2c/imx219.c
 +++ b/drivers/media/i2c/imx219.c
-@@ -674,7 +674,7 @@ static void imx219_set_default_format(struct imx219 *imx219)
+@@ -674,7 +674,7 @@ static void imx219_set_default_format(st
  
  	fmt = &imx219->fmt;
  	fmt->code = MEDIA_BUS_FMT_SRGGB10_1X10;
@@ -24,7 +22,7 @@ index e10af3f74b38..7ef1f2b9b7a8 100644
  	fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->colorspace);
  	fmt->quantization = V4L2_MAP_QUANTIZATION_DEFAULT(true,
  							  fmt->colorspace,
-@@ -844,7 +844,7 @@ static int imx219_enum_frame_size(struct v4l2_subdev *sd,
+@@ -844,7 +844,7 @@ static int imx219_enum_frame_size(struct
  
  static void imx219_reset_colorspace(struct v4l2_mbus_framefmt *fmt)
  {
@@ -33,6 +31,3 @@ index e10af3f74b38..7ef1f2b9b7a8 100644
  	fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->colorspace);
  	fmt->quantization = V4L2_MAP_QUANTIZATION_DEFAULT(true,
  							  fmt->colorspace,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0575-media-i2c-imx290-Sensor-should-report-RAW-color-spac.patch b/root/target/linux/bcm27xx/patches-5.15/950-0548-media-i2c-imx290-Sensor-should-report-RAW-color-spac.patch
similarity index 67%
rename from root/target/linux/bcm27xx/patches-5.15/0575-media-i2c-imx290-Sensor-should-report-RAW-color-spac.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0548-media-i2c-imx290-Sensor-should-report-RAW-color-spac.patch
index 25038e24..969bc7b9 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0575-media-i2c-imx290-Sensor-should-report-RAW-color-spac.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0548-media-i2c-imx290-Sensor-should-report-RAW-color-spac.patch
@@ -1,7 +1,7 @@
-From b5e0a32a8baf5b6a137bbf5c637d9fce6716b152 Mon Sep 17 00:00:00 2001
+From e21b3843360b29a3f81d2327dcc9bb5ff20abda4 Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Thu, 21 Oct 2021 14:44:01 +0100
-Subject: [PATCH 575/634] media: i2c: imx290: Sensor should report RAW color
+Subject: [PATCH 548/828] media: i2c: imx290: Sensor should report RAW color
  space
 
 Tested on Raspberry Pi running libcamera.
@@ -11,11 +11,9 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/i2c/imx290.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 4291c77f5a01..a6f4ba5b9345 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
-@@ -885,7 +885,7 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,
+@@ -885,7 +885,7 @@ static int imx290_set_fmt(struct v4l2_su
  
  	fmt->format.code = imx290->formats[i].code;
  	fmt->format.field = V4L2_FIELD_NONE;
@@ -24,6 +22,3 @@ index 4291c77f5a01..a6f4ba5b9345 100644
  	fmt->format.ycbcr_enc =
  			V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->format.colorspace);
  	fmt->format.quantization =
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0576-media-i2c-imx477-Sensor-should-report-RAW-color-spac.patch b/root/target/linux/bcm27xx/patches-5.15/950-0549-media-i2c-imx477-Sensor-should-report-RAW-color-spac.patch
similarity index 67%
rename from root/target/linux/bcm27xx/patches-5.15/0576-media-i2c-imx477-Sensor-should-report-RAW-color-spac.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0549-media-i2c-imx477-Sensor-should-report-RAW-color-spac.patch
index af67e2fd..e7b63e38 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0576-media-i2c-imx477-Sensor-should-report-RAW-color-spac.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0549-media-i2c-imx477-Sensor-should-report-RAW-color-spac.patch
@@ -1,7 +1,7 @@
-From 1e35deb853afa9844c663b3ef7fc02728df67762 Mon Sep 17 00:00:00 2001
+From b96a87bfc2d5af826ba71ee6d1d4deb5db92e6bf Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Thu, 21 Oct 2021 14:44:43 +0100
-Subject: [PATCH 576/634] media: i2c: imx477: Sensor should report RAW color
+Subject: [PATCH 549/828] media: i2c: imx477: Sensor should report RAW color
  space
 
 Tested on Raspberry Pi running libcamera.
@@ -11,11 +11,9 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/i2c/imx477.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index 96486a7f007c..54bc4e858081 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
-@@ -1471,7 +1471,7 @@ static int imx477_enum_frame_size(struct v4l2_subdev *sd,
+@@ -1471,7 +1471,7 @@ static int imx477_enum_frame_size(struct
  
  static void imx477_reset_colorspace(struct v4l2_mbus_framefmt *fmt)
  {
@@ -24,6 +22,3 @@ index 96486a7f007c..54bc4e858081 100644
  	fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->colorspace);
  	fmt->quantization = V4L2_MAP_QUANTIZATION_DEFAULT(true,
  							  fmt->colorspace,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0577-media-i2c-imx519-Sensor-should-report-RAW-color-spac.patch b/root/target/linux/bcm27xx/patches-5.15/950-0550-media-i2c-imx519-Sensor-should-report-RAW-color-spac.patch
similarity index 67%
rename from root/target/linux/bcm27xx/patches-5.15/0577-media-i2c-imx519-Sensor-should-report-RAW-color-spac.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0550-media-i2c-imx519-Sensor-should-report-RAW-color-spac.patch
index 972e2e42..ca6be30e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0577-media-i2c-imx519-Sensor-should-report-RAW-color-spac.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0550-media-i2c-imx519-Sensor-should-report-RAW-color-spac.patch
@@ -1,7 +1,7 @@
-From d44600710085ea4dc15f4aff011162ca1d237348 Mon Sep 17 00:00:00 2001
+From de0da7ff08b55e8ba0ff6da19e3fca4340e6652a Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Thu, 21 Oct 2021 14:45:07 +0100
-Subject: [PATCH 577/634] media: i2c: imx519: Sensor should report RAW color
+Subject: [PATCH 550/828] media: i2c: imx519: Sensor should report RAW color
  space
 
 Tested on Raspberry Pi running libcamera.
@@ -11,11 +11,9 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/i2c/imx519.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/i2c/imx519.c b/drivers/media/i2c/imx519.c
-index fe7e49a70367..fa09cfca8afe 100644
 --- a/drivers/media/i2c/imx519.c
 +++ b/drivers/media/i2c/imx519.c
-@@ -1317,7 +1317,7 @@ static int imx519_enum_frame_size(struct v4l2_subdev *sd,
+@@ -1317,7 +1317,7 @@ static int imx519_enum_frame_size(struct
  
  static void imx519_reset_colorspace(struct v4l2_mbus_framefmt *fmt)
  {
@@ -24,6 +22,3 @@ index fe7e49a70367..fa09cfca8afe 100644
  	fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->colorspace);
  	fmt->quantization = V4L2_MAP_QUANTIZATION_DEFAULT(true,
  							  fmt->colorspace,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0578-media-i2c-ov5647-Sensor-should-report-RAW-color-spac.patch b/root/target/linux/bcm27xx/patches-5.15/950-0551-media-i2c-ov5647-Sensor-should-report-RAW-color-spac.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0578-media-i2c-ov5647-Sensor-should-report-RAW-color-spac.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0551-media-i2c-ov5647-Sensor-should-report-RAW-color-spac.patch
index 6641a67f..22449fa1 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0578-media-i2c-ov5647-Sensor-should-report-RAW-color-spac.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0551-media-i2c-ov5647-Sensor-should-report-RAW-color-spac.patch
@@ -1,7 +1,7 @@
-From 9462f2aa5aa43f6845c3516eebaaf28c8e11dfab Mon Sep 17 00:00:00 2001
+From 5704bc77cfcbfb2fb19d747e3654c10326abac0d Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Thu, 21 Oct 2021 14:47:00 +0100
-Subject: [PATCH 578/634] media: i2c: ov5647: Sensor should report RAW color
+Subject: [PATCH 551/828] media: i2c: ov5647: Sensor should report RAW color
  space
 
 Tested on Raspberry Pi running libcamera.
@@ -11,11 +11,9 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/i2c/ov5647.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index 4b6f4962e644..ac9074acdd9c 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
-@@ -494,7 +494,7 @@ static const struct ov5647_mode ov5647_modes[] = {
+@@ -494,7 +494,7 @@ static const struct ov5647_mode ov5647_m
  	{
  		.format = {
  			.code		= MEDIA_BUS_FMT_SBGGR10_1X10,
@@ -24,7 +22,7 @@ index 4b6f4962e644..ac9074acdd9c 100644
  			.field		= V4L2_FIELD_NONE,
  			.width		= 2592,
  			.height		= 1944
-@@ -515,7 +515,7 @@ static const struct ov5647_mode ov5647_modes[] = {
+@@ -515,7 +515,7 @@ static const struct ov5647_mode ov5647_m
  	{
  		.format = {
  			.code		= MEDIA_BUS_FMT_SBGGR10_1X10,
@@ -33,7 +31,7 @@ index 4b6f4962e644..ac9074acdd9c 100644
  			.field		= V4L2_FIELD_NONE,
  			.width		= 1920,
  			.height		= 1080
-@@ -536,7 +536,7 @@ static const struct ov5647_mode ov5647_modes[] = {
+@@ -536,7 +536,7 @@ static const struct ov5647_mode ov5647_m
  	{
  		.format = {
  			.code		= MEDIA_BUS_FMT_SBGGR10_1X10,
@@ -42,7 +40,7 @@ index 4b6f4962e644..ac9074acdd9c 100644
  			.field		= V4L2_FIELD_NONE,
  			.width		= 1296,
  			.height		= 972
-@@ -557,7 +557,7 @@ static const struct ov5647_mode ov5647_modes[] = {
+@@ -557,7 +557,7 @@ static const struct ov5647_mode ov5647_m
  	{
  		.format = {
  			.code		= MEDIA_BUS_FMT_SBGGR10_1X10,
@@ -51,6 +49,3 @@ index 4b6f4962e644..ac9074acdd9c 100644
  			.field		= V4L2_FIELD_NONE,
  			.width		= 640,
  			.height		= 480
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0579-media-i2c-ov9281-Sensor-should-report-RAW-color-spac.patch b/root/target/linux/bcm27xx/patches-5.15/950-0552-media-i2c-ov9281-Sensor-should-report-RAW-color-spac.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0579-media-i2c-ov9281-Sensor-should-report-RAW-color-spac.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0552-media-i2c-ov9281-Sensor-should-report-RAW-color-spac.patch
index f1212a83..ee03b98d 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0579-media-i2c-ov9281-Sensor-should-report-RAW-color-spac.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0552-media-i2c-ov9281-Sensor-should-report-RAW-color-spac.patch
@@ -1,7 +1,7 @@
-From c2ef3f9b6b0c06e609ffe329b0d314765bc33a25 Mon Sep 17 00:00:00 2001
+From ac03ad0ceed7cb87c75721eef220b7dd49a9fb22 Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Thu, 21 Oct 2021 14:47:20 +0100
-Subject: [PATCH 579/634] media: i2c: ov9281: Sensor should report RAW color
+Subject: [PATCH 552/828] media: i2c: ov9281: Sensor should report RAW color
  space
 
 Tested on Raspberry Pi running libcamera.
@@ -11,11 +11,9 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/media/i2c/ov9281.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-index e4604746e930..f0d5551b23c1 100644
 --- a/drivers/media/i2c/ov9281.c
 +++ b/drivers/media/i2c/ov9281.c
-@@ -507,7 +507,7 @@ static int ov9281_set_fmt(struct v4l2_subdev *sd,
+@@ -507,7 +507,7 @@ static int ov9281_set_fmt(struct v4l2_su
  	fmt->format.width = mode->width;
  	fmt->format.height = mode->height;
  	fmt->format.field = V4L2_FIELD_NONE;
@@ -24,7 +22,7 @@ index e4604746e930..f0d5551b23c1 100644
  	fmt->format.ycbcr_enc =
  			V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->format.colorspace);
  	fmt->format.quantization =
-@@ -558,7 +558,7 @@ static int ov9281_get_fmt(struct v4l2_subdev *sd,
+@@ -558,7 +558,7 @@ static int ov9281_get_fmt(struct v4l2_su
  		fmt->format.height = mode->height;
  		fmt->format.code = ov9281->code;
  		fmt->format.field = V4L2_FIELD_NONE;
@@ -33,7 +31,7 @@ index e4604746e930..f0d5551b23c1 100644
  		fmt->format.ycbcr_enc =
  			V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->format.colorspace);
  		fmt->format.quantization =
-@@ -911,7 +911,7 @@ static int ov9281_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+@@ -911,7 +911,7 @@ static int ov9281_open(struct v4l2_subde
  	try_fmt->height = def_mode->height;
  	try_fmt->code = MEDIA_BUS_FMT_Y10_1X10;
  	try_fmt->field = V4L2_FIELD_NONE;
@@ -42,6 +40,3 @@ index e4604746e930..f0d5551b23c1 100644
  	try_fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(try_fmt->colorspace);
  	try_fmt->quantization =
  		V4L2_MAP_QUANTIZATION_DEFAULT(true, try_fmt->colorspace,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0580-vc04_services-isp-Report-input-node-as-wanting-full-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0553-vc04_services-isp-Report-input-node-as-wanting-full-.patch
similarity index 73%
rename from root/target/linux/bcm27xx/patches-5.15/0580-vc04_services-isp-Report-input-node-as-wanting-full-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0553-vc04_services-isp-Report-input-node-as-wanting-full-.patch
index bb7dc1e6..635dd670 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0580-vc04_services-isp-Report-input-node-as-wanting-full-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0553-vc04_services-isp-Report-input-node-as-wanting-full-.patch
@@ -1,7 +1,7 @@
-From b45c42b70e8cd83d2aced9a89b4ed31c20d1a751 Mon Sep 17 00:00:00 2001
+From 44ba01c91d53480a1faf983e590bf30d208ba8c2 Mon Sep 17 00:00:00 2001
 From: David Plowman <david.plowman@raspberrypi.com>
 Date: Thu, 21 Oct 2021 14:49:15 +0100
-Subject: [PATCH 580/634] vc04_services: isp: Report input node as wanting full
+Subject: [PATCH 553/828] vc04_services: isp: Report input node as wanting full
  range RAW color space
 
 RAW color spaces are more usually reported as having full range
@@ -14,11 +14,9 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-index 00b044e7d77e..c62f2fb25e94 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -1032,7 +1032,9 @@ static int bcm2835_isp_node_try_fmt(struct file *file, void *priv,
+@@ -1032,7 +1032,9 @@ static int bcm2835_isp_node_try_fmt(stru
  		/* In all cases, we only support the defaults for these: */
  		f->fmt.pix.ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(f->fmt.pix.colorspace);
  		f->fmt.pix.xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(f->fmt.pix.colorspace);
@@ -29,6 +27,3 @@ index 00b044e7d77e..c62f2fb25e94 100644
  		f->fmt.pix.quantization = V4L2_MAP_QUANTIZATION_DEFAULT(is_rgb, f->fmt.pix.colorspace,
  									f->fmt.pix.ycbcr_enc);
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0581-media-bcm2835-unicam-Parse-pad-numbers-correctly.patch b/root/target/linux/bcm27xx/patches-5.15/950-0554-media-bcm2835-unicam-Parse-pad-numbers-correctly.patch
similarity index 79%
rename from root/target/linux/bcm27xx/patches-5.15/0581-media-bcm2835-unicam-Parse-pad-numbers-correctly.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0554-media-bcm2835-unicam-Parse-pad-numbers-correctly.patch
index f9d23413..136baa25 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0581-media-bcm2835-unicam-Parse-pad-numbers-correctly.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0554-media-bcm2835-unicam-Parse-pad-numbers-correctly.patch
@@ -1,7 +1,7 @@
-From 3642977ea44bcbeb7160ee832f9597d3cd4e18c8 Mon Sep 17 00:00:00 2001
+From 950adaafc335a02d3c1a74320ee417656b81fae6 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 23 Sep 2020 15:16:18 +0100
-Subject: [PATCH 581/634] media/bcm2835-unicam: Parse pad numbers correctly
+Subject: [PATCH 554/828] media/bcm2835-unicam: Parse pad numbers correctly
 
 The driver was making big assumptions about the source device
 using pad 0 and 1, which doesn't follow for more complex
@@ -16,8 +16,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../media/platform/bcm2835/bcm2835-unicam.c   | 89 ++++++++++++-------
  1 file changed, 58 insertions(+), 31 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index f1ea1c2da6c3..642764ebf4b8 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -383,6 +383,8 @@ struct unicam_node {
@@ -29,7 +27,7 @@ index f1ea1c2da6c3..642764ebf4b8 100644
  	/* Pointer pointing to current v4l2_buffer */
  	struct unicam_buffer *cur_frm;
  	/* Pointer pointing to next v4l2_buffer */
-@@ -593,7 +595,7 @@ static int __subdev_get_format(struct unicam_device *dev,
+@@ -593,7 +595,7 @@ static int __subdev_get_format(struct un
  {
  	struct v4l2_subdev_format sd_fmt = {
  		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
@@ -38,7 +36,7 @@ index f1ea1c2da6c3..642764ebf4b8 100644
  	};
  	int ret;
  
-@@ -615,7 +617,7 @@ static int __subdev_set_format(struct unicam_device *dev,
+@@ -615,7 +617,7 @@ static int __subdev_set_format(struct un
  {
  	struct v4l2_subdev_format sd_fmt = {
  		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
@@ -47,7 +45,7 @@ index f1ea1c2da6c3..642764ebf4b8 100644
  	};
  	int ret;
  
-@@ -1980,7 +1982,7 @@ static int unicam_enum_framesizes(struct file *file, void *priv,
+@@ -1980,7 +1982,7 @@ static int unicam_enum_framesizes(struct
  
  	fse.which = V4L2_SUBDEV_FORMAT_ACTIVE;
  	fse.index = fsize->index;
@@ -56,7 +54,7 @@ index f1ea1c2da6c3..642764ebf4b8 100644
  
  	ret = v4l2_subdev_call(dev->sensor, pad, enum_frame_size, NULL, &fse);
  	if (ret)
-@@ -2005,6 +2007,7 @@ static int unicam_enum_frameintervals(struct file *file, void *priv,
+@@ -2005,6 +2007,7 @@ static int unicam_enum_frameintervals(st
  	const struct unicam_fmt *fmt;
  	struct v4l2_subdev_frame_interval_enum fie = {
  		.index = fival->index,
@@ -64,7 +62,7 @@ index f1ea1c2da6c3..642764ebf4b8 100644
  		.width = fival->width,
  		.height = fival->height,
  		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
-@@ -2096,8 +2099,13 @@ static int unicam_enum_dv_timings(struct file *file, void *priv,
+@@ -2096,8 +2099,13 @@ static int unicam_enum_dv_timings(struct
  {
  	struct unicam_node *node = video_drvdata(file);
  	struct unicam_device *dev = node->dev;
@@ -79,7 +77,7 @@ index f1ea1c2da6c3..642764ebf4b8 100644
  }
  
  static int unicam_dv_timings_cap(struct file *file, void *priv,
-@@ -2105,8 +2113,13 @@ static int unicam_dv_timings_cap(struct file *file, void *priv,
+@@ -2105,8 +2113,13 @@ static int unicam_dv_timings_cap(struct
  {
  	struct unicam_node *node = video_drvdata(file);
  	struct unicam_device *dev = node->dev;
@@ -94,7 +92,7 @@ index f1ea1c2da6c3..642764ebf4b8 100644
  }
  
  static int unicam_subscribe_event(struct v4l2_fh *fh,
-@@ -2377,14 +2390,12 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2377,14 +2390,12 @@ static int register_node(struct unicam_d
  			 */
  			fmt = get_first_supported_format(unicam);
  
@@ -115,7 +113,7 @@ index f1ea1c2da6c3..642764ebf4b8 100644
  		}
  		if (mbus_fmt.field != V4L2_FIELD_NONE) {
  			/* Interlaced not supported - disable it now. */
-@@ -2394,7 +2405,8 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2394,7 +2405,8 @@ static int register_node(struct unicam_d
  				return -EINVAL;
  		}
  
@@ -125,7 +123,7 @@ index f1ea1c2da6c3..642764ebf4b8 100644
  						: fmt->repacked_fourcc;
  	} else {
  		/* Fix this node format as embedded data. */
-@@ -2407,7 +2419,8 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2407,7 +2419,8 @@ static int register_node(struct unicam_d
  	node->fmt = fmt;
  
  	/* Read current subdev format */
@@ -135,7 +133,7 @@ index f1ea1c2da6c3..642764ebf4b8 100644
  
  	if (v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
  		v4l2_std_id tvnorms;
-@@ -2496,6 +2509,7 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2496,6 +2509,7 @@ static int register_node(struct unicam_d
  		unicam_err(unicam, "Unable to allocate dummy buffer.\n");
  		return -ENOMEM;
  	}
@@ -143,7 +141,7 @@ index f1ea1c2da6c3..642764ebf4b8 100644
  	if (pad_id == METADATA_PAD ||
  	    !v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
  		v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_STD);
-@@ -2554,7 +2568,8 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2554,7 +2568,8 @@ static int register_node(struct unicam_d
  	node->registered = true;
  
  	if (pad_id != METADATA_PAD || unicam->sensor_embedded_data) {
@@ -153,7 +151,7 @@ index f1ea1c2da6c3..642764ebf4b8 100644
  					    &node->video_dev.entity, 0,
  					    MEDIA_LNK_FL_ENABLED |
  					    MEDIA_LNK_FL_IMMUTABLE);
-@@ -2586,8 +2601,10 @@ static void unregister_nodes(struct unicam_device *unicam)
+@@ -2586,8 +2601,10 @@ static void unregister_nodes(struct unic
  	}
  }
  
@@ -165,7 +163,7 @@ index f1ea1c2da6c3..642764ebf4b8 100644
  	int ret;
  
  	unicam->v4l2_dev.notify = unicam_notify;
-@@ -2596,7 +2613,20 @@ static int unicam_probe_complete(struct unicam_device *unicam)
+@@ -2596,7 +2613,20 @@ static int unicam_probe_complete(struct
  	if (!unicam->sensor_state)
  		return -ENOMEM;
  
@@ -187,7 +185,7 @@ index f1ea1c2da6c3..642764ebf4b8 100644
  
  	ret = register_node(unicam, &unicam->node[IMAGE_PAD],
  			    V4L2_BUF_TYPE_VIDEO_CAPTURE, IMAGE_PAD);
-@@ -2605,11 +2635,15 @@ static int unicam_probe_complete(struct unicam_device *unicam)
+@@ -2605,11 +2635,15 @@ static int unicam_probe_complete(struct
  		goto unregister;
  	}
  
@@ -208,7 +206,7 @@ index f1ea1c2da6c3..642764ebf4b8 100644
  	}
  
  	ret = v4l2_device_register_ro_subdev_nodes(&unicam->v4l2_dev);
-@@ -2632,13 +2666,6 @@ static int unicam_probe_complete(struct unicam_device *unicam)
+@@ -2632,13 +2666,6 @@ unregister:
  	return ret;
  }
  
@@ -222,7 +220,7 @@ index f1ea1c2da6c3..642764ebf4b8 100644
  static const struct v4l2_async_notifier_operations unicam_async_ops = {
  	.bound = unicam_async_bound,
  	.complete = unicam_async_complete,
-@@ -2747,7 +2774,7 @@ static int of_unicam_connect_subdevs(struct unicam_device *dev)
+@@ -2747,7 +2774,7 @@ static int of_unicam_connect_subdevs(str
  	dev->notifier.ops = &unicam_async_ops;
  
  	dev->asd.match_type = V4L2_ASYNC_MATCH_FWNODE;
@@ -231,6 +229,3 @@ index f1ea1c2da6c3..642764ebf4b8 100644
  	ret = v4l2_async_notifier_add_subdev(&dev->notifier, &dev->asd);
  	if (ret) {
  		unicam_err(dev, "Error adding subdevice: %d\n", ret);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0582-media-bcm2835-unicam-Add-support-for-configuration-v.patch b/root/target/linux/bcm27xx/patches-5.15/950-0555-media-bcm2835-unicam-Add-support-for-configuration-v.patch
similarity index 63%
rename from root/target/linux/bcm27xx/patches-5.15/0582-media-bcm2835-unicam-Add-support-for-configuration-v.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0555-media-bcm2835-unicam-Add-support-for-configuration-v.patch
index 3bd0bb8a..42301297 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0582-media-bcm2835-unicam-Add-support-for-configuration-v.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0555-media-bcm2835-unicam-Add-support-for-configuration-v.patch
@@ -1,7 +1,7 @@
-From 559b27515d4b5b948c770e5bdeeb69882faa7f16 Mon Sep 17 00:00:00 2001
+From 3caf57e7dfb40fb694018cd3917c1dea3edcf025 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Fri, 15 Oct 2021 17:57:27 +0100
-Subject: [PATCH 582/634] media/bcm2835-unicam: Add support for configuration
+Subject: [PATCH 555/828] media/bcm2835-unicam: Add support for configuration
  via MC API
 
 Adds Media Controller API support for more complex pipelines.
@@ -20,8 +20,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../media/platform/bcm2835/bcm2835-unicam.c   | 2125 ++++++++++-------
  1 file changed, 1314 insertions(+), 811 deletions(-)
 
-diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 642764ebf4b8..80196cd1a54c 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -84,6 +84,10 @@ static int debug;
@@ -35,7 +33,7 @@ index 642764ebf4b8..80196cd1a54c 100644
  #define unicam_dbg(level, dev, fmt, arg...)	\
  		v4l2_dbg(level, debug, &(dev)->v4l2_dev, fmt, ##arg)
  #define unicam_info(dev, fmt, arg...)	\
-@@ -120,7 +124,7 @@ MODULE_PARM_DESC(debug, "Debug level 0-3");
+@@ -120,7 +124,7 @@ MODULE_PARM_DESC(debug, "Debug level 0-3
  #define MIN_WIDTH		16
  #define MIN_HEIGHT		16
  /* Default size of the embedded buffer */
@@ -94,7 +92,7 @@ index 642764ebf4b8..80196cd1a54c 100644
  };
  
  static const struct unicam_fmt formats[] = {
-@@ -162,173 +191,216 @@ static const struct unicam_fmt formats[] = {
+@@ -162,173 +191,216 @@ static const struct unicam_fmt formats[]
  		.depth		= 16,
  		.csi_dt		= 0x1e,
  		.check_variants = 1,
@@ -312,7 +310,7 @@ index 642764ebf4b8..80196cd1a54c 100644
  	}, {
  	/*
  	 * 16 bit Bayer formats could be supported, but there is no CSI2
-@@ -341,30 +413,35 @@ static const struct unicam_fmt formats[] = {
+@@ -341,30 +413,35 @@ static const struct unicam_fmt formats[]
  		.code		= MEDIA_BUS_FMT_Y8_1X8,
  		.depth		= 8,
  		.csi_dt		= 0x2a,
@@ -365,7 +363,7 @@ index 642764ebf4b8..80196cd1a54c 100644
  };
  
  static inline struct unicam_device *
-@@ -911,6 +991,7 @@ static irqreturn_t unicam_isr(int irq, void *dev)
+@@ -911,6 +991,7 @@ static irqreturn_t unicam_isr(int irq, v
  	return IRQ_HANDLED;
  }
  
@@ -373,7 +371,7 @@ index 642764ebf4b8..80196cd1a54c 100644
  static int unicam_querycap(struct file *file, void *priv,
  			   struct v4l2_capability *cap)
  {
-@@ -928,6 +1009,38 @@ static int unicam_querycap(struct file *file, void *priv,
+@@ -928,6 +1009,38 @@ static int unicam_querycap(struct file *
  	return 0;
  }
  
@@ -412,38 +410,20 @@ index 642764ebf4b8..80196cd1a54c 100644
  static int unicam_enum_fmt_vid_cap(struct file *file, void  *priv,
  				   struct v4l2_fmtdesc *f)
  {
-@@ -1272,913 +1385,1271 @@ static int unicam_g_fmt_meta_cap(struct file *file, void *priv,
+@@ -1272,6 +1385,727 @@ static int unicam_g_fmt_meta_cap(struct
  	return 0;
  }
  
--static int unicam_queue_setup(struct vb2_queue *vq,
--			      unsigned int *nbuffers,
--			      unsigned int *nplanes,
--			      unsigned int sizes[],
--			      struct device *alloc_devs[])
 +static int unicam_enum_input(struct file *file, void *priv,
 +			     struct v4l2_input *inp)
- {
--	struct unicam_node *node = vb2_get_drv_priv(vq);
++{
 +	struct unicam_node *node = video_drvdata(file);
- 	struct unicam_device *dev = node->dev;
--	unsigned int size = node->pad_id == IMAGE_PAD ?
--				    node->v_fmt.fmt.pix.sizeimage :
--				    node->v_fmt.fmt.meta.buffersize;
++	struct unicam_device *dev = node->dev;
 +	int ret;
- 
--	if (vq->num_buffers + *nbuffers < 3)
--		*nbuffers = 3 - vq->num_buffers;
++
 +	if (inp->index != 0)
 +		return -EINVAL;
- 
--	if (*nplanes) {
--		if (sizes[0] < size) {
--			unicam_err(dev, "sizes[0] %i < size %u\n", sizes[0],
--				   size);
--			return -EINVAL;
--		}
--		size = sizes[0];
++
 +	inp->type = V4L2_INPUT_TYPE_CAMERA;
 +	if (v4l2_subdev_has_op(dev->sensor, video, s_dv_timings)) {
 +		inp->capabilities = V4L2_IN_CAP_DV_TIMINGS;
@@ -455,40 +435,26 @@ index 642764ebf4b8..80196cd1a54c 100644
 +	} else {
 +		inp->capabilities = 0;
 +		inp->std = 0;
- 	}
- 
--	*nplanes = 1;
--	sizes[0] = size;
++	}
++
 +	if (v4l2_subdev_has_op(dev->sensor, video, g_input_status)) {
 +		ret = v4l2_subdev_call(dev->sensor, video, g_input_status,
 +				       &inp->status);
 +		if (ret < 0)
 +			return ret;
 +	}
- 
++
 +	snprintf(inp->name, sizeof(inp->name), "Camera 0");
- 	return 0;
- }
- 
--static int unicam_buffer_prepare(struct vb2_buffer *vb)
-+static int unicam_g_input(struct file *file, void *priv, unsigned int *i)
- {
--	struct unicam_node *node = vb2_get_drv_priv(vb->vb2_queue);
--	struct unicam_device *dev = node->dev;
--	struct unicam_buffer *buf = to_unicam_buffer(vb);
--	unsigned long size;
-+	*i = 0;
- 
--	if (WARN_ON(!node->fmt))
--		return -EINVAL;
 +	return 0;
 +}
- 
--	size = node->pad_id == IMAGE_PAD ? node->v_fmt.fmt.pix.sizeimage :
--					   node->v_fmt.fmt.meta.buffersize;
--	if (vb2_plane_size(vb, 0) < size) {
--		unicam_err(dev, "data will not fit into plane (%lu < %lu)\n",
--			   vb2_plane_size(vb, 0), size);
++
++static int unicam_g_input(struct file *file, void *priv, unsigned int *i)
++{
++	*i = 0;
++
++	return 0;
++}
++
 +static int unicam_s_input(struct file *file, void *priv, unsigned int i)
 +{
 +	/*
@@ -500,79 +466,35 @@ index 642764ebf4b8..80196cd1a54c 100644
 +	 * map a user physical connector number to s_routing input number.
 +	 */
 +	if (i > 0)
- 		return -EINVAL;
--	}
- 
--	vb2_set_plane_payload(&buf->vb.vb2_buf, 0, size);
- 	return 0;
- }
- 
--static void unicam_buffer_queue(struct vb2_buffer *vb)
++		return -EINVAL;
++
++	return 0;
++}
++
 +static int unicam_querystd(struct file *file, void *priv,
 +			   v4l2_std_id *std)
- {
--	struct unicam_node *node = vb2_get_drv_priv(vb->vb2_queue);
--	struct unicam_buffer *buf = to_unicam_buffer(vb);
--	unsigned long flags;
++{
 +	struct unicam_node *node = video_drvdata(file);
 +	struct unicam_device *dev = node->dev;
- 
--	spin_lock_irqsave(&node->dma_queue_lock, flags);
--	list_add_tail(&buf->list, &node->dma_queue);
--	spin_unlock_irqrestore(&node->dma_queue_lock, flags);
++
 +	return v4l2_subdev_call(dev->sensor, video, querystd, std);
- }
- 
--static void unicam_set_packing_config(struct unicam_device *dev)
++}
++
 +static int unicam_g_std(struct file *file, void *priv, v4l2_std_id *std)
- {
--	u32 pack, unpack;
--	u32 val;
++{
 +	struct unicam_node *node = video_drvdata(file);
 +	struct unicam_device *dev = node->dev;
- 
--	if (dev->node[IMAGE_PAD].v_fmt.fmt.pix.pixelformat ==
--	    dev->node[IMAGE_PAD].fmt->fourcc) {
--		unpack = UNICAM_PUM_NONE;
--		pack = UNICAM_PPM_NONE;
--	} else {
--		switch (dev->node[IMAGE_PAD].fmt->depth) {
--		case 8:
--			unpack = UNICAM_PUM_UNPACK8;
--			break;
--		case 10:
--			unpack = UNICAM_PUM_UNPACK10;
--			break;
--		case 12:
--			unpack = UNICAM_PUM_UNPACK12;
--			break;
--		case 14:
--			unpack = UNICAM_PUM_UNPACK14;
--			break;
--		case 16:
--			unpack = UNICAM_PUM_UNPACK16;
--			break;
--		default:
--			unpack = UNICAM_PUM_NONE;
--			break;
--		}
++
 +	return v4l2_subdev_call(dev->sensor, video, g_std, std);
 +}
- 
--		/* Repacking is always to 16bpp */
--		pack = UNICAM_PPM_PACK16;
--	}
++
 +static int unicam_s_std(struct file *file, void *priv, v4l2_std_id std)
 +{
 +	struct unicam_node *node = video_drvdata(file);
 +	struct unicam_device *dev = node->dev;
 +	int ret;
 +	v4l2_std_id current_std;
- 
--	val = 0;
--	set_field(&val, unpack, UNICAM_PUM_MASK);
--	set_field(&val, pack, UNICAM_PPM_MASK);
--	reg_write(dev, UNICAM_IPIPE, val);
++
 +	ret = v4l2_subdev_call(dev->sensor, video, g_std, &current_std);
 +	if (ret)
 +		return ret;
@@ -591,48 +513,27 @@ index 642764ebf4b8..80196cd1a54c 100644
 +	unicam_reset_format(node);
 +
 +	return ret;
- }
- 
--static void unicam_cfg_image_id(struct unicam_device *dev)
++}
++
 +static int unicam_s_edid(struct file *file, void *priv, struct v4l2_edid *edid)
- {
--	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
--		/* CSI2 mode, hardcode VC 0 for now. */
--		reg_write(dev, UNICAM_IDI0,
--			  (0 << 6) | dev->node[IMAGE_PAD].fmt->csi_dt);
--	} else {
--		/* CCP2 mode */
--		reg_write(dev, UNICAM_IDI0,
--			  0x80 | dev->node[IMAGE_PAD].fmt->csi_dt);
--	}
++{
 +	struct unicam_node *node = video_drvdata(file);
 +	struct unicam_device *dev = node->dev;
 +
 +	return v4l2_subdev_call(dev->sensor, pad, set_edid, edid);
- }
- 
--static void unicam_enable_ed(struct unicam_device *dev)
++}
++
 +static int unicam_g_edid(struct file *file, void *priv, struct v4l2_edid *edid)
- {
--	u32 val = reg_read(dev, UNICAM_DCS);
--
--	set_field(&val, 2, UNICAM_EDL_MASK);
--	/* Do not wrap at the end of the embedded data buffer */
--	set_field(&val, 0, UNICAM_DBOB);
++{
 +	struct unicam_node *node = video_drvdata(file);
 +	struct unicam_device *dev = node->dev;
- 
--	reg_write(dev, UNICAM_DCS, val);
++
 +	return v4l2_subdev_call(dev->sensor, pad, get_edid, edid);
- }
- 
--static void unicam_start_rx(struct unicam_device *dev, dma_addr_t *addr)
++}
++
 +static int unicam_s_selection(struct file *file, void *priv,
 +			      struct v4l2_selection *sel)
- {
--	int line_int_freq = dev->node[IMAGE_PAD].v_fmt.fmt.pix.height >> 2;
--	unsigned int size, i;
--	u32 val;
++{
 +	struct unicam_node *node = video_drvdata(file);
 +	struct unicam_device *dev = node->dev;
 +	struct v4l2_subdev_selection sdsel = {
@@ -641,22 +542,13 @@ index 642764ebf4b8..80196cd1a54c 100644
 +		.flags = sel->flags,
 +		.r = sel->r,
 +	};
- 
--	if (line_int_freq < 128)
--		line_int_freq = 128;
++
 +	if (sel->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
 +		return -EINVAL;
- 
--	/* Enable lane clocks */
--	val = 1;
--	for (i = 0; i < dev->active_data_lanes; i++)
--		val = val << 2 | 1;
--	clk_write(dev, val);
++
 +	return v4l2_subdev_call(dev->sensor, pad, set_selection, NULL, &sdsel);
 +}
- 
--	/* Basic init */
--	reg_write(dev, UNICAM_CTRL, UNICAM_MEM);
++
 +static int unicam_g_selection(struct file *file, void *priv,
 +			      struct v4l2_selection *sel)
 +{
@@ -667,29 +559,17 @@ index 642764ebf4b8..80196cd1a54c 100644
 +		.target = sel->target,
 +	};
 +	int ret;
- 
--	/* Enable analogue control, and leave in reset. */
--	val = UNICAM_AR;
--	set_field(&val, 7, UNICAM_CTATADJ_MASK);
--	set_field(&val, 7, UNICAM_PTATADJ_MASK);
--	reg_write(dev, UNICAM_ANA, val);
--	usleep_range(1000, 2000);
++
 +	if (sel->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
 +		return -EINVAL;
- 
--	/* Come out of reset */
--	reg_write_field(dev, UNICAM_ANA, 0, UNICAM_AR);
++
 +	ret = v4l2_subdev_call(dev->sensor, pad, get_selection, NULL, &sdsel);
 +	if (!ret)
 +		sel->r = sdsel.r;
- 
--	/* Peripheral reset */
--	reg_write_field(dev, UNICAM_CTRL, 1, UNICAM_CPR);
--	reg_write_field(dev, UNICAM_CTRL, 0, UNICAM_CPR);
++
 +	return ret;
 +}
- 
--	reg_write_field(dev, UNICAM_CTRL, 0, UNICAM_CPE);
++
 +static int unicam_enum_framesizes(struct file *file, void *priv,
 +				  struct v4l2_frmsizeenum *fsize)
 +{
@@ -698,125 +578,35 @@ index 642764ebf4b8..80196cd1a54c 100644
 +	const struct unicam_fmt *fmt;
 +	struct v4l2_subdev_frame_size_enum fse;
 +	int ret;
- 
--	/* Enable Rx control. */
--	val = reg_read(dev, UNICAM_CTRL);
--	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
--		set_field(&val, UNICAM_CPM_CSI2, UNICAM_CPM_MASK);
--		set_field(&val, UNICAM_DCM_STROBE, UNICAM_DCM_MASK);
--	} else {
--		set_field(&val, UNICAM_CPM_CCP2, UNICAM_CPM_MASK);
--		set_field(&val, dev->bus_flags, UNICAM_DCM_MASK);
++
 +	/* check for valid format */
 +	fmt = find_format_by_pix(dev, fsize->pixel_format);
 +	if (!fmt) {
 +		unicam_dbg(3, dev, "Invalid pixel code: %x\n",
 +			   fsize->pixel_format);
 +		return -EINVAL;
- 	}
--	/* Packet framer timeout */
--	set_field(&val, 0xf, UNICAM_PFT_MASK);
--	set_field(&val, 128, UNICAM_OET_MASK);
--	reg_write(dev, UNICAM_CTRL, val);
--
--	reg_write(dev, UNICAM_IHWIN, 0);
--	reg_write(dev, UNICAM_IVWIN, 0);
--
--	/* AXI bus access QoS setup */
--	val = reg_read(dev, UNICAM_PRI);
--	set_field(&val, 0, UNICAM_BL_MASK);
--	set_field(&val, 0, UNICAM_BS_MASK);
--	set_field(&val, 0xe, UNICAM_PP_MASK);
--	set_field(&val, 8, UNICAM_NP_MASK);
--	set_field(&val, 2, UNICAM_PT_MASK);
--	set_field(&val, 1, UNICAM_PE);
--	reg_write(dev, UNICAM_PRI, val);
--
--	reg_write_field(dev, UNICAM_ANA, 0, UNICAM_DDL);
++	}
 +	fse.code = fmt->code;
- 
--	/* Always start in trigger frame capture mode (UNICAM_FCM set) */
--	val = UNICAM_FSIE | UNICAM_FEIE | UNICAM_FCM | UNICAM_IBOB;
--	set_field(&val, line_int_freq, UNICAM_LCIE_MASK);
--	reg_write(dev, UNICAM_ICTL, val);
--	reg_write(dev, UNICAM_STA, UNICAM_STA_MASK_ALL);
--	reg_write(dev, UNICAM_ISTA, UNICAM_ISTA_MASK_ALL);
++
 +	fse.which = V4L2_SUBDEV_FORMAT_ACTIVE;
 +	fse.index = fsize->index;
 +	fse.pad = node->src_pad_id;
- 
--	/* tclk_term_en */
--	reg_write_field(dev, UNICAM_CLT, 2, UNICAM_CLT1_MASK);
--	/* tclk_settle */
--	reg_write_field(dev, UNICAM_CLT, 6, UNICAM_CLT2_MASK);
--	/* td_term_en */
--	reg_write_field(dev, UNICAM_DLT, 2, UNICAM_DLT1_MASK);
--	/* ths_settle */
--	reg_write_field(dev, UNICAM_DLT, 6, UNICAM_DLT2_MASK);
--	/* trx_enable */
--	reg_write_field(dev, UNICAM_DLT, 0, UNICAM_DLT3_MASK);
++
 +	ret = v4l2_subdev_call(dev->sensor, pad, enum_frame_size, NULL, &fse);
 +	if (ret)
 +		return ret;
- 
--	reg_write_field(dev, UNICAM_CTRL, 0, UNICAM_SOE);
++
 +	unicam_dbg(1, dev, "%s: index: %d code: %x W:[%d,%d] H:[%d,%d]\n",
 +		   __func__, fse.index, fse.code, fse.min_width, fse.max_width,
 +		   fse.min_height, fse.max_height);
- 
--	/* Packet compare setup - required to avoid missing frame ends */
--	val = 0;
--	set_field(&val, 1, UNICAM_PCE);
--	set_field(&val, 1, UNICAM_GI);
--	set_field(&val, 1, UNICAM_CPH);
--	set_field(&val, 0, UNICAM_PCVC_MASK);
--	set_field(&val, 1, UNICAM_PCDT_MASK);
--	reg_write(dev, UNICAM_CMP0, val);
++
 +	fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE;
 +	fsize->discrete.width = fse.max_width;
 +	fsize->discrete.height = fse.max_height;
- 
--	/* Enable clock lane and set up terminations */
--	val = 0;
--	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
--		/* CSI2 */
--		set_field(&val, 1, UNICAM_CLE);
--		set_field(&val, 1, UNICAM_CLLPE);
--		if (dev->bus_flags & V4L2_MBUS_CSI2_CONTINUOUS_CLOCK) {
--			set_field(&val, 1, UNICAM_CLTRE);
--			set_field(&val, 1, UNICAM_CLHSE);
--		}
--	} else {
--		/* CCP2 */
--		set_field(&val, 1, UNICAM_CLE);
--		set_field(&val, 1, UNICAM_CLHSE);
--		set_field(&val, 1, UNICAM_CLTRE);
--	}
--	reg_write(dev, UNICAM_CLK, val);
++
 +	return 0;
 +}
- 
--	/*
--	 * Enable required data lanes with appropriate terminations.
--	 * The same value needs to be written to UNICAM_DATn registers for
--	 * the active lanes, and 0 for inactive ones.
--	 */
--	val = 0;
--	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
--		/* CSI2 */
--		set_field(&val, 1, UNICAM_DLE);
--		set_field(&val, 1, UNICAM_DLLPE);
--		if (dev->bus_flags & V4L2_MBUS_CSI2_CONTINUOUS_CLOCK) {
--			set_field(&val, 1, UNICAM_DLTRE);
--			set_field(&val, 1, UNICAM_DLHSE);
--		}
--	} else {
--		/* CCP2 */
--		set_field(&val, 1, UNICAM_DLE);
--		set_field(&val, 1, UNICAM_DLHSE);
--		set_field(&val, 1, UNICAM_DLTRE);
--	}
--	reg_write(dev, UNICAM_DAT0, val);
++
 +static int unicam_enum_frameintervals(struct file *file, void *priv,
 +				      struct v4l2_frmivalenum *fival)
 +{
@@ -831,243 +621,115 @@ index 642764ebf4b8..80196cd1a54c 100644
 +		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
 +	};
 +	int ret;
- 
--	if (dev->active_data_lanes == 1)
--		val = 0;
--	reg_write(dev, UNICAM_DAT1, val);
++
 +	fmt = find_format_by_pix(dev, fival->pixel_format);
 +	if (!fmt)
 +		return -EINVAL;
- 
--	if (dev->max_data_lanes > 2) {
--		/*
--		 * Registers UNICAM_DAT2 and UNICAM_DAT3 only valid if the
--		 * instance supports more than 2 data lanes.
--		 */
--		if (dev->active_data_lanes == 2)
--			val = 0;
--		reg_write(dev, UNICAM_DAT2, val);
++
 +	fie.code = fmt->code;
 +	ret = v4l2_subdev_call(dev->sensor, pad, enum_frame_interval,
 +			       NULL, &fie);
 +	if (ret)
 +		return ret;
- 
--		if (dev->active_data_lanes == 3)
--			val = 0;
--		reg_write(dev, UNICAM_DAT3, val);
--	}
++
 +	fival->type = V4L2_FRMIVAL_TYPE_DISCRETE;
 +	fival->discrete = fie.interval;
- 
--	reg_write(dev, UNICAM_IBLS,
--		  dev->node[IMAGE_PAD].v_fmt.fmt.pix.bytesperline);
--	size = dev->node[IMAGE_PAD].v_fmt.fmt.pix.sizeimage;
--	unicam_wr_dma_addr(dev, addr[IMAGE_PAD], size, IMAGE_PAD);
--	unicam_set_packing_config(dev);
--	unicam_cfg_image_id(dev);
++
 +	return 0;
 +}
- 
--	val = reg_read(dev, UNICAM_MISC);
--	set_field(&val, 1, UNICAM_FL0);
--	set_field(&val, 1, UNICAM_FL1);
--	reg_write(dev, UNICAM_MISC, val);
++
 +static int unicam_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
 +{
 +	struct unicam_node *node = video_drvdata(file);
 +	struct unicam_device *dev = node->dev;
- 
--	if (dev->node[METADATA_PAD].streaming && dev->sensor_embedded_data) {
--		size = dev->node[METADATA_PAD].v_fmt.fmt.meta.buffersize;
--		unicam_enable_ed(dev);
--		unicam_wr_dma_addr(dev, addr[METADATA_PAD], size, METADATA_PAD);
--	}
++
 +	return v4l2_g_parm_cap(video_devdata(file), dev->sensor, a);
 +}
- 
--	/* Enable peripheral */
--	reg_write_field(dev, UNICAM_CTRL, 1, UNICAM_CPE);
++
 +static int unicam_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
 +{
 +	struct unicam_node *node = video_drvdata(file);
 +	struct unicam_device *dev = node->dev;
- 
--	/* Load image pointers */
--	reg_write_field(dev, UNICAM_ICTL, 1, UNICAM_LIP_MASK);
++
 +	return v4l2_s_parm_cap(video_devdata(file), dev->sensor, a);
 +}
- 
--	/* Load embedded data buffer pointers if needed */
--	if (dev->node[METADATA_PAD].streaming && dev->sensor_embedded_data)
--		reg_write_field(dev, UNICAM_DCS, 1, UNICAM_LDP);
++
 +static int unicam_g_dv_timings(struct file *file, void *priv,
 +			       struct v4l2_dv_timings *timings)
 +{
 +	struct unicam_node *node = video_drvdata(file);
 +	struct unicam_device *dev = node->dev;
- 
--	/*
--	 * Enable trigger only for the first frame to
--	 * sync correctly to the FS from the source.
--	 */
--	reg_write_field(dev, UNICAM_ICTL, 1, UNICAM_TFC);
++
 +	return v4l2_subdev_call(dev->sensor, video, g_dv_timings, timings);
- }
- 
--static void unicam_disable(struct unicam_device *dev)
++}
++
 +static int unicam_s_dv_timings(struct file *file, void *priv,
 +			       struct v4l2_dv_timings *timings)
- {
--	/* Analogue lane control disable */
--	reg_write_field(dev, UNICAM_ANA, 1, UNICAM_DDL);
++{
 +	struct unicam_node *node = video_drvdata(file);
 +	struct unicam_device *dev = node->dev;
 +	struct v4l2_dv_timings current_timings;
 +	int ret;
- 
--	/* Stop the output engine */
--	reg_write_field(dev, UNICAM_CTRL, 1, UNICAM_SOE);
++
 +	ret = v4l2_subdev_call(dev->sensor, video, g_dv_timings,
 +			       &current_timings);
- 
--	/* Disable the data lanes. */
--	reg_write(dev, UNICAM_DAT0, 0);
--	reg_write(dev, UNICAM_DAT1, 0);
++
 +	if (ret < 0)
 +		return ret;
- 
--	if (dev->max_data_lanes > 2) {
--		reg_write(dev, UNICAM_DAT2, 0);
--		reg_write(dev, UNICAM_DAT3, 0);
--	}
++
 +	if (v4l2_match_dv_timings(timings, &current_timings, 0, false))
 +		return 0;
- 
--	/* Peripheral reset */
--	reg_write_field(dev, UNICAM_CTRL, 1, UNICAM_CPR);
--	usleep_range(50, 100);
--	reg_write_field(dev, UNICAM_CTRL, 0, UNICAM_CPR);
++
 +	if (vb2_is_busy(&node->buffer_queue))
 +		return -EBUSY;
- 
--	/* Disable peripheral */
--	reg_write_field(dev, UNICAM_CTRL, 0, UNICAM_CPE);
++
 +	ret = v4l2_subdev_call(dev->sensor, video, s_dv_timings, timings);
- 
--	/* Clear ED setup */
--	reg_write(dev, UNICAM_DCS, 0);
++
 +	/* Force recomputation of bytesperline */
 +	node->v_fmt.fmt.pix.bytesperline = 0;
- 
--	/* Disable all lane clocks */
--	clk_write(dev, 0);
--}
++
 +	unicam_reset_format(node);
- 
--static void unicam_return_buffers(struct unicam_node *node,
--				  enum vb2_buffer_state state)
--{
--	struct unicam_buffer *buf, *tmp;
--	unsigned long flags;
--
--	spin_lock_irqsave(&node->dma_queue_lock, flags);
--	list_for_each_entry_safe(buf, tmp, &node->dma_queue, list) {
--		list_del(&buf->list);
--		vb2_buffer_done(&buf->vb.vb2_buf, state);
--	}
++
 +	return ret;
 +}
- 
--	if (node->cur_frm)
--		vb2_buffer_done(&node->cur_frm->vb.vb2_buf,
--				state);
--	if (node->next_frm && node->cur_frm != node->next_frm)
--		vb2_buffer_done(&node->next_frm->vb.vb2_buf,
--				state);
++
 +static int unicam_query_dv_timings(struct file *file, void *priv,
 +				   struct v4l2_dv_timings *timings)
 +{
 +	struct unicam_node *node = video_drvdata(file);
 +	struct unicam_device *dev = node->dev;
- 
--	node->cur_frm = NULL;
--	node->next_frm = NULL;
--	spin_unlock_irqrestore(&node->dma_queue_lock, flags);
++
 +	return v4l2_subdev_call(dev->sensor, video, query_dv_timings, timings);
- }
- 
--static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
++}
++
 +static int unicam_enum_dv_timings(struct file *file, void *priv,
 +				  struct v4l2_enum_dv_timings *timings)
- {
--	struct unicam_node *node = vb2_get_drv_priv(vq);
++{
 +	struct unicam_node *node = video_drvdata(file);
- 	struct unicam_device *dev = node->dev;
--	dma_addr_t buffer_addr[MAX_NODES] = { 0 };
--	unsigned long flags;
--	unsigned int i;
- 	int ret;
- 
--	node->streaming = true;
--	if (!(dev->node[IMAGE_PAD].open && dev->node[IMAGE_PAD].streaming &&
--	      (!dev->node[METADATA_PAD].open ||
--	       dev->node[METADATA_PAD].streaming))) {
--		/*
--		 * Metadata pad must be enabled before image pad if it is
--		 * wanted.
--		 */
--		unicam_dbg(3, dev, "Not all nodes are streaming yet.");
--		return 0;
--	}
++	struct unicam_device *dev = node->dev;
++	int ret;
++
 +	timings->pad = node->src_pad_id;
 +	ret = v4l2_subdev_call(dev->sensor, pad, enum_dv_timings, timings);
 +	timings->pad = node->pad_id;
- 
--	dev->sequence = 0;
--	ret = unicam_runtime_get(dev);
--	if (ret < 0) {
--		unicam_dbg(3, dev, "unicam_runtime_get failed\n");
--		goto err_streaming;
--	}
++
 +	return ret;
 +}
- 
--	dev->active_data_lanes = dev->max_data_lanes;
++
 +static int unicam_dv_timings_cap(struct file *file, void *priv,
 +				 struct v4l2_dv_timings_cap *cap)
 +{
 +	struct unicam_node *node = video_drvdata(file);
 +	struct unicam_device *dev = node->dev;
 +	int ret;
- 
--	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
--		struct v4l2_mbus_config mbus_config = { 0 };
++
 +	cap->pad = node->src_pad_id;
 +	ret = v4l2_subdev_call(dev->sensor, pad, dv_timings_cap, cap);
 +	cap->pad = node->pad_id;
- 
--		ret = v4l2_subdev_call(dev->sensor, pad, get_mbus_config,
--				       0, &mbus_config);
--		if (ret < 0 && ret != -ENOIOCTLCMD) {
--			unicam_dbg(3, dev, "g_mbus_config failed\n");
--			goto err_pm_put;
--		}
++
 +	return ret;
 +}
- 
--		dev->active_data_lanes =
--			(mbus_config.flags & V4L2_MBUS_CSI2_LANE_MASK) >>
--					__ffs(V4L2_MBUS_CSI2_LANE_MASK);
--		if (!dev->active_data_lanes)
--			dev->active_data_lanes = dev->max_data_lanes;
--		if (dev->active_data_lanes > dev->max_data_lanes) {
--			unicam_err(dev, "Device has requested %u data lanes, which is >%u configured in DT\n",
--				   dev->active_data_lanes,
--				   dev->max_data_lanes);
--			ret = -EINVAL;
--			goto err_pm_put;
--		}
++
 +static int unicam_subscribe_event(struct v4l2_fh *fh,
 +				  const struct v4l2_event_subscription *sub)
 +{
@@ -1076,47 +738,25 @@ index 642764ebf4b8..80196cd1a54c 100644
 +		return v4l2_event_subscribe(fh, sub, 2, NULL);
 +	case V4L2_EVENT_SOURCE_CHANGE:
 +		return v4l2_event_subscribe(fh, sub, 4, NULL);
- 	}
- 
--	unicam_dbg(1, dev, "Running with %u data lanes\n",
--		   dev->active_data_lanes);
--
--	dev->vpu_req = clk_request_start(dev->vpu_clock, MIN_VPU_CLOCK_RATE);
--	if (!dev->vpu_req) {
--		unicam_err(dev, "failed to set up VPU clock\n");
--		goto err_pm_put;
--	}
++	}
++
 +	return v4l2_ctrl_subscribe_event(fh, sub);
 +}
- 
--	ret = clk_prepare_enable(dev->vpu_clock);
--	if (ret) {
--		unicam_err(dev, "Failed to enable VPU clock: %d\n", ret);
--		goto err_pm_put;
--	}
++
 +static void unicam_notify(struct v4l2_subdev *sd,
 +			  unsigned int notification, void *arg)
 +{
 +	struct unicam_device *dev = to_unicam_device(sd->v4l2_dev);
- 
--	ret = clk_set_rate(dev->clock, 100 * 1000 * 1000);
--	if (ret) {
--		unicam_err(dev, "failed to set up CSI clock\n");
--		goto err_vpu_clock;
++
 +	switch (notification) {
 +	case V4L2_DEVICE_NOTIFY_EVENT:
 +		v4l2_event_queue(&dev->node[IMAGE_PAD].video_dev, arg);
 +		break;
 +	default:
 +		break;
- 	}
++	}
 +}
- 
--	ret = clk_prepare_enable(dev->clock);
--	if (ret) {
--		unicam_err(dev, "Failed to enable CSI clock: %d\n", ret);
--		goto err_vpu_clock;
--	}
++
 +/* unicam capture ioctl operations */
 +static const struct v4l2_ioctl_ops unicam_ioctl_ops = {
 +	.vidioc_querycap		= unicam_querycap,
@@ -1124,73 +764,38 @@ index 642764ebf4b8..80196cd1a54c 100644
 +	.vidioc_g_fmt_vid_cap		= unicam_g_fmt_vid_cap,
 +	.vidioc_s_fmt_vid_cap		= unicam_s_fmt_vid_cap,
 +	.vidioc_try_fmt_vid_cap		= unicam_try_fmt_vid_cap,
- 
--	for (i = 0; i < ARRAY_SIZE(dev->node); i++) {
--		struct unicam_buffer *buf;
++
 +	.vidioc_enum_fmt_meta_cap	= unicam_enum_fmt_meta_cap,
 +	.vidioc_g_fmt_meta_cap		= unicam_g_fmt_meta_cap,
 +	.vidioc_s_fmt_meta_cap		= unicam_g_fmt_meta_cap,
 +	.vidioc_try_fmt_meta_cap	= unicam_g_fmt_meta_cap,
- 
--		if (!dev->node[i].streaming)
--			continue;
++
 +	.vidioc_enum_input		= unicam_enum_input,
 +	.vidioc_g_input			= unicam_g_input,
 +	.vidioc_s_input			= unicam_s_input,
- 
--		spin_lock_irqsave(&dev->node[i].dma_queue_lock, flags);
--		buf = list_first_entry(&dev->node[i].dma_queue,
--				       struct unicam_buffer, list);
--		dev->node[i].cur_frm = buf;
--		dev->node[i].next_frm = buf;
--		list_del(&buf->list);
--		spin_unlock_irqrestore(&dev->node[i].dma_queue_lock, flags);
++
 +	.vidioc_querystd		= unicam_querystd,
 +	.vidioc_s_std			= unicam_s_std,
 +	.vidioc_g_std			= unicam_g_std,
- 
--		buffer_addr[i] =
--			vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 0);
--	}
++
 +	.vidioc_g_edid			= unicam_g_edid,
 +	.vidioc_s_edid			= unicam_s_edid,
- 
--	unicam_start_rx(dev, buffer_addr);
++
 +	.vidioc_enum_framesizes		= unicam_enum_framesizes,
 +	.vidioc_enum_frameintervals	= unicam_enum_frameintervals,
- 
--	ret = v4l2_subdev_call(dev->sensor, video, s_stream, 1);
--	if (ret < 0) {
--		unicam_err(dev, "stream on failed in subdev\n");
--		goto err_disable_unicam;
--	}
++
 +	.vidioc_g_selection		= unicam_g_selection,
 +	.vidioc_s_selection		= unicam_s_selection,
- 
--	dev->clocks_enabled = true;
--	return 0;
++
 +	.vidioc_g_parm			= unicam_g_parm,
 +	.vidioc_s_parm			= unicam_s_parm,
- 
--err_disable_unicam:
--	unicam_disable(dev);
--	clk_disable_unprepare(dev->clock);
--err_vpu_clock:
--	clk_request_done(dev->vpu_req);
--	clk_disable_unprepare(dev->vpu_clock);
--err_pm_put:
--	unicam_runtime_put(dev);
--err_streaming:
--	unicam_return_buffers(node, VB2_BUF_STATE_QUEUED);
--	node->streaming = false;
++
 +	.vidioc_s_dv_timings		= unicam_s_dv_timings,
 +	.vidioc_g_dv_timings		= unicam_g_dv_timings,
 +	.vidioc_query_dv_timings	= unicam_query_dv_timings,
 +	.vidioc_enum_dv_timings		= unicam_enum_dv_timings,
 +	.vidioc_dv_timings_cap		= unicam_dv_timings_cap,
- 
--	return ret;
--}
++
 +	.vidioc_reqbufs			= vb2_ioctl_reqbufs,
 +	.vidioc_create_bufs		= vb2_ioctl_create_bufs,
 +	.vidioc_prepare_buf		= vb2_ioctl_prepare_buf,
@@ -1200,44 +805,25 @@ index 642764ebf4b8..80196cd1a54c 100644
 +	.vidioc_expbuf			= vb2_ioctl_expbuf,
 +	.vidioc_streamon		= vb2_ioctl_streamon,
 +	.vidioc_streamoff		= vb2_ioctl_streamoff,
- 
--static void unicam_stop_streaming(struct vb2_queue *vq)
--{
--	struct unicam_node *node = vb2_get_drv_priv(vq);
--	struct unicam_device *dev = node->dev;
++
 +	.vidioc_log_status		= unicam_log_status,
 +	.vidioc_subscribe_event		= unicam_subscribe_event,
 +	.vidioc_unsubscribe_event	= v4l2_event_unsubscribe,
 +};
- 
--	node->streaming = false;
++
 +/* V4L2 Media Controller Centric IOCTLs */
- 
--	if (node->pad_id == IMAGE_PAD) {
--		/*
--		 * Stop streaming the sensor and disable the peripheral.
--		 * We cannot continue streaming embedded data with the
--		 * image pad disabled.
--		 */
--		if (v4l2_subdev_call(dev->sensor, video, s_stream, 0) < 0)
--			unicam_err(dev, "stream off failed in subdev\n");
++
 +static int unicam_mc_enum_fmt_vid_cap(struct file *file, void  *priv,
 +				      struct v4l2_fmtdesc *f)
 +{
 +	int i, j;
- 
--		unicam_disable(dev);
++
 +	for (i = 0, j = 0; i < ARRAY_SIZE(formats); i++) {
 +		if (f->mbus_code && formats[i].code != f->mbus_code)
 +			continue;
 +		if (formats[i].mc_skip || formats[i].metadata_fmt)
 +			continue;
- 
--		if (dev->clocks_enabled) {
--			clk_request_done(dev->vpu_req);
--			clk_disable_unprepare(dev->vpu_clock);
--			clk_disable_unprepare(dev->clock);
--			dev->clocks_enabled = false;
++
 +		if (formats[i].fourcc) {
 +			if (j == f->index) {
 +				f->pixelformat = formats[i].fourcc;
@@ -1253,48 +839,20 @@ index 642764ebf4b8..80196cd1a54c 100644
 +				return 0;
 +			}
 +			j++;
- 		}
--		unicam_runtime_put(dev);
--
--	} else if (node->pad_id == METADATA_PAD) {
--		/*
--		 * Allow the hardware to spin in the dummy buffer.
--		 * This is only really needed if the embedded data pad is
--		 * disabled before the image pad.
--		 */
--		unicam_wr_dma_addr(dev, node->dummy_buf_dma_addr,
--				   DUMMY_BUF_SIZE, METADATA_PAD);
- 	}
- 
--	/* Clear all queued buffers for the node */
--	unicam_return_buffers(node, VB2_BUF_STATE_ERROR);
++		}
++	}
++
 +	return -EINVAL;
- }
- 
--static int unicam_enum_input(struct file *file, void *priv,
--			     struct v4l2_input *inp)
++}
++
 +static int unicam_mc_g_fmt_vid_cap(struct file *file, void *priv,
 +				   struct v4l2_format *f)
- {
- 	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--	int ret;
- 
--	if (inp->index != 0)
++{
++	struct unicam_node *node = video_drvdata(file);
++
 +	if (node->pad_id != IMAGE_PAD)
- 		return -EINVAL;
- 
--	inp->type = V4L2_INPUT_TYPE_CAMERA;
--	if (v4l2_subdev_has_op(dev->sensor, video, s_dv_timings)) {
--		inp->capabilities = V4L2_IN_CAP_DV_TIMINGS;
--		inp->std = 0;
--	} else if (v4l2_subdev_has_op(dev->sensor, video, s_std)) {
--		inp->capabilities = V4L2_IN_CAP_STD;
--		if (v4l2_subdev_call(dev->sensor, video, g_tvnorms, &inp->std) < 0)
--			inp->std = V4L2_STD_ALL;
--	} else {
--		inp->capabilities = 0;
--		inp->std = 0;
++		return -EINVAL;
++
 +	*f = node->v_fmt;
 +
 +	return 0;
@@ -1316,13 +874,8 @@ index 642764ebf4b8..80196cd1a54c 100644
 +	if (!fmt) {
 +		fmt = &formats[0];
 +		v4l2_format->pixelformat = fmt->fourcc;
- 	}
- 
--	if (v4l2_subdev_has_op(dev->sensor, video, g_input_status)) {
--		ret = v4l2_subdev_call(dev->sensor, video, g_input_status,
--				       &inp->status);
--		if (ret < 0)
--			return ret;
++	}
++
 +	unicam_calc_format_size_bpl(dev, fmt, f);
 +
 +	if (v4l2_format->field == V4L2_FIELD_ANY)
@@ -1344,9 +897,8 @@ index 642764ebf4b8..80196cd1a54c 100644
 +			V4L2_MAP_QUANTIZATION_DEFAULT(is_rgb,
 +						      v4l2_format->colorspace,
 +						      v4l2_format->ycbcr_enc);
- 	}
- 
--	snprintf(inp->name, sizeof(inp->name), "Camera 0");
++	}
++
 +	unicam_dbg(3, dev, "%s: %08x %ux%u (bytesperline %u sizeimage %u)\n",
 +		   __func__, v4l2_format->pixelformat,
 +		   v4l2_format->width, v4l2_format->height,
@@ -1359,14 +911,12 @@ index 642764ebf4b8..80196cd1a54c 100644
 +	struct unicam_node *node = video_drvdata(file);
 +
 +	unicam_mc_try_fmt(node, f, NULL);
- 	return 0;
- }
- 
--static int unicam_g_input(struct file *file, void *priv, unsigned int *i)
++	return 0;
++}
++
 +static int unicam_mc_s_fmt_vid_cap(struct file *file, void *priv,
 +				   struct v4l2_format *f)
- {
--	*i = 0;
++{
 +	struct unicam_node *node = video_drvdata(file);
 +	struct unicam_device *dev = node->dev;
 +	const struct unicam_fmt *fmt;
@@ -1380,23 +930,13 @@ index 642764ebf4b8..80196cd1a54c 100644
 +
 +	node->v_fmt = *f;
 +	node->fmt = fmt;
- 
- 	return 0;
- }
- 
--static int unicam_s_input(struct file *file, void *priv, unsigned int i)
++
++	return 0;
++}
++
 +static int unicam_mc_enum_framesizes(struct file *file, void *fh,
 +				     struct v4l2_frmsizeenum *fsize)
- {
--	/*
--	 * FIXME: Ideally we would like to be able to query the source
--	 * subdevice for information over the input connectors it supports,
--	 * and map that through in to a call to video_ops->s_routing.
--	 * There is no infrastructure support for defining that within
--	 * devicetree at present. Until that is implemented we can't
--	 * map a user physical connector number to s_routing input number.
--	 */
--	if (i > 0)
++{
 +	struct unicam_node *node = video_drvdata(file);
 +	struct unicam_device *dev = node->dev;
 +
@@ -1406,7 +946,7 @@ index 642764ebf4b8..80196cd1a54c 100644
 +	if (!find_format_by_pix(dev, fsize->pixel_format)) {
 +		unicam_dbg(3, dev, "Invalid pixel format 0x%08x\n",
 +			   fsize->pixel_format);
- 		return -EINVAL;
++		return -EINVAL;
 +	}
 +
 +	fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
@@ -1416,12 +956,10 @@ index 642764ebf4b8..80196cd1a54c 100644
 +	fsize->stepwise.min_height = MIN_HEIGHT;
 +	fsize->stepwise.max_height = MAX_HEIGHT;
 +	fsize->stepwise.step_height = 1;
- 
- 	return 0;
- }
- 
--static int unicam_querystd(struct file *file, void *priv,
--			   v4l2_std_id *std)
++
++	return 0;
++}
++
 +static int unicam_mc_enum_fmt_meta_cap(struct file *file, void  *priv,
 +				       struct v4l2_fmtdesc *f)
 +{
@@ -1448,41 +986,34 @@ index 642764ebf4b8..80196cd1a54c 100644
 +
 +static int unicam_mc_g_fmt_meta_cap(struct file *file, void *priv,
 +				    struct v4l2_format *f)
- {
- 	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
- 
--	return v4l2_subdev_call(dev->sensor, video, querystd, std);
++{
++	struct unicam_node *node = video_drvdata(file);
++
 +	if (node->pad_id != METADATA_PAD)
 +		return -EINVAL;
 +
 +	*f = node->v_fmt;
 +
 +	return 0;
- }
- 
--static int unicam_g_std(struct file *file, void *priv, v4l2_std_id *std)
++}
++
 +static int unicam_mc_try_fmt_meta_cap(struct file *file, void *priv,
 +				      struct v4l2_format *f)
- {
- 	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
- 
--	return v4l2_subdev_call(dev->sensor, video, g_std, std);
++{
++	struct unicam_node *node = video_drvdata(file);
++
 +	if (node->pad_id != METADATA_PAD)
 +		return -EINVAL;
 +
 +	f->fmt.meta.dataformat = V4L2_META_FMT_SENSOR_DATA;
 +
 +	return 0;
- }
- 
--static int unicam_s_std(struct file *file, void *priv, v4l2_std_id std)
++}
++
 +static int unicam_mc_s_fmt_meta_cap(struct file *file, void *priv,
 +				    struct v4l2_format *f)
- {
- 	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
++{
++	struct unicam_node *node = video_drvdata(file);
 +
 +	if (node->pad_id != METADATA_PAD)
 +		return -EINVAL;
@@ -1546,31 +1077,23 @@ index 642764ebf4b8..80196cd1a54c 100644
 +						video_dev);
 +	struct unicam_device *unicam = node->dev;
 +	struct v4l2_subdev_format source_fmt;
- 	int ret;
--	v4l2_std_id current_std;
- 
--	ret = v4l2_subdev_call(dev->sensor, video, g_std, &current_std);
--	if (ret)
--		return ret;
++	int ret;
++
 +	if (!media_entity_remote_pad(link->sink->entity->pads)) {
 +		unicam_dbg(1, unicam,
 +			   "video node %s pad not connected\n", vd->name);
 +		return -ENOTCONN;
 +	}
- 
--	if (std == current_std)
++
 +	ret = unicam_mc_subdev_link_validate_get_format(link->source,
 +							&source_fmt);
 +	if (ret < 0)
- 		return 0;
- 
--	if (vb2_is_busy(&node->buffer_queue))
--		return -EBUSY;
++		return 0;
++
 +	if (node->pad_id == IMAGE_PAD) {
 +		struct v4l2_pix_format *pix_fmt = &node->v_fmt.fmt.pix;
 +		const struct unicam_fmt *fmt;
- 
--	ret = v4l2_subdev_call(dev->sensor, video, s_std, std);
++
 +		if (source_fmt.format.width != pix_fmt->width ||
 +		    source_fmt.format.height != pix_fmt->height) {
 +			unicam_err(unicam,
@@ -1612,340 +1135,195 @@ index 642764ebf4b8..80196cd1a54c 100644
 +
 +/* videobuf2 Operations */
 +
-+static int unicam_queue_setup(struct vb2_queue *vq,
-+			      unsigned int *nbuffers,
-+			      unsigned int *nplanes,
-+			      unsigned int sizes[],
-+			      struct device *alloc_devs[])
-+{
-+	struct unicam_node *node = vb2_get_drv_priv(vq);
-+	struct unicam_device *dev = node->dev;
-+	unsigned int size = node->pad_id == IMAGE_PAD ?
-+				    node->v_fmt.fmt.pix.sizeimage :
-+				    node->v_fmt.fmt.meta.buffersize;
-+
-+	if (vq->num_buffers + *nbuffers < 3)
-+		*nbuffers = 3 - vq->num_buffers;
-+
-+	if (*nplanes) {
-+		if (sizes[0] < size) {
-+			unicam_err(dev, "sizes[0] %i < size %u\n", sizes[0],
-+				   size);
-+			return -EINVAL;
-+		}
-+		size = sizes[0];
-+	}
-+
-+	*nplanes = 1;
-+	sizes[0] = size;
-+
-+	return 0;
-+}
-+
-+static int unicam_buffer_prepare(struct vb2_buffer *vb)
-+{
-+	struct unicam_node *node = vb2_get_drv_priv(vb->vb2_queue);
-+	struct unicam_device *dev = node->dev;
-+	struct unicam_buffer *buf = to_unicam_buffer(vb);
-+	unsigned long size;
-+
-+	if (WARN_ON(!node->fmt))
-+		return -EINVAL;
-+
-+	size = node->pad_id == IMAGE_PAD ? node->v_fmt.fmt.pix.sizeimage :
-+					   node->v_fmt.fmt.meta.buffersize;
-+	if (vb2_plane_size(vb, 0) < size) {
-+		unicam_err(dev, "data will not fit into plane (%lu < %lu)\n",
-+			   vb2_plane_size(vb, 0), size);
-+		return -EINVAL;
-+	}
-+
-+	vb2_set_plane_payload(&buf->vb.vb2_buf, 0, size);
-+	return 0;
-+}
-+
-+static void unicam_buffer_queue(struct vb2_buffer *vb)
-+{
-+	struct unicam_node *node = vb2_get_drv_priv(vb->vb2_queue);
-+	struct unicam_buffer *buf = to_unicam_buffer(vb);
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&node->dma_queue_lock, flags);
-+	list_add_tail(&buf->list, &node->dma_queue);
-+	spin_unlock_irqrestore(&node->dma_queue_lock, flags);
-+}
-+
-+static void unicam_set_packing_config(struct unicam_device *dev)
-+{
-+	u32 pack, unpack;
-+	u32 val;
-+
-+	if (dev->node[IMAGE_PAD].v_fmt.fmt.pix.pixelformat ==
-+	    dev->node[IMAGE_PAD].fmt->fourcc) {
-+		unpack = UNICAM_PUM_NONE;
-+		pack = UNICAM_PPM_NONE;
-+	} else {
-+		switch (dev->node[IMAGE_PAD].fmt->depth) {
-+		case 8:
-+			unpack = UNICAM_PUM_UNPACK8;
-+			break;
-+		case 10:
-+			unpack = UNICAM_PUM_UNPACK10;
-+			break;
-+		case 12:
-+			unpack = UNICAM_PUM_UNPACK12;
-+			break;
-+		case 14:
-+			unpack = UNICAM_PUM_UNPACK14;
-+			break;
-+		case 16:
-+			unpack = UNICAM_PUM_UNPACK16;
-+			break;
-+		default:
-+			unpack = UNICAM_PUM_NONE;
-+			break;
-+		}
-+
-+		/* Repacking is always to 16bpp */
-+		pack = UNICAM_PPM_PACK16;
-+	}
-+
-+	val = 0;
-+	set_field(&val, unpack, UNICAM_PUM_MASK);
-+	set_field(&val, pack, UNICAM_PPM_MASK);
-+	reg_write(dev, UNICAM_IPIPE, val);
-+}
-+
-+static void unicam_cfg_image_id(struct unicam_device *dev)
-+{
-+	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
-+		/* CSI2 mode, hardcode VC 0 for now. */
-+		reg_write(dev, UNICAM_IDI0,
-+			  (0 << 6) | dev->node[IMAGE_PAD].fmt->csi_dt);
-+	} else {
-+		/* CCP2 mode */
-+		reg_write(dev, UNICAM_IDI0,
-+			  0x80 | dev->node[IMAGE_PAD].fmt->csi_dt);
-+	}
-+}
-+
-+static void unicam_enable_ed(struct unicam_device *dev)
-+{
-+	u32 val = reg_read(dev, UNICAM_DCS);
-+
-+	set_field(&val, 2, UNICAM_EDL_MASK);
-+	/* Do not wrap at the end of the embedded data buffer */
-+	set_field(&val, 0, UNICAM_DBOB);
-+
-+	reg_write(dev, UNICAM_DCS, val);
-+}
-+
-+static void unicam_start_rx(struct unicam_device *dev, dma_addr_t *addr)
-+{
-+	int line_int_freq = dev->node[IMAGE_PAD].v_fmt.fmt.pix.height >> 2;
-+	unsigned int size, i;
-+	u32 val;
-+
-+	if (line_int_freq < 128)
-+		line_int_freq = 128;
-+
-+	/* Enable lane clocks */
-+	val = 1;
-+	for (i = 0; i < dev->active_data_lanes; i++)
-+		val = val << 2 | 1;
-+	clk_write(dev, val);
-+
-+	/* Basic init */
-+	reg_write(dev, UNICAM_CTRL, UNICAM_MEM);
-+
-+	/* Enable analogue control, and leave in reset. */
-+	val = UNICAM_AR;
-+	set_field(&val, 7, UNICAM_CTATADJ_MASK);
-+	set_field(&val, 7, UNICAM_PTATADJ_MASK);
-+	reg_write(dev, UNICAM_ANA, val);
-+	usleep_range(1000, 2000);
-+
-+	/* Come out of reset */
-+	reg_write_field(dev, UNICAM_ANA, 0, UNICAM_AR);
-+
-+	/* Peripheral reset */
-+	reg_write_field(dev, UNICAM_CTRL, 1, UNICAM_CPR);
-+	reg_write_field(dev, UNICAM_CTRL, 0, UNICAM_CPR);
-+
-+	reg_write_field(dev, UNICAM_CTRL, 0, UNICAM_CPE);
-+
-+	/* Enable Rx control. */
-+	val = reg_read(dev, UNICAM_CTRL);
-+	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
-+		set_field(&val, UNICAM_CPM_CSI2, UNICAM_CPM_MASK);
-+		set_field(&val, UNICAM_DCM_STROBE, UNICAM_DCM_MASK);
-+	} else {
-+		set_field(&val, UNICAM_CPM_CCP2, UNICAM_CPM_MASK);
-+		set_field(&val, dev->bus_flags, UNICAM_DCM_MASK);
-+	}
-+	/* Packet framer timeout */
-+	set_field(&val, 0xf, UNICAM_PFT_MASK);
-+	set_field(&val, 128, UNICAM_OET_MASK);
-+	reg_write(dev, UNICAM_CTRL, val);
-+
-+	reg_write(dev, UNICAM_IHWIN, 0);
-+	reg_write(dev, UNICAM_IVWIN, 0);
-+
-+	/* AXI bus access QoS setup */
-+	val = reg_read(dev, UNICAM_PRI);
-+	set_field(&val, 0, UNICAM_BL_MASK);
-+	set_field(&val, 0, UNICAM_BS_MASK);
-+	set_field(&val, 0xe, UNICAM_PP_MASK);
-+	set_field(&val, 8, UNICAM_NP_MASK);
-+	set_field(&val, 2, UNICAM_PT_MASK);
-+	set_field(&val, 1, UNICAM_PE);
-+	reg_write(dev, UNICAM_PRI, val);
-+
-+	reg_write_field(dev, UNICAM_ANA, 0, UNICAM_DDL);
-+
-+	/* Always start in trigger frame capture mode (UNICAM_FCM set) */
-+	val = UNICAM_FSIE | UNICAM_FEIE | UNICAM_FCM | UNICAM_IBOB;
-+	set_field(&val, line_int_freq, UNICAM_LCIE_MASK);
-+	reg_write(dev, UNICAM_ICTL, val);
-+	reg_write(dev, UNICAM_STA, UNICAM_STA_MASK_ALL);
-+	reg_write(dev, UNICAM_ISTA, UNICAM_ISTA_MASK_ALL);
-+
-+	/* tclk_term_en */
-+	reg_write_field(dev, UNICAM_CLT, 2, UNICAM_CLT1_MASK);
-+	/* tclk_settle */
-+	reg_write_field(dev, UNICAM_CLT, 6, UNICAM_CLT2_MASK);
-+	/* td_term_en */
-+	reg_write_field(dev, UNICAM_DLT, 2, UNICAM_DLT1_MASK);
-+	/* ths_settle */
-+	reg_write_field(dev, UNICAM_DLT, 6, UNICAM_DLT2_MASK);
-+	/* trx_enable */
-+	reg_write_field(dev, UNICAM_DLT, 0, UNICAM_DLT3_MASK);
-+
-+	reg_write_field(dev, UNICAM_CTRL, 0, UNICAM_SOE);
-+
-+	/* Packet compare setup - required to avoid missing frame ends */
-+	val = 0;
-+	set_field(&val, 1, UNICAM_PCE);
-+	set_field(&val, 1, UNICAM_GI);
-+	set_field(&val, 1, UNICAM_CPH);
-+	set_field(&val, 0, UNICAM_PCVC_MASK);
-+	set_field(&val, 1, UNICAM_PCDT_MASK);
-+	reg_write(dev, UNICAM_CMP0, val);
-+
-+	/* Enable clock lane and set up terminations */
-+	val = 0;
-+	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
-+		/* CSI2 */
-+		set_field(&val, 1, UNICAM_CLE);
-+		set_field(&val, 1, UNICAM_CLLPE);
-+		if (dev->bus_flags & V4L2_MBUS_CSI2_CONTINUOUS_CLOCK) {
-+			set_field(&val, 1, UNICAM_CLTRE);
-+			set_field(&val, 1, UNICAM_CLHSE);
-+		}
-+	} else {
-+		/* CCP2 */
-+		set_field(&val, 1, UNICAM_CLE);
-+		set_field(&val, 1, UNICAM_CLHSE);
-+		set_field(&val, 1, UNICAM_CLTRE);
-+	}
-+	reg_write(dev, UNICAM_CLK, val);
-+
-+	/*
-+	 * Enable required data lanes with appropriate terminations.
-+	 * The same value needs to be written to UNICAM_DATn registers for
-+	 * the active lanes, and 0 for inactive ones.
-+	 */
-+	val = 0;
-+	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
-+		/* CSI2 */
-+		set_field(&val, 1, UNICAM_DLE);
-+		set_field(&val, 1, UNICAM_DLLPE);
-+		if (dev->bus_flags & V4L2_MBUS_CSI2_CONTINUOUS_CLOCK) {
-+			set_field(&val, 1, UNICAM_DLTRE);
-+			set_field(&val, 1, UNICAM_DLHSE);
-+		}
-+	} else {
-+		/* CCP2 */
-+		set_field(&val, 1, UNICAM_DLE);
-+		set_field(&val, 1, UNICAM_DLHSE);
-+		set_field(&val, 1, UNICAM_DLTRE);
-+	}
-+	reg_write(dev, UNICAM_DAT0, val);
-+
-+	if (dev->active_data_lanes == 1)
-+		val = 0;
-+	reg_write(dev, UNICAM_DAT1, val);
-+
-+	if (dev->max_data_lanes > 2) {
-+		/*
-+		 * Registers UNICAM_DAT2 and UNICAM_DAT3 only valid if the
-+		 * instance supports more than 2 data lanes.
-+		 */
-+		if (dev->active_data_lanes == 2)
-+			val = 0;
-+		reg_write(dev, UNICAM_DAT2, val);
-+
-+		if (dev->active_data_lanes == 3)
-+			val = 0;
-+		reg_write(dev, UNICAM_DAT3, val);
-+	}
-+
-+	reg_write(dev, UNICAM_IBLS,
-+		  dev->node[IMAGE_PAD].v_fmt.fmt.pix.bytesperline);
-+	size = dev->node[IMAGE_PAD].v_fmt.fmt.pix.sizeimage;
-+	unicam_wr_dma_addr(dev, addr[IMAGE_PAD], size, IMAGE_PAD);
-+	unicam_set_packing_config(dev);
-+	unicam_cfg_image_id(dev);
-+
-+	val = reg_read(dev, UNICAM_MISC);
-+	set_field(&val, 1, UNICAM_FL0);
-+	set_field(&val, 1, UNICAM_FL1);
-+	reg_write(dev, UNICAM_MISC, val);
+ static int unicam_queue_setup(struct vb2_queue *vq,
+ 			      unsigned int *nbuffers,
+ 			      unsigned int *nplanes,
+@@ -1669,6 +2503,12 @@ static int unicam_start_streaming(struct
+ 		goto err_streaming;
+ 	}
  
++	ret = media_pipeline_start(&node->video_dev.entity, &node->pipe);
++	if (ret < 0) {
++		unicam_err(dev, "Failed to start media pipeline: %d\n", ret);
++		goto err_pm_put;
++	}
++
+ 	dev->active_data_lanes = dev->max_data_lanes;
+ 
+ 	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
+@@ -1678,7 +2518,7 @@ static int unicam_start_streaming(struct
+ 				       0, &mbus_config);
+ 		if (ret < 0 && ret != -ENOIOCTLCMD) {
+ 			unicam_dbg(3, dev, "g_mbus_config failed\n");
+-			goto err_pm_put;
++			goto error_pipeline;
+ 		}
+ 
+ 		dev->active_data_lanes =
+@@ -1691,7 +2531,7 @@ static int unicam_start_streaming(struct
+ 				   dev->active_data_lanes,
+ 				   dev->max_data_lanes);
+ 			ret = -EINVAL;
+-			goto err_pm_put;
++			goto error_pipeline;
+ 		}
+ 	}
+ 
+@@ -1701,13 +2541,13 @@ static int unicam_start_streaming(struct
+ 	dev->vpu_req = clk_request_start(dev->vpu_clock, MIN_VPU_CLOCK_RATE);
+ 	if (!dev->vpu_req) {
+ 		unicam_err(dev, "failed to set up VPU clock\n");
+-		goto err_pm_put;
++		goto error_pipeline;
+ 	}
+ 
+ 	ret = clk_prepare_enable(dev->vpu_clock);
+ 	if (ret) {
+ 		unicam_err(dev, "Failed to enable VPU clock: %d\n", ret);
+-		goto err_pm_put;
++		goto error_pipeline;
+ 	}
+ 
+ 	ret = clk_set_rate(dev->clock, 100 * 1000 * 1000);
+@@ -1757,6 +2597,8 @@ err_disable_unicam:
+ err_vpu_clock:
+ 	clk_request_done(dev->vpu_req);
+ 	clk_disable_unprepare(dev->vpu_clock);
++error_pipeline:
++	media_pipeline_stop(&node->video_dev.entity);
+ err_pm_put:
+ 	unicam_runtime_put(dev);
+ err_streaming:
+@@ -1784,6 +2626,8 @@ static void unicam_stop_streaming(struct
+ 
+ 		unicam_disable(dev);
+ 
++		media_pipeline_stop(&node->video_dev.entity);
++
+ 		if (dev->clocks_enabled) {
+ 			clk_request_done(dev->vpu_req);
+ 			clk_disable_unprepare(dev->vpu_clock);
+@@ -1806,379 +2650,6 @@ static void unicam_stop_streaming(struct
+ 	unicam_return_buffers(node, VB2_BUF_STATE_ERROR);
+ }
+ 
+-static int unicam_enum_input(struct file *file, void *priv,
+-			     struct v4l2_input *inp)
+-{
+-	struct unicam_node *node = video_drvdata(file);
+-	struct unicam_device *dev = node->dev;
+-	int ret;
+-
+-	if (inp->index != 0)
+-		return -EINVAL;
+-
+-	inp->type = V4L2_INPUT_TYPE_CAMERA;
+-	if (v4l2_subdev_has_op(dev->sensor, video, s_dv_timings)) {
+-		inp->capabilities = V4L2_IN_CAP_DV_TIMINGS;
+-		inp->std = 0;
+-	} else if (v4l2_subdev_has_op(dev->sensor, video, s_std)) {
+-		inp->capabilities = V4L2_IN_CAP_STD;
+-		if (v4l2_subdev_call(dev->sensor, video, g_tvnorms, &inp->std) < 0)
+-			inp->std = V4L2_STD_ALL;
+-	} else {
+-		inp->capabilities = 0;
+-		inp->std = 0;
+-	}
+-
+-	if (v4l2_subdev_has_op(dev->sensor, video, g_input_status)) {
+-		ret = v4l2_subdev_call(dev->sensor, video, g_input_status,
+-				       &inp->status);
+-		if (ret < 0)
+-			return ret;
+-	}
+-
+-	snprintf(inp->name, sizeof(inp->name), "Camera 0");
+-	return 0;
+-}
+-
+-static int unicam_g_input(struct file *file, void *priv, unsigned int *i)
+-{
+-	*i = 0;
+-
+-	return 0;
+-}
+-
+-static int unicam_s_input(struct file *file, void *priv, unsigned int i)
+-{
+-	/*
+-	 * FIXME: Ideally we would like to be able to query the source
+-	 * subdevice for information over the input connectors it supports,
+-	 * and map that through in to a call to video_ops->s_routing.
+-	 * There is no infrastructure support for defining that within
+-	 * devicetree at present. Until that is implemented we can't
+-	 * map a user physical connector number to s_routing input number.
+-	 */
+-	if (i > 0)
+-		return -EINVAL;
+-
+-	return 0;
+-}
+-
+-static int unicam_querystd(struct file *file, void *priv,
+-			   v4l2_std_id *std)
+-{
+-	struct unicam_node *node = video_drvdata(file);
+-	struct unicam_device *dev = node->dev;
+-
+-	return v4l2_subdev_call(dev->sensor, video, querystd, std);
+-}
+-
+-static int unicam_g_std(struct file *file, void *priv, v4l2_std_id *std)
+-{
+-	struct unicam_node *node = video_drvdata(file);
+-	struct unicam_device *dev = node->dev;
+-
+-	return v4l2_subdev_call(dev->sensor, video, g_std, std);
+-}
+-
+-static int unicam_s_std(struct file *file, void *priv, v4l2_std_id std)
+-{
+-	struct unicam_node *node = video_drvdata(file);
+-	struct unicam_device *dev = node->dev;
+-	int ret;
+-	v4l2_std_id current_std;
+-
+-	ret = v4l2_subdev_call(dev->sensor, video, g_std, &current_std);
+-	if (ret)
+-		return ret;
+-
+-	if (std == current_std)
+-		return 0;
+-
+-	if (vb2_is_busy(&node->buffer_queue))
+-		return -EBUSY;
+-
+-	ret = v4l2_subdev_call(dev->sensor, video, s_std, std);
+-
 -	/* Force recomputation of bytesperline */
 -	node->v_fmt.fmt.pix.bytesperline = 0;
-+	if (dev->node[METADATA_PAD].streaming && dev->sensor_embedded_data) {
-+		size = dev->node[METADATA_PAD].v_fmt.fmt.meta.buffersize;
-+		unicam_enable_ed(dev);
-+		unicam_wr_dma_addr(dev, addr[METADATA_PAD], size, METADATA_PAD);
-+	}
- 
+-
 -	unicam_reset_format(node);
-+	/* Enable peripheral */
-+	reg_write_field(dev, UNICAM_CTRL, 1, UNICAM_CPE);
- 
+-
 -	return ret;
 -}
-+	/* Load image pointers */
-+	reg_write_field(dev, UNICAM_ICTL, 1, UNICAM_LIP_MASK);
- 
+-
 -static int unicam_s_edid(struct file *file, void *priv, struct v4l2_edid *edid)
 -{
 -	struct unicam_node *node = video_drvdata(file);
 -	struct unicam_device *dev = node->dev;
-+	/* Load embedded data buffer pointers if needed */
-+	if (dev->node[METADATA_PAD].streaming && dev->sensor_embedded_data)
-+		reg_write_field(dev, UNICAM_DCS, 1, UNICAM_LDP);
- 
+-
 -	return v4l2_subdev_call(dev->sensor, pad, set_edid, edid);
-+	/*
-+	 * Enable trigger only for the first frame to
-+	 * sync correctly to the FS from the source.
-+	 */
-+	reg_write_field(dev, UNICAM_ICTL, 1, UNICAM_TFC);
- }
- 
+-}
+-
 -static int unicam_g_edid(struct file *file, void *priv, struct v4l2_edid *edid)
-+static void unicam_disable(struct unicam_device *dev)
- {
+-{
 -	struct unicam_node *node = video_drvdata(file);
 -	struct unicam_device *dev = node->dev;
 -
 -	return v4l2_subdev_call(dev->sensor, pad, get_edid, edid);
 -}
-+	/* Analogue lane control disable */
-+	reg_write_field(dev, UNICAM_ANA, 1, UNICAM_DDL);
- 
+-
 -static int unicam_s_selection(struct file *file, void *priv,
 -			      struct v4l2_selection *sel)
 -{
@@ -1957,22 +1335,13 @@ index 642764ebf4b8..80196cd1a54c 100644
 -		.flags = sel->flags,
 -		.r = sel->r,
 -	};
-+	/* Stop the output engine */
-+	reg_write_field(dev, UNICAM_CTRL, 1, UNICAM_SOE);
- 
+-
 -	if (sel->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
 -		return -EINVAL;
-+	/* Disable the data lanes. */
-+	reg_write(dev, UNICAM_DAT0, 0);
-+	reg_write(dev, UNICAM_DAT1, 0);
- 
+-
 -	return v4l2_subdev_call(dev->sensor, pad, set_selection, NULL, &sdsel);
 -}
-+	if (dev->max_data_lanes > 2) {
-+		reg_write(dev, UNICAM_DAT2, 0);
-+		reg_write(dev, UNICAM_DAT3, 0);
-+	}
- 
+-
 -static int unicam_g_selection(struct file *file, void *priv,
 -			      struct v4l2_selection *sel)
 -{
@@ -1983,51 +1352,33 @@ index 642764ebf4b8..80196cd1a54c 100644
 -		.target = sel->target,
 -	};
 -	int ret;
-+	/* Peripheral reset */
-+	reg_write_field(dev, UNICAM_CTRL, 1, UNICAM_CPR);
-+	usleep_range(50, 100);
-+	reg_write_field(dev, UNICAM_CTRL, 0, UNICAM_CPR);
- 
+-
 -	if (sel->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
 -		return -EINVAL;
-+	/* Disable peripheral */
-+	reg_write_field(dev, UNICAM_CTRL, 0, UNICAM_CPE);
- 
+-
 -	ret = v4l2_subdev_call(dev->sensor, pad, get_selection, NULL, &sdsel);
 -	if (!ret)
 -		sel->r = sdsel.r;
-+	/* Clear ED setup */
-+	reg_write(dev, UNICAM_DCS, 0);
- 
+-
 -	return ret;
-+	/* Disable all lane clocks */
-+	clk_write(dev, 0);
- }
- 
+-}
+-
 -static int unicam_enum_framesizes(struct file *file, void *priv,
 -				  struct v4l2_frmsizeenum *fsize)
-+static void unicam_return_buffers(struct unicam_node *node,
-+				  enum vb2_buffer_state state)
- {
+-{
 -	struct unicam_node *node = video_drvdata(file);
 -	struct unicam_device *dev = node->dev;
 -	const struct unicam_fmt *fmt;
 -	struct v4l2_subdev_frame_size_enum fse;
 -	int ret;
-+	struct unicam_buffer *buf, *tmp;
-+	unsigned long flags;
- 
+-
 -	/* check for valid format */
 -	fmt = find_format_by_pix(dev, fsize->pixel_format);
 -	if (!fmt) {
 -		unicam_dbg(3, dev, "Invalid pixel code: %x\n",
 -			   fsize->pixel_format);
 -		return -EINVAL;
-+	spin_lock_irqsave(&node->dma_queue_lock, flags);
-+	list_for_each_entry_safe(buf, tmp, &node->dma_queue, list) {
-+		list_del(&buf->list);
-+		vb2_buffer_done(&buf->vb.vb2_buf, state);
- 	}
+-	}
 -	fse.code = fmt->code;
 -
 -	fse.which = V4L2_SUBDEV_FORMAT_ACTIVE;
@@ -2041,30 +1392,19 @@ index 642764ebf4b8..80196cd1a54c 100644
 -	unicam_dbg(1, dev, "%s: index: %d code: %x W:[%d,%d] H:[%d,%d]\n",
 -		   __func__, fse.index, fse.code, fse.min_width, fse.max_width,
 -		   fse.min_height, fse.max_height);
- 
+-
 -	fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE;
 -	fsize->discrete.width = fse.max_width;
 -	fsize->discrete.height = fse.max_height;
-+	if (node->cur_frm)
-+		vb2_buffer_done(&node->cur_frm->vb.vb2_buf,
-+				state);
-+	if (node->next_frm && node->cur_frm != node->next_frm)
-+		vb2_buffer_done(&node->next_frm->vb.vb2_buf,
-+				state);
- 
+-
 -	return 0;
-+	node->cur_frm = NULL;
-+	node->next_frm = NULL;
-+	spin_unlock_irqrestore(&node->dma_queue_lock, flags);
- }
- 
+-}
+-
 -static int unicam_enum_frameintervals(struct file *file, void *priv,
 -				      struct v4l2_frmivalenum *fival)
-+static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
- {
+-{
 -	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_node *node = vb2_get_drv_priv(vq);
- 	struct unicam_device *dev = node->dev;
+-	struct unicam_device *dev = node->dev;
 -	const struct unicam_fmt *fmt;
 -	struct v4l2_subdev_frame_interval_enum fie = {
 -		.index = fival->index,
@@ -2073,11 +1413,8 @@ index 642764ebf4b8..80196cd1a54c 100644
 -		.height = fival->height,
 -		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
 -	};
-+	dma_addr_t buffer_addr[MAX_NODES] = { 0 };
-+	unsigned long flags;
-+	unsigned int i;
- 	int ret;
- 
+-	int ret;
+-
 -	fmt = find_format_by_pix(dev, fival->pixel_format);
 -	if (!fmt)
 -		return -EINVAL;
@@ -2093,76 +1430,32 @@ index 642764ebf4b8..80196cd1a54c 100644
 -
 -	return 0;
 -}
-+	node->streaming = true;
-+	if (!(dev->node[IMAGE_PAD].open && dev->node[IMAGE_PAD].streaming &&
-+	      (!dev->node[METADATA_PAD].open ||
-+	       dev->node[METADATA_PAD].streaming))) {
-+		/*
-+		 * Metadata pad must be enabled before image pad if it is
-+		 * wanted.
-+		 */
-+		unicam_dbg(3, dev, "Not all nodes are streaming yet.");
-+		return 0;
-+	}
- 
+-
 -static int unicam_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
 -{
 -	struct unicam_node *node = video_drvdata(file);
 -	struct unicam_device *dev = node->dev;
-+	dev->sequence = 0;
-+	ret = unicam_runtime_get(dev);
-+	if (ret < 0) {
-+		unicam_dbg(3, dev, "unicam_runtime_get failed\n");
-+		goto err_streaming;
-+	}
- 
+-
 -	return v4l2_g_parm_cap(video_devdata(file), dev->sensor, a);
 -}
-+	ret = media_pipeline_start(&node->video_dev.entity, &node->pipe);
-+	if (ret < 0) {
-+		unicam_err(dev, "Failed to start media pipeline: %d\n", ret);
-+		goto err_pm_put;
-+	}
- 
+-
 -static int unicam_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
 -{
 -	struct unicam_node *node = video_drvdata(file);
 -	struct unicam_device *dev = node->dev;
-+	dev->active_data_lanes = dev->max_data_lanes;
- 
+-
 -	return v4l2_s_parm_cap(video_devdata(file), dev->sensor, a);
 -}
-+	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
-+		struct v4l2_mbus_config mbus_config = { 0 };
- 
+-
 -static int unicam_g_dv_timings(struct file *file, void *priv,
 -			       struct v4l2_dv_timings *timings)
 -{
 -	struct unicam_node *node = video_drvdata(file);
 -	struct unicam_device *dev = node->dev;
-+		ret = v4l2_subdev_call(dev->sensor, pad, get_mbus_config,
-+				       0, &mbus_config);
-+		if (ret < 0 && ret != -ENOIOCTLCMD) {
-+			unicam_dbg(3, dev, "g_mbus_config failed\n");
-+			goto error_pipeline;
-+		}
- 
+-
 -	return v4l2_subdev_call(dev->sensor, video, g_dv_timings, timings);
 -}
-+		dev->active_data_lanes =
-+			(mbus_config.flags & V4L2_MBUS_CSI2_LANE_MASK) >>
-+					__ffs(V4L2_MBUS_CSI2_LANE_MASK);
-+		if (!dev->active_data_lanes)
-+			dev->active_data_lanes = dev->max_data_lanes;
-+		if (dev->active_data_lanes > dev->max_data_lanes) {
-+			unicam_err(dev, "Device has requested %u data lanes, which is >%u configured in DT\n",
-+				   dev->active_data_lanes,
-+				   dev->max_data_lanes);
-+			ret = -EINVAL;
-+			goto error_pipeline;
-+		}
-+	}
- 
+-
 -static int unicam_s_dv_timings(struct file *file, void *priv,
 -			       struct v4l2_dv_timings *timings)
 -{
@@ -2170,126 +1463,66 @@ index 642764ebf4b8..80196cd1a54c 100644
 -	struct unicam_device *dev = node->dev;
 -	struct v4l2_dv_timings current_timings;
 -	int ret;
-+	unicam_dbg(1, dev, "Running with %u data lanes\n",
-+		   dev->active_data_lanes);
- 
+-
 -	ret = v4l2_subdev_call(dev->sensor, video, g_dv_timings,
 -			       &current_timings);
-+	dev->vpu_req = clk_request_start(dev->vpu_clock, MIN_VPU_CLOCK_RATE);
-+	if (!dev->vpu_req) {
-+		unicam_err(dev, "failed to set up VPU clock\n");
-+		goto error_pipeline;
-+	}
- 
+-
 -	if (ret < 0)
 -		return ret;
-+	ret = clk_prepare_enable(dev->vpu_clock);
-+	if (ret) {
-+		unicam_err(dev, "Failed to enable VPU clock: %d\n", ret);
-+		goto error_pipeline;
-+	}
- 
+-
 -	if (v4l2_match_dv_timings(timings, &current_timings, 0, false))
 -		return 0;
-+	ret = clk_set_rate(dev->clock, 100 * 1000 * 1000);
-+	if (ret) {
-+		unicam_err(dev, "failed to set up CSI clock\n");
-+		goto err_vpu_clock;
-+	}
- 
+-
 -	if (vb2_is_busy(&node->buffer_queue))
 -		return -EBUSY;
-+	ret = clk_prepare_enable(dev->clock);
-+	if (ret) {
-+		unicam_err(dev, "Failed to enable CSI clock: %d\n", ret);
-+		goto err_vpu_clock;
-+	}
- 
+-
 -	ret = v4l2_subdev_call(dev->sensor, video, s_dv_timings, timings);
-+	for (i = 0; i < ARRAY_SIZE(dev->node); i++) {
-+		struct unicam_buffer *buf;
- 
+-
 -	/* Force recomputation of bytesperline */
 -	node->v_fmt.fmt.pix.bytesperline = 0;
-+		if (!dev->node[i].streaming)
-+			continue;
- 
+-
 -	unicam_reset_format(node);
-+		spin_lock_irqsave(&dev->node[i].dma_queue_lock, flags);
-+		buf = list_first_entry(&dev->node[i].dma_queue,
-+				       struct unicam_buffer, list);
-+		dev->node[i].cur_frm = buf;
-+		dev->node[i].next_frm = buf;
-+		list_del(&buf->list);
-+		spin_unlock_irqrestore(&dev->node[i].dma_queue_lock, flags);
- 
+-
 -	return ret;
 -}
-+		buffer_addr[i] =
-+			vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 0);
-+	}
- 
+-
 -static int unicam_query_dv_timings(struct file *file, void *priv,
 -				   struct v4l2_dv_timings *timings)
 -{
 -	struct unicam_node *node = video_drvdata(file);
 -	struct unicam_device *dev = node->dev;
-+	unicam_start_rx(dev, buffer_addr);
- 
+-
 -	return v4l2_subdev_call(dev->sensor, video, query_dv_timings, timings);
 -}
-+	ret = v4l2_subdev_call(dev->sensor, video, s_stream, 1);
-+	if (ret < 0) {
-+		unicam_err(dev, "stream on failed in subdev\n");
-+		goto err_disable_unicam;
-+	}
- 
+-
 -static int unicam_enum_dv_timings(struct file *file, void *priv,
 -				  struct v4l2_enum_dv_timings *timings)
 -{
 -	struct unicam_node *node = video_drvdata(file);
 -	struct unicam_device *dev = node->dev;
 -	int ret;
-+	dev->clocks_enabled = true;
-+	return 0;
- 
+-
 -	timings->pad = node->src_pad_id;
 -	ret = v4l2_subdev_call(dev->sensor, pad, enum_dv_timings, timings);
 -	timings->pad = node->pad_id;
-+err_disable_unicam:
-+	unicam_disable(dev);
-+	clk_disable_unprepare(dev->clock);
-+err_vpu_clock:
-+	clk_request_done(dev->vpu_req);
-+	clk_disable_unprepare(dev->vpu_clock);
-+error_pipeline:
-+	media_pipeline_stop(&node->video_dev.entity);
-+err_pm_put:
-+	unicam_runtime_put(dev);
-+err_streaming:
-+	unicam_return_buffers(node, VB2_BUF_STATE_QUEUED);
-+	node->streaming = false;
- 
- 	return ret;
- }
- 
+-
+-	return ret;
+-}
+-
 -static int unicam_dv_timings_cap(struct file *file, void *priv,
 -				 struct v4l2_dv_timings_cap *cap)
-+static void unicam_stop_streaming(struct vb2_queue *vq)
- {
+-{
 -	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_node *node = vb2_get_drv_priv(vq);
- 	struct unicam_device *dev = node->dev;
+-	struct unicam_device *dev = node->dev;
 -	int ret;
- 
+-
 -	cap->pad = node->src_pad_id;
 -	ret = v4l2_subdev_call(dev->sensor, pad, dv_timings_cap, cap);
 -	cap->pad = node->pad_id;
 -
 -	return ret;
 -}
-+	node->streaming = false;
- 
+-
 -static int unicam_subscribe_event(struct v4l2_fh *fh,
 -				  const struct v4l2_event_subscription *sub)
 -{
@@ -2299,36 +1532,19 @@ index 642764ebf4b8..80196cd1a54c 100644
 -	case V4L2_EVENT_SOURCE_CHANGE:
 -		return v4l2_event_subscribe(fh, sub, 4, NULL);
 -	}
-+	if (node->pad_id == IMAGE_PAD) {
-+		/*
-+		 * Stop streaming the sensor and disable the peripheral.
-+		 * We cannot continue streaming embedded data with the
-+		 * image pad disabled.
-+		 */
-+		if (v4l2_subdev_call(dev->sensor, video, s_stream, 0) < 0)
-+			unicam_err(dev, "stream off failed in subdev\n");
- 
+-
 -	return v4l2_ctrl_subscribe_event(fh, sub);
 -}
-+		unicam_disable(dev);
- 
+-
 -static int unicam_log_status(struct file *file, void *fh)
 -{
 -	struct unicam_node *node = video_drvdata(file);
 -	struct unicam_device *dev = node->dev;
 -	u32 reg;
-+		media_pipeline_stop(&node->video_dev.entity);
- 
+-
 -	/* status for sub devices */
 -	v4l2_device_call_all(&dev->v4l2_dev, 0, core, log_status);
-+		if (dev->clocks_enabled) {
-+			clk_request_done(dev->vpu_req);
-+			clk_disable_unprepare(dev->vpu_clock);
-+			clk_disable_unprepare(dev->clock);
-+			dev->clocks_enabled = false;
-+		}
-+		unicam_runtime_put(dev);
- 
+-
 -	unicam_info(dev, "-----Receiver status-----\n");
 -	unicam_info(dev, "V4L2 width/height:   %ux%u\n",
 -		    node->v_fmt.fmt.pix.width, node->v_fmt.fmt.pix.height);
@@ -2347,21 +1563,10 @@ index 642764ebf4b8..80196cd1a54c 100644
 -		    reg_read(dev, UNICAM_IVSTA));
 -	unicam_info(dev, "Write pointer:       %08x\n",
 -		    reg_read(dev, UNICAM_IBWP));
-+	} else if (node->pad_id == METADATA_PAD) {
-+		/*
-+		 * Allow the hardware to spin in the dummy buffer.
-+		 * This is only really needed if the embedded data pad is
-+		 * disabled before the image pad.
-+		 */
-+		unicam_wr_dma_addr(dev, node->dummy_buf_dma_addr,
-+				   DUMMY_BUF_SIZE, METADATA_PAD);
-+	}
- 
+-
 -	return 0;
-+	/* Clear all queued buffers for the node */
-+	unicam_return_buffers(node, VB2_BUF_STATE_ERROR);
- }
- 
+-}
+-
 -static void unicam_notify(struct v4l2_subdev *sd,
 -			  unsigned int notification, void *arg)
 -{
@@ -2378,7 +1583,7 @@ index 642764ebf4b8..80196cd1a54c 100644
  
  static const struct vb2_ops unicam_video_qops = {
  	.wait_prepare		= vb2_ops_wait_prepare,
-@@ -2261,60 +2732,6 @@ static const struct v4l2_file_operations unicam_fops = {
+@@ -2261,60 +2732,6 @@ static const struct v4l2_file_operations
  	.mmap		= vb2_fop_mmap,
  };
  
@@ -2439,7 +1644,7 @@ index 642764ebf4b8..80196cd1a54c 100644
  static int
  unicam_async_bound(struct v4l2_async_notifier *notifier,
  		   struct v4l2_subdev *subdev,
-@@ -2365,11 +2782,11 @@ static void unicam_node_release(struct video_device *vdev)
+@@ -2365,11 +2782,11 @@ static void unicam_node_release(struct v
  	unicam_put(node->dev);
  }
  
@@ -2455,7 +1660,7 @@ index 642764ebf4b8..80196cd1a54c 100644
  	struct v4l2_mbus_framefmt mbus_fmt = {0};
  	const struct unicam_fmt *fmt;
  	int ret;
-@@ -2414,15 +2831,69 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2414,15 +2831,69 @@ static int register_node(struct unicam_d
  		node->v_fmt.fmt.meta.dataformat = fmt->fourcc;
  	}
  
@@ -2512,7 +1717,8 @@ index 642764ebf4b8..80196cd1a54c 100644
 -		unicam_reset_format(node);
 +	if (!unicam->mc_api) {
 +		const struct unicam_fmt *fmt;
-+
+ 
+-	if (v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
 +		ret = unicam_set_default_format(unicam, node, pad_id, &fmt);
 +		if (ret)
 +			return ret;
@@ -2523,14 +1729,13 @@ index 642764ebf4b8..80196cd1a54c 100644
 +	} else {
 +		unicam_mc_set_default_format(node, pad_id);
 +	}
- 
--	if (v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
++
 +	if (!unicam->mc_api &&
 +	    v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
  		v4l2_std_id tvnorms;
  
  		if (WARN_ON(!v4l2_subdev_has_op(unicam->sensor, video,
-@@ -2445,12 +2916,15 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2445,12 +2916,15 @@ static int register_node(struct unicam_d
  
  	vdev = &node->video_dev;
  	if (pad_id == IMAGE_PAD) {
@@ -2552,7 +1757,7 @@ index 642764ebf4b8..80196cd1a54c 100644
  
  		/*
  		 * If the sensor subdevice has any controls, associate the node
-@@ -2482,7 +2956,8 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2482,7 +2956,8 @@ static int register_node(struct unicam_d
  
  	vdev->release = unicam_node_release;
  	vdev->fops = &unicam_fops;
@@ -2562,7 +1767,7 @@ index 642764ebf4b8..80196cd1a54c 100644
  	vdev->v4l2_dev = &unicam->v4l2_dev;
  	vdev->vfl_dir = VFL_DIR_RX;
  	vdev->queue = q;
-@@ -2490,6 +2965,10 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2490,6 +2965,10 @@ static int register_node(struct unicam_d
  	vdev->device_caps = (pad_id == IMAGE_PAD) ?
  				V4L2_CAP_VIDEO_CAPTURE : V4L2_CAP_META_CAPTURE;
  	vdev->device_caps |= V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
@@ -2573,7 +1778,7 @@ index 642764ebf4b8..80196cd1a54c 100644
  
  	/* Define the device names */
  	snprintf(vdev->name, sizeof(vdev->name), "%s-%s", UNICAM_MODULE_NAME,
-@@ -2509,48 +2988,61 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
+@@ -2509,48 +2988,61 @@ static int register_node(struct unicam_d
  		unicam_err(unicam, "Unable to allocate dummy buffer.\n");
  		return -ENOMEM;
  	}
@@ -2677,7 +1882,7 @@ index 642764ebf4b8..80196cd1a54c 100644
  
  	ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
  	if (ret) {
-@@ -2617,7 +3109,7 @@ static int unicam_async_complete(struct v4l2_async_notifier *notifier)
+@@ -2617,7 +3109,7 @@ static int unicam_async_complete(struct
  		if (unicam->sensor->entity.pads[i].flags & MEDIA_PAD_FL_SOURCE) {
  			if (source_pads < MAX_NODES) {
  				unicam->node[source_pads].src_pad_id = i;
@@ -2686,7 +1891,7 @@ index 642764ebf4b8..80196cd1a54c 100644
  					   source_pads, i);
  			}
  			source_pads++;
-@@ -2646,7 +3138,10 @@ static int unicam_async_complete(struct v4l2_async_notifier *notifier)
+@@ -2646,7 +3138,10 @@ static int unicam_async_complete(struct
  		}
  	}
  
@@ -2698,7 +1903,7 @@ index 642764ebf4b8..80196cd1a54c 100644
  	if (ret) {
  		unicam_err(unicam, "Unable to register subdev nodes.\n");
  		goto unregister;
-@@ -2806,6 +3301,14 @@ static int unicam_probe(struct platform_device *pdev)
+@@ -2806,6 +3301,14 @@ static int unicam_probe(struct platform_
  	kref_init(&unicam->kref);
  	unicam->pdev = pdev;
  
@@ -2713,6 +1918,3 @@ index 642764ebf4b8..80196cd1a54c 100644
  	unicam->base = devm_platform_ioremap_resource(pdev, 0);
  	if (IS_ERR(unicam->base)) {
  		unicam_err(unicam, "Failed to get main io block\n");
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0584-ARM-dts-vc4-kms-v3d-Always-disable-firmware-HDMI.patch b/root/target/linux/bcm27xx/patches-5.15/950-0556-ARM-dts-vc4-kms-v3d-Always-disable-firmware-HDMI.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0584-ARM-dts-vc4-kms-v3d-Always-disable-firmware-HDMI.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0556-ARM-dts-vc4-kms-v3d-Always-disable-firmware-HDMI.patch
index 97935b44..628f7def 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0584-ARM-dts-vc4-kms-v3d-Always-disable-firmware-HDMI.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0556-ARM-dts-vc4-kms-v3d-Always-disable-firmware-HDMI.patch
@@ -1,7 +1,7 @@
-From 52815b24db5b467dafca89be7161571824c623e0 Mon Sep 17 00:00:00 2001
+From 77dcf640cc614b73c442dfc6f54e9b7eff82b0ff Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Mon, 25 Oct 2021 11:48:18 +0100
-Subject: [PATCH 584/634] ARM: dts: vc4-kms-v3d: Always disable firmware HDMI
+Subject: [PATCH 556/828] ARM: dts: vc4-kms-v3d: Always disable firmware HDMI
 
 Both the firmware audio driver and the vc4-kms-v3d driver are capable
 of providing HDMI audio, but only one should be active at any time.
@@ -21,11 +21,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
-index 5a4efdeed663..62e1d77a8182 100644
 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
-@@ -116,8 +116,8 @@ __overlay__  {
+@@ -116,8 +116,8 @@
  	};
  
  	__overrides__ {
@@ -36,11 +34,9 @@ index 5a4efdeed663..62e1d77a8182 100644
  		nocomposite = <0>, "!11";
  	};
  };
-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
-index 4285e12a4e53..76229cad7803 100644
 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
-@@ -180,7 +180,7 @@ __overlay__  {
+@@ -180,7 +180,7 @@
  	__overrides__ {
  		audio   = <0>,"!17";
  		audio1   = <0>,"!18";
@@ -49,6 +45,3 @@ index 4285e12a4e53..76229cad7803 100644
  		composite = <0>, "!1",
  			    <0>, "!2",
  			    <0>, "!3",
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0585-staging-bcm2835-camera-Add-support-for-H264_MIN_QP-H.patch b/root/target/linux/bcm27xx/patches-5.15/950-0557-staging-bcm2835-camera-Add-support-for-H264_MIN_QP-H.patch
similarity index 71%
rename from root/target/linux/bcm27xx/patches-5.15/0585-staging-bcm2835-camera-Add-support-for-H264_MIN_QP-H.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0557-staging-bcm2835-camera-Add-support-for-H264_MIN_QP-H.patch
index eae63500..32820fad 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0585-staging-bcm2835-camera-Add-support-for-H264_MIN_QP-H.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0557-staging-bcm2835-camera-Add-support-for-H264_MIN_QP-H.patch
@@ -1,7 +1,7 @@
-From 9eb237d54ac0886ea7f59bc698a3b1bc6e4e6d06 Mon Sep 17 00:00:00 2001
+From 800aef1344f7edaef71de190684f7667bf1a9e0d Mon Sep 17 00:00:00 2001
 From: soyer <soyer@irl.hu>
 Date: Sat, 23 Oct 2021 12:23:50 +0200
-Subject: [PATCH 585/634] staging/bcm2835-camera: Add support for H264_MIN_QP,
+Subject: [PATCH 557/828] staging/bcm2835-camera: Add support for H264_MIN_QP,
  H264_MAX_QP
 
 Signed-off-by: Gergo Koteles <soyer@irl.hu>
@@ -10,8 +10,6 @@ Signed-off-by: Gergo Koteles <soyer@irl.hu>
  .../vc04_services/bcm2835-camera/controls.c   | 22 +++++++++++++++++++
  2 files changed, 23 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
-index 75524adff0f5..a78973ae94de 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
 @@ -13,7 +13,7 @@
@@ -23,11 +21,9 @@ index 75524adff0f5..a78973ae94de 100644
  
  enum {
  	COMP_CAMERA = 0,
-diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-index f3480a5c5170..de59f435696d 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-@@ -1270,6 +1270,28 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
+@@ -1270,6 +1270,28 @@ static const struct bm2835_mmal_v4l2_ctr
  		.mmal_id = MMAL_PARAMETER_INTRAPERIOD,
  		.setter = ctrl_set_video_encode_param_output,
  	},
@@ -56,6 +52,3 @@ index f3480a5c5170..de59f435696d 100644
  };
  
  int bm2835_mmal_set_all_camera_controls(struct bm2835_mmal_dev *dev)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0586-staging-bcm2835-camera-Add-support-for-MPEG_VIDEO_FO.patch b/root/target/linux/bcm27xx/patches-5.15/950-0558-staging-bcm2835-camera-Add-support-for-MPEG_VIDEO_FO.patch
similarity index 68%
rename from root/target/linux/bcm27xx/patches-5.15/0586-staging-bcm2835-camera-Add-support-for-MPEG_VIDEO_FO.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0558-staging-bcm2835-camera-Add-support-for-MPEG_VIDEO_FO.patch
index 3ca51bd3..9a7fa0af 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0586-staging-bcm2835-camera-Add-support-for-MPEG_VIDEO_FO.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0558-staging-bcm2835-camera-Add-support-for-MPEG_VIDEO_FO.patch
@@ -1,7 +1,7 @@
-From 6b4196d656a1a8c5791b0fcae211165fc1dd9287 Mon Sep 17 00:00:00 2001
+From 1e78d397c168014b222ea40dc1fc241e716ba335 Mon Sep 17 00:00:00 2001
 From: Gergo Koteles <soyer@irl.hu>
 Date: Sun, 24 Oct 2021 23:18:09 +0200
-Subject: [PATCH 586/634] staging/bcm2835-camera: Add support for
+Subject: [PATCH 558/828] staging/bcm2835-camera: Add support for
  MPEG_VIDEO_FORCE_KEY_FRAME
 
 Signed-off-by: Gergo Koteles <soyer@irl.hu>
@@ -10,8 +10,6 @@ Signed-off-by: Gergo Koteles <soyer@irl.hu>
  .../staging/vc04_services/bcm2835-camera/controls.c   | 11 +++++++++++
  2 files changed, 12 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
-index a78973ae94de..fdbcc35ece5b 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
 @@ -13,7 +13,7 @@
@@ -23,11 +21,9 @@ index a78973ae94de..fdbcc35ece5b 100644
  
  enum {
  	COMP_CAMERA = 0,
-diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-index de59f435696d..b1b02fbc473d 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-@@ -1292,6 +1292,17 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
+@@ -1292,6 +1292,17 @@ static const struct bm2835_mmal_v4l2_ctr
  		.mmal_id = MMAL_PARAMETER_VIDEO_ENCODE_MAX_QUANT,
  		.setter = ctrl_set_video_encode_param_output,
  	},
@@ -45,6 +41,3 @@ index de59f435696d..b1b02fbc473d 100644
  };
  
  int bm2835_mmal_set_all_camera_controls(struct bm2835_mmal_dev *dev)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0590-ARM-dts-Add-Pi-Zero-2-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0559-ARM-dts-Add-Pi-Zero-2-support.patch
similarity index 85%
rename from root/target/linux/bcm27xx/patches-5.15/0590-ARM-dts-Add-Pi-Zero-2-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0559-ARM-dts-Add-Pi-Zero-2-support.patch
index a1d391d6..2aca1bfc 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0590-ARM-dts-Add-Pi-Zero-2-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0559-ARM-dts-Add-Pi-Zero-2-support.patch
@@ -1,7 +1,7 @@
-From 30daabdafb4a34a5e6451553d9a5b51b29f07763 Mon Sep 17 00:00:00 2001
+From a1897fd7936a817c1f1805ec4de5a000c5d91a81 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Thu, 9 Sep 2021 10:37:15 +0100
-Subject: [PATCH 590/634] ARM: dts: Add Pi Zero 2 support
+Subject: [PATCH 559/828] ARM: dts: Add Pi Zero 2 support
 
 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 ---
@@ -13,8 +13,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  create mode 100644 arch/arm/boot/dts/bcm2710-rpi-zero-2.dts
  create mode 100644 arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2.dts
 
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 6eb4e78e562c..b2a37ce7fa31 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
@@ -25,9 +23,6 @@ index 6eb4e78e562c..b2a37ce7fa31 100644
  	bcm2709-rpi-2-b.dtb \
  	bcm2710-rpi-2-b.dtb \
  	bcm2710-rpi-3-b.dtb \
-diff --git a/arch/arm/boot/dts/bcm2710-rpi-zero-2.dts b/arch/arm/boot/dts/bcm2710-rpi-zero-2.dts
-new file mode 100644
-index 000000000000..42185a450666
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2.dts
 @@ -0,0 +1,177 @@
@@ -208,11 +203,9 @@ index 000000000000..42185a450666
 +		act_led_trigger = <&act_led>,"linux,default-trigger";
 +	};
 +};
-diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
-index 5a90727064ee..8eadc747ae1f 100644
 --- a/arch/arm64/boot/dts/broadcom/Makefile
 +++ b/arch/arm64/boot/dts/broadcom/Makefile
-@@ -5,6 +5,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb \
+@@ -5,6 +5,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rp
  			      bcm2837-rpi-3-b.dtb \
  			      bcm2837-rpi-3-b-plus.dtb \
  			      bcm2837-rpi-cm3-io3.dtb
@@ -220,13 +213,7 @@ index 5a90727064ee..8eadc747ae1f 100644
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-2-b.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b-plus.dtb
-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..f76f553599ef
 --- /dev/null
 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2.dts
 @@ -0,0 +1 @@
 +#include "../../../../arm/boot/dts/bcm2710-rpi-zero-2.dts"
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0591-clk-raspberrypi-Support-VEC-clock.patch b/root/target/linux/bcm27xx/patches-5.15/950-0560-clk-raspberrypi-Support-VEC-clock.patch
similarity index 69%
rename from root/target/linux/bcm27xx/patches-5.15/0591-clk-raspberrypi-Support-VEC-clock.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0560-clk-raspberrypi-Support-VEC-clock.patch
index 8bccc193..d1d3ae57 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0591-clk-raspberrypi-Support-VEC-clock.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0560-clk-raspberrypi-Support-VEC-clock.patch
@@ -1,15 +1,13 @@
-From 4daac50723f2e04465fd054431ac9976447e395b Mon Sep 17 00:00:00 2001
+From 73e5a2b043e7668e41a6845d3a1a09dacdf670ee Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Tue, 19 Oct 2021 14:13:53 +0100
-Subject: [PATCH 591/634] clk-raspberrypi: Support VEC clock
+Subject: [PATCH 560/828] clk-raspberrypi: Support VEC clock
 
 Signed-off-by: Dom Cobley <popcornmix@gmail.com>
 ---
  drivers/clk/bcm/clk-raspberrypi.c | 3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 1e1bee7f43ed..c4829d62faad 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -33,6 +33,7 @@ enum rpi_firmware_clk_id {
@@ -20,7 +18,7 @@ index 1e1bee7f43ed..c4829d62faad 100644
  	RPI_FIRMWARE_NUM_CLK_ID,
  };
  
-@@ -51,6 +52,7 @@ static char *rpi_firmware_clk_names[] = {
+@@ -51,6 +52,7 @@ static char *rpi_firmware_clk_names[] =
  	[RPI_FIRMWARE_EMMC2_CLK_ID]	= "emmc2",
  	[RPI_FIRMWARE_M2MC_CLK_ID]	= "m2mc",
  	[RPI_FIRMWARE_PIXEL_BVB_CLK_ID]	= "pixel-bvb",
@@ -28,7 +26,7 @@ index 1e1bee7f43ed..c4829d62faad 100644
  };
  
  #define RPI_FIRMWARE_STATE_ENABLE_BIT	BIT(0)
-@@ -273,6 +275,7 @@ static int raspberrypi_discover_clocks(struct raspberrypi_clk *rpi,
+@@ -273,6 +275,7 @@ static int raspberrypi_discover_clocks(s
  		case RPI_FIRMWARE_V3D_CLK_ID:
  		case RPI_FIRMWARE_HEVC_CLK_ID:
  		case RPI_FIRMWARE_PIXEL_BVB_CLK_ID:
@@ -36,6 +34,3 @@ index 1e1bee7f43ed..c4829d62faad 100644
  			hw = raspberrypi_clk_register(rpi, clks->parent,
  						      clks->id);
  			if (IS_ERR(hw))
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0592-dt-Move-VEC-clock-to-clk-raspberrypi.patch b/root/target/linux/bcm27xx/patches-5.15/950-0561-dt-Move-VEC-clock-to-clk-raspberrypi.patch
similarity index 68%
rename from root/target/linux/bcm27xx/patches-5.15/0592-dt-Move-VEC-clock-to-clk-raspberrypi.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0561-dt-Move-VEC-clock-to-clk-raspberrypi.patch
index dc6c9c73..7252a833 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0592-dt-Move-VEC-clock-to-clk-raspberrypi.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0561-dt-Move-VEC-clock-to-clk-raspberrypi.patch
@@ -1,7 +1,7 @@
-From f7cd6bada78c3820ee14630954d8fc7a2d4fcdae Mon Sep 17 00:00:00 2001
+From d979002078421f1d327ed2931e21738b6cec7693 Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Tue, 19 Oct 2021 14:15:45 +0100
-Subject: [PATCH 592/634] dt: Move VEC clock to clk-raspberrypi
+Subject: [PATCH 561/828] dt: Move VEC clock to clk-raspberrypi
 
 clk-2835 is deprecated and gets an innacurate clock for VEC (107MHz).
 Switch to clk-raspberrypi which uses the right PLL to get an accurate 108MHz.
@@ -12,11 +12,9 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  arch/arm/boot/dts/bcm2835-common.dtsi | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index 05ef7089868f..b1ea654eac64 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
-@@ -303,7 +303,7 @@ pixelvalve3: pixelvalve@7ec12000 {
+@@ -304,7 +304,7 @@
  		vec: vec@7ec13000 {
  			compatible = "brcm,bcm2711-vec";
  			reg = <0x7ec13000 0x1000>;
@@ -25,11 +23,9 @@ index 05ef7089868f..b1ea654eac64 100644
  			interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
  			status = "disabled";
  		};
-diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi
-index 06d8c3882cb7..15f3975f1ca1 100644
 --- a/arch/arm/boot/dts/bcm2835-common.dtsi
 +++ b/arch/arm/boot/dts/bcm2835-common.dtsi
-@@ -109,7 +109,7 @@ i2c2: i2c@7e805000 {
+@@ -109,7 +109,7 @@
  		vec: vec@7e806000 {
  			compatible = "brcm,bcm2835-vec";
  			reg = <0x7e806000 0x1000>;
@@ -38,6 +34,3 @@ index 06d8c3882cb7..15f3975f1ca1 100644
  			interrupts = <2 27>;
  			status = "disabled";
  		};
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0593-clk-bcm2835-Remove-VEC-clock-support.patch b/root/target/linux/bcm27xx/patches-5.15/950-0562-clk-bcm2835-Remove-VEC-clock-support.patch
similarity index 70%
rename from root/target/linux/bcm27xx/patches-5.15/0593-clk-bcm2835-Remove-VEC-clock-support.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0562-clk-bcm2835-Remove-VEC-clock-support.patch
index 869f315c..8b9ba5bd 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0593-clk-bcm2835-Remove-VEC-clock-support.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0562-clk-bcm2835-Remove-VEC-clock-support.patch
@@ -1,18 +1,16 @@
-From 6e9c5a2391959ab805ed07870c28adee79919328 Mon Sep 17 00:00:00 2001
+From 6e3ac9c07cf666904718a26011f6bbe95501844d Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Tue, 19 Oct 2021 14:14:55 +0100
-Subject: [PATCH 593/634] clk-bcm2835: Remove VEC clock support
+Subject: [PATCH 562/828] clk-bcm2835: Remove VEC clock support
 
 Signed-off-by: Dom Cobley <popcornmix@gmail.com>
 ---
  drivers/clk/bcm/clk-bcm2835.c | 15 ---------------
  1 file changed, 15 deletions(-)
 
-diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index e4dfbe2cf50e..7112a9c4f7e3 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -2208,21 +2208,6 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {
+@@ -2208,21 +2208,6 @@ static const struct bcm2835_clk_desc clk
  		.frac_bits = 12,
  		.tcnt_mux = 28),
  
@@ -34,6 +32,3 @@ index e4dfbe2cf50e..7112a9c4f7e3 100644
  	/* dsi clocks */
  	[BCM2835_CLOCK_DSI0E]	= REGISTER_PER_CLK(
  		SOC_ALL,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0563-drm-vc4-Add-support-for-gamma-on-BCM2711.patch b/root/target/linux/bcm27xx/patches-5.15/950-0563-drm-vc4-Add-support-for-gamma-on-BCM2711.patch
new file mode 100644
index 00000000..77c4c7ed
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0563-drm-vc4-Add-support-for-gamma-on-BCM2711.patch
@@ -0,0 +1,272 @@
+From 8098389c3d6879a706855661d67be423f9cab5c1 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Tue, 27 Apr 2021 14:24:21 +0200
+Subject: [PATCH 563/828] drm/vc4: Add support for gamma on BCM2711
+
+BCM2711 changes from a 256 entry lookup table to a 16 point
+piecewise linear function as the pipeline bitdepth has increased
+to make a LUT unwieldy.
+
+Implement a simple conversion from a 256 entry LUT that userspace
+is likely to expect to 16 evenly spread points in the PWL. This
+could be improved with curve fitting at a later date.
+
+Co-developed-by: Juerg Haefliger <juergh@canonical.com>
+Signed-off-by: Juerg Haefliger <juergh@canonical.com>
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c | 35 +++++++++++---
+ drivers/gpu/drm/vc4/vc4_drv.h  | 28 +++++++++--
+ drivers/gpu/drm/vc4/vc4_hvs.c  | 87 ++++++++++++++++++++++++++++++++--
+ drivers/gpu/drm/vc4/vc4_regs.h | 22 +++++++++
+ 4 files changed, 159 insertions(+), 13 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -1164,19 +1164,42 @@ int vc4_crtc_init(struct drm_device *drm
+ 
+ 	if (!vc4->hvs->hvs5) {
+ 		drm_mode_crtc_set_gamma_size(crtc, ARRAY_SIZE(vc4_crtc->lut_r));
++	} else {
++		/* This is a lie for hvs5 which uses a 16 point PWL, but it
++		 * allows for something smarter than just 16 linearly spaced
++		 * segments. Conversion is done in vc5_hvs_update_gamma_lut.
++		 */
++		drm_mode_crtc_set_gamma_size(crtc, 256);
++	}
+ 
+-		drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size);
++	drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size);
+ 
++	if (!vc4->hvs->hvs5) {
+ 		/* We support CTM, but only for one CRTC at a time. It's therefore
+ 		 * implemented as private driver state in vc4_kms, not here.
+ 		 */
+ 		drm_crtc_enable_color_mgmt(crtc, 0, true, crtc->gamma_size);
+-	}
+ 
+-	for (i = 0; i < crtc->gamma_size; i++) {
+-		vc4_crtc->lut_r[i] = i;
+-		vc4_crtc->lut_g[i] = i;
+-		vc4_crtc->lut_b[i] = i;
++		/* Initialize the VC4 gamma LUTs */
++		for (i = 0; i < crtc->gamma_size; i++) {
++			vc4_crtc->lut_r[i] = i;
++			vc4_crtc->lut_g[i] = i;
++			vc4_crtc->lut_b[i] = i;
++		}
++	} else {
++		/* Initialize the VC5 gamma PWL entries. Assume 12-bit pipeline,
++		 * evenly spread over full range.
++		 */
++		for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++) {
++			vc4_crtc->pwl_r[i] =
++				VC5_HVS_SET_GAMMA_ENTRY(i << 8, i << 12, 1 << 8);
++			vc4_crtc->pwl_g[i] =
++				VC5_HVS_SET_GAMMA_ENTRY(i << 8, i << 12, 1 << 8);
++			vc4_crtc->pwl_b[i] =
++				VC5_HVS_SET_GAMMA_ENTRY(i << 8, i << 12, 1 << 8);
++			vc4_crtc->pwl_a[i] =
++				VC5_HVS_SET_GAMMA_ENTRY(i << 8, i << 12, 1 << 8);
++		}
+ 	}
+ 
+ 	return 0;
+--- a/drivers/gpu/drm/vc4/vc4_drv.h
++++ b/drivers/gpu/drm/vc4/vc4_drv.h
+@@ -19,6 +19,7 @@
+ #include <drm/drm_modeset_lock.h>
+ 
+ #include "uapi/drm/vc4_drm.h"
++#include "vc4_regs.h"
+ 
+ struct drm_device;
+ struct drm_gem_object;
+@@ -481,6 +482,17 @@ struct vc4_pv_data {
+ 
+ };
+ 
++struct vc5_gamma_entry {
++	u32 x_c_terms;
++	u32 grad_term;
++};
++
++#define VC5_HVS_SET_GAMMA_ENTRY(x, c, g) (struct vc5_gamma_entry){	\
++	.x_c_terms = VC4_SET_FIELD((x), SCALER5_DSPGAMMA_OFF_X) | 	\
++		     VC4_SET_FIELD((c), SCALER5_DSPGAMMA_OFF_C),	\
++	.grad_term = (g)						\
++}
++
+ struct vc4_crtc {
+ 	struct drm_crtc base;
+ 	struct platform_device *pdev;
+@@ -490,9 +502,19 @@ struct vc4_crtc {
+ 	/* Timestamp at start of vblank irq - unaffected by lock delays. */
+ 	ktime_t t_vblank;
+ 
+-	u8 lut_r[256];
+-	u8 lut_g[256];
+-	u8 lut_b[256];
++	union {
++		struct {  /* VC4 gamma LUT */
++			u8 lut_r[256];
++			u8 lut_g[256];
++			u8 lut_b[256];
++		};
++		struct {  /* VC5 gamma PWL entries */
++			struct vc5_gamma_entry pwl_r[SCALER5_DSPGAMMA_NUM_POINTS];
++			struct vc5_gamma_entry pwl_g[SCALER5_DSPGAMMA_NUM_POINTS];
++			struct vc5_gamma_entry pwl_b[SCALER5_DSPGAMMA_NUM_POINTS];
++			struct vc5_gamma_entry pwl_a[SCALER5_DSPGAMMA_NUM_POINTS];
++		};
++	};
+ 
+ 	struct drm_pending_vblank_event *event;
+ 
+--- a/drivers/gpu/drm/vc4/vc4_hvs.c
++++ b/drivers/gpu/drm/vc4/vc4_hvs.c
+@@ -236,6 +236,80 @@ static void vc4_hvs_update_gamma_lut(str
+ 	vc4_hvs_lut_load(crtc);
+ }
+ 
++static void vc5_hvs_write_gamma_entry(struct vc4_dev *vc4,
++				      u32 offset,
++				      struct vc5_gamma_entry *gamma)
++{
++	HVS_WRITE(offset, gamma->x_c_terms);
++	HVS_WRITE(offset + 4, gamma->grad_term);
++}
++
++static void vc5_hvs_lut_load(struct drm_crtc *crtc)
++{
++	struct drm_device *dev = crtc->dev;
++	struct vc4_dev *vc4 = to_vc4_dev(dev);
++	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
++	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state);
++	u32 i;
++	u32 offset = SCALER5_DSPGAMMA_START +
++		vc4_state->assigned_channel * SCALER5_DSPGAMMA_CHAN_OFFSET;
++
++	for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8)
++		vc5_hvs_write_gamma_entry(vc4, offset, &vc4_crtc->pwl_r[i]);
++	for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8)
++		vc5_hvs_write_gamma_entry(vc4, offset, &vc4_crtc->pwl_g[i]);
++	for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8)
++		vc5_hvs_write_gamma_entry(vc4, offset, &vc4_crtc->pwl_b[i]);
++
++	if (vc4_state->assigned_channel == 2) {
++		/* Alpha only valid on channel 2 */
++		for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8)
++			vc5_hvs_write_gamma_entry(vc4, offset, &vc4_crtc->pwl_a[i]);
++	}
++}
++
++static void vc5_hvs_update_gamma_lut(struct drm_crtc *crtc)
++{
++	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
++	struct drm_color_lut *lut = crtc->state->gamma_lut->data;
++	unsigned int step, i;
++	u32 start, end;
++
++#define VC5_HVS_UPDATE_GAMMA_ENTRY_FROM_LUT(pwl, chan)			\
++	start = drm_color_lut_extract(lut[i * step].chan, 12);		\
++	end = drm_color_lut_extract(lut[(i + 1) * step - 1].chan, 12);	\
++									\
++	/* Negative gradients not permitted by the hardware, so		\
++	 * flatten such points out.					\
++	 */								\
++	if (end < start)						\
++		end = start;						\
++									\
++	/* Assume 12bit pipeline.					\
++	 * X evenly spread over full range (12 bit).			\
++	 * C as U12.4 format.						\
++	 * Gradient as U4.8 format.					\
++	*/								\
++	vc4_crtc->pwl[i] =						\
++		VC5_HVS_SET_GAMMA_ENTRY(i << 8, start << 4,		\
++				((end - start) << 4) / (step - 1))
++
++	/* HVS5 has a 16 point piecewise linear function for each colour
++	 * channel (including alpha on channel 2) on each display channel.
++	 *
++	 * Currently take a crude subsample of the gamma LUT, but this could
++	 * be improved to implement curve fitting.
++	 */
++	step = crtc->gamma_size / SCALER5_DSPGAMMA_NUM_POINTS;
++	for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++) {
++		VC5_HVS_UPDATE_GAMMA_ENTRY_FROM_LUT(pwl_r, red);
++		VC5_HVS_UPDATE_GAMMA_ENTRY_FROM_LUT(pwl_g, green);
++		VC5_HVS_UPDATE_GAMMA_ENTRY_FROM_LUT(pwl_b, blue);
++	}
++
++	vc5_hvs_lut_load(crtc);
++}
++
+ int vc4_hvs_get_fifo_from_output(struct drm_device *dev, unsigned int output)
+ {
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
+@@ -329,14 +403,16 @@ static int vc4_hvs_init_channel(struct v
+ 	dispbkgndx &= ~SCALER_DISPBKGND_INTERLACE;
+ 
+ 	HVS_WRITE(SCALER_DISPBKGNDX(chan), dispbkgndx |
+-		  SCALER_DISPBKGND_AUTOHS |
+-		  ((!vc4->hvs->hvs5) ? SCALER_DISPBKGND_GAMMA : 0) |
++		  SCALER_DISPBKGND_AUTOHS | SCALER_DISPBKGND_GAMMA |
+ 		  (interlace ? SCALER_DISPBKGND_INTERLACE : 0));
+ 
+ 	/* Reload the LUT, since the SRAMs would have been disabled if
+ 	 * all CRTCs had SCALER_DISPBKGND_GAMMA unset at once.
+ 	 */
+-	vc4_hvs_lut_load(crtc);
++	if (!vc4->hvs->hvs5)
++		vc4_hvs_lut_load(crtc);
++	else
++		vc5_hvs_lut_load(crtc);
+ 
+ 	return 0;
+ }
+@@ -534,7 +610,10 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 		u32 dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(vc4_state->assigned_channel));
+ 
+ 		if (crtc->state->gamma_lut) {
+-			vc4_hvs_update_gamma_lut(crtc);
++			if (!vc4->hvs->hvs5)
++				vc4_hvs_update_gamma_lut(crtc);
++			else
++				vc5_hvs_update_gamma_lut(crtc);
+ 			dispbkgndx |= SCALER_DISPBKGND_GAMMA;
+ 		} else {
+ 			/* Unsetting DISPBKGND_GAMMA skips the gamma lut step
+--- a/drivers/gpu/drm/vc4/vc4_regs.h
++++ b/drivers/gpu/drm/vc4/vc4_regs.h
+@@ -491,6 +491,28 @@
+ #define SCALER_DLIST_START                      0x00002000
+ #define SCALER_DLIST_SIZE                       0x00004000
+ 
++/* Gamma PWL for each channel. 16 points for each of 4 colour channels (alpha
++ * only on channel 2). 8 bytes per entry, offsets first, then gradient:
++ *   Y = GRAD * X + C
++ *
++ * Values for X and C are left justified, and vary depending on the width of
++ * the HVS channel:
++ *    8-bit pipeline: X uses [31:24], C is U8.8 format, and GRAD is U4.8.
++ *   12-bit pipeline: X uses [31:20], C is U12.4 format, and GRAD is U4.8.
++ *
++ * The 3 HVS channels start at 0x400 offsets (ie chan 1 starts at 0x2400, and
++ * chan 2 at 0x2800).
++ */
++#define SCALER5_DSPGAMMA_NUM_POINTS		16
++#define SCALER5_DSPGAMMA_START			0x00002000
++#define SCALER5_DSPGAMMA_CHAN_OFFSET		0x400
++# define SCALER5_DSPGAMMA_OFF_X_MASK		VC4_MASK(31, 20)
++# define SCALER5_DSPGAMMA_OFF_X_SHIFT		20
++# define SCALER5_DSPGAMMA_OFF_C_MASK		VC4_MASK(15, 0)
++# define SCALER5_DSPGAMMA_OFF_C_SHIFT		0
++# define SCALER5_DSPGAMMA_GRAD_MASK		VC4_MASK(11, 0)
++# define SCALER5_DSPGAMMA_GRAD_SHIFT		0
++
+ #define SCALER5_DLIST_START			0x00004000
+ 
+ # define VC4_HDMI_SW_RESET_FORMAT_DETECT	BIT(1)
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0564-drm-vc4-Add-debugfs-node-that-dumps-the-vc5-gamma-PW.patch b/root/target/linux/bcm27xx/patches-5.15/950-0564-drm-vc4-Add-debugfs-node-that-dumps-the-vc5-gamma-PW.patch
new file mode 100644
index 00000000..4889e7b1
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0564-drm-vc4-Add-debugfs-node-that-dumps-the-vc5-gamma-PW.patch
@@ -0,0 +1,114 @@
+From 6156c9f6df69185541f9eb4ea9ffb45d0972595e Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 28 Apr 2021 12:32:10 +0200
+Subject: [PATCH 564/828] drm/vc4: Add debugfs node that dumps the vc5 gamma
+ PWL entries
+
+This helps with debugging the conversion from a 256 point gamma LUT to
+16 point PWL entries as used by the BCM2711.
+
+Co-developed-by: Juerg Haefliger <juergh@canonical.com>
+Signed-off-by: Juerg Haefliger <juergh@canonical.com>
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hvs.c | 81 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 81 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_hvs.c
++++ b/drivers/gpu/drm/vc4/vc4_hvs.c
+@@ -134,6 +134,84 @@ static int vc4_hvs_debugfs_dlist(struct
+ 	return 0;
+ }
+ 
++static int vc5_hvs_debugfs_gamma(struct seq_file *m, void *data)
++{
++	struct drm_info_node *node = m->private;
++	struct drm_device *dev = node->minor->dev;
++	struct vc4_dev *vc4 = to_vc4_dev(dev);
++	struct drm_printer p = drm_seq_file_printer(m);
++	unsigned int i, chan;
++	u32 dispstat, dispbkgndx;
++
++	for (chan = 0; chan < SCALER_CHANNELS_COUNT; chan++) {
++		u32 x_c, grad;
++		u32 offset = SCALER5_DSPGAMMA_START +
++			chan * SCALER5_DSPGAMMA_CHAN_OFFSET;
++
++		dispstat = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTATX(chan)),
++					 SCALER_DISPSTATX_MODE);
++		if (dispstat == SCALER_DISPSTATX_MODE_DISABLED ||
++		    dispstat == SCALER_DISPSTATX_MODE_EOF) {
++			drm_printf(&p, "HVS channel %u: Channel disabled\n", chan);
++			continue;
++		}
++
++		dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(chan));
++		if (!(dispbkgndx & SCALER_DISPBKGND_GAMMA)) {
++			drm_printf(&p, "HVS channel %u: Gamma disabled\n", chan);
++			continue;
++		}
++
++		drm_printf(&p, "HVS channel %u:\n", chan);
++		drm_printf(&p, "  red:\n");
++		for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8) {
++			x_c = HVS_READ(offset);
++			grad = HVS_READ(offset + 4);
++			drm_printf(&p, "  %08x %08x - x %u, c %u, grad %u\n",
++				   x_c, grad,
++				   VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_X),
++				   VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_C),
++				   grad);
++		}
++		drm_printf(&p, "  green:\n");
++		for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8) {
++			x_c = HVS_READ(offset);
++			grad = HVS_READ(offset + 4);
++			drm_printf(&p, "  %08x %08x - x %u, c %u, grad %u\n",
++				   x_c, grad,
++				   VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_X),
++				   VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_C),
++				   grad);
++		}
++		drm_printf(&p, "  blue:\n");
++		for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8) {
++			x_c = HVS_READ(offset);
++			grad = HVS_READ(offset + 4);
++			drm_printf(&p, "  %08x %08x - x %u, c %u, grad %u\n",
++				   x_c, grad,
++				   VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_X),
++				   VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_C),
++				   grad);
++		}
++
++		/* Alpha only valid on channel 2 */
++		if (chan != 2)
++			continue;
++
++		drm_printf(&p, "  alpha:\n");
++		for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8) {
++			x_c = HVS_READ(offset);
++			grad = HVS_READ(offset + 4);
++			drm_printf(&p, "  %08x %08x - x %u, c %u, grad %u\n",
++				   x_c, grad,
++				   VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_X),
++				   VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_C),
++				   grad);
++		}
++	}
++	return 0;
++}
++
+ /* The filter kernel is composed of dwords each containing 3 9-bit
+  * signed integers packed next to each other.
+  */
+@@ -809,6 +887,9 @@ static int vc4_hvs_bind(struct device *d
+ 			     NULL);
+ 	vc4_debugfs_add_file(drm, "hvs_dlists", vc4_hvs_debugfs_dlist,
+ 			     NULL);
++	if (hvs->hvs5)
++		vc4_debugfs_add_file(drm, "hvs_gamma", vc5_hvs_debugfs_gamma,
++				     NULL);
+ 
+ 	return 0;
+ }
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0565-drm-vc4-hvs-Force-modeset-on-gamma-lut-change.patch b/root/target/linux/bcm27xx/patches-5.15/950-0565-drm-vc4-hvs-Force-modeset-on-gamma-lut-change.patch
new file mode 100644
index 00000000..367fc5b6
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0565-drm-vc4-hvs-Force-modeset-on-gamma-lut-change.patch
@@ -0,0 +1,105 @@
+From ce625a9e39a7f03be54d8998562c5a7553e9f003 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Mon, 14 Jun 2021 15:28:30 +0200
+Subject: [PATCH 565/828] drm/vc4: hvs: Force modeset on gamma lut change
+
+The HVS Gamma block can only be updated when idle, so we need to disable
+the HVS channel when the gamma property is set in an atomic commit.
+
+Since the pixelvalve cannot have its assigned channel halted without
+stalling unless it's disabled as well, in our case that means forcing a
+full disable / enable cycle on the pipeline.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c | 17 +++++++++++++++++
+ drivers/gpu/drm/vc4/vc4_drv.h  |  3 +++
+ drivers/gpu/drm/vc4/vc4_hvs.c  | 32 +++++++++++++++++++++++++++++++-
+ 3 files changed, 51 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -294,6 +294,23 @@ struct drm_encoder *vc4_get_crtc_encoder
+ 	return NULL;
+ }
+ 
++#define drm_for_each_connector_mask(connector, dev, connector_mask) \
++	list_for_each_entry((connector), &(dev)->mode_config.connector_list, head) \
++		for_each_if ((connector_mask) & drm_connector_mask(connector))
++
++struct drm_connector *vc4_get_crtc_connector(struct drm_crtc *crtc,
++					     struct drm_crtc_state *state)
++{
++	struct drm_connector *connector;
++
++	WARN_ON(hweight32(state->connector_mask) > 1);
++
++	drm_for_each_connector_mask(connector, crtc->dev, state->connector_mask)
++		return connector;
++
++	return NULL;
++}
++
+ static void vc4_crtc_pixelvalve_reset(struct drm_crtc *crtc)
+ {
+ 	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
+--- a/drivers/gpu/drm/vc4/vc4_drv.h
++++ b/drivers/gpu/drm/vc4/vc4_drv.h
+@@ -568,6 +568,9 @@ vc4_crtc_to_vc4_pv_data(const struct vc4
+ 	return container_of(data, struct vc4_pv_data, base);
+ }
+ 
++struct drm_connector *vc4_get_crtc_connector(struct drm_crtc *crtc,
++					     struct drm_crtc_state *state);
++
+ struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
+ 					 struct drm_crtc_state *state);
+ 
+--- a/drivers/gpu/drm/vc4/vc4_hvs.c
++++ b/drivers/gpu/drm/vc4/vc4_hvs.c
+@@ -519,6 +519,36 @@ void vc4_hvs_stop_channel(struct drm_dev
+ 		     SCALER_DISPSTATX_EMPTY);
+ }
+ 
++static int vc4_hvs_gamma_check(struct drm_crtc *crtc,
++			       struct drm_atomic_state *state)
++{
++	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
++	struct drm_connector_state *conn_state;
++	struct drm_connector *connector;
++	struct drm_device *dev = crtc->dev;
++	struct vc4_dev *vc4 = to_vc4_dev(dev);
++
++	if (!vc4->hvs->hvs5)
++		return 0;
++
++	if (!crtc_state->color_mgmt_changed)
++		return 0;
++
++	connector = vc4_get_crtc_connector(crtc, crtc_state);
++	if (!connector)
++		return -EINVAL;
++
++	if (!(connector->connector_type == DRM_MODE_CONNECTOR_HDMIA))
++		return 0;
++
++	conn_state = drm_atomic_get_connector_state(state, connector);
++	if (!conn_state)
++		return -EINVAL;
++
++	crtc_state->mode_changed = true;
++	return 0;
++}
++
+ int vc4_hvs_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state)
+ {
+ 	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
+@@ -549,7 +579,7 @@ int vc4_hvs_atomic_check(struct drm_crtc
+ 	if (ret)
+ 		return ret;
+ 
+-	return 0;
++	return vc4_hvs_gamma_check(crtc, state);
+ }
+ 
+ static void vc4_hvs_update_dlist(struct drm_crtc *crtc)
diff --git a/root/target/linux/bcm27xx/patches-5.15/0597-media-i2c-imx477-Add-vsync-trigger_mode-parameter.patch b/root/target/linux/bcm27xx/patches-5.15/950-0566-media-i2c-imx477-Add-vsync-trigger_mode-parameter.patch
similarity index 83%
rename from root/target/linux/bcm27xx/patches-5.15/0597-media-i2c-imx477-Add-vsync-trigger_mode-parameter.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0566-media-i2c-imx477-Add-vsync-trigger_mode-parameter.patch
index 02dcc9ce..4969c097 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0597-media-i2c-imx477-Add-vsync-trigger_mode-parameter.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0566-media-i2c-imx477-Add-vsync-trigger_mode-parameter.patch
@@ -1,7 +1,7 @@
-From 56f178fd10e036223a19e7992bb0bad5542e4d05 Mon Sep 17 00:00:00 2001
+From 22ca800d4316a945c705ad80e55c06be7d3eede9 Mon Sep 17 00:00:00 2001
 From: neocortex-vision <oss@neocortexvision.com>
 Date: Thu, 28 Oct 2021 17:37:36 +0100
-Subject: [PATCH 597/634] media: i2c: imx477: Add vsync trigger_mode parameter
+Subject: [PATCH 566/828] media: i2c: imx477: Add vsync trigger_mode parameter
 
 trigger_mode == 0 (default) => no effect / no registers written
 trigger_mode == 1           => source
@@ -14,8 +14,6 @@ Signed-off-by: Jonas Jacob <jonas.jacob@neocortexvision.com>
  drivers/media/i2c/imx477.c | 25 +++++++++++++++++++++++++
  1 file changed, 25 insertions(+)
 
-diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index 54bc4e858081..2b4dfdd7975a 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
 @@ -25,6 +25,10 @@ static int dpc_enable = 1;
@@ -29,7 +27,7 @@ index 54bc4e858081..2b4dfdd7975a 100644
  #define IMX477_REG_VALUE_08BIT		1
  #define IMX477_REG_VALUE_16BIT		2
  
-@@ -98,6 +102,12 @@ MODULE_PARM_DESC(dpc_enable, "Enable on-sensor DPC");
+@@ -98,6 +102,12 @@ MODULE_PARM_DESC(dpc_enable, "Enable on-
  #define IMX477_TEST_PATTERN_B_DEFAULT	0
  #define IMX477_TEST_PATTERN_GB_DEFAULT	0
  
@@ -42,7 +40,7 @@ index 54bc4e858081..2b4dfdd7975a 100644
  /* Embedded metadata stream structure */
  #define IMX477_EMBEDDED_LINE_WIDTH 16384
  #define IMX477_NUM_EMBEDDED_LINES 1
-@@ -1721,6 +1731,21 @@ static int imx477_start_streaming(struct imx477 *imx477)
+@@ -1721,6 +1731,21 @@ static int imx477_start_streaming(struct
  	imx477_write_reg(imx477, 0x0b05, IMX477_REG_VALUE_08BIT, !!dpc_enable);
  	imx477_write_reg(imx477, 0x0b06, IMX477_REG_VALUE_08BIT, !!dpc_enable);
  
@@ -64,6 +62,3 @@ index 54bc4e858081..2b4dfdd7975a 100644
  	/* Apply customized values from user */
  	ret =  __v4l2_ctrl_handler_setup(imx477->sd.ctrl_handler);
  	if (ret)
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0567-drm-vc4-Relax-VEC-modeline-requirements-and-add-prog.patch b/root/target/linux/bcm27xx/patches-5.15/950-0567-drm-vc4-Relax-VEC-modeline-requirements-and-add-prog.patch
new file mode 100644
index 00000000..297e9ac0
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0567-drm-vc4-Relax-VEC-modeline-requirements-and-add-prog.patch
@@ -0,0 +1,156 @@
+From b8fd970dfaf11198a7c8bb246caec3bacaa94678 Mon Sep 17 00:00:00 2001
+From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
+Date: Thu, 15 Jul 2021 01:08:08 +0200
+Subject: [PATCH 567/828] drm/vc4: Relax VEC modeline requirements and add
+ progressive mode support
+
+Make vc4_vec_encoder_atomic_check() accept arbitrary modelines, as long
+as they result in somewhat sane output from the VEC. The bounds have
+been determined empirically. Additionally, add support for the
+progressive 262-line and 312-line modes.
+
+Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c |  1 +
+ drivers/gpu/drm/vc4/vc4_vec.c  | 97 ++++++++++++++++++++++++++++------
+ 2 files changed, 83 insertions(+), 15 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -410,6 +410,7 @@ static void vc4_crtc_config_pv(struct dr
+ 		CRTC_WRITE(PV_V_CONTROL,
+ 			   PV_VCONTROL_CONTINUOUS |
+ 			   (is_dsi ? PV_VCONTROL_DSI : 0));
++		CRTC_WRITE(PV_VSYNCD_EVEN, 0);
+ 	}
+ 
+ 	CRTC_WRITE(PV_VERTA,
+--- a/drivers/gpu/drm/vc4/vc4_vec.c
++++ b/drivers/gpu/drm/vc4/vc4_vec.c
+@@ -423,18 +423,11 @@ static int vc4_vec_connector_atomic_chec
+ 	struct drm_connector_state *new_state =
+ 		drm_atomic_get_new_connector_state(state, conn);
+ 
+-	const struct vc4_vec_tv_mode *vec_mode =
+-		&vc4_vec_tv_modes[new_state->tv.mode];
+-
+-	if (new_state->crtc) {
++	if (new_state->crtc && old_state->tv.mode != new_state->tv.mode) {
+ 		struct drm_crtc_state *crtc_state =
+ 			drm_atomic_get_new_crtc_state(state, new_state->crtc);
+ 
+-		if (!drm_mode_equal(vec_mode->mode, &crtc_state->mode))
+-			return -EINVAL;
+-
+-		if (old_state->tv.mode != new_state->tv.mode)
+-			crtc_state->mode_changed = true;
++		crtc_state->mode_changed = true;
+ 	}
+ 
+ 	return 0;
+@@ -559,7 +552,10 @@ static void vc4_vec_encoder_enable(struc
+ 	VEC_WRITE(VEC_CLMP0_START, 0xac);
+ 	VEC_WRITE(VEC_CLMP0_END, 0xec);
+ 	VEC_WRITE(VEC_CONFIG2,
+-		  VEC_CONFIG2_UV_DIG_DIS | VEC_CONFIG2_RGB_DIG_DIS);
++		  VEC_CONFIG2_UV_DIG_DIS |
++		  VEC_CONFIG2_RGB_DIG_DIS |
++		  ((encoder->crtc->state->adjusted_mode.flags &
++		    DRM_MODE_FLAG_INTERLACE) ? 0 : VEC_CONFIG2_PROG_SCAN));
+ 	VEC_WRITE(VEC_CONFIG3, VEC_CONFIG3_HORIZ_LEN_STD);
+ 	VEC_WRITE(VEC_DAC_CONFIG, vec->variant->dac_config);
+ 
+@@ -582,17 +578,88 @@ static void vc4_vec_encoder_enable(struc
+ }
+ 
+ 
+-static bool vc4_vec_encoder_mode_fixup(struct drm_encoder *encoder,
+-				       const struct drm_display_mode *mode,
+-				       struct drm_display_mode *adjusted_mode)
++static int vc4_vec_encoder_atomic_check(struct drm_encoder *encoder,
++					struct drm_crtc_state *crtc_state,
++					struct drm_connector_state *conn_state)
+ {
+-	return true;
++	const struct drm_display_mode *reference_mode =
++		vc4_vec_tv_modes[conn_state->tv.mode].mode;
++
++	if (crtc_state->adjusted_mode.crtc_clock != reference_mode->clock ||
++	    crtc_state->adjusted_mode.crtc_htotal != reference_mode->htotal ||
++	    crtc_state->adjusted_mode.crtc_hdisplay % 4 != 0 ||
++	    crtc_state->adjusted_mode.crtc_hsync_end -
++		    crtc_state->adjusted_mode.crtc_hsync_start < 1)
++		return -EINVAL;
++
++	switch (reference_mode->vtotal) {
++	case 525:
++		if (crtc_state->adjusted_mode.crtc_vdisplay < 1 ||
++		    crtc_state->adjusted_mode.crtc_vdisplay > 253 ||
++		    crtc_state->adjusted_mode.crtc_vsync_start -
++			    crtc_state->adjusted_mode.crtc_vdisplay < 1 ||
++		    crtc_state->adjusted_mode.crtc_vsync_end -
++			    crtc_state->adjusted_mode.crtc_vsync_start != 3 ||
++		    crtc_state->adjusted_mode.crtc_vtotal -
++			    crtc_state->adjusted_mode.crtc_vsync_end < 4 ||
++		    crtc_state->adjusted_mode.crtc_vtotal > 262)
++			return -EINVAL;
++
++		if ((crtc_state->adjusted_mode.flags &
++		     DRM_MODE_FLAG_INTERLACE) &&
++		    (crtc_state->adjusted_mode.vdisplay % 2 != 0 ||
++		     crtc_state->adjusted_mode.vsync_start % 2 != 1 ||
++		     crtc_state->adjusted_mode.vsync_end % 2 != 1 ||
++		     crtc_state->adjusted_mode.vtotal % 2 != 1))
++			return -EINVAL;
++
++		/* progressive mode is hard-wired to 262 total lines */
++		if (!(crtc_state->adjusted_mode.flags &
++		      DRM_MODE_FLAG_INTERLACE) &&
++		    crtc_state->adjusted_mode.crtc_vtotal != 262)
++			return -EINVAL;
++
++		break;
++
++	case 625:
++		if (crtc_state->adjusted_mode.crtc_vdisplay < 1 ||
++		    crtc_state->adjusted_mode.crtc_vdisplay > 305 ||
++		    crtc_state->adjusted_mode.crtc_vsync_start -
++			    crtc_state->adjusted_mode.crtc_vdisplay < 1 ||
++		    crtc_state->adjusted_mode.crtc_vsync_end -
++			    crtc_state->adjusted_mode.crtc_vsync_start != 3 ||
++		    crtc_state->adjusted_mode.crtc_vtotal -
++			    crtc_state->adjusted_mode.crtc_vsync_end < 2 ||
++		    crtc_state->adjusted_mode.crtc_vtotal > 312)
++			return -EINVAL;
++
++		if ((crtc_state->adjusted_mode.flags &
++		     DRM_MODE_FLAG_INTERLACE) &&
++		    (crtc_state->adjusted_mode.vdisplay % 2 != 0 ||
++		     crtc_state->adjusted_mode.vsync_start % 2 != 0 ||
++		     crtc_state->adjusted_mode.vsync_end % 2 != 0 ||
++		     crtc_state->adjusted_mode.vtotal % 2 != 1))
++			return -EINVAL;
++
++		/* progressive mode is hard-wired to 312 total lines */
++		if (!(crtc_state->adjusted_mode.flags &
++		      DRM_MODE_FLAG_INTERLACE) &&
++		    crtc_state->adjusted_mode.crtc_vtotal != 312)
++			return -EINVAL;
++
++		break;
++
++	default:
++		return -EINVAL;
++	}
++
++	return 0;
+ }
+ 
+ static const struct drm_encoder_helper_funcs vc4_vec_encoder_helper_funcs = {
+ 	.disable = vc4_vec_encoder_disable,
+ 	.enable = vc4_vec_encoder_enable,
+-	.mode_fixup = vc4_vec_encoder_mode_fixup,
++	.atomic_check = vc4_vec_encoder_atomic_check,
+ };
+ 
+ static const struct vc4_vec_variant bcm2835_vec_variant = {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0568-drm-vc4-Make-VEC-progressive-modes-readily-accessibl.patch b/root/target/linux/bcm27xx/patches-5.15/950-0568-drm-vc4-Make-VEC-progressive-modes-readily-accessibl.patch
new file mode 100644
index 00000000..6f94e8b2
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0568-drm-vc4-Make-VEC-progressive-modes-readily-accessibl.patch
@@ -0,0 +1,165 @@
+From 161777866b0d5e2af40ce15b6858693abbb32124 Mon Sep 17 00:00:00 2001
+From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
+Date: Thu, 15 Jul 2021 01:08:11 +0200
+Subject: [PATCH 568/828] drm/vc4: Make VEC progressive modes readily
+ accessible
+
+Add predefined modelines for the 240p (NTSC) and 288p (PAL) progressive
+modes, and report them through vc4_vec_connector_get_modes().
+
+Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_vec.c | 73 ++++++++++++++++++++++++++---------
+ 1 file changed, 55 insertions(+), 18 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_vec.c
++++ b/drivers/gpu/drm/vc4/vc4_vec.c
+@@ -245,7 +245,8 @@ enum vc4_vec_tv_mode_id {
+ };
+ 
+ struct vc4_vec_tv_mode {
+-	const struct drm_display_mode *mode;
++	const struct drm_display_mode *interlaced_mode;
++	const struct drm_display_mode *progressive_mode;
+ 	u32 config0;
+ 	u32 config1;
+ 	u32 custom_freq;
+@@ -279,61 +280,81 @@ static const struct debugfs_reg32 vec_re
+ };
+ 
+ static const struct drm_display_mode drm_mode_480i = {
+-	DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 13500,
++	DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 13500,
+ 		 720, 720 + 14, 720 + 14 + 64, 720 + 14 + 64 + 60, 0,
+ 		 480, 480 + 7, 480 + 7 + 6, 525, 0,
+ 		 DRM_MODE_FLAG_INTERLACE)
+ };
+ 
++static const struct drm_display_mode drm_mode_240p = {
++	DRM_MODE("720x240", DRM_MODE_TYPE_DRIVER, 13500,
++		 720, 720 + 14, 720 + 14 + 64, 720 + 14 + 64 + 60, 0,
++		 240, 240 + 3, 240 + 3 + 3, 262, 0, 0)
++};
++
+ static const struct drm_display_mode drm_mode_576i = {
+-	DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 13500,
++	DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 13500,
+ 		 720, 720 + 20, 720 + 20 + 64, 720 + 20 + 64 + 60, 0,
+ 		 576, 576 + 4, 576 + 4 + 6, 625, 0,
+ 		 DRM_MODE_FLAG_INTERLACE)
+ };
+ 
++static const struct drm_display_mode drm_mode_288p = {
++	DRM_MODE("720x288", DRM_MODE_TYPE_DRIVER, 13500,
++		 720, 720 + 20, 720 + 20 + 64, 720 + 20 + 64 + 60, 0,
++		 288, 288 + 2, 288 + 2 + 3, 312, 0, 0)
++};
++
+ static const struct vc4_vec_tv_mode vc4_vec_tv_modes[] = {
+ 	[VC4_VEC_TV_MODE_NTSC] = {
+-		.mode = &drm_mode_480i,
++		.interlaced_mode = &drm_mode_480i,
++		.progressive_mode = &drm_mode_240p,
+ 		.config0 = VEC_CONFIG0_NTSC_STD | VEC_CONFIG0_PDEN,
+ 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
+ 	},
+ 	[VC4_VEC_TV_MODE_NTSC_J] = {
+-		.mode = &drm_mode_480i,
++		.interlaced_mode = &drm_mode_480i,
++		.progressive_mode = &drm_mode_240p,
+ 		.config0 = VEC_CONFIG0_NTSC_STD,
+ 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
+ 	},
+ 	[VC4_VEC_TV_MODE_NTSC_443] = {
+ 		/* NTSC with PAL chroma frequency */
+-		.mode = &drm_mode_480i,
++		.interlaced_mode = &drm_mode_480i,
++		.progressive_mode = &drm_mode_240p,
+ 		.config0 = VEC_CONFIG0_NTSC_STD,
+ 		.config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ,
+ 		.custom_freq = 0x2a098acb,
+ 	},
+ 	[VC4_VEC_TV_MODE_PAL] = {
+-		.mode = &drm_mode_576i,
++		.interlaced_mode = &drm_mode_576i,
++		.progressive_mode = &drm_mode_288p,
+ 		.config0 = VEC_CONFIG0_PAL_BDGHI_STD,
+ 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
+ 	},
+ 	[VC4_VEC_TV_MODE_PAL_M] = {
+-		.mode = &drm_mode_480i,
++		.interlaced_mode = &drm_mode_480i,
++		.progressive_mode = &drm_mode_240p,
+ 		.config0 = VEC_CONFIG0_PAL_M_STD,
+ 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
+ 	},
+ 	[VC4_VEC_TV_MODE_PAL_N] = {
+-		.mode = &drm_mode_576i,
++		.interlaced_mode = &drm_mode_576i,
++		.progressive_mode = &drm_mode_288p,
+ 		.config0 = VEC_CONFIG0_PAL_N_STD,
+ 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
+ 	},
+ 	[VC4_VEC_TV_MODE_PAL60] = {
+ 		/* PAL-M with chroma frequency of regular PAL */
+-		.mode = &drm_mode_480i,
++		.interlaced_mode = &drm_mode_480i,
++		.progressive_mode = &drm_mode_240p,
+ 		.config0 = VEC_CONFIG0_PAL_M_STD,
+ 		.config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ,
+ 		.custom_freq = 0x2a098acb,
+ 	},
+ 	[VC4_VEC_TV_MODE_SECAM] = {
+-		.mode = &drm_mode_576i,
++		.interlaced_mode = &drm_mode_576i,
++		.progressive_mode = &drm_mode_288p,
+ 		.config0 = VEC_CONFIG0_SECAM_STD,
+ 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
+ 		.custom_freq = 0x29c71c72,
+@@ -393,16 +414,32 @@ static void vc4_vec_connector_destroy(st
+ static int vc4_vec_connector_get_modes(struct drm_connector *connector)
+ {
+ 	struct drm_connector_state *state = connector->state;
+-	struct drm_display_mode *mode;
++	struct drm_display_mode *interlaced_mode, *progressive_mode;
+ 
+-	mode = drm_mode_duplicate(connector->dev,
+-				  vc4_vec_tv_modes[state->tv.mode].mode);
+-	if (!mode) {
++	interlaced_mode =
++		drm_mode_duplicate(connector->dev,
++				   vc4_vec_tv_modes[state->tv.mode].interlaced_mode);
++	progressive_mode =
++		drm_mode_duplicate(connector->dev,
++				   vc4_vec_tv_modes[state->tv.mode].progressive_mode);
++	if (!interlaced_mode || !progressive_mode) {
+ 		DRM_ERROR("Failed to create a new display mode\n");
++		drm_mode_destroy(connector->dev, interlaced_mode);
++		drm_mode_destroy(connector->dev, progressive_mode);
+ 		return -ENOMEM;
+ 	}
+ 
+-	drm_mode_probed_add(connector, mode);
++	if (connector->cmdline_mode.specified &&
++	    connector->cmdline_mode.refresh_specified &&
++	    !connector->cmdline_mode.interlace)
++		/* progressive mode set at boot, let's make it preferred */
++		progressive_mode->type |= DRM_MODE_TYPE_PREFERRED;
++	else
++		/* otherwise, interlaced mode is preferred */
++		interlaced_mode->type |= DRM_MODE_TYPE_PREFERRED;
++
++	drm_mode_probed_add(connector, interlaced_mode);
++	drm_mode_probed_add(connector, progressive_mode);
+ 
+ 	return 1;
+ }
+@@ -583,7 +620,7 @@ static int vc4_vec_encoder_atomic_check(
+ 					struct drm_connector_state *conn_state)
+ {
+ 	const struct drm_display_mode *reference_mode =
+-		vc4_vec_tv_modes[conn_state->tv.mode].mode;
++		vc4_vec_tv_modes[conn_state->tv.mode].interlaced_mode;
+ 
+ 	if (crtc_state->adjusted_mode.crtc_clock != reference_mode->clock ||
+ 	    crtc_state->adjusted_mode.crtc_htotal != reference_mode->htotal ||
diff --git a/root/target/linux/bcm27xx/patches-5.15/0600-bcm2835-v4l2-codec-Remove-advertised-support-of-VP8.patch b/root/target/linux/bcm27xx/patches-5.15/950-0569-bcm2835-v4l2-codec-Remove-advertised-support-of-VP8.patch
similarity index 64%
rename from root/target/linux/bcm27xx/patches-5.15/0600-bcm2835-v4l2-codec-Remove-advertised-support-of-VP8.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0569-bcm2835-v4l2-codec-Remove-advertised-support-of-VP8.patch
index 64171904..92ce068c 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0600-bcm2835-v4l2-codec-Remove-advertised-support-of-VP8.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0569-bcm2835-v4l2-codec-Remove-advertised-support-of-VP8.patch
@@ -1,7 +1,7 @@
-From 5b608b933eb3ff31d59df69d3077dea2a2737fc2 Mon Sep 17 00:00:00 2001
+From c722c4ed1854ad6b1390d5df35ee4f26e69314cb Mon Sep 17 00:00:00 2001
 From: Dom Cobley <popcornmix@gmail.com>
 Date: Sun, 31 Oct 2021 11:47:59 +0000
-Subject: [PATCH 600/634] bcm2835-v4l2-codec: Remove advertised support of VP8
+Subject: [PATCH 569/828] bcm2835-v4l2-codec: Remove advertised support of VP8
 
 The support for this format by firmware is very limited
 and won't be faster than the arm.
@@ -11,22 +11,17 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 5 -----
  1 file changed, 5 deletions(-)
 
-diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index e8452c82d088..351d693873ed 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -597,11 +597,6 @@ static const struct bcm2835_codec_fmt supported_formats[] = {
- 		.depth			= 0,
+@@ -598,11 +598,6 @@ static const struct bcm2835_codec_fmt su
  		.flags			= V4L2_FMT_FLAG_COMPRESSED,
  		.mmal_fmt		= MMAL_ENCODING_MP2V,
--	}, {
+ 	}, {
 -		.fourcc			= V4L2_PIX_FMT_VP8,
 -		.depth			= 0,
 -		.flags			= V4L2_FMT_FLAG_COMPRESSED,
 -		.mmal_fmt		= MMAL_ENCODING_VP8,
- 	}, {
+-	}, {
  		.fourcc			= V4L2_PIX_FMT_VC1_ANNEX_G,
  		.depth			= 0,
--- 
-2.33.1
-
+ 		.flags			= V4L2_FMT_FLAG_COMPRESSED,
diff --git a/root/target/linux/bcm27xx/patches-5.15/0601-ARM-dts-Rename-Zero-2-W-DT-files.patch b/root/target/linux/bcm27xx/patches-5.15/950-0570-ARM-dts-Rename-Zero-2-W-DT-files.patch
similarity index 93%
rename from root/target/linux/bcm27xx/patches-5.15/0601-ARM-dts-Rename-Zero-2-W-DT-files.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0570-ARM-dts-Rename-Zero-2-W-DT-files.patch
index e72dc4dd..f3826b4b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0601-ARM-dts-Rename-Zero-2-W-DT-files.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0570-ARM-dts-Rename-Zero-2-W-DT-files.patch
@@ -1,7 +1,7 @@
-From 19b22b562a133508c1e164eb0e6f4f92d857d98e Mon Sep 17 00:00:00 2001
+From 5e0dd8153053bb4a64fa8537c69828c731c3b930 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Mon, 1 Nov 2021 15:44:31 +0000
-Subject: [PATCH 601/634] ARM: dts: Rename Zero 2 W DT files
+Subject: [PATCH 570/828] ARM: dts: Rename Zero 2 W DT files
 
 Retain the old names for backwards compatibility for a while, while the
 necessary firmware change rolls out.
@@ -14,8 +14,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  3 files changed, 179 insertions(+), 177 deletions(-)
  create mode 100644 arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
 
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index b2a37ce7fa31..2669938ed507 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -8,6 +8,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
@@ -26,9 +24,6 @@ index b2a37ce7fa31..2669938ed507 100644
  	bcm2709-rpi-2-b.dtb \
  	bcm2710-rpi-2-b.dtb \
  	bcm2710-rpi-3-b.dtb \
-diff --git a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
-new file mode 100644
-index 000000000000..6d0f0c9aae0f
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
 @@ -0,0 +1,177 @@
@@ -209,8 +204,6 @@ index 000000000000..6d0f0c9aae0f
 +		act_led_trigger = <&act_led>,"linux,default-trigger";
 +	};
 +};
-diff --git a/arch/arm/boot/dts/bcm2710-rpi-zero-2.dts b/arch/arm/boot/dts/bcm2710-rpi-zero-2.dts
-index 42185a450666..daa12bd30d6b 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-zero-2.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2.dts
 @@ -1,177 +1 @@
@@ -392,6 +385,3 @@ index 42185a450666..daa12bd30d6b 100644
 -	};
 -};
 +#include "bcm2710-rpi-zero-2-w.dts"
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0602-brcmfmac-Don-t-promote-INFO-logging-to-ERR.patch b/root/target/linux/bcm27xx/patches-5.15/950-0571-brcmfmac-Don-t-promote-INFO-logging-to-ERR.patch
similarity index 71%
rename from root/target/linux/bcm27xx/patches-5.15/0602-brcmfmac-Don-t-promote-INFO-logging-to-ERR.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0571-brcmfmac-Don-t-promote-INFO-logging-to-ERR.patch
index f976aa32..17ca95d8 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0602-brcmfmac-Don-t-promote-INFO-logging-to-ERR.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0571-brcmfmac-Don-t-promote-INFO-logging-to-ERR.patch
@@ -1,7 +1,7 @@
-From d5de5d633d9deb60a9eedad349390af9cd729e59 Mon Sep 17 00:00:00 2001
+From 353bfe14daf21b9e388d5f643ec32e405c538b62 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Tue, 2 Nov 2021 11:13:42 +0000
-Subject: [PATCH 602/634] brcmfmac: Don't promote INFO logging to ERR
+Subject: [PATCH 571/828] brcmfmac: Don't promote INFO logging to ERR
 
 An unwanted side effect of enabling the BRCMDBG config setting is
 redefining brcmf_info to be brcmf_err. This can be alarming to users
@@ -14,11 +14,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
-index 9bb5f709d41a..ca49700cca50 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
-@@ -67,7 +67,12 @@ void __brcmf_err(struct brcmf_bus *bus, const char *func, const char *fmt, ...);
+@@ -67,7 +67,12 @@ void __brcmf_err(struct brcmf_bus *bus,
  #if defined(DEBUG) || defined(CONFIG_BRCM_TRACING)
  
  /* For debug/tracing purposes treat info messages as errors */
@@ -32,6 +30,3 @@ index 9bb5f709d41a..ca49700cca50 100644
  
  __printf(3, 4)
  void __brcmf_dbg(u32 level, const char *func, const char *fmt, ...);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0603-dtoverlays-Update-all-image-sensor-overlays-for-Medi.patch b/root/target/linux/bcm27xx/patches-5.15/950-0572-dtoverlays-Update-all-image-sensor-overlays-for-Medi.patch
similarity index 74%
rename from root/target/linux/bcm27xx/patches-5.15/0603-dtoverlays-Update-all-image-sensor-overlays-for-Medi.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0572-dtoverlays-Update-all-image-sensor-overlays-for-Medi.patch
index 2787e619..ce6c0f54 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0603-dtoverlays-Update-all-image-sensor-overlays-for-Medi.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0572-dtoverlays-Update-all-image-sensor-overlays-for-Medi.patch
@@ -1,7 +1,7 @@
-From 6f40a90e0bd155b679e9d5cdf1281ec83bd2bee2 Mon Sep 17 00:00:00 2001
+From 1a7e911483efd30a443e5c2fdcc68ca1447ffc15 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Thu, 21 Oct 2021 15:06:02 +0100
-Subject: [PATCH 603/634] dtoverlays: Update all image sensor overlays for
+Subject: [PATCH 572/828] dtoverlays: Update all image sensor overlays for
  Media Controller option
 
 Add an option to enable configuration via the Media Controller API
@@ -31,11 +31,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../boot/dts/overlays/tc358743-overlay.dts    |  8 ++++++
  11 files changed, 108 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 5064d8eb2040..1404de8444f2 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
-@@ -416,6 +416,8 @@ Info:   Analog Devices ADV7282M analogue video to CSI2 bridge.
+@@ -416,6 +416,8 @@ Info:   Analog Devices ADV7282M analogue
          variants.
  Load:   dtoverlay=adv7282m,<param>=<val>
  Params: addr                    Overrides the I2C address (default 0x21)
@@ -44,7 +42,7 @@ index 5064d8eb2040..1404de8444f2 100644
  
  
  Name:   adv728x-m
-@@ -426,6 +428,8 @@ Params: addr                    Overrides the I2C address (default 0x21)
+@@ -426,6 +428,8 @@ Params: addr                    Override
          adv7280m                Select ADV7280-M.
          adv7281m                Select ADV7281-M.
          adv7281ma               Select ADV7281-MA.
@@ -53,7 +51,7 @@ index 5064d8eb2040..1404de8444f2 100644
  
  
  Name:   akkordion-iqdacplus
-@@ -1708,6 +1712,8 @@ Params: rotation                Mounting rotation of the camera sensor (0 or
+@@ -1708,6 +1712,8 @@ Params: rotation                Mounting
                                  180, default 180)
          orientation             Sensor orientation (0 = front, 1 = rear,
                                  2 = external, default external)
@@ -62,7 +60,7 @@ index 5064d8eb2040..1404de8444f2 100644
  
  
  Name:   imx290
-@@ -1728,6 +1734,8 @@ Params: 4lane                   Enable 4 CSI2 lanes. This requires a Compute
+@@ -1728,6 +1734,8 @@ Params: 4lane                   Enable 4
                                  2 = external, default external)
          rotation                Mounting rotation of the camera sensor (0 or
                                  180, default 0)
@@ -71,7 +69,7 @@ index 5064d8eb2040..1404de8444f2 100644
  
  
  Name:   imx378
-@@ -1739,6 +1747,8 @@ Params: rotation                Mounting rotation of the camera sensor (0 or
+@@ -1739,6 +1747,8 @@ Params: rotation                Mounting
                                  180, default 180)
          orientation             Sensor orientation (0 = front, 1 = rear,
                                  2 = external, default external)
@@ -80,7 +78,7 @@ index 5064d8eb2040..1404de8444f2 100644
  
  
  Name:   imx477
-@@ -1750,6 +1760,8 @@ Params: rotation                Mounting rotation of the camera sensor (0 or
+@@ -1750,6 +1760,8 @@ Params: rotation                Mounting
                                  180, default 180)
          orientation             Sensor orientation (0 = front, 1 = rear,
                                  2 = external, default external)
@@ -89,7 +87,7 @@ index 5064d8eb2040..1404de8444f2 100644
  
  
  Name:   imx519
-@@ -1761,6 +1773,8 @@ Params: rotation                Mounting rotation of the camera sensor (0 or
+@@ -1761,6 +1773,8 @@ Params: rotation                Mounting
                                  180, default 0)
          orientation             Sensor orientation (0 = front, 1 = rear,
                                  2 = external, default external)
@@ -110,7 +108,7 @@ index 5064d8eb2040..1404de8444f2 100644
  
  
  Name:   jedec-spi-nor
-@@ -2237,6 +2252,8 @@ Params: rotation                Mounting rotation of the camera sensor (0 or
+@@ -2237,6 +2252,8 @@ Params: rotation                Mounting
                                  180, default 0)
          orientation             Sensor orientation (0 = front, 1 = rear,
                                  2 = external, default external)
@@ -119,7 +117,7 @@ index 5064d8eb2040..1404de8444f2 100644
  
  
  Name:   ov7251
-@@ -2248,6 +2265,8 @@ Params: rotation                Mounting rotation of the camera sensor (0 or
+@@ -2248,6 +2265,8 @@ Params: rotation                Mounting
                                  180, default 0)
          orientation             Sensor orientation (0 = front, 1 = rear,
                                  2 = external, default external)
@@ -128,7 +126,7 @@ index 5064d8eb2040..1404de8444f2 100644
  
  
  Name:   ov9281
-@@ -2259,6 +2278,8 @@ Params: rotation                Mounting rotation of the camera sensor (0 or
+@@ -2259,6 +2278,8 @@ Params: rotation                Mounting
                                  180, default 0)
          orientation             Sensor orientation (0 = front, 1 = rear,
                                  2 = external, default external)
@@ -137,7 +135,7 @@ index 5064d8eb2040..1404de8444f2 100644
  
  
  Name:   papirus
-@@ -3239,6 +3260,8 @@ Params: 4lane                   Use 4 lanes (only applicable to Compute Modules
+@@ -3239,6 +3260,8 @@ Params: 4lane                   Use 4 la
          link-frequency          Set the link frequency. Only values of 297000000
                                  (574Mbit/s) and 486000000 (972Mbit/s - default)
                                  are supported by the driver.
@@ -146,11 +144,9 @@ index 5064d8eb2040..1404de8444f2 100644
  
  
  Name:   tc358743-audio
-diff --git a/arch/arm/boot/dts/overlays/adv7282m-overlay.dts b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts
-index 5d85dfd0595c..f7e97c4a13d8 100644
 --- a/arch/arm/boot/dts/overlays/adv7282m-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts
-@@ -59,7 +59,15 @@ __overlay__ {
+@@ -59,7 +59,15 @@
  		};
  	};
  
@@ -166,11 +162,9 @@ index 5d85dfd0595c..f7e97c4a13d8 100644
 +		media-controller = <0>,"=4";
  	};
  };
-diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts
-index 0c065bf09f54..5b5ba70aff7f 100644
 --- a/arch/arm/boot/dts/overlays/imx219-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts
-@@ -108,8 +108,16 @@ __overlay__ {
+@@ -108,8 +108,16 @@
  		};
  	};
  
@@ -187,11 +181,9 @@ index 0c065bf09f54..5b5ba70aff7f 100644
 +		media-controller = <0>,"=6";
  	};
  };
-diff --git a/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
-index d4a5ed6dbbcf..2696daed523c 100644
 --- a/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
 +++ b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
-@@ -134,11 +134,19 @@ __dormant__ {
+@@ -134,11 +134,19 @@
  		};
  	};
  
@@ -211,11 +203,9 @@ index d4a5ed6dbbcf..2696daed523c 100644
 +		media-controller = <0>,"=10";
  	};
  };
-diff --git a/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
-index bb9a9acdbbd7..d785e6cb5d82 100644
 --- a/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
 +++ b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
-@@ -103,8 +103,16 @@ __overlay__ {
+@@ -103,8 +103,16 @@
  		};
  	};
  
@@ -232,11 +222,9 @@ index bb9a9acdbbd7..d785e6cb5d82 100644
 +		media-controller = <0>,"=6";
  	};
  };
-diff --git a/arch/arm/boot/dts/overlays/imx519-overlay.dts b/arch/arm/boot/dts/overlays/imx519-overlay.dts
-index 693c267af1f0..b8593a980bbf 100644
 --- a/arch/arm/boot/dts/overlays/imx519-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/imx519-overlay.dts
-@@ -108,8 +108,16 @@ __overlay__ {
+@@ -108,8 +108,16 @@
  		};
  	};
  
@@ -253,11 +241,9 @@ index 693c267af1f0..b8593a980bbf 100644
 +		media-controller = <0>,"=6";
  	};
  };
-diff --git a/arch/arm/boot/dts/overlays/irs1125-overlay.dts b/arch/arm/boot/dts/overlays/irs1125-overlay.dts
-index e926e18e71fc..065569830ded 100644
 --- a/arch/arm/boot/dts/overlays/irs1125-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts
-@@ -82,4 +82,15 @@ irs1125_clk: camera-clk {
+@@ -82,4 +82,15 @@
  			};
  		};
  	};
@@ -273,11 +259,9 @@ index e926e18e71fc..065569830ded 100644
 +		media-controller = <0>,"=6";
 +	};
  };
-diff --git a/arch/arm/boot/dts/overlays/ov5647-overlay.dts b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
-index d7ed4703c9b0..f57b25c38794 100644
 --- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
-@@ -87,8 +87,16 @@ ov5647_clk: camera-clk {
+@@ -87,8 +87,16 @@
  		};
  	};
  
@@ -294,11 +278,9 @@ index d7ed4703c9b0..f57b25c38794 100644
 +		media-controller = <0>,"=6";
  	};
  };
-diff --git a/arch/arm/boot/dts/overlays/ov7251-overlay.dts b/arch/arm/boot/dts/overlays/ov7251-overlay.dts
-index 09dbeda39d06..6fe652fe011b 100644
 --- a/arch/arm/boot/dts/overlays/ov7251-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/ov7251-overlay.dts
-@@ -106,8 +106,16 @@ __overlay__ {
+@@ -106,8 +106,16 @@
  		};
  	};
  
@@ -315,11 +297,9 @@ index 09dbeda39d06..6fe652fe011b 100644
 +		media-controller = <0>,"=6";
  	};
  };
-diff --git a/arch/arm/boot/dts/overlays/ov9281-overlay.dts b/arch/arm/boot/dts/overlays/ov9281-overlay.dts
-index 277236c03358..b2b9a47c6d27 100644
 --- a/arch/arm/boot/dts/overlays/ov9281-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/ov9281-overlay.dts
-@@ -106,8 +106,16 @@ __overlay__ {
+@@ -106,8 +106,16 @@
  		};
  	};
  
@@ -336,11 +316,9 @@ index 277236c03358..b2b9a47c6d27 100644
 +		media-controller = <0>,"=6";
  	};
  };
-diff --git a/arch/arm/boot/dts/overlays/tc358743-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
-index a1f8af36d2e7..d679d9ba84b6 100644
 --- a/arch/arm/boot/dts/overlays/tc358743-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
-@@ -100,8 +100,16 @@ __dormant__ {
+@@ -100,8 +100,16 @@
  		};
  	};
  
@@ -357,6 +335,3 @@ index a1f8af36d2e7..d679d9ba84b6 100644
 +		media-controller = <0>,"=9";
  	};
  };
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0604-ARM-dt-Add-DT-nodes-for-the-WLAN-interfaces.patch b/root/target/linux/bcm27xx/patches-5.15/950-0573-ARM-dt-Add-DT-nodes-for-the-WLAN-interfaces.patch
similarity index 67%
rename from root/target/linux/bcm27xx/patches-5.15/0604-ARM-dt-Add-DT-nodes-for-the-WLAN-interfaces.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0573-ARM-dt-Add-DT-nodes-for-the-WLAN-interfaces.patch
index fd85188f..e2b726c7 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0604-ARM-dt-Add-DT-nodes-for-the-WLAN-interfaces.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0573-ARM-dt-Add-DT-nodes-for-the-WLAN-interfaces.patch
@@ -1,7 +1,7 @@
-From 91e18cfeae484e4be2f8f2d6b983ff7275096c58 Mon Sep 17 00:00:00 2001
+From 4985a5a3f9c0d4b1b68ac08aa13e754b0a57903d Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Tue, 26 Oct 2021 16:38:44 +0100
-Subject: [PATCH 604/634] ARM: dt: Add DT nodes for the WLAN interfaces
+Subject: [PATCH 573/828] ARM: dt: Add DT nodes for the WLAN interfaces
 
 Mirror upstream changes into the downstream dts files.
 
@@ -13,11 +13,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts | 7 +++++++
  4 files changed, 28 insertions(+)
 
-diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-index 75a5b41514f9..63faf4986987 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-@@ -83,6 +83,13 @@ &mmcnr {
+@@ -83,6 +83,13 @@
  	pinctrl-0 = <&sdio_pins>;
  	bus-width = <4>;
  	status = "okay";
@@ -31,11 +29,9 @@ index 75a5b41514f9..63faf4986987 100644
  };
  
  &uart0 {
-diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-index 7e12c05cc28b..a1b169e554ba 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-@@ -84,6 +84,13 @@ &mmcnr {
+@@ -84,6 +84,13 @@
  	pinctrl-0 = <&sdio_pins>;
  	bus-width = <4>;
  	status = "okay";
@@ -49,11 +45,9 @@ index 7e12c05cc28b..a1b169e554ba 100644
  };
  
  &firmware {
-diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-index d40722ddc286..5cfb9ad76ca9 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-@@ -84,6 +84,13 @@ &mmcnr {
+@@ -84,6 +84,13 @@
  	pinctrl-0 = <&sdio_pins>;
  	bus-width = <4>;
  	status = "okay";
@@ -67,11 +61,9 @@ index d40722ddc286..5cfb9ad76ca9 100644
  };
  
  &soc {
-diff --git a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
-index 6d0f0c9aae0f..2bd223a405a7 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
-@@ -83,6 +83,13 @@ &mmcnr {
+@@ -83,6 +83,13 @@
  	pinctrl-0 = <&sdio_pins>;
  	bus-width = <4>;
  	status = "okay";
@@ -85,6 +77,3 @@ index 6d0f0c9aae0f..2bd223a405a7 100644
  };
  
  &uart0 {
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0606-brcmfmac-Read-alternative-firmware-names-from-DT.patch b/root/target/linux/bcm27xx/patches-5.15/950-0574-brcmfmac-Read-alternative-firmware-names-from-DT.patch
similarity index 80%
rename from root/target/linux/bcm27xx/patches-5.15/0606-brcmfmac-Read-alternative-firmware-names-from-DT.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0574-brcmfmac-Read-alternative-firmware-names-from-DT.patch
index 506e780e..387f2d0e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0606-brcmfmac-Read-alternative-firmware-names-from-DT.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0574-brcmfmac-Read-alternative-firmware-names-from-DT.patch
@@ -1,7 +1,7 @@
-From 485f2eeb2db7eb7e969f5bb578416b7418d942a7 Mon Sep 17 00:00:00 2001
+From b44ced9d0a8578733cbafa1e1172c8d8af9ba198 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Thu, 28 Oct 2021 15:03:16 +0100
-Subject: [PATCH 606/634] brcmfmac: Read alternative firmware names from DT
+Subject: [PATCH 574/828] brcmfmac: Read alternative firmware names from DT
 
 Add the ability to load the names of alternative firmwares from the
 Device Tree node. This permits separate firmwares for 43436s and 43438
@@ -14,8 +14,6 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  .../broadcom/brcm80211/brcmfmac/sdio.c        | 47 +++++++++++++++++--
  3 files changed, 87 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
-index 2f7bc3a70c65..c2d6b8a22858 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
 @@ -10,6 +10,7 @@
@@ -26,7 +24,7 @@ index 2f7bc3a70c65..c2d6b8a22858 100644
  #include "of.h"
  
  static int brcmf_of_get_country_codes(struct device *dev,
-@@ -118,3 +119,38 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,
+@@ -118,3 +119,38 @@ void brcmf_of_probe(struct device *dev,
  	sdio->oob_irq_nr = irq;
  	sdio->oob_irq_flags = irqf;
  }
@@ -65,8 +63,6 @@ index 2f7bc3a70c65..c2d6b8a22858 100644
 +
 +	return count ? fwnames : NULL;
 +}
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h
-index 10bf52253337..5b39a39812d0 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h
 @@ -5,9 +5,16 @@
@@ -86,8 +82,6 @@ index 10bf52253337..5b39a39812d0 100644
 +	return NULL;
 +}
  #endif /* CONFIG_OF */
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-index 6bcaa402a356..5b7118da6ed1 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 @@ -35,6 +35,7 @@
@@ -98,7 +92,7 @@ index 6bcaa402a356..5b7118da6ed1 100644
  
  #define DCMD_RESP_TIMEOUT	msecs_to_jiffies(2500)
  #define CTL_DONE_TIMEOUT	msecs_to_jiffies(2500)
-@@ -635,7 +636,7 @@ MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.*.txt");
+@@ -634,7 +635,7 @@ MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "b
  /* per-board firmware binaries */
  MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.bin");
  
@@ -107,7 +101,7 @@ index 6bcaa402a356..5b7118da6ed1 100644
  	BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
  	BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x0000001F, 43241B0),
  	BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x00000020, 43241B4),
-@@ -661,6 +662,9 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
+@@ -660,6 +661,9 @@ static const struct brcmf_firmware_mappi
  	BRCMF_FW_ENTRY(CY_CC_43752_CHIP_ID, 0xFFFFFFFF, 43752)
  };
  
@@ -117,7 +111,7 @@ index 6bcaa402a356..5b7118da6ed1 100644
  #define TXCTL_CREDITS	2
  
  static void pkt_align(struct sk_buff *p, int len, int align)
-@@ -4152,7 +4156,7 @@ int brcmf_sdio_get_fwname(struct device *dev, const char *ext, u8 *fw_name,
+@@ -4151,7 +4155,7 @@ int brcmf_sdio_get_fwname(struct device
  	}
  	fwreq = brcmf_fw_alloc_request(bus_if->chip, bus_if->chiprev,
  				       brcmf_sdio_fwnames,
@@ -126,7 +120,7 @@ index 6bcaa402a356..5b7118da6ed1 100644
  				       fwnames, ARRAY_SIZE(fwnames));
  	if (!fwreq)
  		return -ENOMEM;
-@@ -4208,6 +4212,9 @@ static const struct brcmf_bus_ops brcmf_sdio_bus_ops = {
+@@ -4207,6 +4211,9 @@ static const struct brcmf_bus_ops brcmf_
  #define BRCMF_SDIO_FW_CODE	0
  #define BRCMF_SDIO_FW_NVRAM	1
  
@@ -136,7 +130,7 @@ index 6bcaa402a356..5b7118da6ed1 100644
  static void brcmf_sdio_firmware_callback(struct device *dev, int err,
  					 struct brcmf_fw_request *fwreq)
  {
-@@ -4223,6 +4230,22 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
+@@ -4222,6 +4229,22 @@ static void brcmf_sdio_firmware_callback
  
  	brcmf_dbg(TRACE, "Enter: dev=%s, err=%d\n", dev_name(dev), err);
  
@@ -159,7 +153,7 @@ index 6bcaa402a356..5b7118da6ed1 100644
  	if (err)
  		goto fail;
  
-@@ -4431,7 +4454,7 @@ brcmf_sdio_prepare_fw_request(struct brcmf_sdio *bus)
+@@ -4430,7 +4453,7 @@ brcmf_sdio_prepare_fw_request(struct brc
  
  	fwreq = brcmf_fw_alloc_request(bus->ci->chip, bus->ci->chiprev,
  				       brcmf_sdio_fwnames,
@@ -168,7 +162,7 @@ index 6bcaa402a356..5b7118da6ed1 100644
  				       fwnames, ARRAY_SIZE(fwnames));
  	if (!fwreq)
  		return NULL;
-@@ -4449,6 +4472,9 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)
+@@ -4448,6 +4471,9 @@ struct brcmf_sdio *brcmf_sdio_probe(stru
  	struct brcmf_sdio *bus;
  	struct workqueue_struct *wq;
  	struct brcmf_fw_request *fwreq;
@@ -178,7 +172,7 @@ index 6bcaa402a356..5b7118da6ed1 100644
  
  	brcmf_dbg(TRACE, "Enter\n");
  
-@@ -4531,6 +4557,21 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)
+@@ -4530,6 +4556,21 @@ struct brcmf_sdio *brcmf_sdio_probe(stru
  
  	brcmf_dbg(INFO, "completed!!\n");
  
@@ -200,6 +194,3 @@ index 6bcaa402a356..5b7118da6ed1 100644
  	fwreq = brcmf_sdio_prepare_fw_request(bus);
  	if (!fwreq) {
  		ret = -ENOMEM;
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0607-ARM-dts-Provide-WLAN-firmware-names-for-Zero-2-W.patch b/root/target/linux/bcm27xx/patches-5.15/950-0575-ARM-dts-Provide-WLAN-firmware-names-for-Zero-2-W.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0607-ARM-dts-Provide-WLAN-firmware-names-for-Zero-2-W.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0575-ARM-dts-Provide-WLAN-firmware-names-for-Zero-2-W.patch
index 2bb0ca94..2a185180 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0607-ARM-dts-Provide-WLAN-firmware-names-for-Zero-2-W.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0575-ARM-dts-Provide-WLAN-firmware-names-for-Zero-2-W.patch
@@ -1,7 +1,7 @@
-From f91f34c091eeede5f57c691e4bbaa6fe9d1d6dce Mon Sep 17 00:00:00 2001
+From cee0cb003202fb389278d103bbdaaf0e0a65240a Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Thu, 28 Oct 2021 15:09:25 +0100
-Subject: [PATCH 607/634] ARM: dts: Provide WLAN firmware names for Zero 2 W
+Subject: [PATCH 575/828] ARM: dts: Provide WLAN firmware names for Zero 2 W
 
 BCM43430/2 may be BCM43430B0 or BCM43436P, and BCM43430/1 can be either
 BCM43430A1 or BCM43436S, the former being upstream names and the
@@ -16,11 +16,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
-diff --git a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
-index 2bd223a405a7..1cd3d01a166d 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
-@@ -89,6 +89,19 @@ &mmcnr {
+@@ -89,6 +89,19 @@
  	brcmf: wifi@1 {
  		reg = <1>;
  		compatible = "brcm,bcm4329-fmac";
@@ -40,6 +38,3 @@ index 2bd223a405a7..1cd3d01a166d 100644
  	};
  };
  
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0608-drm-Check-whether-the-gamma-lut-has-changed-before-u.patch b/root/target/linux/bcm27xx/patches-5.15/950-0576-drm-Check-whether-the-gamma-lut-has-changed-before-u.patch
similarity index 77%
rename from root/target/linux/bcm27xx/patches-5.15/0608-drm-Check-whether-the-gamma-lut-has-changed-before-u.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0576-drm-Check-whether-the-gamma-lut-has-changed-before-u.patch
index d4f6200b..2d39419b 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0608-drm-Check-whether-the-gamma-lut-has-changed-before-u.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0576-drm-Check-whether-the-gamma-lut-has-changed-before-u.patch
@@ -1,7 +1,7 @@
-From 5a0eabcd71b96c268aef62618a9e4cf2a1335a74 Mon Sep 17 00:00:00 2001
+From 4cee5128e4bbf68b25d2bb2d90070dec35f45bfb Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Tue, 2 Nov 2021 16:01:36 +0000
-Subject: [PATCH 608/634] drm: Check whether the gamma lut has changed before
+Subject: [PATCH 576/828] drm: Check whether the gamma lut has changed before
  updating
 
 drm_crtc_legacy_gamma_set updates the gamma_lut blob unconditionally,
@@ -15,11 +15,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/gpu/drm/drm_color_mgmt.c | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c
-index bb14f488c8f6..f99b77d15dac 100644
 --- a/drivers/gpu/drm/drm_color_mgmt.c
 +++ b/drivers/gpu/drm/drm_color_mgmt.c
-@@ -326,8 +326,12 @@ static int drm_crtc_legacy_gamma_set(struct drm_crtc *crtc,
+@@ -326,8 +326,12 @@ 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);
@@ -33,6 +31,3 @@ index bb14f488c8f6..f99b77d15dac 100644
  	crtc_state->color_mgmt_changed |= replaced;
  
  	ret = drm_atomic_commit(state);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0609-brcmfmac-Protect-against-reprobing.patch b/root/target/linux/bcm27xx/patches-5.15/950-0577-brcmfmac-Protect-against-reprobing.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0609-brcmfmac-Protect-against-reprobing.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0577-brcmfmac-Protect-against-reprobing.patch
index 0994485e..d4fa2382 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0609-brcmfmac-Protect-against-reprobing.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0577-brcmfmac-Protect-against-reprobing.patch
@@ -1,7 +1,7 @@
-From 8d9288ebfb3c1c5935ca1aac24ccee62559eab92 Mon Sep 17 00:00:00 2001
+From 6b062fd9e25f964f44157e427213114d0734f693 Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Wed, 3 Nov 2021 11:53:13 +0000
-Subject: [PATCH 609/634] brcmfmac: Protect against reprobing
+Subject: [PATCH 577/828] brcmfmac: Protect against reprobing
 
 It is important to reinitialise the firmware array pointers to protect
 against the case that the brcmfmac driver is reprobed without first
@@ -15,11 +15,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-index 5b7118da6ed1..41a6509b5dc1 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-@@ -662,8 +662,8 @@ static const struct brcmf_firmware_mapping sdio_fwnames[] = {
+@@ -661,8 +661,8 @@ static const struct brcmf_firmware_mappi
  	BRCMF_FW_ENTRY(CY_CC_43752_CHIP_ID, 0xFFFFFFFF, 43752)
  };
  
@@ -30,7 +28,7 @@ index 5b7118da6ed1..41a6509b5dc1 100644
  
  #define TXCTL_CREDITS	2
  
-@@ -4557,6 +4557,8 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)
+@@ -4556,6 +4556,8 @@ struct brcmf_sdio *brcmf_sdio_probe(stru
  
  	brcmf_dbg(INFO, "completed!!\n");
  
@@ -39,6 +37,3 @@ index 5b7118da6ed1..41a6509b5dc1 100644
  	of_fwnames = brcmf_of_fwnames(sdiodev->dev, &of_fw_count);
  	if (of_fwnames)
  		fwnames = devm_kcalloc(sdiodev->dev,
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0578-drm-vc4-kms-Fix-return-code-check.patch b/root/target/linux/bcm27xx/patches-5.15/950-0578-drm-vc4-kms-Fix-return-code-check.patch
new file mode 100644
index 00000000..291c4d71
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0578-drm-vc4-kms-Fix-return-code-check.patch
@@ -0,0 +1,42 @@
+From f3939e4c4a61e89153018e734245fdff2c8614b8 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Wed, 20 Oct 2021 13:31:22 +0200
+Subject: [PATCH 578/828] drm/vc4: kms: Fix return code check
+
+The HVS global state functions return an error pointer, but in most
+cases we check if it's NULL, possibly resulting in an invalid pointer
+dereference.
+
+Fixes: 9ec03d7f1ed3 ("drm/vc4: kms: Wait on previous FIFO users before a commit")
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_kms.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -352,11 +352,11 @@ static void vc4_atomic_commit_tail(struc
+ 	int i;
+ 
+ 	old_hvs_state = vc4_hvs_get_old_global_state(state);
+-	if (WARN_ON(!old_hvs_state))
++	if (WARN_ON(IS_ERR(old_hvs_state)))
+ 		return;
+ 
+ 	new_hvs_state = vc4_hvs_get_new_global_state(state);
+-	if (WARN_ON(!new_hvs_state))
++	if (WARN_ON(IS_ERR(new_hvs_state)))
+ 		return;
+ 
+ 	for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
+@@ -891,8 +891,8 @@ vc4_core_clock_atomic_check(struct drm_a
+ 	load_state = to_vc4_load_tracker_state(priv_state);
+ 
+ 	hvs_new_state = vc4_hvs_get_global_state(state);
+-	if (!hvs_new_state)
+-		return -EINVAL;
++	if (IS_ERR(hvs_new_state))
++		return PTR_ERR(hvs_new_state);
+ 
+ 	for_each_oldnew_crtc_in_state(state, crtc,
+ 				      old_crtc_state,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0579-drm-vc4-kms-Move-clock-request-to-our-HVS-state.patch b/root/target/linux/bcm27xx/patches-5.15/950-0579-drm-vc4-kms-Move-clock-request-to-our-HVS-state.patch
new file mode 100644
index 00000000..16ded09c
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0579-drm-vc4-kms-Move-clock-request-to-our-HVS-state.patch
@@ -0,0 +1,59 @@
+From d9872eb7806723266a9766896b1d4d97689f402d Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Thu, 4 Nov 2021 14:04:37 +0100
+Subject: [PATCH 579/828] drm/vc4: kms: Move clock request to our HVS state
+
+Our current clock request has been stored so far on the main HVS
+structure, but even though we shouldn't have two commits in parallel and
+it shouldn't cause any functional change, the request itself is linked
+to a given HVS state.
+
+Move the request there to make a bit more sense.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_drv.h | 1 -
+ drivers/gpu/drm/vc4/vc4_kms.c | 8 +++++---
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_drv.h
++++ b/drivers/gpu/drm/vc4/vc4_drv.h
+@@ -326,7 +326,6 @@ struct vc4_hvs {
+ 	u32 __iomem *dlist;
+ 
+ 	struct clk *core_clk;
+-	struct clk_request *core_req;
+ 
+ 	/* Memory manager for CRTCs to allocate space in the display
+ 	 * list.  Units are dwords.
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -40,6 +40,7 @@ static struct vc4_ctm_state *to_vc4_ctm_
+ struct vc4_hvs_state {
+ 	struct drm_private_state base;
+ 	unsigned long core_clock_rate;
++	struct clk_request *core_req;
+ 
+ 	struct {
+ 		unsigned in_use: 1;
+@@ -398,7 +399,8 @@ static void vc4_atomic_commit_tail(struc
+ 		 * And remove the previous one based on the HVS
+ 		 * requirements if any.
+ 		 */
+-               clk_request_done(hvs->core_req);
++		clk_request_done(old_hvs_state->core_req);
++		old_hvs_state->core_req = NULL;
+ 	}
+ 
+ 	drm_atomic_helper_commit_modeset_disables(dev, state);
+@@ -432,8 +434,8 @@ static void vc4_atomic_commit_tail(struc
+ 		 * Request a clock rate based on the current HVS
+ 		 * requirements.
+ 		 */
+-		hvs->core_req = clk_request_start(hvs->core_clk,
+-						  new_hvs_state->core_clock_rate);
++		new_hvs_state->core_req = clk_request_start(hvs->core_clk,
++							    new_hvs_state->core_clock_rate);
+ 
+ 		/* And drop the temporary request */
+ 		clk_request_done(core_req);
diff --git a/root/target/linux/bcm27xx/patches-5.15/0616-overlays-Add-fbtft-overlay.patch b/root/target/linux/bcm27xx/patches-5.15/950-0580-overlays-Add-fbtft-overlay.patch
similarity index 97%
rename from root/target/linux/bcm27xx/patches-5.15/0616-overlays-Add-fbtft-overlay.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0580-overlays-Add-fbtft-overlay.patch
index ab6cd463..21598b82 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0616-overlays-Add-fbtft-overlay.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0580-overlays-Add-fbtft-overlay.patch
@@ -1,7 +1,7 @@
-From f4ba882f4371df08a1e20e1afafd827d71bbbebb Mon Sep 17 00:00:00 2001
+From 32ba48d8474b110c6ec2d82fc12bc99dc9992a38 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
 Date: Wed, 3 Nov 2021 12:21:14 +0100
-Subject: [PATCH 616/634] overlays: Add fbtft overlay
+Subject: [PATCH 580/828] overlays: Add fbtft overlay
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -16,8 +16,6 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  3 files changed, 736 insertions(+)
  create mode 100644 arch/arm/boot/dts/overlays/fbtft-overlay.dts
 
-diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index b36c618b01d0..a6b0d9ea0385 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -49,6 +49,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -28,11 +26,9 @@ index b36c618b01d0..a6b0d9ea0385 100644
  	fe-pi-audio.dtbo \
  	fsm-demo.dtbo \
  	ghost-amp.dtbo \
-diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 1404de8444f2..9ad2ed3b3b7e 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
-@@ -857,6 +857,130 @@ Params: interrupt               GPIO used for interrupt (default 4)
+@@ -857,6 +857,130 @@ Params: interrupt               GPIO use
          swapxy                  Touchscreen swapped x y axis
  
  
@@ -163,9 +159,6 @@ index 1404de8444f2..9ad2ed3b3b7e 100644
  Name:   fe-pi-audio
  Info:   Configures the Fe-Pi Audio Sound Card
  Load:   dtoverlay=fe-pi-audio
-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 @@
@@ -780,6 +773,3 @@ index 000000000000..db45f8c53bcc
 +				<&display>, "led-gpios:8=0"; /* GPIO_ACTIVE_HIGH */
 +	};
 +};
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0622-overlays-Additional-parameters-for-gpio-poweroff.patch b/root/target/linux/bcm27xx/patches-5.15/950-0581-overlays-Additional-parameters-for-gpio-poweroff.patch
similarity index 76%
rename from root/target/linux/bcm27xx/patches-5.15/0622-overlays-Additional-parameters-for-gpio-poweroff.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0581-overlays-Additional-parameters-for-gpio-poweroff.patch
index 1e0330fc..031c7061 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0622-overlays-Additional-parameters-for-gpio-poweroff.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0581-overlays-Additional-parameters-for-gpio-poweroff.patch
@@ -1,7 +1,7 @@
-From a92c34bad664c1fe07f04927d618842f7e45dffc Mon Sep 17 00:00:00 2001
+From 33b889a272dcc25179b70900dabadabc6aa7370f Mon Sep 17 00:00:00 2001
 From: Phil Elwell <phil@raspberrypi.com>
 Date: Thu, 11 Nov 2021 10:24:02 +0000
-Subject: [PATCH 622/634] overlays: Additional parameters for gpio-poweroff
+Subject: [PATCH 581/828] overlays: Additional parameters for gpio-poweroff
 
 The gpio-poweroff driver supports active-delay-ms and inactive-delay-ms
 properties. Add parameters to set these parameters - active_delay_ms
@@ -15,11 +15,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts | 2 ++
  2 files changed, 9 insertions(+)
 
-diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 9ad2ed3b3b7e..8e4939377c40 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
-@@ -1155,6 +1155,11 @@ Info:   Drives a GPIO high or low on poweroff (including halt). Using this
+@@ -1155,6 +1155,11 @@ Info:   Drives a GPIO high or low on pow
          or reboot). This also disables the ability to trigger a boot by driving
          GPIO3 low.
  
@@ -31,7 +29,7 @@ index 9ad2ed3b3b7e..8e4939377c40 100644
          Users of this overlay are required to provide an external mechanism to
          switch off the power supply when signalled - failure to do so results
          in a kernel BUG, increased power consumption and undefined behaviour.
-@@ -1170,6 +1175,8 @@ Params: gpiopin                 GPIO for signalling (default 26)
+@@ -1170,6 +1175,8 @@ Params: gpiopin                 GPIO for
          input                   Set if the gpio pin should be configured as
                                  an input.
          export                  Set to export the configured pin to sysfs
@@ -40,11 +38,9 @@ index 9ad2ed3b3b7e..8e4939377c40 100644
          timeout_ms              Specify (in ms) how long the kernel waits for
                                  power-down before issuing a WARN (default 3000).
  
-diff --git a/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts
-index 416aa2bc797a..8153f83f0427 100644
 --- a/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts
-@@ -33,5 +33,7 @@ __overrides__ {
+@@ -33,5 +33,7 @@
  		input =         <&power_ctrl>,"input?";
  		export =        <&power_ctrl>,"export?";
  		timeout_ms =    <&power_ctrl>,"timeout-ms:0";
@@ -52,6 +48,3 @@ index 416aa2bc797a..8153f83f0427 100644
 +		inactive_delay_ms = <&power_ctrl>,"inactive-delay-ms:0";
  	};
  };
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/0624-drm-Fix-double-free-from-checking-if-gamma-lut-has-b.patch b/root/target/linux/bcm27xx/patches-5.15/950-0582-drm-Fix-double-free-from-checking-if-gamma-lut-has-b.patch
similarity index 71%
rename from root/target/linux/bcm27xx/patches-5.15/0624-drm-Fix-double-free-from-checking-if-gamma-lut-has-b.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0582-drm-Fix-double-free-from-checking-if-gamma-lut-has-b.patch
index 195715f8..c779a515 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0624-drm-Fix-double-free-from-checking-if-gamma-lut-has-b.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0582-drm-Fix-double-free-from-checking-if-gamma-lut-has-b.patch
@@ -1,7 +1,7 @@
-From 879dbb3bcb1c25a6938806c99dc8bd49fd8462af Mon Sep 17 00:00:00 2001
+From 58dbcf5b82b3cc5202b1319d140ea79c32f7cc5e Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Mon, 8 Nov 2021 13:55:15 +0000
-Subject: [PATCH 624/634] drm: Fix double free from checking if gamma lut has
+Subject: [PATCH 582/828] drm: Fix double free from checking if gamma lut has
  been updated
 
 The code falls through to "fail" under all conditions, so there is no
@@ -13,11 +13,9 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  drivers/gpu/drm/drm_color_mgmt.c | 2 --
  1 file changed, 2 deletions(-)
 
-diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c
-index f99b77d15dac..da282e7454a8 100644
 --- a/drivers/gpu/drm/drm_color_mgmt.c
 +++ b/drivers/gpu/drm/drm_color_mgmt.c
-@@ -330,8 +330,6 @@ static int drm_crtc_legacy_gamma_set(struct drm_crtc *crtc,
+@@ -330,8 +330,6 @@ static int drm_crtc_legacy_gamma_set(str
  	    memcmp(crtc_state->gamma_lut->data, blob_data, blob->length))
  		replaced |= drm_property_replace_blob(&crtc_state->gamma_lut,
  					      use_gamma_lut ? blob : NULL);
@@ -26,6 +24,3 @@ index f99b77d15dac..da282e7454a8 100644
  	crtc_state->color_mgmt_changed |= replaced;
  
  	ret = drm_atomic_commit(state);
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0583-drm-vc4-Enable-gamma-block-only-when-required.patch b/root/target/linux/bcm27xx/patches-5.15/950-0583-drm-vc4-Enable-gamma-block-only-when-required.patch
new file mode 100644
index 00000000..f9f0fbae
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0583-drm-vc4-Enable-gamma-block-only-when-required.patch
@@ -0,0 +1,66 @@
+From c5448bd5d2bf9ad8743c65b6abf19f770055392e Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 8 Nov 2021 17:32:45 +0000
+Subject: [PATCH 583/828] drm/vc4: Enable gamma block only when required.
+
+With HVS5 the gamma block is now only reprogrammed with
+a disable/enable. Loading the table from vc4_hvs_init_channel
+(called from vc4_hvs_atomic_enable) appears to be at an
+invalid point in time and so isn't applied.
+
+Switch to enabling and disabling the gamma table instead. This
+isn't safe if the pipeline is running, but it isn't now.
+For HVS4 it is safe to enable and disable dynamically, so
+adopt that approach there too.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_hvs.c | 22 +++++++++++++++++-----
+ 1 file changed, 17 insertions(+), 5 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hvs.c
++++ b/drivers/gpu/drm/vc4/vc4_hvs.c
+@@ -480,8 +480,12 @@ static int vc4_hvs_init_channel(struct v
+ 	dispbkgndx &= ~SCALER_DISPBKGND_GAMMA;
+ 	dispbkgndx &= ~SCALER_DISPBKGND_INTERLACE;
+ 
++	if (crtc->state->gamma_lut)
++		/* Enable gamma on if required */
++		dispbkgndx |= SCALER_DISPBKGND_GAMMA;
++
+ 	HVS_WRITE(SCALER_DISPBKGNDX(chan), dispbkgndx |
+-		  SCALER_DISPBKGND_AUTOHS | SCALER_DISPBKGND_GAMMA |
++		  SCALER_DISPBKGND_AUTOHS |
+ 		  (interlace ? SCALER_DISPBKGND_INTERLACE : 0));
+ 
+ 	/* Reload the LUT, since the SRAMs would have been disabled if
+@@ -718,17 +722,25 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 		u32 dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(vc4_state->assigned_channel));
+ 
+ 		if (crtc->state->gamma_lut) {
+-			if (!vc4->hvs->hvs5)
++			if (!vc4->hvs->hvs5) {
+ 				vc4_hvs_update_gamma_lut(crtc);
+-			else
++				dispbkgndx |= SCALER_DISPBKGND_GAMMA;
++			} else {
+ 				vc5_hvs_update_gamma_lut(crtc);
+-			dispbkgndx |= SCALER_DISPBKGND_GAMMA;
++			}
+ 		} else {
+ 			/* Unsetting DISPBKGND_GAMMA skips the gamma lut step
+ 			 * in hardware, which is the same as a linear lut that
+ 			 * DRM expects us to use in absence of a user lut.
++			 *
++			 * Do NOT change state dynamically for hvs5 as it
++			 * inserts a delay in the pipeline that will cause
++			 * stalls if enabled/disabled whilst running. The other
++			 * should already be disabling/enabling the pipeline
++			 * when gamma changes.
+ 			 */
+-			dispbkgndx &= ~SCALER_DISPBKGND_GAMMA;
++			if (!vc4->hvs->hvs5)
++				dispbkgndx &= ~SCALER_DISPBKGND_GAMMA;
+ 		}
+ 		HVS_WRITE(SCALER_DISPBKGNDX(vc4_state->assigned_channel), dispbkgndx);
+ 	}
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0584-drm-vc4-Only-add-gamma-properties-once.patch b/root/target/linux/bcm27xx/patches-5.15/950-0584-drm-vc4-Only-add-gamma-properties-once.patch
new file mode 100644
index 00000000..d44e5d7d
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0584-drm-vc4-Only-add-gamma-properties-once.patch
@@ -0,0 +1,26 @@
+From 54963e627a2c8feeac86475736e7093a2ba077b9 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 8 Nov 2021 18:25:49 +0000
+Subject: [PATCH 584/828] drm/vc4: Only add gamma properties once.
+
+Two calls were made to drm_crtc_enable_color_mgmt to add gamma
+and CTM, however they were both set to add the gamma properties,
+so they ended up added twice.
+
+Fixes: 766cc6b1f7fc "drm/vc4: Add CTM support"
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -1196,7 +1196,7 @@ int vc4_crtc_init(struct drm_device *drm
+ 		/* We support CTM, but only for one CRTC at a time. It's therefore
+ 		 * implemented as private driver state in vc4_kms, not here.
+ 		 */
+-		drm_crtc_enable_color_mgmt(crtc, 0, true, crtc->gamma_size);
++		drm_crtc_enable_color_mgmt(crtc, 0, true, 0);
+ 
+ 		/* Initialize the VC4 gamma LUTs */
+ 		for (i = 0; i < crtc->gamma_size; i++) {
diff --git a/root/target/linux/bcm27xx/patches-5.15/0627-dtoverlays-Remove-i2c0mux-and-i20if-status-from-edt-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0585-dtoverlays-Remove-i2c0mux-and-i20if-status-from-edt-.patch
similarity index 72%
rename from root/target/linux/bcm27xx/patches-5.15/0627-dtoverlays-Remove-i2c0mux-and-i20if-status-from-edt-.patch
rename to root/target/linux/bcm27xx/patches-5.15/950-0585-dtoverlays-Remove-i2c0mux-and-i20if-status-from-edt-.patch
index fb61def4..6b59e05e 100644
--- a/root/target/linux/bcm27xx/patches-5.15/0627-dtoverlays-Remove-i2c0mux-and-i20if-status-from-edt-.patch
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0585-dtoverlays-Remove-i2c0mux-and-i20if-status-from-edt-.patch
@@ -1,7 +1,7 @@
-From ee174967a73a59f0613a43ce5df77b26156e3f64 Mon Sep 17 00:00:00 2001
+From 4cefff9ebff68124e9393cac227dcafef1cb3c66 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
 Date: Wed, 10 Nov 2021 15:55:32 +0000
-Subject: [PATCH 627/634] dtoverlays: Remove i2c0mux and i20if status from
+Subject: [PATCH 585/828] dtoverlays: Remove i2c0mux and i20if status from
  edt-ft5406.dtsi
 
 edt-ft5406.dtsi is included from vc4-kms-dsi-7inch which was
@@ -19,8 +19,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  .../dts/overlays/vc4-kms-dsi-7inch-overlay.dts   |  2 +-
  3 files changed, 17 insertions(+), 9 deletions(-)
 
-diff --git a/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts b/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts
-index f82b4d0e5047..1210e4b8e6dc 100644
 --- a/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts
 @@ -8,3 +8,19 @@
@@ -43,11 +41,9 @@ index f82b4d0e5047..1210e4b8e6dc 100644
 +		};
 +	};
 +};
-diff --git a/arch/arm/boot/dts/overlays/edt-ft5406.dtsi b/arch/arm/boot/dts/overlays/edt-ft5406.dtsi
-index 0473ff17f19f..6f9b4d02460b 100644
 --- a/arch/arm/boot/dts/overlays/edt-ft5406.dtsi
 +++ b/arch/arm/boot/dts/overlays/edt-ft5406.dtsi
-@@ -27,7 +27,6 @@ fragment@12 {
+@@ -27,7 +27,6 @@
  		__overlay__ {
  			#address-cells = <1>;
  			#size-cells = <0>;
@@ -55,7 +51,7 @@ index 0473ff17f19f..6f9b4d02460b 100644
  			ft5406: ts@38 {
  				compatible = "edt,edt-ft5406";
  				reg = <0x38>;
-@@ -38,13 +37,6 @@ ft5406: ts@38 {
+@@ -38,13 +37,6 @@
  		};
  	};
  
@@ -69,11 +65,9 @@ index 0473ff17f19f..6f9b4d02460b 100644
  	__overrides__ {
  		sizex = <&ft5406>,"touchscreen-size-x:0";
  		sizey = <&ft5406>,"touchscreen-size-y: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
-index ecd3bef3d65a..5e1700d0367a 100644
 --- a/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts
-@@ -113,6 +113,6 @@ __overlay__ {
+@@ -113,6 +113,6 @@
  	};
  
  	__overrides__ {
@@ -81,6 +75,3 @@ index ecd3bef3d65a..5e1700d0367a 100644
 +		disable_touch = <0>, "-10-11-12";
  	};
  };
--- 
-2.33.1
-
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0586-drm-vc4-Validate-the-size-of-the-gamma_lut.patch b/root/target/linux/bcm27xx/patches-5.15/950-0586-drm-vc4-Validate-the-size-of-the-gamma_lut.patch
new file mode 100644
index 00000000..d59ca17c
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0586-drm-vc4-Validate-the-size-of-the-gamma_lut.patch
@@ -0,0 +1,32 @@
+From c9759aba1a5b7bdf793c5035248dfa1fb2365fee Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 10 Nov 2021 16:36:12 +0000
+Subject: [PATCH 586/828] drm/vc4: Validate the size of the gamma_lut
+
+Add a check to vc4_hvs_gamma_check to ensure a new non-empty
+gamma LUT is of the correct length before accepting it.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_hvs.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_hvs.c
++++ b/drivers/gpu/drm/vc4/vc4_hvs.c
+@@ -538,6 +538,16 @@ static int vc4_hvs_gamma_check(struct dr
+ 	if (!crtc_state->color_mgmt_changed)
+ 		return 0;
+ 
++	if (crtc_state->gamma_lut) {
++		unsigned int len = drm_color_lut_size(crtc_state->gamma_lut);
++
++		if (len != crtc->gamma_size) {
++			DRM_DEBUG_KMS("Invalid LUT size; got %u, expected %u\n",
++				      len, crtc->gamma_size);
++			return -EINVAL;
++		}
++	}
++
+ 	connector = vc4_get_crtc_connector(crtc, crtc_state);
+ 	if (!connector)
+ 		return -EINVAL;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0587-drm-vc4-Don-t-try-disabling-SCDC-on-Pi0-3.patch b/root/target/linux/bcm27xx/patches-5.15/950-0587-drm-vc4-Don-t-try-disabling-SCDC-on-Pi0-3.patch
new file mode 100644
index 00000000..e0b591b2
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0587-drm-vc4-Don-t-try-disabling-SCDC-on-Pi0-3.patch
@@ -0,0 +1,32 @@
+From a99a5ed170d9936cefb830c62d4194fa948ee594 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Tue, 16 Nov 2021 10:34:34 +0000
+Subject: [PATCH 587/828] drm/vc4: Don't try disabling SCDC on Pi0-3.
+
+The code that set the scdc_enabled flag to ensure it was
+disabled at boot time also ran on Pi0-3 where there is no
+SCDC support. This lead to a warning in vc4_hdmi_encoder_post_crtc_disable
+due to vc4_hdmi_disable_scrambling being called and trying to
+read (and write) register HDMI_SCRAMBLER_CTL which doesn't
+exist on those platforms.
+
+Only set the flag should the interface be configured to support
+more than HDMI 1.4.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -2557,7 +2557,8 @@ static int vc4_hdmi_bind(struct device *
+ 	 * vc4_hdmi_disable_scrambling() will thus run at boot, make
+ 	 * sure it's disabled, and avoid any inconsistency.
+ 	 */
+-	vc4_hdmi->scdc_enabled = true;
++	if (variant->max_pixel_clock > HDMI_14_MAX_TMDS_CLK)
++		vc4_hdmi->scdc_enabled = true;
+ 
+ 	ret = variant->init_resources(vc4_hdmi);
+ 	if (ret)
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0588-media-i2c-ov5647-Support-HFLIP-and-VFLIP.patch b/root/target/linux/bcm27xx/patches-5.15/950-0588-media-i2c-ov5647-Support-HFLIP-and-VFLIP.patch
new file mode 100644
index 00000000..c7b71899
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0588-media-i2c-ov5647-Support-HFLIP-and-VFLIP.patch
@@ -0,0 +1,189 @@
+From c70a0f742a93b77d94ae03f72909e8fda879bcdb Mon Sep 17 00:00:00 2001
+From: David Plowman <david.plowman@raspberrypi.com>
+Date: Mon, 22 Nov 2021 13:10:39 +0000
+Subject: [PATCH 588/828] media: i2c: ov5647: Support HFLIP and VFLIP
+
+Add these missing V4L2 controls. Tested binned and full resolution
+modes in all four orientations using Raspberry Pi running libcamera.
+
+Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
+---
+ drivers/media/i2c/ov5647.c | 76 +++++++++++++++++++++++++++++++++++---
+ 1 file changed, 70 insertions(+), 6 deletions(-)
+
+--- a/drivers/media/i2c/ov5647.c
++++ b/drivers/media/i2c/ov5647.c
+@@ -54,6 +54,8 @@
+ #define OV5647_REG_GAIN_LO		0x350b
+ #define OV5647_REG_VTS_HI		0x380e
+ #define OV5647_REG_VTS_LO		0x380f
++#define OV5647_REG_VFLIP		0x3820
++#define OV5647_REG_HFLIP		0x3821
+ #define OV5647_REG_FRAME_OFF_NUMBER	0x4202
+ #define OV5647_REG_MIPI_CTRL00		0x4800
+ #define OV5647_REG_MIPI_CTRL14		0x4814
+@@ -108,6 +110,8 @@ struct ov5647 {
+ 	struct v4l2_ctrl		*hblank;
+ 	struct v4l2_ctrl		*vblank;
+ 	struct v4l2_ctrl		*exposure;
++	struct v4l2_ctrl		*hflip;
++	struct v4l2_ctrl		*vflip;
+ 	bool				streaming;
+ };
+ 
+@@ -136,7 +140,7 @@ static struct regval_list ov5647_2592x19
+ 	{0x3036, 0x69},
+ 	{0x303c, 0x11},
+ 	{0x3106, 0xf5},
+-	{0x3821, 0x06},
++	{0x3821, 0x00},
+ 	{0x3820, 0x00},
+ 	{0x3827, 0xec},
+ 	{0x370c, 0x03},
+@@ -225,7 +229,7 @@ static struct regval_list ov5647_1080p30
+ 	{0x3036, 0x62},
+ 	{0x303c, 0x11},
+ 	{0x3106, 0xf5},
+-	{0x3821, 0x06},
++	{0x3821, 0x00},
+ 	{0x3820, 0x00},
+ 	{0x3827, 0xec},
+ 	{0x370c, 0x03},
+@@ -389,7 +393,7 @@ static struct regval_list ov5647_2x2binn
+ 	{0x4800, 0x24},
+ 	{0x3503, 0x03},
+ 	{0x3820, 0x41},
+-	{0x3821, 0x07},
++	{0x3821, 0x01},
+ 	{0x350a, 0x00},
+ 	{0x350b, 0x10},
+ 	{0x3500, 0x00},
+@@ -405,7 +409,7 @@ static struct regval_list ov5647_640x480
+ 	{0x3035, 0x11},
+ 	{0x3036, 0x46},
+ 	{0x303c, 0x11},
+-	{0x3821, 0x07},
++	{0x3821, 0x01},
+ 	{0x3820, 0x41},
+ 	{0x370c, 0x03},
+ 	{0x3612, 0x59},
+@@ -946,6 +950,25 @@ static const struct v4l2_subdev_video_op
+ 	.s_stream =		ov5647_s_stream,
+ };
+ 
++/* This function returns the mbus code for the current settings of the
++   HFLIP and VFLIP controls. */
++
++static u32 ov5647_get_mbus_code(struct v4l2_subdev *sd)
++{
++	struct ov5647 *sensor = to_sensor(sd);
++	/* The control values are only 0 or 1. */
++	int index =  sensor->hflip->val | (sensor->vflip->val << 1);
++
++	static const u32 codes[4] = {
++		MEDIA_BUS_FMT_SGBRG10_1X10,
++		MEDIA_BUS_FMT_SBGGR10_1X10,
++		MEDIA_BUS_FMT_SRGGB10_1X10,
++		MEDIA_BUS_FMT_SGRBG10_1X10
++	};
++
++	return codes[index];
++}
++
+ static int ov5647_enum_mbus_code(struct v4l2_subdev *sd,
+ 				 struct v4l2_subdev_state *sd_state,
+ 				 struct v4l2_subdev_mbus_code_enum *code)
+@@ -953,7 +976,7 @@ static int ov5647_enum_mbus_code(struct
+ 	if (code->index > 0)
+ 		return -EINVAL;
+ 
+-	code->code = MEDIA_BUS_FMT_SBGGR10_1X10;
++	code->code = ov5647_get_mbus_code(sd);
+ 
+ 	return 0;
+ }
+@@ -964,7 +987,7 @@ static int ov5647_enum_frame_size(struct
+ {
+ 	const struct v4l2_mbus_framefmt *fmt;
+ 
+-	if (fse->code != MEDIA_BUS_FMT_SBGGR10_1X10 ||
++	if (fse->code != ov5647_get_mbus_code(sd) ||
+ 	    fse->index >= ARRAY_SIZE(ov5647_modes))
+ 		return -EINVAL;
+ 
+@@ -997,6 +1020,8 @@ static int ov5647_get_pad_fmt(struct v4l
+ 	}
+ 
+ 	*fmt = *sensor_format;
++	/* The code we pass back must reflect the current h/vflips. */
++	fmt->code = ov5647_get_mbus_code(sd);
+ 	mutex_unlock(&sensor->lock);
+ 
+ 	return 0;
+@@ -1044,6 +1069,8 @@ static int ov5647_set_pad_fmt(struct v4l
+ 					 exposure_def);
+ 	}
+ 	*fmt = mode->format;
++	/* The code we pass back must reflect the current h/vflips. */
++	fmt->code = ov5647_get_mbus_code(sd);
+ 	mutex_unlock(&sensor->lock);
+ 
+ 	return 0;
+@@ -1219,6 +1246,25 @@ static int ov5647_s_exposure(struct v4l2
+ 	return ov5647_write(sd, OV5647_REG_EXP_LO, (val & 0xf) << 4);
+ }
+ 
++static int ov5647_s_flip( struct v4l2_subdev *sd, u16 reg, u32 ctrl_val)
++{
++	int ret;
++	u8 reg_val;
++
++	/* Set or clear bit 1 and leave everything else alone. */
++	ret = ov5647_read(sd, reg, &reg_val);
++	if (ret == 0) {
++		if (ctrl_val)
++			reg_val |= 2;
++		else
++			reg_val &= ~2;
++
++		ret = ov5647_write(sd, reg, reg_val);
++	}
++
++	return ret;
++}
++
+ static int ov5647_s_ctrl(struct v4l2_ctrl *ctrl)
+ {
+ 	struct ov5647 *sensor = container_of(ctrl->handler,
+@@ -1277,6 +1323,14 @@ static int ov5647_s_ctrl(struct v4l2_ctr
+ 		/* Read-only, but we adjust it based on mode. */
+ 		break;
+ 
++	case V4L2_CID_HFLIP:
++		/* There's an in-built hflip in the sensor, so account for that here. */
++		ov5647_s_flip(sd, OV5647_REG_HFLIP, !ctrl->val);
++		break;
++	case V4L2_CID_VFLIP:
++		ov5647_s_flip(sd, OV5647_REG_VFLIP, ctrl->val);
++		break;
++
+ 	default:
+ 		dev_info(&client->dev,
+ 			 "Control (id:0x%x, val:0x%x) not supported\n",
+@@ -1343,6 +1397,16 @@ static int ov5647_init_controls(struct o
+ 					   sensor->mode->vts -
+ 					   sensor->mode->format.height);
+ 
++	sensor->hflip = v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
++					  V4L2_CID_HFLIP, 0, 1, 1, 0);
++	if (sensor->hflip)
++		sensor->hflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
++
++	sensor->vflip = v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
++					  V4L2_CID_VFLIP, 0, 1, 1, 0);
++	if (sensor->vflip)
++		sensor->vflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
++
+ 	v4l2_fwnode_device_parse(dev, &props);
+ 
+ 	v4l2_ctrl_new_fwnode_properties(&sensor->ctrls, &ov5647_ctrl_ops,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0589-drivers-bcm2835_isp-Allow-multiple-users-for-the-ISP.patch b/root/target/linux/bcm27xx/patches-5.15/950-0589-drivers-bcm2835_isp-Allow-multiple-users-for-the-ISP.patch
new file mode 100644
index 00000000..97682b2e
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0589-drivers-bcm2835_isp-Allow-multiple-users-for-the-ISP.patch
@@ -0,0 +1,173 @@
+From 0948647c6def331a0756661dac53968e5e2a7abf Mon Sep 17 00:00:00 2001
+From: Naushir Patuck <naush@raspberrypi.com>
+Date: Tue, 16 Nov 2021 12:38:44 +0000
+Subject: [PATCH 589/828] drivers: bcm2835_isp: Allow multiple users for the
+ ISP driver.
+
+Add a second (identical) set of device nodes to allow concurrent use of the ISP
+hardware by another user. This change effectively creates a second state
+structure (struct bcm2835_isp_dev) to maintain independent state for the second
+user. Node and media entity names are appened with the instance index
+appropriately.
+
+Further users can be added by changing the BCM2835_ISP_NUM_INSTANCES define.
+
+Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
+---
+ .../bcm2835-isp/bcm2835-v4l2-isp.c            | 76 +++++++++++++++----
+ 1 file changed, 60 insertions(+), 16 deletions(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
++++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
+@@ -26,13 +26,19 @@
+ #include "bcm2835-isp-ctrls.h"
+ #include "bcm2835-isp-fmts.h"
+ 
++/*
++ * We want to instantiate 2 independent instances allowing 2 simultaneous users
++ * of the ISP hardware.
++ */
++#define BCM2835_ISP_NUM_INSTANCES 2
++
+ static unsigned int debug;
+ module_param(debug, uint, 0644);
+ MODULE_PARM_DESC(debug, "activates debug info");
+ 
+-static unsigned int video_nr = 13;
+-module_param(video_nr, uint, 0644);
+-MODULE_PARM_DESC(video_nr, "base video device number");
++static unsigned int video_nr[BCM2835_ISP_NUM_INSTANCES] = { 13, 20 };
++module_param_array(video_nr, uint, NULL, 0644);
++MODULE_PARM_DESC(video_nr, "base video device numbers");
+ 
+ #define BCM2835_ISP_NAME "bcm2835-isp"
+ #define BCM2835_ISP_ENTITY_NAME_LEN 32
+@@ -1279,6 +1285,7 @@ static int bcm2835_isp_get_supported_fmt
+  * or output nodes.
+  */
+ static int register_node(struct bcm2835_isp_dev *dev,
++			 unsigned int instance,
+ 			 struct bcm2835_isp_node *node,
+ 			 int index)
+ {
+@@ -1439,7 +1446,7 @@ static int register_node(struct bcm2835_
+ 	snprintf(vfd->name, sizeof(node->vfd.name), "%s-%s%d", BCM2835_ISP_NAME,
+ 		 node->name, node->id);
+ 
+-	ret = video_register_device(vfd, VFL_TYPE_VIDEO, video_nr + index);
++	ret = video_register_device(vfd, VFL_TYPE_VIDEO, video_nr[instance]);
+ 	if (ret) {
+ 		v4l2_err(&dev->v4l2_dev,
+ 			 "Failed to register video %s[%d] device node\n",
+@@ -1660,9 +1667,8 @@ done:
+ 	return ret;
+ }
+ 
+-static int bcm2835_isp_remove(struct platform_device *pdev)
++static void bcm2835_isp_remove_instance(struct bcm2835_isp_dev *dev)
+ {
+-	struct bcm2835_isp_dev *dev = platform_get_drvdata(pdev);
+ 	unsigned int i;
+ 
+ 	media_controller_unregister(dev);
+@@ -1677,11 +1683,11 @@ static int bcm2835_isp_remove(struct pla
+ 					      dev->component);
+ 
+ 	vchiq_mmal_finalise(dev->mmal_instance);
+-
+-	return 0;
+ }
+ 
+-static int bcm2835_isp_probe(struct platform_device *pdev)
++static int bcm2835_isp_probe_instance(struct platform_device *pdev,
++				      struct bcm2835_isp_dev **dev_int,
++				      unsigned int instance)
+ {
+ 	struct bcm2835_isp_dev *dev;
+ 	unsigned int i;
+@@ -1691,6 +1697,7 @@ static int bcm2835_isp_probe(struct plat
+ 	if (!dev)
+ 		return -ENOMEM;
+ 
++	*dev_int = dev;
+ 	dev->dev = &pdev->dev;
+ 
+ 	ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev);
+@@ -1708,7 +1715,7 @@ static int bcm2835_isp_probe(struct plat
+ 	if (ret) {
+ 		v4l2_err(&dev->v4l2_dev,
+ 			 "%s: failed to create ril.isp component\n", __func__);
+-		goto error;
++		return ret;
+ 	}
+ 
+ 	if (dev->component->inputs < BCM2835_ISP_NUM_OUTPUTS ||
+@@ -1720,7 +1727,7 @@ static int bcm2835_isp_probe(struct plat
+ 			  BCM2835_ISP_NUM_OUTPUTS,
+ 			  dev->component->outputs,
+ 			  BCM2835_ISP_NUM_CAPTURES + BCM2835_ISP_NUM_METADATA);
+-		goto error;
++		return -EINVAL;
+ 	}
+ 
+ 	atomic_set(&dev->num_streaming, 0);
+@@ -1728,17 +1735,54 @@ static int bcm2835_isp_probe(struct plat
+ 	for (i = 0; i < BCM2835_ISP_NUM_NODES; i++) {
+ 		struct bcm2835_isp_node *node = &dev->node[i];
+ 
+-		ret = register_node(dev, node, i);
++		ret = register_node(dev, instance, node, i);
+ 		if (ret)
+-			goto error;
++			return ret;
+ 	}
+ 
+ 	ret = media_controller_register(dev);
+ 	if (ret)
+-		goto error;
++		return ret;
++
++	return 0;
++}
++
++static int bcm2835_isp_remove(struct platform_device *pdev)
++{
++	struct bcm2835_isp_dev **bcm2835_isp_instances;
++	unsigned int i;
++
++	bcm2835_isp_instances = platform_get_drvdata(pdev);
++	for (i = 0; i < BCM2835_ISP_NUM_INSTANCES; i++) {
++		if (bcm2835_isp_instances[i])
++			bcm2835_isp_remove_instance(bcm2835_isp_instances[i]);
++	}
++
++	return 0;
++}
++
++static int bcm2835_isp_probe(struct platform_device *pdev)
++{
++	struct bcm2835_isp_dev **bcm2835_isp_instances;
++	unsigned int i;
++	int ret;
++
++	bcm2835_isp_instances = devm_kzalloc(&pdev->dev,
++					     sizeof(bcm2835_isp_instances) *
++						      BCM2835_ISP_NUM_INSTANCES,
++					     GFP_KERNEL);
++	if (!bcm2835_isp_instances)
++		return -ENOMEM;
++
++	for (i = 0; i < BCM2835_ISP_NUM_INSTANCES; i++) {
++		ret = bcm2835_isp_probe_instance(pdev,
++						 &bcm2835_isp_instances[i], i);
++		if (ret)
++			goto error;
++	}
+ 
+-	platform_set_drvdata(pdev, dev);
+-	v4l2_info(&dev->v4l2_dev, "Loaded V4L2 %s\n", BCM2835_ISP_NAME);
++	platform_set_drvdata(pdev, bcm2835_isp_instances);
++	dev_info(&pdev->dev, "Loaded V4L2 %s\n", BCM2835_ISP_NAME);
+ 	return 0;
+ 
+ error:
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0590-drivers-bcm2835_isp-Fix-div-by-0-bug.patch b/root/target/linux/bcm27xx/patches-5.15/950-0590-drivers-bcm2835_isp-Fix-div-by-0-bug.patch
new file mode 100644
index 00000000..75783ff1
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0590-drivers-bcm2835_isp-Fix-div-by-0-bug.patch
@@ -0,0 +1,23 @@
+From c2724a3e60e77711fb6ebf31967be51b866246b6 Mon Sep 17 00:00:00 2001
+From: Naushir Patuck <naush@raspberrypi.com>
+Date: Thu, 25 Nov 2021 08:59:58 +0000
+Subject: [PATCH 590/828] drivers: bcm2835_isp: Fix div by 0 bug.
+
+Fix a possible division by 0 bug when setting up the mmal port for the stats
+port.
+
+Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
+---
+ drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
++++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
+@@ -544,6 +544,7 @@ static const struct bcm2835_isp_fmt supp
+ 		.step_size	    = 2,
+ 	}, {
+ 		.fourcc		    = V4L2_META_FMT_BCM2835_ISP_STATS,
++		.depth		    = 8,
+ 		.mmal_fmt	    = MMAL_ENCODING_BRCM_STATS,
+ 		/* The rest are not valid fields for stats. */
+ 	}
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0591-Pass-V4L2_CID_MPEG_VIDEO_H264_MIN_QP-MAX_QP-to-bcm28.patch b/root/target/linux/bcm27xx/patches-5.15/950-0591-Pass-V4L2_CID_MPEG_VIDEO_H264_MIN_QP-MAX_QP-to-bcm28.patch
new file mode 100644
index 00000000..67444381
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0591-Pass-V4L2_CID_MPEG_VIDEO_H264_MIN_QP-MAX_QP-to-bcm28.patch
@@ -0,0 +1,67 @@
+From 01fd1cd2aba8f05510483861e7127302c38bd2bf Mon Sep 17 00:00:00 2001
+From: Maxim Devaev <mdevaev@gmail.com>
+Date: Wed, 17 Nov 2021 04:57:56 +0300
+Subject: [PATCH 591/828] Pass V4L2_CID_MPEG_VIDEO_H264_MIN_QP/MAX_QP to
+ bcm2835-v4l2-codec
+
+Following raspberrypi/linux#4704. This is necessary to set up
+quantization for variable bitrate to avoid video flickering.
+---
+ .../bcm2835-codec/bcm2835-v4l2-codec.c        | 32 ++++++++++++++++++-
+ 1 file changed, 31 insertions(+), 1 deletion(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
+@@ -2187,6 +2187,28 @@ static int bcm2835_codec_s_ctrl(struct v
+ 		ret = bcm2835_codec_set_level_profile(ctx, ctrl);
+ 		break;
+ 
++	case V4L2_CID_MPEG_VIDEO_H264_MIN_QP:
++		if (!ctx->component)
++			break;
++
++		ret = vchiq_mmal_port_parameter_set(ctx->dev->instance,
++						    &ctx->component->output[0],
++						    MMAL_PARAMETER_VIDEO_ENCODE_MIN_QUANT,
++						    &ctrl->val,
++						    sizeof(ctrl->val));
++		break;
++
++	case V4L2_CID_MPEG_VIDEO_H264_MAX_QP:
++		if (!ctx->component)
++			break;
++
++		ret = vchiq_mmal_port_parameter_set(ctx->dev->instance,
++						    &ctx->component->output[0],
++						    MMAL_PARAMETER_VIDEO_ENCODE_MAX_QUANT,
++						    &ctrl->val,
++						    sizeof(ctrl->val));
++		break;
++
+ 	case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME: {
+ 		u32 mmal_bool = 1;
+ 
+@@ -3103,7 +3125,7 @@ static int bcm2835_codec_open(struct fil
+ 	case ENCODE:
+ 	{
+ 		/* Encode controls */
+-		v4l2_ctrl_handler_init(hdl, 9);
++		v4l2_ctrl_handler_init(hdl, 11);
+ 
+ 		v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
+ 				       V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
+@@ -3152,6 +3174,14 @@ static int bcm2835_codec_open(struct fil
+ 					 BIT(V4L2_MPEG_VIDEO_H264_PROFILE_HIGH)),
+ 					V4L2_MPEG_VIDEO_H264_PROFILE_HIGH);
+ 		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
++				  V4L2_CID_MPEG_VIDEO_H264_MIN_QP,
++				  0, 51,
++				  1, 20);
++		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
++				  V4L2_CID_MPEG_VIDEO_H264_MAX_QP,
++				  0, 51,
++				  1, 51);
++		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
+ 				  V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME,
+ 				  0, 0, 0, 0);
+ 		if (hdl->error) {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0592-ARM-dts-Update-rpi-400-and-cm4-dts-to-match-4-b.patch b/root/target/linux/bcm27xx/patches-5.15/950-0592-ARM-dts-Update-rpi-400-and-cm4-dts-to-match-4-b.patch
new file mode 100644
index 00000000..645f8004
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0592-ARM-dts-Update-rpi-400-and-cm4-dts-to-match-4-b.patch
@@ -0,0 +1,334 @@
+From c711c2e1684eb79b34f32053766d888da91083e0 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Fri, 26 Nov 2021 15:20:06 +0000
+Subject: [PATCH 592/828] ARM: dts: Update rpi-400 and cm4 dts to match 4-b
+
+The Pi 4B dts file has had numerous updates since the Pi 400 and CM4
+dts files were written. Apply those updates to the other files to
+minimise the differences. The change is largely cosmetic, except for
+the PCI "device-type" to "device_type" rename, and the correction of
+the labels on the Pi 400 GPIO expander pins.
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/boot/dts/bcm2711-rpi-400.dts | 90 ++++--------------------
+ arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 98 ++++++---------------------
+ 2 files changed, 36 insertions(+), 152 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
+@@ -1,9 +1,8 @@
+ // SPDX-License-Identifier: GPL-2.0
+ /dts-v1/;
+ #include "bcm2711.dtsi"
+-#include "bcm2835-rpi.dtsi"
+-
+-#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
++#include "bcm2711-rpi.dtsi"
++//#include "bcm283x-rpi-usb-peripheral.dtsi"
+ 
+ / {
+ 	compatible = "raspberrypi,400", "brcm,bcm2711";
+@@ -14,19 +13,6 @@
+ 		stdout-path = "serial1:115200n8";
+ 	};
+ 
+-	/* Will be filled by the bootloader */
+-	memory@0 {
+-		device_type = "memory";
+-		reg = <0 0 0>;
+-	};
+-
+-	aliases {
+-		emmc2bus = &emmc2bus;
+-		ethernet0 = &genet;
+-		pcie0 = &pcie0;
+-		blconfig = &blconfig;
+-	};
+-
+ 	leds {
+ 		led-act {
+ 			gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
+@@ -54,8 +40,8 @@
+ 		regulator-always-on;
+ 		regulator-settling-time-us = <5000>;
+ 		gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>;
+-		states = <1800000 0x1
+-			  3300000 0x0>;
++		states = <1800000 0x1>,
++			 <3300000 0x0>;
+ 		status = "okay";
+ 	};
+ 
+@@ -78,31 +64,15 @@
+ 	status = "okay";
+ };
+ 
+-&firmware {
+-	firmware_clocks: clocks {
+-		compatible = "raspberrypi,firmware-clocks";
+-		#clock-cells = <1>;
+-	};
+-
+-	expgpio: gpio {
+-		compatible = "raspberrypi,firmware-gpio";
+-		gpio-controller;
+-		#gpio-cells = <2>;
+-		gpio-line-names = "BT_ON",
+-				  "WL_ON",
+-				  "PWR_LED_OFF",
+-				  "GLOBAL_RESET",
+-				  "VDD_SD_IO_SEL",
+-				  "CAM_GPIO",
+-				  "SD_PWR_ON",
+-				  "SD_OC_N";
+-		status = "okay";
+-	};
+-
+-	reset: reset {
+-		compatible = "raspberrypi,firmware-reset";
+-		#reset-cells = <1>;
+-	};
++&expgpio {
++	gpio-line-names = "BT_ON",
++			  "WL_ON",
++			  "PWR_LED_OFF",
++			  "GLOBAL_RESET",
++			  "VDD_SD_IO_SEL",
++			  "GLOBAL_SHUTDOWN",
++			  "SD_PWR_ON",
++			  "SHUTDOWN_REQUEST";
+ };
+ 
+ &gpio {
+@@ -179,23 +149,13 @@
+ };
+ 
+ &hdmi0 {
+-	clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
+-	clock-names = "hdmi", "bvb", "audio", "cec";
+-	wifi-2.4ghz-coexistence;
+ 	status = "okay";
+ };
+ 
+ &hdmi1 {
+-	clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
+-	clock-names = "hdmi", "bvb", "audio", "cec";
+-	wifi-2.4ghz-coexistence;
+ 	status = "okay";
+ };
+ 
+-&hvs {
+-	clocks = <&firmware_clocks 4>;
+-};
+-
+ &pixelvalve0 {
+ 	status = "okay";
+ };
+@@ -218,22 +178,6 @@
+ 	status = "okay";
+ };
+ 
+-&rmem {
+-	/*
+-	 * RPi4's co-processor will copy the board's bootloader configuration
+-	 * into memory for the OS to consume. It'll also update this node with
+-	 * its placement information.
+-	 */
+-	blconfig: nvram@0 {
+-		compatible = "raspberrypi,bootloader-config", "nvmem-rmem";
+-		#address-cells = <1>;
+-		#size-cells = <1>;
+-		reg = <0x0 0x0 0x0>;
+-		no-map;
+-		status = "disabled";
+-	};
+-};
+-
+ /* SDHCI is used to control the SDIO for wireless */
+ &sdhci {
+ 	#address-cells = <1>;
+@@ -274,7 +218,7 @@
+ 
+ &pcie0 {
+ 	pci@0,0 {
+-		device-type = "pci";
++		device_type = "pci";
+ 		#address-cells = <3>;
+ 		#size-cells = <2>;
+ 		ranges;
+@@ -282,7 +226,7 @@
+ 		reg = <0 0 0 0 0>;
+ 
+ 		usb@0,0 {
+-			reg = <0x0 0 0 0 0>;
++			reg = <0 0 0 0 0>;
+ 			resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
+ 		};
+ 	};
+@@ -309,10 +253,6 @@
+ 	status = "okay";
+ };
+ 
+-&vchiq {
+-	interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
+-};
+-
+ &vc4 {
+ 	status = "okay";
+ };
+--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
+@@ -1,9 +1,8 @@
+ // SPDX-License-Identifier: GPL-2.0
+ /dts-v1/;
+ #include "bcm2711.dtsi"
+-#include "bcm2835-rpi.dtsi"
+-
+-#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
++#include "bcm2711-rpi.dtsi"
++//#include "bcm283x-rpi-usb-peripheral.dtsi"
+ 
+ / {
+ 	compatible = "raspberrypi,4-compute-module", "brcm,bcm2711";
+@@ -14,19 +13,6 @@
+ 		stdout-path = "serial1:115200n8";
+ 	};
+ 
+-	/* Will be filled by the bootloader */
+-	memory@0 {
+-		device_type = "memory";
+-		reg = <0 0 0>;
+-	};
+-
+-	aliases {
+-		emmc2bus = &emmc2bus;
+-		ethernet0 = &genet;
+-		pcie0 = &pcie0;
+-		blconfig = &blconfig;
+-	};
+-
+ 	leds {
+ 		led-act {
+ 			gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
+@@ -54,8 +40,8 @@
+ 		regulator-always-on;
+ 		regulator-settling-time-us = <5000>;
+ 		gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>;
+-		states = <1800000 0x1
+-			  3300000 0x0>;
++		states = <1800000 0x1>,
++			 <3300000 0x0>;
+ 		status = "okay";
+ 	};
+ 
+@@ -78,42 +64,26 @@
+ 	status = "okay";
+ };
+ 
+-&firmware {
+-	firmware_clocks: clocks {
+-		compatible = "raspberrypi,firmware-clocks";
+-		#clock-cells = <1>;
+-	};
+-
+-	expgpio: gpio {
+-		compatible = "raspberrypi,firmware-gpio";
+-		gpio-controller;
+-		#gpio-cells = <2>;
+-		gpio-line-names = "BT_ON",
+-				  "WL_ON",
+-				  "PWR_LED_OFF",
+-				  "ANT1",
+-				  "VDD_SD_IO_SEL",
+-				  "CAM_GPIO",
+-				  "SD_PWR_ON",
+-				  "ANT2";
+-		status = "okay";
+-
+-		ant1: ant1 {
+-			gpio-hog;
+-			gpios = <3 GPIO_ACTIVE_HIGH>;
+-			output-high;
+-		};
+-
+-		ant2: ant2 {
+-			gpio-hog;
+-			gpios = <7 GPIO_ACTIVE_HIGH>;
+-			output-low;
+-		};
+-	};
+-
+-	reset: reset {
+-		compatible = "raspberrypi,firmware-reset";
+-		#reset-cells = <1>;
++&expgpio {
++	gpio-line-names = "BT_ON",
++			  "WL_ON",
++			  "PWR_LED_OFF",
++			  "ANT1",
++			  "VDD_SD_IO_SEL",
++			  "CAM_GPIO",
++			  "SD_PWR_ON",
++			  "ANT2";
++
++	ant1: ant1 {
++		gpio-hog;
++		gpios = <3 GPIO_ACTIVE_HIGH>;
++		output-high;
++	};
++
++	ant2: ant2 {
++		gpio-hog;
++		gpios = <7 GPIO_ACTIVE_HIGH>;
++		output-low;
+ 	};
+ };
+ 
+@@ -191,23 +161,13 @@
+ };
+ 
+ &hdmi0 {
+-	clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
+-	clock-names = "hdmi", "bvb", "audio", "cec";
+-	wifi-2.4ghz-coexistence;
+ 	status = "okay";
+ };
+ 
+ &hdmi1 {
+-	clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
+-	clock-names = "hdmi", "bvb", "audio", "cec";
+-	wifi-2.4ghz-coexistence;
+ 	status = "okay";
+ };
+ 
+-&hvs {
+-	clocks = <&firmware_clocks 4>;
+-};
+-
+ &pixelvalve0 {
+ 	status = "okay";
+ };
+@@ -230,22 +190,6 @@
+ 	status = "okay";
+ };
+ 
+-&rmem {
+-	/*
+-	 * RPi4's co-processor will copy the board's bootloader configuration
+-	 * into memory for the OS to consume. It'll also update this node with
+-	 * its placement information.
+-	 */
+-	blconfig: nvram@0 {
+-		compatible = "raspberrypi,bootloader-config", "nvmem-rmem";
+-		#address-cells = <1>;
+-		#size-cells = <1>;
+-		reg = <0x0 0x0 0x0>;
+-		no-map;
+-		status = "disabled";
+-	};
+-};
+-
+ /* SDHCI is used to control the SDIO for wireless */
+ &sdhci {
+ 	#address-cells = <1>;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0593-spi-spidev-Restore-loading-from-Device-Tree.patch b/root/target/linux/bcm27xx/patches-5.15/950-0593-spi-spidev-Restore-loading-from-Device-Tree.patch
new file mode 100644
index 00000000..55eb6033
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0593-spi-spidev-Restore-loading-from-Device-Tree.patch
@@ -0,0 +1,25 @@
+From 0a4e18393f9e07fb1930ed2ae1821084270ae63f Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Mon, 29 Nov 2021 12:14:49 +0000
+Subject: [PATCH 593/828] spi: spidev: Restore loading from Device Tree
+
+As happens occasionally, an upstream change has once again prevented
+spidev from being loaded via Device Tree. We now need "spidev" to be
+included in the new spi_device_id list, otherwise although the
+spidev driver gets loaded no /dev/spidev*.* entries will appear.
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ drivers/spi/spidev.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/spi/spidev.c
++++ b/drivers/spi/spidev.c
+@@ -669,6 +669,7 @@ static const struct file_operations spid
+ static struct class *spidev_class;
+ 
+ static const struct spi_device_id spidev_spi_ids[] = {
++	{ .name = "spidev" },
+ 	{ .name = "dh2228fv" },
+ 	{ .name = "ltc2488" },
+ 	{ .name = "sx1301" },
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0594-drm-vc4-Add-support-for-composite-syncs-to-vc4_dpi.patch b/root/target/linux/bcm27xx/patches-5.15/950-0594-drm-vc4-Add-support-for-composite-syncs-to-vc4_dpi.patch
new file mode 100644
index 00000000..2d96c72d
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0594-drm-vc4-Add-support-for-composite-syncs-to-vc4_dpi.patch
@@ -0,0 +1,56 @@
+From 96e951043f22696f2b5784751ecf96dca8889e55 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 25 Nov 2021 14:45:33 +0000
+Subject: [PATCH 594/828] drm/vc4: Add support for composite syncs to vc4_dpi
+
+The hardware can combine H&V syncs onto the output enable line
+as composite syncs, so add the relevant configuration to do that.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dpi.c | 25 ++++++++++++++++---------
+ 1 file changed, 16 insertions(+), 9 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_dpi.c
++++ b/drivers/gpu/drm/vc4/vc4_dpi.c
+@@ -131,7 +131,7 @@ static void vc4_dpi_encoder_enable(struc
+ 	struct vc4_dpi *dpi = vc4_encoder->dpi;
+ 	struct drm_connector_list_iter conn_iter;
+ 	struct drm_connector *connector = NULL, *connector_scan;
+-	u32 dpi_c = DPI_ENABLE | DPI_OUTPUT_ENABLE_MODE;
++	u32 dpi_c = DPI_ENABLE;
+ 	int ret;
+ 
+ 	/* Look up the connector attached to DPI so we can get the
+@@ -192,15 +192,22 @@ static void vc4_dpi_encoder_enable(struc
+ 		dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1, DPI_FORMAT);
+ 	}
+ 
+-	if (mode->flags & DRM_MODE_FLAG_NHSYNC)
+-		dpi_c |= DPI_HSYNC_INVERT;
+-	else if (!(mode->flags & DRM_MODE_FLAG_PHSYNC))
+-		dpi_c |= DPI_HSYNC_DISABLE;
+-
+-	if (mode->flags & DRM_MODE_FLAG_NVSYNC)
+-		dpi_c |= DPI_VSYNC_INVERT;
+-	else if (!(mode->flags & DRM_MODE_FLAG_PVSYNC))
+-		dpi_c |= DPI_VSYNC_DISABLE;
++	if (mode->flags & DRM_MODE_FLAG_CSYNC) {
++		if (mode->flags & DRM_MODE_FLAG_NCSYNC)
++			dpi_c |= DPI_OUTPUT_ENABLE_INVERT;
++	} else {
++		dpi_c |= DPI_OUTPUT_ENABLE_MODE;
++
++		if (mode->flags & DRM_MODE_FLAG_NHSYNC)
++			dpi_c |= DPI_HSYNC_INVERT;
++		else if (!(mode->flags & DRM_MODE_FLAG_PHSYNC))
++			dpi_c |= DPI_HSYNC_DISABLE;
++
++		if (mode->flags & DRM_MODE_FLAG_NVSYNC)
++			dpi_c |= DPI_VSYNC_INVERT;
++		else if (!(mode->flags & DRM_MODE_FLAG_PVSYNC))
++			dpi_c |= DPI_VSYNC_DISABLE;
++	}
+ 
+ 	DPI_WRITE(DPI_C, dpi_c);
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0595-drm-vc4-Ensure-vc4_hdmi-doesn-t-use-2711-HPD-registe.patch b/root/target/linux/bcm27xx/patches-5.15/950-0595-drm-vc4-Ensure-vc4_hdmi-doesn-t-use-2711-HPD-registe.patch
new file mode 100644
index 00000000..5cefe4bc
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0595-drm-vc4-Ensure-vc4_hdmi-doesn-t-use-2711-HPD-registe.patch
@@ -0,0 +1,85 @@
+From 7283084e344506bbeed84e2f69c4472752d3f643 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Fri, 19 Nov 2021 16:16:40 +0000
+Subject: [PATCH 595/828] drm/vc4: Ensure vc4_hdmi doesn't use 2711 HPD
+ registers on Pi0-3
+
+The existing logic was flawed in that it could try reading the
+2711 specific registers for HPD on a CM1/3 where the HPD GPIO
+hadn't been defined in DT.
+
+Ensure we don't do the 2711 register read on invalid hardware,
+and then
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 24 ++++++++++++++++--------
+ drivers/gpu/drm/vc4/vc4_hdmi.h |  3 +++
+ 2 files changed, 19 insertions(+), 8 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -205,14 +205,8 @@ vc4_hdmi_connector_detect(struct drm_con
+ 		if (gpiod_get_value_cansleep(vc4_hdmi->hpd_gpio))
+ 			connected = true;
+ 	} else {
+-		unsigned long flags;
+-		u32 hotplug;
+-
+-		spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+-		hotplug = HDMI_READ(HDMI_HOTPLUG);
+-		spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+-
+-		if (hotplug & VC4_HDMI_HOTPLUG_CONNECTED)
++		if (vc4_hdmi->variant->hp_detect &&
++		    vc4_hdmi->variant->hp_detect(vc4_hdmi))
+ 			connected = true;
+ 	}
+ 
+@@ -1354,6 +1348,18 @@ static u32 vc5_hdmi_channel_map(struct v
+ 	return channel_map;
+ }
+ 
++static bool vc5_hdmi_hp_detect(struct vc4_hdmi *vc4_hdmi)
++{
++	unsigned long flags;
++	u32 hotplug;
++
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++	hotplug = HDMI_READ(HDMI_HOTPLUG);
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
++	return !!(hotplug & VC4_HDMI_HOTPLUG_CONNECTED);
++}
++
+ /* HDMI audio codec callbacks */
+ static void vc4_hdmi_audio_set_mai_clock(struct vc4_hdmi *vc4_hdmi,
+ 					 unsigned int samplerate)
+@@ -2778,6 +2784,7 @@ static const struct vc4_hdmi_variant bcm
+ 	.phy_rng_disable	= vc5_hdmi_phy_rng_disable,
+ 	.channel_map		= vc5_hdmi_channel_map,
+ 	.supports_hdr		= true,
++	.hp_detect		= vc5_hdmi_hp_detect,
+ };
+ 
+ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = {
+@@ -2806,6 +2813,7 @@ static const struct vc4_hdmi_variant bcm
+ 	.phy_rng_disable	= vc5_hdmi_phy_rng_disable,
+ 	.channel_map		= vc5_hdmi_channel_map,
+ 	.supports_hdr		= true,
++	.hp_detect		= vc5_hdmi_hp_detect,
+ };
+ 
+ static const struct of_device_id vc4_hdmi_dt_match[] = {
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
+@@ -102,6 +102,9 @@ struct vc4_hdmi_variant {
+ 
+ 	/* Enables HDR metadata */
+ 	bool supports_hdr;
++
++	/* Callback for hardware specific hotplug detect */
++	bool (*hp_detect)(struct vc4_hdmi *vc4_hdmi);
+ };
+ 
+ /* HDMI audio information */
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0596-input-edt-ft5x06-Handle-unreliable-TOUCH_UP-events.patch b/root/target/linux/bcm27xx/patches-5.15/950-0596-input-edt-ft5x06-Handle-unreliable-TOUCH_UP-events.patch
new file mode 100644
index 00000000..5114dddd
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0596-input-edt-ft5x06-Handle-unreliable-TOUCH_UP-events.patch
@@ -0,0 +1,63 @@
+From 27708216467e0371de327d6dbe629f0bda99ad76 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Fri, 26 Nov 2021 14:37:40 +0000
+Subject: [PATCH 596/828] input: edt-ft5x06: Handle unreliable TOUCH_UP events
+
+The ft5x06 is unreliable in sending touch up events, so some
+touch IDs can become stuck in the detected state.
+
+Ensure that IDs that are unreported by the controller are
+released.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/input/touchscreen/edt-ft5x06.c | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+--- a/drivers/input/touchscreen/edt-ft5x06.c
++++ b/drivers/input/touchscreen/edt-ft5x06.c
+@@ -127,6 +127,7 @@ struct edt_ft5x06_ts_data {
+ 	int offset_y;
+ 	int report_rate;
+ 	int max_support_points;
++	unsigned int known_ids;
+ 
+ 	char name[EDT_NAME_LEN];
+ 
+@@ -201,6 +202,9 @@ static irqreturn_t edt_ft5x06_ts_isr(int
+ 	int i, type, x, y, id;
+ 	int offset, tplen, datalen, crclen;
+ 	int error;
++	unsigned int active_ids = 0, known_ids = tsdata->known_ids;
++	long released_ids;
++	int b = 0;
+ 
+ 	switch (tsdata->version) {
+ 	case EDT_M06:
+@@ -272,10 +276,25 @@ static irqreturn_t edt_ft5x06_ts_isr(int
+ 
+ 		input_mt_slot(tsdata->input, id);
+ 		if (input_mt_report_slot_state(tsdata->input, MT_TOOL_FINGER,
+-					       type != TOUCH_EVENT_UP))
++					       type != TOUCH_EVENT_UP)) {
+ 			touchscreen_report_pos(tsdata->input, &tsdata->prop,
+ 					       x, y, true);
++			active_ids |= BIT(id);
++		} else {
++			known_ids &= ~BIT(id);
++		}
++	}
++
++	/* One issue with the device is the TOUCH_UP message is not always
++	 * returned. Instead track which ids we know about and report when they
++	 * are no longer updated
++	 */
++	released_ids = known_ids & ~active_ids;
++	for_each_set_bit_from(b, &released_ids, tsdata->max_support_points) {
++		input_mt_slot(tsdata->input, b);
++		input_mt_report_slot_inactive(tsdata->input);
+ 	}
++	tsdata->known_ids = active_ids;
+ 
+ 	input_mt_report_pointer_emulation(tsdata->input, true);
+ 	input_sync(tsdata->input);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0597-dtoverlays-Use-edt-ft5506-for-10-points-instead-of-e.patch b/root/target/linux/bcm27xx/patches-5.15/950-0597-dtoverlays-Use-edt-ft5506-for-10-points-instead-of-e.patch
new file mode 100644
index 00000000..3684093d
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0597-dtoverlays-Use-edt-ft5506-for-10-points-instead-of-e.patch
@@ -0,0 +1,30 @@
+From efab3f7692e609aaabe6a7fac6aefeb33400e33e Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Fri, 26 Nov 2021 16:56:37 +0000
+Subject: [PATCH 597/828] dtoverlays: Use edt-ft5506 for 10 points, instead of
+ edt-ft5x06
+
+Whilst all the datasheets describe FT5x06 as supporting "up to
+10 points of absolution X and Y coordinates", the driver
+implementation for the compatible string "edt,edt-ft5x06" only
+allows for 5.
+
+Switch to the "edt,edt-ft5506" compatible string which allows for
+10 points with no other differences.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/edt-ft5406.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/overlays/edt-ft5406.dtsi
++++ b/arch/arm/boot/dts/overlays/edt-ft5406.dtsi
+@@ -28,7 +28,7 @@
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			ft5406: ts@38 {
+-				compatible = "edt,edt-ft5406";
++				compatible = "edt,edt-ft5506";
+ 				reg = <0x38>;
+ 
+ 				touchscreen-size-x = < 800 >;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0598-staging-bcm2835-codec-bytesperline-for-YUV420-YVU420.patch b/root/target/linux/bcm27xx/patches-5.15/950-0598-staging-bcm2835-codec-bytesperline-for-YUV420-YVU420.patch
new file mode 100644
index 00000000..0c147979
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0598-staging-bcm2835-codec-bytesperline-for-YUV420-YVU420.patch
@@ -0,0 +1,42 @@
+From d86f08b7a00eecc531450b4f852db1448a10c29e Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Fri, 26 Nov 2021 16:46:22 +0000
+Subject: [PATCH 598/828] staging/bcm2835-codec: bytesperline for YUV420/YVU420
+ needs to be 64
+
+Matching https://github.com/raspberrypi/linux/pull/4419, the ISP
+block (which is also used on the input of the encoder, and output
+of the decoder) needs the base address of all planes to be aligned
+to multiples of 32. This includes the chroma planes of YUV420 and
+YVU420.
+If the height is only a multiple of 2 (not 4), then you get an odd
+number of lines in the second plane, which means the 3rd plane
+starts at a multiple of bytesperline/2.
+
+Set the minimum bytesperline alignment to 64 for those formats
+so that the plane alignment is always right.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c  | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
+@@ -157,14 +157,14 @@ static const struct bcm2835_codec_fmt su
+ 		/* YUV formats */
+ 		.fourcc			= V4L2_PIX_FMT_YUV420,
+ 		.depth			= 8,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= 64,
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_I420,
+ 		.size_multiplier_x2	= 3,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_YVU420,
+ 		.depth			= 8,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= 64,
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_YV12,
+ 		.size_multiplier_x2	= 3,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0599-media-rpivid-remove-min_buffers_needed-from-src-queu.patch b/root/target/linux/bcm27xx/patches-5.15/950-0599-media-rpivid-remove-min_buffers_needed-from-src-queu.patch
new file mode 100644
index 00000000..be323972
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0599-media-rpivid-remove-min_buffers_needed-from-src-queu.patch
@@ -0,0 +1,25 @@
+From 5c355d88c918d30799545db17e3c772902c03799 Mon Sep 17 00:00:00 2001
+From: John Cox <jc@kynesim.co.uk>
+Date: Mon, 29 Nov 2021 16:39:35 +0000
+Subject: [PATCH 599/828] media: rpivid: remove min_buffers_needed from src
+ queue
+
+Remove min_buffers_needed=1 from src queue init. Src buffers are bound
+to media requests therefore this setting is not needed and generates
+a WARN in kernel 5.16.
+
+Signed-off-by: John Cox <jc@kynesim.co.uk>
+---
+ drivers/staging/media/rpivid/rpivid_video.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/staging/media/rpivid/rpivid_video.c
++++ b/drivers/staging/media/rpivid/rpivid_video.c
+@@ -680,7 +680,6 @@ int rpivid_queue_init(void *priv, struct
+ 	src_vq->io_modes = VB2_MMAP | VB2_DMABUF;
+ 	src_vq->drv_priv = ctx;
+ 	src_vq->buf_struct_size = sizeof(struct rpivid_buffer);
+-	src_vq->min_buffers_needed = 1;
+ 	src_vq->ops = &rpivid_qops;
+ 	src_vq->mem_ops = &vb2_dma_contig_memops;
+ 	src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0600-staging-bcm2835-codec-Allow-a-different-stride-align.patch b/root/target/linux/bcm27xx/patches-5.15/950-0600-staging-bcm2835-codec-Allow-a-different-stride-align.patch
new file mode 100644
index 00000000..ce5be9fa
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0600-staging-bcm2835-codec-Allow-a-different-stride-align.patch
@@ -0,0 +1,590 @@
+From 4badc1ab1a63e6092ad490661fe91f5932042b57 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 29 Nov 2021 19:11:29 +0000
+Subject: [PATCH 600/828] staging/bcm2835-codec: Allow a different stride
+ alignment per role
+
+Deinterlace and decode aren't affected in the same way as encode
+and ISP by the alignment requirement on 3 plane YUV420.
+Decode would be affected, but it always aligns the height up to
+a macroblock, and uses the selection API to reflect that.
+
+Add in the facility to set the bytesperline alignment per role.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ .../bcm2835-codec/bcm2835-v4l2-codec.c        | 135 ++++++++++--------
+ 1 file changed, 74 insertions(+), 61 deletions(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
+@@ -88,6 +88,7 @@ enum bcm2835_codec_role {
+ 	ENCODE,
+ 	ISP,
+ 	DEINTERLACE,
++	NUM_ROLES
+ };
+ 
+ static const char * const roles[] = {
+@@ -145,7 +146,7 @@ static const char * const components[] =
+ struct bcm2835_codec_fmt {
+ 	u32	fourcc;
+ 	int	depth;
+-	int	bytesperline_align;
++	u8	bytesperline_align[NUM_ROLES];
+ 	u32	flags;
+ 	u32	mmal_fmt;
+ 	int	size_multiplier_x2;
+@@ -157,63 +158,63 @@ static const struct bcm2835_codec_fmt su
+ 		/* YUV formats */
+ 		.fourcc			= V4L2_PIX_FMT_YUV420,
+ 		.depth			= 8,
+-		.bytesperline_align	= 64,
++		.bytesperline_align	= { 32, 64, 64, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_I420,
+ 		.size_multiplier_x2	= 3,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_YVU420,
+ 		.depth			= 8,
+-		.bytesperline_align	= 64,
++		.bytesperline_align	= { 32, 64, 64, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_YV12,
+ 		.size_multiplier_x2	= 3,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_NV12,
+ 		.depth			= 8,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_NV12,
+ 		.size_multiplier_x2	= 3,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_NV21,
+ 		.depth			= 8,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_NV21,
+ 		.size_multiplier_x2	= 3,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_RGB565,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_RGB16,
+ 		.size_multiplier_x2	= 2,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_YUYV,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_YUYV,
+ 		.size_multiplier_x2	= 2,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_UYVY,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_UYVY,
+ 		.size_multiplier_x2	= 2,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_YVYU,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_YVYU,
+ 		.size_multiplier_x2	= 2,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_VYUY,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_VYUY,
+ 		.size_multiplier_x2	= 2,
+@@ -221,21 +222,21 @@ static const struct bcm2835_codec_fmt su
+ 		/* RGB formats */
+ 		.fourcc			= V4L2_PIX_FMT_RGB24,
+ 		.depth			= 24,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_RGB24,
+ 		.size_multiplier_x2	= 2,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_BGR24,
+ 		.depth			= 24,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BGR24,
+ 		.size_multiplier_x2	= 2,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_BGR32,
+ 		.depth			= 32,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BGRA,
+ 		.size_multiplier_x2	= 2,
+@@ -244,7 +245,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 8 bit */
+ 		.fourcc			= V4L2_PIX_FMT_SRGGB8,
+ 		.depth			= 8,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB8,
+ 		.size_multiplier_x2	= 2,
+@@ -252,7 +253,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SBGGR8,
+ 		.depth			= 8,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR8,
+ 		.size_multiplier_x2	= 2,
+@@ -260,7 +261,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGRBG8,
+ 		.depth			= 8,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG8,
+ 		.size_multiplier_x2	= 2,
+@@ -268,7 +269,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGBRG8,
+ 		.depth			= 8,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG8,
+ 		.size_multiplier_x2	= 2,
+@@ -277,7 +278,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 10 bit */
+ 		.fourcc			= V4L2_PIX_FMT_SRGGB10P,
+ 		.depth			= 10,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB10P,
+ 		.size_multiplier_x2	= 2,
+@@ -285,7 +286,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SBGGR10P,
+ 		.depth			= 10,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR10P,
+ 		.size_multiplier_x2	= 2,
+@@ -293,7 +294,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGRBG10P,
+ 		.depth			= 10,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG10P,
+ 		.size_multiplier_x2	= 2,
+@@ -301,7 +302,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGBRG10P,
+ 		.depth			= 10,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG10P,
+ 		.size_multiplier_x2	= 2,
+@@ -310,7 +311,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 12 bit */
+ 		.fourcc			= V4L2_PIX_FMT_SRGGB12P,
+ 		.depth			= 12,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB12P,
+ 		.size_multiplier_x2	= 2,
+@@ -318,7 +319,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SBGGR12P,
+ 		.depth			= 12,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR12P,
+ 		.size_multiplier_x2	= 2,
+@@ -326,7 +327,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGRBG12P,
+ 		.depth			= 12,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG12P,
+ 		.size_multiplier_x2	= 2,
+@@ -334,7 +335,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGBRG12P,
+ 		.depth			= 12,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG12P,
+ 		.size_multiplier_x2	= 2,
+@@ -343,7 +344,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 14 bit */
+ 		.fourcc			= V4L2_PIX_FMT_SRGGB14P,
+ 		.depth			= 14,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB14P,
+ 		.size_multiplier_x2	= 2,
+@@ -351,7 +352,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SBGGR14P,
+ 		.depth			= 14,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR14P,
+ 		.size_multiplier_x2	= 2,
+@@ -360,7 +361,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGRBG14P,
+ 		.depth			= 14,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG14P,
+ 		.size_multiplier_x2	= 2,
+@@ -368,7 +369,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGBRG14P,
+ 		.depth			= 14,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG14P,
+ 		.size_multiplier_x2	= 2,
+@@ -377,7 +378,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 16 bit */
+ 		.fourcc			= V4L2_PIX_FMT_SRGGB16,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB16,
+ 		.size_multiplier_x2	= 2,
+@@ -385,7 +386,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SBGGR16,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR16,
+ 		.size_multiplier_x2	= 2,
+@@ -393,7 +394,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGRBG16,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG16,
+ 		.size_multiplier_x2	= 2,
+@@ -401,7 +402,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGBRG16,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG16,
+ 		.size_multiplier_x2	= 2,
+@@ -411,7 +412,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 10 bit */
+ 		.fourcc			= V4L2_PIX_FMT_SRGGB10,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB10,
+ 		.size_multiplier_x2	= 2,
+@@ -419,7 +420,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SBGGR10,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR10,
+ 		.size_multiplier_x2	= 2,
+@@ -427,7 +428,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGRBG10,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG10,
+ 		.size_multiplier_x2	= 2,
+@@ -435,7 +436,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGBRG10,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG10,
+ 		.size_multiplier_x2	= 2,
+@@ -444,7 +445,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 12 bit */
+ 		.fourcc			= V4L2_PIX_FMT_SRGGB12,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB12,
+ 		.size_multiplier_x2	= 2,
+@@ -452,7 +453,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SBGGR12,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR12,
+ 		.size_multiplier_x2	= 2,
+@@ -460,7 +461,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGRBG12,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG12,
+ 		.size_multiplier_x2	= 2,
+@@ -468,7 +469,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGBRG12,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG12,
+ 		.size_multiplier_x2	= 2,
+@@ -477,7 +478,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 14 bit */
+ 		.fourcc			= V4L2_PIX_FMT_SRGGB14,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB14,
+ 		.size_multiplier_x2	= 2,
+@@ -485,7 +486,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SBGGR14,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR14,
+ 		.size_multiplier_x2	= 2,
+@@ -493,7 +494,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGRBG14,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG14,
+ 		.size_multiplier_x2	= 2,
+@@ -501,7 +502,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGBRG14,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG14,
+ 		.size_multiplier_x2	= 2,
+@@ -511,7 +512,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 8 bit */
+ 		.fourcc			= V4L2_PIX_FMT_GREY,
+ 		.depth			= 8,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_GREY,
+ 		.size_multiplier_x2	= 2,
+@@ -519,7 +520,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 10 bit */
+ 		.fourcc			= V4L2_PIX_FMT_Y10P,
+ 		.depth			= 10,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_Y10P,
+ 		.size_multiplier_x2	= 2,
+@@ -527,7 +528,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 12 bit */
+ 		.fourcc			= V4L2_PIX_FMT_Y12P,
+ 		.depth			= 12,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_Y12P,
+ 		.size_multiplier_x2	= 2,
+@@ -535,7 +536,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 14 bit */
+ 		.fourcc			= V4L2_PIX_FMT_Y14P,
+ 		.depth			= 14,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_Y14P,
+ 		.size_multiplier_x2	= 2,
+@@ -543,7 +544,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 16 bit */
+ 		.fourcc			= V4L2_PIX_FMT_Y16,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_Y16,
+ 		.size_multiplier_x2	= 2,
+@@ -551,7 +552,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 10 bit as 16bpp */
+ 		.fourcc			= V4L2_PIX_FMT_Y10,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_Y10,
+ 		.size_multiplier_x2	= 2,
+@@ -559,7 +560,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 12 bit as 16bpp */
+ 		.fourcc			= V4L2_PIX_FMT_Y12,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_Y12,
+ 		.size_multiplier_x2	= 2,
+@@ -567,7 +568,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 14 bit as 16bpp */
+ 		.fourcc			= V4L2_PIX_FMT_Y14,
+ 		.depth			= 16,
+-		.bytesperline_align	= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_Y14,
+ 		.size_multiplier_x2	= 2,
+@@ -840,9 +841,10 @@ static inline unsigned int get_sizeimage
+ }
+ 
+ static inline unsigned int get_bytesperline(int width,
+-					    struct bcm2835_codec_fmt *fmt)
++					    struct bcm2835_codec_fmt *fmt,
++					    enum bcm2835_codec_role role)
+ {
+-	return ALIGN((width * fmt->depth) >> 3, fmt->bytesperline_align);
++	return ALIGN((width * fmt->depth) >> 3, fmt->bytesperline_align[role]);
+ }
+ 
+ static void setup_mmal_port_format(struct bcm2835_codec_ctx *ctx,
+@@ -1040,7 +1042,7 @@ static void handle_fmt_changed(struct bc
+ 	 */
+ 	q_data->selection_set = true;
+ 	q_data->bytesperline = get_bytesperline(format->es.video.width,
+-						q_data->fmt);
++						q_data->fmt, ctx->dev->role);
+ 
+ 	q_data->height = format->es.video.height;
+ 	q_data->sizeimage = format->buffer_size_min;
+@@ -1422,11 +1424,13 @@ static int vidioc_try_fmt(struct bcm2835
+ 			f->fmt.pix_mp.height = ALIGN(f->fmt.pix_mp.height, 16);
+ 	}
+ 	f->fmt.pix_mp.num_planes = 1;
+-	min_bytesperline = get_bytesperline(f->fmt.pix_mp.width, fmt);
++	min_bytesperline = get_bytesperline(f->fmt.pix_mp.width, fmt,
++					    ctx->dev->role);
+ 	if (f->fmt.pix_mp.plane_fmt[0].bytesperline < min_bytesperline)
+ 		f->fmt.pix_mp.plane_fmt[0].bytesperline = min_bytesperline;
+ 	f->fmt.pix_mp.plane_fmt[0].bytesperline =
+-		ALIGN(f->fmt.pix_mp.plane_fmt[0].bytesperline, fmt->bytesperline_align);
++		ALIGN(f->fmt.pix_mp.plane_fmt[0].bytesperline,
++		      fmt->bytesperline_align[ctx->dev->role]);
+ 
+ 	sizeimage = get_sizeimage(f->fmt.pix_mp.plane_fmt[0].bytesperline,
+ 				  f->fmt.pix_mp.width, f->fmt.pix_mp.height,
+@@ -1581,7 +1585,8 @@ static int vidioc_s_fmt(struct bcm2835_c
+ 		q_data_dst->height = ALIGN(q_data->crop_height, 16);
+ 
+ 		q_data_dst->bytesperline =
+-			get_bytesperline(f->fmt.pix_mp.width, q_data_dst->fmt);
++			get_bytesperline(f->fmt.pix_mp.width, q_data_dst->fmt,
++					 ctx->dev->role);
+ 		q_data_dst->sizeimage = get_sizeimage(q_data_dst->bytesperline,
+ 						      q_data_dst->crop_width,
+ 						      q_data_dst->height,
+@@ -1810,6 +1815,8 @@ static int vidioc_g_selection(struct fil
+ 			}
+ 		}
+ 		break;
++	case NUM_ROLES:
++		break;
+ 	}
+ 
+ 	return 0;
+@@ -1920,6 +1927,8 @@ static int vidioc_s_selection(struct fil
+ 			}
+ 			break;
+ 		}
++	case NUM_ROLES:
++		break;
+ 	}
+ 
+ 	return 0;
+@@ -3087,7 +3096,8 @@ static int bcm2835_codec_open(struct fil
+ 	ctx->q_data[V4L2_M2M_SRC].height = DEFAULT_HEIGHT;
+ 	ctx->q_data[V4L2_M2M_SRC].bytesperline =
+ 			get_bytesperline(DEFAULT_WIDTH,
+-					 ctx->q_data[V4L2_M2M_SRC].fmt);
++					 ctx->q_data[V4L2_M2M_SRC].fmt,
++					 dev->role);
+ 	ctx->q_data[V4L2_M2M_SRC].sizeimage =
+ 		get_sizeimage(ctx->q_data[V4L2_M2M_SRC].bytesperline,
+ 			      ctx->q_data[V4L2_M2M_SRC].crop_width,
+@@ -3100,7 +3110,8 @@ static int bcm2835_codec_open(struct fil
+ 	ctx->q_data[V4L2_M2M_DST].height = DEFAULT_HEIGHT;
+ 	ctx->q_data[V4L2_M2M_DST].bytesperline =
+ 			get_bytesperline(DEFAULT_WIDTH,
+-					 ctx->q_data[V4L2_M2M_DST].fmt);
++					 ctx->q_data[V4L2_M2M_DST].fmt,
++					 dev->role);
+ 	ctx->q_data[V4L2_M2M_DST].sizeimage =
+ 		get_sizeimage(ctx->q_data[V4L2_M2M_DST].bytesperline,
+ 			      ctx->q_data[V4L2_M2M_DST].crop_width,
+@@ -3230,6 +3241,8 @@ static int bcm2835_codec_open(struct fil
+ 		v4l2_ctrl_handler_init(hdl, 0);
+ 	}
+ 	break;
++	case NUM_ROLES:
++	break;
+ 	}
+ 
+ 	ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(dev->m2m_dev, ctx, &queue_init);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0601-drivers-bcm2835_unicam-Add-logging-message-when-a-fr.patch b/root/target/linux/bcm27xx/patches-5.15/950-0601-drivers-bcm2835_unicam-Add-logging-message-when-a-fr.patch
new file mode 100644
index 00000000..087720c0
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0601-drivers-bcm2835_unicam-Add-logging-message-when-a-fr.patch
@@ -0,0 +1,26 @@
+From dd5c7fc65f33267d184b7f2ea22a03e1a5e09b3c Mon Sep 17 00:00:00 2001
+From: Naushir Patuck <naush@raspberrypi.com>
+Date: Tue, 30 Nov 2021 10:39:41 +0000
+Subject: [PATCH 601/828] drivers: bcm2835_unicam: Add logging message when a
+ frame is dropped.
+
+If a dummy buffer is still active on a frame start, it indicates that this frame
+will be dropped. The explicit logging helps users identify performance issues.
+
+Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
+---
+ drivers/media/platform/bcm2835/bcm2835-unicam.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
++++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
+@@ -954,6 +954,9 @@ static irqreturn_t unicam_isr(int irq, v
+ 			if (unicam->node[i].cur_frm)
+ 				unicam->node[i].cur_frm->vb.vb2_buf.timestamp =
+ 								ts;
++			else
++				unicam_dbg(2, unicam, "ISR: [%d] Dropping frame, buffer not available at FS\n",
++					   i);
+ 			/*
+ 			 * Set the next frame output to go to a dummy frame
+ 			 * if we have not managed to obtain another frame
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0602-regulator-rpi-panel-attiny-Don-t-read-the-LCD-power-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0602-regulator-rpi-panel-attiny-Don-t-read-the-LCD-power-.patch
new file mode 100644
index 00000000..703550b6
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0602-regulator-rpi-panel-attiny-Don-t-read-the-LCD-power-.patch
@@ -0,0 +1,46 @@
+From d7041aca489e0ad3e13e5556e46fb33327edf19e Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 29 Nov 2021 18:31:37 +0000
+Subject: [PATCH 602/828] regulator/rpi-panel-attiny: Don't read the LCD power
+ status
+
+The I2C to the Atmel is very fussy, and locks up easily on
+Pi0-3 particularly on reads.
+
+The LCD power status is controlled solely by this driver, so
+rather than reading it back from the Atmel, use the cached
+status last set.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/regulator/rpi-panel-attiny-regulator.c | 18 +-----------------
+ 1 file changed, 1 insertion(+), 17 deletions(-)
+
+--- a/drivers/regulator/rpi-panel-attiny-regulator.c
++++ b/drivers/regulator/rpi-panel-attiny-regulator.c
+@@ -144,24 +144,8 @@ static int attiny_lcd_power_disable(stru
+ static int attiny_lcd_power_is_enabled(struct regulator_dev *rdev)
+ {
+ 	struct attiny_lcd *state = rdev_get_drvdata(rdev);
+-	unsigned int data;
+-	int ret, i;
+ 
+-	mutex_lock(&state->lock);
+-
+-	for (i = 0; i < 10; i++) {
+-		ret = regmap_read(rdev->regmap, REG_PORTC, &data);
+-		if (!ret)
+-			break;
+-		usleep_range(10000, 12000);
+-	}
+-
+-	mutex_unlock(&state->lock);
+-
+-	if (ret < 0)
+-		return ret;
+-
+-	return data & PC_RST_BRIDGE_N;
++	return state->port_states[REG_PORTC - REG_PORTA] & PC_RST_BRIDGE_N;
+ }
+ 
+ static const struct regulator_init_data attiny_regulator_default = {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0603-regulator-rpi-panel-attiny-Use-two-transactions-for-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0603-regulator-rpi-panel-attiny-Use-two-transactions-for-.patch
new file mode 100644
index 00000000..feae5374
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0603-regulator-rpi-panel-attiny-Use-two-transactions-for-.patch
@@ -0,0 +1,68 @@
+From c7ba742f7f090a2b8ed6c16a1176bc6768717b9f Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 25 Nov 2021 14:50:10 +0000
+Subject: [PATCH 603/828] regulator/rpi-panel-attiny: Use two transactions for
+ I2C read
+
+The I2C to the Atmel is very fussy, and locks up easily on
+Pi0-3 particularly on reads.
+If running at 100kHz on Pi3, reading the ID register generally
+locks up the Atmel, but splitting the register select write and
+read into two transactions is reliable.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ .../regulator/rpi-panel-attiny-regulator.c    | 35 ++++++++++++++++++-
+ 1 file changed, 34 insertions(+), 1 deletion(-)
+
+--- a/drivers/regulator/rpi-panel-attiny-regulator.c
++++ b/drivers/regulator/rpi-panel-attiny-regulator.c
+@@ -234,6 +234,39 @@ static void attiny_gpio_set(struct gpio_
+ 	mutex_unlock(&state->lock);
+ }
+ 
++static int attiny_i2c_read(struct i2c_client *client, u8 reg, unsigned int *buf)
++{
++	struct i2c_msg msgs[1];
++	u8 addr_buf[1] = { reg };
++	u8 data_buf[1] = { 0, };
++	int ret;
++
++	/* Write register address */
++	msgs[0].addr = client->addr;
++	msgs[0].flags = 0;
++	msgs[0].len = ARRAY_SIZE(addr_buf);
++	msgs[0].buf = addr_buf;
++
++	ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
++	if (ret != ARRAY_SIZE(msgs))
++		return -EIO;
++
++	usleep_range(5000, 10000);
++
++	/* Read data from register */
++	msgs[0].addr = client->addr;
++	msgs[0].flags = I2C_M_RD;
++	msgs[0].len = 1;
++	msgs[0].buf = data_buf;
++
++	ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
++	if (ret != ARRAY_SIZE(msgs))
++		return -EIO;
++
++	*buf = data_buf[0];
++	return 0;
++}
++
+ /*
+  * I2C driver interface functions
+  */
+@@ -264,7 +297,7 @@ static int attiny_i2c_probe(struct i2c_c
+ 		goto error;
+ 	}
+ 
+-	ret = regmap_read(regmap, REG_ID, &data);
++	ret = attiny_i2c_read(i2c, REG_ID, &data);
+ 	if (ret < 0) {
+ 		dev_err(&i2c->dev, "Failed to read REG_ID reg: %d\n", ret);
+ 		goto error;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0604-input-edt-ft5x06-Only-look-at-the-number-of-points-r.patch b/root/target/linux/bcm27xx/patches-5.15/950-0604-input-edt-ft5x06-Only-look-at-the-number-of-points-r.patch
new file mode 100644
index 00000000..c009494e
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0604-input-edt-ft5x06-Only-look-at-the-number-of-points-r.patch
@@ -0,0 +1,44 @@
+From 89f705a9f6741d4ebc7dbaa278b93e1b641b6e08 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Tue, 30 Nov 2021 17:28:50 +0000
+Subject: [PATCH 604/828] input: edt-ft5x06: Only look at the number of points
+ reported
+
+Register 0x02 in the FT5x06 is TD_STATUS containing the number
+of valid touch points being reported.
+
+Iterate over that number of points rather than all that are
+supported on the device.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/input/touchscreen/edt-ft5x06.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- a/drivers/input/touchscreen/edt-ft5x06.c
++++ b/drivers/input/touchscreen/edt-ft5x06.c
+@@ -205,6 +205,7 @@ static irqreturn_t edt_ft5x06_ts_isr(int
+ 	unsigned int active_ids = 0, known_ids = tsdata->known_ids;
+ 	long released_ids;
+ 	int b = 0;
++	unsigned int num_points;
+ 
+ 	switch (tsdata->version) {
+ 	case EDT_M06:
+@@ -252,9 +253,15 @@ static irqreturn_t edt_ft5x06_ts_isr(int
+ 
+ 		if (!edt_ft5x06_ts_check_crc(tsdata, rdbuf, datalen))
+ 			goto out;
++		num_points = tsdata->max_support_points;
++	} else {
++		/* Register 2 is TD_STATUS, containing the number of touch
++		 * points.
++		 */
++		num_points = min(rdbuf[2] & 0xf, tsdata->max_support_points);
+ 	}
+ 
+-	for (i = 0; i < tsdata->max_support_points; i++) {
++	for (i = 0; i < num_points; i++) {
+ 		u8 *buf = &rdbuf[i * tplen + offset];
+ 
+ 		type = buf[0] >> 6;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0605-drm-vc4-Move-HDMI-reset-to-pm_resume.patch b/root/target/linux/bcm27xx/patches-5.15/950-0605-drm-vc4-Move-HDMI-reset-to-pm_resume.patch
new file mode 100644
index 00000000..f9706108
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0605-drm-vc4-Move-HDMI-reset-to-pm_resume.patch
@@ -0,0 +1,149 @@
+From 6ffcb31a6c240aaf2433e4a59e6ebb024e40158f Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 25 Nov 2021 14:46:55 +0000
+Subject: [PATCH 605/828] drm/vc4: Move HDMI reset to pm_resume
+
+Pi0-3 have power domains attached to the pm_runtime hooks
+for the HDMI block. Initialisation done in the reset called
+from bind is therefore lost if all users of the domain are
+suspended.
+The VEC shares the same lowest level clock/power gating as
+the HDMI block, so whilst that is enabled the block is never
+actually powered down, but if it isn't enabled then we lose
+the state.
+
+Reset and initialise the HDMI block from pm_resume.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c      | 61 ++++++++++++++++++-----------
+ drivers/gpu/drm/vc4/vc4_hdmi_regs.h |  4 +-
+ 2 files changed, 41 insertions(+), 24 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -2194,7 +2194,6 @@ static int vc4_hdmi_cec_init(struct vc4_
+ 	struct platform_device *pdev = vc4_hdmi->pdev;
+ 	struct device *dev = &pdev->dev;
+ 	unsigned long flags;
+-	u32 value;
+ 	int ret;
+ 
+ 	if (!of_find_property(dev->of_node, "interrupts", NULL)) {
+@@ -2213,15 +2212,6 @@ static int vc4_hdmi_cec_init(struct vc4_
+ 	cec_fill_conn_info_from_drm(&conn_info, &vc4_hdmi->connector);
+ 	cec_s_conn_info(vc4_hdmi->cec_adap, &conn_info);
+ 
+-	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+-	value = HDMI_READ(HDMI_CEC_CNTRL_1);
+-	/* Set the logical address to Unregistered */
+-	value |= VC4_HDMI_CEC_ADDR_MASK;
+-	HDMI_WRITE(HDMI_CEC_CNTRL_1, value);
+-	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+-
+-	vc4_hdmi_cec_update_clk_div(vc4_hdmi);
+-
+ 	if (vc4_hdmi->variant->external_irq_controller) {
+ 		ret = request_threaded_irq(platform_get_irq_byname(pdev, "cec-rx"),
+ 					   vc4_cec_irq_handler_rx_bare,
+@@ -2284,6 +2274,29 @@ static void vc4_hdmi_cec_exit(struct vc4
+ 
+ 	cec_unregister_adapter(vc4_hdmi->cec_adap);
+ }
++
++static int vc4_hdmi_cec_resume(struct vc4_hdmi *vc4_hdmi)
++{
++	unsigned long flags;
++	u32 value;
++
++	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++	value = HDMI_READ(HDMI_CEC_CNTRL_1);
++	/* Set the logical address to Unregistered */
++	value |= VC4_HDMI_CEC_ADDR_MASK;
++	HDMI_WRITE(HDMI_CEC_CNTRL_1, value);
++	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++
++	vc4_hdmi_cec_update_clk_div(vc4_hdmi);
++
++	if (!vc4_hdmi->variant->external_irq_controller) {
++		spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
++		HDMI_WRITE(HDMI_CEC_CPU_MASK_SET, 0xffffffff);
++		spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++	}
++
++	return 0;
++}
+ #else
+ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi)
+ {
+@@ -2292,6 +2305,10 @@ static int vc4_hdmi_cec_init(struct vc4_
+ 
+ static void vc4_hdmi_cec_exit(struct vc4_hdmi *vc4_hdmi) {};
+ 
++static void vc4_hdmi_cec_resume(struct vc4_hdmi *vc4_hdmi)
++{
++	return 0;
++}
+ #endif
+ 
+ static int vc4_hdmi_build_regset(struct vc4_hdmi *vc4_hdmi,
+@@ -2526,6 +2543,15 @@ static int vc4_hdmi_runtime_resume(struc
+ 	if (ret)
+ 		return ret;
+ 
++	if (vc4_hdmi->variant->reset)
++		vc4_hdmi->variant->reset(vc4_hdmi);
++
++	ret = vc4_hdmi_cec_resume(vc4_hdmi);
++	if (ret) {
++		clk_disable_unprepare(vc4_hdmi->hsm_clock);
++		return ret;
++	}
++
+ 	return 0;
+ }
+ 
+@@ -2616,20 +2642,11 @@ static int vc4_hdmi_bind(struct device *
+ 	if (ret)
+ 		goto err_put_ddc;
+ 
+-	/*
+-	 * We need to have the device powered up at this point to call
+-	 * our reset hook and for the CEC init.
+-	 */
+-	ret = vc4_hdmi_runtime_resume(dev);
+-	if (ret)
+-		goto err_put_ddc;
+-
+-	pm_runtime_get_noresume(dev);
+-	pm_runtime_set_active(dev);
+ 	pm_runtime_enable(dev);
+ 
+-	if (vc4_hdmi->variant->reset)
+-		vc4_hdmi->variant->reset(vc4_hdmi);
++	ret = pm_runtime_resume_and_get(dev);
++	if (ret)
++		goto err_put_ddc;
+ 
+ 	if ((of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi0") ||
+ 	     of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi1")) &&
+--- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
+@@ -417,7 +417,7 @@ static inline u32 vc4_hdmi_read(struct v
+ 	const struct vc4_hdmi_variant *variant = hdmi->variant;
+ 	void __iomem *base;
+ 
+-	WARN_ON(!pm_runtime_active(&hdmi->pdev->dev));
++	WARN_ON(pm_runtime_status_suspended(&hdmi->pdev->dev));
+ 
+ 	if (reg >= variant->num_registers) {
+ 		dev_warn(&hdmi->pdev->dev,
+@@ -447,7 +447,7 @@ static inline void vc4_hdmi_write(struct
+ 
+ 	lockdep_assert_held(&hdmi->hw_lock);
+ 
+-	WARN_ON(!pm_runtime_active(&hdmi->pdev->dev));
++	WARN_ON(pm_runtime_status_suspended(&hdmi->pdev->dev));
+ 
+ 	if (reg >= variant->num_registers) {
+ 		dev_warn(&hdmi->pdev->dev,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0606-clk-bcm-rpi-Add-the-BCM283x-pixel-clock.patch b/root/target/linux/bcm27xx/patches-5.15/950-0606-clk-bcm-rpi-Add-the-BCM283x-pixel-clock.patch
new file mode 100644
index 00000000..b5d8a9d1
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0606-clk-bcm-rpi-Add-the-BCM283x-pixel-clock.patch
@@ -0,0 +1,26 @@
+From d82a045e6b38650991f9c31b5ea7c03f3278642f Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 2 Dec 2021 13:53:36 +0000
+Subject: [PATCH 606/828] clk: bcm: rpi: Add the BCM283x pixel clock.
+
+The clk-bcm2835 handling of the pixel clock does not function
+correctly when the HDMI power domain is disabled.
+
+The firmware supports it correctly, so add it to the
+firmware clock driver.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/clk/bcm/clk-raspberrypi.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/clk/bcm/clk-raspberrypi.c
++++ b/drivers/clk/bcm/clk-raspberrypi.c
+@@ -276,6 +276,7 @@ static int raspberrypi_discover_clocks(s
+ 		case RPI_FIRMWARE_HEVC_CLK_ID:
+ 		case RPI_FIRMWARE_PIXEL_BVB_CLK_ID:
+ 		case RPI_FIRMWARE_VEC_CLK_ID:
++		case RPI_FIRMWARE_PIXEL_CLK_ID:
+ 			hw = raspberrypi_clk_register(rpi, clks->parent,
+ 						      clks->id);
+ 			if (IS_ERR(hw))
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0607-dt-bcm283x-Change-BCM283x-HDMI-to-use-firmware-clock.patch b/root/target/linux/bcm27xx/patches-5.15/950-0607-dt-bcm283x-Change-BCM283x-HDMI-to-use-firmware-clock.patch
new file mode 100644
index 00000000..f4e4a485
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0607-dt-bcm283x-Change-BCM283x-HDMI-to-use-firmware-clock.patch
@@ -0,0 +1,29 @@
+From c1dd34267e1837e1f9521656606b7adad9633440 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 2 Dec 2021 14:11:09 +0000
+Subject: [PATCH 607/828] dt: bcm283x: Change BCM283x HDMI to use firmware
+ clock driver
+
+The clk-bcm2835 handling of the pixel clock does not function
+correctly when the HDMI power domain is disabled.
+
+The firmware supports it correctly, and the firmware clock
+driver now supports it, so switch the vc4-hdmi driver to use
+the firmware clock driver.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/bcm2835-common.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/bcm2835-common.dtsi
++++ b/arch/arm/boot/dts/bcm2835-common.dtsi
+@@ -128,7 +128,7 @@
+ 				    "hd";
+ 			interrupts = <2 8>, <2 9>;
+ 			ddc = <&i2c2>;
+-			clocks = <&clocks BCM2835_PLLH_PIX>,
++			clocks = <&firmware_clocks 9>,
+ 				 <&clocks BCM2835_CLOCK_HSM>;
+ 			clock-names = "pixel", "hdmi";
+ 			dmas = <&dma (17|(1<<27)|(1<<24))>;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0608-overlays-vc4-kms-v3d-Change-composite-handling.patch b/root/target/linux/bcm27xx/patches-5.15/950-0608-overlays-vc4-kms-v3d-Change-composite-handling.patch
new file mode 100644
index 00000000..15fef0db
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0608-overlays-vc4-kms-v3d-Change-composite-handling.patch
@@ -0,0 +1,58 @@
+From 9c30be10c0ebdb6bdf6e46dd367e29d24410e63b Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Thu, 11 Nov 2021 13:33:25 +0000
+Subject: [PATCH 608/828] overlays: vc4-kms-v3d: Change composite handling
+
+On a Pi 4, enabling composite video disables the HDMI output. As a
+consequence, the composite output is disabled by default. Change the
+vc4-kms-v3d overlay used on older Pis to also disable composite by
+default, replacing the "nocomposite" parameter with a "composite"
+parameter.
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/README                  | 4 ++--
+ arch/arm/boot/dts/overlays/upstream-overlay.dts    | 2 +-
+ arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts | 4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -3620,8 +3620,8 @@ Params: cma-512                 CMA is 5
+         cma-default             Use upstream's default value
+         audio                   Enable or disable audio over HDMI (default "on")
+         noaudio                 Disable all HDMI audio (default "off")
+-        nocomposite             Disable the composite video output (default
+-                                "off")
++        composite               Enable the composite output (default "off")
++                                N.B. Disables all other outputs on a Pi 4.
+ 
+ 
+ Name:   vc4-kms-v3d-pi4
+--- a/arch/arm/boot/dts/overlays/upstream-overlay.dts
++++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts
+@@ -1,4 +1,4 @@
+-// redo: ovmerge -c vc4-kms-v3d-overlay.dts,cma-default dwc2-overlay.dts,dr_mode=otg
++// redo: ovmerge -c vc4-kms-v3d-overlay.dts,cma-default,composite dwc2-overlay.dts,dr_mode=otg
+ 
+ /dts-v1/;
+ /plugin/;
+--- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
++++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
+@@ -89,7 +89,7 @@
+ 
+ 	fragment@11 {
+ 		target = <&vec>;
+-		__overlay__  {
++		__dormant__  {
+ 			status = "okay";
+ 		};
+ 	};
+@@ -118,6 +118,6 @@
+ 	__overrides__ {
+ 		audio   = <0>,"!13";
+ 		noaudio = <0>,"=13";
+-		nocomposite = <0>, "!11";
++		composite = <0>, "=11";
+ 	};
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0609-drm-panel-simple-Populate-bpc-when-using-panel-dpi.patch b/root/target/linux/bcm27xx/patches-5.15/950-0609-drm-panel-simple-Populate-bpc-when-using-panel-dpi.patch
new file mode 100644
index 00000000..d4d9ffa2
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0609-drm-panel-simple-Populate-bpc-when-using-panel-dpi.patch
@@ -0,0 +1,24 @@
+From 78c251206df73c960676383a8b435205aa8da5a6 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 2 Dec 2021 18:10:55 +0000
+Subject: [PATCH 609/828] drm/panel-simple: Populate bpc when using panel-dpi
+
+panel-dpi doesn't know the bit depth, so in the same way that
+DPI is guessed for the connector type, guess that it'll be 8bpc.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/panel/panel-simple.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/gpu/drm/panel/panel-simple.c
++++ b/drivers/gpu/drm/panel/panel-simple.c
+@@ -607,6 +607,8 @@ static int panel_dpi_probe(struct device
+ 
+ 	/* We do not know the connector for the DT node, so guess it */
+ 	desc->connector_type = DRM_MODE_CONNECTOR_DPI;
++	/* Likewise for the bit depth. */
++	desc->bpc = 8;
+ 
+ 	panel->desc = desc;
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0610-drm-panel-simple-Allow-the-bus-format-to-be-read-fro.patch b/root/target/linux/bcm27xx/patches-5.15/950-0610-drm-panel-simple-Allow-the-bus-format-to-be-read-fro.patch
new file mode 100644
index 00000000..cee00b9a
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0610-drm-panel-simple-Allow-the-bus-format-to-be-read-fro.patch
@@ -0,0 +1,28 @@
+From 73a919d03162524df160e475efa27ab0d3393c68 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 2 Dec 2021 18:16:21 +0000
+Subject: [PATCH 610/828] drm/panel-simple: Allow the bus format to be read
+ from DT for panel-dpi
+
+The "panel-dpi" compatible string configures panel from device tree,
+but it doesn't provide any way of configuring the bus format (colour
+representation), nor does it populate it.
+
+Add a DT parameter "bus-format" that allows the MEDIA_BUS_FMT_xxx value
+to be specified from device tree.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/panel/panel-simple.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/gpu/drm/panel/panel-simple.c
++++ b/drivers/gpu/drm/panel/panel-simple.c
+@@ -598,6 +598,7 @@ static int panel_dpi_probe(struct device
+ 
+ 	of_property_read_u32(np, "width-mm", &desc->size.width);
+ 	of_property_read_u32(np, "height-mm", &desc->size.height);
++	of_property_read_u32(np, "bus-format", &desc->bus_format);
+ 
+ 	/* Extract bus_flags from display_timing */
+ 	bus_flags = 0;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0611-drm-vc4-dpi-Add-option-for-inverting-pixel-clock-and.patch b/root/target/linux/bcm27xx/patches-5.15/950-0611-drm-vc4-dpi-Add-option-for-inverting-pixel-clock-and.patch
new file mode 100644
index 00000000..47e99c30
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0611-drm-vc4-dpi-Add-option-for-inverting-pixel-clock-and.patch
@@ -0,0 +1,114 @@
+From 1ac1dae909e91559d97131066756bb487bf8607a Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 2 Dec 2021 18:21:46 +0000
+Subject: [PATCH 611/828] drm/vc4: dpi: Add option for inverting pixel clock
+ and output enable
+
+DRM provides flags for inverting pixel clock and output enable
+signals, but these were not mapped to the relevant registers.
+
+Add those mappings.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dpi.c | 89 ++++++++++++++++++++---------------
+ 1 file changed, 51 insertions(+), 38 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_dpi.c
++++ b/drivers/gpu/drm/vc4/vc4_dpi.c
+@@ -148,45 +148,58 @@ static void vc4_dpi_encoder_enable(struc
+ 	}
+ 	drm_connector_list_iter_end(&conn_iter);
+ 
+-	if (connector && connector->display_info.num_bus_formats) {
+-		u32 bus_format = connector->display_info.bus_formats[0];
++	if (connector) {
++		if (connector->display_info.num_bus_formats) {
++			u32 bus_format = connector->display_info.bus_formats[0];
+ 
+-		switch (bus_format) {
+-		case MEDIA_BUS_FMT_RGB888_1X24:
+-			dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB,
+-					       DPI_FORMAT);
+-			break;
+-		case MEDIA_BUS_FMT_BGR888_1X24:
+-			dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB,
+-					       DPI_FORMAT);
+-			dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR, DPI_ORDER);
+-			break;
+-		case MEDIA_BUS_FMT_RGB666_1X24_CPADHI:
+-			dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_2,
+-					       DPI_FORMAT);
+-			break;
+-		case MEDIA_BUS_FMT_BGR666_1X24_CPADHI:
+-			dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_2,
+-					       DPI_FORMAT);
+-			dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR, DPI_ORDER);
+-			break;
+-		case MEDIA_BUS_FMT_RGB666_1X18:
+-			dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1,
+-					       DPI_FORMAT);
+-			break;
+-		case MEDIA_BUS_FMT_BGR666_1X18:
+-			dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1,
+-					       DPI_FORMAT);
+-			dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR, DPI_ORDER);
+-			break;
+-		case MEDIA_BUS_FMT_RGB565_1X16:
+-			dpi_c |= VC4_SET_FIELD(DPI_FORMAT_16BIT_565_RGB_3,
+-					       DPI_FORMAT);
+-			break;
+-		default:
+-			DRM_ERROR("Unknown media bus format %d\n", bus_format);
+-			break;
++			switch (bus_format) {
++			case MEDIA_BUS_FMT_RGB888_1X24:
++				dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB,
++						       DPI_FORMAT);
++				break;
++			case MEDIA_BUS_FMT_BGR888_1X24:
++				dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB,
++						       DPI_FORMAT);
++				dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR,
++						       DPI_ORDER);
++				break;
++			case MEDIA_BUS_FMT_RGB666_1X24_CPADHI:
++				dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_2,
++						       DPI_FORMAT);
++				break;
++			case MEDIA_BUS_FMT_BGR666_1X24_CPADHI:
++				dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_2,
++						       DPI_FORMAT);
++				dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR,
++						       DPI_ORDER);
++				break;
++			case MEDIA_BUS_FMT_RGB666_1X18:
++				dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1,
++						       DPI_FORMAT);
++				break;
++			case MEDIA_BUS_FMT_BGR666_1X18:
++				dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1,
++						       DPI_FORMAT);
++				dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR,
++						       DPI_ORDER);
++				break;
++			case MEDIA_BUS_FMT_RGB565_1X16:
++				dpi_c |= VC4_SET_FIELD(DPI_FORMAT_16BIT_565_RGB_3,
++						       DPI_FORMAT);
++				break;
++			default:
++				DRM_ERROR("Unknown media bus format %d\n",
++					  bus_format);
++				break;
++			}
+ 		}
++
++		if (connector->display_info.bus_flags &
++					DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE)
++			dpi_c |= DPI_PIXEL_CLK_INVERT;
++
++		if (connector->display_info.bus_flags & DRM_BUS_FLAG_DE_LOW)
++			dpi_c |= DPI_OUTPUT_ENABLE_INVERT;
+ 	} else {
+ 		/* Default to 18bit if no connector found. */
+ 		dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1, DPI_FORMAT);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0612-drm-vc4-dpi-Ensure-a-default-format-is-selected.patch b/root/target/linux/bcm27xx/patches-5.15/950-0612-drm-vc4-dpi-Ensure-a-default-format-is-selected.patch
new file mode 100644
index 00000000..8e116769
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0612-drm-vc4-dpi-Ensure-a-default-format-is-selected.patch
@@ -0,0 +1,45 @@
+From 4cf35266cbe9737b75a135031e8f992794764e9c Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 2 Dec 2021 18:28:29 +0000
+Subject: [PATCH 612/828] drm/vc4: dpi: Ensure a default format is selected
+
+In a couple of error/incomplete configuration cases, the
+DPI_FORMAT bits wouldn't get set.
+
+Adopt a default of RGB666 in all these cases.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dpi.c | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_dpi.c
++++ b/drivers/gpu/drm/vc4/vc4_dpi.c
+@@ -173,6 +173,10 @@ static void vc4_dpi_encoder_enable(struc
+ 				dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR,
+ 						       DPI_ORDER);
+ 				break;
++			default:
++				DRM_ERROR("Unknown media bus format %d\n",
++					  bus_format);
++				fallthrough;
+ 			case MEDIA_BUS_FMT_RGB666_1X18:
+ 				dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1,
+ 						       DPI_FORMAT);
+@@ -187,11 +191,12 @@ static void vc4_dpi_encoder_enable(struc
+ 				dpi_c |= VC4_SET_FIELD(DPI_FORMAT_16BIT_565_RGB_3,
+ 						       DPI_FORMAT);
+ 				break;
+-			default:
+-				DRM_ERROR("Unknown media bus format %d\n",
+-					  bus_format);
+-				break;
+ 			}
++		} else {
++			/* Default to 18bit if no connector found. */
++			dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1,
++					       DPI_FORMAT);
++
+ 		}
+ 
+ 		if (connector->display_info.bus_flags &
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0613-dt-bcm270x-Add-GPIO-defines-for-RGB565-DPI-output-mo.patch b/root/target/linux/bcm27xx/patches-5.15/950-0613-dt-bcm270x-Add-GPIO-defines-for-RGB565-DPI-output-mo.patch
new file mode 100644
index 00000000..87811c13
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0613-dt-bcm270x-Add-GPIO-defines-for-RGB565-DPI-output-mo.patch
@@ -0,0 +1,44 @@
+From 3ac2c49444c6e65ea6801d4e9459b91cf7685f17 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 2 Dec 2021 18:24:44 +0000
+Subject: [PATCH 613/828] dt: bcm270x: Add GPIO defines for RGB565 DPI output
+ modes
+
+Adds the pinctrl defines for the RGB565 DPI output modes.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/bcm270x.dtsi | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+--- a/arch/arm/boot/dts/bcm270x.dtsi
++++ b/arch/arm/boot/dts/bcm270x.dtsi
+@@ -189,6 +189,28 @@
+ 			     20 21>;
+ 		brcm,function = <BCM2835_FSEL_ALT2>;
+ 	};
++	dpi_16bit_gpio0: dpi_16bit_gpio0 {
++		brcm,pins = <0 1 2 3 4 5 6 7 8 9 10 11
++			     12 13 14 15 16 17 18 19>;
++		brcm,function = <BCM2835_FSEL_ALT2>;
++	};
++	dpi_16bit_gpio2: dpi_16bit_gpio2 {
++		brcm,pins = <2 3 4 5 6 7 8 9 10 11
++			     12 13 14 15 16 17 18 19>;
++		brcm,function = <BCM2835_FSEL_ALT2>;
++	};
++	dpi_16bit_cpadhi_gpio0: dpi_16bit_cpadhi_gpio0 {
++		brcm,pins = <0 1 2 3 4 5 6 7 8
++			     12 13 14 15 16 17
++			     20 21 22 23 24>;
++		brcm,function = <BCM2835_FSEL_ALT2>;
++	};
++	dpi_16bit_cpadhi_gpio2: dpi_16bit_cpadhi_gpio2 {
++		brcm,pins = <2 3 4 5 6 7 8
++			     12 13 14 15 16 17
++			     20 21 22 23 24>;
++		brcm,function = <BCM2835_FSEL_ALT2>;
++	};
+ };
+ 
+ &uart0 {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0614-dtoverlays-Add-a-generic-DPI-panel-overlay-for-KMS.patch b/root/target/linux/bcm27xx/patches-5.15/950-0614-dtoverlays-Add-a-generic-DPI-panel-overlay-for-KMS.patch
new file mode 100644
index 00000000..78c10cd8
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0614-dtoverlays-Add-a-generic-DPI-panel-overlay-for-KMS.patch
@@ -0,0 +1,158 @@
+From a243b4fc6da596ee63560c7b3e7fc5a33ea7a2d5 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 2 Dec 2021 18:06:37 +0000
+Subject: [PATCH 614/828] dtoverlays: Add a generic DPI panel overlay for KMS
+
+Uses the "panel-dpi" compatible to set panel timings from
+DT.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/Makefile           |  1 +
+ arch/arm/boot/dts/overlays/README             | 28 ++++++
+ .../overlays/vc4-kms-dpi-generic-overlay.dts  | 92 +++++++++++++++++++
+ 3 files changed, 121 insertions(+)
+ create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
+
+--- a/arch/arm/boot/dts/overlays/Makefile
++++ b/arch/arm/boot/dts/overlays/Makefile
+@@ -232,6 +232,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
+ 	vc4-fkms-v3d.dtbo \
+ 	vc4-fkms-v3d-pi4.dtbo \
+ 	vc4-kms-dpi-at056tn53v1.dtbo \
++	vc4-kms-dpi-generic.dtbo \
+ 	vc4-kms-dsi-7inch.dtbo \
+ 	vc4-kms-dsi-lt070me05000.dtbo \
+ 	vc4-kms-dsi-lt070me05000-v2.dtbo \
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -3563,6 +3563,34 @@ Load:   dtoverlay=vc4-kms-dpi-at056tn53v
+ Params: <None>
+ 
+ 
++Name:   vc4-kms-dpi-generic
++Info:   Enable a generic DPI display under KMS. Default timings are for the
++        Adafruit Kippah with 800x480 panel and RGB666 (GPIOs 0-21)
++        Requires vc4-kms-v3d to be loaded.
++Load:   dtoverlay=vc4-kms-dpi-generic,<param>=<val>
++Params: clock-frequency         Display clock frequency (Hz)
++        hactive                 Horizontal active pixels
++        hfp                     Horizontal front porch
++        hsync                   Horizontal sync pulse width
++        hbp                     Horizontal back porch
++        vactive                 Vertical active lines
++        vfp                     Vertical front porch
++        vsync                   Vertical sync pulse width
++        vbp                     Vertical back porch
++        hsync-invert            Horizontal sync active low
++        vsync-invert            Vertical sync active low
++        de-invert               Data Enable active low
++        pixclk-invert           Negative edge pixel clock
++        width-mm                Define the screen width in mm
++        height-mm               Define the screen height in mm
++        rgb565                  Change to RGB565 output on GPIOs 0-19
++        rgb666-padhi            Change to RGB666 output on GPIOs 0-9, 12-17, and
++                                20-25
++        rgb888                  Change to RGB888 output on GPIOs 0-27
++        bus-format              Override the bus format for a MEDIA_BUS_FMT_*
++                                value. NB also overridden by rgbXXX overrides.
++
++
+ Name:   vc4-kms-dsi-7inch
+ Info:   Enable the Raspberry Pi DSI 7" screen.
+         Includes the edt-ft5406 for the touchscreen element.
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
+@@ -0,0 +1,92 @@
++/*
++ * vc4-kms-dpi-at056tn53v1-overlay.dts
++ */
++
++/dts-v1/;
++/plugin/;
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/pinctrl/bcm2835.h>
++
++/ {
++	compatible = "brcm,bcm2835";
++
++	fragment@0 {
++		target-path = "/";
++		__overlay__ {
++			panel: panel {
++				compatible = "panel-dpi";
++
++				width-mm = <154>;
++				height-mm = <83>;
++				bus-format = <0x1009>;
++
++				timing: panel-timing {
++					clock-frequency = <29500000>;
++					hactive = <800>;
++					hfront-porch = <24>;
++					hsync-len = <72>;
++					hback-porch = <96>;
++					hsync-active = <0>;
++					vactive = <480>;
++					vfront-porch = <3>;
++					vsync-len = <10>;
++					vback-porch = <7>;
++					vsync-active = <0>;
++
++					de-active = <1>;
++					pixelclk-active = <1>;
++				};
++
++				port {
++					panel_in: endpoint {
++						remote-endpoint = <&dpi_out>;
++					};
++				};
++			};
++		};
++	};
++
++	fragment@1 {
++		target = <&dpi>;
++		dpi_node: __overlay__  {
++			status = "okay";
++
++			pinctrl-names = "default";
++			pinctrl-0 = <&dpi_18bit_gpio0>;
++
++			port {
++				dpi_out: endpoint {
++					remote-endpoint = <&panel_in>;
++				};
++			};
++		};
++	};
++
++	__overrides__ {
++		clock-frequency = <&timing>, "clock-frequency:0";
++		hactive = <&timing>, "hactive:0";
++		hfp = <&timing>, "hfront-porch:0";
++		hsync = <&timing>, "hsync-len:0";
++		hbp = <&timing>, "hback-porch:0";
++		vactive = <&timing>, "vactive:0";
++		vfp = <&timing>, "vfront-porch:0";
++		vsync = <&timing>, "vsync-len:0";
++		vbp = <&timing>, "vback-porch:0";
++		hsync-invert = <&timing>, "hsync-active:0=0";
++		vsync-invert = <&timing>, "vsync-active:0=0";
++		de-invert = <&timing>, "de-active:0=0";
++		pixclk-invert = <&timing>, "pixelclk-active:0=0";
++
++		width-mm = <&panel>, "width-mm:0";
++		height-mm = <&panel>, "height-mm:0";
++
++		rgb565 = <&panel>, "bus-format:0=0x1017",
++			<&dpi_node>, "pinctrl-0:0=",<&dpi_16bit_gpio0>;
++		rgb666-padhi = <&panel>, "bus-format:0=0x1015",
++			<&dpi_node>, "pinctrl-0:0=",<&dpi_18bit_cpadhi_gpio0>;
++		rgb888 = <&panel>, "bus-format:0=0x100a",
++			<&dpi_node>, "pinctrl-0:0=",<&dpi_gpio0>;
++		bus-format = <&panel>, "bus-format:0";
++	};
++};
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0615-xhci-quirks-add-link-TRB-quirk-for-VL805.patch b/root/target/linux/bcm27xx/patches-5.15/950-0615-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
new file mode 100644
index 00000000..92af8241
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0615-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
@@ -0,0 +1,60 @@
+From cf8da006a37b72de60ab8bff1b69ece8fd661879 Mon Sep 17 00:00:00 2001
+From: Jonathan Bell <jonathan@raspberrypi.org>
+Date: Mon, 26 Oct 2020 14:03:35 +0000
+Subject: [PATCH 615/828] xhci: quirks: add link TRB quirk for VL805
+
+The VL805 controller can't cope with the TR Dequeue Pointer for an endpoint
+being set to a Link TRB. The hardware-maintained endpoint context ends up
+stuck at the address of the Link TRB, leading to erroneous ring expansion
+events whenever the enqueue pointer wraps to the dequeue position.
+
+If the search for the end of the current TD and ring cycle state lands on
+a Link TRB, move to the next segment.
+
+See: https://github.com/raspberrypi/linux/issues/3919
+
+Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
+---
+ drivers/usb/host/xhci-pci.c  | 1 +
+ drivers/usb/host/xhci-ring.c | 9 +++++++++
+ drivers/usb/host/xhci.h      | 1 +
+ 3 files changed, 11 insertions(+)
+
+--- a/drivers/usb/host/xhci-pci.c
++++ b/drivers/usb/host/xhci-pci.c
+@@ -296,6 +296,7 @@ static void xhci_pci_quirks(struct devic
+ 	if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) {
+ 		xhci->quirks |= XHCI_LPM_SUPPORT;
+ 		xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
++		xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
+ 	}
+ 
+ 	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
+--- a/drivers/usb/host/xhci-ring.c
++++ b/drivers/usb/host/xhci-ring.c
+@@ -667,6 +667,15 @@ static int xhci_move_dequeue_past_td(str
+ 	} while (!cycle_found || !td_last_trb_found);
+ 
+ deq_found:
++	/*
++	 * Quirk: the xHC does not correctly parse link TRBs if the HW Dequeue
++	 * pointer is set to one. Advance to the next TRB (and next segment).
++	 */
++	if (xhci->quirks & XHCI_AVOID_DQ_ON_LINK && trb_is_link(new_deq)) {
++		if (link_trb_toggles_cycle(new_deq))
++			new_cycle ^= 0x1;
++		next_trb(xhci, ep_ring, &new_seg, &new_deq);
++	}
+ 
+ 	/* Don't update the ring cycle state for the producer (us). */
+ 	addr = xhci_trb_virt_to_dma(new_seg, new_deq);
+--- a/drivers/usb/host/xhci.h
++++ b/drivers/usb/host/xhci.h
+@@ -1903,6 +1903,7 @@ struct xhci_hcd {
+ #define XHCI_NO_SOFT_RETRY	BIT_ULL(40)
+ #define XHCI_BROKEN_D3COLD	BIT_ULL(41)
+ #define XHCI_EP_CTX_BROKEN_DCS	BIT_ULL(42)
++#define XHCI_AVOID_DQ_ON_LINK	BIT_ULL(43)
+ 
+ 	unsigned int		num_active_eps;
+ 	unsigned int		limit_active_eps;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0616-xhci-correct-room_on_ring-for-cases-where-there-is-a.patch b/root/target/linux/bcm27xx/patches-5.15/950-0616-xhci-correct-room_on_ring-for-cases-where-there-is-a.patch
new file mode 100644
index 00000000..0c3c53a8
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0616-xhci-correct-room_on_ring-for-cases-where-there-is-a.patch
@@ -0,0 +1,29 @@
+From 50d9c41dcbf3c933cf8004be37c6f1fac03f517b Mon Sep 17 00:00:00 2001
+From: Jonathan Bell <jonathan@raspberrypi.com>
+Date: Fri, 3 Dec 2021 14:32:05 +0000
+Subject: [PATCH 616/828] xhci: correct room_on_ring() for cases where there is
+ a single segment
+
+Don't calculate space based on the number of TRBs in the current segment,
+as it's OK to wrap to the start (and flip the cycle state bit).
+
+Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
+---
+ drivers/usb/host/xhci-ring.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/usb/host/xhci-ring.c
++++ b/drivers/usb/host/xhci-ring.c
+@@ -289,6 +289,12 @@ static inline int room_on_ring(struct xh
+ 		return 0;
+ 
+ 	if (ring->type != TYPE_COMMAND && ring->type != TYPE_EVENT) {
++		/*
++		 * If the ring has a single segment the dequeue segment
++		 * never changes, so don't use it as measure of free space.
++		 */
++		if (ring->num_segs == 1)
++			return ring->num_trbs_free >= num_trbs;
+ 		num_trbs_in_deq_seg = ring->dequeue - ring->deq_seg->trbs;
+ 		if (ring->num_trbs_free < num_trbs + num_trbs_in_deq_seg)
+ 			return 0;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0617-media-imx219-Advertise-embedded-data-node-on-media-p.patch b/root/target/linux/bcm27xx/patches-5.15/950-0617-media-imx219-Advertise-embedded-data-node-on-media-p.patch
new file mode 100644
index 00000000..15cb5542
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0617-media-imx219-Advertise-embedded-data-node-on-media-p.patch
@@ -0,0 +1,416 @@
+From aea0a1fe5514318ebb3b08fa8209c0eadfce3c65 Mon Sep 17 00:00:00 2001
+From: Naushir Patuck <naush@raspberrypi.com>
+Date: Wed, 8 Dec 2021 13:22:48 +0100
+Subject: [PATCH 617/828] media: imx219: Advertise embedded data node on media
+ pad 1
+
+This commit updates the imx219 driver to adverise support for embedded
+data streams.  This can then be used by the bcm2835-unicam driver, which
+has recently been updated to expose the embedded data stream to
+userland.
+
+The imx219 sensor subdevice overloads the media pad to differentiate
+between image stream (pad 0) and embedded data stream (pad 1) when
+performing the v4l2_subdev_pad_ops functions.
+
+Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
+[JMH: Adapt to the mainline 5.16 kernel]
+Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
+---
+ drivers/media/i2c/imx219.c | 254 ++++++++++++++++++++++++-------------
+ 1 file changed, 169 insertions(+), 85 deletions(-)
+
+--- a/drivers/media/i2c/imx219.c
++++ b/drivers/media/i2c/imx219.c
+@@ -118,6 +118,16 @@
+ #define IMX219_PIXEL_ARRAY_WIDTH	3280U
+ #define IMX219_PIXEL_ARRAY_HEIGHT	2464U
+ 
++/* Embedded metadata stream structure */
++#define IMX219_EMBEDDED_LINE_WIDTH 16384
++#define IMX219_NUM_EMBEDDED_LINES 1
++
++enum pad_types {
++	IMAGE_PAD,
++	METADATA_PAD,
++	NUM_PADS
++};
++
+ struct imx219_reg {
+ 	u16 address;
+ 	u8 val;
+@@ -538,7 +548,7 @@ static const struct imx219_mode supporte
+ 
+ struct imx219 {
+ 	struct v4l2_subdev sd;
+-	struct media_pad pad;
++	struct media_pad pad[NUM_PADS];
+ 
+ 	struct v4l2_mbus_framefmt fmt;
+ 
+@@ -688,18 +698,26 @@ static void imx219_set_default_format(st
+ static int imx219_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+ {
+ 	struct imx219 *imx219 = to_imx219(sd);
+-	struct v4l2_mbus_framefmt *try_fmt =
+-		v4l2_subdev_get_try_format(sd, fh->state, 0);
++	struct v4l2_mbus_framefmt *try_fmt_img =
++		v4l2_subdev_get_try_format(sd, fh->state, IMAGE_PAD);
++	struct v4l2_mbus_framefmt *try_fmt_meta =
++		v4l2_subdev_get_try_format(sd, fh->state, METADATA_PAD);
+ 	struct v4l2_rect *try_crop;
+ 
+ 	mutex_lock(&imx219->mutex);
+ 
+-	/* Initialize try_fmt */
+-	try_fmt->width = supported_modes[0].width;
+-	try_fmt->height = supported_modes[0].height;
+-	try_fmt->code = imx219_get_format_code(imx219,
+-					       MEDIA_BUS_FMT_SRGGB10_1X10);
+-	try_fmt->field = V4L2_FIELD_NONE;
++	/* Initialize try_fmt for the image pad */
++	try_fmt_img->width = supported_modes[0].width;
++	try_fmt_img->height = supported_modes[0].height;
++	try_fmt_img->code = imx219_get_format_code(imx219,
++						   MEDIA_BUS_FMT_SRGGB10_1X10);
++	try_fmt_img->field = V4L2_FIELD_NONE;
++
++	/* Initialize try_fmt for the embedded metadata pad */
++	try_fmt_meta->width = IMX219_EMBEDDED_LINE_WIDTH;
++	try_fmt_meta->height = IMX219_NUM_EMBEDDED_LINES;
++	try_fmt_meta->code = MEDIA_BUS_FMT_SENSOR_DATA;
++	try_fmt_meta->field = V4L2_FIELD_NONE;
+ 
+ 	/* Initialize try_crop rectangle. */
+ 	try_crop = v4l2_subdev_get_try_crop(sd, fh->state, 0);
+@@ -808,12 +826,21 @@ static int imx219_enum_mbus_code(struct
+ {
+ 	struct imx219 *imx219 = to_imx219(sd);
+ 
+-	if (code->index >= (ARRAY_SIZE(codes) / 4))
++	if (code->pad >= NUM_PADS)
+ 		return -EINVAL;
+ 
+-	mutex_lock(&imx219->mutex);
+-	code->code = imx219_get_format_code(imx219, codes[code->index * 4]);
+-	mutex_unlock(&imx219->mutex);
++	if (code->pad == IMAGE_PAD) {
++		if (code->index >= (ARRAY_SIZE(codes) / 4))
++			return -EINVAL;
++
++		code->code = imx219_get_format_code(imx219,
++						    codes[code->index * 4]);
++	} else {
++		if (code->index > 0)
++			return -EINVAL;
++
++		code->code = MEDIA_BUS_FMT_SENSOR_DATA;
++	}
+ 
+ 	return 0;
+ }
+@@ -823,21 +850,30 @@ static int imx219_enum_frame_size(struct
+ 				  struct v4l2_subdev_frame_size_enum *fse)
+ {
+ 	struct imx219 *imx219 = to_imx219(sd);
+-	u32 code;
+ 
+-	if (fse->index >= ARRAY_SIZE(supported_modes))
++	if (fse->pad >= NUM_PADS)
+ 		return -EINVAL;
+ 
+-	mutex_lock(&imx219->mutex);
+-	code = imx219_get_format_code(imx219, fse->code);
+-	mutex_unlock(&imx219->mutex);
+-	if (fse->code != code)
+-		return -EINVAL;
++	if (fse->pad == IMAGE_PAD) {
++		if (fse->index >= ARRAY_SIZE(supported_modes))
++			return -EINVAL;
++
++		if (fse->code != imx219_get_format_code(imx219, fse->code))
++			return -EINVAL;
++
++		fse->min_width = supported_modes[fse->index].width;
++		fse->max_width = fse->min_width;
++		fse->min_height = supported_modes[fse->index].height;
++		fse->max_height = fse->min_height;
++	} else {
++		if (fse->code != MEDIA_BUS_FMT_SENSOR_DATA || fse->index > 0)
++			return -EINVAL;
+ 
+-	fse->min_width = supported_modes[fse->index].width;
+-	fse->max_width = fse->min_width;
+-	fse->min_height = supported_modes[fse->index].height;
+-	fse->max_height = fse->min_height;
++		fse->min_width = IMX219_EMBEDDED_LINE_WIDTH;
++		fse->max_width = fse->min_width;
++		fse->min_height = IMX219_NUM_EMBEDDED_LINES;
++		fse->max_height = fse->min_height;
++	}
+ 
+ 	return 0;
+ }
+@@ -852,9 +888,9 @@ static void imx219_reset_colorspace(stru
+ 	fmt->xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(fmt->colorspace);
+ }
+ 
+-static void imx219_update_pad_format(struct imx219 *imx219,
+-				     const struct imx219_mode *mode,
+-				     struct v4l2_subdev_format *fmt)
++static void imx219_update_image_pad_format(struct imx219 *imx219,
++					   const struct imx219_mode *mode,
++					   struct v4l2_subdev_format *fmt)
+ {
+ 	fmt->format.width = mode->width;
+ 	fmt->format.height = mode->height;
+@@ -862,21 +898,39 @@ static void imx219_update_pad_format(str
+ 	imx219_reset_colorspace(&fmt->format);
+ }
+ 
++static void imx219_update_metadata_pad_format(struct v4l2_subdev_format *fmt)
++{
++	fmt->format.width = IMX219_EMBEDDED_LINE_WIDTH;
++	fmt->format.height = IMX219_NUM_EMBEDDED_LINES;
++	fmt->format.code = MEDIA_BUS_FMT_SENSOR_DATA;
++	fmt->format.field = V4L2_FIELD_NONE;
++}
++
+ static int __imx219_get_pad_format(struct imx219 *imx219,
+ 				   struct v4l2_subdev_state *sd_state,
+ 				   struct v4l2_subdev_format *fmt)
+ {
++	if (fmt->pad >= NUM_PADS)
++		return -EINVAL;
++
+ 	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
+ 		struct v4l2_mbus_framefmt *try_fmt =
+ 			v4l2_subdev_get_try_format(&imx219->sd, sd_state,
+ 						   fmt->pad);
+ 		/* update the code which could change due to vflip or hflip: */
+-		try_fmt->code = imx219_get_format_code(imx219, try_fmt->code);
++		try_fmt->code = fmt->pad == IMAGE_PAD ?
++				imx219_get_format_code(imx219, try_fmt->code) :
++				MEDIA_BUS_FMT_SENSOR_DATA;
+ 		fmt->format = *try_fmt;
+ 	} else {
+-		imx219_update_pad_format(imx219, imx219->mode, fmt);
+-		fmt->format.code = imx219_get_format_code(imx219,
+-							  imx219->fmt.code);
++		if (fmt->pad == IMAGE_PAD) {
++			imx219_update_image_pad_format(imx219, imx219->mode,
++						       fmt);
++			fmt->format.code = imx219_get_format_code(imx219,
++							      imx219->fmt.code);
++		} else {
++			imx219_update_metadata_pad_format(fmt);
++		}
+ 	}
+ 
+ 	return 0;
+@@ -906,51 +960,74 @@ static int imx219_set_pad_format(struct
+ 	int exposure_max, exposure_def, hblank;
+ 	unsigned int i;
+ 
+-	mutex_lock(&imx219->mutex);
+-
+-	for (i = 0; i < ARRAY_SIZE(codes); i++)
+-		if (codes[i] == fmt->format.code)
+-			break;
+-	if (i >= ARRAY_SIZE(codes))
+-		i = 0;
++	if (fmt->pad >= NUM_PADS)
++		return -EINVAL;
+ 
+-	/* Bayer order varies with flips */
+-	fmt->format.code = imx219_get_format_code(imx219, codes[i]);
++	mutex_lock(&imx219->mutex);
+ 
+-	mode = v4l2_find_nearest_size(supported_modes,
+-				      ARRAY_SIZE(supported_modes),
+-				      width, height,
+-				      fmt->format.width, fmt->format.height);
+-	imx219_update_pad_format(imx219, mode, fmt);
+-	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
+-		framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
+-		*framefmt = fmt->format;
+-	} else if (imx219->mode != mode ||
+-		   imx219->fmt.code != fmt->format.code) {
+-		imx219->fmt = fmt->format;
+-		imx219->mode = mode;
+-		/* Update limits and set FPS to default */
+-		__v4l2_ctrl_modify_range(imx219->vblank, IMX219_VBLANK_MIN,
+-					 IMX219_VTS_MAX - mode->height, 1,
+-					 mode->vts_def - mode->height);
+-		__v4l2_ctrl_s_ctrl(imx219->vblank,
+-				   mode->vts_def - mode->height);
+-		/* Update max exposure while meeting expected vblanking */
+-		exposure_max = mode->vts_def - 4;
+-		exposure_def = (exposure_max < IMX219_EXPOSURE_DEFAULT) ?
+-			exposure_max : IMX219_EXPOSURE_DEFAULT;
+-		__v4l2_ctrl_modify_range(imx219->exposure,
+-					 imx219->exposure->minimum,
+-					 exposure_max, imx219->exposure->step,
+-					 exposure_def);
+-		/*
+-		 * Currently PPL is fixed to IMX219_PPL_DEFAULT, so hblank
+-		 * depends on mode->width only, and is not changeble in any
+-		 * way other than changing the mode.
+-		 */
+-		hblank = IMX219_PPL_DEFAULT - mode->width;
+-		__v4l2_ctrl_modify_range(imx219->hblank, hblank, hblank, 1,
+-					 hblank);
++	if (fmt->pad == IMAGE_PAD) {
++		for (i = 0; i < ARRAY_SIZE(codes); i++)
++			if (codes[i] == fmt->format.code)
++				break;
++		if (i >= ARRAY_SIZE(codes))
++			i = 0;
++
++		/* Bayer order varies with flips */
++		fmt->format.code = imx219_get_format_code(imx219, codes[i]);
++
++		mode = v4l2_find_nearest_size(supported_modes,
++					      ARRAY_SIZE(supported_modes),
++					      width, height,
++					      fmt->format.width,
++					      fmt->format.height);
++		imx219_update_image_pad_format(imx219, mode, fmt);
++		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
++			framefmt = v4l2_subdev_get_try_format(sd, sd_state,
++							      fmt->pad);
++			*framefmt = fmt->format;
++		} else if (imx219->mode != mode ||
++			imx219->fmt.code != fmt->format.code) {
++			imx219->fmt = fmt->format;
++			imx219->mode = mode;
++			/* Update limits and set FPS to default */
++			__v4l2_ctrl_modify_range(imx219->vblank,
++						 IMX219_VBLANK_MIN,
++						 IMX219_VTS_MAX - mode->height,
++						 1,
++						 mode->vts_def - mode->height);
++			__v4l2_ctrl_s_ctrl(imx219->vblank,
++					   mode->vts_def - mode->height);
++			/*
++			 * Update max exposure while meeting
++			 * expected vblanking
++			 */
++			exposure_max = mode->vts_def - 4;
++			exposure_def =
++				(exposure_max < IMX219_EXPOSURE_DEFAULT) ?
++					exposure_max : IMX219_EXPOSURE_DEFAULT;
++			__v4l2_ctrl_modify_range(imx219->exposure,
++						 imx219->exposure->minimum,
++						 exposure_max,
++						 imx219->exposure->step,
++						 exposure_def);
++			/*
++			 * Currently PPL is fixed to IMX219_PPL_DEFAULT, so
++			 * hblank depends on mode->width only, and is not
++			 * changeble in any way other than changing the mode.
++			 */
++			hblank = IMX219_PPL_DEFAULT - mode->width;
++			__v4l2_ctrl_modify_range(imx219->hblank, hblank, hblank,
++						 1, hblank);
++		}
++	} else {
++		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
++			framefmt = v4l2_subdev_get_try_format(sd, sd_state,
++							      fmt->pad);
++			*framefmt = fmt->format;
++		} else {
++			/* Only one embedded data mode is supported */
++			imx219_update_metadata_pad_format(fmt);
++		}
+ 	}
+ 
+ 	mutex_unlock(&imx219->mutex);
+@@ -1037,9 +1114,11 @@ static int imx219_start_streaming(struct
+ 	const struct imx219_reg_list *reg_list;
+ 	int ret;
+ 
+-	ret = pm_runtime_resume_and_get(&client->dev);
+-	if (ret < 0)
++	ret = pm_runtime_get_sync(&client->dev);
++	if (ret < 0) {
++		pm_runtime_put_noidle(&client->dev);
+ 		return ret;
++	}
+ 
+ 	/* Apply default values of current mode */
+ 	reg_list = &imx219->mode->reg_list;
+@@ -1133,21 +1212,22 @@ err_unlock:
+ /* Power/clock management functions */
+ static int imx219_power_on(struct device *dev)
+ {
+-	struct v4l2_subdev *sd = dev_get_drvdata(dev);
++	struct i2c_client *client = to_i2c_client(dev);
++	struct v4l2_subdev *sd = i2c_get_clientdata(client);
+ 	struct imx219 *imx219 = to_imx219(sd);
+ 	int ret;
+ 
+ 	ret = regulator_bulk_enable(IMX219_NUM_SUPPLIES,
+ 				    imx219->supplies);
+ 	if (ret) {
+-		dev_err(dev, "%s: failed to enable regulators\n",
++		dev_err(&client->dev, "%s: failed to enable regulators\n",
+ 			__func__);
+ 		return ret;
+ 	}
+ 
+ 	ret = clk_prepare_enable(imx219->xclk);
+ 	if (ret) {
+-		dev_err(dev, "%s: failed to enable clock\n",
++		dev_err(&client->dev, "%s: failed to enable clock\n",
+ 			__func__);
+ 		goto reg_off;
+ 	}
+@@ -1166,7 +1246,8 @@ reg_off:
+ 
+ static int imx219_power_off(struct device *dev)
+ {
+-	struct v4l2_subdev *sd = dev_get_drvdata(dev);
++	struct i2c_client *client = to_i2c_client(dev);
++	struct v4l2_subdev *sd = i2c_get_clientdata(client);
+ 	struct imx219 *imx219 = to_imx219(sd);
+ 
+ 	gpiod_set_value_cansleep(imx219->reset_gpio, 0);
+@@ -1178,7 +1259,8 @@ static int imx219_power_off(struct devic
+ 
+ static int __maybe_unused imx219_suspend(struct device *dev)
+ {
+-	struct v4l2_subdev *sd = dev_get_drvdata(dev);
++	struct i2c_client *client = to_i2c_client(dev);
++	struct v4l2_subdev *sd = i2c_get_clientdata(client);
+ 	struct imx219 *imx219 = to_imx219(sd);
+ 
+ 	if (imx219->streaming)
+@@ -1189,7 +1271,8 @@ static int __maybe_unused imx219_suspend
+ 
+ static int __maybe_unused imx219_resume(struct device *dev)
+ {
+-	struct v4l2_subdev *sd = dev_get_drvdata(dev);
++	struct i2c_client *client = to_i2c_client(dev);
++	struct v4l2_subdev *sd = i2c_get_clientdata(client);
+ 	struct imx219 *imx219 = to_imx219(sd);
+ 	int ret;
+ 
+@@ -1525,13 +1608,14 @@ static int imx219_probe(struct i2c_clien
+ 			    V4L2_SUBDEV_FL_HAS_EVENTS;
+ 	imx219->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
+ 
+-	/* Initialize source pad */
+-	imx219->pad.flags = MEDIA_PAD_FL_SOURCE;
++	/* Initialize source pads */
++	imx219->pad[IMAGE_PAD].flags = MEDIA_PAD_FL_SOURCE;
++	imx219->pad[METADATA_PAD].flags = MEDIA_PAD_FL_SOURCE;
+ 
+ 	/* Initialize default format */
+ 	imx219_set_default_format(imx219);
+ 
+-	ret = media_entity_pads_init(&imx219->sd.entity, 1, &imx219->pad);
++	ret = media_entity_pads_init(&imx219->sd.entity, NUM_PADS, imx219->pad);
+ 	if (ret) {
+ 		dev_err(dev, "failed to init entity pads: %d\n", ret);
+ 		goto error_handler_free;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0618-vc4-drm-Ignore-vc4_hdmi-output_enabled-for-allowing-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0618-vc4-drm-Ignore-vc4_hdmi-output_enabled-for-allowing-.patch
new file mode 100644
index 00000000..44cbfdc5
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0618-vc4-drm-Ignore-vc4_hdmi-output_enabled-for-allowing-.patch
@@ -0,0 +1,98 @@
+From 7caeb12fec3190b3075b51aadcdad5eea4948593 Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Wed, 8 Dec 2021 15:57:15 +0000
+Subject: [PATCH 618/828] vc4/drm: Ignore vc4_hdmi->output_enabled for allowing
+ audio (#4759)
+
+Otherwise we reject audio playback when switching hdmi modes
+
+Signed-off-by: Dom Cobley <popcornmix@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 29 ++---------------------------
+ drivers/gpu/drm/vc4/vc4_hdmi.h |  6 ------
+ 2 files changed, 2 insertions(+), 33 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -210,6 +210,7 @@ vc4_hdmi_connector_detect(struct drm_con
+ 			connected = true;
+ 	}
+ 
++	vc4_hdmi->encoder.hdmi_monitor = false;
+ 	if (connected) {
+ 		if (connector->status != connector_status_connected) {
+ 			struct edid *edid = drm_get_edid(connector, vc4_hdmi->ddc);
+@@ -730,15 +731,6 @@ static void vc4_hdmi_encoder_post_crtc_p
+ 	mutex_unlock(&vc4_hdmi->mutex);
+ }
+ 
+-static void vc4_hdmi_encoder_disable(struct drm_encoder *encoder)
+-{
+-	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
+-
+-	mutex_lock(&vc4_hdmi->mutex);
+-	vc4_hdmi->output_enabled = false;
+-	mutex_unlock(&vc4_hdmi->mutex);
+-}
+-
+ static void vc4_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi, bool enable)
+ {
+ 	unsigned long flags;
+@@ -1218,15 +1210,6 @@ static void vc4_hdmi_encoder_post_crtc_e
+ 	mutex_unlock(&vc4_hdmi->mutex);
+ }
+ 
+-static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder)
+-{
+-	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
+-
+-	mutex_lock(&vc4_hdmi->mutex);
+-	vc4_hdmi->output_enabled = true;
+-	mutex_unlock(&vc4_hdmi->mutex);
+-}
+-
+ static void vc4_hdmi_encoder_atomic_mode_set(struct drm_encoder *encoder,
+ 					     struct drm_crtc_state *crtc_state,
+ 					     struct drm_connector_state *conn_state)
+@@ -1320,8 +1303,6 @@ static const struct drm_encoder_helper_f
+ 	.atomic_check = vc4_hdmi_encoder_atomic_check,
+ 	.atomic_mode_set = vc4_hdmi_encoder_atomic_mode_set,
+ 	.mode_valid = vc4_hdmi_encoder_mode_valid,
+-	.disable = vc4_hdmi_encoder_disable,
+-	.enable = vc4_hdmi_encoder_enable,
+ };
+ 
+ static u32 vc4_hdmi_channel_map(struct vc4_hdmi *vc4_hdmi, u32 channel_mask)
+@@ -1421,16 +1402,10 @@ static bool vc4_hdmi_audio_can_stream(st
+ 	lockdep_assert_held(&vc4_hdmi->mutex);
+ 
+ 	/*
+-	 * If the controller is disabled, prevent any ALSA output.
+-	 */
+-	if (!vc4_hdmi->output_enabled)
+-		return false;
+-
+-	/*
+ 	 * If the encoder is currently in DVI mode, treat the codec DAI
+ 	 * as missing.
+ 	 */
+-	if (!(HDMI_READ(HDMI_RAM_PACKET_CONFIG) & VC4_HDMI_RAM_PACKET_ENABLE))
++	if (!vc4_hdmi->encoder.hdmi_monitor)
+ 		return false;
+ 
+ 	return true;
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
+@@ -209,12 +209,6 @@ struct vc4_hdmi {
+ 	struct drm_display_mode saved_adjusted_mode;
+ 
+ 	/**
+-	 * @output_enabled: Is the HDMI controller currently active?
+-	 * Protected by @mutex.
+-	 */
+-	bool output_enabled;
+-
+-	/**
+ 	 * @scdc_enabled: Is the HDMI controller currently running with
+ 	 * the scrambler on? Protected by @mutex.
+ 	 */
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0619-ARM-dts-Create-bcm2711-rpi-cm4s.dts-4761.patch b/root/target/linux/bcm27xx/patches-5.15/950-0619-ARM-dts-Create-bcm2711-rpi-cm4s.dts-4761.patch
new file mode 100644
index 00000000..02d593a7
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0619-ARM-dts-Create-bcm2711-rpi-cm4s.dts-4761.patch
@@ -0,0 +1,425 @@
+From fcb9a14c19d4cebcd7c0a29ec90e557ee29f3744 Mon Sep 17 00:00:00 2001
+From: peterharperuk <77111776+peterharperuk@users.noreply.github.com>
+Date: Mon, 13 Dec 2021 14:00:35 +0000
+Subject: [PATCH 619/828] ARM: dts: Create bcm2711-rpi-cm4s.dts (#4761)
+
+Signed-off-by: Peter Harper <peter.harper@raspberrypi.com>
+---
+ arch/arm/boot/dts/Makefile             |   3 +-
+ arch/arm/boot/dts/bcm2711-rpi-cm4s.dts | 398 +++++++++++++++++++++++++
+ 2 files changed, 400 insertions(+), 1 deletion(-)
+ create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -16,7 +16,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
+ 	bcm2711-rpi-4-b.dtb \
+ 	bcm2711-rpi-400.dtb \
+ 	bcm2710-rpi-cm3.dtb \
+-	bcm2711-rpi-cm4.dtb
++	bcm2711-rpi-cm4.dtb \
++	bcm2711-rpi-cm4s.dtb
+ 
+ dtb-$(CONFIG_ARCH_ALPINE) += \
+ 	alpine-db.dtb
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
+@@ -0,0 +1,398 @@
++// SPDX-License-Identifier: GPL-2.0
++/dts-v1/;
++#include "bcm2711.dtsi"
++#include "bcm2711-rpi.dtsi"
++
++/ {
++	compatible = "raspberrypi,4-compute-module-s", "brcm,bcm2711";
++	model = "Raspberry Pi Compute Module 4S";
++
++	chosen {
++		/* 8250 auxiliary UART instead of pl011 */
++		stdout-path = "serial1:115200n8";
++	};
++
++	leds {
++		led-act {
++			gpios = <&virtgpio 0 0>;
++		};
++	};
++};
++
++&ddc0 {
++	status = "okay";
++};
++
++&gpio {
++	/*
++	 * Parts taken from rpi_SCH_4b_4p0_reduced.pdf and
++	 * the official GPU firmware DT blob.
++	 *
++	 * Legend:
++	 * "FOO" = GPIO line named "FOO" on the schematic
++	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
++	 */
++	gpio-line-names = "ID_SDA",
++			  "ID_SCL",
++			  "SDA1",
++			  "SCL1",
++			  "GPIO_GCLK",
++			  "GPIO5",
++			  "GPIO6",
++			  "SPI_CE1_N",
++			  "SPI_CE0_N",
++			  "SPI_MISO",
++			  "SPI_MOSI",
++			  "SPI_SCLK",
++			  "GPIO12",
++			  "GPIO13",
++			  /* Serial port */
++			  "TXD1",
++			  "RXD1",
++			  "GPIO16",
++			  "GPIO17",
++			  "GPIO18",
++			  "GPIO19",
++			  "GPIO20",
++			  "GPIO21",
++			  "GPIO22",
++			  "GPIO23",
++			  "GPIO24",
++			  "GPIO25",
++			  "GPIO26",
++			  "GPIO27",
++			  "GPIO28",
++			  "GPIO29",
++			  "GPIO30",
++			  "GPIO31",
++			  "GPIO32",
++			  "GPIO33",
++			  "GPIO34",
++			  "GPIO35",
++			  "GPIO36",
++			  "GPIO37",
++			  "GPIO38",
++			  "GPIO39",
++			  "PWM0_MISO",
++			  "PWM1_MOSI",
++			  "GPIO42",
++			  "GPIO43",
++			  "GPIO44",
++			  "GPIO45";
++};
++
++&hdmi0 {
++	status = "okay";
++};
++
++&pixelvalve0 {
++	status = "okay";
++};
++
++&pixelvalve1 {
++	status = "okay";
++};
++
++&pixelvalve2 {
++	status = "okay";
++};
++
++&pixelvalve4 {
++	status = "okay";
++};
++
++&pwm1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&pwm1_0_gpio40 &pwm1_1_gpio41>;
++	status = "okay";
++};
++
++/* EMMC2 is used to drive the EMMC card */
++&emmc2 {
++	bus-width = <8>;
++	broken-cd;
++	status = "okay";
++};
++
++&pcie0 {
++	status = "disabled";
++};
++
++&vchiq {
++	interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
++};
++
++&vc4 {
++	status = "okay";
++};
++
++&vec {
++	status = "disabled";
++};
++
++// =============================================
++// Downstream rpi- changes
++
++#define BCM2711
++
++#include "bcm270x.dtsi"
++#include "bcm2711-rpi-ds.dtsi"
++
++/ {
++	soc {
++		/delete-node/ pixelvalve@7e807000;
++		/delete-node/ hdmi@7e902000;
++
++		virtgpio: virtgpio {
++			compatible = "brcm,bcm2835-virtgpio";
++			gpio-controller;
++			#gpio-cells = <2>;
++			firmware = <&firmware>;
++			status = "okay";
++		};
++	};
++};
++
++#include "bcm283x-rpi-csi0-2lane.dtsi"
++#include "bcm283x-rpi-csi1-4lane.dtsi"
++#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
++#include "bcm283x-rpi-cam1-regulator.dtsi"
++
++/ {
++	chosen {
++		bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
++	};
++
++	aliases {
++		serial0 = &uart0;
++		mmc0 = &emmc2;
++		mmc1 = &mmcnr;
++		mmc2 = &sdhost;
++		i2c3 = &i2c3;
++		i2c4 = &i2c4;
++		i2c5 = &i2c5;
++		i2c6 = &i2c6;
++		spi3 = &spi3;
++		spi4 = &spi4;
++		spi5 = &spi5;
++		spi6 = &spi6;
++		/delete-property/ intc;
++	};
++
++	/delete-node/ wifi-pwrseq;
++};
++
++&uart0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart0_pins>;
++	status = "okay";
++};
++
++&spi0 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
++	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
++
++	spidev0: spidev@0{
++		compatible = "spidev";
++		reg = <0>;	/* CE0 */
++		#address-cells = <1>;
++		#size-cells = <0>;
++		spi-max-frequency = <125000000>;
++	};
++
++	spidev1: spidev@1{
++		compatible = "spidev";
++		reg = <1>;	/* CE1 */
++		#address-cells = <1>;
++		#size-cells = <0>;
++		spi-max-frequency = <125000000>;
++	};
++};
++
++&gpio {
++	spi0_pins: spi0_pins {
++		brcm,pins = <9 10 11>;
++		brcm,function = <BCM2835_FSEL_ALT0>;
++	};
++
++	spi0_cs_pins: spi0_cs_pins {
++		brcm,pins = <8 7>;
++		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
++	};
++
++	spi3_pins: spi3_pins {
++		brcm,pins = <1 2 3>;
++		brcm,function = <BCM2835_FSEL_ALT3>;
++	};
++
++	spi3_cs_pins: spi3_cs_pins {
++		brcm,pins = <0 24>;
++		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
++	};
++
++	spi4_pins: spi4_pins {
++		brcm,pins = <5 6 7>;
++		brcm,function = <BCM2835_FSEL_ALT3>;
++	};
++
++	spi4_cs_pins: spi4_cs_pins {
++		brcm,pins = <4 25>;
++		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
++	};
++
++	spi5_pins: spi5_pins {
++		brcm,pins = <13 14 15>;
++		brcm,function = <BCM2835_FSEL_ALT3>;
++	};
++
++	spi5_cs_pins: spi5_cs_pins {
++		brcm,pins = <12 26>;
++		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
++	};
++
++	spi6_pins: spi6_pins {
++		brcm,pins = <19 20 21>;
++		brcm,function = <BCM2835_FSEL_ALT3>;
++	};
++
++	spi6_cs_pins: spi6_cs_pins {
++		brcm,pins = <18 27>;
++		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
++	};
++
++	i2c0_pins: i2c0 {
++		brcm,pins = <0 1>;
++		brcm,function = <BCM2835_FSEL_ALT0>;
++		brcm,pull = <BCM2835_PUD_UP>;
++	};
++
++	i2c1_pins: i2c1 {
++		brcm,pins = <2 3>;
++		brcm,function = <BCM2835_FSEL_ALT0>;
++		brcm,pull = <BCM2835_PUD_UP>;
++	};
++
++	i2c3_pins: i2c3 {
++		brcm,pins = <4 5>;
++		brcm,function = <BCM2835_FSEL_ALT5>;
++		brcm,pull = <BCM2835_PUD_UP>;
++	};
++
++	i2c4_pins: i2c4 {
++		brcm,pins = <8 9>;
++		brcm,function = <BCM2835_FSEL_ALT5>;
++		brcm,pull = <BCM2835_PUD_UP>;
++	};
++
++	i2c5_pins: i2c5 {
++		brcm,pins = <12 13>;
++		brcm,function = <BCM2835_FSEL_ALT5>;
++		brcm,pull = <BCM2835_PUD_UP>;
++	};
++
++	i2c6_pins: i2c6 {
++		brcm,pins = <22 23>;
++		brcm,function = <BCM2835_FSEL_ALT5>;
++		brcm,pull = <BCM2835_PUD_UP>;
++	};
++
++	i2s_pins: i2s {
++		brcm,pins = <18 19 20 21>;
++		brcm,function = <BCM2835_FSEL_ALT0>;
++	};
++
++	sdio_pins: sdio_pins {
++		brcm,pins =     <34 35 36 37 38 39>;
++		brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
++		brcm,pull =     <0 2 2 2 2 2>;
++	};
++
++	uart0_pins: uart0_pins {
++		brcm,pins;
++		brcm,function;
++		brcm,pull;
++	};
++
++	uart2_pins: uart2_pins {
++		brcm,pins = <0 1>;
++		brcm,function = <BCM2835_FSEL_ALT4>;
++		brcm,pull = <0 2>;
++	};
++
++	uart3_pins: uart3_pins {
++		brcm,pins = <4 5>;
++		brcm,function = <BCM2835_FSEL_ALT4>;
++		brcm,pull = <0 2>;
++	};
++
++	uart4_pins: uart4_pins {
++		brcm,pins = <8 9>;
++		brcm,function = <BCM2835_FSEL_ALT4>;
++		brcm,pull = <0 2>;
++	};
++
++	uart5_pins: uart5_pins {
++		brcm,pins = <12 13>;
++		brcm,function = <BCM2835_FSEL_ALT4>;
++		brcm,pull = <0 2>;
++	};
++};
++
++&i2c0if {
++	clock-frequency = <100000>;
++};
++
++&i2c1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&i2c1_pins>;
++	clock-frequency = <100000>;
++};
++
++&i2s {
++	pinctrl-names = "default";
++	pinctrl-0 = <&i2s_pins>;
++};
++
++// =============================================
++// Board specific stuff here
++
++&sdhost {
++	status = "disabled";
++};
++
++&gpio {
++	audio_pins: audio_pins {
++		brcm,pins = <>;
++		brcm,function = <>;
++	};
++};
++
++&leds {
++	act_led: led-act {
++		label = "led0";
++		linux,default-trigger = "mmc0";
++	};
++};
++
++&pwm1 {
++	status = "disabled";
++};
++
++&audio {
++	pinctrl-names = "default";
++	pinctrl-0 = <&audio_pins>;
++	brcm,disable-headphones = <1>;
++};
++
++/ {
++	__overrides__ {
++		act_led_gpio = <&act_led>,"gpios:4";
++		act_led_activelow = <&act_led>,"gpios:8";
++		act_led_trigger = <&act_led>,"linux,default-trigger";
++
++		sd_poll_once = <&emmc2>, "non-removable?";
++		spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
++			   <&spi0>, "dmas:8=", <&dma40>;
++	};
++};
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0620-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch b/root/target/linux/bcm27xx/patches-5.15/950-0620-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
new file mode 100644
index 00000000..050f35ab
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0620-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
@@ -0,0 +1,258 @@
+From f5e290a1bc3d622fd08a6b27d5121418f2a16333 Mon Sep 17 00:00:00 2001
+From: Jonathan Bell <jonathan@raspberrypi.com>
+Date: Mon, 13 Dec 2021 15:05:56 +0000
+Subject: [PATCH 620/828] xhci: refactor out TRBS_PER_SEGMENT define in runtime
+ code
+
+In anticipation of adjusting the number of utilised TRBs in a ring
+segment, add trbs_per_seg to struct xhci_ring and use this instead
+of a compile-time define.
+
+Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
+---
+ drivers/usb/host/xhci-mem.c  | 48 +++++++++++++++++++-----------------
+ drivers/usb/host/xhci-ring.c | 20 +++++++++------
+ drivers/usb/host/xhci.c      |  6 ++---
+ drivers/usb/host/xhci.h      |  1 +
+ 4 files changed, 42 insertions(+), 33 deletions(-)
+
+--- a/drivers/usb/host/xhci-mem.c
++++ b/drivers/usb/host/xhci-mem.c
+@@ -98,6 +98,7 @@ static void xhci_free_segments_for_ring(
+  */
+ static void xhci_link_segments(struct xhci_segment *prev,
+ 			       struct xhci_segment *next,
++			       unsigned int trbs_per_seg,
+ 			       enum xhci_ring_type type, bool chain_links)
+ {
+ 	u32 val;
+@@ -106,16 +107,16 @@ static void xhci_link_segments(struct xh
+ 		return;
+ 	prev->next = next;
+ 	if (type != TYPE_EVENT) {
+-		prev->trbs[TRBS_PER_SEGMENT-1].link.segment_ptr =
++		prev->trbs[trbs_per_seg - 1].link.segment_ptr =
+ 			cpu_to_le64(next->dma);
+ 
+ 		/* Set the last TRB in the segment to have a TRB type ID of Link TRB */
+-		val = le32_to_cpu(prev->trbs[TRBS_PER_SEGMENT-1].link.control);
++		val = le32_to_cpu(prev->trbs[trbs_per_seg - 1].link.control);
+ 		val &= ~TRB_TYPE_BITMASK;
+ 		val |= TRB_TYPE(TRB_LINK);
+ 		if (chain_links)
+ 			val |= TRB_CHAIN;
+-		prev->trbs[TRBS_PER_SEGMENT-1].link.control = cpu_to_le32(val);
++		prev->trbs[trbs_per_seg - 1].link.control = cpu_to_le32(val);
+ 	}
+ }
+ 
+@@ -139,15 +140,17 @@ static void xhci_link_rings(struct xhci_
+ 			  (xhci->quirks & XHCI_AMD_0x96_HOST)));
+ 
+ 	next = ring->enq_seg->next;
+-	xhci_link_segments(ring->enq_seg, first, ring->type, chain_links);
+-	xhci_link_segments(last, next, ring->type, chain_links);
++	xhci_link_segments(ring->enq_seg, first, ring->trbs_per_seg,
++			   ring->type, chain_links);
++	xhci_link_segments(last, next, ring->trbs_per_seg,
++			   ring->type, chain_links);
+ 	ring->num_segs += num_segs;
+-	ring->num_trbs_free += (TRBS_PER_SEGMENT - 1) * num_segs;
++	ring->num_trbs_free += (ring->trbs_per_seg - 1) * num_segs;
+ 
+ 	if (ring->type != TYPE_EVENT && ring->enq_seg == ring->last_seg) {
+-		ring->last_seg->trbs[TRBS_PER_SEGMENT-1].link.control
++		ring->last_seg->trbs[ring->trbs_per_seg - 1].link.control
+ 			&= ~cpu_to_le32(LINK_TOGGLE);
+-		last->trbs[TRBS_PER_SEGMENT-1].link.control
++		last->trbs[ring->trbs_per_seg - 1].link.control
+ 			|= cpu_to_le32(LINK_TOGGLE);
+ 		ring->last_seg = last;
+ 	}
+@@ -314,14 +317,15 @@ void xhci_initialize_ring_info(struct xh
+ 	 * Each segment has a link TRB, and leave an extra TRB for SW
+ 	 * accounting purpose
+ 	 */
+-	ring->num_trbs_free = ring->num_segs * (TRBS_PER_SEGMENT - 1) - 1;
++	ring->num_trbs_free = ring->num_segs * (ring->trbs_per_seg - 1) - 1;
+ }
+ 
+ /* Allocate segments and link them for a ring */
+ static int xhci_alloc_segments_for_ring(struct xhci_hcd *xhci,
+ 		struct xhci_segment **first, struct xhci_segment **last,
+-		unsigned int num_segs, unsigned int cycle_state,
+-		enum xhci_ring_type type, unsigned int max_packet, gfp_t flags)
++		unsigned int num_segs, unsigned int trbs_per_seg,
++		unsigned int cycle_state, enum xhci_ring_type type,
++		unsigned int max_packet, gfp_t flags)
+ {
+ 	struct xhci_segment *prev;
+ 	bool chain_links;
+@@ -350,12 +354,12 @@ static int xhci_alloc_segments_for_ring(
+ 			}
+ 			return -ENOMEM;
+ 		}
+-		xhci_link_segments(prev, next, type, chain_links);
++		xhci_link_segments(prev, next, trbs_per_seg, type, chain_links);
+ 
+ 		prev = next;
+ 		num_segs--;
+ 	}
+-	xhci_link_segments(prev, *first, type, chain_links);
++	xhci_link_segments(prev, *first, trbs_per_seg, type, chain_links);
+ 	*last = prev;
+ 
+ 	return 0;
+@@ -387,16 +391,17 @@ struct xhci_ring *xhci_ring_alloc(struct
+ 	if (num_segs == 0)
+ 		return ring;
+ 
++	ring->trbs_per_seg = TRBS_PER_SEGMENT;
+ 	ret = xhci_alloc_segments_for_ring(xhci, &ring->first_seg,
+-			&ring->last_seg, num_segs, cycle_state, type,
+-			max_packet, flags);
++			&ring->last_seg, num_segs, ring->trbs_per_seg,
++			cycle_state, type, max_packet, flags);
+ 	if (ret)
+ 		goto fail;
+ 
+ 	/* Only event ring does not use link TRB */
+ 	if (type != TYPE_EVENT) {
+ 		/* See section 4.9.2.1 and 6.4.4.1 */
+-		ring->last_seg->trbs[TRBS_PER_SEGMENT - 1].link.control |=
++		ring->last_seg->trbs[ring->trbs_per_seg - 1].link.control |=
+ 			cpu_to_le32(LINK_TOGGLE);
+ 	}
+ 	xhci_initialize_ring_info(ring, cycle_state);
+@@ -429,16 +434,15 @@ int xhci_ring_expansion(struct xhci_hcd
+ 	unsigned int		num_segs_needed;
+ 	int			ret;
+ 
+-	num_segs_needed = (num_trbs + (TRBS_PER_SEGMENT - 1) - 1) /
+-				(TRBS_PER_SEGMENT - 1);
+-
++	num_segs_needed = (num_trbs + (ring->trbs_per_seg - 1) - 1) /
++				(ring->trbs_per_seg - 1);
+ 	/* Allocate number of segments we needed, or double the ring size */
+ 	num_segs = ring->num_segs > num_segs_needed ?
+ 			ring->num_segs : num_segs_needed;
+ 
+ 	ret = xhci_alloc_segments_for_ring(xhci, &first, &last,
+-			num_segs, ring->cycle_state, ring->type,
+-			ring->bounce_buf_len, flags);
++			num_segs, ring->trbs_per_seg, ring->cycle_state,
++			ring->type, ring->bounce_buf_len, flags);
+ 	if (ret)
+ 		return -ENOMEM;
+ 
+@@ -1811,7 +1815,7 @@ int xhci_alloc_erst(struct xhci_hcd *xhc
+ 	for (val = 0; val < evt_ring->num_segs; val++) {
+ 		entry = &erst->entries[val];
+ 		entry->seg_addr = cpu_to_le64(seg->dma);
+-		entry->seg_size = cpu_to_le32(TRBS_PER_SEGMENT);
++		entry->seg_size = cpu_to_le32(evt_ring->trbs_per_seg);
+ 		entry->rsvd = 0;
+ 		seg = seg->next;
+ 	}
+--- a/drivers/usb/host/xhci-ring.c
++++ b/drivers/usb/host/xhci-ring.c
+@@ -90,15 +90,16 @@ static bool trb_is_link(union xhci_trb *
+ 	return TRB_TYPE_LINK_LE32(trb->link.control);
+ }
+ 
+-static bool last_trb_on_seg(struct xhci_segment *seg, union xhci_trb *trb)
++static bool last_trb_on_seg(struct xhci_segment *seg,
++			    unsigned int trbs_per_seg, union xhci_trb *trb)
+ {
+-	return trb == &seg->trbs[TRBS_PER_SEGMENT - 1];
++	return trb == &seg->trbs[trbs_per_seg - 1];
+ }
+ 
+ static bool last_trb_on_ring(struct xhci_ring *ring,
+ 			struct xhci_segment *seg, union xhci_trb *trb)
+ {
+-	return last_trb_on_seg(seg, trb) && (seg->next == ring->first_seg);
++	return last_trb_on_seg(seg, ring->trbs_per_seg, trb) && (seg->next == ring->first_seg);
+ }
+ 
+ static bool link_trb_toggles_cycle(union xhci_trb *trb)
+@@ -161,7 +162,8 @@ void inc_deq(struct xhci_hcd *xhci, stru
+ 
+ 	/* event ring doesn't have link trbs, check for last trb */
+ 	if (ring->type == TYPE_EVENT) {
+-		if (!last_trb_on_seg(ring->deq_seg, ring->dequeue)) {
++		if (!last_trb_on_seg(ring->deq_seg, ring->trbs_per_seg,
++				     ring->dequeue)) {
+ 			ring->dequeue++;
+ 			goto out;
+ 		}
+@@ -174,7 +176,8 @@ void inc_deq(struct xhci_hcd *xhci, stru
+ 
+ 	/* All other rings have link trbs */
+ 	if (!trb_is_link(ring->dequeue)) {
+-		if (last_trb_on_seg(ring->deq_seg, ring->dequeue)) {
++		if (last_trb_on_seg(ring->deq_seg, ring->trbs_per_seg,
++		    ring->dequeue)) {
+ 			xhci_warn(xhci, "Missing link TRB at end of segment\n");
+ 		} else {
+ 			ring->dequeue++;
+@@ -225,7 +228,7 @@ static void inc_enq(struct xhci_hcd *xhc
+ 	if (!trb_is_link(ring->enqueue))
+ 		ring->num_trbs_free--;
+ 
+-	if (last_trb_on_seg(ring->enq_seg, ring->enqueue)) {
++	if (last_trb_on_seg(ring->enq_seg, ring->trbs_per_seg, ring->enqueue)) {
+ 		xhci_err(xhci, "Tried to move enqueue past ring segment\n");
+ 		return;
+ 	}
+@@ -3153,7 +3156,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd
+ 	 * that clears the EHB.
+ 	 */
+ 	while (xhci_handle_event(xhci) > 0) {
+-		if (event_loop++ < TRBS_PER_SEGMENT / 2)
++		if (event_loop++ < xhci->event_ring->trbs_per_seg / 2)
+ 			continue;
+ 		xhci_update_erst_dequeue(xhci, event_ring_deq);
+ 
+@@ -3294,7 +3297,8 @@ static int prepare_ring(struct xhci_hcd
+ 		}
+ 	}
+ 
+-	if (last_trb_on_seg(ep_ring->enq_seg, ep_ring->enqueue)) {
++	if (last_trb_on_seg(ep_ring->enq_seg, ep_ring->trbs_per_seg,
++	    ep_ring->enqueue)) {
+ 		xhci_warn(xhci, "Missing link TRB at end of ring segment\n");
+ 		return -EINVAL;
+ 	}
+--- a/drivers/usb/host/xhci.c
++++ b/drivers/usb/host/xhci.c
+@@ -855,8 +855,8 @@ static void xhci_clear_command_ring(stru
+ 	seg = ring->deq_seg;
+ 	do {
+ 		memset(seg->trbs, 0,
+-			sizeof(union xhci_trb) * (TRBS_PER_SEGMENT - 1));
+-		seg->trbs[TRBS_PER_SEGMENT - 1].link.control &=
++			sizeof(union xhci_trb) * (ring->trbs_per_seg - 1));
++		seg->trbs[ring->trbs_per_seg - 1].link.control &=
+ 			cpu_to_le32(~TRB_CYCLE);
+ 		seg = seg->next;
+ 	} while (seg != ring->deq_seg);
+@@ -867,7 +867,7 @@ static void xhci_clear_command_ring(stru
+ 	ring->enq_seg = ring->deq_seg;
+ 	ring->enqueue = ring->dequeue;
+ 
+-	ring->num_trbs_free = ring->num_segs * (TRBS_PER_SEGMENT - 1) - 1;
++	ring->num_trbs_free = ring->num_segs * (ring->trbs_per_seg - 1) - 1;
+ 	/*
+ 	 * Ring is now zeroed, so the HW should look for change of ownership
+ 	 * when the cycle bit is set to 1.
+--- a/drivers/usb/host/xhci.h
++++ b/drivers/usb/host/xhci.h
+@@ -1635,6 +1635,7 @@ struct xhci_ring {
+ 	unsigned int		num_trbs_free;
+ 	unsigned int		num_trbs_free_temp;
+ 	unsigned int		bounce_buf_len;
++	unsigned int		trbs_per_seg;
+ 	enum xhci_ring_type	type;
+ 	bool			last_td_was_short;
+ 	struct radix_tree_root	*trb_address_map;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0621-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch b/root/target/linux/bcm27xx/patches-5.15/950-0621-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch
new file mode 100644
index 00000000..f280e638
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0621-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch
@@ -0,0 +1,73 @@
+From 024eac7b2b9552dafd9ed2dd547926a2d4f6adb4 Mon Sep 17 00:00:00 2001
+From: Jonathan Bell <jonathan@raspberrypi.com>
+Date: Mon, 13 Dec 2021 16:04:03 +0000
+Subject: [PATCH 621/828] usb: xhci: add VLI_TRB_CACHE_BUG quirk
+
+The VL805 fetches up to 4 transfer TRBs at a time. TRB reads don't cross
+a 64B boundary, and if a TRB is fetched and is not on a 64B boundary,
+the read is sized up to the next 64B boundary.
+
+However the VL805 implements a readahead prefetch for TRBs on a transfer
+ring. This fetches the next 64B after any TRB read has happened. Near
+the end of a ring segment, the prefetcher can read the first 64B of the
+next page in physical memory and this is where the behaviour causes a
+bug.
+
+The controller does not tag reads with which endpoint they are for, so
+if the start of the next page is a ring segment used by a victim
+endpoint, and the victim endpoint is about to fetch TRBs from the start
+of the segment, the victim endpoint will read from the prefetched data
+and not perform a read to main memory. If the data is stale, the ring
+cycle state bit may not be correct and the endpoint will silently halt.
+
+Adjust trbs_per_seg for transfer rings allocated for this controller.
+
+See https://github.com/raspberrypi/linux/issues/4685
+
+Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
+---
+ drivers/usb/host/xhci-mem.c | 11 +++++++++++
+ drivers/usb/host/xhci-pci.c |  1 +
+ drivers/usb/host/xhci.h     |  1 +
+ 3 files changed, 13 insertions(+)
+
+--- a/drivers/usb/host/xhci-mem.c
++++ b/drivers/usb/host/xhci-mem.c
+@@ -392,6 +392,17 @@ struct xhci_ring *xhci_ring_alloc(struct
+ 		return ring;
+ 
+ 	ring->trbs_per_seg = TRBS_PER_SEGMENT;
++	/*
++	 * The Via VL805 has a bug where cache readahead will fetch off the end
++	 * of a page if the Link TRB of a transfer ring is in the last 4 slots.
++	 * Where there are consecutive physical pages containing ring segments,
++	 * this can cause a desync between the controller's view of a ring
++	 * and the host.
++	 */
++	if (xhci->quirks & XHCI_VLI_TRB_CACHE_BUG &&
++	    type != TYPE_EVENT && type != TYPE_COMMAND)
++		ring->trbs_per_seg -= 4;
++
+ 	ret = xhci_alloc_segments_for_ring(xhci, &ring->first_seg,
+ 			&ring->last_seg, num_segs, ring->trbs_per_seg,
+ 			cycle_state, type, max_packet, flags);
+--- a/drivers/usb/host/xhci-pci.c
++++ b/drivers/usb/host/xhci-pci.c
+@@ -297,6 +297,7 @@ static void xhci_pci_quirks(struct devic
+ 		xhci->quirks |= XHCI_LPM_SUPPORT;
+ 		xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
+ 		xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
++		xhci->quirks |= XHCI_VLI_TRB_CACHE_BUG;
+ 	}
+ 
+ 	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
+--- a/drivers/usb/host/xhci.h
++++ b/drivers/usb/host/xhci.h
+@@ -1905,6 +1905,7 @@ struct xhci_hcd {
+ #define XHCI_BROKEN_D3COLD	BIT_ULL(41)
+ #define XHCI_EP_CTX_BROKEN_DCS	BIT_ULL(42)
+ #define XHCI_AVOID_DQ_ON_LINK	BIT_ULL(43)
++#define XHCI_VLI_TRB_CACHE_BUG	BIT_ULL(44)
+ 
+ 	unsigned int		num_active_eps;
+ 	unsigned int		limit_active_eps;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0622-drm-vc4-Fix-build-without-DRM_VC4_HDMI_CEC.patch b/root/target/linux/bcm27xx/patches-5.15/950-0622-drm-vc4-Fix-build-without-DRM_VC4_HDMI_CEC.patch
new file mode 100644
index 00000000..1e9b5e7d
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0622-drm-vc4-Fix-build-without-DRM_VC4_HDMI_CEC.patch
@@ -0,0 +1,25 @@
+From 3f0f8cad60a783cb2afeeaaeb3ec204296cba525 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Tue, 14 Dec 2021 21:53:18 +0000
+Subject: [PATCH 622/828] drm/vc4: Fix build without DRM_VC4_HDMI_CEC
+
+As reported by @asavah.
+
+Fixes: https://github.com/raspberrypi/linux/issues/4771
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -2280,7 +2280,7 @@ static int vc4_hdmi_cec_init(struct vc4_
+ 
+ static void vc4_hdmi_cec_exit(struct vc4_hdmi *vc4_hdmi) {};
+ 
+-static void vc4_hdmi_cec_resume(struct vc4_hdmi *vc4_hdmi)
++static int vc4_hdmi_cec_resume(struct vc4_hdmi *vc4_hdmi)
+ {
+ 	return 0;
+ }
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0623-dt-Create-static-regulators-and-clocks-for-camera-no.patch b/root/target/linux/bcm27xx/patches-5.15/950-0623-dt-Create-static-regulators-and-clocks-for-camera-no.patch
new file mode 100644
index 00000000..a47ca76d
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0623-dt-Create-static-regulators-and-clocks-for-camera-no.patch
@@ -0,0 +1,383 @@
+From dab9ad5dcc35228983f5f0d22b179d45dc2ae05a Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Sat, 20 Nov 2021 10:48:36 +0000
+Subject: [PATCH 623/828] dt: Create static regulators and clocks for camera
+ nodes
+
+Unloading regulators through dynamic device tree doesn't work
+as the regulators will unregister whilst clients are still
+registered. Whilst the regulator framework does WARN when that
+happens, the client putting the regulator then typically results
+in a NULL dereference and badness.
+
+Instead of creating regulators and clocks from the overlays,
+create regulators and clocks for the sensors in the base DT.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/bcm2708-rpi-b-plus.dts      |  4 ++-
+ arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts      |  4 ++-
+ arch/arm/boot/dts/bcm2708-rpi-b.dts           |  4 ++-
+ arch/arm/boot/dts/bcm2708-rpi-cm.dts          | 21 ++++--------
+ arch/arm/boot/dts/bcm2708-rpi-zero-w.dts      |  4 ++-
+ arch/arm/boot/dts/bcm2708-rpi-zero.dts        |  4 ++-
+ arch/arm/boot/dts/bcm2709-rpi-2-b.dts         |  4 ++-
+ arch/arm/boot/dts/bcm270x.dtsi                | 33 +++++++++++++++++++
+ arch/arm/boot/dts/bcm2710-rpi-2-b.dts         |  4 ++-
+ arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts    |  4 ++-
+ arch/arm/boot/dts/bcm2710-rpi-3-b.dts         |  4 ++-
+ arch/arm/boot/dts/bcm2710-rpi-cm3.dts         | 21 ++++--------
+ arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts    |  4 ++-
+ arch/arm/boot/dts/bcm2711-rpi-4-b.dts         |  4 ++-
+ arch/arm/boot/dts/bcm2711-rpi-cm4.dts         |  1 -
+ .../boot/dts/bcm283x-rpi-cam1-regulator.dtsi  | 10 ------
+ 16 files changed, 80 insertions(+), 50 deletions(-)
+ delete mode 100644 arch/arm/boot/dts/bcm283x-rpi-cam1-regulator.dtsi
+
+--- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
+@@ -5,7 +5,6 @@
+ #include "bcm283x-rpi-smsc9514.dtsi"
+ #include "bcm283x-rpi-csi1-2lane.dtsi"
+ #include "bcm283x-rpi-i2c0mux_0_28.dtsi"
+-#include "bcm283x-rpi-cam1-regulator.dtsi"
+ 
+ / {
+ 	compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";
+@@ -116,6 +115,9 @@
+ 	gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
+ };
+ 
++cam0_reg: &cam_dummy_reg {
++};
++
+ / {
+ 	__overrides__ {
+ 		act_led_gpio = <&act_led>,"gpios:4";
+--- a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
+@@ -4,7 +4,6 @@
+ #include "bcm2708-rpi.dtsi"
+ #include "bcm283x-rpi-smsc9512.dtsi"
+ #include "bcm283x-rpi-csi1-2lane.dtsi"
+-#include "bcm283x-rpi-cam1-regulator.dtsi"
+ 
+ / {
+ 	compatible = "raspberrypi,model-b", "brcm,bcm2835";
+@@ -123,6 +122,9 @@ i2c_csi_dsi: &i2c1 {
+ 	gpio = <&gpio 27 GPIO_ACTIVE_HIGH>;
+ };
+ 
++cam0_reg: &cam_dummy_reg {
++};
++
+ / {
+ 	__overrides__ {
+ 		act_led_gpio = <&act_led>,"gpios:4";
+--- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
+@@ -5,7 +5,6 @@
+ #include "bcm283x-rpi-smsc9512.dtsi"
+ #include "bcm283x-rpi-csi1-2lane.dtsi"
+ #include "bcm283x-rpi-i2c0mux_0_28.dtsi"
+-#include "bcm283x-rpi-cam1-regulator.dtsi"
+ 
+ / {
+ 	compatible = "raspberrypi,model-b", "brcm,bcm2835";
+@@ -110,6 +109,9 @@
+ 	gpio = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ };
+ 
++cam0_reg: &cam_dummy_reg {
++};
++
+ / {
+ 	__overrides__ {
+ 		act_led_gpio = <&act_led>,"gpios:4";
+--- a/arch/arm/boot/dts/bcm2708-rpi-cm.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
+@@ -8,21 +8,14 @@
+ / {
+ 	compatible = "raspberrypi,compute-module", "brcm,bcm2835";
+ 	model = "Raspberry Pi Compute Module";
++};
++
++&cam1_reg {
++	gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
++};
+ 
+-	cam1_reg: cam1_reg {
+-		compatible = "regulator-fixed";
+-		regulator-name = "cam1-regulator";
+-		gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
+-		enable-active-high;
+-		status = "disabled";
+-	};
+-	cam0_reg: cam0_reg {
+-		compatible = "regulator-fixed";
+-		regulator-name = "cam0-regulator";
+-		gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
+-		enable-active-high;
+-		status = "disabled";
+-	};
++cam0_reg: &cam0_regulator {
++	gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
+ };
+ 
+ &uart0 {
+--- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
+@@ -5,7 +5,6 @@
+ #include "bcm283x-rpi-csi1-2lane.dtsi"
+ #include "bcm283x-rpi-i2c0mux_0_28.dtsi"
+ #include "bcm2708-rpi-bt.dtsi"
+-#include "bcm283x-rpi-cam1-regulator.dtsi"
+ 
+ / {
+ 	compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
+@@ -167,6 +166,9 @@
+ 	gpio = <&gpio 44 GPIO_ACTIVE_HIGH>;
+ };
+ 
++cam0_reg: &cam_dummy_reg {
++};
++
+ / {
+ 	__overrides__ {
+ 		act_led_gpio = <&act_led>,"gpios:4";
+--- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
+@@ -4,7 +4,6 @@
+ #include "bcm2708-rpi.dtsi"
+ #include "bcm283x-rpi-csi1-2lane.dtsi"
+ #include "bcm283x-rpi-i2c0mux_0_28.dtsi"
+-#include "bcm283x-rpi-cam1-regulator.dtsi"
+ 
+ / {
+ 	compatible = "raspberrypi,model-zero", "brcm,bcm2835";
+@@ -114,6 +113,9 @@
+ 	gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
+ };
+ 
++cam0_reg: &cam_dummy_reg {
++};
++
+ / {
+ 	__overrides__ {
+ 		act_led_gpio = <&act_led>,"gpios:4";
+--- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
++++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
+@@ -5,7 +5,6 @@
+ #include "bcm283x-rpi-smsc9514.dtsi"
+ #include "bcm283x-rpi-csi1-2lane.dtsi"
+ #include "bcm283x-rpi-i2c0mux_0_28.dtsi"
+-#include "bcm283x-rpi-cam1-regulator.dtsi"
+ 
+ / {
+ 	compatible = "raspberrypi,2-model-b", "brcm,bcm2836";
+@@ -116,6 +115,9 @@
+ 	gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
+ };
+ 
++cam0_reg: &cam_dummy_reg {
++};
++
+ / {
+ 	__overrides__ {
+ 		act_led_gpio = <&act_led>,"gpios:4";
+--- a/arch/arm/boot/dts/bcm270x.dtsi
++++ b/arch/arm/boot/dts/bcm270x.dtsi
+@@ -153,6 +153,39 @@
+ 		};
+ 	};
+ 
++	cam1_reg: cam1_regulator {
++		compatible = "regulator-fixed";
++		regulator-name = "cam1-reg";
++		enable-active-high;
++		/* Needs to be enabled, as removing a regulator is very unsafe */
++		status = "okay";
++	};
++
++	cam1_clk: cam1_clk {
++		compatible = "fixed-clock";
++		#clock-cells = <0>;
++		status = "disabled";
++	};
++
++	cam0_regulator: cam0_regulator {
++		compatible = "regulator-fixed";
++		regulator-name = "cam0-reg";
++		enable-active-high;
++		status = "disabled";
++	};
++
++	cam0_clk: cam0_clk {
++		compatible = "fixed-clock";
++		#clock-cells = <0>;
++		status = "disabled";
++	};
++
++	cam_dummy_reg: cam_dummy_reg {
++		compatible = "regulator-fixed";
++		regulator-name = "cam-dummy-reg";
++		status = "okay";
++	};
++
+ 	__overrides__ {
+ 		cam0-pwdn-ctrl;
+ 		cam0-pwdn;
+--- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
++++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
+@@ -5,7 +5,6 @@
+ #include "bcm283x-rpi-smsc9514.dtsi"
+ #include "bcm283x-rpi-csi1-2lane.dtsi"
+ #include "bcm283x-rpi-i2c0mux_0_28.dtsi"
+-#include "bcm283x-rpi-cam1-regulator.dtsi"
+ 
+ / {
+ 	compatible = "raspberrypi,2-model-b-rev2", "brcm,bcm2837";
+@@ -116,6 +115,9 @@
+ 	gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
+ };
+ 
++cam0_reg: &cam_dummy_reg {
++};
++
+ / {
+ 	__overrides__ {
+ 		act_led_gpio = <&act_led>,"gpios:4";
+--- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
++++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
+@@ -6,7 +6,6 @@
+ #include "bcm283x-rpi-csi1-2lane.dtsi"
+ #include "bcm283x-rpi-i2c0mux_0_44.dtsi"
+ #include "bcm271x-rpi-bt.dtsi"
+-#include "bcm283x-rpi-cam1-regulator.dtsi"
+ 
+ / {
+ 	compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837";
+@@ -188,6 +187,9 @@
+ 	gpio = <&expgpio 5 GPIO_ACTIVE_HIGH>;
+ };
+ 
++cam0_reg: &cam_dummy_reg {
++};
++
+ / {
+ 	__overrides__ {
+ 		act_led_gpio = <&act_led>,"gpios:4";
+--- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
++++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
+@@ -6,7 +6,6 @@
+ #include "bcm283x-rpi-csi1-2lane.dtsi"
+ #include "bcm283x-rpi-i2c0mux_0_44.dtsi"
+ #include "bcm271x-rpi-bt.dtsi"
+-#include "bcm283x-rpi-cam1-regulator.dtsi"
+ 
+ / {
+ 	compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
+@@ -197,6 +196,9 @@
+ 	gpio = <&expgpio 5 GPIO_ACTIVE_HIGH>;
+ };
+ 
++cam0_reg: &cam_dummy_reg {
++};
++
+ / {
+ 	__overrides__ {
+ 		act_led_gpio = <&act_led>,"gpios:4";
+--- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
++++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
+@@ -8,21 +8,14 @@
+ / {
+ 	compatible = "raspberrypi,3-compute-module", "brcm,bcm2837";
+ 	model = "Raspberry Pi Compute Module 3";
++};
++
++&cam1_reg {
++	gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
++};
+ 
+-	cam1_reg: cam1_reg {
+-		compatible = "regulator-fixed";
+-		regulator-name = "cam1-regulator";
+-		gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
+-		enable-active-high;
+-		status = "disabled";
+-	};
+-	cam0_reg: cam0_reg {
+-		compatible = "regulator-fixed";
+-		regulator-name = "cam0-regulator";
+-		gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
+-		enable-active-high;
+-		status = "disabled";
+-	};
++cam0_reg: &cam0_regulator {
++	gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
+ };
+ 
+ &uart0 {
+--- a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
++++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
+@@ -5,7 +5,6 @@
+ #include "bcm283x-rpi-csi1-2lane.dtsi"
+ #include "bcm283x-rpi-i2c0mux_0_44.dtsi"
+ #include "bcm2708-rpi-bt.dtsi"
+-#include "bcm283x-rpi-cam1-regulator.dtsi"
+ 
+ / {
+ 	compatible = "raspberrypi,model-zero-2-w", "brcm,bcm2837";
+@@ -188,6 +187,9 @@
+ 	gpio = <&gpio 40 GPIO_ACTIVE_HIGH>;
+ };
+ 
++cam0_reg: &cam_dummy_reg {
++};
++
+ / {
+ 	__overrides__ {
+ 		act_led_gpio = <&act_led>,"gpios:4";
+--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+@@ -279,7 +279,6 @@
+ #include "bcm2711-rpi-ds.dtsi"
+ #include "bcm283x-rpi-csi1-2lane.dtsi"
+ #include "bcm283x-rpi-i2c0mux_0_44.dtsi"
+-#include "bcm283x-rpi-cam1-regulator.dtsi"
+ 
+ / {
+ 	chosen {
+@@ -548,6 +547,9 @@
+ 	gpio = <&expgpio 5 GPIO_ACTIVE_HIGH>;
+ };
+ 
++cam0_reg: &cam_dummy_reg {
++};
++
+ / {
+ 	__overrides__ {
+ 		act_led_gpio = <&act_led>,"gpios:4";
+--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
+@@ -297,7 +297,6 @@
+ #include "bcm283x-rpi-csi0-2lane.dtsi"
+ #include "bcm283x-rpi-csi1-4lane.dtsi"
+ #include "bcm283x-rpi-i2c0mux_0_44.dtsi"
+-#include "bcm283x-rpi-cam1-regulator.dtsi"
+ 
+ / {
+ 	chosen {
+--- a/arch/arm/boot/dts/bcm283x-rpi-cam1-regulator.dtsi
++++ /dev/null
+@@ -1,10 +0,0 @@
+-// SPDX-License-Identifier: GPL-2.0
+-
+-/ {
+-	cam1_reg: cam1_reg {
+-		compatible = "regulator-fixed";
+-		regulator-name = "cam1-reg";
+-		enable-active-high;
+-		status = "disabled";
+-	};
+-};
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0624-dtoverlays-Convert-the-camera-sensor-overlays-to-use.patch b/root/target/linux/bcm27xx/patches-5.15/950-0624-dtoverlays-Convert-the-camera-sensor-overlays-to-use.patch
new file mode 100644
index 00000000..432d6858
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0624-dtoverlays-Convert-the-camera-sensor-overlays-to-use.patch
@@ -0,0 +1,474 @@
+From fe828fa6cf3a4cc67e01f937dbec4054f1016a41 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Sat, 20 Nov 2021 14:43:29 +0000
+Subject: [PATCH 624/828] dtoverlays: Convert the camera sensor overlays to use
+ the new regs and clks.
+
+Now that we have regulators and clocks defined in the base DT for
+image sensors, switch the overlays to use them.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/imx219-overlay.dts | 40 ++++---------------
+ .../boot/dts/overlays/imx290_327-overlay.dtsi | 40 ++++---------------
+ .../boot/dts/overlays/imx477_378-overlay.dtsi | 31 +++-----------
+ arch/arm/boot/dts/overlays/imx519-overlay.dts | 38 +++---------------
+ arch/arm/boot/dts/overlays/ov5647-overlay.dts | 18 +++++----
+ arch/arm/boot/dts/overlays/ov7251-overlay.dts | 37 +++--------------
+ arch/arm/boot/dts/overlays/ov9281-overlay.dts | 39 ++++--------------
+ 7 files changed, 50 insertions(+), 193 deletions(-)
+
+--- a/arch/arm/boot/dts/overlays/imx219-overlay.dts
++++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts
+@@ -20,12 +20,12 @@
+ 				reg = <0x10>;
+ 				status = "okay";
+ 
+-				clocks = <&imx219_clk>;
++				clocks = <&cam1_clk>;
+ 				clock-names = "xclk";
+ 
+ 				VANA-supply = <&cam1_reg>;	/* 2.8v */
+-				VDIG-supply = <&imx219_vdig>;	/* 1.8v */
+-				VDDL-supply = <&imx219_vddl>;	/* 1.2v */
++				VDIG-supply = <&cam_dummy_reg>;	/* 1.8v */
++				VDDL-supply = <&cam_dummy_reg>;	/* 1.2v */
+ 
+ 				rotation = <180>;
+ 				orientation = <2>;
+@@ -68,26 +68,10 @@
+ 	};
+ 
+ 	fragment@3 {
+-		target-path="/";
++		target = <&cam1_clk>;
+ 		__overlay__ {
+-			imx219_vdig: fixedregulator@1 {
+-				compatible = "regulator-fixed";
+-				regulator-name = "imx219_vdig";
+-				regulator-min-microvolt = <1800000>;
+-				regulator-max-microvolt = <1800000>;
+-			};
+-			imx219_vddl: fixedregulator@2 {
+-				compatible = "regulator-fixed";
+-				regulator-name = "imx219_vddl";
+-				regulator-min-microvolt = <1200000>;
+-				regulator-max-microvolt = <1200000>;
+-			};
+-
+-			imx219_clk: camera-clk {
+-				compatible = "fixed-clock";
+-				#clock-cells = <0>;
+-				clock-frequency = <24000000>;
+-			};
++			status = "okay";
++			clock-frequency = <24000000>;
+ 		};
+ 	};
+ 
+@@ -99,16 +83,6 @@
+ 	};
+ 
+ 	fragment@5 {
+-		target = <&cam1_reg>;
+-		__overlay__ {
+-			status = "okay";
+-			regulator-name = "imx219_vana";
+-			regulator-min-microvolt = <2800000>;
+-			regulator-max-microvolt = <2800000>;
+-		};
+-	};
+-
+-	fragment@6 {
+ 		target = <&csi1>;
+ 		__overlay__ {
+ 			brcm,media-controller;
+@@ -118,6 +92,6 @@
+ 	__overrides__ {
+ 		rotation = <&imx219>,"rotation:0";
+ 		orientation = <&imx219>,"orientation:0";
+-		media-controller = <0>,"=6";
++		media-controller = <0>,"=5";
+ 	};
+ };
+--- a/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
++++ b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
+@@ -20,7 +20,7 @@
+ 				reg = <0x1a>;
+ 				status = "okay";
+ 
+-				clocks = <&imx290_clk>;
++				clocks = <&cam1_clk>;
+ 				clock-names = "xclk";
+ 				clock-frequency = <37125000>;
+ 
+@@ -28,8 +28,8 @@
+ 				orientation = <2>;
+ 
+ 				vdda-supply = <&cam1_reg>;	/* 2.8v */
+-				vdddo-supply = <&imx290_vdddo>;	/* 1.8v */
+-				vddd-supply = <&imx290_vddd>;	/* 1.5v */
++				vdddo-supply = <&cam_dummy_reg>;	/* 1.8v */
++				vddd-supply = <&cam_dummy_reg>;	/* 1.5v */
+ 
+ 				port {
+ 					imx290_0: endpoint {
+@@ -62,26 +62,10 @@
+ 	};
+ 
+ 	fragment@3 {
+-		target-path="/";
++		target = <&cam1_clk>;
+ 		__overlay__ {
+-			imx290_vdddo: fixedregulator@1 {
+-				compatible = "regulator-fixed";
+-				regulator-name = "imx290_vdddo";
+-				regulator-min-microvolt = <1800000>;
+-				regulator-max-microvolt = <1800000>;
+-			};
+-			imx290_vddd: fixedregulator@2 {
+-				compatible = "regulator-fixed";
+-				regulator-name = "imx290_vddd";
+-				regulator-min-microvolt = <1500000>;
+-				regulator-max-microvolt = <1500000>;
+-			};
+-
+-			imx290_clk: camera-clk {
+-				compatible = "fixed-clock";
+-				#clock-cells = <0>;
+-				clock-frequency = <37125000>;
+-			};
++			status = "okay";
++			clock-frequency = <37125000>;
+ 		};
+ 	};
+ 
+@@ -92,16 +76,6 @@
+ 		};
+ 	};
+ 
+-	fragment@5 {
+-		target = <&cam1_reg>;
+-		__overlay__ {
+-			status = "okay";
+-			regulator-name = "imx290_vdda";
+-			regulator-min-microvolt = <2800000>;
+-			regulator-max-microvolt = <2800000>;
+-		};
+-	};
+-
+ 	fragment@6 {
+ 		target = <&imx290_0>;
+ 		__overlay__ {
+@@ -143,7 +117,7 @@
+ 
+ 	__overrides__ {
+ 		4lane = <0>, "-6+7-8+9";
+-		clock-frequency = <&imx290_clk>,"clock-frequency:0",
++		clock-frequency = <&cam1_clk>,"clock-frequency:0",
+ 				  <&imx290>,"clock-frequency:0";
+ 		rotation = <&imx290>,"rotation:0";
+ 		orientation = <&imx290>,"orientation:0";
+--- a/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
++++ b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
+@@ -15,12 +15,12 @@
+ 				reg = <0x1a>;
+ 				status = "okay";
+ 
+-				clocks = <&imx477_clk>;
++				clocks = <&cam1_clk>;
+ 				clock-names = "xclk";
+ 
+ 				VANA-supply = <&cam1_reg>;	/* 2.8v */
+-				VDIG-supply = <&imx477_vdig>;	/* 1.05v */
+-				VDDL-supply = <&imx477_vddl>;	/* 1.8v */
++				VDIG-supply = <&cam_dummy_reg>;	/* 1.05v */
++				VDDL-supply = <&cam_dummy_reg>;	/* 1.8v */
+ 
+ 				rotation = <180>;
+ 				orientation = <2>;
+@@ -63,25 +63,10 @@
+ 	};
+ 
+ 	fragment@3 {
+-		target-path="/";
++		target = <&cam1_clk>;
+ 		__overlay__ {
+-			imx477_vdig: fixedregulator@0 {
+-				compatible = "regulator-fixed";
+-				regulator-name = "imx477_vdig";
+-				regulator-min-microvolt = <1050000>;
+-				regulator-max-microvolt = <1050000>;
+-			};
+-			imx477_vddl: fixedregulator@1 {
+-				compatible = "regulator-fixed";
+-				regulator-name = "imx477_vddl";
+-				regulator-min-microvolt = <1800000>;
+-				regulator-max-microvolt = <1800000>;
+-			};
+-			imx477_clk: camera-clk {
+-				compatible = "fixed-clock";
+-				#clock-cells = <0>;
+-				clock-frequency = <24000000>;
+-			};
++			clock-frequency = <24000000>;
++			status = "okay";
+ 		};
+ 	};
+ 
+@@ -95,11 +80,7 @@
+ 	fragment@5 {
+ 		target = <&cam1_reg>;
+ 		__overlay__ {
+-			status = "okay";
+-			regulator-name = "imx477_vana";
+ 			startup-delay-us = <300000>;
+-			regulator-min-microvolt = <2800000>;
+-			regulator-max-microvolt = <2800000>;
+ 		};
+ 	};
+ 
+--- a/arch/arm/boot/dts/overlays/imx519-overlay.dts
++++ b/arch/arm/boot/dts/overlays/imx519-overlay.dts
+@@ -20,12 +20,12 @@
+ 				reg = <0x1a>;
+ 				status = "okay";
+ 
+-				clocks = <&imx519_clk>;
++				clocks = <&cam1_clk>;
+ 				clock-names = "xclk";
+ 
+ 				VANA-supply = <&cam1_reg>;	/* 2.8v */
+-				VDIG-supply = <&imx519_vdig>;	/* 1.8v */
+-				VDDL-supply = <&imx519_vddl>;	/* 1.2v */
++				VDIG-supply = <&cam_dummy_reg>;	/* 1.8v */
++				VDDL-supply = <&cam_dummy_reg>;	/* 1.2v */
+ 
+ 				rotation = <0>;
+ 				orientation = <2>;
+@@ -68,26 +68,10 @@
+ 	};
+ 
+ 	fragment@3 {
+-		target-path="/";
++		target = <&cam1_clk>;
+ 		__overlay__ {
+-			imx519_vdig: fixedregulator@1 {
+-				compatible = "regulator-fixed";
+-				regulator-name = "imx519_vdig";
+-				regulator-min-microvolt = <1800000>;
+-				regulator-max-microvolt = <1800000>;
+-			};
+-			imx519_vddl: fixedregulator@2 {
+-				compatible = "regulator-fixed";
+-				regulator-name = "imx519_vddl";
+-				regulator-min-microvolt = <1200000>;
+-				regulator-max-microvolt = <1200000>;
+-			};
+-
+-			imx519_clk: camera-clk {
+-				compatible = "fixed-clock";
+-				#clock-cells = <0>;
+-				clock-frequency = <24000000>;
+-			};
++			clock-frequency = <24000000>;
++			status = "okay";
+ 		};
+ 	};
+ 
+@@ -98,16 +82,6 @@
+ 		};
+ 	};
+ 
+-	fragment@5 {
+-		target = <&cam1_reg>;
+-		__overlay__ {
+-			status = "okay";
+-			regulator-name = "imx519_vana";
+-			regulator-min-microvolt = <2800000>;
+-			regulator-max-microvolt = <2800000>;
+-		};
+-	};
+-
+ 	fragment@6 {
+ 		target = <&csi1>;
+ 		__overlay__ {
+--- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts
++++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
+@@ -19,7 +19,7 @@
+ 				status = "okay";
+ 
+ 				pwdn-gpios = <&gpio 41 1>, <&gpio 32 1>;
+-				clocks = <&ov5647_clk>;
++				clocks = <&cam1_clk>;
+ 
+ 				rotation = <0>;
+ 				orientation = <2>;
+@@ -77,13 +77,10 @@
+ 	};
+ 
+ 	fragment@5 {
+-		target-path = "/";
++		target = <&cam1_clk>;
+ 		__overlay__ {
+-			ov5647_clk: camera-clk {
+-				compatible = "fixed-clock";
+-				#clock-cells = <0>;
+-				clock-frequency = <25000000>;
+-			};
++			status = "okay";
++			clock-frequency = <25000000>;
+ 		};
+ 	};
+ 
+@@ -94,6 +91,13 @@
+ 		};
+ 	};
+ 
++	fragment@7 {
++		target = <&cam1_reg>;
++		__overlay__ {
++			status = "disabled";
++		};
++	};
++
+ 	__overrides__ {
+ 		rotation = <&ov5647>,"rotation:0";
+ 		orientation = <&ov5647>,"orientation:0";
+--- a/arch/arm/boot/dts/overlays/ov7251-overlay.dts
++++ b/arch/arm/boot/dts/overlays/ov7251-overlay.dts
+@@ -20,13 +20,13 @@
+ 				reg = <0x60>;
+ 				status = "okay";
+ 
+-				clocks = <&ov7251_clk>;
++				clocks = <&cam1_clk>;
+ 				clock-names = "xclk";
+ 				clock-frequency = <24000000>;
+ 
+-				vdddo-supply = <&ov7251_dovdd>;
++				vdddo-supply = <&cam_dummy_reg>;
+ 				vdda-supply = <&cam1_reg>;
+-				vddd-supply = <&ov7251_dvdd>;
++				vddd-supply = <&cam_dummy_reg>;
+ 
+ 				rotation = <0>;
+ 				orientation = <2>;
+@@ -67,25 +67,10 @@
+ 	};
+ 
+ 	fragment@3 {
+-		target-path="/";
++		target = <&cam1_clk>;
+ 		__overlay__ {
+-			ov7251_dovdd: fixedregulator@1 {
+-				compatible = "regulator-fixed";
+-				regulator-name = "ov7251_dovdd";
+-				regulator-min-microvolt = <1800000>;
+-				regulator-max-microvolt = <1800000>;
+-			};
+-			ov7251_dvdd: fixedregulator@2 {
+-				compatible = "regulator-fixed";
+-				regulator-name = "ov7251_dvdd";
+-				regulator-min-microvolt = <1200000>;
+-				regulator-max-microvolt = <1200000>;
+-			};
+-			ov7251_clk: ov7251-clk {
+-				compatible = "fixed-clock";
+-				#clock-cells = <0>;
+-				clock-frequency = <24000000>;
+-			};
++			status = "okay";
++			clock-frequency = <24000000>;
+ 		};
+ 	};
+ 
+@@ -96,16 +81,6 @@
+ 		};
+ 	};
+ 
+-	fragment@5 {
+-		target = <&cam1_reg>;
+-		__overlay__ {
+-			status = "okay";
+-			regulator-name = "ov7251_avdd";
+-			regulator-min-microvolt = <2800000>;
+-			regulator-max-microvolt = <2800000>;
+-		};
+-	};
+-
+ 	fragment@6 {
+ 		target = <&csi1>;
+ 		__dormant__ {
+--- a/arch/arm/boot/dts/overlays/ov9281-overlay.dts
++++ b/arch/arm/boot/dts/overlays/ov9281-overlay.dts
+@@ -20,12 +20,12 @@
+ 				reg = <0x60>;
+ 				status = "okay";
+ 
+-				clocks = <&ov9281_clk>;
++				clocks = <&cam1_clk>;
+ 				clock-names = "xvclk";
+ 
+ 				avdd-supply = <&cam1_reg>;
+-				dovdd-supply = <&ov9281_dovdd>;
+-				dvdd-supply = <&ov9281_dvdd>;
++				dovdd-supply = <&cam_dummy_reg>;
++				dvdd-supply = <&cam_dummy_reg>;
+ 
+ 				rotation = <0>;
+ 				orientation = <2>;
+@@ -67,25 +67,10 @@
+ 	};
+ 
+ 	fragment@3 {
+-		target-path="/";
++		target = <&cam1_clk>;
+ 		__overlay__ {
+-			ov9281_dovdd: fixedregulator@1 {
+-				compatible = "regulator-fixed";
+-				regulator-name = "ov9281_dovdd";
+-				regulator-min-microvolt = <1800000>;
+-				regulator-max-microvolt = <1800000>;
+-			};
+-			ov9281_dvdd: fixedregulator@2 {
+-				compatible = "regulator-fixed";
+-				regulator-name = "ov9281_dvdd";
+-				regulator-min-microvolt = <1200000>;
+-				regulator-max-microvolt = <1200000>;
+-			};
+-			ov9281_clk: ov9281-clk {
+-				compatible = "fixed-clock";
+-				#clock-cells = <0>;
+-				clock-frequency = <24000000>;
+-			};
++			status = "okay";
++			clock-frequency = <24000000>;
+ 		};
+ 	};
+ 
+@@ -97,16 +82,6 @@
+ 	};
+ 
+ 	fragment@5 {
+-		target = <&cam1_reg>;
+-		__overlay__ {
+-			status = "okay";
+-			regulator-name = "ov9281_avdd";
+-			regulator-min-microvolt = <2800000>;
+-			regulator-max-microvolt = <2800000>;
+-		};
+-	};
+-
+-	fragment@6 {
+ 		target = <&csi1>;
+ 		__overlay__ {
+ 			brcm,media-controller;
+@@ -116,6 +91,6 @@
+ 	__overrides__ {
+ 		rotation = <&ov9281>,"rotation:0";
+ 		orientation = <&ov9281>,"orientation:0";
+-		media-controller = <0>,"=6";
++		media-controller = <0>,"=5";
+ 	};
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0625-media-i2c-ov5647-Add-support-for-regulator-control.patch b/root/target/linux/bcm27xx/patches-5.15/950-0625-media-i2c-ov5647-Add-support-for-regulator-control.patch
new file mode 100644
index 00000000..8938b543
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0625-media-i2c-ov5647-Add-support-for-regulator-control.patch
@@ -0,0 +1,111 @@
+From d673f8c9721d33794d8aa2905524c5655cc3bde2 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 22 Nov 2021 12:31:35 +0000
+Subject: [PATCH 625/828] media: i2c: ov5647: Add support for regulator
+ control.
+
+The driver supported using GPIOs to control the shutdown line,
+but no regulator control.
+
+Add regulator hooks.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov5647.c | 37 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 37 insertions(+)
+
+--- a/drivers/media/i2c/ov5647.c
++++ b/drivers/media/i2c/ov5647.c
+@@ -20,6 +20,7 @@
+ #include <linux/module.h>
+ #include <linux/of_graph.h>
+ #include <linux/pm_runtime.h>
++#include <linux/regulator/consumer.h>
+ #include <linux/slab.h>
+ #include <linux/videodev2.h>
+ #include <media/v4l2-ctrls.h>
+@@ -82,6 +83,15 @@
+ #define OV5647_EXPOSURE_DEFAULT		1000
+ #define OV5647_EXPOSURE_MAX		65535
+ 
++/* regulator supplies */
++static const char * const ov5647_supply_names[] = {
++	"avdd",		/* Analog power */
++	"dovdd",	/* Digital I/O power */
++	"dvdd",		/* Digital core power */
++};
++
++#define OV5647_NUM_SUPPLIES ARRAY_SIZE(ov5647_supply_names)
++
+ struct regval_list {
+ 	u16 addr;
+ 	u8 data;
+@@ -103,6 +113,7 @@ struct ov5647 {
+ 	struct mutex			lock;
+ 	struct clk			*xclk;
+ 	struct gpio_desc		*pwdn;
++	struct regulator_bulk_data supplies[OV5647_NUM_SUPPLIES];
+ 	bool				clock_ncont;
+ 	struct v4l2_ctrl_handler	ctrls;
+ 	const struct ov5647_mode	*mode;
+@@ -787,6 +798,12 @@ static int ov5647_power_on(struct device
+ 
+ 	dev_dbg(dev, "OV5647 power on\n");
+ 
++	ret = regulator_bulk_enable(OV5647_NUM_SUPPLIES, sensor->supplies);
++	if (ret < 0) {
++		dev_err(dev, "Failed to enable regulators\n");
++		return ret;
++	}
++
+ 	if (sensor->pwdn) {
+ 		gpiod_set_value_cansleep(sensor->pwdn, 0);
+ 		msleep(PWDN_ACTIVE_DELAY_MS);
+@@ -818,6 +835,7 @@ error_clk_disable:
+ 	clk_disable_unprepare(sensor->xclk);
+ error_pwdn:
+ 	gpiod_set_value_cansleep(sensor->pwdn, 1);
++	regulator_bulk_disable(OV5647_NUM_SUPPLIES, sensor->supplies);
+ 
+ 	return ret;
+ }
+@@ -847,6 +865,7 @@ static int ov5647_power_off(struct devic
+ 
+ 	clk_disable_unprepare(sensor->xclk);
+ 	gpiod_set_value_cansleep(sensor->pwdn, 1);
++	regulator_bulk_disable(OV5647_NUM_SUPPLIES, sensor->supplies);
+ 
+ 	return 0;
+ }
+@@ -1347,6 +1366,18 @@ static const struct v4l2_ctrl_ops ov5647
+ 	.s_ctrl = ov5647_s_ctrl,
+ };
+ 
++static int ov5647_configure_regulators(struct device *dev,
++				       struct ov5647 *sensor)
++{
++	unsigned int i;
++
++	for (i = 0; i < OV5647_NUM_SUPPLIES; i++)
++		sensor->supplies[i].supply = ov5647_supply_names[i];
++
++	return devm_regulator_bulk_get(dev, OV5647_NUM_SUPPLIES,
++				       sensor->supplies);
++}
++
+ static int ov5647_init_controls(struct ov5647 *sensor, struct device *dev)
+ {
+ 	struct i2c_client *client = v4l2_get_subdevdata(&sensor->sd);
+@@ -1494,6 +1525,12 @@ static int ov5647_probe(struct i2c_clien
+ 		return -EINVAL;
+ 	}
+ 
++	ret = ov5647_configure_regulators(dev, sensor);
++	if (ret) {
++		dev_err(dev, "Failed to get power regulators\n");
++		return ret;
++	}
++
+ 	mutex_init(&sensor->lock);
+ 
+ 	sensor->mode = OV5647_DEFAULT_MODE;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0626-dtoverlays-Convert-ov5647-to-use-the-regulator-frame.patch b/root/target/linux/bcm27xx/patches-5.15/950-0626-dtoverlays-Convert-ov5647-to-use-the-regulator-frame.patch
new file mode 100644
index 00000000..27b9b376
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0626-dtoverlays-Convert-ov5647-to-use-the-regulator-frame.patch
@@ -0,0 +1,48 @@
+From 6594c13bc76f7d1d0cf0c81325cf2d71689d251f Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 22 Nov 2021 12:30:18 +0000
+Subject: [PATCH 626/828] dtoverlays: Convert ov5647 to use the regulator
+ framework
+
+Fixing up shutdown GPIOs via overrides is ugly, and doesn't work
+on eg CM4 where both cameras share the same shutdown GPIO.
+
+The driver is now updated to use the regulator framework, so switch
+to using that instead.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/ov5647-overlay.dts | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts
++++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
+@@ -18,9 +18,12 @@
+ 				reg = <0x36>;
+ 				status = "okay";
+ 
+-				pwdn-gpios = <&gpio 41 1>, <&gpio 32 1>;
+ 				clocks = <&cam1_clk>;
+ 
++				avdd-supply = <&cam1_reg>;
++				dovdd-supply = <&cam_dummy_reg>;
++				dvdd-supply = <&cam_dummy_reg>;
++
+ 				rotation = <0>;
+ 				orientation = <2>;
+ 
+@@ -67,12 +70,9 @@
+ 	};
+ 
+ 	fragment@4 {
+-		target-path="/__overrides__";
++		target = <&cam1_reg>;
+ 		__overlay__ {
+-			cam0-pwdn-ctrl = <&ov5647>,"pwdn-gpios:0";
+-			cam0-pwdn      = <&ov5647>,"pwdn-gpios:4";
+-			cam0-led-ctrl  = <&ov5647>,"pwdn-gpios:12";
+-			cam0-led       = <&ov5647>,"pwdn-gpios:16";
++			startup-delay-us = <20000>;
+ 		};
+ 	};
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0627-media-i2c-ov7251-Make-the-enable-GPIO-optional.patch b/root/target/linux/bcm27xx/patches-5.15/950-0627-media-i2c-ov7251-Make-the-enable-GPIO-optional.patch
new file mode 100644
index 00000000..9f31c6af
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0627-media-i2c-ov7251-Make-the-enable-GPIO-optional.patch
@@ -0,0 +1,26 @@
+From aa27038afdd2728452db25b4cf9ee0750e952162 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Tue, 14 Dec 2021 17:18:49 +0000
+Subject: [PATCH 627/828] media: i2c: ov7251: Make the enable GPIO optional.
+
+Not all implementations wire up the enable GPIO and may just tie
+it to a supply rail.
+Make it optional.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov7251.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -1334,7 +1334,8 @@ static int ov7251_probe(struct i2c_clien
+ 		return PTR_ERR(ov7251->analog_regulator);
+ 	}
+ 
+-	ov7251->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_HIGH);
++	ov7251->enable_gpio = devm_gpiod_get_optional(dev, "enable",
++						      GPIOD_OUT_HIGH);
+ 	if (IS_ERR(ov7251->enable_gpio)) {
+ 		dev_err(dev, "cannot get enable gpio\n");
+ 		return PTR_ERR(ov7251->enable_gpio);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0628-ARM-dts-bcm2711-cm4s-Correct-i2c0mux-to-use-0-1-and-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0628-ARM-dts-bcm2711-cm4s-Correct-i2c0mux-to-use-0-1-and-.patch
new file mode 100644
index 00000000..5ee98547
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0628-ARM-dts-bcm2711-cm4s-Correct-i2c0mux-to-use-0-1-and-.patch
@@ -0,0 +1,49 @@
+From 578179c32256bbc028bf8410159d84ba96d7fa51 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Tue, 14 Dec 2021 14:54:15 +0000
+Subject: [PATCH 628/828] ARM: dts: bcm2711-cm4s Correct i2c0mux to use 0/1 and
+ 28/29 & 2 regulators
+
+CM4S follows CM1/3, so based on the documentation cameras/displays
+connect to 0/1 and 28/29, not 0/1 and 44/45.
+
+Likewise the camera regulator controls are independent as on CM1/3.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/bcm2711-rpi-cm4s.dts | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
+@@ -155,14 +155,28 @@
+ 
+ #include "bcm283x-rpi-csi0-2lane.dtsi"
+ #include "bcm283x-rpi-csi1-4lane.dtsi"
+-#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
+-#include "bcm283x-rpi-cam1-regulator.dtsi"
++#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
+ 
+ / {
+ 	chosen {
+ 		bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
+ 	};
+ 
++	cam1_reg: cam1_reg {
++		compatible = "regulator-fixed";
++		regulator-name = "cam1-regulator";
++		gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
++		enable-active-high;
++		status = "disabled";
++	};
++	cam0_reg: cam0_reg {
++		compatible = "regulator-fixed";
++		regulator-name = "cam0-regulator";
++		gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
++		enable-active-high;
++		status = "disabled";
++	};
++
+ 	aliases {
+ 		serial0 = &uart0;
+ 		mmc0 = &emmc2;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0629-dtoverlays-Add-option-to-select-camera-as-on-CAM0-of.patch b/root/target/linux/bcm27xx/patches-5.15/950-0629-dtoverlays-Add-option-to-select-camera-as-on-CAM0-of.patch
new file mode 100644
index 00000000..dd4c834d
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0629-dtoverlays-Add-option-to-select-camera-as-on-CAM0-of.patch
@@ -0,0 +1,944 @@
+From 5ec24c41cb1252b0a9ed7f404b9c8ef8bc9be5c0 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 22 Nov 2021 12:44:29 +0000
+Subject: [PATCH 629/828] dtoverlays: Add option to select camera as on CAM0 of
+ CM
+
+Parameterise the overlays so that they can have an optional
+cam0 parameter to switch to i2c_vc and csi0.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/bcm2708-rpi-cm.dts          |  1 +
+ arch/arm/boot/dts/bcm2708-rpi-cm.dtsi         |  4 +
+ arch/arm/boot/dts/bcm2710-rpi-cm3.dts         |  5 ++
+ arch/arm/boot/dts/bcm2711-rpi-cm4s.dts        | 25 +++---
+ arch/arm/boot/dts/overlays/README             | 30 +++++++
+ arch/arm/boot/dts/overlays/imx219-overlay.dts | 67 ++++++++-------
+ .../boot/dts/overlays/imx290_327-overlay.dtsi | 27 +++---
+ .../boot/dts/overlays/imx477_378-overlay.dtsi | 84 +++++++++----------
+ arch/arm/boot/dts/overlays/imx519-overlay.dts | 23 +++--
+ .../arm/boot/dts/overlays/irs1125-overlay.dts | 35 ++++----
+ arch/arm/boot/dts/overlays/ov5647-overlay.dts | 33 +++-----
+ arch/arm/boot/dts/overlays/ov7251-overlay.dts | 28 +++----
+ arch/arm/boot/dts/overlays/ov9281-overlay.dts | 29 ++++---
+ .../boot/dts/overlays/tc358743-overlay.dts    | 43 ++++------
+ 14 files changed, 221 insertions(+), 213 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm2708-rpi-cm.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
+@@ -12,6 +12,7 @@
+ 
+ &cam1_reg {
+ 	gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
++	status = "disabled";
+ };
+ 
+ cam0_reg: &cam0_regulator {
+--- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
++++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
+@@ -14,5 +14,9 @@
+ 		act_led_gpio = <&act_led>,"gpios:4";
+ 		act_led_activelow = <&act_led>,"gpios:8";
+ 		act_led_trigger = <&act_led>,"linux,default-trigger";
++		cam0_reg = <&cam0_reg>,"status";
++		cam0_reg_gpio = <&cam0_reg>,"gpios:4";
++		cam1_reg = <&cam1_reg>,"status";
++		cam1_reg_gpio = <&cam1_reg>,"gpios:4";
+ 	};
+ };
+--- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
++++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
+@@ -12,6 +12,7 @@
+ 
+ &cam1_reg {
+ 	gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
++	status = "disabled";
+ };
+ 
+ cam0_reg: &cam0_regulator {
+@@ -137,5 +138,9 @@ cam0_reg: &cam0_regulator {
+ 		act_led_gpio = <&act_led>,"gpios:4";
+ 		act_led_activelow = <&act_led>,"gpios:8";
+ 		act_led_trigger = <&act_led>,"linux,default-trigger";
++		cam0_reg = <&cam0_reg>,"status";
++		cam0_reg_gpio = <&cam0_reg>,"gpios:4";
++		cam1_reg = <&cam1_reg>,"status";
++		cam1_reg_gpio = <&cam1_reg>,"gpios:4";
+ 	};
+ };
+--- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
+@@ -162,21 +162,6 @@
+ 		bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
+ 	};
+ 
+-	cam1_reg: cam1_reg {
+-		compatible = "regulator-fixed";
+-		regulator-name = "cam1-regulator";
+-		gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
+-		enable-active-high;
+-		status = "disabled";
+-	};
+-	cam0_reg: cam0_reg {
+-		compatible = "regulator-fixed";
+-		regulator-name = "cam0-regulator";
+-		gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
+-		enable-active-high;
+-		status = "disabled";
+-	};
+-
+ 	aliases {
+ 		serial0 = &uart0;
+ 		mmc0 = &emmc2;
+@@ -399,6 +384,16 @@
+ 	brcm,disable-headphones = <1>;
+ };
+ 
++&cam1_reg {
++	gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
++	status = "disabled";
++};
++
++cam0_reg: &cam0_regulator {
++	gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
++	status = "disabled";
++};
++
+ / {
+ 	__overrides__ {
+ 		act_led_gpio = <&act_led>,"gpios:4";
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -144,6 +144,16 @@ Params:
+                                 See /sys/kernel/debug/raspberrypi_axi_monitor
+                                 for the results.
+ 
++        cam0_reg                Enables CAM 0 regulator. CM1 & 3 only.
++
++        cam0_reg_gpio           Set GPIO for CAM 0 regulator. Default 30.
++                                CM1 & 3 only.
++
++        cam1_reg                Enables CAM 1 regulator. CM1 & 3 only.
++
++        cam1_reg_gpio           Set GPIO for CAM 1 regulator. Default 2.
++                                CM1 & 3 only.
++
+         eee                     Enable Energy Efficient Ethernet support for
+                                 compatible devices (default "on"). See also
+                                 "tx_lpi_timer". Pi3B+ only.
+@@ -1845,6 +1855,8 @@ Params: rotation                Mounting
+                                 2 = external, default external)
+         media-controller        Configure use of Media Controller API for
+                                 configuring the sensor (default on)
++        cam0                    Adopt the default configuration for CAM0 on a
++                                Compute Module (CSI0, i2c_vc, and cam0_reg).
+ 
+ 
+ Name:   imx290
+@@ -1867,6 +1879,8 @@ Params: 4lane                   Enable 4
+                                 180, default 0)
+         media-controller        Configure use of Media Controller API for
+                                 configuring the sensor (default on)
++        cam0                    Adopt the default configuration for CAM0 on a
++                                Compute Module (CSI0, i2c_vc, and cam0_reg).
+ 
+ 
+ Name:   imx378
+@@ -1880,6 +1894,8 @@ Params: rotation                Mounting
+                                 2 = external, default external)
+         media-controller        Configure use of Media Controller API for
+                                 configuring the sensor (default on)
++        cam0                    Adopt the default configuration for CAM0 on a
++                                Compute Module (CSI0, i2c_vc, and cam0_reg).
+ 
+ 
+ Name:   imx477
+@@ -1893,6 +1909,8 @@ Params: rotation                Mounting
+                                 2 = external, default external)
+         media-controller        Configure use of Media Controller API for
+                                 configuring the sensor (default on)
++        cam0                    Adopt the default configuration for CAM0 on a
++                                Compute Module (CSI0, i2c_vc, and cam0_reg).
+ 
+ 
+ Name:   imx519
+@@ -1906,6 +1924,8 @@ Params: rotation                Mounting
+                                 2 = external, default external)
+         media-controller        Configure use of Media Controller API for
+                                 configuring the sensor (default on)
++        cam0                    Adopt the default configuration for CAM0 on a
++                                Compute Module (CSI0, i2c_vc, and cam0_reg).
+ 
+ 
+ Name:   iqaudio-codec
+@@ -1972,6 +1992,8 @@ Info:   Infineon irs1125 TOF camera modu
+ Load:   dtoverlay=irs1125,<param>=<val>
+ Params: media-controller        Configure use of Media Controller API for
+                                 configuring the sensor (default off)
++        cam0                    Adopt the default configuration for CAM0 on a
++                                Compute Module (CSI0, i2c_vc, and cam0_reg).
+ 
+ 
+ Name:   jedec-spi-nor
+@@ -2385,6 +2407,8 @@ Params: rotation                Mounting
+                                 2 = external, default external)
+         media-controller        Configure use of Media Controller API for
+                                 configuring the sensor (default on)
++        cam0                    Adopt the default configuration for CAM0 on a
++                                Compute Module (CSI0, i2c_vc, and cam0_reg).
+ 
+ 
+ Name:   ov7251
+@@ -2398,6 +2422,8 @@ Params: rotation                Mounting
+                                 2 = external, default external)
+         media-controller        Configure use of Media Controller API for
+                                 configuring the sensor (default off)
++        cam0                    Adopt the default configuration for CAM0 on a
++                                Compute Module (CSI0, i2c_vc, and cam0_reg).
+ 
+ 
+ Name:   ov9281
+@@ -2411,6 +2437,8 @@ Params: rotation                Mounting
+                                 2 = external, default external)
+         media-controller        Configure use of Media Controller API for
+                                 configuring the sensor (default on)
++        cam0                    Adopt the default configuration for CAM0 on a
++                                Compute Module (CSI0, i2c_vc, and cam0_reg).
+ 
+ 
+ Name:   papirus
+@@ -3393,6 +3421,8 @@ Params: 4lane                   Use 4 la
+                                 are supported by the driver.
+         media-controller        Configure use of Media Controller API for
+                                 configuring the sensor (default off)
++        cam0                    Adopt the default configuration for CAM0 on a
++                                Compute Module (CSI0, i2c_vc, and cam0_reg).
+ 
+ 
+ Name:   tc358743-audio
+--- a/arch/arm/boot/dts/overlays/imx219-overlay.dts
++++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts
+@@ -9,6 +9,28 @@
+ 	compatible = "brcm,bcm2835";
+ 
+ 	fragment@0 {
++		target = <&i2c0if>;
++		__overlay__ {
++			status = "okay";
++		};
++	};
++
++	clk_frag: fragment@1 {
++		target = <&cam1_clk>;
++		__overlay__ {
++			status = "okay";
++			clock-frequency = <24000000>;
++		};
++	};
++
++	fragment@2 {
++		target = <&i2c0mux>;
++		__overlay__ {
++			status = "okay";
++		};
++	};
++
++	i2c_frag: fragment@100 {
+ 		target = <&i2c_csi_dsi>;
+ 		__overlay__ {
+ 			#address-cells = <1>;
+@@ -32,7 +54,7 @@
+ 
+ 				port {
+ 					imx219_0: endpoint {
+-						remote-endpoint = <&csi1_ep>;
++						remote-endpoint = <&csi_ep>;
+ 						clock-lanes = <0>;
+ 						data-lanes = <1 2>;
+ 						clock-noncontinuous;
+@@ -44,13 +66,14 @@
+ 		};
+ 	};
+ 
+-	fragment@1 {
++	csi_frag: fragment@101 {
+ 		target = <&csi1>;
+-		__overlay__ {
++		csi: __overlay__ {
+ 			status = "okay";
++			brcm,media-controller;
+ 
+ 			port {
+-				csi1_ep: endpoint {
++				csi_ep: endpoint {
+ 					remote-endpoint = <&imx219_0>;
+ 					clock-lanes = <0>;
+ 					data-lanes = <1 2>;
+@@ -60,38 +83,14 @@
+ 		};
+ 	};
+ 
+-	fragment@2 {
+-		target = <&i2c0if>;
+-		__overlay__ {
+-			status = "okay";
+-		};
+-	};
+-
+-	fragment@3 {
+-		target = <&cam1_clk>;
+-		__overlay__ {
+-			status = "okay";
+-			clock-frequency = <24000000>;
+-		};
+-	};
+-
+-	fragment@4 {
+-		target = <&i2c0mux>;
+-		__overlay__ {
+-			status = "okay";
+-		};
+-	};
+-
+-	fragment@5 {
+-		target = <&csi1>;
+-		__overlay__ {
+-			brcm,media-controller;
+-		};
+-	};
+-
+ 	__overrides__ {
+ 		rotation = <&imx219>,"rotation:0";
+ 		orientation = <&imx219>,"orientation:0";
+-		media-controller = <0>,"=5";
++		media-controller = <&csi>,"brcm,media-controller?";
++		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
++		       <&csi_frag>, "target:0=",<&csi0>,
++		       <&clk_frag>, "target:0=",<&cam0_clk>,
++		       <&imx219>, "clocks:0=",<&cam0_clk>,
++		       <&imx219>, "VANA-supply:0=",<&cam0_reg>;
+ 	};
+ };
+--- a/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
++++ b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
+@@ -9,7 +9,7 @@
+ /{
+ 	compatible = "brcm,bcm2835";
+ 
+-	fragment@0 {
++	i2c_frag: fragment@0 {
+ 		target = <&i2c_csi_dsi>;
+ 		__overlay__ {
+ 			#address-cells = <1>;
+@@ -41,10 +41,11 @@
+ 		};
+ 	};
+ 
+-	fragment@1 {
++	csi_frag: fragment@1 {
+ 		target = <&csi1>;
+-		__overlay__ {
++		csi: __overlay__ {
+ 			status = "okay";
++			brcm,media-controller;
+ 
+ 			port {
+ 				csi1_ep: endpoint {
+@@ -61,9 +62,9 @@
+ 		};
+ 	};
+ 
+-	fragment@3 {
++	clk_frag: fragment@3 {
+ 		target = <&cam1_clk>;
+-		__overlay__ {
++		cam_clk: __overlay__ {
+ 			status = "okay";
+ 			clock-frequency = <37125000>;
+ 		};
+@@ -108,19 +109,17 @@
+ 		};
+ 	};
+ 
+-	fragment@10 {
+-		target = <&csi1>;
+-		__overlay__ {
+-			brcm,media-controller;
+-		};
+-	};
+-
+ 	__overrides__ {
+ 		4lane = <0>, "-6+7-8+9";
+-		clock-frequency = <&cam1_clk>,"clock-frequency:0",
++		clock-frequency = <&cam_clk>,"clock-frequency:0",
+ 				  <&imx290>,"clock-frequency:0";
+ 		rotation = <&imx290>,"rotation:0";
+ 		orientation = <&imx290>,"orientation:0";
+-		media-controller = <0>,"=10";
++		media-controller = <&csi>,"brcm,media-controller?";
++		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
++		       <&csi_frag>, "target:0=",<&csi0>,
++		       <&clk_frag>, "target:0=",<&cam0_clk>,
++		       <&imx290>, "clocks:0=",<&cam0_clk>,
++		       <&imx290>, "vdda-supply:0=",<&cam0_reg>;
+ 	};
+ };
+--- a/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
++++ b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
+@@ -4,7 +4,36 @@
+ /{
+ 	compatible = "brcm,bcm2835";
+ 
+-	fragment@0 {
++	fragment@2 {
++		target = <&i2c0if>;
++		__overlay__ {
++			status = "okay";
++		};
++	};
++
++	clk_frag: fragment@3 {
++		target = <&cam1_clk>;
++		cam_clk: __overlay__ {
++			clock-frequency = <24000000>;
++			status = "okay";
++		};
++	};
++
++	fragment@4 {
++		target = <&i2c0mux>;
++		__overlay__ {
++			status = "okay";
++		};
++	};
++
++	reg_frag: fragment@5 {
++		target = <&cam1_reg>;
++		cam_reg: __overlay__ {
++			startup-delay-us = <300000>;
++		};
++	};
++
++	i2c_frag: fragment@100 {
+ 		target = <&i2c_csi_dsi>;
+ 		__overlay__ {
+ 			#address-cells = <1>;
+@@ -27,7 +56,7 @@
+ 
+ 				port {
+ 					imx477_0: endpoint {
+-						remote-endpoint = <&csi1_ep>;
++						remote-endpoint = <&csi_ep>;
+ 						clock-lanes = <0>;
+ 						data-lanes = <1 2>;
+ 						clock-noncontinuous;
+@@ -39,13 +68,14 @@
+ 		};
+ 	};
+ 
+-	fragment@1 {
++	csi_frag: fragment@101 {
+ 		target = <&csi1>;
+-		__overlay__ {
++		csi: __overlay__ {
+ 			status = "okay";
++			brcm,media-controller;
+ 
+ 			port {
+-				csi1_ep: endpoint {
++				csi_ep: endpoint {
+ 					remote-endpoint = <&imx477_0>;
+ 					clock-lanes = <0>;
+ 					data-lanes = <1 2>;
+@@ -55,45 +85,15 @@
+ 		};
+ 	};
+ 
+-	fragment@2 {
+-		target = <&i2c0if>;
+-		__overlay__ {
+-			status = "okay";
+-		};
+-	};
+-
+-	fragment@3 {
+-		target = <&cam1_clk>;
+-		__overlay__ {
+-			clock-frequency = <24000000>;
+-			status = "okay";
+-		};
+-	};
+-
+-	fragment@4 {
+-		target = <&i2c0mux>;
+-		__overlay__ {
+-			status = "okay";
+-		};
+-	};
+-
+-	fragment@5 {
+-		target = <&cam1_reg>;
+-		__overlay__ {
+-			startup-delay-us = <300000>;
+-		};
+-	};
+-
+-	fragment@6 {
+-		target = <&csi1>;
+-		__overlay__ {
+-			brcm,media-controller;
+-		};
+-	};
+-
+ 	__overrides__ {
+ 		rotation = <&imx477>,"rotation:0";
+ 		orientation = <&imx477>,"orientation:0";
+-		media-controller = <0>,"=6";
++		media-controller = <&csi>,"brcm,media-controller?";
++		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
++		       <&csi_frag>, "target:0=",<&csi0>,
++		       <&clk_frag>, "target:0=",<&cam0_clk>,
++		       <&reg_frag>, "target:0=",<&cam0_reg>,
++		       <&imx477>, "clocks:0=",<&cam0_clk>,
++		       <&imx477>, "vdda-supply:0=",<&cam0_reg>;
+ 	};
+ };
+--- a/arch/arm/boot/dts/overlays/imx519-overlay.dts
++++ b/arch/arm/boot/dts/overlays/imx519-overlay.dts
+@@ -8,7 +8,7 @@
+ /{
+ 	compatible = "brcm,bcm2835";
+ 
+-	fragment@0 {
++	i2c_frag: fragment@0 {
+ 		target = <&i2c_csi_dsi>;
+ 		__overlay__ {
+ 			#address-cells = <1>;
+@@ -44,10 +44,11 @@
+ 		};
+ 	};
+ 
+-	fragment@1 {
++	csi_frag: fragment@1 {
+ 		target = <&csi1>;
+-		__overlay__ {
++		csi: __overlay__ {
+ 			status = "okay";
++			brcm,media-controller;
+ 
+ 			port{
+ 				csi1_ep: endpoint{
+@@ -67,7 +68,7 @@
+ 		};
+ 	};
+ 
+-	fragment@3 {
++	clk_frag: fragment@3 {
+ 		target = <&cam1_clk>;
+ 		__overlay__ {
+ 			clock-frequency = <24000000>;
+@@ -82,16 +83,14 @@
+ 		};
+ 	};
+ 
+-	fragment@6 {
+-		target = <&csi1>;
+-		__overlay__ {
+-			brcm,media-controller;
+-		};
+-	};
+-
+ 	__overrides__ {
+ 		rotation = <&imx519>,"rotation:0";
+ 		orientation = <&imx519>,"orientation:0";
+-		media-controller = <0>,"=6";
++		media-controller = <&csi>,"brcm,media-controller?";
++		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
++		       <&csi_frag>, "target:0=",<&csi0>,
++		       <&clk_frag>, "target:0=",<&cam0_clk>,
++		       <&imx519>, "clocks:0=",<&cam0_clk>,
++		       <&imx519>, "VANA-supply:0=",<&cam0_reg>;
+ 	};
+ };
+--- a/arch/arm/boot/dts/overlays/irs1125-overlay.dts
++++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts
+@@ -6,20 +6,20 @@
+ /{
+ 	compatible = "brcm,bcm2835";
+ 
+-	fragment@0 {
++	i2c_frag: fragment@0 {
+ 		target = <&i2c_csi_dsi>;
+ 		__overlay__ {
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			status = "okay";
+ 
+-			irs1125: irs1125@3D {
++			irs1125: irs1125@3d {
+ 				compatible = "infineon,irs1125";
+-				reg = <0x3D>;
++				reg = <0x3d>;
+ 				status = "okay";
+ 
+ 				pwdn-gpios = <&gpio 5 0>;
+-				clocks = <&irs1125_clk>;
++				clocks = <&cam1_clk>;
+ 
+ 				port {
+ 					irs1125_0: endpoint {
+@@ -35,9 +35,9 @@
+ 		};
+ 	};
+ 
+-	fragment@1 {
++	csi_frag: fragment@1 {
+ 		target = <&csi1>;
+-		__overlay__ {
++		csi: __overlay__ {
+ 			status = "okay";
+ 
+ 			port {
+@@ -72,25 +72,18 @@
+ 		};
+ 	};
+ 
+-	fragment@5 {
+-		target-path = "/";
++	clk_frag: fragment@5 {
++		target = <&cam1_clk>;
+ 		__overlay__ {
+-			irs1125_clk: camera-clk {
+-				compatible = "fixed-clock";
+-				#clock-cells = <0>;
+-				clock-frequency = <26000000>;
+-			};
+-		};
+-	};
+-
+-	fragment@6 {
+-		target = <&csi1>;
+-		__dormant__ {
+-			brcm,media-controller;
++			clock-frequency = <26000000>;
+ 		};
+ 	};
+ 
+ 	__overrides__ {
+-		media-controller = <0>,"=6";
++		media-controller = <&csi>,"brcm,media-controller?";
++		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
++		       <&csi_frag>, "target:0=",<&csi0>,
++		       <&clk_frag>, "target:0=",<&cam0_clk>,
++		       <&irs1125>, "clocks:0=",<&cam0_clk>;
+ 	};
+ };
+--- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts
++++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
+@@ -6,7 +6,7 @@
+ /{
+ 	compatible = "brcm,bcm2835";
+ 
+-	fragment@0 {
++	i2c_frag: fragment@0 {
+ 		target = <&i2c_csi_dsi>;
+ 		__overlay__ {
+ 			#address-cells = <1>;
+@@ -41,10 +41,11 @@
+ 		};
+ 	};
+ 
+-	fragment@1 {
++	csi_frag: fragment@1 {
+ 		target = <&csi1>;
+-		__overlay__ {
++		csi: __overlay__ {
+ 			status = "okay";
++			brcm,media-controller;
+ 
+ 			port {
+ 				csi1_ep: endpoint {
+@@ -69,14 +70,14 @@
+ 		};
+ 	};
+ 
+-	fragment@4 {
++	reg_frag: fragment@4 {
+ 		target = <&cam1_reg>;
+ 		__overlay__ {
+ 			startup-delay-us = <20000>;
+ 		};
+ 	};
+ 
+-	fragment@5 {
++	clk_frag: fragment@5 {
+ 		target = <&cam1_clk>;
+ 		__overlay__ {
+ 			status = "okay";
+@@ -84,23 +85,15 @@
+ 		};
+ 	};
+ 
+-	fragment@6 {
+-		target = <&csi1>;
+-		__overlay__ {
+-			brcm,media-controller;
+-		};
+-	};
+-
+-	fragment@7 {
+-		target = <&cam1_reg>;
+-		__overlay__ {
+-			status = "disabled";
+-		};
+-	};
+-
+ 	__overrides__ {
+ 		rotation = <&ov5647>,"rotation:0";
+ 		orientation = <&ov5647>,"orientation:0";
+-		media-controller = <0>,"=6";
++		media-controller = <&csi>,"brcm,media-controller?";
++		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
++		       <&csi_frag>, "target:0=",<&csi0>,
++		       <&reg_frag>, "target:0=",<&cam0_reg>,
++		       <&clk_frag>, "target:0=",<&cam0_clk>,
++		       <&ov5647>, "clocks:0=",<&cam0_clk>,
++		       <&ov5647>, "avdd-supply:0=",<&cam0_reg>;
+ 	};
+ };
+--- a/arch/arm/boot/dts/overlays/ov7251-overlay.dts
++++ b/arch/arm/boot/dts/overlays/ov7251-overlay.dts
+@@ -8,7 +8,7 @@
+ /{
+ 	compatible = "brcm,bcm2835";
+ 
+-	fragment@0 {
++	i2c_frag: fragment@0 {
+ 		target = <&i2c_csi_dsi>;
+ 		__overlay__ {
+ 			#address-cells = <1>;
+@@ -45,9 +45,9 @@
+ 		};
+ 	};
+ 
+-	fragment@1 {
++	csi_frag: fragment@1 {
+ 		target = <&csi1>;
+-		__overlay__ {
++		csi: __overlay__ {
+ 			status = "okay";
+ 
+ 			port {
+@@ -67,30 +67,28 @@
+ 	};
+ 
+ 	fragment@3 {
+-		target = <&cam1_clk>;
++		target = <&i2c0mux>;
+ 		__overlay__ {
+ 			status = "okay";
+-			clock-frequency = <24000000>;
+ 		};
+ 	};
+ 
+-	fragment@4 {
+-		target = <&i2c0mux>;
++	clk_frag: fragment@4 {
++		target = <&cam1_clk>;
+ 		__overlay__ {
+ 			status = "okay";
+-		};
+-	};
+-
+-	fragment@6 {
+-		target = <&csi1>;
+-		__dormant__ {
+-			brcm,media-controller;
++			clock-frequency = <24000000>;
+ 		};
+ 	};
+ 
+ 	__overrides__ {
+ 		rotation = <&ov7251>,"rotation:0";
+ 		orientation = <&ov7251>,"orientation:0";
+-		media-controller = <0>,"=6";
++		media-controller = <&csi>,"brcm,media-controller?";
++		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
++		       <&csi_frag>, "target:0=",<&csi0>,
++		       <&clk_frag>, "target:0=",<&cam0_clk>,
++		       <&ov7251>, "clocks:0=",<&cam0_clk>,
++		       <&ov7251>, "vdda-supply:0=",<&cam0_reg>;
+ 	};
+ };
+--- a/arch/arm/boot/dts/overlays/ov9281-overlay.dts
++++ b/arch/arm/boot/dts/overlays/ov9281-overlay.dts
+@@ -8,7 +8,7 @@
+ /{
+ 	compatible = "brcm,bcm2835";
+ 
+-	fragment@0 {
++	i2c_frag: fragment@0 {
+ 		target = <&i2c_csi_dsi>;
+ 		__overlay__ {
+ 			#address-cells = <1>;
+@@ -44,10 +44,11 @@
+ 		};
+ 	};
+ 
+-	fragment@1 {
++	csi_frag: fragment@1 {
+ 		target = <&csi1>;
+-		__overlay__ {
++		csi: __overlay__ {
+ 			status = "okay";
++			brcm,media-controller;
+ 
+ 			port {
+ 				csi1_ep: endpoint {
+@@ -67,30 +68,28 @@
+ 	};
+ 
+ 	fragment@3 {
+-		target = <&cam1_clk>;
+-		__overlay__ {
+-			status = "okay";
+-			clock-frequency = <24000000>;
+-		};
+-	};
+-
+-	fragment@4 {
+ 		target = <&i2c0mux>;
+ 		__overlay__ {
+ 			status = "okay";
+ 		};
+ 	};
+ 
+-	fragment@5 {
+-		target = <&csi1>;
++	clk_frag: fragment@4 {
++		target = <&cam1_clk>;
+ 		__overlay__ {
+-			brcm,media-controller;
++			status = "okay";
++			clock-frequency = <24000000>;
+ 		};
+ 	};
+ 
+ 	__overrides__ {
+ 		rotation = <&ov9281>,"rotation:0";
+ 		orientation = <&ov9281>,"orientation:0";
+-		media-controller = <0>,"=5";
++		media-controller = <&csi>,"brcm,media-controller?";
++		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
++		       <&csi_frag>, "target:0=",<&csi0>,
++		       <&clk_frag>, "target:0=",<&cam0_clk>,
++		       <&ov9281>, "clocks:0=",<&cam0_clk>,
++		       <&ov9281>, "avdd-supply:0=",<&cam0_reg>;
+ 	};
+ };
+--- a/arch/arm/boot/dts/overlays/tc358743-overlay.dts
++++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
+@@ -6,23 +6,23 @@
+ /{
+ 	compatible = "brcm,bcm2835";
+ 
+-	fragment@0 {
++	i2c_frag: fragment@0 {
+ 		target = <&i2c_csi_dsi>;
+ 		__overlay__ {
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+ 			status = "okay";
+ 
+-			tc358743@0f {
++			tc358743: tc358743@f {
+ 				compatible = "toshiba,tc358743";
+ 				reg = <0x0f>;
+ 				status = "okay";
+ 
+-				clocks = <&tc358743_clk>;
++				clocks = <&cam1_clk>;
+ 				clock-names = "refclk";
+ 
+ 				port {
+-					tc358743: endpoint {
++					tc358743_0: endpoint {
+ 						remote-endpoint = <&csi1_ep>;
+ 						clock-lanes = <0>;
+ 						clock-noncontinuous;
+@@ -34,28 +34,28 @@
+ 		};
+ 	};
+ 
+-	fragment@1 {
++	csi_frag: fragment@1 {
+ 		target = <&csi1>;
+-		__overlay__ {
++		csi: __overlay__ {
+ 			status = "okay";
+ 
+ 			port {
+ 				csi1_ep: endpoint {
+-					remote-endpoint = <&tc358743>;
++					remote-endpoint = <&tc358743_0>;
+ 				};
+ 			};
+ 		};
+ 	};
+ 
+ 	fragment@2 {
+-		target = <&tc358743>;
++		target = <&tc358743_0>;
+ 		__overlay__ {
+ 			data-lanes = <1 2>;
+ 		};
+ 	};
+ 
+ 	fragment@3 {
+-		target = <&tc358743>;
++		target = <&tc358743_0>;
+ 		__dormant__ {
+ 			data-lanes = <1 2 3 4>;
+ 		};
+@@ -75,14 +75,10 @@
+ 		};
+ 	};
+ 
+-	fragment@6 {
+-		target-path = "/";
++	clk_frag: fragment@6 {
++		target = <&cam1_clk>;
+ 		__overlay__ {
+-			tc358743_clk: bridge-clk {
+-				compatible = "fixed-clock";
+-				#clock-cells = <0>;
+-				clock-frequency = <27000000>;
+-			};
++			clock-frequency = <27000000>;
+ 		};
+ 	};
+ 
+@@ -100,16 +96,13 @@
+ 		};
+ 	};
+ 
+-	fragment@9 {
+-		target = <&csi1>;
+-		__dormant__ {
+-			brcm,media-controller;
+-		};
+-	};
+-
+ 	__overrides__ {
+ 		4lane = <0>, "-2+3-7+8";
+-		link-frequency = <&tc358743>,"link-frequencies#0";
+-		media-controller = <0>,"=9";
++		link-frequency = <&tc358743_0>,"link-frequencies#0";
++		media-controller = <&csi>,"brcm,media-controller?";
++		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
++		       <&csi_frag>, "target:0=",<&csi0>,
++		       <&clk_frag>, "target:0=",<&cam0_clk>,
++		       <&tc358743>, "clocks:0=",<&cam0_clk>;
+ 	};
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0630-ASoC-ma120x0p-Increase-maximum-sample-rate-to-192KHz.patch b/root/target/linux/bcm27xx/patches-5.15/950-0630-ASoC-ma120x0p-Increase-maximum-sample-rate-to-192KHz.patch
new file mode 100644
index 00000000..e0e37ade
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0630-ASoC-ma120x0p-Increase-maximum-sample-rate-to-192KHz.patch
@@ -0,0 +1,24 @@
+From 91767891dbf2cda24674bf79253cef55187b37dd Mon Sep 17 00:00:00 2001
+From: Joerg Schambacher <joerg@hifiberry.com>
+Date: Wed, 15 Dec 2021 19:27:00 +0100
+Subject: [PATCH 630/828] ASoC:ma120x0p: Increase maximum sample rate to 192KHz
+
+Change the maximum sample rate for the amplifier to
+192KHz as given in the Infineon specification.
+
+Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
+---
+ sound/soc/codecs/ma120x0p.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/soc/codecs/ma120x0p.c
++++ b/sound/soc/codecs/ma120x0p.c
+@@ -1002,7 +1002,7 @@ static struct snd_soc_dai_driver ma120x0
+ 		.channels_max	= 2,
+ 		.rates = SNDRV_PCM_RATE_CONTINUOUS,
+ 		.rate_min = 44100,
+-		.rate_max = 96000,
++		.rate_max = 192000,
+ 		.formats = SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE
+ 	},
+ 	.ops        = &ma120x0p_dai_ops,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0631-staging-bcm2835-isp-Fix-cleanup-after-init-fail.patch b/root/target/linux/bcm27xx/patches-5.15/950-0631-staging-bcm2835-isp-Fix-cleanup-after-init-fail.patch
new file mode 100644
index 00000000..1df08fce
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0631-staging-bcm2835-isp-Fix-cleanup-after-init-fail.patch
@@ -0,0 +1,38 @@
+From a5be7d01c9532bb97886ba27ceb05e3e59f2fc9b Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Thu, 16 Dec 2021 16:25:00 +0000
+Subject: [PATCH 631/828] staging/bcm2835-isp: Fix cleanup after init fail
+
+bcm2835_isp_remove is called on an initialisation failure, but at that
+point the drvdata hasn't been set. This causes a crash when e.g. using
+the cutdown firmware (gpu_mem=16).
+
+Move platform_set_drvdata before the instance probing loop to avoid the
+problem.
+
+See: https://github.com/raspberrypi/linux/issues/4774
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
++++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
+@@ -1774,6 +1774,8 @@ static int bcm2835_isp_probe(struct plat
+ 	if (!bcm2835_isp_instances)
+ 		return -ENOMEM;
+ 
++	platform_set_drvdata(pdev, bcm2835_isp_instances);
++
+ 	for (i = 0; i < BCM2835_ISP_NUM_INSTANCES; i++) {
+ 		ret = bcm2835_isp_probe_instance(pdev,
+ 						 &bcm2835_isp_instances[i], i);
+@@ -1781,7 +1783,6 @@ static int bcm2835_isp_probe(struct plat
+ 			goto error;
+ 	}
+ 
+-	platform_set_drvdata(pdev, bcm2835_isp_instances);
+ 	dev_info(&pdev->dev, "Loaded V4L2 %s\n", BCM2835_ISP_NAME);
+ 	return 0;
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0632-drm-vc4-kms-Take-old-state-core-clock-rate-into-acco.patch b/root/target/linux/bcm27xx/patches-5.15/950-0632-drm-vc4-kms-Take-old-state-core-clock-rate-into-acco.patch
new file mode 100644
index 00000000..b314993a
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0632-drm-vc4-kms-Take-old-state-core-clock-rate-into-acco.patch
@@ -0,0 +1,38 @@
+From 3f8d026847193ebe15eefb3b9948b07cee169eaa Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Thu, 18 Nov 2021 14:04:00 +0100
+Subject: [PATCH 632/828] drm/vc4: kms: Take old state core clock rate into
+ account
+
+During a commit, the core clock, which feeds the HVS, needs to run at
+a minimum of 500MHz.
+
+While doing that commit, we can also change the mode to one that
+requires a higher core clock, so we take the core clock rate associated
+to that new state into account for that boost.
+
+However, the old state also needs to be taken into account if it
+requires a core clock higher that the new one and our 500MHz limit,
+since it's still live in hardware at the beginning of our commit.
+
+Fixes: 16e101051f32 ("drm/vc4: Increase the core clock based on HVS load")
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_kms.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -390,9 +390,10 @@ static void vc4_atomic_commit_tail(struc
+ 	}
+ 
+ 	if (vc4->hvs && vc4->hvs->hvs5) {
++		unsigned long state_rate = max(old_hvs_state->core_clock_rate,
++					       new_hvs_state->core_clock_rate);
+ 		unsigned long core_rate = max_t(unsigned long,
+-						500000000,
+-						new_hvs_state->core_clock_rate);
++						500000000, state_rate);
+ 
+ 		core_req = clk_request_start(hvs->core_clk, core_rate);
+ 		/*
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0633-drm-vc4-hvs-Store-channel-in-variable.patch b/root/target/linux/bcm27xx/patches-5.15/950-0633-drm-vc4-hvs-Store-channel-in-variable.patch
new file mode 100644
index 00000000..a5fb8fb8
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0633-drm-vc4-hvs-Store-channel-in-variable.patch
@@ -0,0 +1,53 @@
+From 58e9b332a0f830c81dad83fe96a5427a2a13962e Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Mon, 29 Nov 2021 12:18:39 +0100
+Subject: [PATCH 633/828] drm/vc4: hvs: Store channel in variable
+
+The assigned_channel field of our vc4_crtc_state structure is accessed
+multiple times in vc4_hvs_atomic_flush, so let's move it to a variable
+that can be used in all those places.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hvs.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hvs.c
++++ b/drivers/gpu/drm/vc4/vc4_hvs.c
+@@ -674,6 +674,7 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 	struct drm_device *dev = crtc->dev;
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
+ 	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state);
++	unsigned int channel = vc4_state->assigned_channel;
+ 	struct drm_plane *plane;
+ 	struct vc4_plane_state *vc4_plane_state;
+ 	bool debug_dump_regs = false;
+@@ -714,8 +715,8 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 		/* This sets a black background color fill, as is the case
+ 		 * with other DRM drivers.
+ 		 */
+-		HVS_WRITE(SCALER_DISPBKGNDX(vc4_state->assigned_channel),
+-			  HVS_READ(SCALER_DISPBKGNDX(vc4_state->assigned_channel)) |
++		HVS_WRITE(SCALER_DISPBKGNDX(channel),
++			  HVS_READ(SCALER_DISPBKGNDX(channel)) |
+ 			  SCALER_DISPBKGND_FILL);
+ 
+ 	/* Only update DISPLIST if the CRTC was already running and is not
+@@ -729,7 +730,7 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 		vc4_hvs_update_dlist(crtc);
+ 
+ 	if (crtc->state->color_mgmt_changed) {
+-		u32 dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(vc4_state->assigned_channel));
++		u32 dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(channel));
+ 
+ 		if (crtc->state->gamma_lut) {
+ 			if (!vc4->hvs->hvs5) {
+@@ -752,7 +753,7 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 			if (!vc4->hvs->hvs5)
+ 				dispbkgndx &= ~SCALER_DISPBKGND_GAMMA;
+ 		}
+-		HVS_WRITE(SCALER_DISPBKGNDX(vc4_state->assigned_channel), dispbkgndx);
++		HVS_WRITE(SCALER_DISPBKGNDX(channel), dispbkgndx);
+ 	}
+ 
+ 	if (debug_dump_regs) {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0634-drm-vc4-hvs-Remove-dlist-setup-duplication.patch b/root/target/linux/bcm27xx/patches-5.15/950-0634-drm-vc4-hvs-Remove-dlist-setup-duplication.patch
new file mode 100644
index 00000000..86478442
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0634-drm-vc4-hvs-Remove-dlist-setup-duplication.patch
@@ -0,0 +1,35 @@
+From 7a53cd504cca0a63564ff623aaddcb01421ecc22 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Mon, 6 Dec 2021 16:17:56 +0100
+Subject: [PATCH 634/828] drm/vc4: hvs: Remove dlist setup duplication
+
+Setting the DISPLISTx register needs to occur in every case, and we
+don't need to protect the register using the event_lock, so we can just
+move it after the if branches and simplify a bit the function.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hvs.c | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hvs.c
++++ b/drivers/gpu/drm/vc4/vc4_hvs.c
+@@ -616,15 +616,12 @@ static void vc4_hvs_update_dlist(struct
+ 			crtc->state->event = NULL;
+ 		}
+ 
+-		HVS_WRITE(SCALER_DISPLISTX(vc4_state->assigned_channel),
+-			  vc4_state->mm.start);
+-
+ 		spin_unlock_irqrestore(&dev->event_lock, flags);
+-	} else {
+-		HVS_WRITE(SCALER_DISPLISTX(vc4_state->assigned_channel),
+-			  vc4_state->mm.start);
+ 	}
+ 
++	HVS_WRITE(SCALER_DISPLISTX(vc4_state->assigned_channel),
++		  vc4_state->mm.start);
++
+ 	spin_lock_irqsave(&vc4_crtc->irq_lock, flags);
+ 	vc4_crtc->current_dlist = vc4_state->mm.start;
+ 	spin_unlock_irqrestore(&vc4_crtc->irq_lock, flags);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0635-drm-vc4-hvs-Move-the-dlist-setup-to-its-own-function.patch b/root/target/linux/bcm27xx/patches-5.15/950-0635-drm-vc4-hvs-Move-the-dlist-setup-to-its-own-function.patch
new file mode 100644
index 00000000..34ca4ac3
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0635-drm-vc4-hvs-Move-the-dlist-setup-to-its-own-function.patch
@@ -0,0 +1,71 @@
+From 7e13159e7fa627864b9c0131f9f9c2baa79fc655 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Mon, 6 Dec 2021 16:31:33 +0100
+Subject: [PATCH 635/828] drm/vc4: hvs: Move the dlist setup to its own
+ function
+
+The vc4_hvs_update_dlist function mostly deals with setting up the
+vblank events and setting up the dlist entry pointer to our current
+active one.
+
+We'll want to do the former separately from the vblank handling in later
+patches, so let's move it to a function of its own.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hvs.c | 19 ++++++++++++++-----
+ 1 file changed, 14 insertions(+), 5 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hvs.c
++++ b/drivers/gpu/drm/vc4/vc4_hvs.c
+@@ -596,10 +596,19 @@ int vc4_hvs_atomic_check(struct drm_crtc
+ 	return vc4_hvs_gamma_check(crtc, state);
+ }
+ 
+-static void vc4_hvs_update_dlist(struct drm_crtc *crtc)
++static void vc4_hvs_install_dlist(struct drm_crtc *crtc)
+ {
+ 	struct drm_device *dev = crtc->dev;
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
++	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state);
++
++	HVS_WRITE(SCALER_DISPLISTX(vc4_state->assigned_channel),
++		  vc4_state->mm.start);
++}
++
++static void vc4_hvs_update_dlist(struct drm_crtc *crtc)
++{
++	struct drm_device *dev = crtc->dev;
+ 	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
+ 	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state);
+ 	unsigned long flags;
+@@ -619,9 +628,6 @@ static void vc4_hvs_update_dlist(struct
+ 		spin_unlock_irqrestore(&dev->event_lock, flags);
+ 	}
+ 
+-	HVS_WRITE(SCALER_DISPLISTX(vc4_state->assigned_channel),
+-		  vc4_state->mm.start);
+-
+ 	spin_lock_irqsave(&vc4_crtc->irq_lock, flags);
+ 	vc4_crtc->current_dlist = vc4_state->mm.start;
+ 	spin_unlock_irqrestore(&vc4_crtc->irq_lock, flags);
+@@ -648,6 +654,7 @@ void vc4_hvs_atomic_enable(struct drm_cr
+ 	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
+ 	bool oneshot = vc4_crtc->feeds_txp;
+ 
++	vc4_hvs_install_dlist(crtc);
+ 	vc4_hvs_update_dlist(crtc);
+ 	vc4_hvs_init_channel(vc4, crtc, mode, oneshot);
+ }
+@@ -723,8 +730,10 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 	 * If the CRTC is being disabled, there's no point in updating this
+ 	 * information.
+ 	 */
+-	if (crtc->state->active && old_state->active)
++	if (crtc->state->active && old_state->active) {
++		vc4_hvs_install_dlist(crtc);
+ 		vc4_hvs_update_dlist(crtc);
++	}
+ 
+ 	if (crtc->state->color_mgmt_changed) {
+ 		u32 dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(channel));
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0636-drm-vc4-hvs-Ignore-atomic_flush-if-we-re-disabled.patch b/root/target/linux/bcm27xx/patches-5.15/950-0636-drm-vc4-hvs-Ignore-atomic_flush-if-we-re-disabled.patch
new file mode 100644
index 00000000..82fa5193
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0636-drm-vc4-hvs-Ignore-atomic_flush-if-we-re-disabled.patch
@@ -0,0 +1,27 @@
+From ca008316d263fdba0a649ad36a58e6823218dc38 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Mon, 6 Dec 2021 16:32:10 +0100
+Subject: [PATCH 636/828] drm/vc4: hvs: Ignore atomic_flush if we're disabled
+
+atomic_flush will be called for each CRTC even if they aren't enabled.
+
+The whole code we have there will thus run without a properly affected
+channel, which can then result in all sorts of weird behaviour.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hvs.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_hvs.c
++++ b/drivers/gpu/drm/vc4/vc4_hvs.c
+@@ -686,6 +686,9 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 	u32 __iomem *dlist_start = vc4->hvs->dlist + vc4_state->mm.start;
+ 	u32 __iomem *dlist_next = dlist_start;
+ 
++	if (vc4_state->assigned_channel == VC4_HVS_CHANNEL_DISABLED)
++		return;
++
+ 	if (debug_dump_regs) {
+ 		DRM_INFO("CRTC %d HVS before:\n", drm_crtc_index(crtc));
+ 		vc4_hvs_dump_state(dev);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0637-drm-vc4-Skip-writes-to-disabled-packet-RAM.patch b/root/target/linux/bcm27xx/patches-5.15/950-0637-drm-vc4-Skip-writes-to-disabled-packet-RAM.patch
new file mode 100644
index 00000000..a8ecffcc
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0637-drm-vc4-Skip-writes-to-disabled-packet-RAM.patch
@@ -0,0 +1,58 @@
+From db0c37bd776a81837373dede4752eb991839c977 Mon Sep 17 00:00:00 2001
+From: Dom Cobley <popcornmix@gmail.com>
+Date: Fri, 10 Dec 2021 18:03:18 +0000
+Subject: [PATCH 637/828] drm/vc4: Skip writes to disabled packet RAM
+
+This path actually occurs when audio is started during a hdmi mode set.
+As the data will be written by vc4_hdmi_set_infoframes when packet RAM
+is enabled again, don't treat as an error
+
+Signed-off-by: Dom Cobley <popcornmix@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 5 ++++-
+ drivers/gpu/drm/vc4/vc4_hdmi.h | 6 ++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -684,6 +684,7 @@ static void vc4_hdmi_encoder_post_crtc_d
+ 
+ 	mutex_lock(&vc4_hdmi->mutex);
+ 
++	vc4_hdmi->output_enabled = false;
+ 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 
+ 	HDMI_WRITE(HDMI_RAM_PACKET_CONFIG, 0);
+@@ -1200,6 +1201,7 @@ static void vc4_hdmi_encoder_post_crtc_e
+ 			   VC4_HDMI_RAM_PACKET_ENABLE);
+ 
+ 		spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
++		vc4_hdmi->output_enabled = true;
+ 
+ 		vc4_hdmi_set_infoframes(encoder);
+ 	}
+@@ -1605,7 +1607,8 @@ static int vc4_hdmi_audio_prepare(struct
+ 	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ 
+ 	memcpy(&vc4_hdmi->audio.infoframe, &params->cea, sizeof(params->cea));
+-	vc4_hdmi_set_audio_infoframe(encoder);
++	if (vc4_hdmi->output_enabled)
++		vc4_hdmi_set_audio_infoframe(encoder);
+ 
+ 	mutex_unlock(&vc4_hdmi->mutex);
+ 
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
+@@ -209,6 +209,12 @@ struct vc4_hdmi {
+ 	struct drm_display_mode saved_adjusted_mode;
+ 
+ 	/**
++	 * @output_enabled: Is the HDMI controller currently active?
++	 * Protected by @mutex.
++	 */
++	bool output_enabled;
++
++	/**
+ 	 * @scdc_enabled: Is the HDMI controller currently running with
+ 	 * the scrambler on? Protected by @mutex.
+ 	 */
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0639-drm-edid-Rename-drm_hdmi_avi_infoframe_colorspace-to.patch b/root/target/linux/bcm27xx/patches-5.15/950-0639-drm-edid-Rename-drm_hdmi_avi_infoframe_colorspace-to.patch
new file mode 100644
index 00000000..132cea7c
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0639-drm-edid-Rename-drm_hdmi_avi_infoframe_colorspace-to.patch
@@ -0,0 +1,100 @@
+From 2f805e56093f79839aa3eddaf76fc75648eb0492 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Wed, 14 Apr 2021 16:21:08 +0200
+Subject: [PATCH 639/828] drm/edid: Rename drm_hdmi_avi_infoframe_colorspace to
+ _colorimetry
+
+The drm_hdmi_avi_infoframe_colorspace() function actually sets the
+colorimetry and extended_colorimetry fields in the hdmi_avi_infoframe
+structure with DRM_MODE_COLORIMETRY_* values.
+
+To make things worse, the hdmi_avi_infoframe structure also has a
+colorspace field used to signal whether an RGB or YUV output is being
+used.
+
+Let's remove the inconsistency and allow for the colorspace usage by
+renaming the function.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/drm_edid.c                  | 8 ++++----
+ drivers/gpu/drm/i915/display/intel_hdmi.c   | 2 +-
+ drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.c              | 2 +-
+ include/drm/drm_edid.h                      | 4 ++--
+ 5 files changed, 9 insertions(+), 9 deletions(-)
+
+--- a/drivers/gpu/drm/drm_edid.c
++++ b/drivers/gpu/drm/drm_edid.c
+@@ -5742,13 +5742,13 @@ static const u32 hdmi_colorimetry_val[]
+ #undef ACE
+ 
+ /**
+- * drm_hdmi_avi_infoframe_colorspace() - fill the HDMI AVI infoframe
+- *                                       colorspace information
++ * drm_hdmi_avi_infoframe_colorimetry() - fill the HDMI AVI infoframe
++ *                                       colorimetry information
+  * @frame: HDMI AVI infoframe
+  * @conn_state: connector state
+  */
+ void
+-drm_hdmi_avi_infoframe_colorspace(struct hdmi_avi_infoframe *frame,
++drm_hdmi_avi_infoframe_colorimetry(struct hdmi_avi_infoframe *frame,
+ 				  const struct drm_connector_state *conn_state)
+ {
+ 	u32 colorimetry_val;
+@@ -5767,7 +5767,7 @@ drm_hdmi_avi_infoframe_colorspace(struct
+ 	frame->extended_colorimetry = (colorimetry_val >> 2) &
+ 					EXTENDED_COLORIMETRY_MASK;
+ }
+-EXPORT_SYMBOL(drm_hdmi_avi_infoframe_colorspace);
++EXPORT_SYMBOL(drm_hdmi_avi_infoframe_colorimetry);
+ 
+ /**
+  * drm_hdmi_avi_infoframe_quant_range() - fill the HDMI AVI infoframe
+--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
++++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
+@@ -730,7 +730,7 @@ intel_hdmi_compute_avi_infoframe(struct
+ 	else
+ 		frame->colorspace = HDMI_COLORSPACE_RGB;
+ 
+-	drm_hdmi_avi_infoframe_colorspace(frame, conn_state);
++	drm_hdmi_avi_infoframe_colorimetry(frame, conn_state);
+ 
+ 	/* nonsense combination */
+ 	drm_WARN_ON(encoder->base.dev, crtc_state->limited_color_range &&
+--- a/drivers/gpu/drm/i915/display/intel_lspcon.c
++++ b/drivers/gpu/drm/i915/display/intel_lspcon.c
+@@ -537,7 +537,7 @@ void lspcon_set_infoframes(struct intel_
+ 		frame.avi.colorspace = HDMI_COLORSPACE_RGB;
+ 
+ 	/* Set the Colorspace as per the HDMI spec */
+-	drm_hdmi_avi_infoframe_colorspace(&frame.avi, conn_state);
++	drm_hdmi_avi_infoframe_colorimetry(&frame.avi, conn_state);
+ 
+ 	/* nonsense combination */
+ 	drm_WARN_ON(encoder->base.dev, crtc_state->limited_color_range &&
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -516,7 +516,7 @@ static void vc4_hdmi_set_avi_infoframe(s
+ 					   vc4_encoder->limited_rgb_range ?
+ 					   HDMI_QUANTIZATION_RANGE_LIMITED :
+ 					   HDMI_QUANTIZATION_RANGE_FULL);
+-	drm_hdmi_avi_infoframe_colorspace(&frame.avi, cstate);
++	drm_hdmi_avi_infoframe_colorimetry(&frame.avi, cstate);
+ 	drm_hdmi_avi_infoframe_bars(&frame.avi, cstate);
+ 
+ 	vc4_hdmi_write_infoframe(encoder, &frame);
+--- a/include/drm/drm_edid.h
++++ b/include/drm/drm_edid.h
+@@ -401,8 +401,8 @@ drm_hdmi_vendor_infoframe_from_display_m
+ 					    const struct drm_display_mode *mode);
+ 
+ void
+-drm_hdmi_avi_infoframe_colorspace(struct hdmi_avi_infoframe *frame,
+-				  const struct drm_connector_state *conn_state);
++drm_hdmi_avi_infoframe_colorimetry(struct hdmi_avi_infoframe *frame,
++				   const struct drm_connector_state *conn_state);
+ 
+ void
+ drm_hdmi_avi_infoframe_bars(struct hdmi_avi_infoframe *frame,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0640-drm-vc4-hdmi-Add-full-range-RGB-helper.patch b/root/target/linux/bcm27xx/patches-5.15/950-0640-drm-vc4-hdmi-Add-full-range-RGB-helper.patch
new file mode 100644
index 00000000..a0362e0d
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0640-drm-vc4-hdmi-Add-full-range-RGB-helper.patch
@@ -0,0 +1,43 @@
+From 9bdf91fd0c984f7d6d44ca74c54a698b0d681bcb Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Tue, 12 Jan 2021 15:55:07 +0100
+Subject: [PATCH 640/828] drm/vc4: hdmi: Add full range RGB helper
+
+We're going to need to tell whether we want to run with a full or
+limited range RGB output in multiple places in the code, so let's create
+a helper that will return whether we need with full range or not.
+
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -107,6 +107,15 @@ static bool vc4_hdmi_mode_needs_scrambli
+ 	return (mode->clock * 1000) > HDMI_14_MAX_TMDS_CLK;
+ }
+ 
++static bool vc4_hdmi_is_full_range_rgb(struct vc4_hdmi *vc4_hdmi,
++				       const struct drm_display_mode *mode)
++{
++	struct vc4_hdmi_encoder *vc4_encoder = &vc4_hdmi->encoder;
++
++	return !vc4_encoder->hdmi_monitor ||
++		drm_default_rgb_quant_range(mode) == HDMI_QUANTIZATION_RANGE_FULL;
++}
++
+ static int vc4_hdmi_debugfs_regs(struct seq_file *m, void *unused)
+ {
+ 	struct drm_info_node *node = (struct drm_info_node *)m->private;
+@@ -1115,8 +1124,7 @@ static void vc4_hdmi_encoder_pre_crtc_en
+ 
+ 	mutex_lock(&vc4_hdmi->mutex);
+ 
+-	if (vc4_encoder->hdmi_monitor &&
+-	    drm_default_rgb_quant_range(mode) == HDMI_QUANTIZATION_RANGE_LIMITED) {
++	if (!vc4_hdmi_is_full_range_rgb(vc4_hdmi, mode)) {
+ 		if (vc4_hdmi->variant->csc_setup)
+ 			vc4_hdmi->variant->csc_setup(vc4_hdmi, true);
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0641-drm-vc4-hdmi-Use-full-range-helper-in-csc-functions.patch b/root/target/linux/bcm27xx/patches-5.15/950-0641-drm-vc4-hdmi-Use-full-range-helper-in-csc-functions.patch
new file mode 100644
index 00000000..ecade12a
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0641-drm-vc4-hdmi-Use-full-range-helper-in-csc-functions.patch
@@ -0,0 +1,126 @@
+From e98fa1a3d17a1ef23b88ca13d088ec15c8a16380 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Tue, 12 Jan 2021 15:57:50 +0100
+Subject: [PATCH 641/828] drm/vc4: hdmi: Use full range helper in csc functions
+
+The CSC callbacks takes a boolean as an argument to tell whether we're
+using the full range or limited range RGB.
+
+However, with the upcoming YUV support, the logic will be a bit more
+complex. In order to address this, let's make the callbacks take the
+entire mode, and call our new helper to tell whether the full or limited
+range RGB should be used.
+
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 31 +++++++++++--------------------
+ drivers/gpu/drm/vc4/vc4_hdmi.h |  4 ++--
+ 2 files changed, 13 insertions(+), 22 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -504,7 +504,6 @@ static void vc4_hdmi_write_infoframe(str
+ static void vc4_hdmi_set_avi_infoframe(struct drm_encoder *encoder)
+ {
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
+-	struct vc4_hdmi_encoder *vc4_encoder = to_vc4_hdmi_encoder(encoder);
+ 	struct drm_connector *connector = &vc4_hdmi->connector;
+ 	struct drm_connector_state *cstate = connector->state;
+ 	const struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode;
+@@ -522,9 +521,9 @@ static void vc4_hdmi_set_avi_infoframe(s
+ 
+ 	drm_hdmi_avi_infoframe_quant_range(&frame.avi,
+ 					   connector, mode,
+-					   vc4_encoder->limited_rgb_range ?
+-					   HDMI_QUANTIZATION_RANGE_LIMITED :
+-					   HDMI_QUANTIZATION_RANGE_FULL);
++					   vc4_hdmi_is_full_range_rgb(vc4_hdmi, mode) ?
++					   HDMI_QUANTIZATION_RANGE_FULL :
++					   HDMI_QUANTIZATION_RANGE_LIMITED);
+ 	drm_hdmi_avi_infoframe_colorimetry(&frame.avi, cstate);
+ 	drm_hdmi_avi_infoframe_bars(&frame.avi, cstate);
+ 
+@@ -741,7 +740,8 @@ static void vc4_hdmi_encoder_post_crtc_p
+ 	mutex_unlock(&vc4_hdmi->mutex);
+ }
+ 
+-static void vc4_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi, bool enable)
++static void vc4_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi,
++			       const struct drm_display_mode *mode)
+ {
+ 	unsigned long flags;
+ 	u32 csc_ctl;
+@@ -751,7 +751,7 @@ static void vc4_hdmi_csc_setup(struct vc
+ 	csc_ctl = VC4_SET_FIELD(VC4_HD_CSC_CTL_ORDER_BGR,
+ 				VC4_HD_CSC_CTL_ORDER);
+ 
+-	if (enable) {
++	if (!vc4_hdmi_is_full_range_rgb(vc4_hdmi, mode)) {
+ 		/* CEA VICs other than #1 requre limited range RGB
+ 		 * output unless overridden by an AVI infoframe.
+ 		 * Apply a colorspace conversion to squash 0-255 down
+@@ -781,7 +781,8 @@ static void vc4_hdmi_csc_setup(struct vc
+ 	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+-static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi, bool enable)
++static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi,
++			       const struct drm_display_mode *mode)
+ {
+ 	unsigned long flags;
+ 	u32 csc_ctl;
+@@ -790,7 +791,7 @@ static void vc5_hdmi_csc_setup(struct vc
+ 
+ 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 
+-	if (enable) {
++	if (!vc4_hdmi_is_full_range_rgb(vc4_hdmi, mode)) {
+ 		/* CEA VICs other than #1 requre limited range RGB
+ 		 * output unless overridden by an AVI infoframe.
+ 		 * Apply a colorspace conversion to squash 0-255 down
+@@ -1119,22 +1120,12 @@ static void vc4_hdmi_encoder_pre_crtc_en
+ {
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
+ 	struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode;
+-	struct vc4_hdmi_encoder *vc4_encoder = to_vc4_hdmi_encoder(encoder);
+ 	unsigned long flags;
+ 
+ 	mutex_lock(&vc4_hdmi->mutex);
+ 
+-	if (!vc4_hdmi_is_full_range_rgb(vc4_hdmi, mode)) {
+-		if (vc4_hdmi->variant->csc_setup)
+-			vc4_hdmi->variant->csc_setup(vc4_hdmi, true);
+-
+-		vc4_encoder->limited_rgb_range = true;
+-	} else {
+-		if (vc4_hdmi->variant->csc_setup)
+-			vc4_hdmi->variant->csc_setup(vc4_hdmi, false);
+-
+-		vc4_encoder->limited_rgb_range = false;
+-	}
++	if (vc4_hdmi->variant->csc_setup)
++		vc4_hdmi->variant->csc_setup(vc4_hdmi, mode);
+ 
+ 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_FIFO_CTL, VC4_HDMI_FIFO_CTL_MASTER_SLAVE_N);
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
+@@ -12,7 +12,6 @@
+ struct vc4_hdmi_encoder {
+ 	struct vc4_encoder base;
+ 	bool hdmi_monitor;
+-	bool limited_rgb_range;
+ };
+ 
+ static inline struct vc4_hdmi_encoder *
+@@ -77,7 +76,8 @@ struct vc4_hdmi_variant {
+ 	void (*reset)(struct vc4_hdmi *vc4_hdmi);
+ 
+ 	/* Callback to enable / disable the CSC */
+-	void (*csc_setup)(struct vc4_hdmi *vc4_hdmi, bool enable);
++	void (*csc_setup)(struct vc4_hdmi *vc4_hdmi,
++			  const struct drm_display_mode *mode);
+ 
+ 	/* Callback to configure the video timings in the HDMI block */
+ 	void (*set_timings)(struct vc4_hdmi *vc4_hdmi,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0642-drm-vc4-hdmi-Move-XBAR-setup-to-csc_setup.patch b/root/target/linux/bcm27xx/patches-5.15/950-0642-drm-vc4-hdmi-Move-XBAR-setup-to-csc_setup.patch
new file mode 100644
index 00000000..4d7ce6f9
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0642-drm-vc4-hdmi-Move-XBAR-setup-to-csc_setup.patch
@@ -0,0 +1,34 @@
+From 0118b79a392a8fefcbbc0c2a9d38b9ab181f56bd Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Wed, 13 Jan 2021 11:07:48 +0100
+Subject: [PATCH 642/828] drm/vc4: hdmi: Move XBAR setup to csc_setup
+
+On the BCM2711, the HDMI_VEC_INTERFACE_XBAR register configuration
+depends on whether we're using an RGB or YUV output. Let's move that
+configuration to the CSC setup.
+
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -791,6 +791,8 @@ static void vc5_hdmi_csc_setup(struct vc
+ 
+ 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 
++	HDMI_WRITE(HDMI_VEC_INTERFACE_XBAR, 0x354021);
++
+ 	if (!vc4_hdmi_is_full_range_rgb(vc4_hdmi, mode)) {
+ 		/* CEA VICs other than #1 requre limited range RGB
+ 		 * output unless overridden by an AVI infoframe.
+@@ -905,7 +907,6 @@ static void vc5_hdmi_set_timings(struct
+ 
+ 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 
+-	HDMI_WRITE(HDMI_VEC_INTERFACE_XBAR, 0x354021);
+ 	HDMI_WRITE(HDMI_HORZA,
+ 		   (vsync_pos ? VC5_HDMI_HORZA_VPOS : 0) |
+ 		   (hsync_pos ? VC5_HDMI_HORZA_HPOS : 0) |
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0643-drm-vc4-hdmi-Replace-CSC_CTL-hardcoded-value-by-defi.patch b/root/target/linux/bcm27xx/patches-5.15/950-0643-drm-vc4-hdmi-Replace-CSC_CTL-hardcoded-value-by-defi.patch
new file mode 100644
index 00000000..0380d0c8
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0643-drm-vc4-hdmi-Replace-CSC_CTL-hardcoded-value-by-defi.patch
@@ -0,0 +1,42 @@
+From 4d3f322de0f5e32b46d2c8b53a50a9e3b3cc8d4c Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Wed, 13 Jan 2021 11:20:08 +0100
+Subject: [PATCH 643/828] drm/vc4: hdmi: Replace CSC_CTL hardcoded value by
+ defines
+
+On BCM2711, the HDMI_CSC_CTL register value has been hardcoded to an
+opaque value. Let's replace it with properly defined values.
+
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 5 ++---
+ drivers/gpu/drm/vc4/vc4_regs.h | 3 +++
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -785,9 +785,8 @@ static void vc5_hdmi_csc_setup(struct vc
+ 			       const struct drm_display_mode *mode)
+ {
+ 	unsigned long flags;
+-	u32 csc_ctl;
+-
+-	csc_ctl = 0x07;	/* RGB_CONVERT_MODE = custom matrix, || USE_RGB_TO_YCBCR */
++	u32 csc_ctl = VC5_MT_CP_CSC_CTL_ENABLE | VC4_SET_FIELD(VC4_HD_CSC_CTL_MODE_CUSTOM,
++							       VC5_MT_CP_CSC_CTL_MODE);
+ 
+ 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 
+--- a/drivers/gpu/drm/vc4/vc4_regs.h
++++ b/drivers/gpu/drm/vc4/vc4_regs.h
+@@ -796,6 +796,9 @@ enum {
+ # define VC4_HD_CSC_CTL_RGB2YCC			BIT(1)
+ # define VC4_HD_CSC_CTL_ENABLE			BIT(0)
+ 
++# define VC5_MT_CP_CSC_CTL_ENABLE		BIT(2)
++# define VC5_MT_CP_CSC_CTL_MODE_MASK		VC4_MASK(1, 0)
++
+ # define VC4_DVP_HT_CLOCK_STOP_PIXEL		BIT(1)
+ 
+ /* HVS display list information. */
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0644-drm-vc4-hdmi-Define-colorspace-matrices.patch b/root/target/linux/bcm27xx/patches-5.15/950-0644-drm-vc4-hdmi-Define-colorspace-matrices.patch
new file mode 100644
index 00000000..47c47d19
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0644-drm-vc4-hdmi-Define-colorspace-matrices.patch
@@ -0,0 +1,115 @@
+From 7c291cf92dc618b3e41bb86dd18af1fd9093f89c Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Wed, 13 Jan 2021 11:30:21 +0100
+Subject: [PATCH 644/828] drm/vc4: hdmi: Define colorspace matrices
+
+The current CSC setup code for the BCM2711 uses a sequence of register
+writes to configure the CSC depending on whether we output using a full
+or limited range.
+
+However, with the upcoming introduction of the YUV output, we're going
+to add new matrices to perform the conversions, so we should switch to
+something a bit more flexible that takes the matrix as an argument and
+programs the CSC accordingly.
+
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 79 +++++++++++++++++++++-------------
+ 1 file changed, 50 insertions(+), 29 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -781,6 +781,52 @@ static void vc4_hdmi_csc_setup(struct vc
+ 	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
++
++/*
++ * If we need to output Full Range RGB, then use the unity matrix
++ *
++ * [ 1      0      0      0]
++ * [ 0      1      0      0]
++ * [ 0      0      1      0]
++ *
++ * Matrix is signed 2p13 fixed point, with signed 9p6 offsets
++ */
++static const u16 vc5_hdmi_csc_full_rgb_unity[3][4] = {
++	{ 0x2000, 0x0000, 0x0000, 0x0000 },
++	{ 0x0000, 0x2000, 0x0000, 0x0000 },
++	{ 0x0000, 0x0000, 0x2000, 0x0000 },
++};
++
++/*
++ * CEA VICs other than #1 require limited range RGB output unless
++ * overridden by an AVI infoframe. Apply a colorspace conversion to
++ * squash 0-255 down to 16-235. The matrix here is:
++ *
++ * [ 0.8594 0      0      16]
++ * [ 0      0.8594 0      16]
++ * [ 0      0      0.8594 16]
++ *
++ * Matrix is signed 2p13 fixed point, with signed 9p6 offsets
++ */
++static const u16 vc5_hdmi_csc_full_rgb_to_limited_rgb[3][4] = {
++	{ 0x1b80, 0x0000, 0x0000, 0x0400 },
++	{ 0x0000, 0x1b80, 0x0000, 0x0400 },
++	{ 0x0000, 0x0000, 0x1b80, 0x0400 },
++};
++
++static void vc5_hdmi_set_csc_coeffs(struct vc4_hdmi *vc4_hdmi,
++				    const u16 coeffs[3][4])
++{
++	lockdep_assert_held(&vc4_hdmi->hw_lock);
++
++	HDMI_WRITE(HDMI_CSC_12_11, (coeffs[0][1] << 16) | coeffs[0][0]);
++	HDMI_WRITE(HDMI_CSC_14_13, (coeffs[0][3] << 16) | coeffs[0][2]);
++	HDMI_WRITE(HDMI_CSC_22_21, (coeffs[1][1] << 16) | coeffs[1][0]);
++	HDMI_WRITE(HDMI_CSC_24_23, (coeffs[1][3] << 16) | coeffs[1][2]);
++	HDMI_WRITE(HDMI_CSC_32_31, (coeffs[2][1] << 16) | coeffs[2][0]);
++	HDMI_WRITE(HDMI_CSC_34_33, (coeffs[2][3] << 16) | coeffs[2][2]);
++}
++
+ static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi,
+ 			       const struct drm_display_mode *mode)
+ {
+@@ -792,35 +838,10 @@ static void vc5_hdmi_csc_setup(struct vc
+ 
+ 	HDMI_WRITE(HDMI_VEC_INTERFACE_XBAR, 0x354021);
+ 
+-	if (!vc4_hdmi_is_full_range_rgb(vc4_hdmi, mode)) {
+-		/* CEA VICs other than #1 requre limited range RGB
+-		 * output unless overridden by an AVI infoframe.
+-		 * Apply a colorspace conversion to squash 0-255 down
+-		 * to 16-235.  The matrix here is:
+-		 *
+-		 * [ 0.8594 0      0      16]
+-		 * [ 0      0.8594 0      16]
+-		 * [ 0      0      0.8594 16]
+-		 * [ 0      0      0       1]
+-		 * Matrix is signed 2p13 fixed point, with signed 9p6 offsets
+-		 */
+-		HDMI_WRITE(HDMI_CSC_12_11, (0x0000 << 16) | 0x1b80);
+-		HDMI_WRITE(HDMI_CSC_14_13, (0x0400 << 16) | 0x0000);
+-		HDMI_WRITE(HDMI_CSC_22_21, (0x1b80 << 16) | 0x0000);
+-		HDMI_WRITE(HDMI_CSC_24_23, (0x0400 << 16) | 0x0000);
+-		HDMI_WRITE(HDMI_CSC_32_31, (0x0000 << 16) | 0x0000);
+-		HDMI_WRITE(HDMI_CSC_34_33, (0x0400 << 16) | 0x1b80);
+-	} else {
+-		/* Still use the matrix for full range, but make it unity.
+-		 * Matrix is signed 2p13 fixed point, with signed 9p6 offsets
+-		 */
+-		HDMI_WRITE(HDMI_CSC_12_11, (0x0000 << 16) | 0x2000);
+-		HDMI_WRITE(HDMI_CSC_14_13, (0x0000 << 16) | 0x0000);
+-		HDMI_WRITE(HDMI_CSC_22_21, (0x2000 << 16) | 0x0000);
+-		HDMI_WRITE(HDMI_CSC_24_23, (0x0000 << 16) | 0x0000);
+-		HDMI_WRITE(HDMI_CSC_32_31, (0x0000 << 16) | 0x0000);
+-		HDMI_WRITE(HDMI_CSC_34_33, (0x0000 << 16) | 0x2000);
+-	}
++	if (!vc4_hdmi_is_full_range_rgb(vc4_hdmi, mode))
++		vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_to_limited_rgb);
++	else
++		vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_unity);
+ 
+ 	HDMI_WRITE(HDMI_CSC_CTL, csc_ctl);
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0645-drm-vc4-hdmi-Change-CSC-callback-prototype.patch b/root/target/linux/bcm27xx/patches-5.15/950-0645-drm-vc4-hdmi-Change-CSC-callback-prototype.patch
new file mode 100644
index 00000000..670cf376
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0645-drm-vc4-hdmi-Change-CSC-callback-prototype.patch
@@ -0,0 +1,63 @@
+From 40631521afca7b3010e26cab6ca94b1e3eb47970 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Mon, 18 Jan 2021 09:51:12 +0100
+Subject: [PATCH 645/828] drm/vc4: hdmi: Change CSC callback prototype
+
+In order to support the YUV output, we'll need the atomic state to know
+what is the state of the associated property in the CSC setup callback.
+
+Let's change the prototype of that callback to allow us to access it.
+
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 7 ++++++-
+ drivers/gpu/drm/vc4/vc4_hdmi.h | 1 +
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -741,6 +741,7 @@ static void vc4_hdmi_encoder_post_crtc_p
+ }
+ 
+ static void vc4_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi,
++			       struct drm_connector_state *state,
+ 			       const struct drm_display_mode *mode)
+ {
+ 	unsigned long flags;
+@@ -828,6 +829,7 @@ static void vc5_hdmi_set_csc_coeffs(stru
+ }
+ 
+ static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi,
++			       struct drm_connector_state *state,
+ 			       const struct drm_display_mode *mode)
+ {
+ 	unsigned long flags;
+@@ -1140,13 +1142,16 @@ static void vc4_hdmi_encoder_pre_crtc_en
+ 					     struct drm_atomic_state *state)
+ {
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
++	struct drm_connector *connector = &vc4_hdmi->connector;
+ 	struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode;
++	struct drm_connector_state *conn_state =
++		drm_atomic_get_new_connector_state(state, connector);
+ 	unsigned long flags;
+ 
+ 	mutex_lock(&vc4_hdmi->mutex);
+ 
+ 	if (vc4_hdmi->variant->csc_setup)
+-		vc4_hdmi->variant->csc_setup(vc4_hdmi, mode);
++		vc4_hdmi->variant->csc_setup(vc4_hdmi, conn_state, mode);
+ 
+ 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 	HDMI_WRITE(HDMI_FIFO_CTL, VC4_HDMI_FIFO_CTL_MASTER_SLAVE_N);
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
+@@ -77,6 +77,7 @@ struct vc4_hdmi_variant {
+ 
+ 	/* Callback to enable / disable the CSC */
+ 	void (*csc_setup)(struct vc4_hdmi *vc4_hdmi,
++			  struct drm_connector_state *state,
+ 			  const struct drm_display_mode *mode);
+ 
+ 	/* Callback to configure the video timings in the HDMI block */
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0646-drm-vc4-hdmi-Move-clock-validation-to-its-own-functi.patch b/root/target/linux/bcm27xx/patches-5.15/950-0646-drm-vc4-hdmi-Move-clock-validation-to-its-own-functi.patch
new file mode 100644
index 00000000..5e43ad82
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0646-drm-vc4-hdmi-Move-clock-validation-to-its-own-functi.patch
@@ -0,0 +1,63 @@
+From 3aff5c2c94e4f821b7bbfb78f8d6a614d664367b Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Thu, 2 Dec 2021 16:58:17 +0100
+Subject: [PATCH 646/828] drm/vc4: hdmi: Move clock validation to its own
+ function
+
+Our code is doing the same clock rate validation in multiple instances.
+Let's create a helper to share the rate validation.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 26 +++++++++++++++-----------
+ 1 file changed, 15 insertions(+), 11 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -1250,6 +1250,19 @@ static void vc4_hdmi_encoder_atomic_mode
+ 	mutex_unlock(&vc4_hdmi->mutex);
+ }
+ 
++static enum drm_mode_status
++vc4_hdmi_encoder_clock_valid(const struct vc4_hdmi *vc4_hdmi,
++			     unsigned long long clock)
++{
++	if (clock > vc4_hdmi->variant->max_pixel_clock)
++		return MODE_CLOCK_HIGH;
++
++	if (vc4_hdmi->disable_4kp60 && clock > HDMI_14_MAX_TMDS_CLK)
++		return MODE_CLOCK_HIGH;
++
++	return MODE_OK;
++}
++
+ #define WIFI_2_4GHz_CH1_MIN_FREQ	2400000000ULL
+ #define WIFI_2_4GHz_CH1_MAX_FREQ	2422000000ULL
+ 
+@@ -1294,10 +1307,7 @@ static int vc4_hdmi_encoder_atomic_check
+ 	if (mode->flags & DRM_MODE_FLAG_DBLCLK)
+ 		pixel_rate = pixel_rate * 2;
+ 
+-	if (pixel_rate > vc4_hdmi->variant->max_pixel_clock)
+-		return -EINVAL;
+-
+-	if (vc4_hdmi->disable_4kp60 && (pixel_rate > HDMI_14_MAX_TMDS_CLK))
++	if (vc4_hdmi_encoder_clock_valid(vc4_hdmi, pixel_rate) != MODE_OK)
+ 		return -EINVAL;
+ 
+ 	vc4_state->pixel_rate = pixel_rate;
+@@ -1317,13 +1327,7 @@ vc4_hdmi_encoder_mode_valid(struct drm_e
+ 	     (mode->hsync_end % 2) || (mode->htotal % 2)))
+ 		return MODE_H_ILLEGAL;
+ 
+-	if ((mode->clock * 1000) > vc4_hdmi->variant->max_pixel_clock)
+-		return MODE_CLOCK_HIGH;
+-
+-	if (vc4_hdmi->disable_4kp60 && vc4_hdmi_mode_needs_scrambling(mode))
+-		return MODE_CLOCK_HIGH;
+-
+-	return MODE_OK;
++	return vc4_hdmi_encoder_clock_valid(vc4_hdmi, mode->clock * 1000);
+ }
+ 
+ static const struct drm_encoder_helper_funcs vc4_hdmi_encoder_helper_funcs = {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0647-drm-vc4-hdmi-Move-clock-calculation-into-its-own-fun.patch b/root/target/linux/bcm27xx/patches-5.15/950-0647-drm-vc4-hdmi-Move-clock-calculation-into-its-own-fun.patch
new file mode 100644
index 00000000..7199cbdc
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0647-drm-vc4-hdmi-Move-clock-calculation-into-its-own-fun.patch
@@ -0,0 +1,87 @@
+From ae2b366ec95750e5448396d5cef465cb86587050 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Thu, 2 Dec 2021 17:04:18 +0100
+Subject: [PATCH 647/828] drm/vc4: hdmi: Move clock calculation into its own
+ function
+
+The code to compute our clock rate for a given setup will be called in
+multiple places in the next patches, so let's create a separate function
+for it.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 49 +++++++++++++++++++++++-----------
+ 1 file changed, 34 insertions(+), 15 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -1263,6 +1263,35 @@ vc4_hdmi_encoder_clock_valid(const struc
+ 	return MODE_OK;
+ }
+ 
++static unsigned long long
++vc4_hdmi_encoder_compute_mode_clock(const struct drm_display_mode *mode,
++				    unsigned int bpc)
++{
++	unsigned long long clock = mode->crtc_clock * 1000;
++
++	if (mode->flags & DRM_MODE_FLAG_DBLCLK)
++		clock = clock * 2;
++
++	return clock * bpc / 8;
++}
++
++static int
++vc4_hdmi_encoder_compute_clock(const struct vc4_hdmi *vc4_hdmi,
++			       struct vc4_hdmi_connector_state *vc4_state,
++			       const struct drm_display_mode *mode,
++			       unsigned int bpc)
++{
++	unsigned long long clock;
++
++	clock = vc4_hdmi_encoder_compute_mode_clock(mode, bpc);
++	if (vc4_hdmi_encoder_clock_valid(vc4_hdmi, clock) != MODE_OK)
++		return -EINVAL;
++
++	vc4_state->pixel_rate = clock;
++
++	return 0;
++}
++
+ #define WIFI_2_4GHz_CH1_MIN_FREQ	2400000000ULL
+ #define WIFI_2_4GHz_CH1_MAX_FREQ	2422000000ULL
+ 
+@@ -1275,6 +1304,7 @@ static int vc4_hdmi_encoder_atomic_check
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
+ 	unsigned long long pixel_rate = mode->clock * 1000;
+ 	unsigned long long tmds_rate;
++	int ret;
+ 
+ 	if (vc4_hdmi->variant->unsupported_odd_h_timings &&
+ 	    !(mode->flags & DRM_MODE_FLAG_DBLCLK) &&
+@@ -1296,21 +1326,10 @@ static int vc4_hdmi_encoder_atomic_check
+ 		pixel_rate = mode->clock * 1000;
+ 	}
+ 
+-	if (conn_state->max_bpc == 12) {
+-		pixel_rate = pixel_rate * 150;
+-		do_div(pixel_rate, 100);
+-	} else if (conn_state->max_bpc == 10) {
+-		pixel_rate = pixel_rate * 125;
+-		do_div(pixel_rate, 100);
+-	}
+-
+-	if (mode->flags & DRM_MODE_FLAG_DBLCLK)
+-		pixel_rate = pixel_rate * 2;
+-
+-	if (vc4_hdmi_encoder_clock_valid(vc4_hdmi, pixel_rate) != MODE_OK)
+-		return -EINVAL;
+-
+-	vc4_state->pixel_rate = pixel_rate;
++	ret = vc4_hdmi_encoder_compute_clock(vc4_hdmi, vc4_state, mode,
++					     conn_state->max_bpc);
++	if (ret)
++		return ret;
+ 
+ 	return 0;
+ }
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0648-drm-vc4-hdmi-Take-the-sink-maximum-TMDS-clock-into-a.patch b/root/target/linux/bcm27xx/patches-5.15/950-0648-drm-vc4-hdmi-Take-the-sink-maximum-TMDS-clock-into-a.patch
new file mode 100644
index 00000000..f30ad09b
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0648-drm-vc4-hdmi-Take-the-sink-maximum-TMDS-clock-into-a.patch
@@ -0,0 +1,40 @@
+From b8e898f1cb2753d14c2768510eff27eb54a65afc Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Mon, 13 Dec 2021 15:33:11 +0100
+Subject: [PATCH 648/828] drm/vc4: hdmi: Take the sink maximum TMDS clock into
+ account
+
+In the function that validates that the clock isn't too high, we've only
+taken our controller limitations into account so far.
+
+However, the sink can have a limit on the maximum TMDS clock it can deal
+with too which is exposed through the EDID and the drm_display_info.
+
+Make sure we check it.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -1254,12 +1254,18 @@ static enum drm_mode_status
+ vc4_hdmi_encoder_clock_valid(const struct vc4_hdmi *vc4_hdmi,
+ 			     unsigned long long clock)
+ {
++	const struct drm_connector *connector = &vc4_hdmi->connector;
++	const struct drm_display_info *info = &connector->display_info;
++
+ 	if (clock > vc4_hdmi->variant->max_pixel_clock)
+ 		return MODE_CLOCK_HIGH;
+ 
+ 	if (vc4_hdmi->disable_4kp60 && clock > HDMI_14_MAX_TMDS_CLK)
+ 		return MODE_CLOCK_HIGH;
+ 
++	if (info->max_tmds_clock && clock > (info->max_tmds_clock * 1000))
++		return MODE_CLOCK_HIGH;
++
+ 	return MODE_OK;
+ }
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0649-drm-vc4-hdmi-Take-bpp-into-account-for-the-scrambler.patch b/root/target/linux/bcm27xx/patches-5.15/950-0649-drm-vc4-hdmi-Take-bpp-into-account-for-the-scrambler.patch
new file mode 100644
index 00000000..1cc2db71
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0649-drm-vc4-hdmi-Take-bpp-into-account-for-the-scrambler.patch
@@ -0,0 +1,81 @@
+From f447f77d639d71bb91fe121cd286ab610824e60f Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Fri, 10 Dec 2021 15:00:04 +0100
+Subject: [PATCH 649/828] drm/vc4: hdmi: Take bpp into account for the
+ scrambler
+
+The current code only base its decision for whether the scrambler must be
+enabled or not on the pixel clock of the mode, but doesn't take the bits
+per color into account.
+
+Let's leverage the new function to compute the clock rate in the
+scrambler setup code.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 17 +++++++++++++----
+ drivers/gpu/drm/vc4/vc4_hdmi.h |  5 +++++
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -102,9 +102,17 @@
+ 
+ #define HDMI_14_MAX_TMDS_CLK   (340 * 1000 * 1000)
+ 
+-static bool vc4_hdmi_mode_needs_scrambling(const struct drm_display_mode *mode)
++
++static unsigned long long
++vc4_hdmi_encoder_compute_mode_clock(const struct drm_display_mode *mode,
++				    unsigned int bpc);
++
++static bool vc4_hdmi_mode_needs_scrambling(const struct drm_display_mode *mode,
++					   unsigned int bpc)
+ {
+-	return (mode->clock * 1000) > HDMI_14_MAX_TMDS_CLK;
++	unsigned long long clock = vc4_hdmi_encoder_compute_mode_clock(mode, bpc);
++
++	return clock > HDMI_14_MAX_TMDS_CLK;
+ }
+ 
+ static bool vc4_hdmi_is_full_range_rgb(struct vc4_hdmi *vc4_hdmi,
+@@ -276,7 +284,7 @@ static int vc4_hdmi_connector_get_modes(
+ 		struct drm_display_mode *mode;
+ 
+ 		list_for_each_entry(mode, &connector->probed_modes, head) {
+-			if (vc4_hdmi_mode_needs_scrambling(mode)) {
++			if (vc4_hdmi_mode_needs_scrambling(mode, 8)) {
+ 				drm_warn_once(drm, "The core clock cannot reach frequencies high enough to support 4k @ 60Hz.");
+ 				drm_warn_once(drm, "Please change your config.txt file to add hdmi_enable_4kp60.");
+ 			}
+@@ -627,7 +635,7 @@ static void vc4_hdmi_enable_scrambling(s
+ 	if (!vc4_hdmi_supports_scrambling(encoder, mode))
+ 		return;
+ 
+-	if (!vc4_hdmi_mode_needs_scrambling(mode))
++	if (!vc4_hdmi_mode_needs_scrambling(mode, vc4_hdmi->output_bpc))
+ 		return;
+ 
+ 	drm_scdc_set_high_tmds_clock_ratio(vc4_hdmi->ddc, true);
+@@ -1244,6 +1252,7 @@ static void vc4_hdmi_encoder_atomic_mode
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
+ 
+ 	mutex_lock(&vc4_hdmi->mutex);
++	vc4_hdmi->output_bpc = conn_state->max_bpc;
+ 	memcpy(&vc4_hdmi->saved_adjusted_mode,
+ 	       &crtc_state->adjusted_mode,
+ 	       sizeof(vc4_hdmi->saved_adjusted_mode));
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
+@@ -221,6 +221,11 @@ struct vc4_hdmi {
+ 	 */
+ 	bool scdc_enabled;
+ 
++	/**
++	 * @output_bpc: BPC currently being used. Protected by @mutex.
++	 */
++	unsigned int output_bpc;
++
+ 	/* VC5 debugfs regset */
+ 	struct debugfs_regset32 cec_regset;
+ 	struct debugfs_regset32 csc_regset;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0650-drm-vc4-hdmi-Always-try-to-have-the-highest-bpc.patch b/root/target/linux/bcm27xx/patches-5.15/950-0650-drm-vc4-hdmi-Always-try-to-have-the-highest-bpc.patch
new file mode 100644
index 00000000..19cec4b7
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0650-drm-vc4-hdmi-Always-try-to-have-the-highest-bpc.patch
@@ -0,0 +1,131 @@
+From ba5c4bb79f7707a662782a87eea811588634bbd0 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Fri, 10 Dec 2021 15:29:56 +0100
+Subject: [PATCH 650/828] drm/vc4: hdmi: Always try to have the highest bpc
+
+Currently we take the max_bpc property as the bpc value and do not try
+anything else.
+
+However, what the other drivers seem to be doing is that they would try
+with the highest bpc allowed by the max_bpc property and the hardware
+capabilities, test if it results in an acceptable configuration, and if
+not decrease the bpc and try again.
+
+Let's use the same logic.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 44 ++++++++++++++++++++++++++++++----
+ drivers/gpu/drm/vc4/vc4_hdmi.h |  4 +++-
+ 2 files changed, 43 insertions(+), 5 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -356,6 +356,7 @@ vc4_hdmi_connector_duplicate_state(struc
+ 		return NULL;
+ 
+ 	new_state->pixel_rate = vc4_state->pixel_rate;
++	new_state->output_bpc = vc4_state->output_bpc;
+ 	__drm_atomic_helper_connector_duplicate_state(connector, &new_state->base);
+ 
+ 	return &new_state->base;
+@@ -913,6 +914,8 @@ static void vc5_hdmi_set_timings(struct
+ 				 struct drm_connector_state *state,
+ 				 struct drm_display_mode *mode)
+ {
++	const struct vc4_hdmi_connector_state *vc4_state =
++		conn_state_to_vc4_hdmi_conn_state(state);
+ 	bool hsync_pos = mode->flags & DRM_MODE_FLAG_PHSYNC;
+ 	bool vsync_pos = mode->flags & DRM_MODE_FLAG_PVSYNC;
+ 	bool interlaced = mode->flags & DRM_MODE_FLAG_INTERLACE;
+@@ -960,7 +963,7 @@ static void vc5_hdmi_set_timings(struct
+ 	HDMI_WRITE(HDMI_VERTB0, vertb_even);
+ 	HDMI_WRITE(HDMI_VERTB1, vertb);
+ 
+-	switch (state->max_bpc) {
++	switch (vc4_state->output_bpc) {
+ 	case 12:
+ 		gcp = 6;
+ 		gcp_en = true;
+@@ -1250,9 +1253,11 @@ static void vc4_hdmi_encoder_atomic_mode
+ 					     struct drm_connector_state *conn_state)
+ {
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
++	struct vc4_hdmi_connector_state *vc4_state =
++		conn_state_to_vc4_hdmi_conn_state(conn_state);
+ 
+ 	mutex_lock(&vc4_hdmi->mutex);
+-	vc4_hdmi->output_bpc = conn_state->max_bpc;
++	vc4_hdmi->output_bpc = vc4_state->output_bpc;
+ 	memcpy(&vc4_hdmi->saved_adjusted_mode,
+ 	       &crtc_state->adjusted_mode,
+ 	       sizeof(vc4_hdmi->saved_adjusted_mode));
+@@ -1307,6 +1312,38 @@ vc4_hdmi_encoder_compute_clock(const str
+ 	return 0;
+ }
+ 
++static int
++vc4_hdmi_encoder_compute_config(const struct vc4_hdmi *vc4_hdmi,
++				struct vc4_hdmi_connector_state *vc4_state,
++				const struct drm_display_mode *mode)
++{
++	struct drm_connector_state *conn_state = &vc4_state->base;
++	unsigned int max_bpc = clamp_t(unsigned int, conn_state->max_bpc, 8, 12);
++	unsigned int bpc;
++	int ret;
++
++	for (bpc = max_bpc; bpc >= 8; bpc -= 2) {
++		drm_dbg(dev, "Trying with a %d bpc output\n", bpc);
++
++		ret = vc4_hdmi_encoder_compute_clock(vc4_hdmi, vc4_state,
++						     mode, bpc);
++		if (ret)
++			continue;
++
++		vc4_state->output_bpc = bpc;
++
++		drm_dbg(dev,
++			"Mode %ux%u @ %uHz: Found configuration: bpc: %u, clock: %llu\n",
++			mode->hdisplay, mode->vdisplay, drm_mode_vrefresh(mode),
++			vc4_state->output_bpc,
++			vc4_state->pixel_rate);
++
++		break;
++	}
++
++	return ret;
++}
++
+ #define WIFI_2_4GHz_CH1_MIN_FREQ	2400000000ULL
+ #define WIFI_2_4GHz_CH1_MAX_FREQ	2422000000ULL
+ 
+@@ -1341,8 +1378,7 @@ static int vc4_hdmi_encoder_atomic_check
+ 		pixel_rate = mode->clock * 1000;
+ 	}
+ 
+-	ret = vc4_hdmi_encoder_compute_clock(vc4_hdmi, vc4_state, mode,
+-					     conn_state->max_bpc);
++	ret = vc4_hdmi_encoder_compute_config(vc4_hdmi, vc4_state, mode);
+ 	if (ret)
+ 		return ret;
+ 
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
+@@ -222,7 +222,8 @@ struct vc4_hdmi {
+ 	bool scdc_enabled;
+ 
+ 	/**
+-	 * @output_bpc: BPC currently being used. Protected by @mutex.
++	 * @output_bpc: Copy of @vc4_connector_state.output_bpc for use
++	 * outside of KMS hooks. Protected by @mutex.
+ 	 */
+ 	unsigned int output_bpc;
+ 
+@@ -252,6 +253,7 @@ encoder_to_vc4_hdmi(struct drm_encoder *
+ struct vc4_hdmi_connector_state {
+ 	struct drm_connector_state	base;
+ 	unsigned long long		pixel_rate;
++	unsigned int 			output_bpc;
+ };
+ 
+ static inline struct vc4_hdmi_connector_state *
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0651-drm-vc4-hdmi-Support-HDMI-YUV-output.patch b/root/target/linux/bcm27xx/patches-5.15/950-0651-drm-vc4-hdmi-Support-HDMI-YUV-output.patch
new file mode 100644
index 00000000..0590edef
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0651-drm-vc4-hdmi-Support-HDMI-YUV-output.patch
@@ -0,0 +1,578 @@
+From 3a02d131688be3206ba46b43e5d33c81b9a850c3 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Fri, 4 Dec 2020 17:12:06 +0100
+Subject: [PATCH 651/828] drm/vc4: hdmi: Support HDMI YUV output
+
+In addition to the RGB444 output, the BCM2711 HDMI controller supports
+the YUV444 and YUV422 output formats.
+
+Let's add support for them in the driver, but still use RGB as the
+preferred format.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c      | 289 ++++++++++++++++++++++++++--
+ drivers/gpu/drm/vc4/vc4_hdmi.h      |  14 ++
+ drivers/gpu/drm/vc4/vc4_hdmi_regs.h |   6 +
+ drivers/gpu/drm/vc4/vc4_regs.h      |  16 ++
+ 4 files changed, 309 insertions(+), 16 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -102,15 +102,30 @@
+ 
+ #define HDMI_14_MAX_TMDS_CLK   (340 * 1000 * 1000)
+ 
++static const char * const output_format_str[] = {
++	[VC4_HDMI_OUTPUT_RGB]		= "RGB",
++	[VC4_HDMI_OUTPUT_YUV420]	= "YUV 4:2:0",
++	[VC4_HDMI_OUTPUT_YUV422]	= "YUV 4:2:2",
++	[VC4_HDMI_OUTPUT_YUV444]	= "YUV 4:4:4",
++};
++
++static const char *vc4_hdmi_output_fmt_str(enum vc4_hdmi_output_format fmt)
++{
++	if (fmt >= ARRAY_SIZE(output_format_str))
++		return "invalid";
++
++	return output_format_str[fmt];
++}
+ 
+ static unsigned long long
+ vc4_hdmi_encoder_compute_mode_clock(const struct drm_display_mode *mode,
+-				    unsigned int bpc);
++				    unsigned int bpc, enum vc4_hdmi_output_format fmt);
+ 
+ static bool vc4_hdmi_mode_needs_scrambling(const struct drm_display_mode *mode,
+-					   unsigned int bpc)
++					   unsigned int bpc,
++					   enum vc4_hdmi_output_format fmt)
+ {
+-	unsigned long long clock = vc4_hdmi_encoder_compute_mode_clock(mode, bpc);
++	unsigned long long clock = vc4_hdmi_encoder_compute_mode_clock(mode, bpc, fmt);
+ 
+ 	return clock > HDMI_14_MAX_TMDS_CLK;
+ }
+@@ -284,7 +299,7 @@ static int vc4_hdmi_connector_get_modes(
+ 		struct drm_display_mode *mode;
+ 
+ 		list_for_each_entry(mode, &connector->probed_modes, head) {
+-			if (vc4_hdmi_mode_needs_scrambling(mode, 8)) {
++			if (vc4_hdmi_mode_needs_scrambling(mode, 8, VC4_HDMI_OUTPUT_RGB)) {
+ 				drm_warn_once(drm, "The core clock cannot reach frequencies high enough to support 4k @ 60Hz.");
+ 				drm_warn_once(drm, "Please change your config.txt file to add hdmi_enable_4kp60.");
+ 			}
+@@ -341,6 +356,7 @@ static void vc4_hdmi_connector_reset(str
+ 
+ 	new_state->base.max_bpc = 8;
+ 	new_state->base.max_requested_bpc = 8;
++	new_state->output_format = VC4_HDMI_OUTPUT_RGB;
+ 	drm_atomic_helper_connector_tv_reset(connector);
+ }
+ 
+@@ -357,6 +373,7 @@ vc4_hdmi_connector_duplicate_state(struc
+ 
+ 	new_state->pixel_rate = vc4_state->pixel_rate;
+ 	new_state->output_bpc = vc4_state->output_bpc;
++	new_state->output_format = vc4_state->output_format;
+ 	__drm_atomic_helper_connector_duplicate_state(connector, &new_state->base);
+ 
+ 	return &new_state->base;
+@@ -510,11 +527,38 @@ static void vc4_hdmi_write_infoframe(str
+ 		DRM_ERROR("Failed to wait for infoframe to start: %d\n", ret);
+ }
+ 
++static void vc4_hdmi_avi_infoframe_colorspace(struct hdmi_avi_infoframe *frame,
++					      enum vc4_hdmi_output_format fmt)
++{
++	switch (fmt) {
++	case VC4_HDMI_OUTPUT_RGB:
++		frame->colorspace = HDMI_COLORSPACE_RGB;
++		break;
++
++	case VC4_HDMI_OUTPUT_YUV420:
++		frame->colorspace = HDMI_COLORSPACE_YUV420;
++		break;
++
++	case VC4_HDMI_OUTPUT_YUV422:
++		frame->colorspace = HDMI_COLORSPACE_YUV422;
++		break;
++
++	case VC4_HDMI_OUTPUT_YUV444:
++		frame->colorspace = HDMI_COLORSPACE_YUV444;
++		break;
++
++	default:
++		break;
++	}
++}
++
+ static void vc4_hdmi_set_avi_infoframe(struct drm_encoder *encoder)
+ {
+ 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
+ 	struct drm_connector *connector = &vc4_hdmi->connector;
+ 	struct drm_connector_state *cstate = connector->state;
++	struct vc4_hdmi_connector_state *vc4_state =
++		conn_state_to_vc4_hdmi_conn_state(cstate);
+ 	const struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode;
+ 	union hdmi_infoframe frame;
+ 	int ret;
+@@ -534,6 +578,7 @@ static void vc4_hdmi_set_avi_infoframe(s
+ 					   HDMI_QUANTIZATION_RANGE_FULL :
+ 					   HDMI_QUANTIZATION_RANGE_LIMITED);
+ 	drm_hdmi_avi_infoframe_colorimetry(&frame.avi, cstate);
++	vc4_hdmi_avi_infoframe_colorspace(&frame.avi, vc4_state->output_format);
+ 	drm_hdmi_avi_infoframe_bars(&frame.avi, cstate);
+ 
+ 	vc4_hdmi_write_infoframe(encoder, &frame);
+@@ -636,7 +681,9 @@ static void vc4_hdmi_enable_scrambling(s
+ 	if (!vc4_hdmi_supports_scrambling(encoder, mode))
+ 		return;
+ 
+-	if (!vc4_hdmi_mode_needs_scrambling(mode, vc4_hdmi->output_bpc))
++	if (!vc4_hdmi_mode_needs_scrambling(mode,
++					    vc4_hdmi->output_bpc,
++					    vc4_hdmi->output_format))
+ 		return;
+ 
+ 	drm_scdc_set_high_tmds_clock_ratio(vc4_hdmi->ddc, true);
+@@ -824,6 +871,38 @@ static const u16 vc5_hdmi_csc_full_rgb_t
+ 	{ 0x0000, 0x0000, 0x1b80, 0x0400 },
+ };
+ 
++/*
++ * Conversion between Full Range RGB and Full Range YUV422 using the
++ * BT.709 Colorspace
++ *
++ * [  0.212639  0.715169  0.072192  0   ]
++ * [ -0.117208 -0.394207  0.511416  128 ]
++ * [  0.511416 -0.464524 -0.046891  128 ]
++ *
++ * Matrix is signed 2p13 fixed point, with signed 9p6 offsets
++ */
++static const u16 vc5_hdmi_csc_full_rgb_to_full_yuv422_bt709[3][4] = {
++	{ 0x06ce, 0x16e3, 0x024f, 0x0000 },
++	{ 0xfc41, 0xf364, 0x105e, 0x2000 },
++	{ 0x105e, 0xf124, 0xfe81, 0x2000 },
++};
++
++/*
++ * Conversion between Full Range RGB and Full Range YUV444 using the
++ * BT.709 Colorspace
++ *
++ * [ -0.117208 -0.394207  0.511416  128 ]
++ * [  0.511416 -0.464524 -0.046891  128 ]
++ * [  0.212639  0.715169  0.072192  0   ]
++ *
++ * Matrix is signed 2p13 fixed point, with signed 9p6 offsets
++ */
++static const u16 vc5_hdmi_csc_full_rgb_to_full_yuv444_bt709[3][4] = {
++	{ 0xfc41, 0xf364, 0x105e, 0x2000 },
++	{ 0x105e, 0xf124, 0xfe81, 0x2000 },
++	{ 0x06ce, 0x16e3, 0x024f, 0x0000 },
++};
++
+ static void vc5_hdmi_set_csc_coeffs(struct vc4_hdmi *vc4_hdmi,
+ 				    const u16 coeffs[3][4])
+ {
+@@ -841,19 +920,53 @@ static void vc5_hdmi_csc_setup(struct vc
+ 			       struct drm_connector_state *state,
+ 			       const struct drm_display_mode *mode)
+ {
++	struct vc4_hdmi_connector_state *vc4_state =
++		conn_state_to_vc4_hdmi_conn_state(state);
+ 	unsigned long flags;
++	u32 if_cfg = 0;
++	u32 if_xbar = 0x543210;
++	u32 csc_chan_ctl = 0;
+ 	u32 csc_ctl = VC5_MT_CP_CSC_CTL_ENABLE | VC4_SET_FIELD(VC4_HD_CSC_CTL_MODE_CUSTOM,
+ 							       VC5_MT_CP_CSC_CTL_MODE);
+ 
+ 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
+ 
+-	HDMI_WRITE(HDMI_VEC_INTERFACE_XBAR, 0x354021);
++	switch (vc4_state->output_format) {
++	case VC4_HDMI_OUTPUT_YUV444:
++		vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_to_full_yuv444_bt709);
++		break;
++
++	case VC4_HDMI_OUTPUT_YUV422:
++		csc_ctl |= VC4_SET_FIELD(VC5_MT_CP_CSC_CTL_FILTER_MODE_444_TO_422_STANDARD,
++					 VC5_MT_CP_CSC_CTL_FILTER_MODE_444_TO_422) |
++			VC5_MT_CP_CSC_CTL_USE_444_TO_422 |
++			VC5_MT_CP_CSC_CTL_USE_RNG_SUPPRESSION;
+ 
+-	if (!vc4_hdmi_is_full_range_rgb(vc4_hdmi, mode))
+-		vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_to_limited_rgb);
+-	else
+-		vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_unity);
++		csc_chan_ctl |= VC4_SET_FIELD(VC5_MT_CP_CHANNEL_CTL_OUTPUT_REMAP_LEGACY_STYLE,
++					      VC5_MT_CP_CHANNEL_CTL_OUTPUT_REMAP);
++
++		if_cfg |= VC4_SET_FIELD(VC5_DVP_HT_VEC_INTERFACE_CFG_SEL_422_FORMAT_422_LEGACY,
++					VC5_DVP_HT_VEC_INTERFACE_CFG_SEL_422);
++
++		vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_to_full_yuv422_bt709);
++		break;
+ 
++	case VC4_HDMI_OUTPUT_RGB:
++		if_xbar = 0x354021;
++
++		if (!vc4_hdmi_is_full_range_rgb(vc4_hdmi, mode))
++			vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_to_limited_rgb);
++		else
++			vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_unity);
++		break;
++
++	default:
++		break;
++	}
++
++	HDMI_WRITE(HDMI_VEC_INTERFACE_CFG, if_cfg);
++	HDMI_WRITE(HDMI_VEC_INTERFACE_XBAR, if_xbar);
++	HDMI_WRITE(HDMI_CSC_CHANNEL_CTL, csc_chan_ctl);
+ 	HDMI_WRITE(HDMI_CSC_CTL, csc_ctl);
+ 
+ 	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+@@ -979,6 +1092,15 @@ static void vc5_hdmi_set_timings(struct
+ 		break;
+ 	}
+ 
++	/*
++	 * YCC422 is always 36-bit and not considered deep colour so
++	 * doesn't signal in GCP
++	 */
++	if (vc4_state->output_format == VC4_HDMI_OUTPUT_YUV422) {
++		gcp = 4;
++		gcp_en = false;
++	}
++
+ 	reg = HDMI_READ(HDMI_DEEP_COLOR_CONFIG_1);
+ 	reg &= ~(VC5_HDMI_DEEP_COLOR_CONFIG_1_INIT_PACK_PHASE_MASK |
+ 		 VC5_HDMI_DEEP_COLOR_CONFIG_1_COLOR_DEPTH_MASK);
+@@ -1258,12 +1380,97 @@ static void vc4_hdmi_encoder_atomic_mode
+ 
+ 	mutex_lock(&vc4_hdmi->mutex);
+ 	vc4_hdmi->output_bpc = vc4_state->output_bpc;
++	vc4_hdmi->output_format = vc4_state->output_format;
+ 	memcpy(&vc4_hdmi->saved_adjusted_mode,
+ 	       &crtc_state->adjusted_mode,
+ 	       sizeof(vc4_hdmi->saved_adjusted_mode));
+ 	mutex_unlock(&vc4_hdmi->mutex);
+ }
+ 
++static bool
++vc4_hdmi_sink_supports_format_bpc(const struct vc4_hdmi *vc4_hdmi,
++				  const struct drm_display_info *info,
++				  const struct drm_display_mode *mode,
++				  unsigned int format, unsigned int bpc)
++{
++	struct drm_device *dev = vc4_hdmi->connector.dev;
++	u8 vic = drm_match_cea_mode(mode);
++
++	if (vic == 1 && bpc != 8) {
++		drm_dbg(dev, "VIC1 requires a bpc of 8, got %u\n", bpc);
++		return false;
++	}
++
++	if (!info->is_hdmi &&
++	    (format != VC4_HDMI_OUTPUT_RGB || bpc != 8)) {
++		drm_dbg(dev, "DVI Monitors require an RGB output at 8 bpc\n");
++		return false;
++	}
++
++	switch (format) {
++	case VC4_HDMI_OUTPUT_RGB:
++		drm_dbg(dev, "RGB Format, checking the constraints.\n");
++
++		if (!(info->color_formats & DRM_COLOR_FORMAT_RGB444))
++			return false;
++
++		if (bpc == 10 && !(info->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_30)) {
++			drm_dbg(dev, "10 BPC but sink doesn't support Deep Color 30.\n");
++			return false;
++		}
++
++		if (bpc == 12 && !(info->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_36)) {
++			drm_dbg(dev, "12 BPC but sink doesn't support Deep Color 36.\n");
++			return false;
++		}
++
++		drm_dbg(dev, "RGB format supported in that configuration.\n");
++
++		return true;
++
++	case VC4_HDMI_OUTPUT_YUV422:
++		drm_dbg(dev, "YUV422 format, checking the constraints.\n");
++
++		if (!(info->color_formats & DRM_COLOR_FORMAT_YCRCB422)) {
++			drm_dbg(dev, "Sink doesn't support YUV422.\n");
++			return false;
++		}
++
++		if (bpc != 12) {
++			drm_dbg(dev, "YUV422 only supports 12 bpc.\n");
++			return false;
++		}
++
++		drm_dbg(dev, "YUV422 format supported in that configuration.\n");
++
++		return true;
++
++	case VC4_HDMI_OUTPUT_YUV444:
++		drm_dbg(dev, "YUV444 format, checking the constraints.\n");
++
++		if (!(info->color_formats & DRM_COLOR_FORMAT_YCRCB444)) {
++			drm_dbg(dev, "Sink doesn't support YUV444.\n");
++			return false;
++		}
++
++		if (bpc == 10 && !(info->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_30)) {
++			drm_dbg(dev, "10 BPC but sink doesn't support Deep Color 30.\n");
++			return false;
++		}
++
++		if (bpc == 12 && !(info->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_36)) {
++			drm_dbg(dev, "12 BPC but sink doesn't support Deep Color 36.\n");
++			return false;
++		}
++
++		drm_dbg(dev, "YUV444 format supported in that configuration.\n");
++
++		return true;
++	}
++
++	return false;
++}
++
+ static enum drm_mode_status
+ vc4_hdmi_encoder_clock_valid(const struct vc4_hdmi *vc4_hdmi,
+ 			     unsigned long long clock)
+@@ -1285,13 +1492,17 @@ vc4_hdmi_encoder_clock_valid(const struc
+ 
+ static unsigned long long
+ vc4_hdmi_encoder_compute_mode_clock(const struct drm_display_mode *mode,
+-				    unsigned int bpc)
++				    unsigned int bpc,
++				    enum vc4_hdmi_output_format fmt)
+ {
+ 	unsigned long long clock = mode->crtc_clock * 1000;
+ 
+ 	if (mode->flags & DRM_MODE_FLAG_DBLCLK)
+ 		clock = clock * 2;
+ 
++	if (fmt == VC4_HDMI_OUTPUT_YUV422)
++		bpc = 8;
++
+ 	return clock * bpc / 8;
+ }
+ 
+@@ -1299,11 +1510,11 @@ static int
+ vc4_hdmi_encoder_compute_clock(const struct vc4_hdmi *vc4_hdmi,
+ 			       struct vc4_hdmi_connector_state *vc4_state,
+ 			       const struct drm_display_mode *mode,
+-			       unsigned int bpc)
++			       unsigned int bpc, unsigned int fmt)
+ {
+ 	unsigned long long clock;
+ 
+-	clock = vc4_hdmi_encoder_compute_mode_clock(mode, bpc);
++	clock = vc4_hdmi_encoder_compute_mode_clock(mode, bpc, fmt);
+ 	if (vc4_hdmi_encoder_clock_valid(vc4_hdmi, clock) != MODE_OK)
+ 		return -EINVAL;
+ 
+@@ -1313,10 +1524,55 @@ vc4_hdmi_encoder_compute_clock(const str
+ }
+ 
+ static int
++vc4_hdmi_encoder_compute_format(const struct vc4_hdmi *vc4_hdmi,
++				struct vc4_hdmi_connector_state *vc4_state,
++				const struct drm_display_mode *mode,
++				unsigned int bpc)
++{
++	struct drm_device *dev = vc4_hdmi->connector.dev;
++	const struct drm_connector *connector = &vc4_hdmi->connector;
++	const struct drm_display_info *info = &connector->display_info;
++	unsigned int format;
++
++	drm_dbg(dev, "Trying with an RGB output\n");
++
++	format = VC4_HDMI_OUTPUT_RGB;
++	if (vc4_hdmi_sink_supports_format_bpc(vc4_hdmi, info, mode, format, bpc)) {
++		int ret;
++
++		ret = vc4_hdmi_encoder_compute_clock(vc4_hdmi, vc4_state,
++						     mode, bpc, format);
++		if (!ret) {
++			vc4_state->output_format = format;
++			return 0;
++		}
++	}
++
++	drm_dbg(dev, "Failed, Trying with an YUV422 output\n");
++
++	format = VC4_HDMI_OUTPUT_YUV422;
++	if (vc4_hdmi_sink_supports_format_bpc(vc4_hdmi, info, mode, format, bpc)) {
++		int ret;
++
++		ret = vc4_hdmi_encoder_compute_clock(vc4_hdmi, vc4_state,
++						     mode, bpc, format);
++		if (!ret) {
++			vc4_state->output_format = format;
++			return 0;
++		}
++	}
++
++	drm_dbg(dev, "Failed. No Format Supported for that bpc count.\n");
++
++	return -EINVAL;
++}
++
++static int
+ vc4_hdmi_encoder_compute_config(const struct vc4_hdmi *vc4_hdmi,
+ 				struct vc4_hdmi_connector_state *vc4_state,
+ 				const struct drm_display_mode *mode)
+ {
++	struct drm_device *dev = vc4_hdmi->connector.dev;
+ 	struct drm_connector_state *conn_state = &vc4_state->base;
+ 	unsigned int max_bpc = clamp_t(unsigned int, conn_state->max_bpc, 8, 12);
+ 	unsigned int bpc;
+@@ -1325,17 +1581,18 @@ vc4_hdmi_encoder_compute_config(const st
+ 	for (bpc = max_bpc; bpc >= 8; bpc -= 2) {
+ 		drm_dbg(dev, "Trying with a %d bpc output\n", bpc);
+ 
+-		ret = vc4_hdmi_encoder_compute_clock(vc4_hdmi, vc4_state,
+-						     mode, bpc);
++		ret = vc4_hdmi_encoder_compute_format(vc4_hdmi, vc4_state,
++						      mode, bpc);
+ 		if (ret)
+ 			continue;
+ 
+ 		vc4_state->output_bpc = bpc;
+ 
+ 		drm_dbg(dev,
+-			"Mode %ux%u @ %uHz: Found configuration: bpc: %u, clock: %llu\n",
++			"Mode %ux%u @ %uHz: Found configuration: bpc: %u, fmt: %s, clock: %llu\n",
+ 			mode->hdisplay, mode->vdisplay, drm_mode_vrefresh(mode),
+ 			vc4_state->output_bpc,
++			vc4_hdmi_output_fmt_str(vc4_state->output_format),
+ 			vc4_state->pixel_rate);
+ 
+ 		break;
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
+@@ -121,6 +121,13 @@ struct vc4_hdmi_audio {
+ 	bool streaming;
+ };
+ 
++enum vc4_hdmi_output_format {
++	VC4_HDMI_OUTPUT_RGB,
++	VC4_HDMI_OUTPUT_YUV422,
++	VC4_HDMI_OUTPUT_YUV444,
++	VC4_HDMI_OUTPUT_YUV420,
++};
++
+ /* General HDMI hardware state. */
+ struct vc4_hdmi {
+ 	struct vc4_hdmi_audio audio;
+@@ -227,6 +234,12 @@ struct vc4_hdmi {
+ 	 */
+ 	unsigned int output_bpc;
+ 
++	/**
++	 * @output_format: Copy of @vc4_connector_state.output_format
++	 * for use outside of KMS hooks. Protected by @mutex.
++	 */
++	enum vc4_hdmi_output_format output_format;
++
+ 	/* VC5 debugfs regset */
+ 	struct debugfs_regset32 cec_regset;
+ 	struct debugfs_regset32 csc_regset;
+@@ -254,6 +267,7 @@ struct vc4_hdmi_connector_state {
+ 	struct drm_connector_state	base;
+ 	unsigned long long		pixel_rate;
+ 	unsigned int 			output_bpc;
++	enum vc4_hdmi_output_format	output_format;
+ };
+ 
+ static inline struct vc4_hdmi_connector_state *
+--- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
+@@ -54,6 +54,7 @@ enum vc4_hdmi_field {
+ 	HDMI_CSC_24_23,
+ 	HDMI_CSC_32_31,
+ 	HDMI_CSC_34_33,
++	HDMI_CSC_CHANNEL_CTL,
+ 	HDMI_CSC_CTL,
+ 
+ 	/*
+@@ -119,6 +120,7 @@ enum vc4_hdmi_field {
+ 	HDMI_TX_PHY_POWERDOWN_CTL,
+ 	HDMI_TX_PHY_RESET_CTL,
+ 	HDMI_TX_PHY_TMDS_CLK_WORD_SEL,
++	HDMI_VEC_INTERFACE_CFG,
+ 	HDMI_VEC_INTERFACE_XBAR,
+ 	HDMI_VERTA0,
+ 	HDMI_VERTA1,
+@@ -246,6 +248,7 @@ static const struct vc4_hdmi_register __
+ 	VC4_HDMI_REG(HDMI_SCRAMBLER_CTL, 0x1c4),
+ 
+ 	VC5_DVP_REG(HDMI_CLOCK_STOP, 0x0bc),
++	VC5_DVP_REG(HDMI_VEC_INTERFACE_CFG, 0x0ec),
+ 	VC5_DVP_REG(HDMI_VEC_INTERFACE_XBAR, 0x0f0),
+ 
+ 	VC5_PHY_REG(HDMI_TX_PHY_RESET_CTL, 0x000),
+@@ -291,6 +294,7 @@ static const struct vc4_hdmi_register __
+ 	VC5_CSC_REG(HDMI_CSC_24_23, 0x010),
+ 	VC5_CSC_REG(HDMI_CSC_32_31, 0x014),
+ 	VC5_CSC_REG(HDMI_CSC_34_33, 0x018),
++	VC5_CSC_REG(HDMI_CSC_CHANNEL_CTL, 0x02c),
+ };
+ 
+ static const struct vc4_hdmi_register __maybe_unused vc5_hdmi_hdmi1_fields[] = {
+@@ -327,6 +331,7 @@ static const struct vc4_hdmi_register __
+ 	VC4_HDMI_REG(HDMI_SCRAMBLER_CTL, 0x1c4),
+ 
+ 	VC5_DVP_REG(HDMI_CLOCK_STOP, 0x0bc),
++	VC5_DVP_REG(HDMI_VEC_INTERFACE_CFG, 0x0ec),
+ 	VC5_DVP_REG(HDMI_VEC_INTERFACE_XBAR, 0x0f0),
+ 
+ 	VC5_PHY_REG(HDMI_TX_PHY_RESET_CTL, 0x000),
+@@ -372,6 +377,7 @@ static const struct vc4_hdmi_register __
+ 	VC5_CSC_REG(HDMI_CSC_24_23, 0x010),
+ 	VC5_CSC_REG(HDMI_CSC_32_31, 0x014),
+ 	VC5_CSC_REG(HDMI_CSC_34_33, 0x018),
++	VC5_CSC_REG(HDMI_CSC_CHANNEL_CTL, 0x02c),
+ };
+ 
+ static inline
+--- a/drivers/gpu/drm/vc4/vc4_regs.h
++++ b/drivers/gpu/drm/vc4/vc4_regs.h
+@@ -796,11 +796,27 @@ enum {
+ # define VC4_HD_CSC_CTL_RGB2YCC			BIT(1)
+ # define VC4_HD_CSC_CTL_ENABLE			BIT(0)
+ 
++# define VC5_MT_CP_CSC_CTL_USE_444_TO_422	BIT(6)
++# define VC5_MT_CP_CSC_CTL_FILTER_MODE_444_TO_422_MASK \
++						VC4_MASK(5, 4)
++# define VC5_MT_CP_CSC_CTL_FILTER_MODE_444_TO_422_STANDARD \
++						3
++# define VC5_MT_CP_CSC_CTL_USE_RNG_SUPPRESSION	BIT(3)
+ # define VC5_MT_CP_CSC_CTL_ENABLE		BIT(2)
+ # define VC5_MT_CP_CSC_CTL_MODE_MASK		VC4_MASK(1, 0)
+ 
++# define VC5_MT_CP_CHANNEL_CTL_OUTPUT_REMAP_MASK \
++						VC4_MASK(7, 6)
++# define VC5_MT_CP_CHANNEL_CTL_OUTPUT_REMAP_LEGACY_STYLE \
++						2
++
+ # define VC4_DVP_HT_CLOCK_STOP_PIXEL		BIT(1)
+ 
++# define VC5_DVP_HT_VEC_INTERFACE_CFG_SEL_422_MASK \
++						VC4_MASK(3, 2)
++# define VC5_DVP_HT_VEC_INTERFACE_CFG_SEL_422_FORMAT_422_LEGACY \
++						2
++
+ /* HVS display list information. */
+ #define HVS_BOOTLOADER_DLIST_END                32
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0652-media-v4l2-ctrls-Add-V4L2_CID_NOTIFY_GAINS-control.patch b/root/target/linux/bcm27xx/patches-5.15/950-0652-media-v4l2-ctrls-Add-V4L2_CID_NOTIFY_GAINS-control.patch
new file mode 100644
index 00000000..7b134dff
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0652-media-v4l2-ctrls-Add-V4L2_CID_NOTIFY_GAINS-control.patch
@@ -0,0 +1,51 @@
+From effad78b92e8a2cfe441ceb106d5dea49fb3376e Mon Sep 17 00:00:00 2001
+From: David Plowman <david.plowman@raspberrypi.com>
+Date: Mon, 16 Aug 2021 13:39:08 +0200
+Subject: [PATCH 652/828] media: v4l2-ctrls: Add V4L2_CID_NOTIFY_GAINS control
+
+commit a9c80593ff80ddb7c6496624e5384e1ea3460a72 upstream.
+
+We add a new control V4L2_CID_NOTIFY_GAINS which allows the sensor to
+be notified what gains will be applied to the different colour
+channels by subsequent processing (such as by an ISP), even though the
+sensor will not apply any of these gains itself.
+
+For Bayer sensors this will be an array control taking 4 values which
+are the 4 gains arranged in the fixed order B, Gb, Gr and R,
+irrespective of the exact Bayer order of the sensor itself. The use of
+an array makes it straightforward to extend this control to non-Bayer
+sensors (for example, sensors with an RGBW pattern) in future.
+
+The units are in all cases linear with the default value indicating a
+gain of exactly 1.0. For example, if the default value were reported as
+128 then the value 192 would represent a gain of exactly 1.5.
+
+Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+---
+ drivers/media/v4l2-core/v4l2-ctrls-defs.c | 1 +
+ include/uapi/linux/v4l2-controls.h        | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c
++++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c
+@@ -1109,6 +1109,7 @@ const char *v4l2_ctrl_get_name(u32 id)
+ 	case V4L2_CID_TEST_PATTERN_GREENR:	return "Green (Red) Pixel Value";
+ 	case V4L2_CID_TEST_PATTERN_BLUE:	return "Blue Pixel Value";
+ 	case V4L2_CID_TEST_PATTERN_GREENB:	return "Green (Blue) Pixel Value";
++	case V4L2_CID_NOTIFY_GAINS:		return "Notify Gains";
+ 
+ 	/* Image processing controls */
+ 	/* Keep the order of the 'case's the same as in v4l2-controls.h! */
+--- a/include/uapi/linux/v4l2-controls.h
++++ b/include/uapi/linux/v4l2-controls.h
+@@ -1123,6 +1123,7 @@ enum v4l2_jpeg_chroma_subsampling {
+ #define V4L2_CID_TEST_PATTERN_BLUE		(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 6)
+ #define V4L2_CID_TEST_PATTERN_GREENB		(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 7)
+ #define V4L2_CID_UNIT_CELL_SIZE			(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 8)
++#define V4L2_CID_NOTIFY_GAINS			(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 9)
+ 
+ 
+ /* Image processing controls */
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0653-media-v4l2-ctrls-Document-V4L2_CID_NOTIFY_GAINS-cont.patch b/root/target/linux/bcm27xx/patches-5.15/950-0653-media-v4l2-ctrls-Document-V4L2_CID_NOTIFY_GAINS-cont.patch
new file mode 100644
index 00000000..a7f0df9b
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0653-media-v4l2-ctrls-Document-V4L2_CID_NOTIFY_GAINS-cont.patch
@@ -0,0 +1,48 @@
+From 49ab2f8dc34111ed2dc8aff1dc0b24e25181a9a5 Mon Sep 17 00:00:00 2001
+From: David Plowman <david.plowman@raspberrypi.com>
+Date: Mon, 16 Aug 2021 13:39:09 +0200
+Subject: [PATCH 653/828] media: v4l2-ctrls: Document V4L2_CID_NOTIFY_GAINS
+ control
+
+commit 311a839a1ad255ebcb7291fb4e0d2ec2f32312a7 upstream.
+
+Add documentation for the V4L2_CID_NOTIFY_GAINS control.
+
+This control is required by sensors that need to know what colour
+gains will be applied to pixels by downstream processing (such as by
+an ISP), though the sensor does not apply these gains itself.
+
+Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+---
+ .../media/v4l/ext-ctrls-image-source.rst      | 20 +++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+--- a/Documentation/userspace-api/media/v4l/ext-ctrls-image-source.rst
++++ b/Documentation/userspace-api/media/v4l/ext-ctrls-image-source.rst
+@@ -72,3 +72,23 @@ Image Source Control IDs
+     * - __u32
+       - ``height``
+       - Height of the area.
++
++``V4L2_CID_NOTIFY_GAINS (integer array)``
++    The sensor is notified what gains will be applied to the different
++    colour channels by subsequent processing (such as by an ISP). The
++    sensor is merely informed of these values in case it performs
++    processing that requires them, but it does not apply them itself to
++    the output pixels.
++
++    Currently it is defined only for Bayer sensors, and is an array
++    control taking 4 gain values, being the gains for each of the
++    Bayer channels. The gains are always in the order B, Gb, Gr and R,
++    irrespective of the exact Bayer order of the sensor itself.
++
++    The use of an array allows this control to be extended to sensors
++    with, for example, non-Bayer CFAs (colour filter arrays).
++
++    The units for the gain values are linear, with the default value
++    representing a gain of exactly 1.0. For example, if this default value
++    is reported as being (say) 128, then a value of 192 would represent
++    a gain of exactly 1.5.
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0654-Extending-ili9881c-driver-support-for-nwe080-panel.patch b/root/target/linux/bcm27xx/patches-5.15/950-0654-Extending-ili9881c-driver-support-for-nwe080-panel.patch
new file mode 100644
index 00000000..7070e607
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0654-Extending-ili9881c-driver-support-for-nwe080-panel.patch
@@ -0,0 +1,318 @@
+From b9db07289681fe6a3fc014af47205b758ed1a6a5 Mon Sep 17 00:00:00 2001
+From: Penk Chen <penk@cutiepi.io>
+Date: Mon, 20 Dec 2021 03:44:56 +0900
+Subject: [PATCH 654/828] Extending ili9881c driver support for nwe080 panel
+
+Signed-off-by: Penk Chen <penk@cutiepi.io>
+---
+ drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 253 +++++++++++++++++-
+ 1 file changed, 251 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
++++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
+@@ -1,6 +1,8 @@
+ // SPDX-License-Identifier: GPL-2.0
+ /*
+  * Copyright (C) 2017-2018, Bootlin
++ * Copyright (C) 2021, Henson Li <henson@cutiepi.io>
++ * Copyright (C) 2021, Penk Chen <penk@cutiepi.io>
+  */
+ 
+ #include <linux/delay.h>
+@@ -42,6 +44,7 @@ struct ili9881c_desc {
+ 	const struct ili9881c_instr *init;
+ 	const size_t init_length;
+ 	const struct drm_display_mode *mode;
++	const unsigned flags;
+ };
+ 
+ struct ili9881c {
+@@ -453,6 +456,225 @@ static const struct ili9881c_instr k101_
+ 	ILI9881C_COMMAND_INSTR(0xD3, 0x3F), /* VN0 */
+ };
+ 
++static const struct ili9881c_instr nwe080_init[] = {
++	ILI9881C_SWITCH_PAGE_INSTR(3),
++	//GIP_1
++	ILI9881C_COMMAND_INSTR(0x01, 0x00),
++	ILI9881C_COMMAND_INSTR(0x02, 0x00),
++	ILI9881C_COMMAND_INSTR(0x03, 0x73),
++	ILI9881C_COMMAND_INSTR(0x04, 0x00),
++	ILI9881C_COMMAND_INSTR(0x05, 0x00),
++	ILI9881C_COMMAND_INSTR(0x06, 0x0A),
++	ILI9881C_COMMAND_INSTR(0x07, 0x00),
++	ILI9881C_COMMAND_INSTR(0x08, 0x00),
++	ILI9881C_COMMAND_INSTR(0x09, 0x20),
++	ILI9881C_COMMAND_INSTR(0x0a, 0x20),
++	ILI9881C_COMMAND_INSTR(0x0b, 0x00),
++	ILI9881C_COMMAND_INSTR(0x0c, 0x00),
++	ILI9881C_COMMAND_INSTR(0x0d, 0x00),
++	ILI9881C_COMMAND_INSTR(0x0e, 0x00),
++	ILI9881C_COMMAND_INSTR(0x0f, 0x1E),
++	ILI9881C_COMMAND_INSTR(0x10, 0x1E),
++	ILI9881C_COMMAND_INSTR(0x11, 0x00),
++	ILI9881C_COMMAND_INSTR(0x12, 0x00),
++	ILI9881C_COMMAND_INSTR(0x13, 0x00),
++	ILI9881C_COMMAND_INSTR(0x14, 0x00),
++	ILI9881C_COMMAND_INSTR(0x15, 0x00),
++	ILI9881C_COMMAND_INSTR(0x16, 0x00),
++	ILI9881C_COMMAND_INSTR(0x17, 0x00),
++	ILI9881C_COMMAND_INSTR(0x18, 0x00),
++	ILI9881C_COMMAND_INSTR(0x19, 0x00),
++	ILI9881C_COMMAND_INSTR(0x1A, 0x00),
++	ILI9881C_COMMAND_INSTR(0x1B, 0x00),
++	ILI9881C_COMMAND_INSTR(0x1C, 0x00),
++	ILI9881C_COMMAND_INSTR(0x1D, 0x00),
++	ILI9881C_COMMAND_INSTR(0x1E, 0x40),
++	ILI9881C_COMMAND_INSTR(0x1F, 0x80),
++	ILI9881C_COMMAND_INSTR(0x20, 0x06),
++	ILI9881C_COMMAND_INSTR(0x21, 0x01),
++	ILI9881C_COMMAND_INSTR(0x22, 0x00),
++	ILI9881C_COMMAND_INSTR(0x23, 0x00),
++	ILI9881C_COMMAND_INSTR(0x24, 0x00),
++	ILI9881C_COMMAND_INSTR(0x25, 0x00),
++	ILI9881C_COMMAND_INSTR(0x26, 0x00),
++	ILI9881C_COMMAND_INSTR(0x27, 0x00),
++	ILI9881C_COMMAND_INSTR(0x28, 0x33),
++	ILI9881C_COMMAND_INSTR(0x29, 0x03),
++	ILI9881C_COMMAND_INSTR(0x2A, 0x00),
++	ILI9881C_COMMAND_INSTR(0x2B, 0x00),
++	ILI9881C_COMMAND_INSTR(0x2C, 0x00),
++	ILI9881C_COMMAND_INSTR(0x2D, 0x00),
++	ILI9881C_COMMAND_INSTR(0x2E, 0x00),
++	ILI9881C_COMMAND_INSTR(0x2F, 0x00),
++	ILI9881C_COMMAND_INSTR(0x30, 0x00),
++	ILI9881C_COMMAND_INSTR(0x31, 0x00),
++	ILI9881C_COMMAND_INSTR(0x32, 0x00),
++	ILI9881C_COMMAND_INSTR(0x33, 0x00),
++	ILI9881C_COMMAND_INSTR(0x34, 0x04),
++	ILI9881C_COMMAND_INSTR(0x35, 0x00),
++	ILI9881C_COMMAND_INSTR(0x36, 0x00),
++	ILI9881C_COMMAND_INSTR(0x37, 0x00),
++	ILI9881C_COMMAND_INSTR(0x38, 0x3C),
++	ILI9881C_COMMAND_INSTR(0x39, 0x00),
++	ILI9881C_COMMAND_INSTR(0x3A, 0x00),
++	ILI9881C_COMMAND_INSTR(0x3B, 0x00),
++	ILI9881C_COMMAND_INSTR(0x3C, 0x00),
++	ILI9881C_COMMAND_INSTR(0x3D, 0x00),
++	ILI9881C_COMMAND_INSTR(0x3E, 0x00),
++	ILI9881C_COMMAND_INSTR(0x3F, 0x00),
++	ILI9881C_COMMAND_INSTR(0x40, 0x00),
++	ILI9881C_COMMAND_INSTR(0x41, 0x00),
++	ILI9881C_COMMAND_INSTR(0x42, 0x00),
++	ILI9881C_COMMAND_INSTR(0x43, 0x00),
++	ILI9881C_COMMAND_INSTR(0x44, 0x00),
++
++	ILI9881C_COMMAND_INSTR(0x50, 0x10),
++	ILI9881C_COMMAND_INSTR(0x51, 0x32),
++	ILI9881C_COMMAND_INSTR(0x52, 0x54),
++	ILI9881C_COMMAND_INSTR(0x53, 0x76),
++	ILI9881C_COMMAND_INSTR(0x54, 0x98),
++	ILI9881C_COMMAND_INSTR(0x55, 0xba),
++	ILI9881C_COMMAND_INSTR(0x56, 0x10),
++	ILI9881C_COMMAND_INSTR(0x57, 0x32),
++	ILI9881C_COMMAND_INSTR(0x58, 0x54),
++	ILI9881C_COMMAND_INSTR(0x59, 0x76),
++	ILI9881C_COMMAND_INSTR(0x5A, 0x98),
++	ILI9881C_COMMAND_INSTR(0x5B, 0xba),
++	ILI9881C_COMMAND_INSTR(0x5C, 0xdc),
++	ILI9881C_COMMAND_INSTR(0x5D, 0xfe),
++
++	//GIP_3
++	ILI9881C_COMMAND_INSTR(0x5E, 0x00),
++	ILI9881C_COMMAND_INSTR(0x5F, 0x01),
++	ILI9881C_COMMAND_INSTR(0x60, 0x00),
++	ILI9881C_COMMAND_INSTR(0x61, 0x15),
++	ILI9881C_COMMAND_INSTR(0x62, 0x14),
++	ILI9881C_COMMAND_INSTR(0x63, 0x0E),
++	ILI9881C_COMMAND_INSTR(0x64, 0x0F),
++	ILI9881C_COMMAND_INSTR(0x65, 0x0C),
++	ILI9881C_COMMAND_INSTR(0x66, 0x0D),
++	ILI9881C_COMMAND_INSTR(0x67, 0x06),
++	ILI9881C_COMMAND_INSTR(0x68, 0x02),
++	ILI9881C_COMMAND_INSTR(0x69, 0x02),
++	ILI9881C_COMMAND_INSTR(0x6A, 0x02),
++	ILI9881C_COMMAND_INSTR(0x6B, 0x02),
++	ILI9881C_COMMAND_INSTR(0x6C, 0x02),
++	ILI9881C_COMMAND_INSTR(0x6D, 0x02),
++	ILI9881C_COMMAND_INSTR(0x6E, 0x07),
++	ILI9881C_COMMAND_INSTR(0x6F, 0x02),
++	ILI9881C_COMMAND_INSTR(0x70, 0x02),
++	ILI9881C_COMMAND_INSTR(0x71, 0x02),
++	ILI9881C_COMMAND_INSTR(0x72, 0x02),
++	ILI9881C_COMMAND_INSTR(0x73, 0x02),
++	ILI9881C_COMMAND_INSTR(0x74, 0x02),
++
++	ILI9881C_COMMAND_INSTR(0x75, 0x01),
++	ILI9881C_COMMAND_INSTR(0x76, 0x00),
++	ILI9881C_COMMAND_INSTR(0x77, 0x14),
++	ILI9881C_COMMAND_INSTR(0x78, 0x15),
++	ILI9881C_COMMAND_INSTR(0x79, 0x0E),
++	ILI9881C_COMMAND_INSTR(0x7A, 0x0F),
++	ILI9881C_COMMAND_INSTR(0x7B, 0x0C),
++	ILI9881C_COMMAND_INSTR(0x7C, 0x0D),
++	ILI9881C_COMMAND_INSTR(0x7D, 0x06),
++	ILI9881C_COMMAND_INSTR(0x7E, 0x02),
++	ILI9881C_COMMAND_INSTR(0x7F, 0x02),
++	ILI9881C_COMMAND_INSTR(0x80, 0x02),
++	ILI9881C_COMMAND_INSTR(0x81, 0x02),
++	ILI9881C_COMMAND_INSTR(0x82, 0x02),
++	ILI9881C_COMMAND_INSTR(0x83, 0x02),
++	ILI9881C_COMMAND_INSTR(0x84, 0x07),
++	ILI9881C_COMMAND_INSTR(0x85, 0x02),
++	ILI9881C_COMMAND_INSTR(0x86, 0x02),
++	ILI9881C_COMMAND_INSTR(0x87, 0x02),
++	ILI9881C_COMMAND_INSTR(0x88, 0x02),
++	ILI9881C_COMMAND_INSTR(0x89, 0x02),
++	ILI9881C_COMMAND_INSTR(0x8A, 0x02),
++
++	ILI9881C_SWITCH_PAGE_INSTR(4),
++	ILI9881C_COMMAND_INSTR(0x6C, 0x15),
++	ILI9881C_COMMAND_INSTR(0x6E, 0x2A),
++
++	//clamp 15V
++	ILI9881C_COMMAND_INSTR(0x6F, 0x35),
++	ILI9881C_COMMAND_INSTR(0x3A, 0x92),
++	ILI9881C_COMMAND_INSTR(0x8D, 0x1F),
++	ILI9881C_COMMAND_INSTR(0x87, 0xBA),
++	ILI9881C_COMMAND_INSTR(0x26, 0x76),
++	ILI9881C_COMMAND_INSTR(0xB2, 0xD1),
++	ILI9881C_COMMAND_INSTR(0xB5, 0x27),
++	ILI9881C_COMMAND_INSTR(0x31, 0x75),
++	ILI9881C_COMMAND_INSTR(0x30, 0x03),
++	ILI9881C_COMMAND_INSTR(0x3B, 0x98),
++	ILI9881C_COMMAND_INSTR(0x35, 0x17),
++	ILI9881C_COMMAND_INSTR(0x33, 0x14),
++	ILI9881C_COMMAND_INSTR(0x38, 0x01),
++	ILI9881C_COMMAND_INSTR(0x39, 0x00),
++
++	ILI9881C_SWITCH_PAGE_INSTR(1),
++	// direction rotate
++	//ILI9881C_COMMAND_INSTR(0x22, 0x0B),
++	ILI9881C_COMMAND_INSTR(0x22, 0x0A),
++	ILI9881C_COMMAND_INSTR(0x31, 0x00),
++	ILI9881C_COMMAND_INSTR(0x53, 0x63),
++	ILI9881C_COMMAND_INSTR(0x55, 0x69),
++	ILI9881C_COMMAND_INSTR(0x50, 0xC7),
++	ILI9881C_COMMAND_INSTR(0x51, 0xC2),
++	ILI9881C_COMMAND_INSTR(0x60, 0x26),
++
++	ILI9881C_COMMAND_INSTR(0xA0, 0x08),
++	ILI9881C_COMMAND_INSTR(0xA1, 0x0F),
++	ILI9881C_COMMAND_INSTR(0xA2, 0x25),
++	ILI9881C_COMMAND_INSTR(0xA3, 0x01),
++	ILI9881C_COMMAND_INSTR(0xA4, 0x23),
++	ILI9881C_COMMAND_INSTR(0xA5, 0x18),
++	ILI9881C_COMMAND_INSTR(0xA6, 0x11),
++	ILI9881C_COMMAND_INSTR(0xA7, 0x1A),
++	ILI9881C_COMMAND_INSTR(0xA8, 0x81),
++	ILI9881C_COMMAND_INSTR(0xA9, 0x19),
++	ILI9881C_COMMAND_INSTR(0xAA, 0x26),
++	ILI9881C_COMMAND_INSTR(0xAB, 0x7C),
++	ILI9881C_COMMAND_INSTR(0xAC, 0x24),
++	ILI9881C_COMMAND_INSTR(0xAD, 0x1E),
++	ILI9881C_COMMAND_INSTR(0xAE, 0x5C),
++	ILI9881C_COMMAND_INSTR(0xAF, 0x2A),
++	ILI9881C_COMMAND_INSTR(0xB0, 0x2B),
++	ILI9881C_COMMAND_INSTR(0xB1, 0x50),
++	ILI9881C_COMMAND_INSTR(0xB2, 0x5C),
++	ILI9881C_COMMAND_INSTR(0xB3, 0x39),
++
++	ILI9881C_COMMAND_INSTR(0xC0, 0x08),
++	ILI9881C_COMMAND_INSTR(0xC1, 0x1F),
++	ILI9881C_COMMAND_INSTR(0xC2, 0x24),
++	ILI9881C_COMMAND_INSTR(0xC3, 0x1D),
++	ILI9881C_COMMAND_INSTR(0xC4, 0x04),
++	ILI9881C_COMMAND_INSTR(0xC5, 0x32),
++	ILI9881C_COMMAND_INSTR(0xC6, 0x24),
++	ILI9881C_COMMAND_INSTR(0xC7, 0x1F),
++	ILI9881C_COMMAND_INSTR(0xC8, 0x90),
++	ILI9881C_COMMAND_INSTR(0xC9, 0x20),
++	ILI9881C_COMMAND_INSTR(0xCA, 0x2C),
++	ILI9881C_COMMAND_INSTR(0xCB, 0x82),
++	ILI9881C_COMMAND_INSTR(0xCC, 0x19),
++	ILI9881C_COMMAND_INSTR(0xCD, 0x22),
++	ILI9881C_COMMAND_INSTR(0xCE, 0x4E),
++	ILI9881C_COMMAND_INSTR(0xCF, 0x28),
++	ILI9881C_COMMAND_INSTR(0xD0, 0x2D),
++	ILI9881C_COMMAND_INSTR(0xD1, 0x51),
++	ILI9881C_COMMAND_INSTR(0xD2, 0x5D),
++	ILI9881C_COMMAND_INSTR(0xD3, 0x39),
++
++	ILI9881C_SWITCH_PAGE_INSTR(0),
++	//PWM
++	ILI9881C_COMMAND_INSTR(0x51, 0x0F),
++	ILI9881C_COMMAND_INSTR(0x52, 0xFF),
++	ILI9881C_COMMAND_INSTR(0x53, 0x2C),
++
++	ILI9881C_COMMAND_INSTR(0x11, 0x00),
++	ILI9881C_COMMAND_INSTR(0x29, 0x00),
++	ILI9881C_COMMAND_INSTR(0x35, 0x00),
++};
++
+ static inline struct ili9881c *panel_to_ili9881c(struct drm_panel *panel)
+ {
+ 	return container_of(panel, struct ili9881c, panel);
+@@ -603,6 +825,23 @@ static const struct drm_display_mode k10
+ 	.height_mm	= 217,
+ };
+ 
++static const struct drm_display_mode nwe080_default_mode = {
++	.clock 		= 71750,
++
++	.hdisplay	= 800,
++	.hsync_start	= 800 + 52,
++	.hsync_end	= 800 + 52 + 8,
++	.htotal		= 800 + 52 + 8 + 48,
++
++	.vdisplay	= 1280,
++	.vsync_start	= 1280 + 16,
++	.vsync_end	= 1280 + 16 + 6,
++	.vtotal		= 1280 + 16 + 6 + 15,
++
++	.width_mm 	= 107,
++	.height_mm 	= 170,
++};
++
+ static int ili9881c_get_modes(struct drm_panel *panel,
+ 			      struct drm_connector *connector)
+ {
+@@ -670,7 +909,7 @@ static int ili9881c_dsi_probe(struct mip
+ 
+ 	drm_panel_add(&ctx->panel);
+ 
+-	dsi->mode_flags = MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
++	dsi->mode_flags = ctx->desc->flags;
+ 	dsi->format = MIPI_DSI_FMT_RGB888;
+ 	dsi->lanes = 4;
+ 
+@@ -691,18 +930,28 @@ static const struct ili9881c_desc lhr050
+ 	.init = lhr050h41_init,
+ 	.init_length = ARRAY_SIZE(lhr050h41_init),
+ 	.mode = &lhr050h41_default_mode,
++	.flags = MIPI_DSI_MODE_VIDEO_SYNC_PULSE,
+ };
+ 
+ static const struct ili9881c_desc k101_im2byl02_desc = {
+ 	.init = k101_im2byl02_init,
+ 	.init_length = ARRAY_SIZE(k101_im2byl02_init),
+ 	.mode = &k101_im2byl02_default_mode,
++	.flags = MIPI_DSI_MODE_VIDEO_SYNC_PULSE,
++};
++
++static const struct ili9881c_desc nwe080_desc = {
++	.init = nwe080_init,
++	.init_length = ARRAY_SIZE(nwe080_init),
++	.mode = &nwe080_default_mode,
++	.flags = MIPI_DSI_MODE_VIDEO_SYNC_PULSE | MIPI_DSI_MODE_VIDEO,
+ };
+ 
+ static const struct of_device_id ili9881c_of_match[] = {
+ 	{ .compatible = "bananapi,lhr050h41", .data = &lhr050h41_desc },
+ 	{ .compatible = "feixin,k101-im2byl02", .data = &k101_im2byl02_desc },
+-	{ }
++	{ .compatible = "nwe,nwe080", .data = &nwe080_desc },
++	{}
+ };
+ MODULE_DEVICE_TABLE(of, ili9881c_of_match);
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0655-Add-panel-overlay-for-CutiePi.patch b/root/target/linux/bcm27xx/patches-5.15/950-0655-Add-panel-overlay-for-CutiePi.patch
new file mode 100644
index 00000000..89cf52bd
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0655-Add-panel-overlay-for-CutiePi.patch
@@ -0,0 +1,172 @@
+From 1a0eb0494bc85525bfb6674358c6f03ee19c8c5e Mon Sep 17 00:00:00 2001
+From: Penk Chen <penk@cutiepi.io>
+Date: Mon, 20 Dec 2021 03:46:26 +0900
+Subject: [PATCH 655/828] Add panel overlay for CutiePi
+
+Signed-off-by: Penk Chen <penk@cutiepi.io>
+---
+ arch/arm/boot/dts/overlays/Makefile           |   1 +
+ arch/arm/boot/dts/overlays/README             |   6 +
+ .../dts/overlays/cutiepi-panel-overlay.dts    | 117 ++++++++++++++++++
+ arch/arm/boot/dts/overlays/overlay_map.dts    |   4 +
+ 4 files changed, 128 insertions(+)
+ create mode 100644 arch/arm/boot/dts/overlays/cutiepi-panel-overlay.dts
+
+--- a/arch/arm/boot/dts/overlays/Makefile
++++ b/arch/arm/boot/dts/overlays/Makefile
+@@ -34,6 +34,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
+ 	cap1106.dtbo \
+ 	chipdip-dac.dtbo \
+ 	cma.dtbo \
++	cutiepi-panel.dtbo \
+ 	dht11.dtbo \
+ 	dionaudio-loco.dtbo \
+ 	dionaudio-loco-v2.dtbo \
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -679,6 +679,12 @@ Params: cma-512                 CMA is 5
+         cma-default             Use upstream's default value
+ 
+ 
++Name:   cutiepi-panel
++Info:   8" TFT LCD display and touch panel used by cutiepi.io
++Load:   dtoverlay=cutiepi-panel
++Params: <None>
++
++
+ Name:   dht11
+ Info:   Overlay for the DHT11/DHT21/DHT22 humidity/temperature sensors
+         Also sometimes found with the part number(s) AM230x.
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/cutiepi-panel-overlay.dts
+@@ -0,0 +1,117 @@
++/dts-v1/;
++/plugin/;
++
++/ {
++    compatible = "brcm,bcm2711";
++
++    fragment@0 {
++        target=<&dsi1>;
++
++        __overlay__ {
++            status = "okay";
++
++            #address-cells = <1>;
++            #size-cells = <0>;
++
++            port {
++                dsi1_out_port: endpoint {
++                    remote-endpoint = <&panel_dsi_in1>;
++                };
++            };
++
++            display1: panel@0 {
++                compatible = "nwe,nwe080";
++                reg=<0>;
++                backlight = <&rpi_backlight>;
++                reset-gpios = <&gpio 20 0>;
++                port {
++                    panel_dsi_in1: endpoint {
++                        remote-endpoint = <&dsi1_out_port>;
++                    };
++                };
++            };
++        };
++    };
++
++    fragment@1 {
++        target = <&gpio>;
++        __overlay__ {
++            pwm_pins: pwm_pins {
++                brcm,pins = <12>;
++                brcm,function = <4>; // ALT0
++            };
++        };
++    };
++
++    fragment@2 {
++        target = <&pwm>;
++        frag1: __overlay__ {
++            pinctrl-names = "default";
++            pinctrl-0 = <&pwm_pins>;
++            assigned-clock-rates = <1000000>;
++            status = "okay";
++        };
++    };
++
++    fragment@3 {
++        target-path = "/";
++        __overlay__ {
++            rpi_backlight: rpi_backlight {
++                compatible = "pwm-backlight";
++                brightness-levels = <0 6 8 12 16 24 32 40 48 64 96 128 160 192 224 255>;
++                default-brightness-level = <6>;
++                pwms = <&pwm 0 200000>;
++                power-supply = <&vdd_3v3_reg>;
++                status = "okay";
++            };
++        };
++    };
++
++    fragment@4 {
++        target = <&i2c6>;
++        frag0: __overlay__ {
++            status = "okay";
++            pinctrl-names = "default";
++            pinctrl-0 = <&i2c6_pins>;
++            clock-frequency = <100000>;
++        };
++    };
++
++    fragment@5 {
++        target = <&i2c6_pins>;
++        __overlay__ {
++            brcm,pins = <22 23>;
++        };
++    };
++
++    fragment@6 {
++            target = <&gpio>;
++            __overlay__ {
++                goodix_pins: goodix_pins {
++                    brcm,pins = <21 26>; // interrupt and reset
++                    brcm,function = <0 0>; // in
++                    brcm,pull = <2 2>; // pull-up
++                };
++            };
++    };
++
++    fragment@7 {
++        target = <&i2c6>;
++        __overlay__ {
++            #address-cells = <1>;
++            #size-cells = <0>;
++            status = "okay";
++
++            gt9xx: gt9xx@5d {
++                compatible = "goodix,gt9271"; 
++                reg = <0x5D>;
++                pinctrl-names = "default";
++                pinctrl-0 = <&goodix_pins>;
++                interrupt-parent = <&gpio>;
++                interrupts = <21 2>; // high-to-low edge triggered
++                irq-gpios = <&gpio 21 0>; 
++                reset-gpios = <&gpio 26 0>;
++            };
++        };
++    };
++};
+--- a/arch/arm/boot/dts/overlays/overlay_map.dts
++++ b/arch/arm/boot/dts/overlays/overlay_map.dts
+@@ -5,6 +5,10 @@
+ 		deprecated = "use i2c-sensor,bmp085";
+ 	};
+ 
++	cutiepi-panel {
++		bcm2711;
++	};
++
+ 	highperi {
+ 		bcm2711;
+ 	};
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0656-dtoverlays-Enable-cam1_clock-when-using-tc358743-or-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0656-dtoverlays-Enable-cam1_clock-when-using-tc358743-or-.patch
new file mode 100644
index 00000000..ec74ddae
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0656-dtoverlays-Enable-cam1_clock-when-using-tc358743-or-.patch
@@ -0,0 +1,42 @@
+From 5b3b4446b20dee60f1be110378e98db05b94f0d3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20Van=C4=9Bk?= <linuxtardis@gmail.com>
+Date: Tue, 28 Dec 2021 15:43:10 +0100
+Subject: [PATCH 656/828] dtoverlays: Enable cam1_clock when using tc358743 or
+ irs1125
+
+This fixes a regression introduced in 131f1322039284932ccb601a5cffdd9ca5d36d96
+(see also https://github.com/raspberrypi/linux/issues/4791).
+The tc358743 driver refused to bind to the device. The irs1125
+driver is likely behaving similarly.
+
+The new unified cam1_clk node that represents the fixed on-board
+oscillator is marked as disabled by default. These overlays didn't
+expect this and so the clock nodes were stuck in disabled state.
+
+This commit just adds the required status = "okay" line. Other sensor
+drivers do this too.
+---
+ arch/arm/boot/dts/overlays/irs1125-overlay.dts  | 1 +
+ arch/arm/boot/dts/overlays/tc358743-overlay.dts | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/arch/arm/boot/dts/overlays/irs1125-overlay.dts
++++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts
+@@ -75,6 +75,7 @@
+ 	clk_frag: fragment@5 {
+ 		target = <&cam1_clk>;
+ 		__overlay__ {
++			status = "okay";
+ 			clock-frequency = <26000000>;
+ 		};
+ 	};
+--- a/arch/arm/boot/dts/overlays/tc358743-overlay.dts
++++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
+@@ -78,6 +78,7 @@
+ 	clk_frag: fragment@6 {
+ 		target = <&cam1_clk>;
+ 		__overlay__ {
++			status = "okay";
+ 			clock-frequency = <27000000>;
+ 		};
+ 	};
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0657-uapi-v4l2-controls-Reset-V4L2_CID_USER_BCM2835_ISP_B.patch b/root/target/linux/bcm27xx/patches-5.15/950-0657-uapi-v4l2-controls-Reset-V4L2_CID_USER_BCM2835_ISP_B.patch
new file mode 100644
index 00000000..aa64c3c7
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0657-uapi-v4l2-controls-Reset-V4L2_CID_USER_BCM2835_ISP_B.patch
@@ -0,0 +1,33 @@
+From ac30055eedf9ba54b713ceffe7819110a056f802 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Tue, 4 Jan 2022 13:56:42 +0000
+Subject: [PATCH 657/828] uapi/v4l2-controls: Reset
+ V4L2_CID_USER_BCM2835_ISP_BASE to same as 5.10
+
+https://github.com/raspberrypi/linux/issues/4440
+
+Upstream has added additional device specific controls, so the
+V4L2_CID_USER_BASE + 0x10e0 value that had been defined for use with
+the ISP has been taken by something else (and +0x10f0 has been used as
+well)
+
+Duplicate the use on V4L2_CID_USER_BASE + 0x10e0 so that userspace
+(libcamera) doesn't need to change. Once the driver is upstream, then
+we'll update libcamera to adopt the new value as it then won't change.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ include/uapi/linux/v4l2-controls.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/uapi/linux/v4l2-controls.h
++++ b/include/uapi/linux/v4l2-controls.h
+@@ -214,7 +214,7 @@ enum v4l2_colorfx {
+ 
+ /* The base for the bcm2835-isp driver controls.
+  * We reserve 16 controls for this driver. */
+-#define V4L2_CID_USER_BCM2835_ISP_BASE		(V4L2_CID_USER_BASE + 0x10f0)
++#define V4L2_CID_USER_BCM2835_ISP_BASE		(V4L2_CID_USER_BASE + 0x10e0)
+ 
+ /* MPEG-class control IDs */
+ /* The MPEG controls are applicable to all codec controls
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0658-drm-vc4-hdmi-Fix-HDMI-monitor-detection-in-polled-mo.patch b/root/target/linux/bcm27xx/patches-5.15/950-0658-drm-vc4-hdmi-Fix-HDMI-monitor-detection-in-polled-mo.patch
new file mode 100644
index 00000000..6a8f8090
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0658-drm-vc4-hdmi-Fix-HDMI-monitor-detection-in-polled-mo.patch
@@ -0,0 +1,46 @@
+From ca787663b65c554204be7aa9ce14be6074646fdf Mon Sep 17 00:00:00 2001
+From: Matthias Reichl <hias@horus.com>
+Date: Thu, 30 Dec 2021 14:28:37 +0100
+Subject: [PATCH 658/828] drm/vc4: hdmi: Fix HDMI monitor detection in polled
+ mode
+
+When vc4_hdmi_connector_detect() was called in
+connector_status_connected state it incorrectly cleared the
+hdmi_monitor flag, leading to no audio on RPi3.
+
+Fix this by clearing hdmi_monitor only when the hpd check
+indicated no connection or if reading the edid failed.
+
+Signed-off-by: Matthias Reichl <hias@horus.com>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -242,7 +242,6 @@ vc4_hdmi_connector_detect(struct drm_con
+ 			connected = true;
+ 	}
+ 
+-	vc4_hdmi->encoder.hdmi_monitor = false;
+ 	if (connected) {
+ 		if (connector->status != connector_status_connected) {
+ 			struct edid *edid = drm_get_edid(connector, vc4_hdmi->ddc);
+@@ -251,6 +250,8 @@ vc4_hdmi_connector_detect(struct drm_con
+ 				cec_s_phys_addr_from_edid(vc4_hdmi->cec_adap, edid);
+ 				vc4_hdmi->encoder.hdmi_monitor = drm_detect_hdmi_monitor(edid);
+ 				kfree(edid);
++			} else {
++				vc4_hdmi->encoder.hdmi_monitor = false;
+ 			}
+ 		}
+ 
+@@ -260,6 +261,8 @@ vc4_hdmi_connector_detect(struct drm_con
+ 		return connector_status_connected;
+ 	}
+ 
++	vc4_hdmi->encoder.hdmi_monitor = false;
++
+ 	cec_phys_addr_invalidate(vc4_hdmi->cec_adap);
+ 	pm_runtime_put(&vc4_hdmi->pdev->dev);
+ 	mutex_unlock(&vc4_hdmi->mutex);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0659-drm-vc4-hdmi-Fix-no-video-output-on-DVI-monitors.patch b/root/target/linux/bcm27xx/patches-5.15/950-0659-drm-vc4-hdmi-Fix-no-video-output-on-DVI-monitors.patch
new file mode 100644
index 00000000..46c9f040
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0659-drm-vc4-hdmi-Fix-no-video-output-on-DVI-monitors.patch
@@ -0,0 +1,29 @@
+From ca0632a13df15e8d1391671aa4cdc27131e6c1e6 Mon Sep 17 00:00:00 2001
+From: Matthias Reichl <hias@horus.com>
+Date: Thu, 30 Dec 2021 15:12:19 +0100
+Subject: [PATCH 659/828] drm/vc4: hdmi: Fix no video output on DVI monitors
+
+The drm edid parser doesn't signal RGB support on DVI monitors
+with old edid versions, leading to 8-bit RGB mode being rejected
+and no video on DVI monitors.
+
+As 8-bit RGB is mandatory on HDMI and DVI monitors anyways we can
+simply drop the RGB format check, aligning vc4 with other drivers.
+
+Signed-off-by: Matthias Reichl <hias@horus.com>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -1414,9 +1414,6 @@ vc4_hdmi_sink_supports_format_bpc(const
+ 	case VC4_HDMI_OUTPUT_RGB:
+ 		drm_dbg(dev, "RGB Format, checking the constraints.\n");
+ 
+-		if (!(info->color_formats & DRM_COLOR_FORMAT_RGB444))
+-			return false;
+-
+ 		if (bpc == 10 && !(info->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_30)) {
+ 			drm_dbg(dev, "10 BPC but sink doesn't support Deep Color 30.\n");
+ 			return false;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0660-staging-bcm2835-codec-Fix-typo.patch b/root/target/linux/bcm27xx/patches-5.15/950-0660-staging-bcm2835-codec-Fix-typo.patch
new file mode 100644
index 00000000..0814aba9
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0660-staging-bcm2835-codec-Fix-typo.patch
@@ -0,0 +1,21 @@
+From 30c3c6a46ca33c03c9f9759bc6649c14495eefa7 Mon Sep 17 00:00:00 2001
+From: Andriy Gelman <andriy.gelman@gmail.com>
+Date: Sun, 2 Jan 2022 12:22:52 -0500
+Subject: [PATCH 660/828] staging/bcm2835-codec: Fix typo
+
+Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
+---
+ .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c    | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
+@@ -1563,7 +1563,7 @@ static int vidioc_s_fmt(struct bcm2835_c
+ 	q_data->bytesperline = f->fmt.pix_mp.plane_fmt[0].bytesperline;
+ 	q_data->sizeimage = f->fmt.pix_mp.plane_fmt[0].sizeimage;
+ 
+-	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev,	"Calulated bpl as %u, size %u\n",
++	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev,	"Calculated bpl as %u, size %u\n",
+ 		 q_data->bytesperline, q_data->sizeimage);
+ 
+ 	if (ctx->dev->role == DECODE &&
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0661-media-i2c-ov9281-Increase-diff-between-VTS-and-max-e.patch b/root/target/linux/bcm27xx/patches-5.15/950-0661-media-i2c-ov9281-Increase-diff-between-VTS-and-max-e.patch
new file mode 100644
index 00000000..d23e9976
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0661-media-i2c-ov9281-Increase-diff-between-VTS-and-max-e.patch
@@ -0,0 +1,60 @@
+From 80be5c26404a39cedff1827ccfb07e52ba881db9 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Tue, 4 Jan 2022 14:46:01 +0000
+Subject: [PATCH 661/828] media: i2c: ov9281: Increase diff between VTS and max
+ exposure
+
+The driver did allow the exposure to go up to VTS - 4 lines,
+but this would produce a visible line on 1280x800, and a stall of
+the sensor at 640x480.
+
+Whilst it appears to work with a difference of 5, the datasheet states
+there should be at least 25 lines difference between VTS and exposure,
+so use that value.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov9281.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+--- a/drivers/media/i2c/ov9281.c
++++ b/drivers/media/i2c/ov9281.c
+@@ -52,7 +52,11 @@
+ #define OV9281_REG_EXPOSURE		0x3500
+ #define	OV9281_EXPOSURE_MIN		4
+ #define	OV9281_EXPOSURE_STEP		1
+-#define OV9281_VTS_MAX			0x7fff
++/*
++ * Number of lines less than frame length (VTS) that exposure must be.
++ * Datasheet states 25, although empirically 5 appears to work.
++ */
++#define OV9281_EXPOSURE_OFFSET		25
+ 
+ #define OV9281_REG_GAIN_H		0x3508
+ #define OV9281_REG_GAIN_L		0x3509
+@@ -69,6 +73,7 @@
+ #define OV9281_TEST_PATTERN_DISABLE	0x0
+ 
+ #define OV9281_REG_VTS			0x380e
++#define OV9281_VTS_MAX			0x7fff
+ 
+ /*
+  * OV9281 native and active pixel array size.
+@@ -967,7 +972,7 @@ static int ov9281_set_ctrl(struct v4l2_c
+ 	switch (ctrl->id) {
+ 	case V4L2_CID_VBLANK:
+ 		/* Update max exposure while meeting expected vblanking */
+-		max = ov9281->cur_mode->height + ctrl->val - 4;
++		max = ov9281->cur_mode->height + ctrl->val - OV9281_EXPOSURE_OFFSET;
+ 		__v4l2_ctrl_modify_range(ov9281->exposure,
+ 					 ov9281->exposure->minimum, max,
+ 					 ov9281->exposure->step,
+@@ -1062,7 +1067,7 @@ static int ov9281_initialize_controls(st
+ 					   OV9281_VTS_MAX - mode->height, 1,
+ 					   vblank_def);
+ 
+-	exposure_max = mode->vts_def - 4;
++	exposure_max = mode->vts_def - OV9281_EXPOSURE_OFFSET;
+ 	ov9281->exposure = v4l2_ctrl_new_std(handler, &ov9281_ctrl_ops,
+ 					     V4L2_CID_EXPOSURE,
+ 					     OV9281_EXPOSURE_MIN, exposure_max,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0662-Use-GitHubs-issue-form-for-bug-reports.patch b/root/target/linux/bcm27xx/patches-5.15/950-0662-Use-GitHubs-issue-form-for-bug-reports.patch
new file mode 100644
index 00000000..a85486db
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0662-Use-GitHubs-issue-form-for-bug-reports.patch
@@ -0,0 +1,163 @@
+From a0993611b66c466baab7953ecd31c78327730384 Mon Sep 17 00:00:00 2001
+From: Andreas Blaesius <andi@unlegacy-android.org>
+Date: Wed, 5 Jan 2022 20:38:39 +0100
+Subject: [PATCH 662/828] Use GitHubs issue form for bug reports
+
+Use GitHubs issue form for bug reports.
+
+- modern look
+- user don't need to mess with given markdown parts while filling the issue template
+
+Setup config.yml for general questions and problems with the Raspbian distribution packages.
+---
+ .github/ISSUE_TEMPLATE/bug_report.md  | 34 ----------
+ .github/ISSUE_TEMPLATE/bug_report.yml | 91 +++++++++++++++++++++++++++
+ .github/ISSUE_TEMPLATE/config.yml     |  9 +++
+ 3 files changed, 100 insertions(+), 34 deletions(-)
+ delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
+ create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
+ create mode 100644 .github/ISSUE_TEMPLATE/config.yml
+
+--- a/.github/ISSUE_TEMPLATE/bug_report.md
++++ /dev/null
+@@ -1,34 +0,0 @@
+----
+-name: Bug report
+-about: Create a report to help us fix your issue
+-
+----
+-
+-**Is this the right place for my bug report?**
+-This repository contains the Linux kernel used on the Raspberry Pi. If you believe that the issue you are seeing is kernel-related, this is the right place. If not, we have other repositories for the GPU firmware at [github.com/raspberrypi/firmware](https://github.com/raspberrypi/firmware) and Raspberry Pi userland applications at [github.com/raspberrypi/userland](https://github.com/raspberrypi/userland). If you have problems with the Raspbian distribution packages, report them in the [github.com/RPi-Distro/repo](https://github.com/RPi-Distro/repo). If you simply have a question, then [the Raspberry Pi forums](https://www.raspberrypi.org/forums) are the best place to ask it.
+-
+-**Describe the bug**
+-Add a clear and concise description of what you think the bug is.
+-
+-**To reproduce**
+-List the steps required to reproduce the issue.
+-
+-**Expected behaviour**
+-Add a clear and concise description of what you expected to happen.
+-
+-**Actual behaviour**
+-Add a clear and concise description of what actually happened.
+-
+-**System**
+- Copy and paste the results of the raspinfo command in to this section. Alternatively, copy and paste a pastebin link, or add answers to the following questions:
+-
+-* Which model of Raspberry Pi? e.g. Pi3B+, PiZeroW
+-* Which OS and version (`cat /etc/rpi-issue`)?
+-* Which firmware version (`vcgencmd version`)?
+-* Which kernel version (`uname -a`)?
+-
+-**Logs**
+-If applicable, add the relevant output from `dmesg` or similar.
+-
+-**Additional context**
+-Add any other relevant context for the problem.
+--- /dev/null
++++ b/.github/ISSUE_TEMPLATE/bug_report.yml
+@@ -0,0 +1,91 @@
++name: "Bug report"
++description: Create a report to help us fix your issue
++body:
++- type: markdown
++  attributes:
++    value: |
++      **Is this the right place for my bug report?**
++      This repository contains the Linux kernel used on the Raspberry Pi.
++      If you believe that the issue you are seeing is kernel-related, this is the right place.
++      If not, we have other repositories for the GPU firmware at [github.com/raspberrypi/firmware](https://github.com/raspberrypi/firmware) and Raspberry Pi userland applications at [github.com/raspberrypi/userland](https://github.com/raspberrypi/userland).
++      
++      If you have problems with the Raspbian distribution packages, report them in the [github.com/RPi-Distro/repo](https://github.com/RPi-Distro/repo).
++      If you simply have a question, then [the Raspberry Pi forums](https://www.raspberrypi.org/forums) are the best place to ask it.
++
++- type: textarea
++  id: description
++  attributes:
++    label: Describe the bug
++    description: |
++      Add a clear and concise description of what you think the bug is.
++  validations:
++    required: true
++
++- type: textarea
++  id: reproduce
++  attributes:
++    label: Steps to reproduce the behaviour
++    description: |
++      List the steps required to reproduce the issue.
++  validations:
++    required: true
++
++- type: dropdown
++  id: model
++  attributes:
++    label: Device (s)
++    description: On which device you are facing the bug?
++    multiple: true
++    options:
++      - Raspberry Pi Zero
++      - Raspberry Pi Zero W / WH
++      - Raspberry Pi Zero 2 W
++      - Raspberry Pi 1 Mod. A
++      - Raspberry Pi 1 Mod. A+
++      - Raspberry Pi 1 Mod. B
++      - Raspberry Pi 1 Mod. B+
++      - Raspberry Pi 2 Mod. B
++      - Raspberry Pi 2 Mod. B v1.2
++      - Raspberry Pi 3 Mod. A+
++      - Raspberry Pi 3 Mod. B
++      - Raspberry Pi 3 Mod. B+
++      - Raspberry Pi 4 Mod. B
++      - Raspberry Pi 400
++      - Raspberry Pi CM1
++      - Raspberry Pi CM3
++      - Raspberry Pi CM3 Lite
++      - Raspberry Pi CM3+
++      - Raspberry Pi CM3+ Lite
++      - Raspberry Pi CM4
++      - Raspberry Pi CM4 Lite
++      - Other
++  validations:
++    required: true
++
++- type: textarea
++  id: system
++  attributes:
++    label: System
++    description: |
++      Copy and paste the results of the raspinfo command in to this section.
++      Alternatively, copy and paste a pastebin link, or add answers to the following questions:
++      * Which OS and version (`cat /etc/rpi-issue`)?
++      * Which firmware version (`vcgencmd version`)?
++      * Which kernel version (`uname -a`)?
++  validations:
++    required: true
++
++- type: textarea
++  id: logs
++  attributes:
++    label: Logs
++    description: |
++      If applicable, add the relevant output from `dmesg` or similar.
++
++- type: textarea
++  id: additional
++  attributes:
++    label: Additional context
++    description: |
++      Add any other relevant context for the problem.
++
+--- /dev/null
++++ b/.github/ISSUE_TEMPLATE/config.yml
+@@ -0,0 +1,9 @@
++blank_issues_enabled: false
++contact_links:
++  - name: "⛔ Question"
++    url: https://www.raspberrypi.org/forums
++    about: "Please do not use GitHub for asking questions. If you simply have a question, then the Raspberry Pi forums are the best place to ask it. Thanks in advance for helping us keep the issue tracker clean!"
++  - name: "⛔ Problems with the Raspbian distribution packages"
++    url: https://github.com/RPi-Distro/repo
++    about: "If you have problems with the Raspbian distribution packages, please report them in the github.com/RPi-Distro/repo."
++
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0663-bcm2835-v4l2-isp-Add-missing-lock-initialization.patch b/root/target/linux/bcm27xx/patches-5.15/950-0663-bcm2835-v4l2-isp-Add-missing-lock-initialization.patch
new file mode 100644
index 00000000..17708336
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0663-bcm2835-v4l2-isp-Add-missing-lock-initialization.patch
@@ -0,0 +1,51 @@
+From bf3850f999ebe4a149c0a3b1f54d409096364bc3 Mon Sep 17 00:00:00 2001
+From: Padmanabha Srinivasaiah <treasure4paddy@gmail.com>
+Date: Thu, 30 Dec 2021 21:45:10 +0100
+Subject: [PATCH 663/828] bcm2835-v4l2-isp: Add missing lock initialization
+
+ISP device allocation is dynamic hence the locks too.
+struct mutex queue_lock is not initialized which result in bug.
+
+Fixing same by initializing it.
+
+[   29.847138] INFO: trying to register non-static key.
+[   29.847156] The code is fine but needs lockdep annotation, or maybe
+[   29.847159] you didn't initialize this object before use?
+[   29.847161] turning off the locking correctness validator.
+[   29.847167] CPU: 1 PID: 343 Comm: v4l_id Tainted: G         C        5.15.11-rt24-v8+ #8
+[   29.847187] Hardware name: Raspberry Pi 4 Model B Rev 1.4 (DT)
+[   29.847194] Call trace:
+[   29.847197]  dump_backtrace+0x0/0x1b8
+[   29.847227]  show_stack+0x20/0x30
+[   29.847240]  dump_stack_lvl+0x8c/0xb8
+[   29.847254]  dump_stack+0x18/0x34
+[   29.847263]  register_lock_class+0x494/0x4a0
+[   29.847278]  __lock_acquire+0x80/0x1680
+[   29.847289]  lock_acquire+0x214/0x3a0
+[   29.847300]  mutex_lock_nested+0x70/0xc8
+[   29.847312]  _vb2_fop_release+0x3c/0xa8 [videobuf2_v4l2]
+[   29.847346]  vb2_fop_release+0x34/0x60 [videobuf2_v4l2]
+[   29.847367]  v4l2_release+0xc8/0x108 [videodev]
+[   29.847453]  __fput+0x8c/0x258
+[   29.847476]  ____fput+0x18/0x28
+[   29.847487]  task_work_run+0x98/0x180
+[   29.847502]  do_notify_resume+0x228/0x3f8
+[   29.847515]  el0_svc+0xec/0xf0
+[   29.847523]  el0t_64_sync_handler+0x90/0xb8
+[   29.847531]  el0t_64_sync+0x180/0x184
+
+Signed-off-by: Padmanabha Srinivasaiah <treasure4paddy@gmail.com>
+---
+ drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
++++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
+@@ -1294,6 +1294,7 @@ static int register_node(struct bcm2835_
+ 	int ret;
+ 
+ 	mutex_init(&node->lock);
++	mutex_init(&node->queue_lock);
+ 
+ 	node->dev = dev;
+ 	vfd = &node->vfd;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0664-overlays-Add-overlay-for-Azoteq-IQS550.patch b/root/target/linux/bcm27xx/patches-5.15/950-0664-overlays-Add-overlay-for-Azoteq-IQS550.patch
new file mode 100644
index 00000000..08514d29
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0664-overlays-Add-overlay-for-Azoteq-IQS550.patch
@@ -0,0 +1,97 @@
+From 10908954c1158ab059c639f73fb132f338ee7717 Mon Sep 17 00:00:00 2001
+From: Jeff LaBundy <jeff@labundy.com>
+Date: Mon, 28 Jan 2019 23:11:47 -0600
+Subject: [PATCH 664/828] overlays: Add overlay for Azoteq IQS550
+
+This patch adds a device tree overlay for the Azoteq IQS550
+trackpad/touchscreen controller.
+
+Signed-off-by: Jeff LaBundy <jeff@labundy.com>
+---
+ arch/arm/boot/dts/overlays/Makefile           |  1 +
+ arch/arm/boot/dts/overlays/README             | 13 ++++++
+ arch/arm/boot/dts/overlays/iqs550-overlay.dts | 46 +++++++++++++++++++
+ 3 files changed, 60 insertions(+)
+ create mode 100644 arch/arm/boot/dts/overlays/iqs550-overlay.dts
+
+--- a/arch/arm/boot/dts/overlays/Makefile
++++ b/arch/arm/boot/dts/overlays/Makefile
+@@ -106,6 +106,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
+ 	iqaudio-dac.dtbo \
+ 	iqaudio-dacplus.dtbo \
+ 	iqaudio-digi-wm8804-audio.dtbo \
++	iqs550.dtbo \
+ 	irs1125.dtbo \
+ 	jedec-spi-nor.dtbo \
+ 	justboom-both.dtbo \
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -1991,6 +1991,19 @@ Params: card_name               Override
+                                 dai stream name.
+ 
+ 
++Name:   iqs550
++Info:   Enables I2C connected Azoteq IQS550 trackpad/touchscreen controller
++        using GPIO 4 (pin 7 on GPIO header) for interrupt.
++Load:   dtoverlay=iqs550,<param>=<val>
++Params: interrupt               GPIO used for interrupt (default 4)
++        reset                   GPIO used for reset (optional)
++        sizex                   Touchscreen size x (default 800)
++        sizey                   Touchscreen size y (default 480)
++        invx                    Touchscreen inverted x axis
++        invy                    Touchscreen inverted y axis
++        swapxy                  Touchscreen swapped x y axis
++
++
+ Name:   irs1125
+ Info:   Infineon irs1125 TOF camera module.
+         Uses Unicam 1, which is the standard camera connector on most Pi
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/iqs550-overlay.dts
+@@ -0,0 +1,46 @@
++// SPDX-License-Identifier: GPL-2.0-or-later
++// Definitions for Azoteq IQS550 trackpad/touchscreen controller
++/dts-v1/;
++/plugin/;
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/interrupt-controller/irq.h>
++
++/ {
++	compatible = "brcm,bcm2835";
++
++	fragment@0 {
++		target = <&i2c1>;
++		__overlay__ {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			status = "okay";
++
++			iqs550: iqs550@74 {
++				compatible = "azoteq,iqs550";
++				reg = <0x74>;
++				interrupt-parent = <&gpio>;
++				interrupts = <4 IRQ_TYPE_LEVEL_HIGH>;
++				touchscreen-size-x = <800>;
++				touchscreen-size-y = <480>;
++			};
++		};
++	};
++
++	fragment@1 {
++		target = <&iqs550>;
++		iqs550_reset: __dormant__ {
++			reset-gpios = <&gpio 255 (GPIO_ACTIVE_LOW |
++						  GPIO_PUSH_PULL)>;
++		};
++	};
++
++	__overrides__ {
++		interrupt = <&iqs550>,"interrupts:0";
++		reset = <0>,"+1", <&iqs550_reset>,"reset-gpios:4";
++		sizex = <&iqs550>,"touchscreen-size-x:0";
++		sizey = <&iqs550>,"touchscreen-size-y:0";
++		invx = <&iqs550>,"touchscreen-inverted-x?";
++		invy = <&iqs550>,"touchscreen-inverted-y?";
++		swapxy = <&iqs550>,"touchscreen-swapped-x-y?";
++	};
++};
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0665-dtoverlays-Add-backlight-gpio-parameter-to-vc4-kms-d.patch b/root/target/linux/bcm27xx/patches-5.15/950-0665-dtoverlays-Add-backlight-gpio-parameter-to-vc4-kms-d.patch
new file mode 100644
index 00000000..873a5a4e
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0665-dtoverlays-Add-backlight-gpio-parameter-to-vc4-kms-d.patch
@@ -0,0 +1,60 @@
+From 23e71f5c53444f240a039572a378ff1135445e40 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Fri, 7 Jan 2022 11:12:08 +0000
+Subject: [PATCH 665/828] dtoverlays: Add backlight-gpio parameter to
+ vc4-kms-dpi-generic
+
+To allow for the cases where a simple panel does have a GPIO
+controlled backlight. Defaults to having no backlight defined.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/README             |  2 ++
+ .../overlays/vc4-kms-dpi-generic-overlay.dts  | 19 +++++++++++++++++++
+ 2 files changed, 21 insertions(+)
+
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -3638,6 +3638,8 @@ Params: clock-frequency         Display
+         rgb888                  Change to RGB888 output on GPIOs 0-27
+         bus-format              Override the bus format for a MEDIA_BUS_FMT_*
+                                 value. NB also overridden by rgbXXX overrides.
++        backlight-gpio          Defines a GPIO to be used for backlight control
++                                (default of none).
+ 
+ 
+ Name:   vc4-kms-dsi-7inch
+--- a/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
+@@ -63,6 +63,23 @@
+ 		};
+ 	};
+ 
++	fragment@2 {
++		target = <&panel>;
++		__dormant__  {
++			backlight = <&backlight>;
++		};
++	};
++
++	fragment@3 {
++		target-path = "/";
++		__dormant__  {
++			backlight: backlight {
++				compatible = "gpio-backlight";
++				gpios = <&gpio 255 GPIO_ACTIVE_HIGH>;
++			};
++		};
++	};
++
+ 	__overrides__ {
+ 		clock-frequency = <&timing>, "clock-frequency:0";
+ 		hactive = <&timing>, "hactive:0";
+@@ -88,5 +105,7 @@
+ 		rgb888 = <&panel>, "bus-format:0=0x100a",
+ 			<&dpi_node>, "pinctrl-0:0=",<&dpi_gpio0>;
+ 		bus-format = <&panel>, "bus-format:0";
++		backlight-gpio = <0>, "+2+3",
++			<&backlight>, "gpios:4";
+ 	};
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0666-drm-vc4-Add-alpha_blend_mode-property-to-each-plane.patch b/root/target/linux/bcm27xx/patches-5.15/950-0666-drm-vc4-Add-alpha_blend_mode-property-to-each-plane.patch
new file mode 100644
index 00000000..22756171
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0666-drm-vc4-Add-alpha_blend_mode-property-to-each-plane.patch
@@ -0,0 +1,108 @@
+From 0a8c22a623e9b07f99dee23bfca18d3d552ddd62 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Sat, 8 Jan 2022 13:24:10 +0000
+Subject: [PATCH 666/828] drm/vc4: Add alpha_blend_mode property to each plane.
+
+Move from only supporting the default of pre-multiplied
+alpha to supporting user specified blend mode using the
+standardised property.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_plane.c | 62 ++++++++++++++++++++++++++-------
+ 1 file changed, 49 insertions(+), 13 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_plane.c
++++ b/drivers/gpu/drm/vc4/vc4_plane.c
+@@ -663,6 +663,48 @@ static const u32 colorspace_coeffs[2][DR
+ 	}
+ };
+ 
++static u32 vc4_hvs4_get_alpha_blend_mode(struct drm_plane_state *state)
++{
++	if (!state->fb->format->has_alpha)
++		return VC4_SET_FIELD(SCALER_POS2_ALPHA_MODE_FIXED,
++				     SCALER_POS2_ALPHA_MODE);
++
++	switch (state->pixel_blend_mode) {
++	case DRM_MODE_BLEND_PIXEL_NONE:
++		return VC4_SET_FIELD(SCALER_POS2_ALPHA_MODE_FIXED,
++				     SCALER_POS2_ALPHA_MODE);
++	default:
++	case DRM_MODE_BLEND_PREMULTI:
++		return VC4_SET_FIELD(SCALER_POS2_ALPHA_MODE_PIPELINE,
++				     SCALER_POS2_ALPHA_MODE) |
++			SCALER_POS2_ALPHA_PREMULT;
++	case DRM_MODE_BLEND_COVERAGE:
++		return VC4_SET_FIELD(SCALER_POS2_ALPHA_MODE_PIPELINE,
++				     SCALER_POS2_ALPHA_MODE);
++	}
++}
++
++static u32 vc4_hvs5_get_alpha_blend_mode(struct drm_plane_state *state)
++{
++	if (!state->fb->format->has_alpha)
++		return VC4_SET_FIELD(SCALER5_CTL2_ALPHA_MODE_FIXED,
++				     SCALER5_CTL2_ALPHA_MODE);
++
++	switch (state->pixel_blend_mode) {
++	case DRM_MODE_BLEND_PIXEL_NONE:
++		return VC4_SET_FIELD(SCALER5_CTL2_ALPHA_MODE_FIXED,
++				     SCALER5_CTL2_ALPHA_MODE);
++	default:
++	case DRM_MODE_BLEND_PREMULTI:
++		return VC4_SET_FIELD(SCALER5_CTL2_ALPHA_MODE_PIPELINE,
++				     SCALER5_CTL2_ALPHA_MODE) |
++			SCALER5_CTL2_ALPHA_PREMULT;
++	case DRM_MODE_BLEND_COVERAGE:
++		return VC4_SET_FIELD(SCALER5_CTL2_ALPHA_MODE_PIPELINE,
++				     SCALER5_CTL2_ALPHA_MODE);
++	}
++}
++
+ /* Writes out a full display list for an active plane to the plane's
+  * private dlist state.
+  */
+@@ -945,13 +987,8 @@ static int vc4_plane_mode_set(struct drm
+ 		/* Position Word 2: Source Image Size, Alpha */
+ 		vc4_state->pos2_offset = vc4_state->dlist_count;
+ 		vc4_dlist_write(vc4_state,
+-				VC4_SET_FIELD(fb->format->has_alpha ?
+-					      SCALER_POS2_ALPHA_MODE_PIPELINE :
+-					      SCALER_POS2_ALPHA_MODE_FIXED,
+-					      SCALER_POS2_ALPHA_MODE) |
+ 				(mix_plane_alpha ? SCALER_POS2_ALPHA_MIX : 0) |
+-				(fb->format->has_alpha ?
+-						SCALER_POS2_ALPHA_PREMULT : 0) |
++				vc4_hvs4_get_alpha_blend_mode(state) |
+ 				VC4_SET_FIELD(vc4_state->src_w[0],
+ 					      SCALER_POS2_WIDTH) |
+ 				VC4_SET_FIELD(vc4_state->src_h[0],
+@@ -996,14 +1033,9 @@ static int vc4_plane_mode_set(struct drm
+ 		vc4_dlist_write(vc4_state,
+ 				VC4_SET_FIELD(state->alpha >> 4,
+ 					      SCALER5_CTL2_ALPHA) |
+-				(fb->format->has_alpha ?
+-					SCALER5_CTL2_ALPHA_PREMULT : 0) |
++				vc4_hvs5_get_alpha_blend_mode(state) |
+ 				(mix_plane_alpha ?
+-					SCALER5_CTL2_ALPHA_MIX : 0) |
+-				VC4_SET_FIELD(fb->format->has_alpha ?
+-				      SCALER5_CTL2_ALPHA_MODE_PIPELINE :
+-				      SCALER5_CTL2_ALPHA_MODE_FIXED,
+-				      SCALER5_CTL2_ALPHA_MODE)
++					SCALER5_CTL2_ALPHA_MIX : 0)
+ 			       );
+ 
+ 		/* Position Word 1: Scaled Image Dimensions. */
+@@ -1493,6 +1525,10 @@ struct drm_plane *vc4_plane_init(struct
+ 	drm_plane_helper_add(plane, &vc4_plane_helper_funcs);
+ 
+ 	drm_plane_create_alpha_property(plane);
++	drm_plane_create_blend_mode_property(plane,
++					     BIT(DRM_MODE_BLEND_PIXEL_NONE) |
++					     BIT(DRM_MODE_BLEND_PREMULTI) |
++					     BIT(DRM_MODE_BLEND_COVERAGE));
+ 	drm_plane_create_rotation_property(plane, DRM_MODE_ROTATE_0,
+ 					   DRM_MODE_ROTATE_0 |
+ 					   DRM_MODE_ROTATE_180 |
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0667-arm-Fix-custom-rpi-__memset32-and-__memset64.patch b/root/target/linux/bcm27xx/patches-5.15/950-0667-arm-Fix-custom-rpi-__memset32-and-__memset64.patch
new file mode 100644
index 00000000..e00b22d0
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0667-arm-Fix-custom-rpi-__memset32-and-__memset64.patch
@@ -0,0 +1,57 @@
+From 23078ccb0198491fc429ae7191d359b889addd28 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Tue, 11 Jan 2022 10:48:30 +0000
+Subject: [PATCH 667/828] arm: Fix custom rpi __memset32 and __memset64
+
+See: https://github.com/raspberrypi/linux/issues/4798
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/lib/memset_rpi.S | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+--- a/arch/arm/lib/memset_rpi.S
++++ b/arch/arm/lib/memset_rpi.S
+@@ -53,8 +53,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ ENTRY(mmioset)
+ ENTRY(memset)
+ ENTRY(__memset)
+-ENTRY(__memset32)
+-ENTRY(__memset64)
+ 
+         S       .req    a1
+         DAT0    .req    a2
+@@ -64,10 +62,14 @@ ENTRY(__memset64)
+         DAT3    .req    lr
+ 
+         orr     DAT0, DAT0, DAT0, lsl #8
+-        push    {S, lr}
+         orr     DAT0, DAT0, DAT0, lsl #16
++
++ENTRY(__memset32)
+         mov     DAT1, DAT0
+ 
++ENTRY(__memset64)
++        push    {S, lr}
++
+         /* See if we're guaranteed to have at least one 16-byte aligned 16-byte write */
+         cmp     N, #31
+         blo     170f
+@@ -89,7 +91,7 @@ ENTRY(__memset64)
+         stmcsia S!, {DAT0, DAT1}
+ 164:    /* Delayed set up of DAT2 and DAT3 so we could use them as scratch registers above */
+         mov     DAT2, DAT0
+-        mov     DAT3, DAT0
++        mov     DAT3, DAT1
+         /* Now the inner loop of 16-byte stores */
+ 165:    stmia   S!, {DAT0, DAT1, DAT2, DAT3}
+         subs    N, N, #16
+@@ -105,7 +107,7 @@ ENTRY(__memset64)
+ 
+ 170:    /* Short case */
+         mov     DAT2, DAT0
+-        mov     DAT3, DAT0
++        mov     DAT3, DAT1
+         tst     S, #3
+         beq     174f
+ 172:    subs    N, N, #1
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0668-overlays-Add-vl805-overlay.patch b/root/target/linux/bcm27xx/patches-5.15/950-0668-overlays-Add-vl805-overlay.patch
new file mode 100644
index 00000000..428e7c33
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0668-overlays-Add-vl805-overlay.patch
@@ -0,0 +1,72 @@
+From 474e3d6cd2ef9c2058da1c5c290366b896384677 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Wed, 12 Jan 2022 12:48:53 +0000
+Subject: [PATCH 668/828] overlays: Add vl805 overlay
+
+With the automatic VL805 support being removed from the standard
+CM4 dtb (since most CM4 carriers don't have a VL805), retain support
+on those that do by creating a "vl805" overlay that restores the
+deleted "usb@0,0" node.
+
+The "vl805" overlay will be loaded automatically (after an upcoming
+firmware update) on CM4 boards where the EEPROM config includes the
+setting VL805=1.
+
+See: https://forums.raspberrypi.com/viewtopic.php?t=326088
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/Makefile          |  1 +
+ arch/arm/boot/dts/overlays/README            |  8 ++++++++
+ arch/arm/boot/dts/overlays/vl805-overlay.dts | 18 ++++++++++++++++++
+ 3 files changed, 27 insertions(+)
+ create mode 100644 arch/arm/boot/dts/overlays/vl805-overlay.dts
+
+--- a/arch/arm/boot/dts/overlays/Makefile
++++ b/arch/arm/boot/dts/overlays/Makefile
+@@ -243,6 +243,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
+ 	vc4-kms-v3d-pi4.dtbo \
+ 	vc4-kms-vga666.dtbo \
+ 	vga666.dtbo \
++	vl805.dtbo \
+ 	w1-gpio.dtbo \
+ 	w1-gpio-pullup.dtbo \
+ 	w5500.dtbo \
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -3744,6 +3744,14 @@ Load:   dtoverlay=vga666
+ Params: <None>
+ 
+ 
++Name:   vl805
++Info:   Overlay to enable a VIA VL805 USB3 controller on CM4 carriers
++        Will be loaded automatically by up-to-date firmware if "VL805=1" is
++        set in the EEPROM config.
++Load:   dtoverlay=vl805
++Params: <None>
++
++
+ Name:   w1-gpio
+ Info:   Configures the w1-gpio Onewire interface module.
+         Use this overlay if you *don't* need a GPIO to drive an external pullup.
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/vl805-overlay.dts
+@@ -0,0 +1,18 @@
++/dts-v1/;
++/plugin/;
++
++#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
++
++/ {
++	compatible = "brcm,bcm2711";
++
++	fragment@0 {
++		target-path = "pcie0/pci@0,0";
++		__overlay__ {
++			usb@0,0 {
++				reg = <0 0 0 0 0>;
++				resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
++			};
++		};
++	};
++};
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0669-arm-Fix-annoying-.eh_frame-section-warnings.patch b/root/target/linux/bcm27xx/patches-5.15/950-0669-arm-Fix-annoying-.eh_frame-section-warnings.patch
new file mode 100644
index 00000000..240dd0a2
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0669-arm-Fix-annoying-.eh_frame-section-warnings.patch
@@ -0,0 +1,123 @@
+From 50e88e053db650b419228c8587a3e8f4c46d2d27 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Wed, 12 Jan 2022 17:27:03 +0000
+Subject: [PATCH 669/828] arm: Fix annoying .eh_frame section warnings
+
+Replace the cfi directives with the UNWIND equivalents. This prevents
+the .eh_frame section from being created, eliminating the warnings.
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/lib/memcpy_rpi.S  |  2 ++
+ arch/arm/lib/memcpymove.h  | 45 ++++++++++++--------------------------
+ arch/arm/lib/memmove_rpi.S |  2 ++
+ 3 files changed, 18 insertions(+), 31 deletions(-)
+
+--- a/arch/arm/lib/memcpy_rpi.S
++++ b/arch/arm/lib/memcpy_rpi.S
+@@ -27,6 +27,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ */
+ 
+ #include <linux/linkage.h>
++#include <asm/assembler.h>
++#include <asm/unwind.h>
+ #include "arm-mem.h"
+ #include "memcpymove.h"
+ 
+--- a/arch/arm/lib/memcpymove.h
++++ b/arch/arm/lib/memcpymove.h
+@@ -280,6 +280,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ 199:
+         pop     {DAT3, DAT4, DAT5, DAT6, DAT7}
+         pop     {D, DAT1, DAT2, pc}
++        UNWIND( .fnend )
+ .endm
+ 
+ .macro memcpy_medium_inner_loop  backwards, align
+@@ -358,19 +359,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+         LAST    .req    ip
+         OFF     .req    lr
+ 
+-        .cfi_startproc
++        UNWIND( .fnstart )
+ 
+         push    {D, DAT1, DAT2, lr}
++        UNWIND( .fnend )
+ 
+-        .cfi_def_cfa_offset 16
+-        .cfi_rel_offset D, 0
+-        .cfi_undefined  S
+-        .cfi_undefined  N
+-        .cfi_undefined  DAT0
+-        .cfi_rel_offset DAT1, 4
+-        .cfi_rel_offset DAT2, 8
+-        .cfi_undefined  LAST
+-        .cfi_rel_offset lr, 12
++        UNWIND( .fnstart )
++        UNWIND( .save {D, DAT1, DAT2, lr} )
+ 
+  .if backwards
+         add     D, D, N
+@@ -386,17 +381,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ 
+         /* Long case */
+         push    {DAT3, DAT4, DAT5, DAT6, DAT7}
++        UNWIND( .fnend )
+ 
+-        .cfi_def_cfa_offset 36
+-        .cfi_rel_offset D, 20
+-        .cfi_rel_offset DAT1, 24
+-        .cfi_rel_offset DAT2, 28
+-        .cfi_rel_offset DAT3, 0
+-        .cfi_rel_offset DAT4, 4
+-        .cfi_rel_offset DAT5, 8
+-        .cfi_rel_offset DAT6, 12
+-        .cfi_rel_offset DAT7, 16
+-        .cfi_rel_offset lr, 32
++        UNWIND( .fnstart )
++        UNWIND( .save {D, DAT1, DAT2, lr} )
++        UNWIND( .save {DAT3, DAT4, DAT5, DAT6, DAT7} )
+ 
+         /* Adjust N so that the decrement instruction can also test for
+          * inner loop termination. We want it to stop when there are
+@@ -436,16 +425,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ 156:    memcpy_long_inner_loop  backwards, 2
+ 157:    memcpy_long_inner_loop  backwards, 3
+ 
+-        .cfi_def_cfa_offset 16
+-        .cfi_rel_offset D, 0
+-        .cfi_rel_offset DAT1, 4
+-        .cfi_rel_offset DAT2, 8
+-        .cfi_same_value DAT3
+-        .cfi_same_value DAT4
+-        .cfi_same_value DAT5
+-        .cfi_same_value DAT6
+-        .cfi_same_value DAT7
+-        .cfi_rel_offset lr, 12
++        UNWIND( .fnend )
++
++        UNWIND( .fnstart )
++        UNWIND( .save {D, DAT1, DAT2, lr} )
+ 
+ 160:    /* Medium case */
+         preload_all  backwards, 0, 0, S, N, DAT2, OFF
+@@ -488,7 +471,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+         memcpy_short_inner_loop  backwards, 0
+ 140:    memcpy_short_inner_loop  backwards, 1
+ 
+-        .cfi_endproc
++        UNWIND( .fnend )
+ 
+         .unreq  D
+         .unreq  S
+--- a/arch/arm/lib/memmove_rpi.S
++++ b/arch/arm/lib/memmove_rpi.S
+@@ -27,6 +27,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ */
+ 
+ #include <linux/linkage.h>
++#include <asm/assembler.h>
++#include <asm/unwind.h>
+ #include "arm-mem.h"
+ #include "memcpymove.h"
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0670-drm-vc4-Disable-Gamma-control-on-HVS5-due-to-issues-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0670-drm-vc4-Disable-Gamma-control-on-HVS5-due-to-issues-.patch
new file mode 100644
index 00000000..c15655f2
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0670-drm-vc4-Disable-Gamma-control-on-HVS5-due-to-issues-.patch
@@ -0,0 +1,36 @@
+From c1cb7c112dc7740e44f39deba04af288f8e8b22d Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 13 Jan 2022 11:30:42 +0000
+Subject: [PATCH 670/828] drm/vc4: Disable Gamma control on HVS5 due to issues
+ writing the table
+
+Still under investigation, but the conditions under which the HVS
+will accept values written to the gamma PWL are not straightforward.
+
+Disable gamma on HVS5 again until it can be resolved to avoid
+gamma being enabled with an incorrect table.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -1182,15 +1182,9 @@ int vc4_crtc_init(struct drm_device *drm
+ 
+ 	if (!vc4->hvs->hvs5) {
+ 		drm_mode_crtc_set_gamma_size(crtc, ARRAY_SIZE(vc4_crtc->lut_r));
+-	} else {
+-		/* This is a lie for hvs5 which uses a 16 point PWL, but it
+-		 * allows for something smarter than just 16 linearly spaced
+-		 * segments. Conversion is done in vc5_hvs_update_gamma_lut.
+-		 */
+-		drm_mode_crtc_set_gamma_size(crtc, 256);
++		drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size);
+ 	}
+ 
+-	drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size);
+ 
+ 	if (!vc4->hvs->hvs5) {
+ 		/* We support CTM, but only for one CRTC at a time. It's therefore
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0671-drm-vc4-hdmi-Fix-clock-value-used-for-validating-hdm.patch b/root/target/linux/bcm27xx/patches-5.15/950-0671-drm-vc4-hdmi-Fix-clock-value-used-for-validating-hdm.patch
new file mode 100644
index 00000000..6d06f35e
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0671-drm-vc4-hdmi-Fix-clock-value-used-for-validating-hdm.patch
@@ -0,0 +1,29 @@
+From 29aaf9c69666ae04e87c989b4b4e71b859766096 Mon Sep 17 00:00:00 2001
+From: Dom Cobley <popcornmix@gmail.com>
+Date: Thu, 13 Jan 2022 15:47:23 +0000
+Subject: [PATCH 671/828] drm/vc4: hdmi: Fix clock value used for validating
+ hdmi modes
+
+We are using mode->crt_clock here which is filled by drm_mode_set_crtcinfo()
+which is called right after .mode_valid.
+
+Use mode->clock which is valid here.
+
+Fixes: 624d93a4f0 ("drm/vc4: hdmi: Move clock calculation into its own function")
+
+Signed-off-by: Dom Cobley <popcornmix@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -1495,7 +1495,7 @@ vc4_hdmi_encoder_compute_mode_clock(cons
+ 				    unsigned int bpc,
+ 				    enum vc4_hdmi_output_format fmt)
+ {
+-	unsigned long long clock = mode->crtc_clock * 1000;
++	unsigned long long clock = mode->clock * 1000;
+ 
+ 	if (mode->flags & DRM_MODE_FLAG_DBLCLK)
+ 		clock = clock * 2;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0672-ARM-dts-Remove-VL805-USB-node-from-CM4-dts.patch b/root/target/linux/bcm27xx/patches-5.15/950-0672-ARM-dts-Remove-VL805-USB-node-from-CM4-dts.patch
new file mode 100644
index 00000000..fb3e5011
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0672-ARM-dts-Remove-VL805-USB-node-from-CM4-dts.patch
@@ -0,0 +1,32 @@
+From ba964231bbe24cdf4926a3c95641c36150fd3469 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Wed, 12 Jan 2022 14:39:46 +0000
+Subject: [PATCH 672/828] ARM: dts: Remove VL805 USB node from CM4 dts
+
+Neither the CM4 module nor the CM4IO board have a VL805 USB3
+controller. The existing "usb@0,0" node is a hangover from the
+Pi 4 dts; delete it. An up-to-date firmware will automatically load
+the vl805 overlay on CM4s with VL805=1 in the EEPROM config, ensuring
+that the firmware is notified of any PCIe reset.
+
+See: https://forums.raspberrypi.com/viewtopic.php?t=326088
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 5 -----
+ 1 file changed, 5 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
+@@ -237,11 +237,6 @@
+ 		ranges;
+ 
+ 		reg = <0 0 0 0 0>;
+-
+-		usb@0,0 {
+-			reg = <0 0 0 0 0>;
+-			resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
+-		};
+ 	};
+ };
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0673-mfd-simple-mfd-i2c-Add-configuration-for-RPi-POE-HAT.patch b/root/target/linux/bcm27xx/patches-5.15/950-0673-mfd-simple-mfd-i2c-Add-configuration-for-RPi-POE-HAT.patch
new file mode 100644
index 00000000..134aff56
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0673-mfd-simple-mfd-i2c-Add-configuration-for-RPi-POE-HAT.patch
@@ -0,0 +1,63 @@
+From 83de4dd78a05dbd5ba086ec3fece58425e5e0140 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 19 Jan 2022 17:22:57 +0000
+Subject: [PATCH 673/828] mfd: simple-mfd-i2c: Add configuration for RPi POE
+ HAT
+
+The Raspbery Pi PoE+ HAT exposes a fan controller and power
+supply status reporting via a single I2C address.
+
+Create an MFD device that allows loading of the relevant
+sub-drivers, with a shared I2C regmap.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/mfd/Kconfig          | 10 ++++++++++
+ drivers/mfd/simple-mfd-i2c.c | 10 ++++++++++
+ 2 files changed, 20 insertions(+)
+
+--- a/drivers/mfd/Kconfig
++++ b/drivers/mfd/Kconfig
+@@ -1093,6 +1093,16 @@ config MFD_SPMI_PMIC
+ 	  Say M here if you want to include support for the SPMI PMIC
+ 	  series as a module.  The module will be called "qcom-spmi-pmic".
+ 
++config MFD_RASPBERRYPI_POE_HAT
++	tristate "Raspberry Pi PoE HAT MFD"
++	depends on I2C
++	select MFD_SIMPLE_MFD_I2C
++	help
++	  This module supports the PWM fan controller found on the Raspberry Pi
++	  POE and POE+ HAT boards, and the power supply driver on the POE+ HAT.
++	  (Functionally it relies on MFD_SIMPLE_MFD_I2C to provide the framework
++	  that loads the child drivers).
++
+ config MFD_RDC321X
+ 	tristate "RDC R-321x southbridge"
+ 	select MFD_CORE
+--- a/drivers/mfd/simple-mfd-i2c.c
++++ b/drivers/mfd/simple-mfd-i2c.c
+@@ -29,6 +29,15 @@ static const struct regmap_config regmap
+ 	.val_bits = 8,
+ };
+ 
++static const struct regmap_config regmap_config_16r_8v = {
++	.reg_bits = 16,
++	.val_bits = 8,
++};
++
++static const struct simple_mfd_data rpi_poe_core = {
++	.regmap_config = &regmap_config_16r_8v,
++};
++
+ static int simple_mfd_i2c_probe(struct i2c_client *i2c)
+ {
+ 	const struct simple_mfd_data *simple_mfd_data;
+@@ -64,6 +73,7 @@ static int simple_mfd_i2c_probe(struct i
+ 
+ static const struct of_device_id simple_mfd_i2c_of_match[] = {
+ 	{ .compatible = "kontron,sl28cpld" },
++	{ .compatible = "raspberrypi,poe-core", &rpi_poe_core },
+ 	{}
+ };
+ MODULE_DEVICE_TABLE(of, simple_mfd_i2c_of_match);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0674-pwm-raspberrypi-poe-Add-option-of-being-created-by-M.patch b/root/target/linux/bcm27xx/patches-5.15/950-0674-pwm-raspberrypi-poe-Add-option-of-being-created-by-M.patch
new file mode 100644
index 00000000..566a7f40
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0674-pwm-raspberrypi-poe-Add-option-of-being-created-by-M.patch
@@ -0,0 +1,171 @@
+From 3b9597249e00599de3b7fb3cc1b209cf415517b1 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 19 Jan 2022 17:26:22 +0000
+Subject: [PATCH 674/828] pwm: raspberrypi-poe: Add option of being created by
+ MFD or FW
+
+The firmware can only use I2C0 if the kernel isn't, therefore
+with libcamera and DRM using it the PoE HAT fan control needs
+to move to the kernel.
+
+Add the option for the driver to be created by the PoE HAT core
+MFD driver, and use the I2C regmap that provides to control fan
+functions.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/pwm/pwm-raspberrypi-poe.c | 81 ++++++++++++++++++-------------
+ 1 file changed, 48 insertions(+), 33 deletions(-)
+
+--- a/drivers/pwm/pwm-raspberrypi-poe.c
++++ b/drivers/pwm/pwm-raspberrypi-poe.c
+@@ -16,6 +16,7 @@
+ #include <linux/of.h>
+ #include <linux/platform_device.h>
+ #include <linux/pwm.h>
++#include <linux/regmap.h>
+ 
+ #include <soc/bcm2835/raspberrypi-firmware.h>
+ #include <dt-bindings/pwm/raspberrypi,firmware-poe-pwm.h>
+@@ -27,6 +28,10 @@
+ 
+ struct raspberrypi_pwm {
+ 	struct rpi_firmware *firmware;
++
++	struct regmap *regmap;
++	u32 offset;
++
+ 	struct pwm_chip chip;
+ 	unsigned int duty_cycle;
+ };
+@@ -43,7 +48,7 @@ struct raspberrypi_pwm *raspberrypi_pwm_
+ 	return container_of(chip, struct raspberrypi_pwm, chip);
+ }
+ 
+-static int raspberrypi_pwm_set_property(struct rpi_firmware *firmware,
++static int raspberrypi_pwm_set_property(struct raspberrypi_pwm *pwm,
+ 					u32 reg, u32 val)
+ {
+ 	struct raspberrypi_pwm_prop msg = {
+@@ -52,17 +57,19 @@ static int raspberrypi_pwm_set_property(
+ 	};
+ 	int ret;
+ 
+-	ret = rpi_firmware_property(firmware, RPI_FIRMWARE_SET_POE_HAT_VAL,
+-				    &msg, sizeof(msg));
+-	if (ret)
+-		return ret;
+-	if (msg.ret)
+-		return -EIO;
++	if (pwm->firmware) {
++		ret = rpi_firmware_property(pwm->firmware, RPI_FIRMWARE_SET_POE_HAT_VAL,
++					    &msg, sizeof(msg));
++		if (!ret && msg.ret)
++			ret = -EIO;
++	} else {
++		ret = regmap_write(pwm->regmap, pwm->offset + reg, val);
++	}
+ 
+-	return 0;
++	return ret;
+ }
+ 
+-static int raspberrypi_pwm_get_property(struct rpi_firmware *firmware,
++static int raspberrypi_pwm_get_property(struct raspberrypi_pwm *pwm,
+ 					u32 reg, u32 *val)
+ {
+ 	struct raspberrypi_pwm_prop msg = {
+@@ -70,16 +77,17 @@ static int raspberrypi_pwm_get_property(
+ 	};
+ 	int ret;
+ 
+-	ret = rpi_firmware_property(firmware, RPI_FIRMWARE_GET_POE_HAT_VAL,
+-				    &msg, sizeof(msg));
+-	if (ret)
+-		return ret;
+-	if (msg.ret)
+-		return -EIO;
+-
+-	*val = le32_to_cpu(msg.val);
++	if (pwm->firmware) {
++		ret = rpi_firmware_property(pwm->firmware, RPI_FIRMWARE_GET_POE_HAT_VAL,
++					    &msg, sizeof(msg));
++		if (!ret && msg.ret)
++			ret = -EIO;
++		*val = le32_to_cpu(msg.val);
++	} else {
++		ret = regmap_read(pwm->regmap, pwm->offset + reg, val);
++	}
+ 
+-	return 0;
++	return ret;
+ }
+ 
+ static void raspberrypi_pwm_get_state(struct pwm_chip *chip,
+@@ -117,7 +125,7 @@ static int raspberrypi_pwm_apply(struct
+ 	if (duty_cycle == rpipwm->duty_cycle)
+ 		return 0;
+ 
+-	ret = raspberrypi_pwm_set_property(rpipwm->firmware, RPI_PWM_CUR_DUTY_REG,
++	ret = raspberrypi_pwm_set_property(rpipwm, RPI_PWM_CUR_DUTY_REG,
+ 					   duty_cycle);
+ 	if (ret) {
+ 		dev_err(chip->dev, "Failed to set duty cycle: %pe\n",
+@@ -144,29 +152,35 @@ static int raspberrypi_pwm_probe(struct
+ 	struct raspberrypi_pwm *rpipwm;
+ 	int ret;
+ 
+-	firmware_node = of_get_parent(dev->of_node);
+-	if (!firmware_node) {
+-		dev_err(dev, "Missing firmware node\n");
+-		return -ENOENT;
+-	}
+-
+-	firmware = devm_rpi_firmware_get(&pdev->dev, firmware_node);
+-	of_node_put(firmware_node);
+-	if (!firmware)
+-		return dev_err_probe(dev, -EPROBE_DEFER,
+-				     "Failed to get firmware handle\n");
+-
+ 	rpipwm = devm_kzalloc(&pdev->dev, sizeof(*rpipwm), GFP_KERNEL);
+ 	if (!rpipwm)
+ 		return -ENOMEM;
+ 
+-	rpipwm->firmware = firmware;
++	if (pdev->dev.parent)
++		rpipwm->regmap = dev_get_regmap(pdev->dev.parent, NULL);
++
++	if (rpipwm->regmap) {
++		ret = device_property_read_u32(&pdev->dev, "reg", &rpipwm->offset);
++		if (ret)
++			return -EINVAL;
++	} else {
++		firmware_node = of_get_parent(dev->of_node);
++
++		firmware = devm_rpi_firmware_get(&pdev->dev, firmware_node);
++		of_node_put(firmware_node);
++		if (!firmware)
++			return dev_err_probe(dev, -EPROBE_DEFER,
++					     "Failed to get firmware handle\n");
++
++		rpipwm->firmware = firmware;
++	}
++
+ 	rpipwm->chip.dev = dev;
+ 	rpipwm->chip.ops = &raspberrypi_pwm_ops;
+ 	rpipwm->chip.base = -1;
+ 	rpipwm->chip.npwm = RASPBERRYPI_FIRMWARE_PWM_NUM;
+ 
+-	ret = raspberrypi_pwm_get_property(rpipwm->firmware, RPI_PWM_CUR_DUTY_REG,
++	ret = raspberrypi_pwm_get_property(rpipwm, RPI_PWM_CUR_DUTY_REG,
+ 					   &rpipwm->duty_cycle);
+ 	if (ret) {
+ 		dev_err(dev, "Failed to get duty cycle: %pe\n", ERR_PTR(ret));
+@@ -178,6 +192,7 @@ static int raspberrypi_pwm_probe(struct
+ 
+ static const struct of_device_id raspberrypi_pwm_of_match[] = {
+ 	{ .compatible = "raspberrypi,firmware-poe-pwm", },
++	{ .compatible = "raspberrypi,poe-pwm", },
+ 	{ }
+ };
+ MODULE_DEVICE_TABLE(of, raspberrypi_pwm_of_match);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0675-power-rpi-poe-Drop-CURRENT_AVG-as-it-is-not-hardware.patch b/root/target/linux/bcm27xx/patches-5.15/950-0675-power-rpi-poe-Drop-CURRENT_AVG-as-it-is-not-hardware.patch
new file mode 100644
index 00000000..b7efa18f
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0675-power-rpi-poe-Drop-CURRENT_AVG-as-it-is-not-hardware.patch
@@ -0,0 +1,43 @@
+From e6b14207814312b1abf12ae8999bb6b6523bc23d Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 20 Jan 2022 15:48:03 +0000
+Subject: [PATCH 675/828] power: rpi-poe: Drop CURRENT_AVG as it is not
+ hardware averaged
+
+As documented the _AVG parameters are meant to be hardware
+averaged, but the implementation for the PoE+ HAT was done in
+software in the firmware.
+
+Drop the property.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/power/supply/rpi_poe_power.c | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+--- a/drivers/power/supply/rpi_poe_power.c
++++ b/drivers/power/supply/rpi_poe_power.c
+@@ -106,15 +106,6 @@ static int rpi_poe_power_supply_get_prop
+ 		r_val->intval = (val > 5);
+ 		return 0;
+ 
+-	case POWER_SUPPLY_PROP_CURRENT_AVG:
+-		val = 50;
+-		ret = read_reg(ctx->fw, RPI_POE_ADC_REG, &val);
+-		if (ret)
+-			return ret;
+-		val = (val * 3300)/9821;
+-		r_val->intval = val * 1000;
+-		return 0;
+-
+ 	case POWER_SUPPLY_PROP_CURRENT_NOW:
+ 		ret = read_reg(ctx->fw, RPI_POE_ADC_REG, &val);
+ 		if (ret)
+@@ -145,7 +136,6 @@ static int rpi_poe_power_supply_get_prop
+ static enum power_supply_property rpi_poe_power_supply_properties[] = {
+ 	POWER_SUPPLY_PROP_HEALTH,
+ 	POWER_SUPPLY_PROP_ONLINE,
+-	POWER_SUPPLY_PROP_CURRENT_AVG,
+ 	POWER_SUPPLY_PROP_CURRENT_NOW,
+ 	POWER_SUPPLY_PROP_CURRENT_MAX,
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0676-power-rpi-poe-Add-option-of-being-created-by-MFD-or-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0676-power-rpi-poe-Add-option-of-being-created-by-MFD-or-.patch
new file mode 100644
index 00000000..e58afd61
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0676-power-rpi-poe-Add-option-of-being-created-by-MFD-or-.patch
@@ -0,0 +1,234 @@
+From 1197db4a025d71be686d63689bbc983d921bef7b Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 20 Jan 2022 15:50:27 +0000
+Subject: [PATCH 676/828] power: rpi-poe: Add option of being created by MFD or
+ FW
+
+The firmware can only use I2C0 if the kernel isn't, therefore
+with libcamera and DRM using it the PoE HAT fan control needs
+to move to the kernel.
+
+Add the option for the driver to be created by the PoE HAT core
+MFD driver, and use the I2C regmap that provides to control fan
+functions.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/power/supply/rpi_poe_power.c | 124 ++++++++++++++++-----------
+ 1 file changed, 75 insertions(+), 49 deletions(-)
+
+--- a/drivers/power/supply/rpi_poe_power.c
++++ b/drivers/power/supply/rpi_poe_power.c
+@@ -12,10 +12,13 @@
+ #include <linux/of.h>
+ #include <linux/platform_device.h>
+ #include <linux/power_supply.h>
++#include <linux/regmap.h>
+ #include <soc/bcm2835/raspberrypi-firmware.h>
+ 
+-#define RPI_POE_ADC_REG			0x2
+-#define RPI_POE_FLAG_REG		0x4
++#define RPI_POE_FW_BASE_REG		0x2
++
++#define RPI_POE_ADC_REG			0x0
++#define RPI_POE_FLAG_REG		0x2
+ 
+ #define RPI_POE_FLAG_AT			BIT(0)
+ #define RPI_POE_FLAG_OC			BIT(1)
+@@ -26,8 +29,12 @@
+ #define DRVNAME "rpi-poe-power-supply"
+ 
+ struct rpi_poe_power_supply_ctx {
+-	struct power_supply *supply;
+ 	struct rpi_firmware *fw;
++
++	struct regmap *regmap;
++	u32 offset;
++
++	struct power_supply *supply;
+ };
+ 
+ struct fw_tag_data_s {
+@@ -36,40 +43,51 @@ struct fw_tag_data_s {
+ 	u32 ret;
+ };
+ 
+-static int write_reg(struct rpi_firmware *fw, u32 reg, u32 *val)
++static int write_reg(struct rpi_poe_power_supply_ctx *ctx, u32 reg, u32 *val)
+ {
+ 	struct fw_tag_data_s fw_tag_data = {
+-		.reg = reg,
++		.reg = reg + RPI_POE_FW_BASE_REG,
+ 		.val = *val
+ 	};
+ 	int ret;
+ 
+-	ret = rpi_firmware_property(fw, RPI_FIRMWARE_SET_POE_HAT_VAL,
+-				    &fw_tag_data, sizeof(fw_tag_data));
+-	if (ret)
+-		return ret;
+-	else if (fw_tag_data.ret)
+-		return -EIO;
+-	return 0;
++	if (ctx->fw) {
++		ret = rpi_firmware_property(ctx->fw, RPI_FIRMWARE_SET_POE_HAT_VAL,
++					    &fw_tag_data, sizeof(fw_tag_data));
++		if (!ret && fw_tag_data.ret)
++			ret = -EIO;
++	} else {
++		ret = regmap_write(ctx->regmap, ctx->offset + reg, *val);
++	}
++
++	return ret;
+ }
+ 
+-static int read_reg(struct rpi_firmware *fw, u32 reg, u32 *val)
++static int read_reg(struct rpi_poe_power_supply_ctx *ctx, u32 reg, u32 *val)
+ {
+ 	struct fw_tag_data_s fw_tag_data = {
+-		.reg = reg,
++		.reg = reg + RPI_POE_FW_BASE_REG,
+ 		.val = *val
+ 	};
++	u32 value;
+ 	int ret;
+ 
+-	ret = rpi_firmware_property(fw, RPI_FIRMWARE_GET_POE_HAT_VAL,
+-				    &fw_tag_data, sizeof(fw_tag_data));
+-	if (ret)
+-		return ret;
+-	else if (fw_tag_data.ret)
+-		return -EIO;
++	if (ctx->fw) {
++		ret = rpi_firmware_property(ctx->fw, RPI_FIRMWARE_GET_POE_HAT_VAL,
++					    &fw_tag_data, sizeof(fw_tag_data));
++		if (!ret && fw_tag_data.ret)
++			ret = -EIO;
++		*val = fw_tag_data.val;
++	} else {
++		ret = regmap_read(ctx->regmap, ctx->offset + reg, &value);
++		if (!ret) {
++			*val = value;
++			ret = regmap_read(ctx->regmap, ctx->offset + reg + 1, &value);
++			*val |= value << 8;
++		}
++	}
+ 
+-	*val = fw_tag_data.val;
+-	return 0;
++	return ret;
+ }
+ 
+ static int rpi_poe_power_supply_get_property(struct power_supply *psy,
+@@ -82,14 +100,14 @@ static int rpi_poe_power_supply_get_prop
+ 
+ 	switch (psp) {
+ 	case POWER_SUPPLY_PROP_HEALTH:
+-		ret = read_reg(ctx->fw, RPI_POE_FLAG_REG, &val);
++		ret = read_reg(ctx, RPI_POE_FLAG_REG, &val);
+ 		if (ret)
+ 			return ret;
+ 
+ 		if (val & RPI_POE_FLAG_OC) {
+ 			r_val->intval = POWER_SUPPLY_HEALTH_UNSPEC_FAILURE;
+ 			val = RPI_POE_FLAG_OC;
+-			ret = write_reg(ctx->fw, RPI_POE_FLAG_REG, &val);
++			ret = write_reg(ctx, RPI_POE_FLAG_REG, &val);
+ 			if (ret)
+ 				return ret;
+ 			return 0;
+@@ -99,7 +117,7 @@ static int rpi_poe_power_supply_get_prop
+ 		return 0;
+ 
+ 	case POWER_SUPPLY_PROP_ONLINE:
+-		ret = read_reg(ctx->fw, RPI_POE_ADC_REG, &val);
++		ret = read_reg(ctx, RPI_POE_ADC_REG, &val);
+ 		if (ret)
+ 			return ret;
+ 
+@@ -107,7 +125,7 @@ static int rpi_poe_power_supply_get_prop
+ 		return 0;
+ 
+ 	case POWER_SUPPLY_PROP_CURRENT_NOW:
+-		ret = read_reg(ctx->fw, RPI_POE_ADC_REG, &val);
++		ret = read_reg(ctx, RPI_POE_ADC_REG, &val);
+ 		if (ret)
+ 			return ret;
+ 		val = (val * 3300)/9821;
+@@ -115,15 +133,14 @@ static int rpi_poe_power_supply_get_prop
+ 		return 0;
+ 
+ 	case POWER_SUPPLY_PROP_CURRENT_MAX:
+-		ret = read_reg(ctx->fw, RPI_POE_FLAG_REG, &val);
++		ret = read_reg(ctx, RPI_POE_FLAG_REG, &val);
+ 		if (ret)
+ 			return ret;
+ 
+-		if (val & RPI_POE_FLAG_AT) {
++		if (val & RPI_POE_FLAG_AT)
+ 			r_val->intval = RPI_POE_CURRENT_AT_MAX;
+-			return 0;
+-		}
+-		r_val->intval = RPI_POE_CURRENT_AF_MAX;
++		else
++			r_val->intval = RPI_POE_CURRENT_AF_MAX;
+ 		return 0;
+ 
+ 	default:
+@@ -158,29 +175,38 @@ static int rpi_poe_power_supply_probe(st
+ 	if (!of_device_is_available(pdev->dev.of_node))
+ 		return -ENODEV;
+ 
+-	fw_node = of_parse_phandle(pdev->dev.of_node, "firmware", 0);
+-	if (!fw_node) {
+-		dev_err(&pdev->dev, "Missing firmware node\n");
+-		return -ENOENT;
+-	}
+-
+ 	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
+ 	if (!ctx)
+ 		return -ENOMEM;
+ 
+-	ctx->fw = rpi_firmware_get(fw_node);
+-	if (!ctx->fw)
+-		return -EPROBE_DEFER;
+-	if (rpi_firmware_property(ctx->fw,
+-			RPI_FIRMWARE_GET_FIRMWARE_REVISION,
+-			&revision, sizeof(revision))) {
+-		dev_err(&pdev->dev, "Failed to get firmware revision\n");
+-		return -ENOENT;
+-	}
+-	if (revision < 0x60af72e8) {
+-		dev_err(&pdev->dev, "Unsupported firmware\n");
+-		return -ENOENT;
++	if (pdev->dev.parent)
++		ctx->regmap = dev_get_regmap(pdev->dev.parent, NULL);
++
++	if (ctx->regmap) {
++		if (device_property_read_u32(&pdev->dev, "reg", &ctx->offset))
++			return -EINVAL;
++	} else {
++		fw_node = of_parse_phandle(pdev->dev.of_node, "firmware", 0);
++		if (!fw_node) {
++			dev_err(&pdev->dev, "Missing firmware node\n");
++			return -ENOENT;
++		}
++
++		ctx->fw = rpi_firmware_get(fw_node);
++		if (!ctx->fw)
++			return -EPROBE_DEFER;
++		if (rpi_firmware_property(ctx->fw,
++					  RPI_FIRMWARE_GET_FIRMWARE_REVISION,
++					  &revision, sizeof(revision))) {
++			dev_err(&pdev->dev, "Failed to get firmware revision\n");
++			return -ENOENT;
++		}
++		if (revision < 0x60af72e8) {
++			dev_err(&pdev->dev, "Unsupported firmware\n");
++			return -ENOENT;
++		}
+ 	}
++
+ 	platform_set_drvdata(pdev, ctx);
+ 
+ 	psy_cfg.of_node = pdev->dev.of_node;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0677-dtoverlays-Add-option-for-PoE-HAT-to-use-Linux-I2C-i.patch b/root/target/linux/bcm27xx/patches-5.15/950-0677-dtoverlays-Add-option-for-PoE-HAT-to-use-Linux-I2C-i.patch
new file mode 100644
index 00000000..7a2038fb
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0677-dtoverlays-Add-option-for-PoE-HAT-to-use-Linux-I2C-i.patch
@@ -0,0 +1,158 @@
+From 03e5ef833f387177c5f40f8cc57c452d43145bb3 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 19 Jan 2022 17:29:13 +0000
+Subject: [PATCH 677/828] dtoverlays: Add option for PoE HAT to use Linux I2C
+ instead of FW.
+
+Adds parameter "i2c" to use the PoE HAT I2C MFD driver to instantiate
+the PoE HAT drivers, instead of being off the firmware.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/README             |  4 ++
+ .../arm/boot/dts/overlays/rpi-poe-overlay.dts | 62 +++++++++++++++----
+ .../dts/overlays/rpi-poe-plus-overlay.dts     | 15 +++++
+ 3 files changed, 69 insertions(+), 12 deletions(-)
+
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -2858,6 +2858,8 @@ Params: poe_fan_temp0           Temperat
+                                 speeds up (default 55000)
+         poe_fan_temp3_hyst      Temperature delta (in millicelcius) at which
+                                 the fan slows down (default 5000)
++        i2c                     Control the fan via Linux I2C drivers instead of
++                                the firmware.
+ 
+ 
+ Name:   rpi-poe-plus
+@@ -2879,6 +2881,8 @@ Params: poe_fan_temp0           Temperat
+                                 speeds up (default 55000)
+         poe_fan_temp3_hyst      Temperature delta (in millicelcius) at which
+                                 the fan slows down (default 5000)
++        i2c                     Control the fan via Linux I2C drivers instead of
++                                the firmware.
+ 
+ 
+ Name:   rpi-proto
+--- a/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
++++ b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
+@@ -8,16 +8,6 @@
+ 	compatible = "brcm,bcm2835";
+ 
+ 	fragment@0 {
+-		target = <&firmware>;
+-		__overlay__ {
+-			fwpwm: pwm {
+-				compatible = "raspberrypi,firmware-poe-pwm";
+-				#pwm-cells = <2>;
+-			};
+-		};
+-	};
+-
+-	fragment@1 {
+ 		target-path = "/";
+ 		__overlay__ {
+ 			fan: pwm-fan {
+@@ -29,7 +19,7 @@
+ 		};
+ 	};
+ 
+-	fragment@2 {
++	fragment@1 {
+ 		target = <&cpu_thermal>;
+ 		__overlay__ {
+ 			trips {
+@@ -75,7 +65,7 @@
+ 		};
+ 	};
+ 
+-	fragment@3 {
++	fragment@2 {
+ 		target-path = "/__overrides__";
+ 		__overlay__ {
+ 			poe_fan_temp0 =		<&trip0>,"temperature:0";
+@@ -89,6 +79,52 @@
+ 		};
+ 	};
+ 
++	fragment@3 {
++		target = <&firmware>;
++		__overlay__ {
++			fwpwm: pwm {
++				compatible = "raspberrypi,firmware-poe-pwm";
++				#pwm-cells = <2>;
++			};
++		};
++	};
++
++	fragment@4 {
++		target = <&i2c0>;
++		__dormant__ {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			status = "okay";
++
++			poe_mfd: poe@51 {
++				compatible = "raspberrypi,poe-core";
++				reg = <0x51>;
++				status = "okay";
++
++				poe_mfd_pwm: poe_pwm@f0 {
++					compatible = "raspberrypi,poe-pwm";
++					reg = <0xf0>;
++					status = "okay";
++					#pwm-cells = <2>;
++				};
++			};
++		};
++	};
++
++	fragment@5 {
++		target = <&i2c0if>;
++		__dormant__ {
++			status = "okay";
++		};
++	};
++
++	fragment@6 {
++		target = <&i2c0mux>;
++		__dormant__ {
++			status = "okay";
++		};
++	};
++
+ 	__overrides__ {
+ 		poe_fan_temp0 =		<&trip0>,"temperature:0";
+ 		poe_fan_temp0_hyst =	<&trip0>,"hysteresis:0";
+@@ -98,5 +134,7 @@
+ 		poe_fan_temp2_hyst =	<&trip2>,"hysteresis:0";
+ 		poe_fan_temp3 =		<&trip3>,"temperature:0";
+ 		poe_fan_temp3_hyst =	<&trip3>,"hysteresis:0";
++		i2c =			<0>, "-3+4+5+6",
++					<&fan>,"pwms:0=",<&poe_mfd_pwm>;
+ 	};
+ };
+--- a/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts
++++ b/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts
+@@ -16,6 +16,21 @@
+ 			};
+ 		};
+ 	};
++	fragment@11 {
++		target = <&poe_mfd>;
++		__dormant__ {
++			rpi-poe-power-supply@f2 {
++				compatible = "raspberrypi,rpi-poe-power-supply";
++				reg = <0xf2>;
++				status = "okay";
++			};
++		};
++	};
++
++	__overrides__ {
++		i2c =	<0>, "-3+4+5+6-10+11",
++			<&fan>,"pwms:0=",<&poe_mfd_pwm>;
++	};
+ };
+ 
+ &fan {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0678-drivers-bcm2835_unicam-Disable-trigger-mode-operatio.patch b/root/target/linux/bcm27xx/patches-5.15/950-0678-drivers-bcm2835_unicam-Disable-trigger-mode-operatio.patch
new file mode 100644
index 00000000..8e3cc1e1
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0678-drivers-bcm2835_unicam-Disable-trigger-mode-operatio.patch
@@ -0,0 +1,57 @@
+From c9e12ea35e155c532b23dc84583885970b5e56af Mon Sep 17 00:00:00 2001
+From: Naushir Patuck <naush@raspberrypi.com>
+Date: Tue, 18 Jan 2022 13:13:14 +0000
+Subject: [PATCH 678/828] drivers: bcm2835_unicam: Disable trigger mode
+ operation
+
+On a Pi3 B/B+ platform the imx219 sensor frequently generates a single corrupt
+frame when the sensor first starts. This can either be a missing line, or
+invalid samples within the line. This only occurrs using the Unicam kernel
+driver.
+
+Disabling trigger mode elimiates this corruption. Since trigger mode is a
+legacy feature copied from the firmware driver and not expected to be needed,
+remove it. Tested on the Raspberry Pi cameras and shows no ill effects.
+
+Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
+---
+ drivers/media/platform/bcm2835/bcm2835-unicam.c | 14 +-------------
+ 1 file changed, 1 insertion(+), 13 deletions(-)
+
+--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
++++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
+@@ -986,11 +986,6 @@ static irqreturn_t unicam_isr(int irq, v
+ 		}
+ 	}
+ 
+-	if (reg_read(unicam, UNICAM_ICTL) & UNICAM_FCM) {
+-		/* Switch out of trigger mode if selected */
+-		reg_write_field(unicam, UNICAM_ICTL, 1, UNICAM_TFC);
+-		reg_write_field(unicam, UNICAM_ICTL, 0, UNICAM_FCM);
+-	}
+ 	return IRQ_HANDLED;
+ }
+ 
+@@ -2300,8 +2295,7 @@ static void unicam_start_rx(struct unica
+ 
+ 	reg_write_field(dev, UNICAM_ANA, 0, UNICAM_DDL);
+ 
+-	/* Always start in trigger frame capture mode (UNICAM_FCM set) */
+-	val = UNICAM_FSIE | UNICAM_FEIE | UNICAM_FCM | UNICAM_IBOB;
++	val = UNICAM_FSIE | UNICAM_FEIE | UNICAM_IBOB;
+ 	set_field(&val, line_int_freq, UNICAM_LCIE_MASK);
+ 	reg_write(dev, UNICAM_ICTL, val);
+ 	reg_write(dev, UNICAM_STA, UNICAM_STA_MASK_ALL);
+@@ -2414,12 +2408,6 @@ static void unicam_start_rx(struct unica
+ 	/* Load embedded data buffer pointers if needed */
+ 	if (dev->node[METADATA_PAD].streaming && dev->sensor_embedded_data)
+ 		reg_write_field(dev, UNICAM_DCS, 1, UNICAM_LDP);
+-
+-	/*
+-	 * Enable trigger only for the first frame to
+-	 * sync correctly to the FS from the source.
+-	 */
+-	reg_write_field(dev, UNICAM_ICTL, 1, UNICAM_TFC);
+ }
+ 
+ static void unicam_disable(struct unicam_device *dev)
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0679-arm-Remove-spurious-.fnend-directive.patch b/root/target/linux/bcm27xx/patches-5.15/950-0679-arm-Remove-spurious-.fnend-directive.patch
new file mode 100644
index 00000000..c3e54dec
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0679-arm-Remove-spurious-.fnend-directive.patch
@@ -0,0 +1,27 @@
+From ee41b3bb9c3322eed6f5c185eb5c8a077a721280 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Fri, 21 Jan 2022 08:49:13 +0000
+Subject: [PATCH 679/828] arm: Remove spurious .fnend directive
+
+...a.k.a. Fix annoying build error
+
+Some toolchains rightly object to the fact that once the acros are
+expanded this results in multiple ".fnend"s without ".fnstart"s.
+
+See: https://github.com/raspberrypi/linux/issues/4836
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/lib/memcpymove.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/arch/arm/lib/memcpymove.h
++++ b/arch/arm/lib/memcpymove.h
+@@ -280,7 +280,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
+ 199:
+         pop     {DAT3, DAT4, DAT5, DAT6, DAT7}
+         pop     {D, DAT1, DAT2, pc}
+-        UNWIND( .fnend )
+ .endm
+ 
+ .macro memcpy_medium_inner_loop  backwards, align
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0680-drm-vc4-dsi-Correct-max-divider-to-255-not-7.patch b/root/target/linux/bcm27xx/patches-5.15/950-0680-drm-vc4-dsi-Correct-max-divider-to-255-not-7.patch
new file mode 100644
index 00000000..1fdf3ecc
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0680-drm-vc4-dsi-Correct-max-divider-to-255-not-7.patch
@@ -0,0 +1,26 @@
+From e2bfa7de0cba8aa9cb613ddd4ffb4fefb5a20421 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Fri, 22 Oct 2021 16:48:50 +0100
+Subject: [PATCH 680/828] drm/vc4: dsi: Correct max divider to 255 (not 7)
+
+The integer divider from parent PLL to DSI clock is capable
+of going up to /255, not just /7 that the driver was trying.
+This allows for slower link frequencies on the DSI bus where
+the resolution permits.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dsi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_dsi.c
++++ b/drivers/gpu/drm/vc4/vc4_dsi.c
+@@ -850,7 +850,7 @@ static bool vc4_dsi_encoder_mode_fixup(s
+ 	/* Find what divider gets us a faster clock than the requested
+ 	 * pixel clock.
+ 	 */
+-	for (divider = 1; divider < 7; divider++) {
++	for (divider = 1; divider < 255; divider++) {
+ 		if (parent_rate / (divider + 1) < pll_clock)
+ 			break;
+ 	}
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0681-dtoverlays-Add-pwm-backlight-option-to-vc4-kms-dpi-g.patch b/root/target/linux/bcm27xx/patches-5.15/950-0681-dtoverlays-Add-pwm-backlight-option-to-vc4-kms-dpi-g.patch
new file mode 100644
index 00000000..5d473d8d
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0681-dtoverlays-Add-pwm-backlight-option-to-vc4-kms-dpi-g.patch
@@ -0,0 +1,107 @@
+From 93968161184d5969d656ff9a7652ab69b54fa6af Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Fri, 21 Jan 2022 14:22:01 +0000
+Subject: [PATCH 681/828] dtoverlays: Add pwm backlight option to
+ vc4-kms-dpi-generic
+
+Adds the option of a PWM controlled backlight on a generic
+DPI display.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/README             | 17 +++++++
+ .../overlays/vc4-kms-dpi-generic-overlay.dts  | 51 +++++++++++++++++++
+ 2 files changed, 68 insertions(+)
+
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -3644,6 +3644,23 @@ Params: clock-frequency         Display
+                                 value. NB also overridden by rgbXXX overrides.
+         backlight-gpio          Defines a GPIO to be used for backlight control
+                                 (default of none).
++        backlight-pwm           Defines a PWM channel to be used for backlight
++                                control (default of none). NB Disables audio
++                                headphone output as that also uses PWM.
++        backlight-pwm-chan      Choose channel on &pwm node for backlight
++                                control.
++                                (default 0).
++        backlight-pwm-gpio      GPIO pin to be used for the PWM backlight. See
++                                pwm-2chan for valid options.
++                                (default 18 - note this can only work with
++                                 rgb666-padhi).
++        backlight-pwm-func      Pin function of GPIO used for the PWM
++                                backlight.
++                                See pwm-2chan for valid options.
++                                (default 2).
++        backlight-def-brightness
++                                Set the default brightness. Normal range 1-16.
++                                (default 16).
+ 
+ 
+ Name:   vc4-kms-dsi-7inch
+--- a/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
+@@ -80,6 +80,52 @@
+ 		};
+ 	};
+ 
++	fragment@4 {
++		target = <&panel>;
++		__dormant__  {
++			backlight = <&backlight_pwm>;
++		};
++	};
++
++	fragment@5 {
++		target-path = "/";
++		__dormant__  {
++			backlight_pwm: backlight_pwm {
++				compatible = "pwm-backlight";
++				brightness-levels = <0 6 8 12 16 24 32 40 48 64 96 128 160 192 224 255>;
++				default-brightness-level = <16>;
++				pwms = <&pwm 0 200000>;
++			};
++		};
++	};
++
++	fragment@6 {
++		target = <&pwm>;
++		__dormant__ {
++			pinctrl-names = "default";
++			pinctrl-0 = <&pwm_pins>;
++			assigned-clock-rates = <1000000>;
++			status = "okay";
++		};
++	};
++
++	fragment@7 {
++		target = <&gpio>;
++		__dormant__ {
++			pwm_pins: pwm_pins {
++				brcm,pins = <18>;
++				brcm,function = <2>; /* Alt5 */
++			};
++		};
++	};
++
++	fragment@8 {
++		target = <&audio>;
++		__dormant__  {
++		    brcm,disable-headphones;
++		};
++	};
++
+ 	__overrides__ {
+ 		clock-frequency = <&timing>, "clock-frequency:0";
+ 		hactive = <&timing>, "hactive:0";
+@@ -107,5 +153,10 @@
+ 		bus-format = <&panel>, "bus-format:0";
+ 		backlight-gpio = <0>, "+2+3",
+ 			<&backlight>, "gpios:4";
++		backlight-pwm = <0>, "+4+5+6+7+8";
++		backlight-pwm-chan = <&backlight_pwm>, "pwms:4";
++		backlight-pwm-gpio = <&pwm_pins>, "brcm,pins:0";
++		backlight-pwm-func = <&pwm_pins>, "brcm,function:0";
++		backlight-def-brightness = <&backlight_pwm>, "default-brightness-level:0";
+ 	};
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0682-dtoverlays-Correct-h-v-sync_invert-config-in-vc4-kms.patch b/root/target/linux/bcm27xx/patches-5.15/950-0682-dtoverlays-Correct-h-v-sync_invert-config-in-vc4-kms.patch
new file mode 100644
index 00000000..352b165a
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0682-dtoverlays-Correct-h-v-sync_invert-config-in-vc4-kms.patch
@@ -0,0 +1,38 @@
+From 0d2d0cdcbfd7859efaf6f51dcec988da5897c099 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Fri, 21 Jan 2022 15:12:25 +0000
+Subject: [PATCH 682/828] dtoverlays: Correct [h|v]sync_invert config in
+ vc4-kms-dpi-generic
+
+Both the base node and override set these parameters to 0,
+so it made no difference. The base node should have been 1.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
+@@ -1,5 +1,5 @@
+ /*
+- * vc4-kms-dpi-at056tn53v1-overlay.dts
++ * vc4-kms-dpi-generic-overlay.dts
+  */
+ 
+ /dts-v1/;
+@@ -27,12 +27,12 @@
+ 					hfront-porch = <24>;
+ 					hsync-len = <72>;
+ 					hback-porch = <96>;
+-					hsync-active = <0>;
++					hsync-active = <1>;
+ 					vactive = <480>;
+ 					vfront-porch = <3>;
+ 					vsync-len = <10>;
+ 					vback-porch = <7>;
+-					vsync-active = <0>;
++					vsync-active = <1>;
+ 
+ 					de-active = <1>;
+ 					pixelclk-active = <1>;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0683-ARM-dts-BCM2711-AON_INTR2-generates-IRQ-edges.patch b/root/target/linux/bcm27xx/patches-5.15/950-0683-ARM-dts-BCM2711-AON_INTR2-generates-IRQ-edges.patch
new file mode 100644
index 00000000..f6b88243
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0683-ARM-dts-BCM2711-AON_INTR2-generates-IRQ-edges.patch
@@ -0,0 +1,39 @@
+From 8afc3ec3abcd230a0649670540bec353af775414 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Fri, 21 Jan 2022 12:24:57 +0000
+Subject: [PATCH 683/828] ARM: dts: BCM2711 AON_INTR2 generates IRQ edges
+
+THe AON_INTR2 controller manages the HDMI interrupts, combining them
+into a single interrupt passed to the GIC. bcm2711.dtsi declares the
+interrupt as being IRQ_TYPE_LEVEL_HIGH, but it should be
+IRQ_TYPE_EDGE_RISING. Most of the time the distinction shouldn't
+matter, but there is a small possibility of losing interrupts unless
+it is corrected.
+
+See: http://lists.infradead.org/pipermail/linux-arm-kernel/2022-January/710292.html
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/boot/dts/bcm2711.dtsi | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm2711.dtsi
++++ b/arch/arm/boot/dts/bcm2711.dtsi
+@@ -320,7 +320,7 @@
+ 		aon_intr: interrupt-controller@7ef00100 {
+ 			compatible = "brcm,bcm2711-l2-intc", "brcm,l2-intc";
+ 			reg = <0x7ef00100 0x30>;
+-			interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
++			interrupts = <GIC_SPI 96 IRQ_TYPE_EDGE_RISING>;
+ 			interrupt-controller;
+ 			#interrupt-cells = <1>;
+ 			status = "disabled";
+@@ -403,7 +403,7 @@
+ 				 <&clk_27MHz>;
+ 			resets = <&dvp 1>;
+ 			interrupt-parent = <&aon_intr>;
+-			interrupts = <8>, <7>, <6>,
++			interrupts = <8>, <7>, <6>,	// This is correct
+ 				     <9>, <10>, <11>;
+ 			interrupt-names = "cec-tx", "cec-rx", "cec-low",
+ 					  "wakeup", "hpd-connected", "hpd-removed";
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0684-update-rpi-display-overlay.dts-pins-for-5.10.patch b/root/target/linux/bcm27xx/patches-5.15/950-0684-update-rpi-display-overlay.dts-pins-for-5.10.patch
new file mode 100644
index 00000000..f80169b8
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0684-update-rpi-display-overlay.dts-pins-for-5.10.patch
@@ -0,0 +1,21 @@
+From d5287bddcf0f459ba1dae3b8a585f8f4a722d37b Mon Sep 17 00:00:00 2001
+From: Andreas Watterott <1488433+awatterott@users.noreply.github.com>
+Date: Sat, 22 Jan 2022 12:32:09 +0100
+Subject: [PATCH 684/828] update rpi-display-overlay.dts pins for 5.10+
+
+backlight has been turned off
+---
+ arch/arm/boot/dts/overlays/rpi-display-overlay.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/overlays/rpi-display-overlay.dts
++++ b/arch/arm/boot/dts/overlays/rpi-display-overlay.dts
+@@ -61,7 +61,7 @@
+ 				buswidth = <8>;
+ 				reset-gpios = <&gpio 23 1>;
+ 				dc-gpios = <&gpio 24 0>;
+-				led-gpios = <&gpio 18 0>;
++				led-gpios = <&gpio 18 1>;
+ 				debug = <0>;
+ 			};
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0685-media-i2c-imx219-Correct-the-minimum-vblanking-value.patch b/root/target/linux/bcm27xx/patches-5.15/950-0685-media-i2c-imx219-Correct-the-minimum-vblanking-value.patch
new file mode 100644
index 00000000..21dcd3e4
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0685-media-i2c-imx219-Correct-the-minimum-vblanking-value.patch
@@ -0,0 +1,26 @@
+From e9969729eb388c44ede6e5997a6a87c559c7142d Mon Sep 17 00:00:00 2001
+From: David Plowman <david.plowman@raspberrypi.com>
+Date: Tue, 25 Jan 2022 15:48:53 +0000
+Subject: [PATCH 685/828] media: i2c: imx219: Correct the minimum vblanking
+ value
+
+The datasheet for this sensor documents the minimum vblanking as being
+32 lines. It does fix some problems with occasional black lines at the
+bottom of images (tested on Raspberry Pi).
+
+Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
+---
+ drivers/media/i2c/imx219.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/media/i2c/imx219.c
++++ b/drivers/media/i2c/imx219.c
+@@ -55,7 +55,7 @@
+ #define IMX219_VTS_30FPS_640x480	0x06e3
+ #define IMX219_VTS_MAX			0xffff
+ 
+-#define IMX219_VBLANK_MIN		4
++#define IMX219_VBLANK_MIN		32
+ 
+ /*Frame Length Line*/
+ #define IMX219_FLL_MIN			0x08a6
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0686-drm-vc4_hdmi-Add-Broadcast-RGB-property-to-allow-ove.patch b/root/target/linux/bcm27xx/patches-5.15/950-0686-drm-vc4_hdmi-Add-Broadcast-RGB-property-to-allow-ove.patch
new file mode 100644
index 00000000..fe701316
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0686-drm-vc4_hdmi-Add-Broadcast-RGB-property-to-allow-ove.patch
@@ -0,0 +1,222 @@
+From ddd0084db2b52c4856447ea7a9dc6b9b6dc77905 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 8 Apr 2020 16:12:02 +0100
+Subject: [PATCH 686/828] drm/vc4_hdmi: Add Broadcast RGB property to allow
+ override of RGB range
+
+Copy Intel's "Broadcast RGB" property semantics to add manual override
+of the HDMI pixel range for monitors that don't abide by the content
+of the AVI Infoframe.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 103 +++++++++++++++++++++++++++++++++
+ drivers/gpu/drm/vc4/vc4_hdmi.h |  15 +++++
+ 2 files changed, 118 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -56,6 +56,14 @@
+ #include "vc4_hdmi_regs.h"
+ #include "vc4_regs.h"
+ 
++/*
++ * "Broadcast RGB" property.
++ * Allows overriding of HDMI full or limited range RGB
++ */
++#define VC4_BROADCAST_RGB_AUTO 0
++#define VC4_BROADCAST_RGB_FULL 1
++#define VC4_BROADCAST_RGB_LIMITED 2
++
+ #define VC5_HDMI_HORZA_HFP_SHIFT		16
+ #define VC5_HDMI_HORZA_HFP_MASK			VC4_MASK(28, 16)
+ #define VC5_HDMI_HORZA_VPOS			BIT(15)
+@@ -135,6 +143,10 @@ static bool vc4_hdmi_is_full_range_rgb(s
+ {
+ 	struct vc4_hdmi_encoder *vc4_encoder = &vc4_hdmi->encoder;
+ 
++	if (vc4_hdmi->broadcast_rgb == VC4_BROADCAST_RGB_LIMITED)
++		return false;
++	else if (vc4_hdmi->broadcast_rgb == VC4_BROADCAST_RGB_FULL)
++		return true;
+ 	return !vc4_encoder->hdmi_monitor ||
+ 		drm_default_rgb_quant_range(mode) == HDMI_QUANTIZATION_RANGE_FULL;
+ }
+@@ -341,6 +353,65 @@ static int vc4_hdmi_connector_atomic_che
+ 	return 0;
+ }
+ 
++/**
++ * vc4_hdmi_connector_atomic_get_property - hook for
++ *						connector->atomic_get_property.
++ * @connector: Connector to get the property for.
++ * @state: Connector state to retrieve the property from.
++ * @property: Property to retrieve.
++ * @val: Return value for the property.
++ *
++ * Returns the atomic property value for a digital connector.
++ */
++int vc4_hdmi_connector_get_property(struct drm_connector *connector,
++				    const struct drm_connector_state *state,
++				    struct drm_property *property,
++				    uint64_t *val)
++{
++	struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector);
++	const struct vc4_hdmi_connector_state *vc4_conn_state =
++				const_conn_state_to_vc4_hdmi_conn_state(state);
++
++	if (property == vc4_hdmi->broadcast_rgb_property) {
++		*val = vc4_conn_state->broadcast_rgb;
++	} else {
++		DRM_DEBUG_ATOMIC("Unknown property [PROP:%d:%s]\n",
++				 property->base.id, property->name);
++		return -EINVAL;
++	}
++
++	return 0;
++}
++
++/**
++ * vc4_hdmi_connector_atomic_set_property - hook for
++ *						connector->atomic_set_property.
++ * @connector: Connector to set the property for.
++ * @state: Connector state to set the property on.
++ * @property: Property to set.
++ * @val: New value for the property.
++ *
++ * Sets the atomic property value for a digital connector.
++ */
++int vc4_hdmi_connector_set_property(struct drm_connector *connector,
++				    struct drm_connector_state *state,
++				    struct drm_property *property,
++				    uint64_t val)
++{
++	struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector);
++	struct vc4_hdmi_connector_state *vc4_conn_state =
++				conn_state_to_vc4_hdmi_conn_state(state);
++
++	if (property == vc4_hdmi->broadcast_rgb_property) {
++		vc4_conn_state->broadcast_rgb = val;
++		return 0;
++	}
++
++	DRM_DEBUG_ATOMIC("Unknown property [PROP:%d:%s]\n",
++			 property->base.id, property->name);
++	return -EINVAL;
++}
++
+ static void vc4_hdmi_connector_reset(struct drm_connector *connector)
+ {
+ 	struct vc4_hdmi_connector_state *old_state =
+@@ -377,6 +448,7 @@ vc4_hdmi_connector_duplicate_state(struc
+ 	new_state->pixel_rate = vc4_state->pixel_rate;
+ 	new_state->output_bpc = vc4_state->output_bpc;
+ 	new_state->output_format = vc4_state->output_format;
++	new_state->broadcast_rgb = vc4_state->broadcast_rgb;
+ 	__drm_atomic_helper_connector_duplicate_state(connector, &new_state->base);
+ 
+ 	return &new_state->base;
+@@ -389,6 +461,8 @@ static const struct drm_connector_funcs
+ 	.reset = vc4_hdmi_connector_reset,
+ 	.atomic_duplicate_state = vc4_hdmi_connector_duplicate_state,
+ 	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
++	.atomic_get_property = vc4_hdmi_connector_get_property,
++	.atomic_set_property = vc4_hdmi_connector_set_property,
+ };
+ 
+ static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs = {
+@@ -396,6 +470,32 @@ static const struct drm_connector_helper
+ 	.atomic_check = vc4_hdmi_connector_atomic_check,
+ };
+ 
++static const struct drm_prop_enum_list broadcast_rgb_names[] = {
++	{ VC4_BROADCAST_RGB_AUTO, "Automatic" },
++	{ VC4_BROADCAST_RGB_FULL, "Full" },
++	{ VC4_BROADCAST_RGB_LIMITED, "Limited 16:235" },
++};
++
++static void
++vc4_hdmi_attach_broadcast_rgb_property(struct drm_device *dev,
++				       struct vc4_hdmi *vc4_hdmi)
++{
++	struct drm_property *prop = vc4_hdmi->broadcast_rgb_property;
++
++	if (!prop) {
++		prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,
++						"Broadcast RGB",
++						broadcast_rgb_names,
++						ARRAY_SIZE(broadcast_rgb_names));
++		if (!prop)
++			return;
++
++		vc4_hdmi->broadcast_rgb_property = prop;
++	}
++
++	drm_object_attach_property(&vc4_hdmi->connector.base, prop, 0);
++}
++
+ static int vc4_hdmi_connector_init(struct drm_device *dev,
+ 				   struct vc4_hdmi *vc4_hdmi)
+ {
+@@ -439,6 +539,8 @@ static int vc4_hdmi_connector_init(struc
+ 	if (vc4_hdmi->variant->supports_hdr)
+ 		drm_connector_attach_hdr_output_metadata_property(connector);
+ 
++	vc4_hdmi_attach_broadcast_rgb_property(dev, vc4_hdmi);
++
+ 	drm_connector_attach_encoder(connector, encoder);
+ 
+ 	return 0;
+@@ -1384,6 +1486,7 @@ static void vc4_hdmi_encoder_atomic_mode
+ 	mutex_lock(&vc4_hdmi->mutex);
+ 	vc4_hdmi->output_bpc = vc4_state->output_bpc;
+ 	vc4_hdmi->output_format = vc4_state->output_format;
++	vc4_hdmi->broadcast_rgb = vc4_state->broadcast_rgb;
+ 	memcpy(&vc4_hdmi->saved_adjusted_mode,
+ 	       &crtc_state->adjusted_mode,
+ 	       sizeof(vc4_hdmi->saved_adjusted_mode));
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
+@@ -140,6 +140,8 @@ struct vc4_hdmi {
+ 
+ 	struct delayed_work scrambling_work;
+ 
++	struct drm_property *broadcast_rgb_property;
++
+ 	struct i2c_adapter *ddc;
+ 	void __iomem *hdmicore_regs;
+ 	void __iomem *hd_regs;
+@@ -240,6 +242,12 @@ struct vc4_hdmi {
+ 	 */
+ 	enum vc4_hdmi_output_format output_format;
+ 
++	/**
++	 * @broadcast_rgb: Copy of @vc4_connector_state.broadcast_rgb
++	 * for use outside of KMS hooks. Protected by @mutex.
++	 */
++	int broadcast_rgb;
++
+ 	/* VC5 debugfs regset */
+ 	struct debugfs_regset32 cec_regset;
+ 	struct debugfs_regset32 csc_regset;
+@@ -268,6 +276,7 @@ struct vc4_hdmi_connector_state {
+ 	unsigned long long		pixel_rate;
+ 	unsigned int 			output_bpc;
+ 	enum vc4_hdmi_output_format	output_format;
++	int				broadcast_rgb;
+ };
+ 
+ static inline struct vc4_hdmi_connector_state *
+@@ -275,6 +284,12 @@ conn_state_to_vc4_hdmi_conn_state(struct
+ {
+ 	return container_of(conn_state, struct vc4_hdmi_connector_state, base);
+ }
++
++static inline const struct vc4_hdmi_connector_state *
++const_conn_state_to_vc4_hdmi_conn_state(const struct drm_connector_state *conn_state)
++{
++	return container_of(conn_state, struct vc4_hdmi_connector_state, base);
++}
+ 
+ void vc4_hdmi_phy_init(struct vc4_hdmi *vc4_hdmi,
+ 		       struct vc4_hdmi_connector_state *vc4_conn_state);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0687-overlays-Add-MAX30102-HR-to-i2c-sensor-overlay.patch b/root/target/linux/bcm27xx/patches-5.15/950-0687-overlays-Add-MAX30102-HR-to-i2c-sensor-overlay.patch
new file mode 100644
index 00000000..d1cbbe36
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0687-overlays-Add-MAX30102-HR-to-i2c-sensor-overlay.patch
@@ -0,0 +1,78 @@
+From df1acde2145d87b957c1fc8cc7b9b16569d2bfc1 Mon Sep 17 00:00:00 2001
+From: coldspark29 <jan.claussen10@web.de>
+Date: Wed, 18 Aug 2021 13:41:04 +0200
+Subject: [PATCH 687/828] overlays: Add MAX30102 HR to i2c-sensor overlay
+
+Add support for the MAX30102 heart rate and blood oxygen sensor to the
+i2c-sensor overlay.
+
+See: https://github.com/raspberrypi/linux/pull/4535
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/README             |  6 ++++++
+ .../boot/dts/overlays/i2c-sensor-overlay.dts  | 20 +++++++++++++++++++
+ 2 files changed, 26 insertions(+)
+
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -1725,6 +1725,9 @@ Params: addr                    Set the
+ 
+         htu21                   Select the HTU21 temperature and humidity sensor
+ 
++        int_pin                 Set the GPIO to use for interrupts (max30102
++                                only)
++
+         lm75                    Select the Maxim LM75 temperature sensor
+                                 Valid addresses 0x48-0x4f, default 0x4f
+ 
+@@ -1733,6 +1736,9 @@ Params: addr                    Set the
+         max17040                Select the Maxim Integrated MAX17040 battery
+                                 monitor
+ 
++        max30102                Select the Maxim Integrated MAX30102 heart-rate
++                                and blood-oxygen sensor
++
+         sht3x                   Select the Sensiron SHT3x temperature and
+                                 humidity sensor. Valid addresses 0x44-0x45,
+                                 default 0x44
+--- a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
++++ b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
+@@ -291,11 +291,30 @@
+ 		};
+ 	};
+ 
++	fragment@19 {
++		target = <&i2c_arm>;
++		__dormant__ {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			status = "okay";
++
++			max30102: max30102@57 {
++				compatible = "maxim,max30102";
++				reg = <0x57>;
++				maxim,red-led-current-microamp = <7000>;
++				maxim,ir-led-current-microamp  = <7000>;
++				interrupt-parent = <&gpio>;
++				interrupts = <4 2>;
++			};
++		};
++	};
++
+ 	__overrides__ {
+ 		addr =  <&bme280>,"reg:0", <&bmp280>,"reg:0", <&tmp102>,"reg:0",
+ 			<&lm75>,"reg:0", <&hdc100x>,"reg:0", <&sht3x>,"reg:0",
+ 			<&ds1621>,"reg:0", <&bme680>,"reg:0", <&ccs811>,"reg:0",
+ 			<&bh1750>,"reg:0";
++		int_pin = <&max30102>, "interrupts:0";
+ 		bme280 = <0>,"+0";
+ 		bmp085 = <0>,"+1";
+ 		bmp180 = <0>,"+2";
+@@ -316,5 +335,6 @@
+ 		sgp30 = <0>,"+16";
+ 		ccs811 = <0>, "+17";
+ 		bh1750 = <0>, "+18";
++		max30102 = <0>,"+19";
+ 	};
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0688-misc-bcm2835_smi-Use-proper-enum-types-for-dma_-un-m.patch b/root/target/linux/bcm27xx/patches-5.15/950-0688-misc-bcm2835_smi-Use-proper-enum-types-for-dma_-un-m.patch
new file mode 100644
index 00000000..0387bcd0
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0688-misc-bcm2835_smi-Use-proper-enum-types-for-dma_-un-m.patch
@@ -0,0 +1,85 @@
+From e4dce052f9ac1fe9f219060f022d588220c607c7 Mon Sep 17 00:00:00 2001
+From: Nathan Chancellor <nathan@kernel.org>
+Date: Mon, 31 Jan 2022 17:12:10 -0700
+Subject: [PATCH 688/828] misc: bcm2835_smi: Use proper enum types for
+ dma_{,un}map_single()
+
+Clang warns:
+
+  drivers/misc/bcm2835_smi.c:692:4: warning: implicit conversion from enumeration type 'enum dma_transfer_direction' to different enumeration type 'enum dma_data_direction' [-Wenum-conversion]
+                          DMA_MEM_TO_DEV);
+                          ^~~~~~~~~~~~~~~
+  ./include/linux/dma-mapping.h:406:66: note: expanded from macro 'dma_map_single'
+  #define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, 0)
+                                     ~~~~~~~~~~~~~~~~~~~~          ^
+  drivers/misc/bcm2835_smi.c:705:35: warning: implicit conversion from enumeration type 'enum dma_transfer_direction' to different enumeration type 'enum dma_data_direction' [-Wenum-conversion]
+                          (inst->dev, phy_addr, n_bytes, DMA_MEM_TO_DEV);
+                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
+  ./include/linux/dma-mapping.h:407:70: note: expanded from macro 'dma_unmap_single'
+  #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, 0)
+                                       ~~~~~~~~~~~~~~~~~~~~~~          ^
+  drivers/misc/bcm2835_smi.c:751:12: warning: implicit conversion from enumeration type 'enum dma_transfer_direction' to different enumeration type 'enum dma_data_direction' [-Wenum-conversion]
+                                                       DMA_DEV_TO_MEM);
+                                                       ^~~~~~~~~~~~~~~
+  ./include/linux/dma-mapping.h:406:66: note: expanded from macro 'dma_map_single'
+  #define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, 0)
+                                     ~~~~~~~~~~~~~~~~~~~~          ^
+  drivers/misc/bcm2835_smi.c:761:50: warning: implicit conversion from enumeration type 'enum dma_transfer_direction' to different enumeration type 'enum dma_data_direction' [-Wenum-conversion]
+                  dma_unmap_single(inst->dev, phy_addr, n_bytes, DMA_DEV_TO_MEM);
+                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
+  ./include/linux/dma-mapping.h:407:70: note: expanded from macro 'dma_unmap_single'
+  #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, 0)
+                                       ~~~~~~~~~~~~~~~~~~~~~~          ^
+  4 warnings generated.
+
+Use the proper enumerated type to clear up the warning. There is not
+actually a bug here because the enumerated types have the same integer
+value:
+
+DMA_MEM_TO_DEV = DMA_TO_DEVICE = 1
+DMA_DEV_TO_MEM = DMA_FROM_DEVICE = 2
+
+Fixes: 93254d0f7bc8 ("Add SMI driver")
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
+---
+ drivers/misc/bcm2835_smi.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/misc/bcm2835_smi.c
++++ b/drivers/misc/bcm2835_smi.c
+@@ -689,7 +689,7 @@ void bcm2835_smi_write_buf(
+ 			inst->dev,
+ 			(void *)buf,
+ 			n_bytes,
+-			DMA_MEM_TO_DEV);
++			DMA_TO_DEVICE);
+ 		struct scatterlist *sgl =
+ 			smi_scatterlist_from_buffer(inst, phy_addr, n_bytes,
+ 				&inst->buffer_sgl);
+@@ -702,7 +702,7 @@ void bcm2835_smi_write_buf(
+ 		smi_dma_write_sgl(inst, sgl, 1, n_bytes);
+ 
+ 		dma_unmap_single
+-			(inst->dev, phy_addr, n_bytes, DMA_MEM_TO_DEV);
++			(inst->dev, phy_addr, n_bytes, DMA_TO_DEVICE);
+ 	} else if (n_bytes) {
+ 		smi_write_fifo(inst, (uint32_t *) buf, n_bytes);
+ 	}
+@@ -748,7 +748,7 @@ void bcm2835_smi_read_buf(struct bcm2835
+ 	if (n_bytes > DMA_THRESHOLD_BYTES) {
+ 		dma_addr_t phy_addr = dma_map_single(inst->dev,
+ 						     buf, n_bytes,
+-						     DMA_DEV_TO_MEM);
++						     DMA_FROM_DEVICE);
+ 		struct scatterlist *sgl = smi_scatterlist_from_buffer(
+ 			inst, phy_addr, n_bytes,
+ 			&inst->buffer_sgl);
+@@ -758,7 +758,7 @@ void bcm2835_smi_read_buf(struct bcm2835
+ 			goto out;
+ 		}
+ 		smi_dma_read_sgl(inst, sgl, 1, n_bytes);
+-		dma_unmap_single(inst->dev, phy_addr, n_bytes, DMA_DEV_TO_MEM);
++		dma_unmap_single(inst->dev, phy_addr, n_bytes, DMA_FROM_DEVICE);
+ 	} else if (n_bytes) {
+ 		smi_read_fifo(inst, (uint32_t *)buf, n_bytes);
+ 	}
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0689-ASoC-ma120x0p-Remove-unnecessary-const-specifier.patch b/root/target/linux/bcm27xx/patches-5.15/950-0689-ASoC-ma120x0p-Remove-unnecessary-const-specifier.patch
new file mode 100644
index 00000000..0517bcd7
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0689-ASoC-ma120x0p-Remove-unnecessary-const-specifier.patch
@@ -0,0 +1,38 @@
+From 98d910a18ab28101ace73501b0bd480f37ea0e05 Mon Sep 17 00:00:00 2001
+From: Nathan Chancellor <nathan@kernel.org>
+Date: Mon, 31 Jan 2022 17:15:35 -0700
+Subject: [PATCH 689/828] ASoC: ma120x0p: Remove unnecessary const specifier
+
+Clang warns:
+
+  sound/soc/codecs/ma120x0p.c:891:14: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
+  static const SOC_VALUE_ENUM_SINGLE_DECL(pwr_mode_ctrl,
+               ^
+  ./include/sound/soc.h:362:2: note: expanded from macro 'SOC_VALUE_ENUM_SINGLE_DECL'
+          SOC_VALUE_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xmask, xtexts, xvalues)
+          ^
+  ./include/sound/soc.h:359:2: note: expanded from macro 'SOC_VALUE_ENUM_DOUBLE_DECL'
+          const struct soc_enum name = SOC_VALUE_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, \
+          ^
+  1 warning generated.
+
+SOC_VALUE_ENUM_DOUBLE_DECL already has a const specifier. Remove the duplicate
+const to clean up the warning.
+
+Fixes: 42444979e710 ("Add support for all the downstream rpi sound card drivers")
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
+---
+ sound/soc/codecs/ma120x0p.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/soc/codecs/ma120x0p.c
++++ b/sound/soc/codecs/ma120x0p.c
+@@ -888,7 +888,7 @@ static const int pwr_mode_values[] = {
+ 		0x70,
+ 	};
+ 
+-static const SOC_VALUE_ENUM_SINGLE_DECL(pwr_mode_ctrl,
++static SOC_VALUE_ENUM_SINGLE_DECL(pwr_mode_ctrl,
+ 	ma_pm_man__a, 0, 0x70,
+ 	pwr_mode_texts,
+ 	pwr_mode_values);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0690-ASoC-bcm-allo-piano-dac-plus-Remove-unnecessary-cons.patch b/root/target/linux/bcm27xx/patches-5.15/950-0690-ASoC-bcm-allo-piano-dac-plus-Remove-unnecessary-cons.patch
new file mode 100644
index 00000000..c44d23d5
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0690-ASoC-bcm-allo-piano-dac-plus-Remove-unnecessary-cons.patch
@@ -0,0 +1,75 @@
+From 5f3ac0d10525b59a134301ea4095af13cc1abf73 Mon Sep 17 00:00:00 2001
+From: Nathan Chancellor <nathan@kernel.org>
+Date: Mon, 31 Jan 2022 17:20:55 -0700
+Subject: [PATCH 690/828] ASoC: bcm: allo-piano-dac-plus: Remove unnecessary
+ const specifiers
+
+Clang warns:
+
+  sound/soc/bcm/allo-piano-dac-plus.c:66:14: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
+  static const SOC_ENUM_SINGLE_DECL(allo_piano_mode_enum,
+               ^
+  ./include/sound/soc.h:355:2: note: expanded from macro 'SOC_ENUM_SINGLE_DECL'
+          SOC_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xtexts)
+          ^
+  ./include/sound/soc.h:352:2: note: expanded from macro 'SOC_ENUM_DOUBLE_DECL'
+          const struct soc_enum name = SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, \
+          ^
+  sound/soc/bcm/allo-piano-dac-plus.c:75:14: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
+  static const SOC_ENUM_SINGLE_DECL(allo_piano_dual_mode_enum,
+               ^
+  ./include/sound/soc.h:355:2: note: expanded from macro 'SOC_ENUM_SINGLE_DECL'
+          SOC_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xtexts)
+          ^
+  ./include/sound/soc.h:352:2: note: expanded from macro 'SOC_ENUM_DOUBLE_DECL'
+          const struct soc_enum name = SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, \
+          ^
+  sound/soc/bcm/allo-piano-dac-plus.c:96:14: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
+  static const SOC_ENUM_SINGLE_DECL(allo_piano_enum,
+               ^
+  ./include/sound/soc.h:355:2: note: expanded from macro 'SOC_ENUM_SINGLE_DECL'
+          SOC_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xtexts)
+          ^
+  ./include/sound/soc.h:352:2: note: expanded from macro 'SOC_ENUM_DOUBLE_DECL'
+          const struct soc_enum name = SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, \
+          ^
+  3 warnings generated.
+
+SOC_VALUE_ENUM_DOUBLE_DECL already has a const specifier. Remove the duplicate
+const specifiers to clean up the warnings.
+
+Fixes: 42444979e710 ("Add support for all the downstream rpi sound card drivers")
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
+---
+ sound/soc/bcm/allo-piano-dac-plus.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/sound/soc/bcm/allo-piano-dac-plus.c
++++ b/sound/soc/bcm/allo-piano-dac-plus.c
+@@ -63,7 +63,7 @@ static const char * const allo_piano_mod
+ 	"2.2",
+ };
+ 
+-static const SOC_ENUM_SINGLE_DECL(allo_piano_mode_enum,
++static SOC_ENUM_SINGLE_DECL(allo_piano_mode_enum,
+ 		0, 0, allo_piano_mode_texts);
+ 
+ static const char * const allo_piano_dual_mode_texts[] = {
+@@ -72,7 +72,7 @@ static const char * const allo_piano_dua
+ 	"Dual-Stereo",
+ };
+ 
+-static const SOC_ENUM_SINGLE_DECL(allo_piano_dual_mode_enum,
++static SOC_ENUM_SINGLE_DECL(allo_piano_dual_mode_enum,
+ 		0, 0, allo_piano_dual_mode_texts);
+ 
+ static const char * const allo_piano_dsp_low_pass_texts[] = {
+@@ -93,7 +93,7 @@ static const char * const allo_piano_dsp
+ 	"200",
+ };
+ 
+-static const SOC_ENUM_SINGLE_DECL(allo_piano_enum,
++static SOC_ENUM_SINGLE_DECL(allo_piano_enum,
+ 		0, 0, allo_piano_dsp_low_pass_texts);
+ 
+ static int __snd_allo_piano_dsp_program(struct snd_soc_pcm_runtime *rtd,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0691-media-bcm2835-unicam-Set-ret-on-error-path-in-unicam.patch b/root/target/linux/bcm27xx/patches-5.15/950-0691-media-bcm2835-unicam-Set-ret-on-error-path-in-unicam.patch
new file mode 100644
index 00000000..cee0d225
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0691-media-bcm2835-unicam-Set-ret-on-error-path-in-unicam.patch
@@ -0,0 +1,43 @@
+From 6814859b8fded04c864c3cd8ad5421b304bd54a3 Mon Sep 17 00:00:00 2001
+From: Nathan Chancellor <nathan@kernel.org>
+Date: Mon, 31 Jan 2022 17:23:38 -0700
+Subject: [PATCH 691/828] media: bcm2835-unicam: Set ret on error path in
+ unicam_async_complete()
+
+Clang warns:
+
+  drivers/media/platform/bcm2835/bcm2835-unicam.c:3109:6: warning: variable 'ret' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
+          if (!source_pads) {
+              ^~~~~~~~~~~~
+  drivers/media/platform/bcm2835/bcm2835-unicam.c:3152:9: note: uninitialized use occurs here
+          return ret;
+                 ^~~
+  drivers/media/platform/bcm2835/bcm2835-unicam.c:3109:2: note: remove the 'if' if its condition is always false
+          if (!source_pads) {
+          ^~~~~~~~~~~~~~~~~~~
+  drivers/media/platform/bcm2835/bcm2835-unicam.c:3091:9: note: initialize the variable 'ret' to silence this warning
+          int ret;
+                 ^
+                  = 0
+  1 warning generated.
+
+When the if condition is true, ret will be used uninitialized, which
+could result in undesirable behavior. Set ret to -ENODEV on the error
+path, which is a standard error code for the ->complete() callback.
+
+Fixes: d056e86eb35f ("media/bcm2835-unicam: Parse pad numbers correctly")
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
+---
+ drivers/media/platform/bcm2835/bcm2835-unicam.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
++++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
+@@ -3108,6 +3108,7 @@ static int unicam_async_complete(struct
+ 	}
+ 	if (!source_pads) {
+ 		unicam_err(unicam, "No source pads on sensor.\n");
++		ret = -ENODEV;
+ 		goto unregister;
+ 	}
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0692-media-i2c-ov9281-Initialize-id_msb-to-zero-in-ov9281.patch b/root/target/linux/bcm27xx/patches-5.15/950-0692-media-i2c-ov9281-Initialize-id_msb-to-zero-in-ov9281.patch
new file mode 100644
index 00000000..e662376d
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0692-media-i2c-ov9281-Initialize-id_msb-to-zero-in-ov9281.patch
@@ -0,0 +1,48 @@
+From 17f0d1ecdb011e02eab4969d680e274ed303912a Mon Sep 17 00:00:00 2001
+From: Nathan Chancellor <nathan@kernel.org>
+Date: Mon, 31 Jan 2022 17:50:43 -0700
+Subject: [PATCH 692/828] media: i2c: ov9281: Initialize id_msb to zero in
+ ov9281_check_sensor_id()
+
+Clang warns:
+
+  drivers/media/i2c/ov9281.c:1132:6: warning: variable 'id_msb' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
+          if (!ret)
+              ^~~~
+  drivers/media/i2c/ov9281.c:1135:9: note: uninitialized use occurs here
+          id |= (id_msb << 8);
+                 ^~~~~~
+  drivers/media/i2c/ov9281.c:1132:2: note: remove the 'if' if its condition is always true
+          if (!ret)
+          ^~~~~~~~~
+  drivers/media/i2c/ov9281.c:1127:20: note: initialize the variable 'id_msb' to silence this warning
+          u32 id = 0, id_msb;
+                            ^
+                             = 0
+  1 warning generated.
+
+If the first ov9281_read_reg() call fails, id_msb will be used
+uninitialized. However, this warning does not actually matter in
+practice because the value of id is not used when either call to
+ov9281_read_reg() fails, as the boolean OR will short circuit due to the
+ret condition being checked first. Regardless, it is not good to use
+variables uninitialized so silence the warning by initializing id_msb to
+0, as was done with id.
+
+Fixes: 20855581e0eb ("media: i2c: ov9281: Read chip ID via 2 reads")
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
+---
+ drivers/media/i2c/ov9281.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/media/i2c/ov9281.c
++++ b/drivers/media/i2c/ov9281.c
+@@ -1124,7 +1124,7 @@ static int ov9281_check_sensor_id(struct
+ 				  struct i2c_client *client)
+ {
+ 	struct device *dev = &ov9281->client->dev;
+-	u32 id = 0, id_msb;
++	u32 id = 0, id_msb = 0;
+ 	int ret;
+ 
+ 	ret = ov9281_read_reg(client, OV9281_REG_CHIP_ID + 1,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0693-i2c-bcm2835-Make-clock-stretch-timeout-configurable.patch b/root/target/linux/bcm27xx/patches-5.15/950-0693-i2c-bcm2835-Make-clock-stretch-timeout-configurable.patch
new file mode 100644
index 00000000..a62a9706
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0693-i2c-bcm2835-Make-clock-stretch-timeout-configurable.patch
@@ -0,0 +1,44 @@
+From 2bb5d35dc24534d63c14c7bc2ad19385026b5e05 Mon Sep 17 00:00:00 2001
+From: Alex Crawford <raspberrypi/linux@code.acrawford.com>
+Date: Fri, 28 Jan 2022 13:36:51 -0800
+Subject: [PATCH 693/828] i2c: bcm2835: Make clock-stretch timeout configurable
+
+The default clock-stretch timeout is 35 mS, which works well for
+SMBus, but there are some I2C devices which can stretch the clock even
+longer. Rather than trying to prescribe a safe default for everyone,
+allow the timeout to be configured.
+
+Signed-off-by: Alex Crawford <raspberrypi/linux@code.acrawford.com>
+---
+ drivers/i2c/busses/i2c-bcm2835.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+--- a/drivers/i2c/busses/i2c-bcm2835.c
++++ b/drivers/i2c/busses/i2c-bcm2835.c
+@@ -60,6 +60,10 @@ static unsigned int debug;
+ module_param(debug, uint, 0644);
+ MODULE_PARM_DESC(debug, "1=err, 2=isr, 3=xfer");
+ 
++static unsigned int clk_tout_ms = 35; /* SMBUs-recommended 35ms */
++module_param(clk_tout_ms, uint, 0644);
++MODULE_PARM_DESC(clk_tout_ms, "clock-stretch timeout (mS)");
++
+ #define BCM2835_DEBUG_MAX	512
+ struct bcm2835_debug {
+ 	struct i2c_msg *msg;
+@@ -219,12 +223,12 @@ static int clk_bcm2835_i2c_set_rate(stru
+ 			   (redl << BCM2835_I2C_REDL_SHIFT));
+ 
+ 	/*
+-	 * Set the clock stretch timeout to the SMBUs-recommended 35ms.
++	 * Set the clock stretch timeout.
+ 	 */
+-	if (rate > 0xffff*1000/35)
++	if (rate > 0xffff*1000/clk_tout_ms)
+ 	    clk_tout = 0xffff;
+ 	else
+-	    clk_tout = 35*rate/1000;
++	    clk_tout = clk_tout_ms*rate/1000;
+ 
+ 	bcm2835_i2c_writel(div->i2c_dev, BCM2835_I2C_CLKT, clk_tout);
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0694-Patching-lan78xx-for-SOF_TIMESTAMPING_TX_SOFTWARE-su.patch b/root/target/linux/bcm27xx/patches-5.15/950-0694-Patching-lan78xx-for-SOF_TIMESTAMPING_TX_SOFTWARE-su.patch
new file mode 100644
index 00000000..d32bb70d
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0694-Patching-lan78xx-for-SOF_TIMESTAMPING_TX_SOFTWARE-su.patch
@@ -0,0 +1,20 @@
+From fb27f766e08737dbde1bf7e3452b3bfcf10528ce Mon Sep 17 00:00:00 2001
+From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com>
+Date: Sat, 29 Jan 2022 10:01:36 +0000
+Subject: [PATCH 694/828] Patching lan78xx for SOF_TIMESTAMPING_TX_SOFTWARE
+ support
+
+---
+ drivers/net/usb/lan78xx.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/usb/lan78xx.c
++++ b/drivers/net/usb/lan78xx.c
+@@ -1788,6 +1788,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,
++	.get_ts_info    = ethtool_op_get_ts_info,
+ };
+ 
+ static void lan78xx_init_mac_address(struct lan78xx_net *dev)
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0695-drm-vc4-Add-DRM-210101010-RGB-formats-for-hvs5.patch b/root/target/linux/bcm27xx/patches-5.15/950-0695-drm-vc4-Add-DRM-210101010-RGB-formats-for-hvs5.patch
new file mode 100644
index 00000000..e38e9789
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0695-drm-vc4-Add-DRM-210101010-RGB-formats-for-hvs5.patch
@@ -0,0 +1,51 @@
+From 9a1759f31651fdac8dbe4c9d14d15ba70a5f185d Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 31 Jan 2022 16:28:43 +0000
+Subject: [PATCH 695/828] drm/vc4: Add DRM 210101010 RGB formats for hvs5.
+
+HVS5 supports the 210101010 RGB[A|X] formats, but they were
+missing from the DRM to HVS mapping list, so weren't available.
+Add them in.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_plane.c | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_plane.c
++++ b/drivers/gpu/drm/vc4/vc4_plane.c
+@@ -135,6 +135,34 @@ static const struct hvs_format {
+ 		.pixel_order = HVS_PIXEL_ORDER_XYCBCR,
+ 		.hvs5_only = true,
+ 	},
++	{
++		.drm = DRM_FORMAT_XRGB2101010,
++		.hvs = HVS_PIXEL_FORMAT_RGBA1010102,
++		.pixel_order = HVS_PIXEL_ORDER_ABGR,
++		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB,
++		.hvs5_only = true,
++	},
++	{
++		.drm = DRM_FORMAT_ARGB2101010,
++		.hvs = HVS_PIXEL_FORMAT_RGBA1010102,
++		.pixel_order = HVS_PIXEL_ORDER_ABGR,
++		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB,
++		.hvs5_only = true,
++	},
++	{
++		.drm = DRM_FORMAT_ABGR2101010,
++		.hvs = HVS_PIXEL_FORMAT_RGBA1010102,
++		.pixel_order = HVS_PIXEL_ORDER_ARGB,
++		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
++		.hvs5_only = true,
++	},
++	{
++		.drm = DRM_FORMAT_XBGR2101010,
++		.hvs = HVS_PIXEL_FORMAT_RGBA1010102,
++		.pixel_order = HVS_PIXEL_ORDER_ARGB,
++		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
++		.hvs5_only = true,
++	},
+ };
+ 
+ static const struct hvs_format *vc4_get_hvs_format(u32 drm_format)
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0696-overlays-Add-spi0-0cs-overlay.patch b/root/target/linux/bcm27xx/patches-5.15/950-0696-overlays-Add-spi0-0cs-overlay.patch
new file mode 100644
index 00000000..7f43d70b
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0696-overlays-Add-spi0-0cs-overlay.patch
@@ -0,0 +1,84 @@
+From 43bc5220fa63ca67db69e71868a138dbb515bb03 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Mon, 31 Jan 2022 21:01:25 +0000
+Subject: [PATCH 696/828] overlays: Add spi0-0cs overlay
+
+An overlay to enable SPI0 without claiming any chip select GPIOs.
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/Makefile           |  1 +
+ arch/arm/boot/dts/overlays/README             |  8 ++++
+ .../boot/dts/overlays/spi0-0cs-overlay.dts    | 39 +++++++++++++++++++
+ 3 files changed, 48 insertions(+)
+ create mode 100644 arch/arm/boot/dts/overlays/spi0-0cs-overlay.dts
+
+--- a/arch/arm/boot/dts/overlays/Makefile
++++ b/arch/arm/boot/dts/overlays/Makefile
+@@ -195,6 +195,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
+ 	spi-gpio35-39.dtbo \
+ 	spi-gpio40-45.dtbo \
+ 	spi-rtc.dtbo \
++	spi0-0cs.dtbo \
+ 	spi0-1cs.dtbo \
+ 	spi0-2cs.dtbo \
+ 	spi1-1cs.dtbo \
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -3115,6 +3115,14 @@ Params: ds3232                  Select t
+         cs_high                 This device requires an active-high CS
+ 
+ 
++Name:   spi0-0cs
++Info:   Don't claim any CS pins for SPI0. Requires a device with its chip
++        select permanently enabled, but frees a GPIO for e.g. a DPI display.
++Load:   dtoverlay=spi0-0cs,<param>=<val>
++Params: no_miso                 Don't claim and use the MISO pin (9), freeing
++                                it for other uses.
++
++
+ Name:   spi0-1cs
+ Info:   Only use one CS pin for SPI0
+ Load:   dtoverlay=spi0-1cs,<param>=<val>
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/spi0-0cs-overlay.dts
+@@ -0,0 +1,39 @@
++/dts-v1/;
++/plugin/;
++
++/ {
++	compatible = "brcm,bcm2835";
++
++	fragment@0 {
++		target = <&spi0_cs_pins>;
++		frag0: __overlay__ {
++			brcm,pins;
++		};
++	};
++
++	fragment@1 {
++		target = <&spi0>;
++		__overlay__ {
++			cs-gpios;
++			status = "okay";
++		};
++	};
++
++	fragment@2 {
++		target = <&spidev1>;
++		__overlay__ {
++			status = "disabled";
++		};
++	};
++
++	fragment@3 {
++		target = <&spi0_pins>;
++		__dormant__ {
++			brcm,pins = <10 11>;
++		};
++	};
++
++	__overrides__ {
++		no_miso = <0>,"=3";
++	};
++};
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0697-dtoverlays-Rework-vc4-kms-dpi-overlays-to-remove-dup.patch b/root/target/linux/bcm27xx/patches-5.15/950-0697-dtoverlays-Rework-vc4-kms-dpi-overlays-to-remove-dup.patch
new file mode 100644
index 00000000..93861fcf
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0697-dtoverlays-Rework-vc4-kms-dpi-overlays-to-remove-dup.patch
@@ -0,0 +1,545 @@
+From a951997d305889235725050ee8d4fe68c8504681 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 31 Jan 2022 17:25:19 +0000
+Subject: [PATCH 697/828] dtoverlays: Rework vc4-kms-dpi overlays to remove
+ duplication
+
+Removes all the common panel, dpi, and backlight configuration
+from the individual vc4-kms-dpi-* files into vc4-kms-dpi.dtsi.
+
+Creates a new vc4-kms-dpi-panel-overlay.dts for preconfigured
+panels, with overrides to enable the different panel configurations.
+
+Deprecates vc4-kms-dpi-at056tn53v1 as superceded by vc4-kms-dpi-panel.
+vc4-kms-kippah-7inch not deprecated for now as it is likely to be
+in wider use than at056tn53v1.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/Makefile           |   2 +-
+ arch/arm/boot/dts/overlays/README             |  33 ++++-
+ arch/arm/boot/dts/overlays/overlay_map.dts    |   4 +
+ .../vc4-kms-dpi-at056tn53v1-overlay.dts       |  44 ------
+ .../overlays/vc4-kms-dpi-generic-overlay.dts  | 138 ++++--------------
+ .../overlays/vc4-kms-dpi-panel-overlay.dts    |  62 ++++++++
+ arch/arm/boot/dts/overlays/vc4-kms-dpi.dtsi   | 109 ++++++++++++++
+ .../overlays/vc4-kms-kippah-7inch-overlay.dts |  27 +---
+ 8 files changed, 235 insertions(+), 184 deletions(-)
+ delete mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi-at056tn53v1-overlay.dts
+ create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi-panel-overlay.dts
+ create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi.dtsi
+
+--- a/arch/arm/boot/dts/overlays/Makefile
++++ b/arch/arm/boot/dts/overlays/Makefile
+@@ -234,8 +234,8 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
+ 	upstream-pi4.dtbo \
+ 	vc4-fkms-v3d.dtbo \
+ 	vc4-fkms-v3d-pi4.dtbo \
+-	vc4-kms-dpi-at056tn53v1.dtbo \
+ 	vc4-kms-dpi-generic.dtbo \
++	vc4-kms-dpi-panel.dtbo \
+ 	vc4-kms-dsi-7inch.dtbo \
+ 	vc4-kms-dsi-lt070me05000.dtbo \
+ 	vc4-kms-dsi-lt070me05000-v2.dtbo \
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -3624,10 +3624,8 @@ Params: cma-512                 CMA is 5
+ 
+ 
+ Name:   vc4-kms-dpi-at056tn53v1
+-Info:   Enable an Innolux 5.6in VGA TFT connected to DPI interface under KMS.
+-        Requires vc4-kms-v3d to be loaded.
+-Load:   dtoverlay=vc4-kms-dpi-at056tn53v1
+-Params: <None>
++Info:   This overlay is now deprecated - see vc4-kms-dpi-panel,at056tn53v1
++Load:   <Deprecated>
+ 
+ 
+ Name:   vc4-kms-dpi-generic
+@@ -3659,6 +3657,33 @@ Params: clock-frequency         Display
+         backlight-gpio          Defines a GPIO to be used for backlight control
+                                 (default of none).
+         backlight-pwm           Defines a PWM channel to be used for backlight
++                                control (default of none). NB Disables audio
++                                headphone output as that also uses PWM.
++        backlight-pwm-chan      Choose channel on &pwm node for backlight
++                                control.
++                                (default 0).
++        backlight-pwm-gpio      GPIO pin to be used for the PWM backlight. See
++                                pwm-2chan for valid options.
++                                (default 18 - note this can only work with
++                                 rgb666-padhi).
++        backlight-pwm-func      Pin function of GPIO used for the PWM
++                                backlight.
++                                See pwm-2chan for valid options.
++                                (default 2).
++        backlight-def-brightness
++                                Set the default brightness. Normal range 1-16.
++                                (default 16).
++
++
++Name:   vc4-kms-dpi-panel
++Info:   Enable a preconfigured KMS DPI panel.
++        Requires vc4-kms-v3d to be loaded.
++Load:   dtoverlay=vc4-kms-dpi-panel,<param>=<val>
++Params: at056tn53v1             Enable an Innolux 5.6in VGA TFT
++        kippah-7inch            Enable an Adafruit Kippah with 7inch panel.
++        backlight-gpio          Defines a GPIO to be used for backlight control
++                                (default of none).
++        backlight-pwm           Defines a PWM channel to be used for backlight
+                                 control (default of none). NB Disables audio
+                                 headphone output as that also uses PWM.
+         backlight-pwm-chan      Choose channel on &pwm node for backlight
+--- a/arch/arm/boot/dts/overlays/overlay_map.dts
++++ b/arch/arm/boot/dts/overlays/overlay_map.dts
+@@ -151,6 +151,10 @@
+ 		bcm2711;
+ 	};
+ 
++	vc4-kms-dpi-at056tn53v1 {
++		deprecated = "use vc4-kms-dpi-panel,at056tn53v1";
++	};
++
+ 	vc4-kms-v3d {
+ 		bcm2835;
+ 		bcm2711 = "vc4-kms-v3d-pi4";
+--- a/arch/arm/boot/dts/overlays/vc4-kms-dpi-at056tn53v1-overlay.dts
++++ /dev/null
+@@ -1,44 +0,0 @@
+-/*
+- * vc4-kms-dpi-at056tn53v1-overlay.dts
+- */
+-
+-/dts-v1/;
+-/plugin/;
+-
+-#include <dt-bindings/gpio/gpio.h>
+-#include <dt-bindings/pinctrl/bcm2835.h>
+-
+-/ {
+-	compatible = "brcm,bcm2835";
+-
+-	fragment@0 {
+-		target-path = "/";
+-		__overlay__ {
+-			panel: panel {
+-				compatible = "innolux,at056tn53v1", "simple-panel";
+-
+-				port {
+-					panel_in: endpoint {
+-						remote-endpoint = <&dpi_out>;
+-					};
+-				};
+-			};
+-		};
+-	};
+-
+-	fragment@1 {
+-		target = <&dpi>;
+-		__overlay__  {
+-			status = "okay";
+-
+-			pinctrl-names = "default";
+-			pinctrl-0 = <&dpi_18bit_cpadhi_gpio0>;
+-
+-			port {
+-				dpi_out: endpoint {
+-					remote-endpoint = <&panel_in>;
+-				};
+-			};
+-		};
+-	};
+-};
+--- a/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
+@@ -5,124 +5,43 @@
+ /dts-v1/;
+ /plugin/;
+ 
+-#include <dt-bindings/gpio/gpio.h>
+-#include <dt-bindings/pinctrl/bcm2835.h>
++#include "vc4-kms-dpi.dtsi"
+ 
+ / {
+ 	compatible = "brcm,bcm2835";
+ 
+ 	fragment@0 {
+-		target-path = "/";
+-		__overlay__ {
+-			panel: panel {
+-				compatible = "panel-dpi";
+-
+-				width-mm = <154>;
+-				height-mm = <83>;
+-				bus-format = <0x1009>;
+-
+-				timing: panel-timing {
+-					clock-frequency = <29500000>;
+-					hactive = <800>;
+-					hfront-porch = <24>;
+-					hsync-len = <72>;
+-					hback-porch = <96>;
+-					hsync-active = <1>;
+-					vactive = <480>;
+-					vfront-porch = <3>;
+-					vsync-len = <10>;
+-					vback-porch = <7>;
+-					vsync-active = <1>;
+-
+-					de-active = <1>;
+-					pixelclk-active = <1>;
+-				};
+-
+-				port {
+-					panel_in: endpoint {
+-						remote-endpoint = <&dpi_out>;
+-					};
+-				};
+-			};
+-		};
+-	};
+-
+-	fragment@1 {
+-		target = <&dpi>;
+-		dpi_node: __overlay__  {
+-			status = "okay";
+-
+-			pinctrl-names = "default";
+-			pinctrl-0 = <&dpi_18bit_gpio0>;
+-
+-			port {
+-				dpi_out: endpoint {
+-					remote-endpoint = <&panel_in>;
+-				};
+-			};
+-		};
+-	};
+-
+-	fragment@2 {
+-		target = <&panel>;
+-		__dormant__  {
+-			backlight = <&backlight>;
+-		};
+-	};
+-
+-	fragment@3 {
+-		target-path = "/";
+-		__dormant__  {
+-			backlight: backlight {
+-				compatible = "gpio-backlight";
+-				gpios = <&gpio 255 GPIO_ACTIVE_HIGH>;
+-			};
+-		};
+-	};
+-
+-	fragment@4 {
+ 		target = <&panel>;
+-		__dormant__  {
+-			backlight = <&backlight_pwm>;
+-		};
+-	};
+-
+-	fragment@5 {
+-		target-path = "/";
+-		__dormant__  {
+-			backlight_pwm: backlight_pwm {
+-				compatible = "pwm-backlight";
+-				brightness-levels = <0 6 8 12 16 24 32 40 48 64 96 128 160 192 224 255>;
+-				default-brightness-level = <16>;
+-				pwms = <&pwm 0 200000>;
+-			};
+-		};
+-	};
++		__overlay__  {
++			compatible = "panel-dpi";
+ 
+-	fragment@6 {
+-		target = <&pwm>;
+-		__dormant__ {
+-			pinctrl-names = "default";
+-			pinctrl-0 = <&pwm_pins>;
+-			assigned-clock-rates = <1000000>;
+-			status = "okay";
+-		};
+-	};
++			width-mm = <154>;
++			height-mm = <83>;
++			bus-format = <0x1009>;
++
++			timing: panel-timing {
++				clock-frequency = <29500000>;
++				hactive = <800>;
++				hfront-porch = <24>;
++				hsync-len = <72>;
++				hback-porch = <96>;
++				hsync-active = <1>;
++				vactive = <480>;
++				vfront-porch = <3>;
++				vsync-len = <10>;
++				vback-porch = <7>;
++				vsync-active = <1>;
+ 
+-	fragment@7 {
+-		target = <&gpio>;
+-		__dormant__ {
+-			pwm_pins: pwm_pins {
+-				brcm,pins = <18>;
+-				brcm,function = <2>; /* Alt5 */
++				de-active = <1>;
++				pixelclk-active = <1>;
+ 			};
+ 		};
+ 	};
+ 
+-	fragment@8 {
+-		target = <&audio>;
+-		__dormant__  {
+-		    brcm,disable-headphones;
++	fragment@1 {
++		target = <&dpi>;
++		__overlay__  {
++			pinctrl-0 = <&dpi_18bit_gpio0>;
+ 		};
+ 	};
+ 
+@@ -151,12 +70,5 @@
+ 		rgb888 = <&panel>, "bus-format:0=0x100a",
+ 			<&dpi_node>, "pinctrl-0:0=",<&dpi_gpio0>;
+ 		bus-format = <&panel>, "bus-format:0";
+-		backlight-gpio = <0>, "+2+3",
+-			<&backlight>, "gpios:4";
+-		backlight-pwm = <0>, "+4+5+6+7+8";
+-		backlight-pwm-chan = <&backlight_pwm>, "pwms:4";
+-		backlight-pwm-gpio = <&pwm_pins>, "brcm,pins:0";
+-		backlight-pwm-func = <&pwm_pins>, "brcm,function:0";
+-		backlight-def-brightness = <&backlight_pwm>, "default-brightness-level:0";
+ 	};
+ };
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-panel-overlay.dts
+@@ -0,0 +1,62 @@
++/*
++ * vc4-kms-dpi-panel-overlay.dts
++ * Support for any predefined DPI panel.
++ */
++
++/dts-v1/;
++/plugin/;
++
++#include "vc4-kms-dpi.dtsi"
++
++/ {
++	compatible = "brcm,bcm2835";
++
++	fragment@0 {
++		target = <&panel>;
++		__dormant__  {
++			compatible = "innolux,at056tn53v1", "simple-panel";
++		};
++	};
++	fragment@1 {
++		target = <&panel>;
++		__dormant__  {
++			compatible = "ontat,yx700wv03", "simple-panel";
++		};
++	};
++
++	fragment@90 {
++		target = <&dpi>;
++		__dormant__  {
++			pinctrl-0 = <&dpi_18bit_cpadhi_gpio0>;
++		};
++	};
++	fragment@91 {
++		target = <&dpi>;
++		__dormant__  {
++			pinctrl-0 = <&dpi_18bit_gpio0>;
++		};
++	};
++	fragment@92 {
++		target = <&dpi>;
++		__dormant__  {
++			pinctrl-0 = <&dpi_gpio0>;
++		};
++	};
++	fragment@93 {
++		target = <&dpi>;
++		__dormant__  {
++			pinctrl-0 = <&dpi_16bit_cpadhi_gpio0>;
++		};
++	};
++	fragment@94 {
++		target = <&dpi>;
++		__dormant__  {
++			pinctrl-0 = <&dpi_16bit_gpio0>;
++		};
++	};
++
++	__overrides__ {
++		at056tn53v1 = <0>, "+0+90";
++		kippah-7inch = <0>, "+1+91";
++	};
++};
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi.dtsi
+@@ -0,0 +1,109 @@
++/*
++ * vc4-kms-dpi.dtsi
++ */
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/pinctrl/bcm2835.h>
++
++/ {
++	fragment@100 {
++		target-path = "/";
++		__overlay__ {
++			panel: panel {
++				port {
++					panel_in: endpoint {
++						remote-endpoint = <&dpi_out>;
++					};
++				};
++			};
++		};
++	};
++
++	fragment@101 {
++		target = <&dpi>;
++		dpi_node: __overlay__  {
++			status = "okay";
++
++			pinctrl-names = "default";
++
++			port {
++				dpi_out: endpoint {
++					remote-endpoint = <&panel_in>;
++				};
++			};
++		};
++	};
++
++	fragment@102 {
++		target = <&panel>;
++		__dormant__  {
++			backlight = <&backlight>;
++		};
++	};
++
++	fragment@103 {
++		target-path = "/";
++		__dormant__  {
++			backlight: backlight {
++				compatible = "gpio-backlight";
++				gpios = <&gpio 255 GPIO_ACTIVE_HIGH>;
++			};
++		};
++	};
++
++	fragment@104 {
++		target = <&panel>;
++		__dormant__  {
++			backlight = <&backlight_pwm>;
++		};
++	};
++
++	fragment@105 {
++		target-path = "/";
++		__dormant__  {
++			backlight_pwm: backlight_pwm {
++				compatible = "pwm-backlight";
++				brightness-levels = <0 6 8 12 16 24 32 40 48 64 96 128 160 192 224 255>;
++				default-brightness-level = <16>;
++				pwms = <&pwm 0 200000>;
++			};
++		};
++	};
++
++	fragment@106 {
++		target = <&pwm>;
++		__dormant__ {
++			pinctrl-names = "default";
++			pinctrl-0 = <&pwm_pins>;
++			assigned-clock-rates = <1000000>;
++			status = "okay";
++		};
++	};
++
++	fragment@107 {
++		target = <&gpio>;
++		__dormant__ {
++			pwm_pins: pwm_pins {
++				brcm,pins = <18>;
++				brcm,function = <2>; /* Alt5 */
++			};
++		};
++	};
++
++	fragment@108 {
++		target = <&audio>;
++		__dormant__  {
++		    brcm,disable-headphones;
++		};
++	};
++
++	__overrides__ {
++		backlight-gpio = <0>, "+102+103",
++			<&backlight>, "gpios:4";
++		backlight-pwm = <0>, "+104+105+106+107+108";
++		backlight-pwm-chan = <&backlight_pwm>, "pwms:4";
++		backlight-pwm-gpio = <&pwm_pins>, "brcm,pins:0";
++		backlight-pwm-func = <&pwm_pins>, "brcm,function:0";
++		backlight-def-brightness = <&backlight_pwm>, "default-brightness-level:0";
++	};
++};
+--- a/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts
++++ b/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts
+@@ -1,43 +1,26 @@
+ /*
+- * vc4-kms-v3d-overlay.dts
++ * vc4-kms-kippah-7inch-overlay.dts
+  */
+ 
+ /dts-v1/;
+ /plugin/;
+ 
+-#include <dt-bindings/pinctrl/bcm2835.h>
++#include "vc4-kms-dpi.dtsi"
+ 
+ / {
+ 	compatible = "brcm,bcm2835";
+ 
+ 	fragment@0 {
+-		target-path = "/";
+-		__overlay__ {
+-			panel: panel {
+-				compatible = "ontat,yx700wv03", "simple-panel";
+-
+-				port {
+-					panel_in: endpoint {
+-						remote-endpoint = <&dpi_out>;
+-					};
+-				};
+-			};
++		target = <&panel>;
++		__overlay__  {
++			compatible = "ontat,yx700wv03", "simple-panel";
+ 		};
+ 	};
+ 
+ 	fragment@1 {
+ 		target = <&dpi>;
+ 		__overlay__  {
+-			status = "okay";
+-
+-			pinctrl-names = "default";
+ 			pinctrl-0 = <&dpi_18bit_gpio0>;
+-
+-			port {
+-				dpi_out: endpoint@0 {
+-					remote-endpoint = <&panel_in>;
+-				};
+-			};
+ 		};
+ 	};
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0698-media-uapi-Document-format-MEDIA_BUS_FMT_RGB565_1X24.patch b/root/target/linux/bcm27xx/patches-5.15/950-0698-media-uapi-Document-format-MEDIA_BUS_FMT_RGB565_1X24.patch
new file mode 100644
index 00000000..d2c1d3b8
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0698-media-uapi-Document-format-MEDIA_BUS_FMT_RGB565_1X24.patch
@@ -0,0 +1,60 @@
+From 6cb38270b0701051abe8d182c4310139614ce44d Mon Sep 17 00:00:00 2001
+From: Chris Morgan <macromorgan@hotmail.com>
+Date: Fri, 28 Jan 2022 17:37:43 -0600
+Subject: [PATCH 698/828] media: uapi: Document format
+ MEDIA_BUS_FMT_RGB565_1X24_CPADHI
+
+Add support for MEDIA_BUS_FMT_RGB565_1X24_CPADHI. This format is used
+by the Geekworm MZP280 panel which interfaces with the Raspberry Pi.
+
+Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
+---
+ .../media/v4l/subdev-formats.rst              | 37 +++++++++++++++++++
+ 1 file changed, 37 insertions(+)
+
+--- a/Documentation/userspace-api/media/v4l/subdev-formats.rst
++++ b/Documentation/userspace-api/media/v4l/subdev-formats.rst
+@@ -624,6 +624,43 @@ The following tables list existing packe
+       - b\ :sub:`2`
+       - b\ :sub:`1`
+       - b\ :sub:`0`
++    * .. _MEDIA_BUS_FMT_RGB565_1X24_CPADHI:
++
++      - MEDIA_BUS_FMT_RGB565_1X24_CPADHI
++      - 0x1020
++      -
++      -
++      -
++      -
++      -
++      -
++      -
++      -
++      -
++      - 0
++      - 0
++      - 0
++      - r\ :sub:`4`
++      - r\ :sub:`3`
++      - r\ :sub:`2`
++      - r\ :sub:`1`
++      - r\ :sub:`0`
++      - 0
++      - 0
++      - g\ :sub:`5`
++      - g\ :sub:`4`
++      - g\ :sub:`3`
++      - g\ :sub:`2`
++      - g\ :sub:`1`
++      - g\ :sub:`0`
++      - 0
++      - 0
++      - 0
++      - b\ :sub:`4`
++      - b\ :sub:`3`
++      - b\ :sub:`2`
++      - b\ :sub:`1`
++      - b\ :sub:`0`
+     * .. _MEDIA-BUS-FMT-BGR565-2X8-BE:
+ 
+       - MEDIA_BUS_FMT_BGR565_2X8_BE
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0699-media-uapi-add-MEDIA_BUS_FMT_RGB565_1X24_CPADHI.patch b/root/target/linux/bcm27xx/patches-5.15/950-0699-media-uapi-add-MEDIA_BUS_FMT_RGB565_1X24_CPADHI.patch
new file mode 100644
index 00000000..7cd1ae89
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0699-media-uapi-add-MEDIA_BUS_FMT_RGB565_1X24_CPADHI.patch
@@ -0,0 +1,31 @@
+From 11ffcf80d1057e3444237d7f612a7f7dc24de145 Mon Sep 17 00:00:00 2001
+From: Chris Morgan <macromorgan@hotmail.com>
+Date: Fri, 28 Jan 2022 17:38:40 -0600
+Subject: [PATCH 699/828] media: uapi: add MEDIA_BUS_FMT_RGB565_1X24_CPADHI
+
+Add the MEDIA_BUS_FMT_RGB565_1X24_CPADHI format used by the Geekworm
+MZP280 panel for the Raspberry Pi.
+
+Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
+---
+ include/uapi/linux/media-bus-format.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/include/uapi/linux/media-bus-format.h
++++ b/include/uapi/linux/media-bus-format.h
+@@ -34,13 +34,14 @@
+ 
+ #define MEDIA_BUS_FMT_FIXED			0x0001
+ 
+-/* RGB - next is	0x1020 */
++/* RGB - next is	0x1021 */
+ #define MEDIA_BUS_FMT_RGB444_1X12		0x1016
+ #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE	0x1001
+ #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE	0x1002
+ #define MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE	0x1003
+ #define MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE	0x1004
+ #define MEDIA_BUS_FMT_RGB565_1X16		0x1017
++#define MEDIA_BUS_FMT_RGB565_1X24_CPADHI	0x1020
+ #define MEDIA_BUS_FMT_BGR565_2X8_BE		0x1005
+ #define MEDIA_BUS_FMT_BGR565_2X8_LE		0x1006
+ #define MEDIA_BUS_FMT_RGB565_2X8_BE		0x1007
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0700-drm-vc4-dpi-Support-DPI-interface-in-mode3-for-RGB56.patch b/root/target/linux/bcm27xx/patches-5.15/950-0700-drm-vc4-dpi-Support-DPI-interface-in-mode3-for-RGB56.patch
new file mode 100644
index 00000000..53821292
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0700-drm-vc4-dpi-Support-DPI-interface-in-mode3-for-RGB56.patch
@@ -0,0 +1,31 @@
+From c63a1b63d37c4c0a13108a87dae408ab288a126a Mon Sep 17 00:00:00 2001
+From: Chris Morgan <macromorgan@hotmail.com>
+Date: Fri, 28 Jan 2022 17:39:54 -0600
+Subject: [PATCH 700/828] drm/vc4: dpi: Support DPI interface in mode3 for
+ RGB565
+
+Add support for the VC4 DPI driver to utilize DPI mode 3. This is
+defined here as xxxRRRRRxxGGGGGGxxxBBBBB:
+https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#parallel-display-interface-dpi
+
+This mode is required to use the Geekworm MZP280 DPI display.
+
+Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
+Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dpi.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_dpi.c
++++ b/drivers/gpu/drm/vc4/vc4_dpi.c
+@@ -191,6 +191,10 @@ static void vc4_dpi_encoder_enable(struc
+ 				dpi_c |= VC4_SET_FIELD(DPI_FORMAT_16BIT_565_RGB_3,
+ 						       DPI_FORMAT);
+ 				break;
++			case MEDIA_BUS_FMT_RGB565_1X24_CPADHI:
++				dpi_c |= VC4_SET_FIELD(DPI_FORMAT_16BIT_565_RGB_2,
++						       DPI_FORMAT);
++				break;
+ 			}
+ 		} else {
+ 			/* Default to 18bit if no connector found. */
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0701-dt-bindings-vendor-prefixes-Add-Geekworm.patch b/root/target/linux/bcm27xx/patches-5.15/950-0701-dt-bindings-vendor-prefixes-Add-Geekworm.patch
new file mode 100644
index 00000000..82428600
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0701-dt-bindings-vendor-prefixes-Add-Geekworm.patch
@@ -0,0 +1,23 @@
+From 6e684a2e53b3ed3706c7d1d93d55742d939c37eb Mon Sep 17 00:00:00 2001
+From: Chris Morgan <macromorgan@hotmail.com>
+Date: Fri, 28 Jan 2022 17:40:50 -0600
+Subject: [PATCH 701/828] dt-bindings: vendor-prefixes: Add Geekworm
+
+Add vendor prefix for Geekworm (https://geekworm.com).
+
+Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
+---
+ Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
++++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
+@@ -439,6 +439,8 @@ patternProperties:
+     description: General Electric Company
+   "^geekbuying,.*":
+     description: GeekBuying
++  "^geekworm,.*":
++    description: Geekworm
+   "^gef,.*":
+     description: GE Fanuc Intelligent Platforms Embedded Systems, Inc.
+   "^GEFanuc,.*":
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0702-dt-bindings-display-simple-add-Geekworm-MZP280-Panel.patch b/root/target/linux/bcm27xx/patches-5.15/950-0702-dt-bindings-display-simple-add-Geekworm-MZP280-Panel.patch
new file mode 100644
index 00000000..3577af3b
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0702-dt-bindings-display-simple-add-Geekworm-MZP280-Panel.patch
@@ -0,0 +1,34 @@
+From f0cdb93b67c1347798a2d6bee570a16c27eddfd6 Mon Sep 17 00:00:00 2001
+From: Chris Morgan <macromorgan@hotmail.com>
+Date: Fri, 28 Jan 2022 17:41:18 -0600
+Subject: [PATCH 702/828] dt-bindings: display: simple: add Geekworm MZP280
+ Panel
+
+The Geekworm MZP280 panel is a 480x640 (portrait) panel with a
+capacitive touch interface and a 40 pin header meant to interface
+directly with the Raspberry Pi. The screen is 2.8 inches diagonally,
+and there appear to be at least 4 distinct versions all with the same
+panel timings.
+
+Timings were derived from drivers posted on the github located here:
+https://github.com/tianyoujian/MZDPI/tree/master/vga
+
+Additional details about this panel family can be found here:
+https://wiki.geekworm.com/2.8_inch_Touch_Screen_for_Pi_zero
+
+Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
+---
+ .../devicetree/bindings/display/panel/panel-simple.yaml         | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/Documentation/devicetree/bindings/display/panel/panel-simple.yaml
++++ b/Documentation/devicetree/bindings/display/panel/panel-simple.yaml
+@@ -148,6 +148,8 @@ properties:
+       - frida,frd350h54004
+         # FriendlyELEC HD702E 800x1280 LCD panel
+       - friendlyarm,hd702e
++        # Geekworm MZP280 2.8" 480x640 LCD panel with capacitive touch
++      - geekworm,mzp280
+         # GiantPlus GPG48273QS5 4.3" (480x272) WQVGA TFT LCD panel
+       - giantplus,gpg48273qs5
+         # GiantPlus GPM940B0 3.0" QVGA TFT LCD panel
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0703-drm-panel-simple-add-Geekworm-MZP280-Panel.patch b/root/target/linux/bcm27xx/patches-5.15/950-0703-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
new file mode 100644
index 00000000..3ca00523
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0703-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
@@ -0,0 +1,58 @@
+From b0c0af6932615dde6580e57445c4e00e84d1bb46 Mon Sep 17 00:00:00 2001
+From: Chris Morgan <macromorgan@hotmail.com>
+Date: Fri, 28 Jan 2022 17:42:12 -0600
+Subject: [PATCH 703/828] drm/panel: simple: add Geekworm MZP280 Panel
+
+Add support for the Geekworm MZP280 Panel
+
+Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
+Acked-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/panel/panel-simple.c | 29 ++++++++++++++++++++++++++++
+ 1 file changed, 29 insertions(+)
+
+--- a/drivers/gpu/drm/panel/panel-simple.c
++++ b/drivers/gpu/drm/panel/panel-simple.c
+@@ -2321,6 +2321,32 @@ static const struct panel_desc friendlya
+ 	},
+ };
+ 
++static const struct drm_display_mode geekworm_mzp280_mode = {
++	.clock = 32000,
++	.hdisplay = 480,
++	.hsync_start = 480 + 41,
++	.hsync_end = 480 + 41 + 20,
++	.htotal = 480 + 41 + 20 + 60,
++	.vdisplay = 640,
++	.vsync_start = 640 + 5,
++	.vsync_end = 640 + 5 + 10,
++	.vtotal = 640 + 5 + 10 + 10,
++	.flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC,
++};
++
++static const struct panel_desc geekworm_mzp280 = {
++	.modes = &geekworm_mzp280_mode,
++	.num_modes = 1,
++	.bpc = 6,
++	.size = {
++		.width = 47,
++		.height = 61,
++	},
++	.bus_format = MEDIA_BUS_FMT_RGB565_1X24_CPADHI,
++	.bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE,
++	.connector_type = DRM_MODE_CONNECTOR_DPI,
++};
++
+ static const struct drm_display_mode giantplus_gpg482739qs5_mode = {
+ 	.clock = 9000,
+ 	.hdisplay = 480,
+@@ -4701,6 +4727,9 @@ static const struct of_device_id platfor
+ 		.compatible = "friendlyarm,hd702e",
+ 		.data = &friendlyarm_hd702e,
+ 	}, {
++		.compatible = "geekworm,mzp280",
++		.data = &geekworm_mzp280,
++	}, {
+ 		.compatible = "giantplus,gpg482739qs5",
+ 		.data = &giantplus_gpg482739qs5
+ 	}, {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0704-overlays-README-Deprecate-vc4-kms-kippah-7inch.patch b/root/target/linux/bcm27xx/patches-5.15/950-0704-overlays-README-Deprecate-vc4-kms-kippah-7inch.patch
new file mode 100644
index 00000000..7c03a200
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0704-overlays-README-Deprecate-vc4-kms-kippah-7inch.patch
@@ -0,0 +1,31 @@
+From 1b2460f8a38c54527faebbde41017b6716e9fa6c Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Wed, 2 Feb 2022 09:11:20 +0000
+Subject: [PATCH 704/828] overlays: README: Deprecate vc4-kms-kippah-7inch
+
+The vc4-kms-kippah-7inch overlay has been replaced by the container
+overlay vc4-kms-dpi-panel, using the "kippah-7inch" parameter. The
+original overlay has been retained for now to avoid breaking
+existing installations, but that doesn't make it any less deprecated,
+so update the README accordingly.
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/README | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -3737,10 +3737,8 @@ Params: <None>
+ 
+ 
+ Name:   vc4-kms-kippah-7inch
+-Info:   Enable the Adafruit DPI Kippah with the 7" Ontat panel attached.
+-        Requires vc4-kms-v3d to be loaded.
+-Load:   dtoverlay=vc4-kms-kippah-7inch
+-Params: <None>
++Info:   This overlay is now deprecated - see vc4-kms-dpi-panel,kippah-7inch
++Load:   <Deprecated>
+ 
+ 
+ Name:   vc4-kms-v3d
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0705-drm-panel-Add-and-initialise-an-orientation-field-to.patch b/root/target/linux/bcm27xx/patches-5.15/950-0705-drm-panel-Add-and-initialise-an-orientation-field-to.patch
new file mode 100644
index 00000000..8a5ff026
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0705-drm-panel-Add-and-initialise-an-orientation-field-to.patch
@@ -0,0 +1,89 @@
+From a987047e48613b1764161ad92abbda76e62cdda6 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Tue, 1 Feb 2022 12:20:20 +0000
+Subject: [PATCH 705/828] drm/panel: Add and initialise an orientation field to
+ drm_panel
+
+Current usage of drm_connector_set_panel_orientation is from a panel's
+get_modes call. However if the panel orientation property doesn't
+exist on the connector at this point, then drm_mode_object triggers
+WARNs as the connector is already registered.
+
+Add an orientation variable to struct drm_panel and initialise it from
+drm_panel_init.
+panel_bridge_attach can then create the property before the connector
+is registered.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/bridge/panel.c |  4 ++++
+ drivers/gpu/drm/drm_panel.c    | 15 ++++++++++-----
+ include/drm/drm_panel.h        |  8 ++++++++
+ 3 files changed, 22 insertions(+), 5 deletions(-)
+
+--- a/drivers/gpu/drm/bridge/panel.c
++++ b/drivers/gpu/drm/bridge/panel.c
+@@ -79,6 +79,10 @@ static int panel_bridge_attach(struct dr
+ 		return ret;
+ 	}
+ 
++	/* set up connector's "panel orientation" property */
++	drm_connector_set_panel_orientation(&panel_bridge->connector,
++					    panel_bridge->panel->orientation);
++
+ 	drm_connector_attach_encoder(&panel_bridge->connector,
+ 					  bridge->encoder);
+ 
+--- a/drivers/gpu/drm/drm_panel.c
++++ b/drivers/gpu/drm/drm_panel.c
+@@ -61,6 +61,9 @@ void drm_panel_init(struct drm_panel *pa
+ 	panel->dev = dev;
+ 	panel->funcs = funcs;
+ 	panel->connector_type = connector_type;
++
++	panel->orientation = DRM_MODE_PANEL_ORIENTATION_UNKNOWN;
++	of_drm_get_panel_orientation(dev->of_node, &panel->orientation);
+ }
+ EXPORT_SYMBOL(drm_panel_init);
+ 
+@@ -289,16 +292,18 @@ int of_drm_get_panel_orientation(const s
+ 	if (ret < 0)
+ 		return ret;
+ 
+-	if (rotation == 0)
++	if (rotation == 0) {
+ 		*orientation = DRM_MODE_PANEL_ORIENTATION_NORMAL;
+-	else if (rotation == 90)
++	} else if (rotation == 90) {
+ 		*orientation = DRM_MODE_PANEL_ORIENTATION_RIGHT_UP;
+-	else if (rotation == 180)
++	} else if (rotation == 180) {
+ 		*orientation = DRM_MODE_PANEL_ORIENTATION_BOTTOM_UP;
+-	else if (rotation == 270)
++	} else if (rotation == 270) {
+ 		*orientation = DRM_MODE_PANEL_ORIENTATION_LEFT_UP;
+-	else
++	} else {
++		DRM_ERROR("%pOF: invalid orientation %d\n", np, ret);
+ 		return -EINVAL;
++	}
+ 
+ 	return 0;
+ }
+--- a/include/drm/drm_panel.h
++++ b/include/drm/drm_panel.h
+@@ -166,6 +166,14 @@ struct drm_panel {
+ 	int connector_type;
+ 
+ 	/**
++	 * @orientation:
++	 *
++	 * Panel orientation at initialisation. This is used to initialise the
++	 * drm_connector property for panel orientation.
++	 */
++	enum drm_panel_orientation orientation;
++
++	/**
+ 	 * @list:
+ 	 *
+ 	 * Panel entry in registry.
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0706-drm-panel-simple-Remove-custom-handling-of-orientati.patch b/root/target/linux/bcm27xx/patches-5.15/950-0706-drm-panel-simple-Remove-custom-handling-of-orientati.patch
new file mode 100644
index 00000000..e3e7cb06
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0706-drm-panel-simple-Remove-custom-handling-of-orientati.patch
@@ -0,0 +1,48 @@
+From 6e5d9028efb0ac3d341d2f74e9b01b602e9dbf50 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Tue, 1 Feb 2022 12:24:51 +0000
+Subject: [PATCH 706/828] drm/panel: simple: Remove custom handling of
+ orientation
+
+Panel orientation is now handled by the drm_panel and
+panel_bridge frameworks, so remove the custom handling.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/panel/panel-simple.c | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+--- a/drivers/gpu/drm/panel/panel-simple.c
++++ b/drivers/gpu/drm/panel/panel-simple.c
+@@ -195,8 +195,6 @@ struct panel_simple {
+ 	struct edid *edid;
+ 
+ 	struct drm_display_mode override_mode;
+-
+-	enum drm_panel_orientation orientation;
+ };
+ 
+ static inline struct panel_simple *to_panel_simple(struct drm_panel *panel)
+@@ -533,9 +531,6 @@ static int panel_simple_get_modes(struct
+ 	/* add hard-coded panel modes */
+ 	num += panel_simple_get_non_edid_modes(p, connector);
+ 
+-	/* set up connector's "panel orientation" property */
+-	drm_connector_set_panel_orientation(connector, p->orientation);
+-
+ 	return num;
+ }
+ 
+@@ -702,12 +697,6 @@ static int panel_simple_probe(struct dev
+ 		return err;
+ 	}
+ 
+-	err = of_drm_get_panel_orientation(dev->of_node, &panel->orientation);
+-	if (err) {
+-		dev_err(dev, "%pOF: failed to get orientation %d\n", dev->of_node, err);
+-		return err;
+-	}
+-
+ 	ddc = of_parse_phandle(dev->of_node, "ddc-i2c-bus", 0);
+ 	if (ddc) {
+ 		panel->ddc = of_find_i2c_adapter_by_node(ddc);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0707-overlays-Add-rotate-property-to-vc4-kms-dpi-panel.patch b/root/target/linux/bcm27xx/patches-5.15/950-0707-overlays-Add-rotate-property-to-vc4-kms-dpi-panel.patch
new file mode 100644
index 00000000..7c5dc79d
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0707-overlays-Add-rotate-property-to-vc4-kms-dpi-panel.patch
@@ -0,0 +1,49 @@
+From be32d949072804d59356305fc6c056ef4c7eaa8e Mon Sep 17 00:00:00 2001
+From: Chris Morgan <macromorgan@hotmail.com>
+Date: Wed, 2 Feb 2022 10:42:00 -0600
+Subject: [PATCH 707/828] overlays: Add rotate property to vc4-kms-dpi-panel
+
+Allow a user to specify the panel rotation in devicetree as 0, 90,
+180, or 270 by setting a parameter.
+
+Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
+---
+ arch/arm/boot/dts/overlays/README           | 2 ++
+ arch/arm/boot/dts/overlays/vc4-kms-dpi.dtsi | 2 ++
+ 2 files changed, 4 insertions(+)
+
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -3673,6 +3673,7 @@ Params: clock-frequency         Display
+         backlight-def-brightness
+                                 Set the default brightness. Normal range 1-16.
+                                 (default 16).
++        rotate                  Display rotation {0,90,180,270} (default 0)
+ 
+ 
+ Name:   vc4-kms-dpi-panel
+@@ -3700,6 +3701,7 @@ Params: at056tn53v1             Enable a
+         backlight-def-brightness
+                                 Set the default brightness. Normal range 1-16.
+                                 (default 16).
++        rotate                  Display rotation {0,90,180,270} (default 0)
+ 
+ 
+ Name:   vc4-kms-dsi-7inch
+--- a/arch/arm/boot/dts/overlays/vc4-kms-dpi.dtsi
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi.dtsi
+@@ -10,6 +10,7 @@
+ 		target-path = "/";
+ 		__overlay__ {
+ 			panel: panel {
++				rotation = <0>;
+ 				port {
+ 					panel_in: endpoint {
+ 						remote-endpoint = <&dpi_out>;
+@@ -105,5 +106,6 @@
+ 		backlight-pwm-gpio = <&pwm_pins>, "brcm,pins:0";
+ 		backlight-pwm-func = <&pwm_pins>, "brcm,function:0";
+ 		backlight-def-brightness = <&backlight_pwm>, "default-brightness-level:0";
++		rotate = <&panel>, "rotation:0";
+ 	};
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0708-overlays-Add-Geekworm-mzp280-to-vc4-kms-dpi-panel.patch b/root/target/linux/bcm27xx/patches-5.15/950-0708-overlays-Add-Geekworm-mzp280-to-vc4-kms-dpi-panel.patch
new file mode 100644
index 00000000..ef689162
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0708-overlays-Add-Geekworm-mzp280-to-vc4-kms-dpi-panel.patch
@@ -0,0 +1,46 @@
+From e066c0e56d2c20b52f86e557cd39275bc4f07b61 Mon Sep 17 00:00:00 2001
+From: Chris Morgan <macromorgan@hotmail.com>
+Date: Wed, 2 Feb 2022 10:43:32 -0600
+Subject: [PATCH 708/828] overlays: Add Geekworm mzp280 to vc4-kms-dpi-panel
+
+Add support for the Geekworm mzp280 DPI panel to the generic
+vc4-kms-dpi-panel overlay.
+
+Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
+---
+ arch/arm/boot/dts/overlays/README                        | 1 +
+ arch/arm/boot/dts/overlays/vc4-kms-dpi-panel-overlay.dts | 7 +++++++
+ 2 files changed, 8 insertions(+)
+
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -3682,6 +3682,7 @@ Info:   Enable a preconfigured KMS DPI p
+ Load:   dtoverlay=vc4-kms-dpi-panel,<param>=<val>
+ Params: at056tn53v1             Enable an Innolux 5.6in VGA TFT
+         kippah-7inch            Enable an Adafruit Kippah with 7inch panel.
++        mzp280                  Enable a Geekworm MZP280 panel.
+         backlight-gpio          Defines a GPIO to be used for backlight control
+                                 (default of none).
+         backlight-pwm           Defines a PWM channel to be used for backlight
+--- a/arch/arm/boot/dts/overlays/vc4-kms-dpi-panel-overlay.dts
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-panel-overlay.dts
+@@ -23,6 +23,12 @@
+ 			compatible = "ontat,yx700wv03", "simple-panel";
+ 		};
+ 	};
++	fragment@2 {
++		target = <&panel>;
++		__dormant__  {
++			compatible = "geekworm,mzp280", "simple-panel";
++		};
++	};
+ 
+ 	fragment@90 {
+ 		target = <&dpi>;
+@@ -58,5 +64,6 @@
+ 	__overrides__ {
+ 		at056tn53v1 = <0>, "+0+90";
+ 		kippah-7inch = <0>, "+1+91";
++		mzp280 = <0>, "+2+93";
+ 	};
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0709-drm-panel-Add-panel-driver-for-Ilitek-ILI9806E-panel.patch b/root/target/linux/bcm27xx/patches-5.15/950-0709-drm-panel-Add-panel-driver-for-Ilitek-ILI9806E-panel.patch
new file mode 100644
index 00000000..6d007576
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0709-drm-panel-Add-panel-driver-for-Ilitek-ILI9806E-panel.patch
@@ -0,0 +1,537 @@
+From 8f5e24cd7e8c85d1c14b0da4027de220e6546446 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 5 Jan 2022 19:14:48 +0000
+Subject: [PATCH 709/828] drm/panel: Add panel driver for Ilitek ILI9806E panel
+
+The Ilitek ILI9806E driver is used in the Pimoroni HyperPixel4
+and potentially other displays. Whilst it can support multiple
+interfaces, this driver only accounts for SPI configuration and
+DPI video data.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/panel/Kconfig                 |  11 +
+ drivers/gpu/drm/panel/Makefile                |   1 +
+ drivers/gpu/drm/panel/panel-ilitek-ili9806e.c | 486 ++++++++++++++++++
+ 3 files changed, 498 insertions(+)
+ create mode 100644 drivers/gpu/drm/panel/panel-ilitek-ili9806e.c
+
+--- a/drivers/gpu/drm/panel/Kconfig
++++ b/drivers/gpu/drm/panel/Kconfig
+@@ -139,6 +139,17 @@ config DRM_PANEL_ILITEK_ILI9341
+ 	  QVGA (240x320) RGB panels. support serial & parallel rgb
+ 	  interface.
+ 
++config DRM_PANEL_ILITEK_ILI9806E
++	tristate "Ilitek ILI9806E-based panels"
++	depends on OF && SPI
++	depends on DRM_KMS_HELPER
++	depends on DRM_KMS_CMA_HELPER
++	depends on BACKLIGHT_CLASS_DEVICE
++	select DRM_MIPI_DBI
++	help
++	  Say Y if you want to enable support for panels based on the
++	  Ilitek ILI9806e controller.
++
+ config DRM_PANEL_ILITEK_ILI9881C
+ 	tristate "Ilitek ILI9881C-based panels"
+ 	depends on OF
+--- a/drivers/gpu/drm/panel/Makefile
++++ b/drivers/gpu/drm/panel/Makefile
+@@ -12,6 +12,7 @@ obj-$(CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA
+ obj-$(CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D) += panel-feiyang-fy07024di26a30d.o
+ obj-$(CONFIG_DRM_PANEL_ILITEK_IL9322) += panel-ilitek-ili9322.o
+ obj-$(CONFIG_DRM_PANEL_ILITEK_ILI9341) += panel-ilitek-ili9341.o
++obj-$(CONFIG_DRM_PANEL_ILITEK_ILI9806E) += panel-ilitek-ili9806e.o
+ obj-$(CONFIG_DRM_PANEL_ILITEK_ILI9881C) += panel-ilitek-ili9881c.o
+ obj-$(CONFIG_DRM_PANEL_INNOLUX_EJ030NA) += panel-innolux-ej030na.o
+ obj-$(CONFIG_DRM_PANEL_INNOLUX_P079ZCA) += panel-innolux-p079zca.o
+--- /dev/null
++++ b/drivers/gpu/drm/panel/panel-ilitek-ili9806e.c
+@@ -0,0 +1,486 @@
++// SPDX-License-Identifier: GPL-2.0-only
++/*
++ * Ilitek ILI9806E TFT LCD drm_panel driver.
++ *
++ * Copyright (C) 2022 Raspberry Pi Ltd
++ *
++ * Derived from drivers/drm/gpu/panel/panel-sitronix-st7789v.c
++ * Copyright (C) 2017 Free Electrons
++ */
++
++#include <drm/drm_modes.h>
++#include <drm/drm_panel.h>
++
++#include <linux/bitops.h>
++#include <linux/gpio/consumer.h>
++#include <linux/media-bus-format.h>
++#include <linux/module.h>
++#include <linux/of_device.h>
++#include <linux/regmap.h>
++#include <linux/regulator/consumer.h>
++#include <linux/spi/spi.h>
++
++#include <video/mipi_display.h>
++#include <video/of_videomode.h>
++#include <video/videomode.h>
++
++struct ili9806 {
++	struct drm_panel panel;
++	struct spi_device *spi;
++	struct gpio_desc *reset;
++	struct regulator *power;
++	u32 bus_format;
++};
++
++#define ILI9806_DATA		BIT(8)
++
++#define ILI9806_MAX_MSG_LEN	6
++
++struct ili9806e_msg {
++	unsigned int len;
++	u16 msg[ILI9806_MAX_MSG_LEN];
++};
++
++#define ILI9806_SET_PAGE(page)	\
++	{				\
++		.len = 6,		\
++		.msg = {		\
++			0xFF,			\
++			ILI9806_DATA | 0xFF,	\
++			ILI9806_DATA | 0x98,	\
++			ILI9806_DATA | 0x06,	\
++			ILI9806_DATA | 0x04,	\
++			ILI9806_DATA | (page)	\
++		},				\
++	}
++
++#define ILI9806_SET_REG_PARAM(reg, data)	\
++	{					\
++		.len = 2,			\
++		.msg = {			\
++			(reg),			\
++			ILI9806_DATA | (data),	\
++		},				\
++	}
++
++#define ILI9806_SET_REG(reg)	\
++	{				\
++		.len = 1,		\
++		.msg = { (reg) },		\
++	}
++
++static const struct ili9806e_msg panel_init[] = {
++	ILI9806_SET_PAGE(1),
++
++	/* interface mode
++	 *   SEPT_SDIO = 0 (spi interface transfer through SDA pin)
++	 *   SDO_STATUS = 1 (always output, but without output tri-state)
++	 */
++	ILI9806_SET_REG_PARAM(0x08, 0x10),
++	/* display control
++	 * VSPL = 1 (vertical sync polarity)
++	 * HSPL = 0 (horizontal sync polarity)
++	 * DPL = 0 (PCLK polarity)
++	 * EPL = 1 (data enable polarity)
++	 */
++	ILI9806_SET_REG_PARAM(0x21, 0x0d),
++	/* resolution control (0x02 = 480x800) */
++	ILI9806_SET_REG_PARAM(0x30, 0x02),
++	/* display inversion control (0x00 = column inversion) */
++	ILI9806_SET_REG_PARAM(0x31, 0x00),
++	/* power control
++	 *  EXB1T = 0 (internal charge pump)
++	 *  EXT_CPCK_SEL = 1 (pump clock control signal = output 2 x waveform)
++	 *  BT = 0 (DDVDH / DDVDL voltage = VCI x 2 / VCI x -2)
++	 */
++	ILI9806_SET_REG_PARAM(0x40, 0x10),
++	/* power control
++	 *  DDVDH_CLP = 5.6 (DDVDH clamp leve)
++	 *  DDVDL_CLP = -5.6 (DDVDL clamp leve)
++	 */
++	ILI9806_SET_REG_PARAM(0x41, 0x55),
++	/* power control
++	 *  VGH_CP = 2DDVDH - DDVDL (step up factor for VGH)
++	 *  VGL_CP = DDVDL + VCL - VCIP (step up factor for VGL)
++	 */
++	ILI9806_SET_REG_PARAM(0x42, 0x02),
++	/* power control
++	 *  VGH_CLPEN = 0 (disable VGH clamp level)
++	 *  VGH_CLP = 9 (15.0 VGH clamp level - but this is disabled so not used?)
++	 */
++	ILI9806_SET_REG_PARAM(0x43, 0x84),
++	/* power control
++	 *  VGL_CLPEN = 0 (disable VGL clamp level)
++	 *  VGL_CLP = 9 (-11.0 VGL clamp level - but this is disabled so not used?)
++	 */
++	ILI9806_SET_REG_PARAM(0x44, 0x84),
++
++	/* power control
++	 *  VREG1OUT voltage for positive gamma?
++	 */
++	ILI9806_SET_REG_PARAM(0x50, 0x78),
++	/* power control
++	 *  VREG2OUT voltage for negative gamma?
++	 */
++	ILI9806_SET_REG_PARAM(0x51, 0x78),
++
++	ILI9806_SET_REG_PARAM(0x52, 0x00),
++	ILI9806_SET_REG_PARAM(0x53, 0x77),
++	ILI9806_SET_REG_PARAM(0x57, 0x60),
++	ILI9806_SET_REG_PARAM(0x60, 0x07),
++	ILI9806_SET_REG_PARAM(0x61, 0x00),
++	ILI9806_SET_REG_PARAM(0x62, 0x08),
++	ILI9806_SET_REG_PARAM(0x63, 0x00),
++	ILI9806_SET_REG_PARAM(0xA0, 0x00),
++	ILI9806_SET_REG_PARAM(0xA1, 0x07),
++	ILI9806_SET_REG_PARAM(0xA2, 0x0C),
++	ILI9806_SET_REG_PARAM(0xA3, 0x0B),
++	ILI9806_SET_REG_PARAM(0xA4, 0x03),
++	ILI9806_SET_REG_PARAM(0xA5, 0x07),
++	ILI9806_SET_REG_PARAM(0xA6, 0x06),
++	ILI9806_SET_REG_PARAM(0xA7, 0x04),
++	ILI9806_SET_REG_PARAM(0xA8, 0x08),
++	ILI9806_SET_REG_PARAM(0xA9, 0x0C),
++	ILI9806_SET_REG_PARAM(0xAA, 0x13),
++	ILI9806_SET_REG_PARAM(0xAB, 0x06),
++	ILI9806_SET_REG_PARAM(0xAC, 0x0D),
++	ILI9806_SET_REG_PARAM(0xAD, 0x19),
++	ILI9806_SET_REG_PARAM(0xAE, 0x10),
++	ILI9806_SET_REG_PARAM(0xAF, 0x00),
++	/* negative gamma control
++	 * set the gray scale voltage to adjust the gamma characteristics of the panel
++	 */
++	ILI9806_SET_REG_PARAM(0xC0, 0x00),
++	ILI9806_SET_REG_PARAM(0xC1, 0x07),
++	ILI9806_SET_REG_PARAM(0xC2, 0x0C),
++	ILI9806_SET_REG_PARAM(0xC3, 0x0B),
++	ILI9806_SET_REG_PARAM(0xC4, 0x03),
++	ILI9806_SET_REG_PARAM(0xC5, 0x07),
++	ILI9806_SET_REG_PARAM(0xC6, 0x07),
++	ILI9806_SET_REG_PARAM(0xC7, 0x04),
++	ILI9806_SET_REG_PARAM(0xC8, 0x08),
++	ILI9806_SET_REG_PARAM(0xC9, 0x0C),
++	ILI9806_SET_REG_PARAM(0xCA, 0x13),
++	ILI9806_SET_REG_PARAM(0xCB, 0x06),
++	ILI9806_SET_REG_PARAM(0xCC, 0x0D),
++	ILI9806_SET_REG_PARAM(0xCD, 0x18),
++	ILI9806_SET_REG_PARAM(0xCE, 0x10),
++	ILI9806_SET_REG_PARAM(0xCF, 0x00),
++
++	ILI9806_SET_PAGE(6),
++
++	ILI9806_SET_REG_PARAM(0x00, 0x20),
++	ILI9806_SET_REG_PARAM(0x01, 0x0A),
++	ILI9806_SET_REG_PARAM(0x02, 0x00),
++	ILI9806_SET_REG_PARAM(0x03, 0x00),
++	ILI9806_SET_REG_PARAM(0x04, 0x01),
++	ILI9806_SET_REG_PARAM(0x05, 0x01),
++	ILI9806_SET_REG_PARAM(0x06, 0x98),
++	ILI9806_SET_REG_PARAM(0x07, 0x06),
++	ILI9806_SET_REG_PARAM(0x08, 0x01),
++	ILI9806_SET_REG_PARAM(0x09, 0x80),
++	ILI9806_SET_REG_PARAM(0x0A, 0x00),
++	ILI9806_SET_REG_PARAM(0x0B, 0x00),
++	ILI9806_SET_REG_PARAM(0x0C, 0x01),
++	ILI9806_SET_REG_PARAM(0x0D, 0x01),
++	ILI9806_SET_REG_PARAM(0x0E, 0x00),
++	ILI9806_SET_REG_PARAM(0x0F, 0x00),
++	ILI9806_SET_REG_PARAM(0x10, 0xF0),
++	ILI9806_SET_REG_PARAM(0x11, 0xF4),
++	ILI9806_SET_REG_PARAM(0x12, 0x01),
++	ILI9806_SET_REG_PARAM(0x13, 0x00),
++	ILI9806_SET_REG_PARAM(0x14, 0x00),
++	ILI9806_SET_REG_PARAM(0x15, 0xC0),
++	ILI9806_SET_REG_PARAM(0x16, 0x08),
++	ILI9806_SET_REG_PARAM(0x17, 0x00),
++	ILI9806_SET_REG_PARAM(0x18, 0x00),
++	ILI9806_SET_REG_PARAM(0x19, 0x00),
++	ILI9806_SET_REG_PARAM(0x1A, 0x00),
++	ILI9806_SET_REG_PARAM(0x1B, 0x00),
++	ILI9806_SET_REG_PARAM(0x1C, 0x00),
++	ILI9806_SET_REG_PARAM(0x1D, 0x00),
++	ILI9806_SET_REG_PARAM(0x20, 0x01),
++	ILI9806_SET_REG_PARAM(0x21, 0x23),
++	ILI9806_SET_REG_PARAM(0x22, 0x45),
++	ILI9806_SET_REG_PARAM(0x23, 0x67),
++	ILI9806_SET_REG_PARAM(0x24, 0x01),
++	ILI9806_SET_REG_PARAM(0x25, 0x23),
++	ILI9806_SET_REG_PARAM(0x26, 0x45),
++	ILI9806_SET_REG_PARAM(0x27, 0x67),
++	ILI9806_SET_REG_PARAM(0x30, 0x11),
++	ILI9806_SET_REG_PARAM(0x31, 0x11),
++	ILI9806_SET_REG_PARAM(0x32, 0x00),
++	ILI9806_SET_REG_PARAM(0x33, 0xEE),
++	ILI9806_SET_REG_PARAM(0x34, 0xFF),
++	ILI9806_SET_REG_PARAM(0x35, 0xBB),
++	ILI9806_SET_REG_PARAM(0x36, 0xAA),
++	ILI9806_SET_REG_PARAM(0x37, 0xDD),
++	ILI9806_SET_REG_PARAM(0x38, 0xCC),
++	ILI9806_SET_REG_PARAM(0x39, 0x66),
++	ILI9806_SET_REG_PARAM(0x3A, 0x77),
++	ILI9806_SET_REG_PARAM(0x3B, 0x22),
++	ILI9806_SET_REG_PARAM(0x3C, 0x22),
++	ILI9806_SET_REG_PARAM(0x3D, 0x22),
++	ILI9806_SET_REG_PARAM(0x3E, 0x22),
++	ILI9806_SET_REG_PARAM(0x3F, 0x22),
++	ILI9806_SET_REG_PARAM(0x40, 0x22),
++	/* register doesn't exist on page 6? */
++	ILI9806_SET_REG_PARAM(0x52, 0x10),
++	/* doesn't make sense, not valid according to datasheet */
++	ILI9806_SET_REG_PARAM(0x53, 0x10),
++	/* doesn't make sense, not valid according to datasheet */
++	ILI9806_SET_REG_PARAM(0x54, 0x13),
++
++	ILI9806_SET_PAGE(7),
++
++	/* enable VREG */
++	ILI9806_SET_REG_PARAM(0x18, 0x1D),
++	/* enable VGL_REG */
++	ILI9806_SET_REG_PARAM(0x17, 0x22),
++	/* register doesn't exist on page 7? */
++	ILI9806_SET_REG_PARAM(0x02, 0x77),
++	/* register doesn't exist on page 7? */
++	ILI9806_SET_REG_PARAM(0x26, 0xB2),
++	/* register doesn't exist on page 7? */
++	ILI9806_SET_REG_PARAM(0xE1, 0x79),
++
++	ILI9806_SET_PAGE(0),
++
++	ILI9806_SET_REG_PARAM(MIPI_DCS_SET_PIXEL_FORMAT,
++			      MIPI_DCS_PIXEL_FMT_18BIT << 4),
++	ILI9806_SET_REG_PARAM(MIPI_DCS_SET_TEAR_ON, 0x00),
++	ILI9806_SET_REG(MIPI_DCS_EXIT_SLEEP_MODE),
++};
++
++#define NUM_INIT_REGS ARRAY_SIZE(panel_init)
++
++static inline struct ili9806 *panel_to_ili9806(struct drm_panel *panel)
++{
++	return container_of(panel, struct ili9806, panel);
++}
++
++static int ili9806_write_msg(struct ili9806 *ctx, const struct ili9806e_msg *msg)
++{
++	struct spi_transfer xfer = { };
++	struct spi_message spi;
++	//u16 txbuf[] = { msg->, ILI9806_DATA | data };
++
++	spi_message_init(&spi);
++
++	xfer.tx_buf = msg->msg;
++	xfer.bits_per_word = 9;
++	xfer.len = sizeof(u16) * msg->len;
++
++	spi_message_add_tail(&xfer, &spi);
++	return spi_sync(ctx->spi, &spi);
++}
++
++static int ili9806e_write_msg_list(struct ili9806 *ctx,
++				   const struct ili9806e_msg msgs[],
++				   unsigned int num_msgs)
++{
++	int ret, i;
++
++	for (i = 0; i < num_msgs; i++) {
++		ret = ili9806_write_msg(ctx, &msgs[i]);
++		if (ret)
++			break;
++	}
++
++	return ret;
++}
++
++static const struct drm_display_mode ili9806e_480x800_mode = {
++	.clock = 32000,
++	.hdisplay = 480,
++	.hsync_start = 480 + 10,
++	.hsync_end = 480 + 10 + 16,
++	.htotal = 480 + 10 + 16 + 59,
++	.vdisplay = 800,
++	.vsync_start = 800 + 15,
++	.vsync_end = 800 + 15 + 113,
++	.vtotal = 800 + 15 + 113 + 15,
++	.flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC,
++};
++
++static int ili9806_get_modes(struct drm_panel *panel,
++			     struct drm_connector *connector)
++{
++	struct ili9806 *ctx = panel_to_ili9806(panel);
++	struct drm_display_mode *mode;
++
++	mode = drm_mode_duplicate(connector->dev, &ili9806e_480x800_mode);
++	if (!mode) {
++		dev_err(panel->dev, "failed to add mode %ux%ux@%u\n",
++			ili9806e_480x800_mode.hdisplay,
++			ili9806e_480x800_mode.vdisplay,
++			drm_mode_vrefresh(&ili9806e_480x800_mode));
++		return -ENOMEM;
++	}
++
++	drm_mode_set_name(mode);
++
++	mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
++	drm_mode_probed_add(connector, mode);
++
++	connector->display_info.width_mm = 61;
++	connector->display_info.height_mm = 103;
++	drm_display_info_set_bus_formats(&connector->display_info,
++					 &ctx->bus_format, 1);
++	connector->display_info.bus_flags =
++					DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE;
++
++	return 1;
++}
++
++static int ili9806_prepare(struct drm_panel *panel)
++{
++	struct ili9806 *ctx = panel_to_ili9806(panel);
++	int ret;
++
++	ret = regulator_enable(ctx->power);
++	if (ret)
++		return ret;
++
++	ret = ili9806e_write_msg_list(ctx, panel_init, NUM_INIT_REGS);
++
++	return ret;
++}
++
++static int ili9806_enable(struct drm_panel *panel)
++{
++	struct ili9806 *ctx = panel_to_ili9806(panel);
++	const struct ili9806e_msg msg = ILI9806_SET_REG(MIPI_DCS_SET_DISPLAY_ON);
++	int ret;
++
++	ret = ili9806_write_msg(ctx, &msg);
++
++	return ret;
++}
++
++static int ili9806_disable(struct drm_panel *panel)
++{
++	struct ili9806 *ctx = panel_to_ili9806(panel);
++	const struct ili9806e_msg msg = ILI9806_SET_REG(MIPI_DCS_SET_DISPLAY_OFF);
++	int ret;
++
++	ret = ili9806_write_msg(ctx, &msg);
++
++	return ret;
++}
++
++static int ili9806_unprepare(struct drm_panel *panel)
++{
++	struct ili9806 *ctx = panel_to_ili9806(panel);
++	const struct ili9806e_msg msg = ILI9806_SET_REG(MIPI_DCS_ENTER_SLEEP_MODE);
++	int ret;
++
++	ret = ili9806_write_msg(ctx, &msg);
++
++	return ret;
++}
++
++static const struct drm_panel_funcs ili9806_drm_funcs = {
++	.disable	= ili9806_disable,
++	.enable		= ili9806_enable,
++	.get_modes	= ili9806_get_modes,
++	.prepare	= ili9806_prepare,
++	.unprepare	= ili9806_unprepare,
++};
++
++static const struct of_device_id ili9806_of_match[] = {
++	{	.compatible = "txw,txw397017s2",
++		.data = (void *)MEDIA_BUS_FMT_RGB888_1X24,
++	}, {
++		.compatible = "pimoroni,hyperpixel4",
++		.data = (void *)MEDIA_BUS_FMT_RGB666_1X24_CPADHI,
++	}, {
++		.compatible = "ilitek,ili9806e",
++		.data = (void *)MEDIA_BUS_FMT_RGB888_1X24,
++	}, {
++		/* sentinel */
++	}
++};
++MODULE_DEVICE_TABLE(of, ili9806_of_match);
++
++static int ili9806_probe(struct spi_device *spi)
++{
++	const struct ili9806e_msg panel_reset[] = {
++		ILI9806_SET_PAGE(0),
++		ILI9806_SET_REG_PARAM(0x01, 0x00)
++	};
++	const struct of_device_id *id;
++	struct ili9806 *ctx;
++	int ret;
++
++	ctx = devm_kzalloc(&spi->dev, sizeof(*ctx), GFP_KERNEL);
++	if (!ctx)
++		return -ENOMEM;
++
++	id = of_match_node(ili9806_of_match, spi->dev.of_node);
++	if (!id)
++		return -ENODEV;
++
++	ctx->bus_format = (u32)id->data;
++
++	spi_set_drvdata(spi, ctx);
++	ctx->spi = spi;
++
++	drm_panel_init(&ctx->panel, &spi->dev, &ili9806_drm_funcs,
++		       DRM_MODE_CONNECTOR_DPI);
++
++	ctx->power = devm_regulator_get(&spi->dev, "power");
++	if (IS_ERR(ctx->power))
++		return PTR_ERR(ctx->power);
++
++	ctx->reset = devm_gpiod_get_optional(&spi->dev, "reset", GPIOD_OUT_LOW);
++	if (IS_ERR(ctx->reset)) {
++		dev_err(&spi->dev, "Couldn't get our reset line\n");
++		return PTR_ERR(ctx->reset);
++	}
++
++	/* Soft reset */
++	ili9806e_write_msg_list(ctx, panel_reset, ARRAY_SIZE(panel_reset));
++	msleep(200);
++
++	ret = drm_panel_of_backlight(&ctx->panel);
++	if (ret)
++		return ret;
++
++	drm_panel_add(&ctx->panel);
++
++	return 0;
++}
++
++static int ili9806_remove(struct spi_device *spi)
++{
++	struct ili9806 *ctx = spi_get_drvdata(spi);
++
++	drm_panel_remove(&ctx->panel);
++
++	return 0;
++}
++
++static const struct spi_device_id ili9806_ids[] = {
++	{ "txw397017s2", 0 },
++	{ "ili9806e", 0 },
++	{ "hyperpixel4", 0 },
++	{ /* sentinel */ }
++};
++
++MODULE_DEVICE_TABLE(spi, ili9806_ids);
++
++static struct spi_driver ili9806_driver = {
++	.probe = ili9806_probe,
++	.remove = ili9806_remove,
++	.driver = {
++		.name = "ili9806e",
++		.of_match_table = ili9806_of_match,
++	},
++	.id_table = ili9806_ids,
++};
++module_spi_driver(ili9806_driver);
++
++MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.com>");
++MODULE_DESCRIPTION("ili9806 LCD panel driver");
++MODULE_LICENSE("GPL v2");
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0710-drm-panel-Add-panel-driver-for-TDO-Y17B-based-panels.patch b/root/target/linux/bcm27xx/patches-5.15/950-0710-drm-panel-Add-panel-driver-for-TDO-Y17B-based-panels.patch
new file mode 100644
index 00000000..df41455a
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0710-drm-panel-Add-panel-driver-for-TDO-Y17B-based-panels.patch
@@ -0,0 +1,331 @@
+From 5d8467de67569177778c2e36910cf4ba36ccb712 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 26 Jan 2022 16:02:31 +0000
+Subject: [PATCH 710/828] drm/panel: Add panel driver for TDO Y17B based panels
+
+The Top DisplayOptoelectronics (TDO) T17B driver chip is used
+in the TL040HDS20CT panel (found in the Pimoroni HyperPixel4
+Square display) and potentially other displays.
+The driver chip supports SPI for  configuration and DPI
+video data.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/panel/Kconfig          |  11 +
+ drivers/gpu/drm/panel/Makefile         |   1 +
+ drivers/gpu/drm/panel/panel-tdo-y17p.c | 279 +++++++++++++++++++++++++
+ 3 files changed, 291 insertions(+)
+ create mode 100644 drivers/gpu/drm/panel/panel-tdo-y17p.c
+
+--- a/drivers/gpu/drm/panel/Kconfig
++++ b/drivers/gpu/drm/panel/Kconfig
+@@ -560,6 +560,17 @@ config DRM_PANEL_SONY_ACX565AKM
+ 	  Say Y here if you want to enable support for the Sony ACX565AKM
+ 	  800x600 3.5" panel (found on the Nokia N900).
+ 
++config DRM_PANEL_TPO_Y17P
++	tristate "TDO Y17P-based panels"
++	depends on OF && SPI
++	depends on DRM_KMS_HELPER
++	depends on DRM_KMS_CMA_HELPER
++	depends on BACKLIGHT_CLASS_DEVICE
++	select DRM_MIPI_DBI
++	help
++	  Say Y if you want to enable support for panels based on the
++	  TDO Y17P controller.
++
+ config DRM_PANEL_TDO_TL070WSH30
+ 	tristate "TDO TL070WSH30 DSI panel"
+ 	depends on OF
+--- a/drivers/gpu/drm/panel/Makefile
++++ b/drivers/gpu/drm/panel/Makefile
+@@ -58,6 +58,7 @@ obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7789V)
+ obj-$(CONFIG_DRM_PANEL_SONY_ACX424AKP) += panel-sony-acx424akp.o
+ obj-$(CONFIG_DRM_PANEL_SONY_ACX565AKM) += panel-sony-acx565akm.o
+ obj-$(CONFIG_DRM_PANEL_TDO_TL070WSH30) += panel-tdo-tl070wsh30.o
++obj-$(CONFIG_DRM_PANEL_TPO_Y17P) += panel-tdo-y17p.o
+ obj-$(CONFIG_DRM_PANEL_TPO_TD028TTEC1) += panel-tpo-td028ttec1.o
+ obj-$(CONFIG_DRM_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o
+ obj-$(CONFIG_DRM_PANEL_TPO_TPG110) += panel-tpo-tpg110.o
+--- /dev/null
++++ b/drivers/gpu/drm/panel/panel-tdo-y17p.c
+@@ -0,0 +1,279 @@
++// SPDX-License-Identifier: GPL-2.0-only
++/*
++ * TDO Y17P TFT LCD drm_panel driver.
++ *
++ * SPI configured DPI display controller
++ * Copyright (C) 2022 Raspberry Pi Ltd
++ *
++ * Derived from drivers/drm/gpu/panel/panel-sitronix-st7789v.c
++ * Copyright (C) 2017 Free Electrons
++ */
++
++#include <drm/drm_modes.h>
++#include <drm/drm_panel.h>
++
++#include <linux/bitops.h>
++#include <linux/gpio/consumer.h>
++#include <linux/media-bus-format.h>
++#include <linux/module.h>
++#include <linux/of_device.h>
++#include <linux/regmap.h>
++#include <linux/regulator/consumer.h>
++#include <linux/spi/spi.h>
++
++#include <video/mipi_display.h>
++#include <video/of_videomode.h>
++#include <video/videomode.h>
++
++struct tdo_y17p {
++	struct drm_panel panel;
++	struct spi_device *spi;
++	struct gpio_desc *reset;
++	struct regulator *power;
++	u32 bus_format;
++};
++
++static const u16 panel_init[] = {
++	0x0ff, 0x1ff, 0x198, 0x106, 0x104, 0x101, 0x008, 0x110,
++	0x021, 0x109, 0x030, 0x102, 0x031, 0x100, 0x040, 0x110,
++	0x041, 0x155, 0x042, 0x102, 0x043, 0x109, 0x044, 0x107,
++	0x050, 0x178, 0x051, 0x178, 0x052, 0x100, 0x053, 0x16d,
++	0x060, 0x107, 0x061, 0x100, 0x062, 0x108, 0x063, 0x100,
++	0x0a0, 0x100, 0x0a1, 0x107, 0x0a2, 0x10c, 0x0a3, 0x10b,
++	0x0a4, 0x103, 0x0a5, 0x107, 0x0a6, 0x106, 0x0a7, 0x104,
++	0x0a8, 0x108, 0x0a9, 0x10c, 0x0aa, 0x113, 0x0ab, 0x106,
++	0x0ac, 0x10d, 0x0ad, 0x119, 0x0ae, 0x110, 0x0af, 0x100,
++	0x0c0, 0x100, 0x0c1, 0x107, 0x0c2, 0x10c, 0x0c3, 0x10b,
++	0x0c4, 0x103, 0x0c5, 0x107, 0x0c6, 0x107, 0x0c7, 0x104,
++	0x0c8, 0x108, 0x0c9, 0x10c, 0x0ca, 0x113, 0x0cb, 0x106,
++	0x0cc, 0x10d, 0x0cd, 0x118, 0x0ce, 0x110, 0x0cf, 0x100,
++	0x0ff, 0x1ff, 0x198, 0x106, 0x104, 0x106, 0x000, 0x120,
++	0x001, 0x10a, 0x002, 0x100, 0x003, 0x100, 0x004, 0x101,
++	0x005, 0x101, 0x006, 0x198, 0x007, 0x106, 0x008, 0x101,
++	0x009, 0x180, 0x00a, 0x100, 0x00b, 0x100, 0x00c, 0x101,
++	0x00d, 0x101, 0x00e, 0x100, 0x00f, 0x100, 0x010, 0x1f0,
++	0x011, 0x1f4, 0x012, 0x101, 0x013, 0x100, 0x014, 0x100,
++	0x015, 0x1c0, 0x016, 0x108, 0x017, 0x100, 0x018, 0x100,
++	0x019, 0x100, 0x01a, 0x100, 0x01b, 0x100, 0x01c, 0x100,
++	0x01d, 0x100, 0x020, 0x101, 0x021, 0x123, 0x022, 0x145,
++	0x023, 0x167, 0x024, 0x101, 0x025, 0x123, 0x026, 0x145,
++	0x027, 0x167, 0x030, 0x111, 0x031, 0x111, 0x032, 0x100,
++	0x033, 0x1ee, 0x034, 0x1ff, 0x035, 0x1bb, 0x036, 0x1aa,
++	0x037, 0x1dd, 0x038, 0x1cc, 0x039, 0x166, 0x03a, 0x177,
++	0x03b, 0x122, 0x03c, 0x122, 0x03d, 0x122, 0x03e, 0x122,
++	0x03f, 0x122, 0x040, 0x122, 0x052, 0x110, 0x053, 0x110,
++	0x0ff, 0x1ff, 0x198, 0x106, 0x104, 0x107, 0x018, 0x11d,
++	0x017, 0x122, 0x002, 0x177, 0x026, 0x1b2, 0x0e1, 0x179,
++	0x0ff, 0x1ff, 0x198, 0x106, 0x104, 0x100, 0x03a, 0x160,
++	0x035, 0x100, 0x011, 0x100,
++};
++
++#define NUM_INIT_REGS ARRAY_SIZE(panel_init)
++
++static inline struct tdo_y17p *panel_to_tdo_y17p(struct drm_panel *panel)
++{
++	return container_of(panel, struct tdo_y17p, panel);
++}
++
++static int tdo_y17p_write_msg(struct tdo_y17p *ctx, const u16 *msg, unsigned int len)
++{
++	struct spi_transfer xfer = { };
++	struct spi_message spi;
++
++	spi_message_init(&spi);
++
++	xfer.tx_buf = msg;
++	xfer.bits_per_word = 9;
++	xfer.len = sizeof(u16) * len;
++
++	spi_message_add_tail(&xfer, &spi);
++	return spi_sync(ctx->spi, &spi);
++}
++
++static const struct drm_display_mode tdo_y17pe_720x720_mode = {
++	.clock = 36720,
++	.hdisplay = 720,
++	.hsync_start = 720 + 20,
++	.hsync_end = 720 + 20 + 20,
++	.htotal = 720 + 20 + 20 + 40,
++	.vdisplay = 720,
++	.vsync_start = 720 + 15,
++	.vsync_end = 720 + 15 + 15,
++	.vtotal = 720 + 15 + 15 + 15,
++	.flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC,
++};
++
++static int tdo_y17p_get_modes(struct drm_panel *panel,
++			      struct drm_connector *connector)
++{
++	struct tdo_y17p *ctx = panel_to_tdo_y17p(panel);
++	struct drm_display_mode *mode;
++
++	mode = drm_mode_duplicate(connector->dev, &tdo_y17pe_720x720_mode);
++	if (!mode) {
++		dev_err(panel->dev, "failed to add mode %ux%ux@%u\n",
++			tdo_y17pe_720x720_mode.hdisplay,
++			tdo_y17pe_720x720_mode.vdisplay,
++			drm_mode_vrefresh(&tdo_y17pe_720x720_mode));
++		return -ENOMEM;
++	}
++
++	drm_mode_set_name(mode);
++
++	mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
++	drm_mode_probed_add(connector, mode);
++
++	connector->display_info.width_mm = 72;
++	connector->display_info.height_mm = 72;
++	drm_display_info_set_bus_formats(&connector->display_info,
++					 &ctx->bus_format, 1);
++	connector->display_info.bus_flags = 0;
++
++	return 1;
++}
++
++static int tdo_y17p_prepare(struct drm_panel *panel)
++{
++	struct tdo_y17p *ctx = panel_to_tdo_y17p(panel);
++	int ret;
++
++	ret = regulator_enable(ctx->power);
++	if (ret)
++		return ret;
++
++	ret = tdo_y17p_write_msg(ctx, panel_init, NUM_INIT_REGS);
++
++	msleep(120);
++
++	return ret;
++}
++
++static int tdo_y17p_enable(struct drm_panel *panel)
++{
++	struct tdo_y17p *ctx = panel_to_tdo_y17p(panel);
++	const u16 msg[] = { MIPI_DCS_SET_DISPLAY_ON };
++	int ret;
++
++	ret = tdo_y17p_write_msg(ctx, msg, ARRAY_SIZE(msg));
++
++	return ret;
++}
++
++static int tdo_y17p_disable(struct drm_panel *panel)
++{
++	struct tdo_y17p *ctx = panel_to_tdo_y17p(panel);
++	const u16 msg[] = { MIPI_DCS_SET_DISPLAY_OFF };
++	int ret;
++
++	ret = tdo_y17p_write_msg(ctx, msg, ARRAY_SIZE(msg));
++
++	return ret;
++}
++
++static int tdo_y17p_unprepare(struct drm_panel *panel)
++{
++	struct tdo_y17p *ctx = panel_to_tdo_y17p(panel);
++	const u16 msg[] = { MIPI_DCS_ENTER_SLEEP_MODE };
++	int ret;
++
++	ret = tdo_y17p_write_msg(ctx, msg, ARRAY_SIZE(msg));
++
++	return ret;
++}
++
++static const struct drm_panel_funcs tdo_y17p_drm_funcs = {
++	.disable	= tdo_y17p_disable,
++	.enable		= tdo_y17p_enable,
++	.get_modes	= tdo_y17p_get_modes,
++	.prepare	= tdo_y17p_prepare,
++	.unprepare	= tdo_y17p_unprepare,
++};
++
++static const struct of_device_id tdo_y17p_of_match[] = {
++	{	.compatible = "tdo,tl040hds20ct",
++		.data = (void *)MEDIA_BUS_FMT_BGR888_1X24,
++	}, {
++		.compatible = "pimoroni,hyperpixel4square",
++		.data = (void *)MEDIA_BUS_FMT_BGR666_1X24_CPADHI,
++	}, {
++		.compatible = "tdo,y17p",
++		.data = (void *)MEDIA_BUS_FMT_BGR888_1X24,
++	}, {
++		/* sentinel */
++	}
++};
++MODULE_DEVICE_TABLE(of, tdo_y17p_of_match);
++
++static int tdo_y17p_probe(struct spi_device *spi)
++{
++	const struct of_device_id *id;
++	struct tdo_y17p *ctx;
++	int ret;
++
++	ctx = devm_kzalloc(&spi->dev, sizeof(*ctx), GFP_KERNEL);
++	if (!ctx)
++		return -ENOMEM;
++
++	id = of_match_node(tdo_y17p_of_match, spi->dev.of_node);
++	if (!id)
++		return -ENODEV;
++
++	ctx->bus_format = (u32)id->data;
++
++	spi_set_drvdata(spi, ctx);
++	ctx->spi = spi;
++
++	drm_panel_init(&ctx->panel, &spi->dev, &tdo_y17p_drm_funcs,
++		       DRM_MODE_CONNECTOR_DPI);
++
++	ctx->power = devm_regulator_get(&spi->dev, "power");
++	if (IS_ERR(ctx->power))
++		return PTR_ERR(ctx->power);
++
++	ctx->reset = devm_gpiod_get_optional(&spi->dev, "reset", GPIOD_OUT_LOW);
++	if (IS_ERR(ctx->reset)) {
++		dev_err(&spi->dev, "Couldn't get our reset line\n");
++		return PTR_ERR(ctx->reset);
++	}
++
++	ret = drm_panel_of_backlight(&ctx->panel);
++	if (ret)
++		return ret;
++
++	drm_panel_add(&ctx->panel);
++
++	return 0;
++}
++
++static int tdo_y17p_remove(struct spi_device *spi)
++{
++	struct tdo_y17p *ctx = spi_get_drvdata(spi);
++
++	drm_panel_remove(&ctx->panel);
++
++	return 0;
++}
++
++static const struct spi_device_id tdo_y17p_ids[] = {
++	{ "tl040hds20ct", 0 },
++	{ "hyperpixel4square", 0 },
++	{ "y17p", 0 },
++	{ /* sentinel */ }
++};
++
++MODULE_DEVICE_TABLE(spi, tdo_y17p_ids);
++
++static struct spi_driver tdo_y17p_driver = {
++	.probe = tdo_y17p_probe,
++	.remove = tdo_y17p_remove,
++	.driver = {
++		.name = "tdo_y17p",
++		.of_match_table = tdo_y17p_of_match,
++	},
++	.id_table = tdo_y17p_ids,
++};
++module_spi_driver(tdo_y17p_driver);
++
++MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.com>");
++MODULE_DESCRIPTION("TDO Y17P LCD panel driver");
++MODULE_LICENSE("GPL v2");
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0711-drm-panel-panel-sitronix-st7701-Support-SPI-config-a.patch b/root/target/linux/bcm27xx/patches-5.15/950-0711-drm-panel-panel-sitronix-st7701-Support-SPI-config-a.patch
new file mode 100644
index 00000000..74b2296a
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0711-drm-panel-panel-sitronix-st7701-Support-SPI-config-a.patch
@@ -0,0 +1,564 @@
+From 8496f70831a1f1947094e420bc543c5526107d43 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Tue, 1 Feb 2022 15:27:01 +0000
+Subject: [PATCH 711/828] drm/panel/panel-sitronix-st7701: Support SPI config
+ and RGB data
+
+The ST7701 supports numerous different interface mechanisms for
+MIPI DSI, RGB, or SPI. The driver was only implementing DSI input,
+so add RGB parallel input with SPI configuration.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/panel/panel-sitronix-st7701.c | 382 ++++++++++++++++--
+ 1 file changed, 359 insertions(+), 23 deletions(-)
+
+--- a/drivers/gpu/drm/panel/panel-sitronix-st7701.c
++++ b/drivers/gpu/drm/panel/panel-sitronix-st7701.c
+@@ -7,15 +7,20 @@
+ #include <drm/drm_mipi_dsi.h>
+ #include <drm/drm_modes.h>
+ #include <drm/drm_panel.h>
++#include <drm/drm_print.h>
+ 
+ #include <linux/gpio/consumer.h>
+ #include <linux/delay.h>
++#include <linux/media-bus-format.h>
+ #include <linux/module.h>
+ #include <linux/of_device.h>
+ #include <linux/regulator/consumer.h>
++#include <linux/spi/spi.h>
+ 
+ #include <video/mipi_display.h>
+ 
++#define SPI_DATA_FLAG			0x100
++
+ /* Command2 BKx selection command */
+ #define DSI_CMD2BKX_SEL			0xFF
+ 
+@@ -46,9 +51,14 @@
+  * 11 = CMD2BK1, Command2 BK1
+  * 00 = Command2 disable
+  */
++#define DSI_CMD2BK3_SEL			0x13
+ #define DSI_CMD2BK1_SEL			0x11
+ #define DSI_CMD2BK0_SEL			0x10
+ #define DSI_CMD2BKX_SEL_NONE		0x00
++#define SPI_CMD2BK3_SEL			(SPI_DATA_FLAG | DSI_CMD2BK3_SEL)
++#define SPI_CMD2BK1_SEL			(SPI_DATA_FLAG | DSI_CMD2BK1_SEL)
++#define SPI_CMD2BK0_SEL			(SPI_DATA_FLAG | DSI_CMD2BK0_SEL)
++#define SPI_CMD2BKX_SEL_NONE		(SPI_DATA_FLAG | DSI_CMD2BKX_SEL_NONE)
+ 
+ /* Command2, BK0 bytes */
+ #define DSI_LINESET_LINE		0x69
+@@ -86,19 +96,34 @@
+ #define DSI_MIPISET1_EOT_EN		BIT(3)
+ #define DSI_CMD2_BK1_MIPISET1_SET	(BIT(7) | DSI_MIPISET1_EOT_EN)
+ 
++struct st7701;
++
++enum st7701_ctrl_if {
++	ST7701_CTRL_DSI,
++	ST7701_CTRL_SPI,
++};
++
+ struct st7701_panel_desc {
+ 	const struct drm_display_mode *mode;
+ 	unsigned int lanes;
+ 	unsigned long flags;
+ 	enum mipi_dsi_pixel_format format;
++	u32 mediabus_format;
+ 	const char *const *supply_names;
+ 	unsigned int num_supplies;
+ 	unsigned int panel_sleep_delay;
++	void (*init_sequence)(struct st7701 *st7701);
++	unsigned int conn_type;
++	enum st7701_ctrl_if interface;
++	u32 bus_flags;
+ };
+ 
+ struct st7701 {
+ 	struct drm_panel panel;
+ 	struct mipi_dsi_device *dsi;
++	struct spi_device *spi;
++	const struct device *dev;
++
+ 	const struct st7701_panel_desc *desc;
+ 
+ 	struct regulator_bulk_data *supplies;
+@@ -123,7 +148,23 @@ static inline int st7701_dsi_write(struc
+ 		st7701_dsi_write(st7701, d, ARRAY_SIZE(d));	\
+ 	}
+ 
+-static void st7701_init_sequence(struct st7701 *st7701)
++#define ST7701_SPI(st7701, seq...)				\
++	{							\
++		const u16 d[] = { seq };			\
++		struct spi_transfer xfer = { };			\
++		struct spi_message spi;				\
++								\
++		spi_message_init(&spi);				\
++								\
++		xfer.tx_buf = d;				\
++		xfer.bits_per_word = 9;				\
++		xfer.len = sizeof(u16) * ARRAY_SIZE(d);		\
++								\
++		spi_message_add_tail(&xfer, &spi);		\
++		spi_sync((st7701)->spi, &spi);			\
++	}
++
++static void ts8550b_init_sequence(struct st7701 *st7701)
+ {
+ 	const struct drm_display_mode *mode = st7701->desc->mode;
+ 
+@@ -194,6 +235,111 @@ static void st7701_init_sequence(struct
+ 		   0x77, 0x01, 0x00, 0x00, DSI_CMD2BKX_SEL_NONE);
+ }
+ 
++static void txw210001b0_init_sequence(struct st7701 *st7701)
++{
++	ST7701_SPI(st7701, MIPI_DCS_SOFT_RESET);
++
++	usleep_range(5000, 7000);
++
++	ST7701_SPI(st7701, DSI_CMD2BKX_SEL,
++		   0x177, 0x101, 0x100, 0x100, SPI_CMD2BK0_SEL);
++
++	ST7701_SPI(st7701, DSI_CMD2_BK0_LNESET, 0x13B, 0x100);
++
++	ST7701_SPI(st7701, DSI_CMD2_BK0_PORCTRL, 0x10B, 0x102);
++
++	ST7701_SPI(st7701, DSI_CMD2_BK0_INVSEL, 0x100, 0x102);
++
++	ST7701_SPI(st7701, 0xCC, 0x110);
++
++	/*
++	 * Gamma option B:
++	 * Positive Voltage Gamma Control
++	 */
++	ST7701_SPI(st7701, DSI_CMD2_BK0_PVGAMCTRL,
++		   0x102, 0x113, 0x11B, 0x10D, 0x110, 0x105, 0x108, 0x107,
++		   0x107, 0x124, 0x104, 0x111, 0x10E, 0x12C, 0x133, 0x11D);
++
++	/* Negative Voltage Gamma Control */
++	ST7701_SPI(st7701, DSI_CMD2_BK0_NVGAMCTRL,
++		   0x105, 0x113, 0x11B, 0x10D, 0x111, 0x105, 0x108, 0x107,
++		   0x107, 0x124, 0x104, 0x111, 0x10E, 0x12C, 0x133, 0x11D);
++
++	ST7701_SPI(st7701, DSI_CMD2BKX_SEL,
++		   0x177, 0x101, 0x100, 0x100, SPI_CMD2BK1_SEL);
++
++	ST7701_SPI(st7701, DSI_CMD2_BK1_VRHS, 0x15D);
++
++	ST7701_SPI(st7701, DSI_CMD2_BK1_VCOM, 0x143);
++
++	ST7701_SPI(st7701, DSI_CMD2_BK1_VGHSS, 0x181);
++
++	ST7701_SPI(st7701, DSI_CMD2_BK1_TESTCMD, 0x180);
++
++	ST7701_SPI(st7701, DSI_CMD2_BK1_VGLS, 0x143);
++
++	ST7701_SPI(st7701, DSI_CMD2_BK1_PWCTLR1, 0x185);
++
++	ST7701_SPI(st7701, DSI_CMD2_BK1_PWCTLR2, 0x120);
++
++	ST7701_SPI(st7701, DSI_CMD2_BK1_SPD1, 0x178);
++
++	ST7701_SPI(st7701, DSI_CMD2_BK1_SPD2, 0x178);
++
++	ST7701_SPI(st7701, DSI_CMD2_BK1_MIPISET1, 0x188);
++
++	ST7701_SPI(st7701, 0xE0, 0x100, 0x100, 0x102);
++
++	ST7701_SPI(st7701, 0xE1,
++		   0x103, 0x1A0, 0x100, 0x100, 0x104, 0x1A0, 0x100, 0x100,
++		   0x100, 0x120, 0x120);
++
++	ST7701_SPI(st7701, 0xE2,
++		   0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100,
++		   0x100, 0x100, 0x100, 0x100, 0x100);
++
++	ST7701_SPI(st7701, 0xE3, 0x100, 0x100, 0x111, 0x100);
++
++	ST7701_SPI(st7701, 0xE4, 0x122, 0x100);
++
++	ST7701_SPI(st7701, 0xE5,
++		   0x105, 0x1EC, 0x1A0, 0x1A0, 0x107, 0x1EE, 0x1A0, 0x1A0,
++		   0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100);
++
++	ST7701_SPI(st7701, 0xE6, 0x100, 0x100, 0x111, 0x100);
++
++	ST7701_SPI(st7701, 0xE7, 0x122, 0x100);
++
++	ST7701_SPI(st7701, 0xE8,
++		   0x106, 0x1ED, 0x1A0, 0x1A0, 0x108, 0x1EF, 0x1A0, 0x1A0,
++		   0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100);
++
++	ST7701_SPI(st7701, 0xEB,
++		   0x100, 0x100, 0x140, 0x140, 0x100, 0x100, 0x100);
++
++	ST7701_SPI(st7701, 0xED,
++		   0x1FF, 0x1FF, 0x1FF, 0x1BA, 0x10A, 0x1BF, 0x145, 0x1FF,
++		   0x1FF, 0x154, 0x1FB, 0x1A0, 0x1AB, 0x1FF, 0x1FF, 0x1FF);
++
++	ST7701_SPI(st7701, 0xEF, 0x110, 0x10D, 0x104, 0x108, 0x13F, 0x11F);
++
++	ST7701_SPI(st7701, DSI_CMD2BKX_SEL,
++		   0x177, 0x101, 0x100, 0x100, SPI_CMD2BK3_SEL);
++
++	ST7701_SPI(st7701, 0xEF, 0x108);
++
++	ST7701_SPI(st7701, DSI_CMD2BKX_SEL,
++		   0x177, 0x101, 0x100, 0x100, SPI_CMD2BKX_SEL_NONE);
++
++	ST7701_SPI(st7701, 0xCD, 0x108);  /* RGB format COLCTRL */
++
++	ST7701_SPI(st7701, 0x36, 0x108); /* MadCtl */
++
++	ST7701_SPI(st7701, 0x3A, 0x166);  /* Colmod */
++
++	ST7701_SPI(st7701, MIPI_DCS_EXIT_SLEEP_MODE);
++}
++
+ static int st7701_prepare(struct drm_panel *panel)
+ {
+ 	struct st7701 *st7701 = panel_to_st7701(panel);
+@@ -210,7 +356,7 @@ static int st7701_prepare(struct drm_pan
+ 	gpiod_set_value(st7701->reset, 1);
+ 	msleep(150);
+ 
+-	st7701_init_sequence(st7701);
++	st7701->desc->init_sequence(st7701);
+ 
+ 	return 0;
+ }
+@@ -219,7 +365,15 @@ static int st7701_enable(struct drm_pane
+ {
+ 	struct st7701 *st7701 = panel_to_st7701(panel);
+ 
+-	ST7701_DSI(st7701, MIPI_DCS_SET_DISPLAY_ON, 0x00);
++	switch (st7701->desc->interface) {
++	case ST7701_CTRL_DSI:
++		ST7701_DSI(st7701, MIPI_DCS_SET_DISPLAY_ON, 0x00);
++		break;
++	case ST7701_CTRL_SPI:
++		ST7701_SPI(st7701, MIPI_DCS_SET_DISPLAY_ON);
++		msleep(30);
++		break;
++	}
+ 
+ 	return 0;
+ }
+@@ -228,7 +382,14 @@ static int st7701_disable(struct drm_pan
+ {
+ 	struct st7701 *st7701 = panel_to_st7701(panel);
+ 
+-	ST7701_DSI(st7701, MIPI_DCS_SET_DISPLAY_OFF, 0x00);
++	switch (st7701->desc->interface) {
++	case ST7701_CTRL_DSI:
++		ST7701_DSI(st7701, MIPI_DCS_SET_DISPLAY_OFF, 0x00);
++		break;
++	case ST7701_CTRL_SPI:
++		ST7701_SPI(st7701, MIPI_DCS_SET_DISPLAY_OFF);
++		break;
++	}
+ 
+ 	return 0;
+ }
+@@ -237,7 +398,14 @@ static int st7701_unprepare(struct drm_p
+ {
+ 	struct st7701 *st7701 = panel_to_st7701(panel);
+ 
+-	ST7701_DSI(st7701, MIPI_DCS_ENTER_SLEEP_MODE, 0x00);
++	switch (st7701->desc->interface) {
++	case ST7701_CTRL_DSI:
++		ST7701_DSI(st7701, MIPI_DCS_ENTER_SLEEP_MODE, 0x00);
++		break;
++	case ST7701_CTRL_SPI:
++		ST7701_SPI(st7701, MIPI_DCS_ENTER_SLEEP_MODE);
++		break;
++	}
+ 
+ 	msleep(st7701->sleep_delay);
+ 
+@@ -268,7 +436,7 @@ static int st7701_get_modes(struct drm_p
+ 
+ 	mode = drm_mode_duplicate(connector->dev, desc_mode);
+ 	if (!mode) {
+-		dev_err(&st7701->dsi->dev, "failed to add mode %ux%u@%u\n",
++		dev_err(st7701->dev, "failed to add mode %ux%u@%u\n",
+ 			desc_mode->hdisplay, desc_mode->vdisplay,
+ 			drm_mode_vrefresh(desc_mode));
+ 		return -ENOMEM;
+@@ -277,9 +445,18 @@ static int st7701_get_modes(struct drm_p
+ 	drm_mode_set_name(mode);
+ 	drm_mode_probed_add(connector, mode);
+ 
++	if (st7701->desc->mediabus_format)
++		drm_display_info_set_bus_formats(&connector->display_info,
++						 &st7701->desc->mediabus_format,
++						 1);
++	connector->display_info.bus_flags = 0;
++
+ 	connector->display_info.width_mm = desc_mode->width_mm;
+ 	connector->display_info.height_mm = desc_mode->height_mm;
+ 
++	if (st7701->desc->bus_flags)
++		connector->display_info.bus_flags = st7701->desc->bus_flags;
++
+ 	return 1;
+ }
+ 
+@@ -323,24 +500,68 @@ static const struct st7701_panel_desc ts
+ 	.supply_names = ts8550b_supply_names,
+ 	.num_supplies = ARRAY_SIZE(ts8550b_supply_names),
+ 	.panel_sleep_delay = 80, /* panel need extra 80ms for sleep out cmd */
++	.init_sequence = ts8550b_init_sequence,
++	.conn_type = DRM_MODE_CONNECTOR_DSI,
++	.interface = ST7701_CTRL_DSI,
+ };
+ 
+-static int st7701_dsi_probe(struct mipi_dsi_device *dsi)
++static const struct drm_display_mode txw210001b0_mode = {
++	.clock		= 19200,
++
++	.hdisplay	= 480,
++	.hsync_start	= 480 + 10,
++	.hsync_end	= 480 + 10 + 16,
++	.htotal		= 480 + 10 + 16 + 56,
++
++	.vdisplay	= 480,
++	.vsync_start	= 480 + 15,
++	.vsync_end	= 480 + 15 + 60,
++	.vtotal		= 480 + 15 + 60 + 15,
++
++	.width_mm	= 53,
++	.height_mm	= 53,
++	.flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC,
++
++	.type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED,
++};
++
++static const struct st7701_panel_desc txw210001b0_desc = {
++	.mode = &txw210001b0_mode,
++	.mediabus_format = MEDIA_BUS_FMT_RGB888_1X24,
++	.supply_names = ts8550b_supply_names,
++	.num_supplies = ARRAY_SIZE(ts8550b_supply_names),
++	.init_sequence = txw210001b0_init_sequence,
++	.conn_type = DRM_MODE_CONNECTOR_DPI,
++	.interface = ST7701_CTRL_SPI,
++	.bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE,
++};
++
++static const struct st7701_panel_desc hyperpixel2r_desc = {
++	.mode = &txw210001b0_mode,
++	.mediabus_format = MEDIA_BUS_FMT_RGB666_1X24_CPADHI,
++	.supply_names = ts8550b_supply_names,
++	.num_supplies = ARRAY_SIZE(ts8550b_supply_names),
++	.init_sequence = txw210001b0_init_sequence,
++	.conn_type = DRM_MODE_CONNECTOR_DPI,
++	.interface = ST7701_CTRL_SPI,
++	.bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE,
++};
++
++static int st7701_probe(struct device *dev, struct st7701 **ret_st7701)
+ {
+ 	const struct st7701_panel_desc *desc;
+ 	struct st7701 *st7701;
+ 	int ret, i;
+ 
+-	st7701 = devm_kzalloc(&dsi->dev, sizeof(*st7701), GFP_KERNEL);
++	st7701 = devm_kzalloc(dev, sizeof(*st7701), GFP_KERNEL);
+ 	if (!st7701)
+ 		return -ENOMEM;
+ 
+-	desc = of_device_get_match_data(&dsi->dev);
+-	dsi->mode_flags = desc->flags;
+-	dsi->format = desc->format;
+-	dsi->lanes = desc->lanes;
++	desc = of_device_get_match_data(dev);
++	if (!desc)
++		return -EINVAL;
+ 
+-	st7701->supplies = devm_kcalloc(&dsi->dev, desc->num_supplies,
++	st7701->supplies = devm_kcalloc(dev, desc->num_supplies,
+ 					sizeof(*st7701->supplies),
+ 					GFP_KERNEL);
+ 	if (!st7701->supplies)
+@@ -349,19 +570,19 @@ static int st7701_dsi_probe(struct mipi_
+ 	for (i = 0; i < desc->num_supplies; i++)
+ 		st7701->supplies[i].supply = desc->supply_names[i];
+ 
+-	ret = devm_regulator_bulk_get(&dsi->dev, desc->num_supplies,
++	ret = devm_regulator_bulk_get(dev, desc->num_supplies,
+ 				      st7701->supplies);
+ 	if (ret < 0)
+ 		return ret;
+ 
+-	st7701->reset = devm_gpiod_get(&dsi->dev, "reset", GPIOD_OUT_LOW);
++	st7701->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
+ 	if (IS_ERR(st7701->reset)) {
+-		dev_err(&dsi->dev, "Couldn't get our reset GPIO\n");
++		dev_err(dev, "Couldn't get our reset GPIO\n");
+ 		return PTR_ERR(st7701->reset);
+ 	}
+ 
+-	drm_panel_init(&st7701->panel, &dsi->dev, &st7701_funcs,
+-		       DRM_MODE_CONNECTOR_DSI);
++	drm_panel_init(&st7701->panel, dev, &st7701_funcs,
++		       desc->conn_type);
+ 
+ 	/**
+ 	 * Once sleep out has been issued, ST7701 IC required to wait 120ms
+@@ -380,9 +601,30 @@ static int st7701_dsi_probe(struct mipi_
+ 
+ 	drm_panel_add(&st7701->panel);
+ 
++	st7701->desc = desc;
++	st7701->dev = dev;
++
++	*ret_st7701 = st7701;
++
++	return 0;
++}
++
++static int st7701_dsi_probe(struct mipi_dsi_device *dsi)
++{
++	struct st7701 *st7701;
++	int ret;
++
++	ret = st7701_probe(&dsi->dev, &st7701);
++
++	if (ret)
++		return ret;
++
++	dsi->mode_flags = st7701->desc->flags;
++	dsi->format = st7701->desc->format;
++	dsi->lanes = st7701->desc->lanes;
++
+ 	mipi_dsi_set_drvdata(dsi, st7701);
+ 	st7701->dsi = dsi;
+-	st7701->desc = desc;
+ 
+ 	return mipi_dsi_attach(dsi);
+ }
+@@ -397,21 +639,115 @@ static int st7701_dsi_remove(struct mipi
+ 	return 0;
+ }
+ 
+-static const struct of_device_id st7701_of_match[] = {
++static const struct of_device_id st7701_dsi_of_match[] = {
+ 	{ .compatible = "techstar,ts8550b", .data = &ts8550b_desc },
+ 	{ }
+ };
+-MODULE_DEVICE_TABLE(of, st7701_of_match);
++MODULE_DEVICE_TABLE(of, st7701_dsi_of_match);
+ 
+ static struct mipi_dsi_driver st7701_dsi_driver = {
+ 	.probe		= st7701_dsi_probe,
+ 	.remove		= st7701_dsi_remove,
+ 	.driver = {
+ 		.name		= "st7701",
+-		.of_match_table	= st7701_of_match,
++		.of_match_table	= st7701_dsi_of_match,
+ 	},
+ };
+-module_mipi_dsi_driver(st7701_dsi_driver);
++
++/* SPI display  probe */
++static const struct of_device_id st7701_spi_of_match[] = {
++	{	.compatible = "txw,txw210001b0",
++		.data = &txw210001b0_desc,
++	}, {
++		.compatible = "pimoroni,hyperpixel2round",
++		.data = &hyperpixel2r_desc,
++	}, {
++		/* sentinel */
++	}
++};
++MODULE_DEVICE_TABLE(of, st7701_spi_of_match);
++
++static int st7701_spi_probe(struct spi_device *spi)
++{
++	struct st7701 *st7701;
++	int ret;
++
++	spi->mode = SPI_MODE_3;
++	spi->bits_per_word = 9;
++	ret = spi_setup(spi);
++	if (ret < 0) {
++		dev_err(&spi->dev, "failed to setup SPI: %d\n", ret);
++		return ret;
++	}
++
++	ret = st7701_probe(&spi->dev, &st7701);
++
++	if (ret)
++		return ret;
++
++	spi_set_drvdata(spi, st7701);
++	st7701->spi = spi;
++
++	return 0;
++}
++
++static int st7701_spi_remove(struct spi_device *spi)
++{
++	struct st7701 *ctx = spi_get_drvdata(spi);
++
++	drm_panel_remove(&ctx->panel);
++
++	return 0;
++}
++
++static const struct spi_device_id st7701_spi_ids[] = {
++	{ "txw210001b0", 0 },
++	{ "hyperpixel2round", 0 },
++	{ /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(spi, st7701_spi_ids);
++
++static struct spi_driver st7701_spi_driver = {
++	.probe = st7701_spi_probe,
++	.remove = st7701_spi_remove,
++	.driver = {
++		.name = "st7701",
++		.of_match_table = st7701_spi_of_match,
++	},
++	.id_table = st7701_spi_ids,
++};
++
++static int __init panel_st7701_init(void)
++{
++	int err;
++
++	err = spi_register_driver(&st7701_spi_driver);
++	if (err < 0)
++		return err;
++
++	if (IS_ENABLED(CONFIG_DRM_MIPI_DSI)) {
++		err = mipi_dsi_driver_register(&st7701_dsi_driver);
++		if (err < 0)
++			goto err_did_spi_register;
++	}
++
++	return 0;
++
++err_did_spi_register:
++	spi_unregister_driver(&st7701_spi_driver);
++
++	return err;
++}
++module_init(panel_st7701_init);
++
++static void __exit panel_st7701_exit(void)
++{
++	if (IS_ENABLED(CONFIG_DRM_MIPI_DSI))
++		mipi_dsi_driver_unregister(&st7701_dsi_driver);
++
++	spi_unregister_driver(&st7701_spi_driver);
++}
++module_exit(panel_st7701_exit);
+ 
+ MODULE_AUTHOR("Jagan Teki <jagan@amarulasolutions.com>");
+ MODULE_DESCRIPTION("Sitronix ST7701 LCD Panel Driver");
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0712-bindings-Add-sck-idle-input-to-spi-gpio.patch b/root/target/linux/bcm27xx/patches-5.15/950-0712-bindings-Add-sck-idle-input-to-spi-gpio.patch
new file mode 100644
index 00000000..13734bbc
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0712-bindings-Add-sck-idle-input-to-spi-gpio.patch
@@ -0,0 +1,23 @@
+From 4f6809ac0fd0b19edcf58fb54881c92e5bf6dd92 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Fri, 4 Feb 2022 11:33:28 +0000
+Subject: [PATCH 712/828] bindings: Add sck-idle-input to spi-gpio
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ Documentation/devicetree/bindings/spi/spi-gpio.yaml | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/Documentation/devicetree/bindings/spi/spi-gpio.yaml
++++ b/Documentation/devicetree/bindings/spi/spi-gpio.yaml
+@@ -43,6 +43,10 @@ properties:
+       with no chip select is connected.
+     $ref: "/schemas/types.yaml#/definitions/uint32"
+ 
++  sck-idle-input:
++    description: Make SCK an input when inactive.
++    type: boolean
++
+   # Deprecated properties
+   gpio-sck: false
+   gpio-miso: false
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0713-spi-gpio-Add-sck-idle-input-property.patch b/root/target/linux/bcm27xx/patches-5.15/950-0713-spi-gpio-Add-sck-idle-input-property.patch
new file mode 100644
index 00000000..bdf2f898
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0713-spi-gpio-Add-sck-idle-input-property.patch
@@ -0,0 +1,57 @@
+From a93defac861966cbcd51fc0dcb1e9a70e82b65f3 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Wed, 12 Jan 2022 08:23:28 +0000
+Subject: [PATCH 713/828] spi: gpio: Add sck-idle-input property
+
+The sck-idle-input property indicates that the spi-gpio driver should
+return the SCK line to an input when the chip select signals are
+inactive.
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ drivers/spi/spi-gpio.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+--- a/drivers/spi/spi-gpio.c
++++ b/drivers/spi/spi-gpio.c
+@@ -35,6 +35,7 @@ struct spi_gpio {
+ 	struct gpio_desc		*sck;
+ 	struct gpio_desc		*miso;
+ 	struct gpio_desc		*mosi;
++	bool				sck_idle_input;
+ 	struct gpio_desc		**cs_gpios;
+ };
+ 
+@@ -201,8 +202,12 @@ static void spi_gpio_chipselect(struct s
+ 	struct spi_gpio *spi_gpio = spi_to_spi_gpio(spi);
+ 
+ 	/* set initial clock line level */
+-	if (is_active)
+-		gpiod_set_value_cansleep(spi_gpio->sck, spi->mode & SPI_CPOL);
++	if (is_active) {
++		if (spi_gpio->sck_idle_input)
++			gpiod_direction_output(spi_gpio->sck, spi->mode & SPI_CPOL);
++		else
++			gpiod_set_value_cansleep(spi_gpio->sck, spi->mode & SPI_CPOL);
++	}
+ 
+ 	/* Drive chip select line, if we have one */
+ 	if (spi_gpio->cs_gpios) {
+@@ -211,6 +216,9 @@ static void spi_gpio_chipselect(struct s
+ 		/* SPI chip selects are normally active-low */
+ 		gpiod_set_value_cansleep(cs, (spi->mode & SPI_CS_HIGH) ? is_active : !is_active);
+ 	}
++
++	if (spi_gpio->sck_idle_input && !is_active)
++		gpiod_direction_input(spi_gpio->sck);
+ }
+ 
+ static int spi_gpio_setup(struct spi_device *spi)
+@@ -289,6 +297,7 @@ static int spi_gpio_request(struct devic
+ 	if (IS_ERR(spi_gpio->miso))
+ 		return PTR_ERR(spi_gpio->miso);
+ 
++	spi_gpio->sck_idle_input = device_property_read_bool(dev, "sck-idle-input");
+ 	spi_gpio->sck = devm_gpiod_get(dev, "sck", GPIOD_OUT_LOW);
+ 	return PTR_ERR_OR_ZERO(spi_gpio->sck);
+ }
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0714-dtoverlays-Add-overlays-for-Pimoroni-Hyperpixel-disp.patch b/root/target/linux/bcm27xx/patches-5.15/950-0714-dtoverlays-Add-overlays-for-Pimoroni-Hyperpixel-disp.patch
new file mode 100644
index 00000000..83dbebb7
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0714-dtoverlays-Add-overlays-for-Pimoroni-Hyperpixel-disp.patch
@@ -0,0 +1,394 @@
+From cf59b7c7f7752295cf048cdc2201d7a00a9894f6 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 6 Jan 2022 13:04:34 +0000
+Subject: [PATCH 714/828] dtoverlays: Add overlays for Pimoroni Hyperpixel
+ displays
+
+Adds an overlays for the Pimoroni HyperPixel4, HyperPixel 4
+Square, and HyperPixel 2 Round DPI displays.
+
+We have a conflict over the use of GPIO 27 for touch screen
+interrupt and SPI CLK for configuring the display on the
+two HyperPixel4 displays.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/Makefile           |   3 +
+ arch/arm/boot/dts/overlays/README             |  33 +++++
+ .../dts/overlays/vc4-kms-dpi-hyperpixel.dtsi  |  94 +++++++++++++++
+ .../vc4-kms-dpi-hyperpixel2r-overlay.dts      | 114 ++++++++++++++++++
+ .../vc4-kms-dpi-hyperpixel4-overlay.dts       |  57 +++++++++
+ .../vc4-kms-dpi-hyperpixel4sq-overlay.dts     |  36 ++++++
+ 6 files changed, 337 insertions(+)
+ create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel.dtsi
+ create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel2r-overlay.dts
+ create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4-overlay.dts
+ create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4sq-overlay.dts
+
+--- a/arch/arm/boot/dts/overlays/Makefile
++++ b/arch/arm/boot/dts/overlays/Makefile
+@@ -235,6 +235,9 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
+ 	vc4-fkms-v3d.dtbo \
+ 	vc4-fkms-v3d-pi4.dtbo \
+ 	vc4-kms-dpi-generic.dtbo \
++	vc4-kms-dpi-hyperpixel2r.dtbo \
++	vc4-kms-dpi-hyperpixel4.dtbo \
++	vc4-kms-dpi-hyperpixel4sq.dtbo \
+ 	vc4-kms-dpi-panel.dtbo \
+ 	vc4-kms-dsi-7inch.dtbo \
+ 	vc4-kms-dsi-lt070me05000.dtbo \
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -3676,6 +3676,39 @@ Params: clock-frequency         Display
+         rotate                  Display rotation {0,90,180,270} (default 0)
+ 
+ 
++Name:   vc4-kms-dpi-hyperpixel2r
++Info:   Enable the KMS drivers for the Pimoroni HyperPixel2 Round DPI display.
++        Requires vc4-kms-v3d to be loaded.
++Load:   dtoverlay=vc4-kms-dpi-hyperpixel2r,<param>=<val>
++Params: disable-touch           Disables the touch controller
++        touchscreen-inverted-x  Inverts X direction of touch controller
++        touchscreen-inverted-y  Inverts Y direction of touch controller
++        touchscreen-swapped-x-y Swaps X & Y axes of touch controller
++        rotate                  Display rotation {0,90,180,270} (default 0)
++
++
++Name:   vc4-kms-dpi-hyperpixel4
++Info:   Enable the KMS drivers for the Pimoroni HyperPixel4 DPI display.
++        Requires vc4-kms-v3d to be loaded.
++Load:   dtoverlay=vc4-kms-dpi-hyperpixel4,<param>=<val>
++Params: disable-touch           Disables the touch controller
++        touchscreen-inverted-x  Inverts X direction of touch controller
++        touchscreen-inverted-y  Inverts Y direction of touch controller
++        touchscreen-swapped-x-y Swaps X & Y axes of touch controller
++        rotate                  Display rotation {0,90,180,270} (default 0)
++
++
++Name:   vc4-kms-dpi-hyperpixel4sq
++Info:   Enable the KMS drivers for the Pimoroni HyperPixel4 Square DPI display.
++        Requires vc4-kms-v3d to be loaded.
++Load:   dtoverlay=vc4-kms-dpi-hyperpixel4sq,<param>=<val>
++Params: disable-touch           Disables the touch controller
++        touchscreen-inverted-x  Inverts X direction of touch controller
++        touchscreen-inverted-y  Inverts Y direction of touch controller
++        touchscreen-swapped-x-y Swaps X & Y axes of touch controller
++        rotate                  Display rotation {0,90,180,270} (default 0)
++
++
+ Name:   vc4-kms-dpi-panel
+ Info:   Enable a preconfigured KMS DPI panel.
+         Requires vc4-kms-v3d to be loaded.
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel.dtsi
+@@ -0,0 +1,94 @@
++/*
++ * vc4-kms-dpi-hyperpixel4.dtsi
++ * Commmon initialisation for HyperPixel DPI displays
++ */
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/pinctrl/bcm2835.h>
++
++/ {
++	compatible = "brcm,bcm2835";
++
++	fragment@0 {
++		target-path = "/";
++		__overlay__ {
++			spi {
++				compatible = "spi-gpio";
++				#address-cells = <1>;
++				#size-cells = <0>;
++				pinctrl-0 = <&spi_pins>;
++				pinctrl-names = "default";
++
++				sck-gpios = <&gpio 27 GPIO_ACTIVE_HIGH>;
++				mosi-gpios = <&gpio 26 GPIO_ACTIVE_HIGH>;
++				cs-gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
++				num-chipselects = <1>;
++				sck-idle-input;
++
++				panel: display@0 {
++					reg = <0>;
++					/* 100 kHz */
++					spi-max-frequency = <100000>;
++					backlight = <&backlight>;
++					rotation = <0>;
++
++					port {
++						panel_in: endpoint {
++							remote-endpoint = <&dpi_out>;
++						};
++					};
++				};
++			};
++
++			backlight: backlight {
++				compatible = "gpio-backlight";
++				gpios = <&gpio 19 0>;
++			};
++		};
++	};
++
++	fragment@1 {
++		target = <&dpi>;
++		__overlay__  {
++			status = "okay";
++
++			pinctrl-names = "default";
++			pinctrl-0 = <&dpi_18bit_cpadhi_gpio0>;
++
++			port {
++				dpi_out: endpoint {
++					remote-endpoint = <&panel_in>;
++				};
++			};
++		};
++	};
++
++	fragment@2 {
++		target = <&gpio>;
++		__overlay__ {
++			spi_pins: hyperpixel4_spi_pins {
++				brcm,pins = <27 18 26>;
++				brcm,pull = <BCM2835_PUD_UP BCM2835_PUD_UP BCM2835_PUD_OFF>;
++				brcm,function = <0>;
++			};
++		};
++	};
++
++	fragment@3 {
++		target-path = "/";
++		__overlay__ {
++			i2c_gpio: i2c@0 {
++				compatible = "i2c-gpio";
++				gpios = <&gpio 10 0 /* sda */
++					 &gpio 11 0>; /* scl */
++				i2c-gpio,delay-us = <4>;        /* ~100 kHz */
++				#address-cells = <1>;
++				#size-cells = <0>;
++			};
++		};
++	};
++
++	__overrides__ {
++		rotate = <&panel>, "rotation:0";
++	};
++};
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel2r-overlay.dts
+@@ -0,0 +1,114 @@
++/*
++ * vc4-kms-dpi-hyperpixel2r-overlay.dts
++ */
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/pinctrl/bcm2835.h>
++
++/dts-v1/;
++/plugin/;
++
++/ {
++	compatible = "brcm,bcm2835";
++
++	fragment@0 {
++		target-path = "/";
++		__overlay__ {
++			spi {
++				compatible = "spi-gpio";
++				#address-cells = <1>;
++				#size-cells = <0>;
++				pinctrl-0 = <&spi_pins>;
++				pinctrl-names = "default";
++
++				sck-gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
++				mosi-gpios = <&gpio 10 GPIO_ACTIVE_HIGH>;
++				cs-gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
++				num-chipselects = <1>;
++
++				panel: display@0 {
++					compatible = "pimoroni,hyperpixel2round";
++					reg = <0>;
++					/* 100 kHz */
++					spi-max-frequency = <100000>;
++					backlight = <&backlight>;
++					rotation = <0>;
++
++					port {
++						panel_in: endpoint {
++							remote-endpoint = <&dpi_out>;
++						};
++					};
++				};
++			};
++
++			backlight: backlight {
++				compatible = "gpio-backlight";
++				gpios = <&gpio 19 0>;
++			};
++		};
++	};
++
++	fragment@1 {
++		target = <&dpi>;
++		__overlay__  {
++			status = "okay";
++
++			pinctrl-names = "default";
++			pinctrl-0 = <&dpi_18bit_cpadhi_gpio0>;
++
++			port {
++				dpi_out: endpoint {
++					remote-endpoint = <&panel_in>;
++				};
++			};
++		};
++	};
++
++	fragment@2 {
++		target = <&gpio>;
++		__overlay__ {
++			spi_pins: hyperpixel4_spi_pins {
++				brcm,pins = <27 18 26>;
++				brcm,pull = <BCM2835_PUD_UP BCM2835_PUD_UP BCM2835_PUD_OFF>;
++				brcm,function = <0>;
++			};
++		};
++	};
++
++	fragment@3 {
++		target-path = "/";
++		__overlay__ {
++			i2c_gpio: i2c@0 {
++				compatible = "i2c-gpio";
++				status = "disabled";
++
++				gpios = <&gpio 10 GPIO_ACTIVE_HIGH /* sda */
++					 &gpio 11 GPIO_ACTIVE_HIGH>; /* scl */
++				i2c-gpio,delay-us = <4>;        /* ~100 kHz */
++				#address-cells = <1>;
++				#size-cells = <0>;
++
++				polytouch: edt-ft5x06@15 {
++					#address-cells = <1>;
++					#size-cells = <0>;
++					compatible = "edt,edt-ft5406";
++					reg = <0x15>;
++					interrupt-parent = <&gpio>;
++					interrupts = <27 0x02>;
++					touchscreen-size-x = <240>;
++					touchscreen-size-y = <240>;
++				};
++			};
++		};
++	};
++
++	__overrides__ {
++		disable-touch = <0>,"-3";
++		touchscreen-inverted-x = <&polytouch>,"touchscreen-inverted-x?";
++		touchscreen-inverted-y = <&polytouch>,"touchscreen-inverted-y!";
++		touchscreen-swapped-x-y = <&polytouch>,"touchscreen-swapped-x-y!";
++		rotate = <&panel>, "rotation:0";
++	};
++
++};
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4-overlay.dts
+@@ -0,0 +1,57 @@
++/*
++ * vc4-kms-dpi-hyperpixel4sq-overlay.dts
++ */
++
++/dts-v1/;
++/plugin/;
++
++#include "vc4-kms-dpi-hyperpixel.dtsi"
++
++&panel {
++	compatible = "pimoroni,hyperpixel4";
++};
++
++/ {
++	fragment@11 {
++		target = <&i2c_gpio>;
++		__overlay__ {
++			/* needed to avoid dtc warning */
++			#address-cells = <1>;
++			#size-cells = <0>;
++			ft6236_14: ft6236@14 {
++				compatible = "goodix,gt911";
++				reg = <0x14>;
++				interrupt-parent = <&gpio>;
++				interrupts = <27 2>;
++				touchscreen-size-x = <480>;
++				touchscreen-size-y = <800>;
++				touchscreen-x-mm = <51>;
++				touchscreen-y-mm = <85>;
++				touchscreen-inverted-y;
++				touchscreen-swapped-x-y;
++			};
++			ft6236_5d: ft6236@5d {
++				compatible = "goodix,gt911";
++				reg = <0x5d>;
++				interrupt-parent = <&gpio>;
++				interrupts = <27 2>;
++				touchscreen-size-x = <480>;
++				touchscreen-size-y = <800>;
++				touchscreen-x-mm = <51>;
++				touchscreen-y-mm = <85>;
++				touchscreen-inverted-y;
++				touchscreen-swapped-x-y;
++			};
++		};
++	};
++
++	__overrides__ {
++		disable-touch = <0>,"-3-11";
++		touchscreen-inverted-x = <&ft6236_14>,"touchscreen-inverted-x?",
++					 <&ft6236_5d>,"touchscreen-inverted-x?";
++		touchscreen-inverted-y = <&ft6236_14>,"touchscreen-inverted-y!",
++					 <&ft6236_5d>,"touchscreen-inverted-y!";
++		touchscreen-swapped-x-y = <&ft6236_14>,"touchscreen-swapped-x-y!",
++					  <&ft6236_5d>,"touchscreen-swapped-x-y!";
++	};
++};
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4sq-overlay.dts
+@@ -0,0 +1,36 @@
++/*
++ * vc4-kms-dpi-hyperpixel4-overlay.dts
++ */
++
++/dts-v1/;
++/plugin/;
++
++#include "vc4-kms-dpi-hyperpixel.dtsi"
++
++&panel {
++	compatible = "pimoroni,hyperpixel4square";
++};
++
++/ {
++	fragment@11 {
++		target = <&i2c_gpio>;
++		__overlay__ {
++			polytouch: edt-ft5x06@48 {
++				#address-cells = <1>;
++				#size-cells = <0>;
++				compatible = "edt,edt-ft5406";
++				reg = <0x48>;
++				interrupt-parent = <&gpio>;
++				interrupts = <27 0x02>;
++				touchscreen-size-x = <720>;
++				touchscreen-size-y = <720>;
++			};
++		};
++	};
++	__overrides__ {
++		disable-touch = <0>,"-3-11";
++		touchscreen-inverted-x = <&polytouch>,"touchscreen-inverted-x?";
++		touchscreen-inverted-y = <&polytouch>,"touchscreen-inverted-y!";
++		touchscreen-swapped-x-y = <&polytouch>,"touchscreen-swapped-x-y!";
++	};
++};
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0715-dtoverlay-Reduce-size-of-PCIE-IB-window-in-pcie-32-d.patch b/root/target/linux/bcm27xx/patches-5.15/950-0715-dtoverlay-Reduce-size-of-PCIE-IB-window-in-pcie-32-d.patch
new file mode 100644
index 00000000..96b650b1
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0715-dtoverlay-Reduce-size-of-PCIE-IB-window-in-pcie-32-d.patch
@@ -0,0 +1,51 @@
+From 4612495fdf28d10224c4f713626a480e99e7f5da Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 3 Feb 2022 11:17:16 +0000
+Subject: [PATCH 715/828] dtoverlay: Reduce size of PCIE IB window in
+ pcie-32-dma overlay
+
+The PCIE inbound window is rounded up to a power of 2, so the default
+of 3GB rounds up to 4GB starting at 0. This prohibits the MSI vector
+sitting at 0x0_fffffffc, and causes warnings from some subsystems
+(eg ahci) of a 64bit address on a 32bit configuration.
+
+Reduce the window down to 2GB to avoid this issue.
+
+https://github.com/raspberrypi/linux/issues/4848
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ .../dts/overlays/pcie-32bit-dma-overlay.dts   | 20 +++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+--- a/arch/arm/boot/dts/overlays/pcie-32bit-dma-overlay.dts
++++ b/arch/arm/boot/dts/overlays/pcie-32bit-dma-overlay.dts
+@@ -11,8 +11,28 @@
+ 	fragment@0 {
+ 		target-path = "/aliases";
+ 		__overlay__ {
++			/*
++			 * Removing this alias stops the firmware patching the
++			 * PCIE DT dma-ranges based on the detected chip
++			 * revision.
++			 */
+ 			pcie0 = "";
+ 		};
+ 	};
+ 
++	fragment@1 {
++		target = <&pcie0>;
++		__overlay__ {
++			/*
++			 * The size of the range is rounded up to a power of 2,
++			 * so the range ends up being 0-4GB, and the MSI vector
++			 * gets pushed beyond 4GB.
++			 */
++			#address-cells = <3>;
++			#size-cells = <2>;
++			dma-ranges = <0x02000000 0x0 0x00000000 0x0 0x00000000
++				      0x0 0x80000000>;
++		};
++	};
++
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0716-ARM-dts-Permanently-disable-hdmi1-and-ddc1-on-CM4S.patch b/root/target/linux/bcm27xx/patches-5.15/950-0716-ARM-dts-Permanently-disable-hdmi1-and-ddc1-on-CM4S.patch
new file mode 100644
index 00000000..1ec1f121
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0716-ARM-dts-Permanently-disable-hdmi1-and-ddc1-on-CM4S.patch
@@ -0,0 +1,41 @@
+From 33eb5484c876e188e5f24e5af589d31d451cb62f Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Wed, 2 Feb 2022 17:47:54 +0000
+Subject: [PATCH 716/828] ARM: dts: Permanently disable hdmi1 and ddc1 on CM4S
+
+CM4S has no HDMI1 output, so it is advisable to disable the controller
+and its I2C interface in software. This is ordinarily done by setting
+their status properties to "disabled", but the vc4-kms-v3d(-pi4)
+overlay enables both HDMIs and DDCs as part of the transfer of control
+from the VPU.
+
+Knobble the CM4S dts in such a way that the overlay applies
+successfully but the hdmi1 and ddc1 nodes remain disabled by changing
+the compatible string to something unrecognised.
+
+See: https://github.com/raspberrypi/linux/issues/4857
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/boot/dts/bcm2711-rpi-cm4s.dts | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
+@@ -367,6 +367,16 @@
+ 	};
+ };
+ 
++/* Permanently disable HDMI1 */
++&hdmi1 {
++	compatible = "disabled";
++};
++
++/* Permanently disable DDC1 */
++&ddc1 {
++	compatible = "disabled";
++};
++
+ &leds {
+ 	act_led: led-act {
+ 		label = "led0";
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0717-net-phy-lan87xx-Decrease-phy-polling-rate.patch b/root/target/linux/bcm27xx/patches-5.15/950-0717-net-phy-lan87xx-Decrease-phy-polling-rate.patch
new file mode 100644
index 00000000..3e2cc153
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0717-net-phy-lan87xx-Decrease-phy-polling-rate.patch
@@ -0,0 +1,55 @@
+From ce1c9c96438f6589ccce3854d3b9989f4c94a310 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Thu, 3 Feb 2022 15:51:41 +0000
+Subject: [PATCH 717/828] net: phy: lan87xx: Decrease phy polling rate
+
+Polling at 100Hz for 1.5s consumes quite a bit of kworker time with no
+obvious benefit. Reduce that polling rate to ~6Hz.
+
+To further save CPU and power, defer the next poll if no energy is
+detected.
+
+See: https://github.com/raspberrypi/linux/issues/4780
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ drivers/net/phy/smsc.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/phy/smsc.c
++++ b/drivers/net/phy/smsc.c
+@@ -218,6 +218,8 @@ static int lan87xx_read_status(struct ph
+ 	int err = genphy_read_status(phydev);
+ 
+ 	if (!phydev->link && priv->energy_enable) {
++		int energy_detected;
++
+ 		/* Disable EDPD to wake up PHY */
+ 		int rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
+ 		if (rc < 0)
+@@ -233,7 +235,7 @@ static int lan87xx_read_status(struct ph
+ 		 */
+ 		read_poll_timeout(phy_read, rc,
+ 				  rc & MII_LAN83C185_ENERGYON || rc < 0,
+-				  10000, 1500000, true, phydev,
++				  150000, 1500000, true, phydev,
+ 				  MII_LAN83C185_CTRL_STATUS);
+ 		if (rc < 0)
+ 			return rc;
+@@ -243,10 +245,16 @@ static int lan87xx_read_status(struct ph
+ 		if (rc < 0)
+ 			return rc;
+ 
++		energy_detected = !!(rc & MII_LAN83C185_ENERGYON);
++
+ 		rc = phy_write(phydev, MII_LAN83C185_CTRL_STATUS,
+ 			       rc | MII_LAN83C185_EDPWRDOWN);
+ 		if (rc < 0)
+ 			return rc;
++
++		/* Save CPU and power by deferring the next poll */
++		if (!energy_detected)
++			msleep(2000);
+ 	}
+ 
+ 	return err;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0718-drm-panel-Fix-compilation-warnings.patch b/root/target/linux/bcm27xx/patches-5.15/950-0718-drm-panel-Fix-compilation-warnings.patch
new file mode 100644
index 00000000..02697dc6
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0718-drm-panel-Fix-compilation-warnings.patch
@@ -0,0 +1,35 @@
+From 39f7e028a57cb68fec59dca4bb9628397834f356 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Sat, 5 Feb 2022 18:41:07 +0000
+Subject: [PATCH 718/828] drm: panel: Fix compilation warnings
+
+See: https://github.com/raspberrypi/linux/pull/4812
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ drivers/gpu/drm/panel/panel-ilitek-ili9806e.c | 2 +-
+ drivers/gpu/drm/panel/panel-tdo-y17p.c        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/panel/panel-ilitek-ili9806e.c
++++ b/drivers/gpu/drm/panel/panel-ilitek-ili9806e.c
+@@ -421,7 +421,7 @@ static int ili9806_probe(struct spi_devi
+ 	if (!id)
+ 		return -ENODEV;
+ 
+-	ctx->bus_format = (u32)id->data;
++	ctx->bus_format = (u32)(uintptr_t)id->data;
+ 
+ 	spi_set_drvdata(spi, ctx);
+ 	ctx->spi = spi;
+--- a/drivers/gpu/drm/panel/panel-tdo-y17p.c
++++ b/drivers/gpu/drm/panel/panel-tdo-y17p.c
+@@ -218,7 +218,7 @@ static int tdo_y17p_probe(struct spi_dev
+ 	if (!id)
+ 		return -ENODEV;
+ 
+-	ctx->bus_format = (u32)id->data;
++	ctx->bus_format = (u32)(uintptr_t)id->data;
+ 
+ 	spi_set_drvdata(spi, ctx);
+ 	ctx->spi = spi;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0719-media-bcm2835-unicam-Handle-a-repeated-frame-start-w.patch b/root/target/linux/bcm27xx/patches-5.15/950-0719-media-bcm2835-unicam-Handle-a-repeated-frame-start-w.patch
new file mode 100644
index 00000000..43ec9834
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0719-media-bcm2835-unicam-Handle-a-repeated-frame-start-w.patch
@@ -0,0 +1,63 @@
+From 6ba84c863b8bda2248d5c558d6c5238977f6f156 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Fri, 4 Feb 2022 16:12:35 +0000
+Subject: [PATCH 719/828] media: bcm2835-unicam: Handle a repeated frame start
+ with no end
+
+In the case of 2 frame starts being received with no frame end
+between, the queued buffer held in next_frm was lost as the
+pointer was overwritten with the dummy buffer.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ .../media/platform/bcm2835/bcm2835-unicam.c   | 29 +++++++++++++++----
+ 1 file changed, 24 insertions(+), 5 deletions(-)
+
+--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
++++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
+@@ -933,10 +933,14 @@ static irqreturn_t unicam_isr(int irq, v
+ 			 * as complete, as the HW will reuse that buffer.
+ 			 */
+ 			if (unicam->node[i].cur_frm &&
+-			    unicam->node[i].cur_frm != unicam->node[i].next_frm)
++			    unicam->node[i].cur_frm != unicam->node[i].next_frm) {
+ 				unicam_process_buffer_complete(&unicam->node[i],
+ 							       sequence);
+-			unicam->node[i].cur_frm = unicam->node[i].next_frm;
++				unicam->node[i].cur_frm = unicam->node[i].next_frm;
++				unicam->node[i].next_frm = NULL;
++			} else {
++				unicam->node[i].cur_frm = unicam->node[i].next_frm;
++			}
+ 		}
+ 		unicam->sequence++;
+ 	}
+@@ -959,10 +963,25 @@ static irqreturn_t unicam_isr(int irq, v
+ 					   i);
+ 			/*
+ 			 * Set the next frame output to go to a dummy frame
+-			 * if we have not managed to obtain another frame
+-			 * from the queue.
++			 * if no buffer currently queued.
+ 			 */
+-			unicam_schedule_dummy_buffer(&unicam->node[i]);
++			if (!unicam->node[i].next_frm ||
++			    unicam->node[i].next_frm == unicam->node[i].cur_frm) {
++				unicam_schedule_dummy_buffer(&unicam->node[i]);
++			} else if (unicam->node[i].cur_frm) {
++				/*
++				 * Repeated FS without FE. Hardware will have
++				 * swapped buffers, but the cur_frm doesn't
++				 * contain valid data. Return cur_frm to the
++				 * queue.
++				 */
++				spin_lock(&unicam->node[i].dma_queue_lock);
++				list_add_tail(&unicam->node[i].cur_frm->list,
++					      &unicam->node[i].dma_queue);
++				spin_unlock(&unicam->node[i].dma_queue_lock);
++				unicam->node[i].cur_frm = unicam->node[i].next_frm;
++				unicam->node[i].next_frm = NULL;
++			}
+ 		}
+ 
+ 		unicam_queue_event_sof(unicam);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0720-overlays-rpi-poe-plus-Fix-parameters.patch b/root/target/linux/bcm27xx/patches-5.15/950-0720-overlays-rpi-poe-plus-Fix-parameters.patch
new file mode 100644
index 00000000..ec2ede81
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0720-overlays-rpi-poe-plus-Fix-parameters.patch
@@ -0,0 +1,120 @@
+From 90f1e51e0be2a768d6d05aed2ed463d4c0b52173 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Mon, 7 Feb 2022 16:06:11 +0000
+Subject: [PATCH 720/828] overlays: rpi-poe(-plus): Fix parameters
+
+The support of PoE HATs is complicated because there are two methods to
+control them - via the firmware, and directly over I2C - the choice
+between the two methods depending on which side "owns" the i2c0 bus.
+
+The firmware determines the ownership of i2c0 by analysing the Device
+Tree after applying any dtoverlays and dtparams. For this reason the
+PoE HAT overlays have recently been applied by the firmware _after_
+config.txt has been processed, but this has prevented any user-supplied
+threshold settings from being applied - either because the parameters
+are unknown or because (after an explicit dtoverlay=rpi-poe) the
+firmware's reload of the overlay has overwritten the user's settings.
+
+Solve the problem by restructuring the rpi-poe overlays to support
+a mode switch _after_ the overlay has been merged, thereby allowing
+the overlays to be loaded _before_ config.txt is processed.
+
+There is a companion firmware patch that changes the point at which
+the overlays are loaded, and the parameter used to switch modes, but
+the updated overlays are still compatible with older firmware, albeit
+without working parameters.
+
+See: https://github.com/raspberrypi/firmware/issues/1689
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/rpi-poe-overlay.dts    | 15 ++++++++++-----
+ .../boot/dts/overlays/rpi-poe-plus-overlay.dts    | 15 +++++++++++++--
+ 2 files changed, 23 insertions(+), 7 deletions(-)
+
+--- a/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
++++ b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
+@@ -67,7 +67,7 @@
+ 
+ 	fragment@2 {
+ 		target-path = "/__overrides__";
+-		__overlay__ {
++		params: __overlay__ {
+ 			poe_fan_temp0 =		<&trip0>,"temperature:0";
+ 			poe_fan_temp0_hyst =	<&trip0>,"hysteresis:0";
+ 			poe_fan_temp1 =		<&trip1>,"temperature:0";
+@@ -76,6 +76,9 @@
+ 			poe_fan_temp2_hyst =	<&trip2>,"hysteresis:0";
+ 			poe_fan_temp3 =		<&trip3>,"temperature:0";
+ 			poe_fan_temp3_hyst =	<&trip3>,"hysteresis:0";
++			poe_fan_i2c =		<&fwpwm>,"status=disabled",
++						<&poe_mfd>,"status=okay",
++						<&fan>,"pwms:0=",<&poe_mfd_pwm>;
+ 		};
+ 	};
+ 
+@@ -91,15 +94,14 @@
+ 
+ 	fragment@4 {
+ 		target = <&i2c0>;
+-		__dormant__ {
++		i2c_bus: __overlay__ {
+ 			#address-cells = <1>;
+ 			#size-cells = <0>;
+-			status = "okay";
+ 
+ 			poe_mfd: poe@51 {
+ 				compatible = "raspberrypi,poe-core";
+ 				reg = <0x51>;
+-				status = "okay";
++				status = "disabled";
+ 
+ 				poe_mfd_pwm: poe_pwm@f0 {
+ 					compatible = "raspberrypi,poe-pwm";
+@@ -134,7 +136,10 @@
+ 		poe_fan_temp2_hyst =	<&trip2>,"hysteresis:0";
+ 		poe_fan_temp3 =		<&trip3>,"temperature:0";
+ 		poe_fan_temp3_hyst =	<&trip3>,"hysteresis:0";
+-		i2c =			<0>, "-3+4+5+6",
++		i2c =			<0>, "+5+6",
++					<&fwpwm>,"status=disabled",
++					<&i2c_bus>,"status=okay",
++					<&poe_mfd>,"status=okay",
+ 					<&fan>,"pwms:0=",<&poe_mfd_pwm>;
+ 	};
+ };
+--- a/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts
++++ b/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts
+@@ -18,7 +18,7 @@
+ 	};
+ 	fragment@11 {
+ 		target = <&poe_mfd>;
+-		__dormant__ {
++		__overlay__ {
+ 			rpi-poe-power-supply@f2 {
+ 				compatible = "raspberrypi,rpi-poe-power-supply";
+ 				reg = <0xf2>;
+@@ -28,7 +28,11 @@
+ 	};
+ 
+ 	__overrides__ {
+-		i2c =	<0>, "-3+4+5+6-10+11",
++		i2c =	<0>, "+5+6",
++			<&fwpwm>,"status=disabled",
++			<&rpi_poe_power_supply>,"status=disabled",
++			<&i2c_bus>,"status=okay",
++			<&poe_mfd>,"status=okay",
+ 			<&fan>,"pwms:0=",<&poe_mfd_pwm>;
+ 	};
+ };
+@@ -36,3 +40,10 @@
+ &fan {
+ 	cooling-levels = <0 32 64 128 255>;
+ };
++
++&params {
++	poe_fan_i2c = <&fwpwm>,"status=disabled",
++		      <&rpi_poe_power_supply>,"status=disabled",
++		      <&poe_mfd>,"status=okay",
++		      <&fan>,"pwms:0=",<&poe_mfd_pwm>;
++};
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0721-dtoverlays-fix-overrides-in-vc4-kms-dpi-generic.patch b/root/target/linux/bcm27xx/patches-5.15/950-0721-dtoverlays-fix-overrides-in-vc4-kms-dpi-generic.patch
new file mode 100644
index 00000000..47a393ad
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0721-dtoverlays-fix-overrides-in-vc4-kms-dpi-generic.patch
@@ -0,0 +1,53 @@
+From cbd68465932bac1febf31f1d0119bcc7899c1e2c Mon Sep 17 00:00:00 2001
+From: Grigori Goronzy <greg@kinoho.net>
+Date: Wed, 9 Feb 2022 22:20:17 +0100
+Subject: [PATCH 721/828] dtoverlays: fix overrides in vc4-kms-dpi-generic
+
+Apparently broken by commit 3c033975. Introduce new names to allow for
+proper addressing of overrides.
+
+Signed-off-by: Grigori Goronzy <greg@kinoho.net>
+---
+ .../overlays/vc4-kms-dpi-generic-overlay.dts   | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+--- a/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
+@@ -12,7 +12,7 @@
+ 
+ 	fragment@0 {
+ 		target = <&panel>;
+-		__overlay__  {
++		panel_generic: __overlay__  {
+ 			compatible = "panel-dpi";
+ 
+ 			width-mm = <154>;
+@@ -40,7 +40,7 @@
+ 
+ 	fragment@1 {
+ 		target = <&dpi>;
+-		__overlay__  {
++		dpi_node_generic: __overlay__  {
+ 			pinctrl-0 = <&dpi_18bit_gpio0>;
+ 		};
+ 	};
+@@ -63,12 +63,12 @@
+ 		width-mm = <&panel>, "width-mm:0";
+ 		height-mm = <&panel>, "height-mm:0";
+ 
+-		rgb565 = <&panel>, "bus-format:0=0x1017",
+-			<&dpi_node>, "pinctrl-0:0=",<&dpi_16bit_gpio0>;
+-		rgb666-padhi = <&panel>, "bus-format:0=0x1015",
+-			<&dpi_node>, "pinctrl-0:0=",<&dpi_18bit_cpadhi_gpio0>;
+-		rgb888 = <&panel>, "bus-format:0=0x100a",
+-			<&dpi_node>, "pinctrl-0:0=",<&dpi_gpio0>;
+-		bus-format = <&panel>, "bus-format:0";
++		rgb565 = <&panel_generic>, "bus-format:0=0x1017",
++			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_16bit_gpio0>;
++		rgb666-padhi = <&panel_generic>, "bus-format:0=0x1015",
++			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_18bit_cpadhi_gpio0>;
++		rgb888 = <&panel_generic>, "bus-format:0=0x100a",
++			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_gpio0>;
++		bus-format = <&panel_generic>, "bus-format:0";
+ 	};
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0722-dtoverlays-add-rgb565-padhi-output-to-vc4-kms-dpi-ge.patch b/root/target/linux/bcm27xx/patches-5.15/950-0722-dtoverlays-add-rgb565-padhi-output-to-vc4-kms-dpi-ge.patch
new file mode 100644
index 00000000..9b979f34
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0722-dtoverlays-add-rgb565-padhi-output-to-vc4-kms-dpi-ge.patch
@@ -0,0 +1,37 @@
+From 3f9164296fe90af247bf15c73ef0adc316512966 Mon Sep 17 00:00:00 2001
+From: Grigori Goronzy <greg@kinoho.net>
+Date: Wed, 9 Feb 2022 22:23:11 +0100
+Subject: [PATCH 722/828] dtoverlays: add rgb565-padhi output to
+ vc4-kms-dpi-generic
+
+This mode is used by some DPI based display adapters, such as the
+'VGA565' and 'VGA Zero' low-cost VGA adapters for the Raspberry Pi.
+
+Signed-off-by: Grigori Goronzy <greg@kinoho.net>
+---
+ arch/arm/boot/dts/overlays/README                          | 2 ++
+ arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts | 2 ++
+ 2 files changed, 4 insertions(+)
+
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -3649,6 +3649,8 @@ Params: clock-frequency         Display
+         width-mm                Define the screen width in mm
+         height-mm               Define the screen height in mm
+         rgb565                  Change to RGB565 output on GPIOs 0-19
++        rgb565-padhi            Change to RGB565 output on GPIOs 0-8, 12-17, and
++                                20-24
+         rgb666-padhi            Change to RGB666 output on GPIOs 0-9, 12-17, and
+                                 20-25
+         rgb888                  Change to RGB888 output on GPIOs 0-27
+--- a/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
+@@ -65,6 +65,8 @@
+ 
+ 		rgb565 = <&panel_generic>, "bus-format:0=0x1017",
+ 			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_16bit_gpio0>;
++		rgb565-padhi = <&panel_generic>, "bus-format:0=0x1020",
++			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_16bit_cpadhi_gpio0>;
+ 		rgb666-padhi = <&panel_generic>, "bus-format:0=0x1015",
+ 			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_18bit_cpadhi_gpio0>;
+ 		rgb888 = <&panel_generic>, "bus-format:0=0x100a",
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0723-media-i2c-imx219-Scale-the-pixel-clock-rate-for-the-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0723-media-i2c-imx219-Scale-the-pixel-clock-rate-for-the-.patch
new file mode 100644
index 00000000..4628489c
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0723-media-i2c-imx219-Scale-the-pixel-clock-rate-for-the-.patch
@@ -0,0 +1,129 @@
+From 9b2a4e1747327b049628fbfb5f2783e3666c8da8 Mon Sep 17 00:00:00 2001
+From: Naushir Patuck <naush@raspberrypi.com>
+Date: Tue, 8 Feb 2022 13:49:11 +0000
+Subject: [PATCH 723/828] media: i2c: imx219: Scale the pixel clock rate for
+ the 640x480 mode
+
+The 640x480 mode uses a special binning mode for high framerate operation where
+the pixel rate is effectively doubled. Account for this when setting up the
+pixel clock rate, and applying the vblank and exposure controls.
+
+Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
+---
+ drivers/media/i2c/imx219.c | 33 ++++++++++++++++++++++++++-------
+ 1 file changed, 26 insertions(+), 7 deletions(-)
+
+--- a/drivers/media/i2c/imx219.c
++++ b/drivers/media/i2c/imx219.c
+@@ -153,6 +153,9 @@ struct imx219_mode {
+ 
+ 	/* Default register values */
+ 	struct imx219_reg_list reg_list;
++
++	/* Relative pixel clock rate factor for the mode. */
++	unsigned int rate_factor;
+ };
+ 
+ /*
+@@ -495,6 +498,7 @@ static const struct imx219_mode supporte
+ 			.num_of_regs = ARRAY_SIZE(mode_3280x2464_regs),
+ 			.regs = mode_3280x2464_regs,
+ 		},
++		.rate_factor = 1,
+ 	},
+ 	{
+ 		/* 1080P 30fps cropped */
+@@ -511,6 +515,7 @@ static const struct imx219_mode supporte
+ 			.num_of_regs = ARRAY_SIZE(mode_1920_1080_regs),
+ 			.regs = mode_1920_1080_regs,
+ 		},
++		.rate_factor = 1,
+ 	},
+ 	{
+ 		/* 2x2 binned 30fps mode */
+@@ -527,6 +532,7 @@ static const struct imx219_mode supporte
+ 			.num_of_regs = ARRAY_SIZE(mode_1640_1232_regs),
+ 			.regs = mode_1640_1232_regs,
+ 		},
++		.rate_factor = 1,
+ 	},
+ 	{
+ 		/* 640x480 30fps mode */
+@@ -543,6 +549,11 @@ static const struct imx219_mode supporte
+ 			.num_of_regs = ARRAY_SIZE(mode_640_480_regs),
+ 			.regs = mode_640_480_regs,
+ 		},
++		/*
++		 * This mode uses a special 2x2 binning that doubles the
++		 * the internal pixel clock rate.
++		 */
++		.rate_factor = 2,
+ 	},
+ };
+ 
+@@ -765,7 +776,8 @@ static int imx219_set_ctrl(struct v4l2_c
+ 		break;
+ 	case V4L2_CID_EXPOSURE:
+ 		ret = imx219_write_reg(imx219, IMX219_REG_EXPOSURE,
+-				       IMX219_REG_VALUE_16BIT, ctrl->val);
++				       IMX219_REG_VALUE_16BIT,
++				       ctrl->val / imx219->mode->rate_factor);
+ 		break;
+ 	case V4L2_CID_DIGITAL_GAIN:
+ 		ret = imx219_write_reg(imx219, IMX219_REG_DIGITAL_GAIN,
+@@ -785,7 +797,8 @@ static int imx219_set_ctrl(struct v4l2_c
+ 	case V4L2_CID_VBLANK:
+ 		ret = imx219_write_reg(imx219, IMX219_REG_VTS,
+ 				       IMX219_REG_VALUE_16BIT,
+-				       imx219->mode->height + ctrl->val);
++				       (imx219->mode->height + ctrl->val) /
++						imx219->mode->rate_factor);
+ 		break;
+ 	case V4L2_CID_TEST_PATTERN_RED:
+ 		ret = imx219_write_reg(imx219, IMX219_REG_TESTP_RED,
+@@ -957,7 +970,7 @@ static int imx219_set_pad_format(struct
+ 	struct imx219 *imx219 = to_imx219(sd);
+ 	const struct imx219_mode *mode;
+ 	struct v4l2_mbus_framefmt *framefmt;
+-	int exposure_max, exposure_def, hblank;
++	int exposure_max, exposure_def, hblank, pixel_rate;
+ 	unsigned int i;
+ 
+ 	if (fmt->pad >= NUM_PADS)
+@@ -1018,6 +1031,12 @@ static int imx219_set_pad_format(struct
+ 			hblank = IMX219_PPL_DEFAULT - mode->width;
+ 			__v4l2_ctrl_modify_range(imx219->hblank, hblank, hblank,
+ 						 1, hblank);
++
++			/* Scale the pixel rate based on the mode specific factor */
++			pixel_rate =
++				IMX219_PIXEL_RATE * imx219->mode->rate_factor;
++			__v4l2_ctrl_modify_range(imx219->pixel_rate, pixel_rate,
++						 pixel_rate, 1, pixel_rate);
+ 		}
+ 	} else {
+ 		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
+@@ -1362,7 +1381,7 @@ static int imx219_init_controls(struct i
+ 	struct v4l2_ctrl_handler *ctrl_hdlr;
+ 	unsigned int height = imx219->mode->height;
+ 	struct v4l2_fwnode_device_properties props;
+-	int exposure_max, exposure_def, hblank;
++	int exposure_max, exposure_def, hblank, pixel_rate;
+ 	int i, ret;
+ 
+ 	ctrl_hdlr = &imx219->ctrl_handler;
+@@ -1374,11 +1393,11 @@ static int imx219_init_controls(struct i
+ 	ctrl_hdlr->lock = &imx219->mutex;
+ 
+ 	/* By default, PIXEL_RATE is read only */
++	pixel_rate = IMX219_PIXEL_RATE * imx219->mode->rate_factor;
+ 	imx219->pixel_rate = v4l2_ctrl_new_std(ctrl_hdlr, &imx219_ctrl_ops,
+ 					       V4L2_CID_PIXEL_RATE,
+-					       IMX219_PIXEL_RATE,
+-					       IMX219_PIXEL_RATE, 1,
+-					       IMX219_PIXEL_RATE);
++					       pixel_rate, pixel_rate,
++					       1, pixel_rate);
+ 
+ 	imx219->link_freq =
+ 		v4l2_ctrl_new_int_menu(ctrl_hdlr, &imx219_ctrl_ops,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0724-drm-vc4-For-DPI-MEDIA_BUS_FMT_RGB565_1X16-is-mode-1-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0724-drm-vc4-For-DPI-MEDIA_BUS_FMT_RGB565_1X16-is-mode-1-.patch
new file mode 100644
index 00000000..00b6cb2b
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0724-drm-vc4-For-DPI-MEDIA_BUS_FMT_RGB565_1X16-is-mode-1-.patch
@@ -0,0 +1,25 @@
+From 8640533e171986501f6880addc6aac90e3d2e0dc Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 14 Feb 2022 15:34:51 +0000
+Subject: [PATCH 724/828] drm/vc4: For DPI, MEDIA_BUS_FMT_RGB565_1X16 is mode
+ 1, not 3.
+
+The mapping is incorrect for RGB565_1X16 as it should be
+DPI_FORMAT_18BIT_666_RGB_1 instead of DPI_FORMAT_18BIT_666_RGB_3.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dpi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_dpi.c
++++ b/drivers/gpu/drm/vc4/vc4_dpi.c
+@@ -188,7 +188,7 @@ static void vc4_dpi_encoder_enable(struc
+ 						       DPI_ORDER);
+ 				break;
+ 			case MEDIA_BUS_FMT_RGB565_1X16:
+-				dpi_c |= VC4_SET_FIELD(DPI_FORMAT_16BIT_565_RGB_3,
++				dpi_c |= VC4_SET_FIELD(DPI_FORMAT_16BIT_565_RGB_1,
+ 						       DPI_FORMAT);
+ 				break;
+ 			case MEDIA_BUS_FMT_RGB565_1X24_CPADHI:
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0725-dtoverlays-Add-additional-mappings-to-vc4-kms-dpi-ge.patch b/root/target/linux/bcm27xx/patches-5.15/950-0725-dtoverlays-Add-additional-mappings-to-vc4-kms-dpi-ge.patch
new file mode 100644
index 00000000..a06c136c
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0725-dtoverlays-Add-additional-mappings-to-vc4-kms-dpi-ge.patch
@@ -0,0 +1,45 @@
+From b9a1ece214e946eb158bbef8cd8eff70d22a11da Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 14 Feb 2022 15:59:32 +0000
+Subject: [PATCH 725/828] dtoverlays: Add additional mappings to
+ vc4-kms-dpi-generic
+
+Adds mappings for bgr666, bgr666-padhi, and bgr888.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/README                          | 4 ++++
+ arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts | 5 +++++
+ 2 files changed, 9 insertions(+)
+
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -3651,8 +3651,12 @@ Params: clock-frequency         Display
+         rgb565                  Change to RGB565 output on GPIOs 0-19
+         rgb565-padhi            Change to RGB565 output on GPIOs 0-8, 12-17, and
+                                 20-24
++        bgr666                  Change to BGR666 output on GPIOs 0-21.
++        bgr666-padhi            Change to BGR666 output on GPIOs 0-9, 12-17, and
++                                20-25
+         rgb666-padhi            Change to RGB666 output on GPIOs 0-9, 12-17, and
+                                 20-25
++        bgr888                  Change to BGR888 output on GPIOs 0-27
+         rgb888                  Change to RGB888 output on GPIOs 0-27
+         bus-format              Override the bus format for a MEDIA_BUS_FMT_*
+                                 value. NB also overridden by rgbXXX overrides.
+--- a/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
++++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
+@@ -67,8 +67,13 @@
+ 			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_16bit_gpio0>;
+ 		rgb565-padhi = <&panel_generic>, "bus-format:0=0x1020",
+ 			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_16bit_cpadhi_gpio0>;
++		bgr666 = <&panel_generic>, "bus-format:0=0x101f";
++		bgr666-padhi = <&panel_generic>, "bus-format:0=0x101e",
++			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_18bit_cpadhi_gpio0>;
+ 		rgb666-padhi = <&panel_generic>, "bus-format:0=0x1015",
+ 			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_18bit_cpadhi_gpio0>;
++		bgr888 = <&panel_generic>, "bus-format:0=0x1013",
++			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_gpio0>;
+ 		rgb888 = <&panel_generic>, "bus-format:0=0x100a",
+ 			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_gpio0>;
+ 		bus-format = <&panel_generic>, "bus-format:0";
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0726-drm-dsi-Document-the-meaning-and-spec-references-for.patch b/root/target/linux/bcm27xx/patches-5.15/950-0726-drm-dsi-Document-the-meaning-and-spec-references-for.patch
new file mode 100644
index 00000000..018d00d3
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0726-drm-dsi-Document-the-meaning-and-spec-references-for.patch
@@ -0,0 +1,76 @@
+From 2e5b8c88921938b59fe39ea864fd2dfaeee439f2 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Fri, 17 Dec 2021 13:36:52 +0000
+Subject: [PATCH 726/828] drm/dsi: Document the meaning and spec references for
+ MIPI_DSI_MODE_*
+
+The MIPI_DSI_MODE_* flags have fairly terse descriptions and no reference
+to the DSI specification as to their exact meaning. Usage has therefore
+been rather fluid.
+
+Extend the descriptions and provide references to the part of the
+MIPI DSI specification regarding what they mean.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ include/drm/drm_mipi_dsi.h | 38 ++++++++++++++++++++++++++------------
+ 1 file changed, 26 insertions(+), 12 deletions(-)
+
+--- a/include/drm/drm_mipi_dsi.h
++++ b/include/drm/drm_mipi_dsi.h
+@@ -113,29 +113,43 @@ struct mipi_dsi_host *of_find_mipi_dsi_h
+ 
+ /* DSI mode flags */
+ 
+-/* video mode */
++/* Video mode display.
++ * Not set denotes a command mode display.
++ */
+ #define MIPI_DSI_MODE_VIDEO		BIT(0)
+-/* video burst mode */
++/* Video burst mode.
++ * Link frequency to be configured via platform configuration.
++ * This should always be set in conjunction with MIPI_DSI_MODE_VIDEO.
++ * (DSI spec V1.1 8.11.4)
++ */
+ #define MIPI_DSI_MODE_VIDEO_BURST	BIT(1)
+-/* video pulse mode */
++/* Video pulse mode.
++ * Not set denotes sync event mode. (DSI spec V1.1 8.11.2)
++ */
+ #define MIPI_DSI_MODE_VIDEO_SYNC_PULSE	BIT(2)
+-/* enable auto vertical count mode */
++/* Enable auto vertical count mode */
+ #define MIPI_DSI_MODE_VIDEO_AUTO_VERT	BIT(3)
+-/* enable hsync-end packets in vsync-pulse and v-porch area */
++/* Enable hsync-end packets in vsync-pulse and v-porch area */
+ #define MIPI_DSI_MODE_VIDEO_HSE		BIT(4)
+-/* disable hfront-porch area */
++/* Transmit NULL packets or LP mode during hfront-porch area.
++ * Not set denotes sending a blanking packet instead. (DSI spec V1.1 8.11.1)
++ */
+ #define MIPI_DSI_MODE_VIDEO_NO_HFP	BIT(5)
+-/* disable hback-porch area */
++/* Transmit NULL packets or LP mode during hback-porch area.
++ * Not set denotes sending a blanking packet instead. (DSI spec V1.1 8.11.1)
++ */
+ #define MIPI_DSI_MODE_VIDEO_NO_HBP	BIT(6)
+-/* disable hsync-active area */
++/* Transmit NULL packets or LP mode during hsync-active area.
++ * Not set denotes sending a blanking packet instead. (DSI spec V1.1 8.11.1)
++ */
+ #define MIPI_DSI_MODE_VIDEO_NO_HSA	BIT(7)
+-/* flush display FIFO on vsync pulse */
++/* Flush display FIFO on vsync pulse */
+ #define MIPI_DSI_MODE_VSYNC_FLUSH	BIT(8)
+-/* disable EoT packets in HS mode */
++/* Disable EoT packets in HS mode. (DSI spec V1.1 8.1)  */
+ #define MIPI_DSI_MODE_NO_EOT_PACKET	BIT(9)
+-/* device supports non-continuous clock behavior (DSI spec 5.6.1) */
++/* Device supports non-continuous clock behavior (DSI spec V1.1 5.6.1) */
+ #define MIPI_DSI_CLOCK_NON_CONTINUOUS	BIT(10)
+-/* transmit data in low power */
++/* Transmit data in low power */
+ #define MIPI_DSI_MODE_LPM		BIT(11)
+ 
+ enum mipi_dsi_pixel_format {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0727-drm-bridge-tc358762-Ignore-EPROBE_DEFER-when-logging.patch b/root/target/linux/bcm27xx/patches-5.15/950-0727-drm-bridge-tc358762-Ignore-EPROBE_DEFER-when-logging.patch
new file mode 100644
index 00000000..c414dd59
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0727-drm-bridge-tc358762-Ignore-EPROBE_DEFER-when-logging.patch
@@ -0,0 +1,25 @@
+From 836e3c39e76b40c45a3e84a76e54af0f6013440c Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 20 Jan 2022 17:29:36 +0000
+Subject: [PATCH 727/828] drm/bridge: tc358762: Ignore EPROBE_DEFER when
+ logging errors
+
+mipi_dsi_attach can fail due to resources not being available
+yet, therefore do not log error messages should they occur.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/bridge/tc358762.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/bridge/tc358762.c
++++ b/drivers/gpu/drm/bridge/tc358762.c
+@@ -243,7 +243,7 @@ static int tc358762_probe(struct mipi_ds
+ 	ret = mipi_dsi_attach(dsi);
+ 	if (ret < 0) {
+ 		drm_bridge_remove(&ctx->bridge);
+-		dev_err(dev, "failed to attach dsi\n");
++		dev_err_probe(dev, ret, "failed to attach dsi\n");
+ 	}
+ 
+ 	return ret;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0728-drm-vc4-Rename-bridge-to-out_bridge.patch b/root/target/linux/bcm27xx/patches-5.15/950-0728-drm-vc4-Rename-bridge-to-out_bridge.patch
new file mode 100644
index 00000000..27850dec
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0728-drm-vc4-Rename-bridge-to-out_bridge.patch
@@ -0,0 +1,76 @@
+From 86eeafb3cfda3516bb68ba05afa9b0058fe0d75d Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 30 Sep 2021 17:51:16 +0100
+Subject: [PATCH 728/828] drm/vc4: Rename bridge to out_bridge
+
+In preparation for converting the encoder to being a bridge,
+rename the variable holding the next bridge in the chain to
+out_bridge, so that our bridge can be called bridge.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dsi.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_dsi.c
++++ b/drivers/gpu/drm/vc4/vc4_dsi.c
+@@ -553,7 +553,7 @@ struct vc4_dsi {
+ 
+ 	struct mipi_dsi_host dsi_host;
+ 	struct drm_encoder *encoder;
+-	struct drm_bridge *bridge;
++	struct drm_bridge *out_bridge;
+ 	struct list_head bridge_chain;
+ 
+ 	void __iomem *regs;
+@@ -804,7 +804,7 @@ static void vc4_dsi_encoder_disable(stru
+ 		if (iter->funcs->disable)
+ 			iter->funcs->disable(iter);
+ 
+-		if (iter == dsi->bridge)
++		if (iter == dsi->out_bridge)
+ 			break;
+ 	}
+ 
+@@ -1667,7 +1667,7 @@ static int vc4_dsi_bind(struct device *d
+ 	}
+ 
+ 	ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
+-					  &panel, &dsi->bridge);
++					  &panel, &dsi->out_bridge);
+ 	if (ret) {
+ 		/* If the bridge or panel pointed by dev->of_node is not
+ 		 * enabled, just return 0 here so that we don't prevent the DRM
+@@ -1682,10 +1682,10 @@ static int vc4_dsi_bind(struct device *d
+ 	}
+ 
+ 	if (panel) {
+-		dsi->bridge = devm_drm_panel_bridge_add_typed(dev, panel,
+-							      DRM_MODE_CONNECTOR_DSI);
+-		if (IS_ERR(dsi->bridge)) {
+-			ret = PTR_ERR(dsi->bridge);
++		dsi->out_bridge = devm_drm_panel_bridge_add_typed(dev, panel,
++								  DRM_MODE_CONNECTOR_DSI);
++		if (IS_ERR(dsi->out_bridge)) {
++			ret = PTR_ERR(dsi->out_bridge);
+ 			goto err_free_dma;
+ 		}
+ 	}
+@@ -1704,7 +1704,7 @@ static int vc4_dsi_bind(struct device *d
+ 	drm_simple_encoder_init(drm, dsi->encoder, DRM_MODE_ENCODER_DSI);
+ 	drm_encoder_helper_add(dsi->encoder, &vc4_dsi_encoder_helper_funcs);
+ 
+-	ret = drm_bridge_attach(dsi->encoder, dsi->bridge, NULL, 0);
++	ret = drm_bridge_attach(dsi->encoder, dsi->out_bridge, NULL, 0);
+ 	if (ret) {
+ 		dev_err(dev, "bridge attach failed: %d\n", ret);
+ 		goto err_free_dma;
+@@ -1741,7 +1741,7 @@ static void vc4_dsi_unbind(struct device
+ {
+ 	struct vc4_dsi *dsi = dev_get_drvdata(dev);
+ 
+-	if (dsi->bridge)
++	if (dsi->out_bridge)
+ 		pm_runtime_disable(dev);
+ 
+ 	/*
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0729-drm-vc4-Move-DSI-initialisation-to-encoder_mode_set.patch b/root/target/linux/bcm27xx/patches-5.15/950-0729-drm-vc4-Move-DSI-initialisation-to-encoder_mode_set.patch
new file mode 100644
index 00000000..629fcc3a
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0729-drm-vc4-Move-DSI-initialisation-to-encoder_mode_set.patch
@@ -0,0 +1,65 @@
+From a3b2c5988b25017bcdda4fcf9e38169e70cb083b Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 7 Feb 2022 17:14:51 +0000
+Subject: [PATCH 729/828] drm/vc4: Move DSI initialisation to encoder_mode_set.
+
+Breaking the bridge chain does not work for atomic bridges/panels
+and generally causes issues.
+We need to initialise the DSI host before the bridge pre_enables
+are called, so move that to encoder_mode_set in the same way that
+dw-mipi-dsi does.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dsi.c | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_dsi.c
++++ b/drivers/gpu/drm/vc4/vc4_dsi.c
+@@ -872,19 +872,19 @@ static bool vc4_dsi_encoder_mode_fixup(s
+ 	return true;
+ }
+ 
+-static void vc4_dsi_encoder_enable(struct drm_encoder *encoder)
++static void vc4_dsi_encoder_mode_set(struct drm_encoder *encoder,
++				     struct drm_display_mode *user_mode,
++				     struct drm_display_mode *adjusted_mode)
+ {
+-	struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
+ 	struct vc4_dsi_encoder *vc4_encoder = to_vc4_dsi_encoder(encoder);
+ 	struct vc4_dsi *dsi = vc4_encoder->dsi;
+ 	struct device *dev = &dsi->pdev->dev;
+ 	bool debug_dump_regs = false;
+-	struct drm_bridge *iter;
+ 	unsigned long hs_clock;
+ 	u32 ui_ns;
+ 	/* Minimum LP state duration in escape clock cycles. */
+ 	u32 lpx = dsi_esc_timing(60);
+-	unsigned long pixel_clock_hz = mode->clock * 1000;
++	unsigned long pixel_clock_hz = adjusted_mode->clock * 1000;
+ 	unsigned long dsip_clock;
+ 	unsigned long phy_clock;
+ 	int ret;
+@@ -1111,6 +1111,14 @@ static void vc4_dsi_encoder_enable(struc
+ 		       ~DSI_PORT_BIT(PHY_AFEC0_RESET));
+ 
+ 	vc4_dsi_ulps(dsi, false);
++}
++
++static void vc4_dsi_encoder_enable(struct drm_encoder *encoder)
++{
++	struct vc4_dsi_encoder *vc4_encoder = to_vc4_dsi_encoder(encoder);
++	struct vc4_dsi *dsi = vc4_encoder->dsi;
++	bool debug_dump_regs = false;
++	struct drm_bridge *iter;
+ 
+ 	list_for_each_entry_reverse(iter, &dsi->bridge_chain, chain_node) {
+ 		if (iter->funcs->pre_enable)
+@@ -1376,6 +1384,7 @@ static const struct drm_encoder_helper_f
+ 	.disable = vc4_dsi_encoder_disable,
+ 	.enable = vc4_dsi_encoder_enable,
+ 	.mode_fixup = vc4_dsi_encoder_mode_fixup,
++	.mode_set = vc4_dsi_encoder_mode_set,
+ };
+ 
+ static const struct vc4_dsi_variant bcm2711_dsi1_variant = {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0730-drm-vc4-Remove-splitting-the-bridge-chain-from-the-d.patch b/root/target/linux/bcm27xx/patches-5.15/950-0730-drm-vc4-Remove-splitting-the-bridge-chain-from-the-d.patch
new file mode 100644
index 00000000..657057eb
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0730-drm-vc4-Remove-splitting-the-bridge-chain-from-the-d.patch
@@ -0,0 +1,110 @@
+From 848cfa9f5e43412e5074e1a0ac68910b6b0731e2 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 15 Dec 2021 17:44:49 +0000
+Subject: [PATCH 730/828] drm/vc4: Remove splitting the bridge chain from the
+ driver.
+
+Splitting the bridge chain fails for atomic bridges as the
+framework can't add the relevant state in
+drm_atomic_add_encoder_bridges.
+The chain was split because we needed to power up before
+calling pre_enable, but that is now done in mode_set, and will
+move into the framework.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dsi.c | 38 -----------------------------------
+ 1 file changed, 38 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_dsi.c
++++ b/drivers/gpu/drm/vc4/vc4_dsi.c
+@@ -554,7 +554,6 @@ struct vc4_dsi {
+ 	struct mipi_dsi_host dsi_host;
+ 	struct drm_encoder *encoder;
+ 	struct drm_bridge *out_bridge;
+-	struct list_head bridge_chain;
+ 
+ 	void __iomem *regs;
+ 
+@@ -798,23 +797,9 @@ static void vc4_dsi_encoder_disable(stru
+ 	struct vc4_dsi_encoder *vc4_encoder = to_vc4_dsi_encoder(encoder);
+ 	struct vc4_dsi *dsi = vc4_encoder->dsi;
+ 	struct device *dev = &dsi->pdev->dev;
+-	struct drm_bridge *iter;
+-
+-	list_for_each_entry_reverse(iter, &dsi->bridge_chain, chain_node) {
+-		if (iter->funcs->disable)
+-			iter->funcs->disable(iter);
+-
+-		if (iter == dsi->out_bridge)
+-			break;
+-	}
+ 
+ 	vc4_dsi_ulps(dsi, true);
+ 
+-	list_for_each_entry_from(iter, &dsi->bridge_chain, chain_node) {
+-		if (iter->funcs->post_disable)
+-			iter->funcs->post_disable(iter);
+-	}
+-
+ 	clk_disable_unprepare(dsi->pll_phy_clock);
+ 	clk_disable_unprepare(dsi->escape_clock);
+ 	clk_disable_unprepare(dsi->pixel_clock);
+@@ -1118,12 +1103,6 @@ static void vc4_dsi_encoder_enable(struc
+ 	struct vc4_dsi_encoder *vc4_encoder = to_vc4_dsi_encoder(encoder);
+ 	struct vc4_dsi *dsi = vc4_encoder->dsi;
+ 	bool debug_dump_regs = false;
+-	struct drm_bridge *iter;
+-
+-	list_for_each_entry_reverse(iter, &dsi->bridge_chain, chain_node) {
+-		if (iter->funcs->pre_enable)
+-			iter->funcs->pre_enable(iter);
+-	}
+ 
+ 	if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO) {
+ 		DSI_PORT_WRITE(DISP0_CTRL,
+@@ -1140,11 +1119,6 @@ static void vc4_dsi_encoder_enable(struc
+ 			       DSI_DISP0_ENABLE);
+ 	}
+ 
+-	list_for_each_entry(iter, &dsi->bridge_chain, chain_node) {
+-		if (iter->funcs->enable)
+-			iter->funcs->enable(iter);
+-	}
+-
+ 	if (debug_dump_regs) {
+ 		struct drm_printer p = drm_info_printer(&dsi->pdev->dev);
+ 		dev_info(&dsi->pdev->dev, "DSI regs after:\n");
+@@ -1578,7 +1552,6 @@ static int vc4_dsi_bind(struct device *d
+ 	if (!vc4_dsi_encoder)
+ 		return -ENOMEM;
+ 
+-	INIT_LIST_HEAD(&dsi->bridge_chain);
+ 	vc4_dsi_encoder->base.type = dsi->variant->port ?
+ 			VC4_ENCODER_TYPE_DSI1 : VC4_ENCODER_TYPE_DSI0;
+ 	vc4_dsi_encoder->dsi = dsi;
+@@ -1718,12 +1691,6 @@ static int vc4_dsi_bind(struct device *d
+ 		dev_err(dev, "bridge attach failed: %d\n", ret);
+ 		goto err_free_dma;
+ 	}
+-	/* Disable the atomic helper calls into the bridge.  We
+-	 * manually call the bridge pre_enable / enable / etc. calls
+-	 * from our driver, since we need to sequence them within the
+-	 * encoder's enable/disable paths.
+-	 */
+-	list_splice_init(&dsi->encoder->bridge_chain, &dsi->bridge_chain);
+ 
+ 	vc4_debugfs_add_regset32(drm, dsi->variant->debugfs_name, &dsi->regset);
+ 
+@@ -1753,11 +1720,6 @@ static void vc4_dsi_unbind(struct device
+ 	if (dsi->out_bridge)
+ 		pm_runtime_disable(dev);
+ 
+-	/*
+-	 * Restore the bridge_chain so the bridge detach procedure can happen
+-	 * normally.
+-	 */
+-	list_splice_init(&dsi->bridge_chain, &dsi->encoder->bridge_chain);
+ 	drm_encoder_cleanup(dsi->encoder);
+ 
+ 	if (dsi->reg_dma_chan) {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0731-drm-vc4-Convert-vc4_dsi-to-use-atomic-enable-disable.patch b/root/target/linux/bcm27xx/patches-5.15/950-0731-drm-vc4-Convert-vc4_dsi-to-use-atomic-enable-disable.patch
new file mode 100644
index 00000000..fc990754
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0731-drm-vc4-Convert-vc4_dsi-to-use-atomic-enable-disable.patch
@@ -0,0 +1,85 @@
+From 0437d5d1ea322c1e0f6395fa5327d116512b1e21 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 15 Dec 2021 17:47:14 +0000
+Subject: [PATCH 731/828] drm/vc4: Convert vc4_dsi to use atomic
+ enable/disable/mode_set.
+
+The atomic calls are preferred as the non-atomic ones
+are deprecated. In preparation for conversion to a bridge,
+switch to the atomic calls.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dsi.c | 23 +++++++++++++++--------
+ 1 file changed, 15 insertions(+), 8 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_dsi.c
++++ b/drivers/gpu/drm/vc4/vc4_dsi.c
+@@ -792,7 +792,8 @@ dsi_esc_timing(u32 ns)
+ 	return DIV_ROUND_UP(ns, ESC_TIME_NS);
+ }
+ 
+-static void vc4_dsi_encoder_disable(struct drm_encoder *encoder)
++static void vc4_dsi_encoder_disable(struct drm_encoder *encoder,
++				    struct drm_atomic_state *state)
+ {
+ 	struct vc4_dsi_encoder *vc4_encoder = to_vc4_dsi_encoder(encoder);
+ 	struct vc4_dsi *dsi = vc4_encoder->dsi;
+@@ -858,18 +859,19 @@ static bool vc4_dsi_encoder_mode_fixup(s
+ }
+ 
+ static void vc4_dsi_encoder_mode_set(struct drm_encoder *encoder,
+-				     struct drm_display_mode *user_mode,
+-				     struct drm_display_mode *adjusted_mode)
++				     struct drm_crtc_state *crtc_state,
++				     struct drm_connector_state *conn_state)
+ {
+ 	struct vc4_dsi_encoder *vc4_encoder = to_vc4_dsi_encoder(encoder);
+ 	struct vc4_dsi *dsi = vc4_encoder->dsi;
+ 	struct device *dev = &dsi->pdev->dev;
++	const struct drm_display_mode *mode;
+ 	bool debug_dump_regs = false;
+ 	unsigned long hs_clock;
+ 	u32 ui_ns;
+ 	/* Minimum LP state duration in escape clock cycles. */
+ 	u32 lpx = dsi_esc_timing(60);
+-	unsigned long pixel_clock_hz = adjusted_mode->clock * 1000;
++	unsigned long pixel_clock_hz;
+ 	unsigned long dsip_clock;
+ 	unsigned long phy_clock;
+ 	int ret;
+@@ -886,6 +888,10 @@ static void vc4_dsi_encoder_mode_set(str
+ 		drm_print_regset32(&p, &dsi->regset);
+ 	}
+ 
++	mode = &crtc_state->adjusted_mode;
++
++	pixel_clock_hz = mode->clock * 1000;
++
+ 	/* Round up the clk_set_rate() request slightly, since
+ 	 * PLLD_DSI1 is an integer divider and its rate selection will
+ 	 * never round up.
+@@ -1098,7 +1104,8 @@ static void vc4_dsi_encoder_mode_set(str
+ 	vc4_dsi_ulps(dsi, false);
+ }
+ 
+-static void vc4_dsi_encoder_enable(struct drm_encoder *encoder)
++static void vc4_dsi_encoder_enable(struct drm_encoder *encoder,
++				   struct drm_atomic_state *state)
+ {
+ 	struct vc4_dsi_encoder *vc4_encoder = to_vc4_dsi_encoder(encoder);
+ 	struct vc4_dsi *dsi = vc4_encoder->dsi;
+@@ -1355,10 +1362,10 @@ static const struct mipi_dsi_host_ops vc
+ };
+ 
+ static const struct drm_encoder_helper_funcs vc4_dsi_encoder_helper_funcs = {
+-	.disable = vc4_dsi_encoder_disable,
+-	.enable = vc4_dsi_encoder_enable,
++	.atomic_disable = vc4_dsi_encoder_disable,
++	.atomic_enable = vc4_dsi_encoder_enable,
+ 	.mode_fixup = vc4_dsi_encoder_mode_fixup,
+-	.mode_set = vc4_dsi_encoder_mode_set,
++	.atomic_mode_set = vc4_dsi_encoder_mode_set,
+ };
+ 
+ static const struct vc4_dsi_variant bcm2711_dsi1_variant = {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0732-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch b/root/target/linux/bcm27xx/patches-5.15/950-0732-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch
new file mode 100644
index 00000000..dc225ba6
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0732-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch
@@ -0,0 +1,264 @@
+From e7663e4bed84715fdb020991ddb59092334c129f Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 15 Dec 2021 17:57:45 +0000
+Subject: [PATCH 732/828] drm/vc4: Convert vc4_dsi to using a bridge instead of
+ encoder.
+
+Remove the encoder functions, and create a bridge attached to
+this dumb encoder which implements the same functionality.
+
+As a bridge has state which an encoder doesn't, we need to
+add the state management functions as well.
+
+As there is no bridge atomic_mode_set, move the initialisation
+code that was in mode_set into _pre_enable.
+The code to actually enable and disable sending video are split
+from the general control into _enable and _disable.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dsi.c | 124 ++++++++++++++++++++++++----------
+ 1 file changed, 90 insertions(+), 34 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_dsi.c
++++ b/drivers/gpu/drm/vc4/vc4_dsi.c
+@@ -554,6 +554,7 @@ struct vc4_dsi {
+ 	struct mipi_dsi_host dsi_host;
+ 	struct drm_encoder *encoder;
+ 	struct drm_bridge *out_bridge;
++	struct drm_bridge bridge;
+ 
+ 	void __iomem *regs;
+ 
+@@ -655,6 +656,12 @@ to_vc4_dsi_encoder(struct drm_encoder *e
+ 	return container_of(encoder, struct vc4_dsi_encoder, base.base);
+ }
+ 
++static inline struct vc4_dsi *
++bridge_to_vc4_dsi(struct drm_bridge *bridge)
++{
++	return container_of(bridge, struct vc4_dsi, bridge);
++}
++
+ static const struct debugfs_reg32 dsi0_regs[] = {
+ 	VC4_REG32(DSI0_CTRL),
+ 	VC4_REG32(DSI0_STAT),
+@@ -792,11 +799,21 @@ dsi_esc_timing(u32 ns)
+ 	return DIV_ROUND_UP(ns, ESC_TIME_NS);
+ }
+ 
+-static void vc4_dsi_encoder_disable(struct drm_encoder *encoder,
+-				    struct drm_atomic_state *state)
++static void vc4_dsi_bridge_disable(struct drm_bridge *bridge,
++				   struct drm_bridge_state *state)
++{
++	struct vc4_dsi *dsi = bridge_to_vc4_dsi(bridge);
++	u32 disp0_ctrl;
++
++	disp0_ctrl = DSI_PORT_READ(DISP0_CTRL);
++	disp0_ctrl &= ~DSI_DISP0_ENABLE;
++	DSI_PORT_WRITE(DISP0_CTRL, disp0_ctrl);
++}
++
++static void vc4_dsi_bridge_post_disable(struct drm_bridge *bridge,
++					struct drm_bridge_state *state)
+ {
+-	struct vc4_dsi_encoder *vc4_encoder = to_vc4_dsi_encoder(encoder);
+-	struct vc4_dsi *dsi = vc4_encoder->dsi;
++	struct vc4_dsi *dsi = bridge_to_vc4_dsi(bridge);
+ 	struct device *dev = &dsi->pdev->dev;
+ 
+ 	vc4_dsi_ulps(dsi, true);
+@@ -821,12 +838,11 @@ static void vc4_dsi_encoder_disable(stru
+  * higher-than-expected clock rate to the panel, but that's what the
+  * firmware does too.
+  */
+-static bool vc4_dsi_encoder_mode_fixup(struct drm_encoder *encoder,
+-				       const struct drm_display_mode *mode,
+-				       struct drm_display_mode *adjusted_mode)
++static bool vc4_dsi_bridge_mode_fixup(struct drm_bridge *bridge,
++				      const struct drm_display_mode *mode,
++				      struct drm_display_mode *adjusted_mode)
+ {
+-	struct vc4_dsi_encoder *vc4_encoder = to_vc4_dsi_encoder(encoder);
+-	struct vc4_dsi *dsi = vc4_encoder->dsi;
++	struct vc4_dsi *dsi = bridge_to_vc4_dsi(bridge);
+ 	struct clk *phy_parent = clk_get_parent(dsi->pll_phy_clock);
+ 	unsigned long parent_rate = clk_get_rate(phy_parent);
+ 	unsigned long pixel_clock_hz = mode->clock * 1000;
+@@ -858,16 +874,18 @@ static bool vc4_dsi_encoder_mode_fixup(s
+ 	return true;
+ }
+ 
+-static void vc4_dsi_encoder_mode_set(struct drm_encoder *encoder,
+-				     struct drm_crtc_state *crtc_state,
+-				     struct drm_connector_state *conn_state)
++static void vc4_dsi_bridge_pre_enable(struct drm_bridge *bridge,
++				      struct drm_bridge_state *old_state)
+ {
+-	struct vc4_dsi_encoder *vc4_encoder = to_vc4_dsi_encoder(encoder);
+-	struct vc4_dsi *dsi = vc4_encoder->dsi;
++	struct drm_atomic_state *state = old_state->base.state;
++	struct vc4_dsi *dsi = bridge_to_vc4_dsi(bridge);
++	const struct drm_crtc_state *crtc_state;
+ 	struct device *dev = &dsi->pdev->dev;
+ 	const struct drm_display_mode *mode;
++	struct drm_connector *connector;
+ 	bool debug_dump_regs = false;
+ 	unsigned long hs_clock;
++	struct drm_crtc *crtc;
+ 	u32 ui_ns;
+ 	/* Minimum LP state duration in escape clock cycles. */
+ 	u32 lpx = dsi_esc_timing(60);
+@@ -888,6 +906,14 @@ static void vc4_dsi_encoder_mode_set(str
+ 		drm_print_regset32(&p, &dsi->regset);
+ 	}
+ 
++	/*
++	 * Retrieve the CRTC adjusted mode. This requires a little dance to go
++	 * from the bridge to the encoder, to the connector and to the CRTC.
++	 */
++	connector = drm_atomic_get_new_connector_for_encoder(state,
++							     bridge->encoder);
++	crtc = drm_atomic_get_new_connector_state(state, connector)->crtc;
++	crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
+ 	mode = &crtc_state->adjusted_mode;
+ 
+ 	pixel_clock_hz = mode->clock * 1000;
+@@ -1102,14 +1128,6 @@ static void vc4_dsi_encoder_mode_set(str
+ 		       ~DSI_PORT_BIT(PHY_AFEC0_RESET));
+ 
+ 	vc4_dsi_ulps(dsi, false);
+-}
+-
+-static void vc4_dsi_encoder_enable(struct drm_encoder *encoder,
+-				   struct drm_atomic_state *state)
+-{
+-	struct vc4_dsi_encoder *vc4_encoder = to_vc4_dsi_encoder(encoder);
+-	struct vc4_dsi *dsi = vc4_encoder->dsi;
+-	bool debug_dump_regs = false;
+ 
+ 	if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO) {
+ 		DSI_PORT_WRITE(DISP0_CTRL,
+@@ -1118,13 +1136,23 @@ static void vc4_dsi_encoder_enable(struc
+ 			       VC4_SET_FIELD(dsi->format, DSI_DISP0_PFORMAT) |
+ 			       VC4_SET_FIELD(DSI_DISP0_LP_STOP_PERFRAME,
+ 					     DSI_DISP0_LP_STOP_CTRL) |
+-			       DSI_DISP0_ST_END |
+-			       DSI_DISP0_ENABLE);
++			       DSI_DISP0_ST_END);
+ 	} else {
+ 		DSI_PORT_WRITE(DISP0_CTRL,
+-			       DSI_DISP0_COMMAND_MODE |
+-			       DSI_DISP0_ENABLE);
++			       DSI_DISP0_COMMAND_MODE);
+ 	}
++}
++
++static void vc4_dsi_bridge_enable(struct drm_bridge *bridge,
++				  struct drm_bridge_state *old_state)
++{
++	struct vc4_dsi *dsi = bridge_to_vc4_dsi(bridge);
++	bool debug_dump_regs = false;
++	u32 disp0_ctrl;
++
++	disp0_ctrl = DSI_PORT_READ(DISP0_CTRL);
++	disp0_ctrl |= DSI_DISP0_ENABLE;
++	DSI_PORT_WRITE(DISP0_CTRL, disp0_ctrl);
+ 
+ 	if (debug_dump_regs) {
+ 		struct drm_printer p = drm_info_printer(&dsi->pdev->dev);
+@@ -1133,6 +1161,16 @@ static void vc4_dsi_encoder_enable(struc
+ 	}
+ }
+ 
++static int vc4_dsi_bridge_attach(struct drm_bridge *bridge,
++				 enum drm_bridge_attach_flags flags)
++{
++	struct vc4_dsi *dsi = bridge_to_vc4_dsi(bridge);
++
++	/* Attach the panel or bridge to the dsi bridge */
++	return drm_bridge_attach(bridge->encoder, dsi->out_bridge,
++				 &dsi->bridge, flags);
++}
++
+ static ssize_t vc4_dsi_host_transfer(struct mipi_dsi_host *host,
+ 				     const struct mipi_dsi_msg *msg)
+ {
+@@ -1309,6 +1347,7 @@ static int vc4_dsi_host_attach(struct mi
+ 			       struct mipi_dsi_device *device)
+ {
+ 	struct vc4_dsi *dsi = host_to_dsi(host);
++	int ret;
+ 
+ 	dsi->lanes = device->lanes;
+ 	dsi->channel = device->channel;
+@@ -1343,7 +1382,15 @@ static int vc4_dsi_host_attach(struct mi
+ 		return 0;
+ 	}
+ 
+-	return component_add(&dsi->pdev->dev, &vc4_dsi_ops);
++	drm_bridge_add(&dsi->bridge);
++
++	ret = component_add(&dsi->pdev->dev, &vc4_dsi_ops);
++	if (ret) {
++		drm_bridge_remove(&dsi->bridge);
++		return ret;
++	}
++
++	return 0;
+ }
+ 
+ static int vc4_dsi_host_detach(struct mipi_dsi_host *host,
+@@ -1352,6 +1399,7 @@ static int vc4_dsi_host_detach(struct mi
+ 	struct vc4_dsi *dsi = host_to_dsi(host);
+ 
+ 	component_del(&dsi->pdev->dev, &vc4_dsi_ops);
++	drm_bridge_remove(&dsi->bridge);
+ 	return 0;
+ }
+ 
+@@ -1361,11 +1409,16 @@ static const struct mipi_dsi_host_ops vc
+ 	.transfer = vc4_dsi_host_transfer,
+ };
+ 
+-static const struct drm_encoder_helper_funcs vc4_dsi_encoder_helper_funcs = {
+-	.atomic_disable = vc4_dsi_encoder_disable,
+-	.atomic_enable = vc4_dsi_encoder_enable,
+-	.mode_fixup = vc4_dsi_encoder_mode_fixup,
+-	.atomic_mode_set = vc4_dsi_encoder_mode_set,
++static const struct drm_bridge_funcs vc4_dsi_bridge_funcs = {
++	.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
++	.atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
++	.atomic_reset = drm_atomic_helper_bridge_reset,
++	.atomic_pre_enable = vc4_dsi_bridge_pre_enable,
++	.atomic_enable = vc4_dsi_bridge_enable,
++	.atomic_disable = vc4_dsi_bridge_disable,
++	.atomic_post_disable = vc4_dsi_bridge_post_disable,
++	.attach = vc4_dsi_bridge_attach,
++	.mode_fixup = vc4_dsi_bridge_mode_fixup,
+ };
+ 
+ static const struct vc4_dsi_variant bcm2711_dsi1_variant = {
+@@ -1691,9 +1744,8 @@ static int vc4_dsi_bind(struct device *d
+ 		goto err_free_dma;
+ 
+ 	drm_simple_encoder_init(drm, dsi->encoder, DRM_MODE_ENCODER_DSI);
+-	drm_encoder_helper_add(dsi->encoder, &vc4_dsi_encoder_helper_funcs);
+ 
+-	ret = drm_bridge_attach(dsi->encoder, dsi->out_bridge, NULL, 0);
++	ret = drm_bridge_attach(dsi->encoder, &dsi->bridge, NULL, 0);
+ 	if (ret) {
+ 		dev_err(dev, "bridge attach failed: %d\n", ret);
+ 		goto err_free_dma;
+@@ -1755,6 +1807,10 @@ static int vc4_dsi_dev_probe(struct plat
+ 		return -ENOMEM;
+ 	dev_set_drvdata(dev, dsi);
+ 
++	dsi->bridge.funcs = &vc4_dsi_bridge_funcs;
++	dsi->bridge.of_node = dev->of_node;
++	dsi->bridge.type = DRM_MODE_CONNECTOR_DSI;
++
+ 	dsi->pdev = pdev;
+ 	dsi->dsi_host.ops = &vc4_dsi_host_ops;
+ 	dsi->dsi_host.dev = dev;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0733-drm-vc4-Remove-entry-to-ULPS-from-vc4_dsi-post_disab.patch b/root/target/linux/bcm27xx/patches-5.15/950-0733-drm-vc4-Remove-entry-to-ULPS-from-vc4_dsi-post_disab.patch
new file mode 100644
index 00000000..44dd441e
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0733-drm-vc4-Remove-entry-to-ULPS-from-vc4_dsi-post_disab.patch
@@ -0,0 +1,32 @@
+From 26be9df66c6aef500d73a74d7e99db029eca9ea2 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Fri, 11 Feb 2022 14:15:26 +0000
+Subject: [PATCH 733/828] drm/vc4: Remove entry to ULPS from vc4_dsi
+ post_disable
+
+Post_disable was sending the D-PHY sequence to put any device
+into ULPS suspend mode, and then cutting power to the DSI block.
+The power-on reset state of the DSI block is for DSI to be in
+an operational state, not ULPS, so it then never sent the sequence
+for exiting ULPS. Any attached device that didn't have an external
+reset therefore remained in ULPS / standby, and didn't function.
+
+Use of ULPS isn't well specified in DRM, therefore remove entering
+it to avoid the above situation.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_dsi.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_dsi.c
++++ b/drivers/gpu/drm/vc4/vc4_dsi.c
+@@ -816,8 +816,6 @@ static void vc4_dsi_bridge_post_disable(
+ 	struct vc4_dsi *dsi = bridge_to_vc4_dsi(bridge);
+ 	struct device *dev = &dsi->pdev->dev;
+ 
+-	vc4_dsi_ulps(dsi, true);
+-
+ 	clk_disable_unprepare(dsi->pll_phy_clock);
+ 	clk_disable_unprepare(dsi->escape_clock);
+ 	clk_disable_unprepare(dsi->pixel_clock);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0734-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch b/root/target/linux/bcm27xx/patches-5.15/950-0734-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
new file mode 100644
index 00000000..7ce9938c
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0734-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
@@ -0,0 +1,96 @@
+From c2621614ceb6766598d0f90f31fdb5049b384c70 Mon Sep 17 00:00:00 2001
+From: Jonathan Bell <jonathan@raspberrypi.com>
+Date: Wed, 16 Feb 2022 14:31:02 +0000
+Subject: [PATCH 734/828] usb: xhci: add a quirk for Superspeed bulk OUT
+ transfers on VL805
+
+The VL805 has a bug in its internal FIFO space accounting that results
+in bulk OUT babble if a TRB in a large multi-element TD has a data
+buffer size that is larger than and not a multiple of wMaxPacketSize for
+the endpoint. If the downstream USB3.0 link is congested, or latency is
+increased through an intermediate hub, then the VL805 enters a suspected
+FIFO overflow condition and transmits repeated, garbled data to the
+endpoint.
+
+TDs with TRBs of exact multiples of wMaxPacketSize and smaller than
+wMaxPacketSize appear to be handled correctly, so split buffers at a
+1024-byte length boundary and put the remainder in a separate smaller
+TRB.
+
+Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
+---
+ drivers/usb/host/xhci-pci.c  |  1 +
+ drivers/usb/host/xhci-ring.c | 21 +++++++++++++++++++--
+ drivers/usb/host/xhci.h      |  1 +
+ 3 files changed, 21 insertions(+), 2 deletions(-)
+
+--- a/drivers/usb/host/xhci-pci.c
++++ b/drivers/usb/host/xhci-pci.c
+@@ -298,6 +298,7 @@ static void xhci_pci_quirks(struct devic
+ 		xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
+ 		xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
+ 		xhci->quirks |= XHCI_VLI_TRB_CACHE_BUG;
++		xhci->quirks |= XHCI_VLI_SS_BULK_OUT_BUG;
+ 	}
+ 
+ 	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
+--- a/drivers/usb/host/xhci-ring.c
++++ b/drivers/usb/host/xhci-ring.c
+@@ -3607,14 +3607,15 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
+ 	unsigned int num_trbs;
+ 	unsigned int start_cycle, num_sgs = 0;
+ 	unsigned int enqd_len, block_len, trb_buff_len, full_len;
+-	int sent_len, ret;
+-	u32 field, length_field, remainder;
++	int sent_len, ret, vli_quirk = 0;
++	u32 field, length_field, remainder, maxpacket;
+ 	u64 addr, send_addr;
+ 
+ 	ring = xhci_urb_to_transfer_ring(xhci, urb);
+ 	if (!ring)
+ 		return -EINVAL;
+ 
++	maxpacket = usb_endpoint_maxp(&urb->ep->desc);
+ 	full_len = urb->transfer_buffer_length;
+ 	/* If we have scatter/gather list, we use it. */
+ 	if (urb->num_sgs && !(urb->transfer_flags & URB_DMA_MAP_SINGLE)) {
+@@ -3651,6 +3652,17 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
+ 	start_cycle = ring->cycle_state;
+ 	send_addr = addr;
+ 
++	if (xhci->quirks & XHCI_VLI_SS_BULK_OUT_BUG &&
++	    !usb_urb_dir_in(urb) && urb->dev->speed >= USB_SPEED_SUPER) {
++		/*
++		 * VL805 - superspeed bulk OUT traffic can cause
++		 * an internal fifo overflow if the TRB buffer is larger
++		 * than wMaxPacket and the length is not an integer
++		 * multiple of wMaxPacket.
++		 */
++		vli_quirk = 1;
++	}
++
+ 	/* Queue the TRBs, even if they are zero-length */
+ 	for (enqd_len = 0; first_trb || enqd_len < full_len;
+ 			enqd_len += trb_buff_len) {
+@@ -3663,6 +3675,11 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
+ 		if (enqd_len + trb_buff_len > full_len)
+ 			trb_buff_len = full_len - enqd_len;
+ 
++		if (vli_quirk && trb_buff_len > maxpacket) {
++			/* SS bulk wMaxPacket is 1024B */
++			remainder = trb_buff_len & (maxpacket - 1);
++			trb_buff_len -= remainder;
++		}
+ 		/* Don't change the cycle bit of the first TRB until later */
+ 		if (first_trb) {
+ 			first_trb = false;
+--- a/drivers/usb/host/xhci.h
++++ b/drivers/usb/host/xhci.h
+@@ -1906,6 +1906,7 @@ struct xhci_hcd {
+ #define XHCI_EP_CTX_BROKEN_DCS	BIT_ULL(42)
+ #define XHCI_AVOID_DQ_ON_LINK	BIT_ULL(43)
+ #define XHCI_VLI_TRB_CACHE_BUG	BIT_ULL(44)
++#define XHCI_VLI_SS_BULK_OUT_BUG	BIT_ULL(45)
+ 
+ 	unsigned int		num_active_eps;
+ 	unsigned int		limit_active_eps;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0735-dtoverlays-Correct-link-frequency-for-ov7251.patch b/root/target/linux/bcm27xx/patches-5.15/950-0735-dtoverlays-Correct-link-frequency-for-ov7251.patch
new file mode 100644
index 00000000..23537c4e
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0735-dtoverlays-Correct-link-frequency-for-ov7251.patch
@@ -0,0 +1,23 @@
+From 22f2386b8e5f469fa6ac5ed29a82b52ba31351f7 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 17 Feb 2022 15:16:56 +0000
+Subject: [PATCH 735/828] dtoverlays: Correct link frequency for ov7251
+
+It was incorrect, so the driver rejected it.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/ov7251-overlay.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/overlays/ov7251-overlay.dts
++++ b/arch/arm/boot/dts/overlays/ov7251-overlay.dts
+@@ -38,7 +38,7 @@
+ 						data-lanes = <1>;
+ 						clock-noncontinuous;
+ 						link-frequencies =
+-							/bits/ 64 <456000000>;
++							/bits/ 64 <240000000>;
+ 					};
+ 				};
+ 			};
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0736-media-i2c-Add-acpi-support-to-ov7251.patch b/root/target/linux/bcm27xx/patches-5.15/950-0736-media-i2c-Add-acpi-support-to-ov7251.patch
new file mode 100644
index 00000000..1c7c4234
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0736-media-i2c-Add-acpi-support-to-ov7251.patch
@@ -0,0 +1,39 @@
+From 720115649e646e39c8eae72747c91a4867fc6456 Mon Sep 17 00:00:00 2001
+From: Daniel Scally <djrscally@gmail.com>
+Date: Tue, 15 Feb 2022 23:07:30 +0000
+Subject: [PATCH 736/828] media: i2c: Add acpi support to ov7251
+
+Add support for enumeration through ACPI to the ov7251 driver
+
+Signed-off-by: Daniel Scally <djrscally@gmail.com>
+---
+ drivers/media/i2c/ov7251.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -14,6 +14,7 @@
+ #include <linux/i2c.h>
+ #include <linux/init.h>
+ #include <linux/module.h>
++#include <linux/mod_devicetable.h>
+ #include <linux/regulator/consumer.h>
+ #include <linux/slab.h>
+ #include <linux/types.h>
+@@ -1501,9 +1502,16 @@ static const struct of_device_id ov7251_
+ };
+ MODULE_DEVICE_TABLE(of, ov7251_of_match);
+ 
++static const struct acpi_device_id ov7251_acpi_match[] = {
++	{ "INT347E" },
++	{ }
++};
++MODULE_DEVICE_TABLE(acpi, ov7251_acpi_match);
++
+ static struct i2c_driver ov7251_i2c_driver = {
+ 	.driver = {
+ 		.of_match_table = ov7251_of_match,
++		.acpi_match_table = ov7251_acpi_match,
+ 		.name  = "ov7251",
+ 	},
+ 	.probe_new  = ov7251_probe,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0737-media-i2c-Provide-ov7251_check_hwcfg.patch b/root/target/linux/bcm27xx/patches-5.15/950-0737-media-i2c-Provide-ov7251_check_hwcfg.patch
new file mode 100644
index 00000000..87358309
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0737-media-i2c-Provide-ov7251_check_hwcfg.patch
@@ -0,0 +1,121 @@
+From 2bfcd756fe2174df72aa2020ad81d3a2cb9238b5 Mon Sep 17 00:00:00 2001
+From: Daniel Scally <djrscally@gmail.com>
+Date: Tue, 15 Feb 2022 23:07:31 +0000
+Subject: [PATCH 737/828] media: i2c: Provide ov7251_check_hwcfg()
+
+Move the endpoint checking from .probe() to a dedicated function,
+and additionally check that the firmware provided link frequencies
+are a match for those supported by the driver. Finally, return
+-EPROBE_DEFER if the endpoint is not available, as it could be built
+by the ipu3-cio2 driver if that probes later.
+
+Signed-off-by: Daniel Scally <djrscally@gmail.com>
+---
+ drivers/media/i2c/ov7251.c | 84 ++++++++++++++++++++++++++++++--------
+ 1 file changed, 66 insertions(+), 18 deletions(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -1255,11 +1255,74 @@ static const struct v4l2_subdev_ops ov72
+ 	.pad = &ov7251_subdev_pad_ops,
+ };
+ 
++static int ov7251_check_hwcfg(struct ov7251 *ov7251)
++{
++	struct fwnode_handle *fwnode = dev_fwnode(ov7251->dev);
++	struct v4l2_fwnode_endpoint bus_cfg = {
++		.bus_type = V4L2_MBUS_CSI2_DPHY,
++	};
++	struct fwnode_handle *endpoint;
++	bool freq_found;
++	int i, j;
++	int ret;
++
++	endpoint = fwnode_graph_get_next_endpoint(fwnode, NULL);
++	if (!endpoint)
++		return -EPROBE_DEFER; /* could be provided by cio2-bridge */
++
++	ret = v4l2_fwnode_endpoint_alloc_parse(endpoint, &bus_cfg);
++	fwnode_handle_put(endpoint);
++	if (ret)
++		return dev_err_probe(ov7251->dev, ret,
++				     "parsing endpoint node failed\n");
++
++	if (bus_cfg.bus_type != V4L2_MBUS_CSI2_DPHY) {
++		ret = -EINVAL;
++		dev_err(ov7251->dev, "invalid bus type (%u), must be (%u)\n",
++			bus_cfg.bus_type, V4L2_MBUS_CSI2_DPHY);
++		goto out_free_bus_cfg;
++	}
++
++	if (bus_cfg.bus.mipi_csi2.num_data_lanes != 1) {
++		dev_err(ov7251->dev, "only a 1-lane CSI2 config is supported");
++		ret = -EINVAL;
++		goto out_free_bus_cfg;
++	}
++
++	if (!bus_cfg.nr_of_link_frequencies) {
++		dev_err(ov7251->dev, "no link frequencies defined\n");
++		ret = -EINVAL;
++		goto out_free_bus_cfg;
++	}
++
++	freq_found = false;
++	for (i = 0; i < bus_cfg.nr_of_link_frequencies; i++) {
++		if (freq_found)
++			break;
++
++		for (j = 0; j < ARRAY_SIZE(link_freq); j++)
++			if (bus_cfg.link_frequencies[i] == link_freq[j]) {
++				freq_found = true;
++				break;
++			}
++	}
++
++	if (i == bus_cfg.nr_of_link_frequencies) {
++		dev_err(ov7251->dev, "no supported link freq found\n");
++		ret = -EINVAL;
++		goto out_free_bus_cfg;
++	}
++
++out_free_bus_cfg:
++	v4l2_fwnode_endpoint_free(&bus_cfg);
++
++	return ret;
++}
++
+ static int ov7251_probe(struct i2c_client *client)
+ {
+ 	struct v4l2_fwnode_device_properties props;
+ 	struct device *dev = &client->dev;
+-	struct fwnode_handle *endpoint;
+ 	struct ov7251 *ov7251;
+ 	u8 chip_id_high, chip_id_low, chip_rev;
+ 	int ret;
+@@ -1271,24 +1334,9 @@ static int ov7251_probe(struct i2c_clien
+ 	ov7251->i2c_client = client;
+ 	ov7251->dev = dev;
+ 
+-	endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL);
+-	if (!endpoint) {
+-		dev_err(dev, "endpoint node not found\n");
+-		return -EINVAL;
+-	}
+-
+-	ret = v4l2_fwnode_endpoint_parse(endpoint, &ov7251->ep);
+-	fwnode_handle_put(endpoint);
+-	if (ret < 0) {
+-		dev_err(dev, "parsing endpoint node failed\n");
++	ret = ov7251_check_hwcfg(ov7251);
++	if (ret)
+ 		return ret;
+-	}
+-
+-	if (ov7251->ep.bus_type != V4L2_MBUS_CSI2_DPHY) {
+-		dev_err(dev, "invalid bus type (%u), must be CSI2 (%u)\n",
+-			ov7251->ep.bus_type, V4L2_MBUS_CSI2_DPHY);
+-		return -EINVAL;
+-	}
+ 
+ 	/* get system clock (xclk) */
+ 	ov7251->xclk = devm_clk_get(dev, "xclk");
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0738-media-i2c-Add-ov7251_pll_configure.patch b/root/target/linux/bcm27xx/patches-5.15/950-0738-media-i2c-Add-ov7251_pll_configure.patch
new file mode 100644
index 00000000..42e60a85
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0738-media-i2c-Add-ov7251_pll_configure.patch
@@ -0,0 +1,266 @@
+From 0f1c209acedb7409af021a9f34c2dedb4080d648 Mon Sep 17 00:00:00 2001
+From: Daniel Scally <djrscally@gmail.com>
+Date: Tue, 15 Feb 2022 23:07:32 +0000
+Subject: [PATCH 738/828] media: i2c: Add ov7251_pll_configure()
+
+Rather than having the pll settings hidden inside mode blobs, define
+them in structs and use a dedicated function to set them. This makes
+it simpler to extend the driver to support other external clock
+frequencies.
+
+Signed-off-by: Daniel Scally <djrscally@gmail.com>
+---
+ drivers/media/i2c/ov7251.c | 165 ++++++++++++++++++++++++++++++-------
+ 1 file changed, 135 insertions(+), 30 deletions(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -42,6 +42,16 @@
+ #define OV7251_TIMING_FORMAT2_MIRROR	BIT(2)
+ #define OV7251_PRE_ISP_00		0x5e00
+ #define OV7251_PRE_ISP_00_TEST_PATTERN	BIT(7)
++#define OV7251_PLL1_PRE_DIV_REG		0x30b4
++#define OV7251_PLL1_MULT_REG		0x30b3
++#define OV7251_PLL1_DIVIDER_REG		0x30b1
++#define OV7251_PLL1_PIX_DIV_REG		0x30b0
++#define OV7251_PLL1_MIPI_DIV_REG	0x30b5
++#define OV7251_PLL2_PRE_DIV_REG		0x3098
++#define OV7251_PLL2_MULT_REG		0x3099
++#define OV7251_PLL2_DIVIDER_REG		0x309d
++#define OV7251_PLL2_SYS_DIV_REG		0x309a
++#define OV7251_PLL2_ADC_DIV_REG		0x309b
+ 
+ struct reg_value {
+ 	u16 reg;
+@@ -60,6 +70,27 @@ struct ov7251_mode_info {
+ 	struct v4l2_fract timeperframe;
+ };
+ 
++struct ov7251_pll1_config {
++	unsigned int pre_div;
++	unsigned int mult;
++	unsigned int div;
++	unsigned int pix_div;
++	unsigned int mipi_div;
++};
++
++struct ov7251_pll2_config {
++	unsigned int pre_div;
++	unsigned int mult;
++	unsigned int div;
++	unsigned int sys_div;
++	unsigned int adc_div;
++};
++
++struct ov7251_pll_configs {
++	const struct ov7251_pll1_config *pll1;
++	const struct ov7251_pll2_config *pll2;
++};
++
+ struct ov7251 {
+ 	struct i2c_client *i2c_client;
+ 	struct device *dev;
+@@ -71,6 +102,8 @@ struct ov7251 {
+ 	struct clk *xclk;
+ 	u32 xclk_freq;
+ 
++	const struct ov7251_pll_configs *pll_configs;
++
+ 	struct regulator *io_regulator;
+ 	struct regulator *core_regulator;
+ 	struct regulator *analog_regulator;
+@@ -100,6 +133,36 @@ static inline struct ov7251 *to_ov7251(s
+ 	return container_of(sd, struct ov7251, sd);
+ }
+ 
++enum xclk_rate {
++	OV7251_24_MHZ,
++	OV7251_NUM_SUPPORTED_RATES
++};
++
++static const struct ov7251_pll1_config ov7251_pll1_config_24_mhz = {
++	.pre_div = 0x03,
++	.mult = 0x64,
++	.div = 0x01,
++	.pix_div = 0x0a,
++	.mipi_div = 0x05
++};
++
++static const struct ov7251_pll2_config ov7251_pll2_config_24_mhz = {
++	.pre_div = 0x04,
++	.mult = 0x28,
++	.div = 0x00,
++	.sys_div = 0x05,
++	.adc_div = 0x04
++};
++
++static const struct ov7251_pll_configs ov7251_pll_configs_24_mhz = {
++	.pll1 = &ov7251_pll1_config_24_mhz,
++	.pll2 = &ov7251_pll2_config_24_mhz
++};
++
++static const struct ov7251_pll_configs *ov7251_pll_configs[] = {
++	[OV7251_24_MHZ] = &ov7251_pll_configs_24_mhz
++};
++
+ static const struct reg_value ov7251_global_init_setting[] = {
+ 	{ 0x0103, 0x01 },
+ 	{ 0x303b, 0x02 },
+@@ -118,16 +181,6 @@ static const struct reg_value ov7251_set
+ 	{ 0x301c, 0xf0 },
+ 	{ 0x3023, 0x05 },
+ 	{ 0x3037, 0xf0 },
+-	{ 0x3098, 0x04 }, /* pll2 pre divider */
+-	{ 0x3099, 0x28 }, /* pll2 multiplier */
+-	{ 0x309a, 0x05 }, /* pll2 sys divider */
+-	{ 0x309b, 0x04 }, /* pll2 adc divider */
+-	{ 0x309d, 0x00 }, /* pll2 divider */
+-	{ 0x30b0, 0x0a }, /* pll1 pix divider */
+-	{ 0x30b1, 0x01 }, /* pll1 divider */
+-	{ 0x30b3, 0x64 }, /* pll1 multiplier */
+-	{ 0x30b4, 0x03 }, /* pll1 pre divider */
+-	{ 0x30b5, 0x05 }, /* pll1 mipi divider */
+ 	{ 0x3106, 0xda },
+ 	{ 0x3503, 0x07 },
+ 	{ 0x3509, 0x10 },
+@@ -256,16 +309,6 @@ static const struct reg_value ov7251_set
+ 	{ 0x301c, 0x00 },
+ 	{ 0x3023, 0x05 },
+ 	{ 0x3037, 0xf0 },
+-	{ 0x3098, 0x04 }, /* pll2 pre divider */
+-	{ 0x3099, 0x28 }, /* pll2 multiplier */
+-	{ 0x309a, 0x05 }, /* pll2 sys divider */
+-	{ 0x309b, 0x04 }, /* pll2 adc divider */
+-	{ 0x309d, 0x00 }, /* pll2 divider */
+-	{ 0x30b0, 0x0a }, /* pll1 pix divider */
+-	{ 0x30b1, 0x01 }, /* pll1 divider */
+-	{ 0x30b3, 0x64 }, /* pll1 multiplier */
+-	{ 0x30b4, 0x03 }, /* pll1 pre divider */
+-	{ 0x30b5, 0x05 }, /* pll1 mipi divider */
+ 	{ 0x3106, 0xda },
+ 	{ 0x3503, 0x07 },
+ 	{ 0x3509, 0x10 },
+@@ -394,16 +437,6 @@ static const struct reg_value ov7251_set
+ 	{ 0x301c, 0x00 },
+ 	{ 0x3023, 0x05 },
+ 	{ 0x3037, 0xf0 },
+-	{ 0x3098, 0x04 }, /* pll2 pre divider */
+-	{ 0x3099, 0x28 }, /* pll2 multiplier */
+-	{ 0x309a, 0x05 }, /* pll2 sys divider */
+-	{ 0x309b, 0x04 }, /* pll2 adc divider */
+-	{ 0x309d, 0x00 }, /* pll2 divider */
+-	{ 0x30b0, 0x0a }, /* pll1 pix divider */
+-	{ 0x30b1, 0x01 }, /* pll1 divider */
+-	{ 0x30b3, 0x64 }, /* pll1 multiplier */
+-	{ 0x30b4, 0x03 }, /* pll1 pre divider */
+-	{ 0x30b5, 0x05 }, /* pll1 mipi divider */
+ 	{ 0x3106, 0xda },
+ 	{ 0x3503, 0x07 },
+ 	{ 0x3509, 0x10 },
+@@ -519,6 +552,10 @@ static const struct reg_value ov7251_set
+ 	{ 0x5001, 0x80 },
+ };
+ 
++static const unsigned long supported_xclk_rates[] = {
++	[OV7251_24_MHZ] = 24000000,
++};
++
+ static const s64 link_freq[] = {
+ 	240000000,
+ };
+@@ -692,6 +729,63 @@ static int ov7251_read_reg(struct ov7251
+ 	return 0;
+ }
+ 
++static int ov7251_pll_configure(struct ov7251 *ov7251)
++{
++	const struct ov7251_pll_configs *configs;
++	int ret;
++
++	configs = ov7251->pll_configs;
++
++	ret = ov7251_write_reg(ov7251, OV7251_PLL1_PRE_DIV_REG,
++			       configs->pll1->pre_div);
++	if (ret < 0)
++		return ret;
++
++	ret = ov7251_write_reg(ov7251, OV7251_PLL1_MULT_REG,
++			       configs->pll1->mult);
++	if (ret < 0)
++		return ret;
++	ret = ov7251_write_reg(ov7251, OV7251_PLL1_DIVIDER_REG,
++			       configs->pll1->div);
++	if (ret < 0)
++		return ret;
++
++	ret = ov7251_write_reg(ov7251, OV7251_PLL1_PIX_DIV_REG,
++			       configs->pll1->pix_div);
++	if (ret < 0)
++		return ret;
++
++	ret = ov7251_write_reg(ov7251, OV7251_PLL1_MIPI_DIV_REG,
++			       configs->pll1->mipi_div);
++	if (ret < 0)
++		return ret;
++
++	ret = ov7251_write_reg(ov7251, OV7251_PLL2_PRE_DIV_REG,
++			       configs->pll2->pre_div);
++	if (ret < 0)
++		return ret;
++
++	ret = ov7251_write_reg(ov7251, OV7251_PLL2_MULT_REG,
++			       configs->pll2->mult);
++	if (ret < 0)
++		return ret;
++
++	ret = ov7251_write_reg(ov7251, OV7251_PLL2_DIVIDER_REG,
++			       configs->pll2->div);
++	if (ret < 0)
++		return ret;
++
++	ret = ov7251_write_reg(ov7251, OV7251_PLL2_SYS_DIV_REG,
++			       configs->pll2->sys_div);
++	if (ret < 0)
++		return ret;
++
++	ret = ov7251_write_reg(ov7251, OV7251_PLL2_ADC_DIV_REG,
++			       configs->pll2->adc_div);
++
++	return ret;
++}
++
+ static int ov7251_set_exposure(struct ov7251 *ov7251, s32 exposure)
+ {
+ 	u16 reg;
+@@ -1143,6 +1237,11 @@ static int ov7251_s_stream(struct v4l2_s
+ 	mutex_lock(&ov7251->lock);
+ 
+ 	if (enable) {
++		ret = ov7251_pll_configure(ov7251);
++		if (ret)
++			return dev_err_probe(ov7251->dev, ret,
++					     "error configuring PLLs\n");
++
+ 		ret = ov7251_set_register_array(ov7251,
+ 					ov7251->current_mode->data,
+ 					ov7251->current_mode->data_size);
+@@ -1326,6 +1425,7 @@ static int ov7251_probe(struct i2c_clien
+ 	struct ov7251 *ov7251;
+ 	u8 chip_id_high, chip_id_low, chip_rev;
+ 	int ret;
++	int i;
+ 
+ 	ov7251 = devm_kzalloc(dev, sizeof(struct ov7251), GFP_KERNEL);
+ 	if (!ov7251)
+@@ -1364,6 +1464,11 @@ static int ov7251_probe(struct i2c_clien
+ 		dev_err(dev, "could not set xclk frequency\n");
+ 		return ret;
+ 	}
++	for (i = 0; i < ARRAY_SIZE(supported_xclk_rates); i++)
++		if (ov7251->xclk_freq == supported_xclk_rates[i])
++			break;
++
++	ov7251->pll_configs = ov7251_pll_configs[i];
+ 
+ 	ov7251->io_regulator = devm_regulator_get(dev, "vdddo");
+ 	if (IS_ERR(ov7251->io_regulator)) {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0739-media-i2c-Add-support-for-19.2MHz-clock-to-ov7251.patch b/root/target/linux/bcm27xx/patches-5.15/950-0739-media-i2c-Add-support-for-19.2MHz-clock-to-ov7251.patch
new file mode 100644
index 00000000..08b3e8a4
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0739-media-i2c-Add-support-for-19.2MHz-clock-to-ov7251.patch
@@ -0,0 +1,144 @@
+From 6b877ea7d8bcd69d73b169c7cb1d247d5cc67933 Mon Sep 17 00:00:00 2001
+From: Daniel Scally <djrscally@gmail.com>
+Date: Tue, 15 Feb 2022 23:07:33 +0000
+Subject: [PATCH 739/828] media: i2c: Add support for 19.2MHz clock to ov7251
+
+The OV7251 sensor is used as the IR camera sensor on the Microsoft
+Surface line of tablets; this provides a 19.2MHz external clock. Add
+the ability to support that rate to the driver by defining a new set
+of PLL configs. Extend the clock handling in .probe() to check for
+either supported frequency.
+
+Signed-off-by: Daniel Scally <djrscally@gmail.com>
+---
+ drivers/media/i2c/ov7251.c | 61 ++++++++++++++++++++++++++++----------
+ 1 file changed, 45 insertions(+), 16 deletions(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -134,10 +134,19 @@ static inline struct ov7251 *to_ov7251(s
+ }
+ 
+ enum xclk_rate {
++	OV7251_19_2_MHZ,
+ 	OV7251_24_MHZ,
+ 	OV7251_NUM_SUPPORTED_RATES
+ };
+ 
++static const struct ov7251_pll1_config ov7251_pll1_config_19_2_mhz = {
++	.pre_div = 0x03,
++	.mult = 0x4b,
++	.div = 0x01,
++	.pix_div = 0x0a,
++	.mipi_div = 0x05
++};
++
+ static const struct ov7251_pll1_config ov7251_pll1_config_24_mhz = {
+ 	.pre_div = 0x03,
+ 	.mult = 0x64,
+@@ -146,6 +155,14 @@ static const struct ov7251_pll1_config o
+ 	.mipi_div = 0x05
+ };
+ 
++static const struct ov7251_pll2_config ov7251_pll2_config_19_2_mhz = {
++	.pre_div = 0x04,
++	.mult = 0x32,
++	.div = 0x00,
++	.sys_div = 0x05,
++	.adc_div = 0x04
++};
++
+ static const struct ov7251_pll2_config ov7251_pll2_config_24_mhz = {
+ 	.pre_div = 0x04,
+ 	.mult = 0x28,
+@@ -154,12 +171,18 @@ static const struct ov7251_pll2_config o
+ 	.adc_div = 0x04
+ };
+ 
++static const struct ov7251_pll_configs ov7251_pll_configs_19_2_mhz = {
++	.pll1 = &ov7251_pll1_config_19_2_mhz,
++	.pll2 = &ov7251_pll2_config_19_2_mhz
++};
++
+ static const struct ov7251_pll_configs ov7251_pll_configs_24_mhz = {
+ 	.pll1 = &ov7251_pll1_config_24_mhz,
+ 	.pll2 = &ov7251_pll2_config_24_mhz
+ };
+ 
+ static const struct ov7251_pll_configs *ov7251_pll_configs[] = {
++	[OV7251_19_2_MHZ] = &ov7251_pll_configs_19_2_mhz,
+ 	[OV7251_24_MHZ] = &ov7251_pll_configs_24_mhz
+ };
+ 
+@@ -553,6 +576,7 @@ static const struct reg_value ov7251_set
+ };
+ 
+ static const unsigned long supported_xclk_rates[] = {
++	[OV7251_19_2_MHZ] = 19200000,
+ 	[OV7251_24_MHZ] = 24000000,
+ };
+ 
+@@ -1424,6 +1448,7 @@ static int ov7251_probe(struct i2c_clien
+ 	struct device *dev = &client->dev;
+ 	struct ov7251 *ov7251;
+ 	u8 chip_id_high, chip_id_low, chip_rev;
++	unsigned int rate = 0;
+ 	int ret;
+ 	int i;
+ 
+@@ -1439,35 +1464,39 @@ static int ov7251_probe(struct i2c_clien
+ 		return ret;
+ 
+ 	/* get system clock (xclk) */
+-	ov7251->xclk = devm_clk_get(dev, "xclk");
++	ov7251->xclk = devm_clk_get(dev, NULL);
+ 	if (IS_ERR(ov7251->xclk)) {
+ 		dev_err(dev, "could not get xclk");
+ 		return PTR_ERR(ov7251->xclk);
+ 	}
+ 
++	/*
++	 * We could have either a 24MHz or 19.2MHz clock rate from either dt or
++	 * ACPI. We also need to support the IPU3 case which will have both an
++	 * external clock AND a clock-frequency property.
++	 */
+ 	ret = fwnode_property_read_u32(dev_fwnode(dev), "clock-frequency",
+-				       &ov7251->xclk_freq);
+-	if (ret) {
+-		dev_err(dev, "could not get xclk frequency\n");
+-		return ret;
++				       &rate);
++	if (!ret && ov7251->xclk) {
++		ret = clk_set_rate(ov7251->xclk, rate);
++		if (ret)
++			return dev_err_probe(dev, ret,
++					     "failed to set clock rate\n");
++	} else if (ret && !ov7251->xclk) {
++		return dev_err_probe(dev, ret, "invalid clock config\n");
+ 	}
+ 
+-	/* external clock must be 24MHz, allow 1% tolerance */
+-	if (ov7251->xclk_freq < 23760000 || ov7251->xclk_freq > 24240000) {
+-		dev_err(dev, "external clock frequency %u is not supported\n",
+-			ov7251->xclk_freq);
+-		return -EINVAL;
+-	}
++	ov7251->xclk_freq = rate ? rate : clk_get_rate(ov7251->xclk);
+ 
+-	ret = clk_set_rate(ov7251->xclk, ov7251->xclk_freq);
+-	if (ret) {
+-		dev_err(dev, "could not set xclk frequency\n");
+-		return ret;
+-	}
+ 	for (i = 0; i < ARRAY_SIZE(supported_xclk_rates); i++)
+ 		if (ov7251->xclk_freq == supported_xclk_rates[i])
+ 			break;
+ 
++	if (i == ARRAY_SIZE(supported_xclk_rates))
++		return dev_err_probe(dev, -EINVAL,
++				     "clock rate %u Hz is unsupported\n",
++				     ov7251->xclk_freq);
++
+ 	ov7251->pll_configs = ov7251_pll_configs[i];
+ 
+ 	ov7251->io_regulator = devm_regulator_get(dev, "vdddo");
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0740-media-i2c-Add-ov7251_detect_chip.patch b/root/target/linux/bcm27xx/patches-5.15/950-0740-media-i2c-Add-ov7251_detect_chip.patch
new file mode 100644
index 00000000..83aceed7
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0740-media-i2c-Add-ov7251_detect_chip.patch
@@ -0,0 +1,98 @@
+From 872a4ebefbdc226eb5cc7ca474d7ac1d7b282956 Mon Sep 17 00:00:00 2001
+From: Daniel Scally <djrscally@gmail.com>
+Date: Tue, 15 Feb 2022 23:07:34 +0000
+Subject: [PATCH 740/828] media: i2c: Add ov7251_detect_chip()
+
+.probe() is quite busy for this driver; make it cleaner by moving the
+chip verification to a dedicated function.
+
+Signed-off-by: Daniel Scally <djrscally@gmail.com>
+---
+ drivers/media/i2c/ov7251.c | 62 +++++++++++++++++++++-----------------
+ 1 file changed, 35 insertions(+), 27 deletions(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -1442,12 +1442,44 @@ out_free_bus_cfg:
+ 	return ret;
+ }
+ 
++static int ov7251_detect_chip(struct ov7251 *ov7251)
++{
++	u8 chip_id_high, chip_id_low, chip_rev;
++	int ret;
++
++	ret = ov7251_read_reg(ov7251, OV7251_CHIP_ID_HIGH, &chip_id_high);
++	if (ret < 0 || chip_id_high != OV7251_CHIP_ID_HIGH_BYTE)
++		return dev_err_probe(ov7251->dev, -ENODEV,
++				     "could not read ID high\n");
++
++	ret = ov7251_read_reg(ov7251, OV7251_CHIP_ID_LOW, &chip_id_low);
++	if (ret < 0 || chip_id_low != OV7251_CHIP_ID_LOW_BYTE)
++		return dev_err_probe(ov7251->dev, -ENODEV,
++				     "could not read ID low\n");
++
++	ret = ov7251_read_reg(ov7251, OV7251_SC_GP_IO_IN1, &chip_rev);
++	if (ret < 0)
++		return dev_err_probe(ov7251->dev, -ENODEV,
++				     "could not read revision\n");
++	chip_rev >>= 4;
++
++	dev_info(ov7251->dev,
++		 "OV7251 revision %x (%s) detected at address 0x%02x\n",
++		 chip_rev,
++		 chip_rev == 0x4 ? "1A / 1B" :
++		 chip_rev == 0x5 ? "1C / 1D" :
++		 chip_rev == 0x6 ? "1E" :
++		 chip_rev == 0x7 ? "1F" : "unknown",
++		 ov7251->i2c_client->addr);
++
++	return 0;
++}
++
+ static int ov7251_probe(struct i2c_client *client)
+ {
+ 	struct v4l2_fwnode_device_properties props;
+ 	struct device *dev = &client->dev;
+ 	struct ov7251 *ov7251;
+-	u8 chip_id_high, chip_id_low, chip_rev;
+ 	unsigned int rate = 0;
+ 	int ret;
+ 	int i;
+@@ -1589,34 +1621,10 @@ static int ov7251_probe(struct i2c_clien
+ 		goto free_entity;
+ 	}
+ 
+-	ret = ov7251_read_reg(ov7251, OV7251_CHIP_ID_HIGH, &chip_id_high);
+-	if (ret < 0 || chip_id_high != OV7251_CHIP_ID_HIGH_BYTE) {
+-		dev_err(dev, "could not read ID high\n");
+-		ret = -ENODEV;
+-		goto power_down;
+-	}
+-	ret = ov7251_read_reg(ov7251, OV7251_CHIP_ID_LOW, &chip_id_low);
+-	if (ret < 0 || chip_id_low != OV7251_CHIP_ID_LOW_BYTE) {
+-		dev_err(dev, "could not read ID low\n");
+-		ret = -ENODEV;
+-		goto power_down;
+-	}
+-
+-	ret = ov7251_read_reg(ov7251, OV7251_SC_GP_IO_IN1, &chip_rev);
+-	if (ret < 0) {
+-		dev_err(dev, "could not read revision\n");
+-		ret = -ENODEV;
++	ret = ov7251_detect_chip(ov7251);
++	if (ret)
+ 		goto power_down;
+-	}
+-	chip_rev >>= 4;
+ 
+-	dev_info(dev, "OV7251 revision %x (%s) detected at address 0x%02x\n",
+-		 chip_rev,
+-		 chip_rev == 0x4 ? "1A / 1B" :
+-		 chip_rev == 0x5 ? "1C / 1D" :
+-		 chip_rev == 0x6 ? "1E" :
+-		 chip_rev == 0x7 ? "1F" : "unknown",
+-		 client->addr);
+ 
+ 	ret = ov7251_read_reg(ov7251, OV7251_PRE_ISP_00,
+ 			      &ov7251->pre_isp_00);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0741-media-i2c-Add-pm_runtime-support-to-ov7251.patch b/root/target/linux/bcm27xx/patches-5.15/950-0741-media-i2c-Add-pm_runtime-support-to-ov7251.patch
new file mode 100644
index 00000000..8b220688
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0741-media-i2c-Add-pm_runtime-support-to-ov7251.patch
@@ -0,0 +1,208 @@
+From fc9c0e280e5673ad327c6c145667715a0b4614c7 Mon Sep 17 00:00:00 2001
+From: Daniel Scally <djrscally@gmail.com>
+Date: Tue, 15 Feb 2022 23:07:35 +0000
+Subject: [PATCH 741/828] media: i2c: Add pm_runtime support to ov7251
+
+Add pm_runtime support to the ov7251 driver.
+
+Signed-off-by: Daniel Scally <djrscally@gmail.com>
+---
+ drivers/media/i2c/ov7251.c | 78 ++++++++++++++++++++++++++++++--------
+ 1 file changed, 63 insertions(+), 15 deletions(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -15,6 +15,7 @@
+ #include <linux/init.h>
+ #include <linux/module.h>
+ #include <linux/mod_devicetable.h>
++#include <linux/pm_runtime.h>
+ #include <linux/regulator/consumer.h>
+ #include <linux/slab.h>
+ #include <linux/types.h>
+@@ -884,6 +885,24 @@ static void ov7251_set_power_off(struct
+ 	ov7251_regulators_disable(ov7251);
+ }
+ 
++static int __maybe_unused ov7251_sensor_suspend(struct device *dev)
++{
++	struct v4l2_subdev *sd = dev_get_drvdata(dev);
++	struct ov7251 *ov7251 = to_ov7251(sd);
++
++	ov7251_set_power_off(ov7251);
++
++	return 0;
++}
++
++static int __maybe_unused ov7251_sensor_resume(struct device *dev)
++{
++	struct v4l2_subdev *sd = dev_get_drvdata(dev);
++	struct ov7251 *ov7251 = to_ov7251(sd);
++
++	return ov7251_set_power_on(ov7251);
++}
++
+ static int ov7251_s_power(struct v4l2_subdev *sd, int on)
+ {
+ 	struct ov7251 *ov7251 = to_ov7251(sd);
+@@ -985,7 +1004,7 @@ static int ov7251_s_ctrl(struct v4l2_ctr
+ 
+ 	/* v4l2_ctrl_lock() locks our mutex */
+ 
+-	if (!ov7251->power_on)
++	if (!pm_runtime_get_if_in_use(ov7251->dev))
+ 		return 0;
+ 
+ 	switch (ctrl->id) {
+@@ -1009,6 +1028,8 @@ static int ov7251_s_ctrl(struct v4l2_ctr
+ 		break;
+ 	}
+ 
++	pm_runtime_put(ov7251->dev);
++
+ 	return ret;
+ }
+ 
+@@ -1261,10 +1282,15 @@ static int ov7251_s_stream(struct v4l2_s
+ 	mutex_lock(&ov7251->lock);
+ 
+ 	if (enable) {
++		ret = pm_runtime_get_sync(ov7251->dev);
++		if (ret < 0)
++			return ret;
++
+ 		ret = ov7251_pll_configure(ov7251);
+-		if (ret)
+-			return dev_err_probe(ov7251->dev, ret,
+-					     "error configuring PLLs\n");
++		if (ret) {
++			dev_err(ov7251->dev, "error configuring PLLs\n");
++			goto err_power_down;
++		}
+ 
+ 		ret = ov7251_set_register_array(ov7251,
+ 					ov7251->current_mode->data,
+@@ -1273,23 +1299,29 @@ static int ov7251_s_stream(struct v4l2_s
+ 			dev_err(ov7251->dev, "could not set mode %dx%d\n",
+ 				ov7251->current_mode->width,
+ 				ov7251->current_mode->height);
+-			goto exit;
++			goto err_power_down;
+ 		}
+ 		ret = __v4l2_ctrl_handler_setup(&ov7251->ctrls);
+ 		if (ret < 0) {
+ 			dev_err(ov7251->dev, "could not sync v4l2 controls\n");
+-			goto exit;
++			goto err_power_down;
+ 		}
+ 		ret = ov7251_write_reg(ov7251, OV7251_SC_MODE_SELECT,
+ 				       OV7251_SC_MODE_SELECT_STREAMING);
++		if (ret)
++			goto err_power_down;
+ 	} else {
+ 		ret = ov7251_write_reg(ov7251, OV7251_SC_MODE_SELECT,
+ 				       OV7251_SC_MODE_SELECT_SW_STANDBY);
++		pm_runtime_put(ov7251->dev);
+ 	}
+ 
+-exit:
+ 	mutex_unlock(&ov7251->lock);
++	return ret;
+ 
++err_power_down:
++	pm_runtime_put_noidle(ov7251->dev);
++	mutex_unlock(&ov7251->lock);
+ 	return ret;
+ }
+ 
+@@ -1615,23 +1647,24 @@ static int ov7251_probe(struct i2c_clien
+ 		goto free_ctrl;
+ 	}
+ 
+-	ret = ov7251_s_power(&ov7251->sd, true);
+-	if (ret < 0) {
+-		dev_err(dev, "could not power up OV7251\n");
++	ret = ov7251_set_power_on(ov7251);
++	if (ret)
+ 		goto free_entity;
+-	}
+ 
+ 	ret = ov7251_detect_chip(ov7251);
+ 	if (ret)
+ 		goto power_down;
+ 
++	pm_runtime_set_active(&client->dev);
++	pm_runtime_get_noresume(&client->dev);
++	pm_runtime_enable(&client->dev);
+ 
+ 	ret = ov7251_read_reg(ov7251, OV7251_PRE_ISP_00,
+ 			      &ov7251->pre_isp_00);
+ 	if (ret < 0) {
+ 		dev_err(dev, "could not read test pattern value\n");
+ 		ret = -ENODEV;
+-		goto power_down;
++		goto err_pm_runtime;
+ 	}
+ 
+ 	ret = ov7251_read_reg(ov7251, OV7251_TIMING_FORMAT1,
+@@ -1639,7 +1672,7 @@ static int ov7251_probe(struct i2c_clien
+ 	if (ret < 0) {
+ 		dev_err(dev, "could not read vflip value\n");
+ 		ret = -ENODEV;
+-		goto power_down;
++		goto err_pm_runtime;
+ 	}
+ 
+ 	ret = ov7251_read_reg(ov7251, OV7251_TIMING_FORMAT2,
+@@ -1647,10 +1680,12 @@ static int ov7251_probe(struct i2c_clien
+ 	if (ret < 0) {
+ 		dev_err(dev, "could not read hflip value\n");
+ 		ret = -ENODEV;
+-		goto power_down;
++		goto err_pm_runtime;
+ 	}
+ 
+-	ov7251_s_power(&ov7251->sd, false);
++	pm_runtime_set_autosuspend_delay(&client->dev, 1000);
++	pm_runtime_use_autosuspend(&client->dev);
++	pm_runtime_put_autosuspend(&client->dev);
+ 
+ 	ret = v4l2_async_register_subdev(&ov7251->sd);
+ 	if (ret < 0) {
+@@ -1662,6 +1697,9 @@ static int ov7251_probe(struct i2c_clien
+ 
+ 	return 0;
+ 
++err_pm_runtime:
++	pm_runtime_disable(ov7251->dev);
++	pm_runtime_put_noidle(ov7251->dev);
+ power_down:
+ 	ov7251_s_power(&ov7251->sd, false);
+ free_entity:
+@@ -1683,9 +1721,18 @@ static int ov7251_remove(struct i2c_clie
+ 	v4l2_ctrl_handler_free(&ov7251->ctrls);
+ 	mutex_destroy(&ov7251->lock);
+ 
++	pm_runtime_disable(ov7251->dev);
++	if (!pm_runtime_status_suspended(ov7251->dev))
++		ov7251_set_power_off(ov7251);
++	pm_runtime_set_suspended(ov7251->dev);
++
+ 	return 0;
+ }
+ 
++static const struct dev_pm_ops ov7251_pm_ops = {
++	SET_RUNTIME_PM_OPS(ov7251_sensor_suspend, ov7251_sensor_resume, NULL)
++};
++
+ static const struct of_device_id ov7251_of_match[] = {
+ 	{ .compatible = "ovti,ov7251" },
+ 	{ /* sentinel */ }
+@@ -1703,6 +1750,7 @@ static struct i2c_driver ov7251_i2c_driv
+ 		.of_match_table = ov7251_of_match,
+ 		.acpi_match_table = ov7251_acpi_match,
+ 		.name  = "ov7251",
++		.pm = &ov7251_pm_ops,
+ 	},
+ 	.probe_new  = ov7251_probe,
+ 	.remove = ov7251_remove,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0742-media-i2c-Remove-.s_power-from-ov7251.patch b/root/target/linux/bcm27xx/patches-5.15/950-0742-media-i2c-Remove-.s_power-from-ov7251.patch
new file mode 100644
index 00000000..15abcfe7
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0742-media-i2c-Remove-.s_power-from-ov7251.patch
@@ -0,0 +1,89 @@
+From fe5009287816e4be80a4f5c4916c7877495b197a Mon Sep 17 00:00:00 2001
+From: Daniel Scally <djrscally@gmail.com>
+Date: Tue, 15 Feb 2022 23:07:36 +0000
+Subject: [PATCH 742/828] media: i2c: Remove .s_power() from ov7251
+
+The .s_power() callback is deprecated, and now that we have pm_runtime
+functionality in the driver there's no further use for it. Delete the
+function.
+
+Signed-off-by: Daniel Scally <djrscally@gmail.com>
+Reported-by: kernel test robot <lkp@intel.com>
+---
+ drivers/media/i2c/ov7251.c | 44 +-------------------------------------
+ 1 file changed, 1 insertion(+), 43 deletions(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -903,43 +903,6 @@ static int __maybe_unused ov7251_sensor_
+ 	return ov7251_set_power_on(ov7251);
+ }
+ 
+-static int ov7251_s_power(struct v4l2_subdev *sd, int on)
+-{
+-	struct ov7251 *ov7251 = to_ov7251(sd);
+-	int ret = 0;
+-
+-	mutex_lock(&ov7251->lock);
+-
+-	/* If the power state is not modified - no work to do. */
+-	if (ov7251->power_on == !!on)
+-		goto exit;
+-
+-	if (on) {
+-		ret = ov7251_set_power_on(ov7251);
+-		if (ret < 0)
+-			goto exit;
+-
+-		ret = ov7251_set_register_array(ov7251,
+-					ov7251_global_init_setting,
+-					ARRAY_SIZE(ov7251_global_init_setting));
+-		if (ret < 0) {
+-			dev_err(ov7251->dev, "could not set init registers\n");
+-			ov7251_set_power_off(ov7251);
+-			goto exit;
+-		}
+-
+-		ov7251->power_on = true;
+-	} else {
+-		ov7251_set_power_off(ov7251);
+-		ov7251->power_on = false;
+-	}
+-
+-exit:
+-	mutex_unlock(&ov7251->lock);
+-
+-	return ret;
+-}
+-
+ static int ov7251_set_hflip(struct ov7251 *ov7251, s32 value)
+ {
+ 	u8 val = ov7251->timing_format2;
+@@ -1384,10 +1347,6 @@ exit:
+ 	return ret;
+ }
+ 
+-static const struct v4l2_subdev_core_ops ov7251_core_ops = {
+-	.s_power = ov7251_s_power,
+-};
+-
+ static const struct v4l2_subdev_video_ops ov7251_video_ops = {
+ 	.s_stream = ov7251_s_stream,
+ 	.g_frame_interval = ov7251_get_frame_interval,
+@@ -1405,7 +1364,6 @@ static const struct v4l2_subdev_pad_ops
+ };
+ 
+ static const struct v4l2_subdev_ops ov7251_subdev_ops = {
+-	.core = &ov7251_core_ops,
+ 	.video = &ov7251_video_ops,
+ 	.pad = &ov7251_subdev_pad_ops,
+ };
+@@ -1701,7 +1659,7 @@ err_pm_runtime:
+ 	pm_runtime_disable(ov7251->dev);
+ 	pm_runtime_put_noidle(ov7251->dev);
+ power_down:
+-	ov7251_s_power(&ov7251->sd, false);
++	ov7251_set_power_off(ov7251);
+ free_entity:
+ 	media_entity_cleanup(&ov7251->sd.entity);
+ free_ctrl:
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0743-media-i2c-ov7251-Reinstate-setting-ov7251_global_ini.patch b/root/target/linux/bcm27xx/patches-5.15/950-0743-media-i2c-ov7251-Reinstate-setting-ov7251_global_ini.patch
new file mode 100644
index 00000000..b949532f
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0743-media-i2c-ov7251-Reinstate-setting-ov7251_global_ini.patch
@@ -0,0 +1,32 @@
+From 7e3b860f29cbe98feb049eedb31ecf50636976dc Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 17 Feb 2022 14:48:30 +0000
+Subject: [PATCH 743/828] media: i2c: ov7251: Reinstate setting
+ ov7251_global_init_setting
+
+"media: i2c: Remove .s_power() from ov7251" removed the call that
+sent ov7251_global_init_setting to the sensor. Send it when starting
+streaming.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov7251.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -1249,6 +1249,14 @@ static int ov7251_s_stream(struct v4l2_s
+ 		if (ret < 0)
+ 			return ret;
+ 
++		ret = ov7251_set_register_array(ov7251,
++					ov7251_global_init_setting,
++					ARRAY_SIZE(ov7251_global_init_setting));
++		if (ret < 0) {
++			dev_err(ov7251->dev, "could not set global_init_setting\n");
++			goto err_power_down;
++		}
++
+ 		ret = ov7251_pll_configure(ov7251);
+ 		if (ret) {
+ 			dev_err(ov7251->dev, "error configuring PLLs\n");
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0744-media-i2c-ov7251-V4L2_CID_PIXEL_RATE-is-fixed.patch b/root/target/linux/bcm27xx/patches-5.15/950-0744-media-i2c-ov7251-V4L2_CID_PIXEL_RATE-is-fixed.patch
new file mode 100644
index 00000000..feacf603
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0744-media-i2c-ov7251-V4L2_CID_PIXEL_RATE-is-fixed.patch
@@ -0,0 +1,104 @@
+From 9a48e250947df4d220051c66da45ad62caa19e6a Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Sat, 12 Feb 2022 09:47:38 +0000
+Subject: [PATCH 744/828] media: i2c: ov7251: V4L2_CID_PIXEL_RATE is fixed
+
+The pixel rate doesn't actually change based on the mode, and
+can not be set by userspace.
+
+Fix the control. The control is already read only as set by the core.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov7251.c | 24 +++++-------------------
+ 1 file changed, 5 insertions(+), 19 deletions(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -54,6 +54,8 @@
+ #define OV7251_PLL2_SYS_DIV_REG		0x309a
+ #define OV7251_PLL2_ADC_DIV_REG		0x309b
+ 
++#define OV7251_PIXEL_CLOCK 48000000
++
+ struct reg_value {
+ 	u16 reg;
+ 	u8 val;
+@@ -64,7 +66,6 @@ struct ov7251_mode_info {
+ 	u32 height;
+ 	const struct reg_value *data;
+ 	u32 data_size;
+-	u32 pixel_clock;
+ 	u32 link_freq;
+ 	u16 exposure_max;
+ 	u16 exposure_def;
+@@ -112,7 +113,6 @@ struct ov7251 {
+ 	const struct ov7251_mode_info *current_mode;
+ 
+ 	struct v4l2_ctrl_handler ctrls;
+-	struct v4l2_ctrl *pixel_clock;
+ 	struct v4l2_ctrl *link_freq;
+ 	struct v4l2_ctrl *exposure;
+ 	struct v4l2_ctrl *gain;
+@@ -591,7 +591,6 @@ static const struct ov7251_mode_info ov7
+ 		.height = 480,
+ 		.data = ov7251_setting_vga_30fps,
+ 		.data_size = ARRAY_SIZE(ov7251_setting_vga_30fps),
+-		.pixel_clock = 48000000,
+ 		.link_freq = 0, /* an index in link_freq[] */
+ 		.exposure_max = 1704,
+ 		.exposure_def = 504,
+@@ -605,7 +604,6 @@ static const struct ov7251_mode_info ov7
+ 		.height = 480,
+ 		.data = ov7251_setting_vga_60fps,
+ 		.data_size = ARRAY_SIZE(ov7251_setting_vga_60fps),
+-		.pixel_clock = 48000000,
+ 		.link_freq = 0, /* an index in link_freq[] */
+ 		.exposure_max = 840,
+ 		.exposure_def = 504,
+@@ -619,7 +617,6 @@ static const struct ov7251_mode_info ov7
+ 		.height = 480,
+ 		.data = ov7251_setting_vga_90fps,
+ 		.data_size = ARRAY_SIZE(ov7251_setting_vga_90fps),
+-		.pixel_clock = 48000000,
+ 		.link_freq = 0, /* an index in link_freq[] */
+ 		.exposure_max = 552,
+ 		.exposure_def = 504,
+@@ -1155,11 +1152,6 @@ static int ov7251_set_format(struct v4l2
+ 	__crop->height = new_mode->height;
+ 
+ 	if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
+-		ret = __v4l2_ctrl_s_ctrl_int64(ov7251->pixel_clock,
+-					       new_mode->pixel_clock);
+-		if (ret < 0)
+-			goto exit;
+-
+ 		ret = __v4l2_ctrl_s_ctrl(ov7251->link_freq,
+ 					 new_mode->link_freq);
+ 		if (ret < 0)
+@@ -1319,11 +1311,6 @@ static int ov7251_set_frame_interval(str
+ 	new_mode = ov7251_find_mode_by_ival(ov7251, &fi->interval);
+ 
+ 	if (new_mode != ov7251->current_mode) {
+-		ret = __v4l2_ctrl_s_ctrl_int64(ov7251->pixel_clock,
+-					       new_mode->pixel_clock);
+-		if (ret < 0)
+-			goto exit;
+-
+ 		ret = __v4l2_ctrl_s_ctrl(ov7251->link_freq,
+ 					 new_mode->link_freq);
+ 		if (ret < 0)
+@@ -1571,10 +1558,9 @@ static int ov7251_probe(struct i2c_clien
+ 				     V4L2_CID_TEST_PATTERN,
+ 				     ARRAY_SIZE(ov7251_test_pattern_menu) - 1,
+ 				     0, 0, ov7251_test_pattern_menu);
+-	ov7251->pixel_clock = v4l2_ctrl_new_std(&ov7251->ctrls,
+-						&ov7251_ctrl_ops,
+-						V4L2_CID_PIXEL_RATE,
+-						1, INT_MAX, 1, 1);
++	v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
++			  V4L2_CID_PIXEL_RATE, OV7251_PIXEL_CLOCK,
++			  OV7251_PIXEL_CLOCK, 1, OV7251_PIXEL_CLOCK);
+ 	ov7251->link_freq = v4l2_ctrl_new_int_menu(&ov7251->ctrls,
+ 						   &ov7251_ctrl_ops,
+ 						   V4L2_CID_LINK_FREQ,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0745-media-i2c-ov7251-V4L2_CID_LINK_FREQUENCY-is-fixed.patch b/root/target/linux/bcm27xx/patches-5.15/950-0745-media-i2c-ov7251-V4L2_CID_LINK_FREQUENCY-is-fixed.patch
new file mode 100644
index 00000000..0c4945b3
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0745-media-i2c-ov7251-V4L2_CID_LINK_FREQUENCY-is-fixed.patch
@@ -0,0 +1,107 @@
+From 387b0cc27221b807b0b68e94d12c36edf048e537 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Sat, 12 Feb 2022 09:53:47 +0000
+Subject: [PATCH 745/828] media: i2c: ov7251: V4L2_CID_LINK_FREQUENCY is fixed
+
+The link frequency does not change with the mode, so remove
+the special handling for it.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov7251.c | 29 +++++++----------------------
+ 1 file changed, 7 insertions(+), 22 deletions(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -66,7 +66,6 @@ struct ov7251_mode_info {
+ 	u32 height;
+ 	const struct reg_value *data;
+ 	u32 data_size;
+-	u32 link_freq;
+ 	u16 exposure_max;
+ 	u16 exposure_def;
+ 	struct v4l2_fract timeperframe;
+@@ -113,7 +112,6 @@ struct ov7251 {
+ 	const struct ov7251_mode_info *current_mode;
+ 
+ 	struct v4l2_ctrl_handler ctrls;
+-	struct v4l2_ctrl *link_freq;
+ 	struct v4l2_ctrl *exposure;
+ 	struct v4l2_ctrl *gain;
+ 
+@@ -591,7 +589,6 @@ static const struct ov7251_mode_info ov7
+ 		.height = 480,
+ 		.data = ov7251_setting_vga_30fps,
+ 		.data_size = ARRAY_SIZE(ov7251_setting_vga_30fps),
+-		.link_freq = 0, /* an index in link_freq[] */
+ 		.exposure_max = 1704,
+ 		.exposure_def = 504,
+ 		.timeperframe = {
+@@ -604,7 +601,6 @@ static const struct ov7251_mode_info ov7
+ 		.height = 480,
+ 		.data = ov7251_setting_vga_60fps,
+ 		.data_size = ARRAY_SIZE(ov7251_setting_vga_60fps),
+-		.link_freq = 0, /* an index in link_freq[] */
+ 		.exposure_max = 840,
+ 		.exposure_def = 504,
+ 		.timeperframe = {
+@@ -617,7 +613,6 @@ static const struct ov7251_mode_info ov7
+ 		.height = 480,
+ 		.data = ov7251_setting_vga_90fps,
+ 		.data_size = ARRAY_SIZE(ov7251_setting_vga_90fps),
+-		.link_freq = 0, /* an index in link_freq[] */
+ 		.exposure_max = 552,
+ 		.exposure_def = 504,
+ 		.timeperframe = {
+@@ -1152,11 +1147,6 @@ static int ov7251_set_format(struct v4l2
+ 	__crop->height = new_mode->height;
+ 
+ 	if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
+-		ret = __v4l2_ctrl_s_ctrl(ov7251->link_freq,
+-					 new_mode->link_freq);
+-		if (ret < 0)
+-			goto exit;
+-
+ 		ret = __v4l2_ctrl_modify_range(ov7251->exposure,
+ 					       1, new_mode->exposure_max,
+ 					       1, new_mode->exposure_def);
+@@ -1311,11 +1301,6 @@ static int ov7251_set_frame_interval(str
+ 	new_mode = ov7251_find_mode_by_ival(ov7251, &fi->interval);
+ 
+ 	if (new_mode != ov7251->current_mode) {
+-		ret = __v4l2_ctrl_s_ctrl(ov7251->link_freq,
+-					 new_mode->link_freq);
+-		if (ret < 0)
+-			goto exit;
+-
+ 		ret = __v4l2_ctrl_modify_range(ov7251->exposure,
+ 					       1, new_mode->exposure_max,
+ 					       1, new_mode->exposure_def);
+@@ -1464,6 +1449,7 @@ static int ov7251_probe(struct i2c_clien
+ {
+ 	struct v4l2_fwnode_device_properties props;
+ 	struct device *dev = &client->dev;
++	struct v4l2_ctrl *ctrl;
+ 	struct ov7251 *ov7251;
+ 	unsigned int rate = 0;
+ 	int ret;
+@@ -1561,13 +1547,12 @@ static int ov7251_probe(struct i2c_clien
+ 	v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
+ 			  V4L2_CID_PIXEL_RATE, OV7251_PIXEL_CLOCK,
+ 			  OV7251_PIXEL_CLOCK, 1, OV7251_PIXEL_CLOCK);
+-	ov7251->link_freq = v4l2_ctrl_new_int_menu(&ov7251->ctrls,
+-						   &ov7251_ctrl_ops,
+-						   V4L2_CID_LINK_FREQ,
+-						   ARRAY_SIZE(link_freq) - 1,
+-						   0, link_freq);
+-	if (ov7251->link_freq)
+-		ov7251->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
++	ctrl = v4l2_ctrl_new_int_menu(&ov7251->ctrls, &ov7251_ctrl_ops,
++				      V4L2_CID_LINK_FREQ,
++				      ARRAY_SIZE(link_freq) - 1,
++				      0, link_freq);
++	if (ctrl)
++		ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
+ 
+ 	ov7251->sd.ctrl_handler = &ov7251->ctrls;
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0746-media-i2c-ov7251-Initialise-current_mode-during-prob.patch b/root/target/linux/bcm27xx/patches-5.15/950-0746-media-i2c-ov7251-Initialise-current_mode-during-prob.patch
new file mode 100644
index 00000000..28bdbb17
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0746-media-i2c-ov7251-Initialise-current_mode-during-prob.patch
@@ -0,0 +1,26 @@
+From dab58d9041365a55d821f57bc4837b929abc5c35 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Sat, 12 Feb 2022 11:57:19 +0000
+Subject: [PATCH 746/828] media: i2c: ov7251: Initialise current_mode during
+ probe
+
+Initialise ov7251->current_mode during probe to avoid the issue
+of a NULL dereference should get_frame_interval be called before
+set_frame_interval or set_format.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov7251.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -1529,6 +1529,8 @@ static int ov7251_probe(struct i2c_clien
+ 
+ 	mutex_init(&ov7251->lock);
+ 
++	ov7251->current_mode = &ov7251_mode_info_data[0];
++
+ 	v4l2_ctrl_handler_init(&ov7251->ctrls, 9);
+ 	ov7251->ctrls.lock = &ov7251->lock;
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0747-media-i2c-ov7251-Add-V4L2_CID_HBLANK-control.patch b/root/target/linux/bcm27xx/patches-5.15/950-0747-media-i2c-ov7251-Add-V4L2_CID_HBLANK-control.patch
new file mode 100644
index 00000000..e3fd414b
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0747-media-i2c-ov7251-Add-V4L2_CID_HBLANK-control.patch
@@ -0,0 +1,85 @@
+From e9a3e44c8fdb4e8ed724b0243198fe91aca77c6a Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Sat, 12 Feb 2022 12:05:02 +0000
+Subject: [PATCH 747/828] media: i2c: ov7251: Add V4L2_CID_HBLANK control
+
+HBLANK is a fixed value in this driver, so add as a fixed
+read-only control.
+The value is updated during set_format as the V4L2 control is
+dependent on width, even though only one width is actually
+defined.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov7251.c | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -37,6 +37,8 @@
+ #define OV7251_AEC_EXPO_2		0x3502
+ #define OV7251_AEC_AGC_ADJ_0		0x350a
+ #define OV7251_AEC_AGC_ADJ_1		0x350b
++ /* HTS is registers 0x380c and 0x380d */
++#define OV7251_HTS			0x3a0
+ #define OV7251_TIMING_FORMAT1		0x3820
+ #define OV7251_TIMING_FORMAT1_VFLIP	BIT(2)
+ #define OV7251_TIMING_FORMAT2		0x3821
+@@ -114,6 +116,7 @@ struct ov7251 {
+ 	struct v4l2_ctrl_handler ctrls;
+ 	struct v4l2_ctrl *exposure;
+ 	struct v4l2_ctrl *gain;
++	struct v4l2_ctrl *hblank;
+ 
+ 	/* Cached register values */
+ 	u8 aec_pk_manual;
+@@ -1131,6 +1134,7 @@ static int ov7251_set_format(struct v4l2
+ 	struct v4l2_mbus_framefmt *__format;
+ 	struct v4l2_rect *__crop;
+ 	const struct ov7251_mode_info *new_mode;
++	s64 h_blank;
+ 	int ret = 0;
+ 
+ 	mutex_lock(&ov7251->lock);
+@@ -1147,6 +1151,11 @@ static int ov7251_set_format(struct v4l2
+ 	__crop->height = new_mode->height;
+ 
+ 	if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
++		h_blank = OV7251_HTS - new_mode->width;
++		__v4l2_ctrl_modify_range(ov7251->hblank, h_blank,
++					 h_blank, 1, h_blank);
++		__v4l2_ctrl_s_ctrl(ov7251->hblank, h_blank);
++
+ 		ret = __v4l2_ctrl_modify_range(ov7251->exposure,
+ 					       1, new_mode->exposure_max,
+ 					       1, new_mode->exposure_def);
+@@ -1452,6 +1461,7 @@ static int ov7251_probe(struct i2c_clien
+ 	struct v4l2_ctrl *ctrl;
+ 	struct ov7251 *ov7251;
+ 	unsigned int rate = 0;
++	u32 h_blank;
+ 	int ret;
+ 	int i;
+ 
+@@ -1531,7 +1541,7 @@ static int ov7251_probe(struct i2c_clien
+ 
+ 	ov7251->current_mode = &ov7251_mode_info_data[0];
+ 
+-	v4l2_ctrl_handler_init(&ov7251->ctrls, 9);
++	v4l2_ctrl_handler_init(&ov7251->ctrls, 10);
+ 	ov7251->ctrls.lock = &ov7251->lock;
+ 
+ 	v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
+@@ -1555,6 +1565,12 @@ static int ov7251_probe(struct i2c_clien
+ 				      0, link_freq);
+ 	if (ctrl)
+ 		ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
++	h_blank = OV7251_HTS - ov7251->current_mode->width;
++	ov7251->hblank = v4l2_ctrl_new_std(&ov7251->ctrls, NULL,
++					   V4L2_CID_HBLANK, h_blank,
++					   h_blank, 1, h_blank);
++	if (ov7251->hblank)
++		ov7251->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
+ 
+ 	ov7251->sd.ctrl_handler = &ov7251->ctrls;
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0748-media-i2c-ov7251-Do-not-reset-gain-on-mode-change.patch b/root/target/linux/bcm27xx/patches-5.15/950-0748-media-i2c-ov7251-Do-not-reset-gain-on-mode-change.patch
new file mode 100644
index 00000000..50c75c9e
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0748-media-i2c-ov7251-Do-not-reset-gain-on-mode-change.patch
@@ -0,0 +1,58 @@
+From a23c8ac6400abc554e92b7e1e763f241e5328b18 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Sat, 12 Feb 2022 12:33:13 +0000
+Subject: [PATCH 748/828] media: i2c: ov7251: Do not reset gain on mode change
+
+There is no reaon why changing mode should reset the analogue
+gain of the sensor, and it's not the behaviour that userspace
+will be expecting.
+Remove the reset.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov7251.c | 13 ++-----------
+ 1 file changed, 2 insertions(+), 11 deletions(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -115,7 +115,6 @@ struct ov7251 {
+ 
+ 	struct v4l2_ctrl_handler ctrls;
+ 	struct v4l2_ctrl *exposure;
+-	struct v4l2_ctrl *gain;
+ 	struct v4l2_ctrl *hblank;
+ 
+ 	/* Cached register values */
+@@ -1167,10 +1166,6 @@ static int ov7251_set_format(struct v4l2
+ 		if (ret < 0)
+ 			goto exit;
+ 
+-		ret = __v4l2_ctrl_s_ctrl(ov7251->gain, 16);
+-		if (ret < 0)
+-			goto exit;
+-
+ 		ov7251->current_mode = new_mode;
+ 	}
+ 
+@@ -1321,10 +1316,6 @@ static int ov7251_set_frame_interval(str
+ 		if (ret < 0)
+ 			goto exit;
+ 
+-		ret = __v4l2_ctrl_s_ctrl(ov7251->gain, 16);
+-		if (ret < 0)
+-			goto exit;
+-
+ 		ov7251->current_mode = new_mode;
+ 	}
+ 
+@@ -1550,8 +1541,8 @@ static int ov7251_probe(struct i2c_clien
+ 			  V4L2_CID_VFLIP, 0, 1, 1, 0);
+ 	ov7251->exposure = v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
+ 					     V4L2_CID_EXPOSURE, 1, 32, 1, 32);
+-	ov7251->gain = v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
+-					 V4L2_CID_GAIN, 16, 1023, 1, 16);
++	v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops, V4L2_CID_GAIN,
++			  16, 1023, 1, 16);
+ 	v4l2_ctrl_new_std_menu_items(&ov7251->ctrls, &ov7251_ctrl_ops,
+ 				     V4L2_CID_TEST_PATTERN,
+ 				     ARRAY_SIZE(ov7251_test_pattern_menu) - 1,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0749-media-i2c-ov7251-Fix-link_freq-validation-loop.patch b/root/target/linux/bcm27xx/patches-5.15/950-0749-media-i2c-ov7251-Fix-link_freq-validation-loop.patch
new file mode 100644
index 00000000..e9c6af7b
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0749-media-i2c-ov7251-Fix-link_freq-validation-loop.patch
@@ -0,0 +1,33 @@
+From 05441ef40d0fc9c01879fa6909f6b8fac451569f Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 17 Feb 2022 15:57:01 +0000
+Subject: [PATCH 749/828] media: i2c: ov7251: Fix link_freq validation loop
+
+If only one link frequency was configured, then ov7251_check_hwcfg
+failed as the conditions weren't checked in the appropriate places.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov7251.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -1390,14 +1390,14 @@ static int ov7251_check_hwcfg(struct ov7
+ 
+ 	freq_found = false;
+ 	for (i = 0; i < bus_cfg.nr_of_link_frequencies; i++) {
+-		if (freq_found)
+-			break;
+-
+ 		for (j = 0; j < ARRAY_SIZE(link_freq); j++)
+ 			if (bus_cfg.link_frequencies[i] == link_freq[j]) {
+ 				freq_found = true;
+ 				break;
+ 			}
++
++		if (freq_found)
++			break;
+ 	}
+ 
+ 	if (i == bus_cfg.nr_of_link_frequencies) {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0750-media-i2c-ov7251-Add-get_selection-for-NATIVE_SIZE-C.patch b/root/target/linux/bcm27xx/patches-5.15/950-0750-media-i2c-ov7251-Add-get_selection-for-NATIVE_SIZE-C.patch
new file mode 100644
index 00000000..07a23181
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0750-media-i2c-ov7251-Add-get_selection-for-NATIVE_SIZE-C.patch
@@ -0,0 +1,78 @@
+From a10cff455299c60b272e231e22557561ec49a329 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 17 Feb 2022 16:23:23 +0000
+Subject: [PATCH 750/828] media: i2c: ov7251: Add get_selection for
+ NATIVE_SIZE, CROP_BOUNDS, CROP_DEFAULT
+
+As required by libcamera, add get_selection handling for
+V4L2_SEL_TGT_NATIVE_SIZE, V4L2_SEL_TGT_CROP_DEFAULT, and
+V4L2_SEL_TGT_CROP_BOUNDS.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov7251.c | 45 ++++++++++++++++++++++++++++++++------
+ 1 file changed, 38 insertions(+), 7 deletions(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -56,6 +56,18 @@
+ #define OV7251_PLL2_SYS_DIV_REG		0x309a
+ #define OV7251_PLL2_ADC_DIV_REG		0x309b
+ 
++/*
++ * OV7251 native and active pixel array size.
++ * Datasheet not available to confirm these values, so assume there are no
++ * border pixels.
++ */
++#define OV7251_NATIVE_WIDTH		640U
++#define OV7251_NATIVE_HEIGHT		480U
++#define OV7251_PIXEL_ARRAY_LEFT		0U
++#define OV7251_PIXEL_ARRAY_TOP		0U
++#define OV7251_PIXEL_ARRAY_WIDTH	640U
++#define OV7251_PIXEL_ARRAY_HEIGHT	480U
++
+ #define OV7251_PIXEL_CLOCK 48000000
+ 
+ struct reg_value {
+@@ -1212,15 +1224,34 @@ static int ov7251_get_selection(struct v
+ {
+ 	struct ov7251 *ov7251 = to_ov7251(sd);
+ 
+-	if (sel->target != V4L2_SEL_TGT_CROP)
+-		return -EINVAL;
++	switch (sel->target) {
++	case V4L2_SEL_TGT_CROP:
++		mutex_lock(&ov7251->lock);
++		sel->r = *__ov7251_get_pad_crop(ov7251, sd_state, sel->pad,
++						sel->which);
++		mutex_unlock(&ov7251->lock);
+ 
+-	mutex_lock(&ov7251->lock);
+-	sel->r = *__ov7251_get_pad_crop(ov7251, sd_state, sel->pad,
+-					sel->which);
+-	mutex_unlock(&ov7251->lock);
++		return 0;
+ 
+-	return 0;
++	case V4L2_SEL_TGT_NATIVE_SIZE:
++		sel->r.top = 0;
++		sel->r.left = 0;
++		sel->r.width = OV7251_NATIVE_WIDTH;
++		sel->r.height = OV7251_NATIVE_HEIGHT;
++
++		return 0;
++
++	case V4L2_SEL_TGT_CROP_DEFAULT:
++	case V4L2_SEL_TGT_CROP_BOUNDS:
++		sel->r.top = OV7251_PIXEL_ARRAY_TOP;
++		sel->r.left = OV7251_PIXEL_ARRAY_LEFT;
++		sel->r.width = OV7251_PIXEL_ARRAY_WIDTH;
++		sel->r.height = OV7251_PIXEL_ARRAY_HEIGHT;
++
++		return 0;
++	}
++
++	return -EINVAL;
+ }
+ 
+ static int ov7251_s_stream(struct v4l2_subdev *subdev, int enable)
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0751-media-i2c-ov7251-Set-VTS-instead-of-having-full-tabl.patch b/root/target/linux/bcm27xx/patches-5.15/950-0751-media-i2c-ov7251-Set-VTS-instead-of-having-full-tabl.patch
new file mode 100644
index 00000000..7d0d582e
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0751-media-i2c-ov7251-Set-VTS-instead-of-having-full-tabl.patch
@@ -0,0 +1,373 @@
+From 7e55e7793b19ec6b82ef4a22e964cdd32c0b96c1 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 17 Feb 2022 16:24:51 +0000
+Subject: [PATCH 751/828] media: i2c: ov7251: Set VTS instead of having full
+ tables for FPS.
+
+The driver did have a full copy of the registers for each of
+the 30, 60, and 90 fps modes. The main difference between them were
+registers 0x380e/f which set the total height of the frame (VTS).
+
+Remove the excess register settings, and Set that register value
+explicitly for each mode.
+
+This has dropped a change for the 30fps mode to registers 0x3016,
+0x3017, 0x3018, 0x301a, 0x301b, and 0x301c. The data available
+doesn't describe these registers, but the sensor seems fully
+functional without the alternate settings.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov7251.c | 286 +++----------------------------------
+ 1 file changed, 21 insertions(+), 265 deletions(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -39,6 +39,8 @@
+ #define OV7251_AEC_AGC_ADJ_1		0x350b
+  /* HTS is registers 0x380c and 0x380d */
+ #define OV7251_HTS			0x3a0
++#define OV7251_VTS_HIGH			0x380e
++#define OV7251_VTS_LOW			0x380f
+ #define OV7251_TIMING_FORMAT1		0x3820
+ #define OV7251_TIMING_FORMAT1_VFLIP	BIT(2)
+ #define OV7251_TIMING_FORMAT2		0x3821
+@@ -82,6 +84,7 @@ struct ov7251_mode_info {
+ 	u32 data_size;
+ 	u16 exposure_max;
+ 	u16 exposure_def;
++	u16 vts;
+ 	struct v4l2_fract timeperframe;
+ };
+ 
+@@ -204,263 +207,7 @@ static const struct reg_value ov7251_glo
+ 	{ 0x303b, 0x02 },
+ };
+ 
+-static const struct reg_value ov7251_setting_vga_30fps[] = {
+-	{ 0x3005, 0x00 },
+-	{ 0x3012, 0xc0 },
+-	{ 0x3013, 0xd2 },
+-	{ 0x3014, 0x04 },
+-	{ 0x3016, 0xf0 },
+-	{ 0x3017, 0xf0 },
+-	{ 0x3018, 0xf0 },
+-	{ 0x301a, 0xf0 },
+-	{ 0x301b, 0xf0 },
+-	{ 0x301c, 0xf0 },
+-	{ 0x3023, 0x05 },
+-	{ 0x3037, 0xf0 },
+-	{ 0x3106, 0xda },
+-	{ 0x3503, 0x07 },
+-	{ 0x3509, 0x10 },
+-	{ 0x3600, 0x1c },
+-	{ 0x3602, 0x62 },
+-	{ 0x3620, 0xb7 },
+-	{ 0x3622, 0x04 },
+-	{ 0x3626, 0x21 },
+-	{ 0x3627, 0x30 },
+-	{ 0x3630, 0x44 },
+-	{ 0x3631, 0x35 },
+-	{ 0x3634, 0x60 },
+-	{ 0x3636, 0x00 },
+-	{ 0x3662, 0x01 },
+-	{ 0x3663, 0x70 },
+-	{ 0x3664, 0x50 },
+-	{ 0x3666, 0x0a },
+-	{ 0x3669, 0x1a },
+-	{ 0x366a, 0x00 },
+-	{ 0x366b, 0x50 },
+-	{ 0x3673, 0x01 },
+-	{ 0x3674, 0xff },
+-	{ 0x3675, 0x03 },
+-	{ 0x3705, 0xc1 },
+-	{ 0x3709, 0x40 },
+-	{ 0x373c, 0x08 },
+-	{ 0x3742, 0x00 },
+-	{ 0x3757, 0xb3 },
+-	{ 0x3788, 0x00 },
+-	{ 0x37a8, 0x01 },
+-	{ 0x37a9, 0xc0 },
+-	{ 0x3800, 0x00 },
+-	{ 0x3801, 0x04 },
+-	{ 0x3802, 0x00 },
+-	{ 0x3803, 0x04 },
+-	{ 0x3804, 0x02 },
+-	{ 0x3805, 0x8b },
+-	{ 0x3806, 0x01 },
+-	{ 0x3807, 0xeb },
+-	{ 0x3808, 0x02 }, /* width high */
+-	{ 0x3809, 0x80 }, /* width low */
+-	{ 0x380a, 0x01 }, /* height high */
+-	{ 0x380b, 0xe0 }, /* height low */
+-	{ 0x380c, 0x03 }, /* total horiz timing high */
+-	{ 0x380d, 0xa0 }, /* total horiz timing low */
+-	{ 0x380e, 0x06 }, /* total vertical timing high */
+-	{ 0x380f, 0xbc }, /* total vertical timing low */
+-	{ 0x3810, 0x00 },
+-	{ 0x3811, 0x04 },
+-	{ 0x3812, 0x00 },
+-	{ 0x3813, 0x05 },
+-	{ 0x3814, 0x11 },
+-	{ 0x3815, 0x11 },
+-	{ 0x3820, 0x40 },
+-	{ 0x3821, 0x00 },
+-	{ 0x382f, 0x0e },
+-	{ 0x3832, 0x00 },
+-	{ 0x3833, 0x05 },
+-	{ 0x3834, 0x00 },
+-	{ 0x3835, 0x0c },
+-	{ 0x3837, 0x00 },
+-	{ 0x3b80, 0x00 },
+-	{ 0x3b81, 0xa5 },
+-	{ 0x3b82, 0x10 },
+-	{ 0x3b83, 0x00 },
+-	{ 0x3b84, 0x08 },
+-	{ 0x3b85, 0x00 },
+-	{ 0x3b86, 0x01 },
+-	{ 0x3b87, 0x00 },
+-	{ 0x3b88, 0x00 },
+-	{ 0x3b89, 0x00 },
+-	{ 0x3b8a, 0x00 },
+-	{ 0x3b8b, 0x05 },
+-	{ 0x3b8c, 0x00 },
+-	{ 0x3b8d, 0x00 },
+-	{ 0x3b8e, 0x00 },
+-	{ 0x3b8f, 0x1a },
+-	{ 0x3b94, 0x05 },
+-	{ 0x3b95, 0xf2 },
+-	{ 0x3b96, 0x40 },
+-	{ 0x3c00, 0x89 },
+-	{ 0x3c01, 0x63 },
+-	{ 0x3c02, 0x01 },
+-	{ 0x3c03, 0x00 },
+-	{ 0x3c04, 0x00 },
+-	{ 0x3c05, 0x03 },
+-	{ 0x3c06, 0x00 },
+-	{ 0x3c07, 0x06 },
+-	{ 0x3c0c, 0x01 },
+-	{ 0x3c0d, 0xd0 },
+-	{ 0x3c0e, 0x02 },
+-	{ 0x3c0f, 0x0a },
+-	{ 0x4001, 0x42 },
+-	{ 0x4004, 0x04 },
+-	{ 0x4005, 0x00 },
+-	{ 0x404e, 0x01 },
+-	{ 0x4300, 0xff },
+-	{ 0x4301, 0x00 },
+-	{ 0x4315, 0x00 },
+-	{ 0x4501, 0x48 },
+-	{ 0x4600, 0x00 },
+-	{ 0x4601, 0x4e },
+-	{ 0x4801, 0x0f },
+-	{ 0x4806, 0x0f },
+-	{ 0x4819, 0xaa },
+-	{ 0x4823, 0x3e },
+-	{ 0x4837, 0x19 },
+-	{ 0x4a0d, 0x00 },
+-	{ 0x4a47, 0x7f },
+-	{ 0x4a49, 0xf0 },
+-	{ 0x4a4b, 0x30 },
+-	{ 0x5000, 0x85 },
+-	{ 0x5001, 0x80 },
+-};
+-
+-static const struct reg_value ov7251_setting_vga_60fps[] = {
+-	{ 0x3005, 0x00 },
+-	{ 0x3012, 0xc0 },
+-	{ 0x3013, 0xd2 },
+-	{ 0x3014, 0x04 },
+-	{ 0x3016, 0x10 },
+-	{ 0x3017, 0x00 },
+-	{ 0x3018, 0x00 },
+-	{ 0x301a, 0x00 },
+-	{ 0x301b, 0x00 },
+-	{ 0x301c, 0x00 },
+-	{ 0x3023, 0x05 },
+-	{ 0x3037, 0xf0 },
+-	{ 0x3106, 0xda },
+-	{ 0x3503, 0x07 },
+-	{ 0x3509, 0x10 },
+-	{ 0x3600, 0x1c },
+-	{ 0x3602, 0x62 },
+-	{ 0x3620, 0xb7 },
+-	{ 0x3622, 0x04 },
+-	{ 0x3626, 0x21 },
+-	{ 0x3627, 0x30 },
+-	{ 0x3630, 0x44 },
+-	{ 0x3631, 0x35 },
+-	{ 0x3634, 0x60 },
+-	{ 0x3636, 0x00 },
+-	{ 0x3662, 0x01 },
+-	{ 0x3663, 0x70 },
+-	{ 0x3664, 0x50 },
+-	{ 0x3666, 0x0a },
+-	{ 0x3669, 0x1a },
+-	{ 0x366a, 0x00 },
+-	{ 0x366b, 0x50 },
+-	{ 0x3673, 0x01 },
+-	{ 0x3674, 0xff },
+-	{ 0x3675, 0x03 },
+-	{ 0x3705, 0xc1 },
+-	{ 0x3709, 0x40 },
+-	{ 0x373c, 0x08 },
+-	{ 0x3742, 0x00 },
+-	{ 0x3757, 0xb3 },
+-	{ 0x3788, 0x00 },
+-	{ 0x37a8, 0x01 },
+-	{ 0x37a9, 0xc0 },
+-	{ 0x3800, 0x00 },
+-	{ 0x3801, 0x04 },
+-	{ 0x3802, 0x00 },
+-	{ 0x3803, 0x04 },
+-	{ 0x3804, 0x02 },
+-	{ 0x3805, 0x8b },
+-	{ 0x3806, 0x01 },
+-	{ 0x3807, 0xeb },
+-	{ 0x3808, 0x02 }, /* width high */
+-	{ 0x3809, 0x80 }, /* width low */
+-	{ 0x380a, 0x01 }, /* height high */
+-	{ 0x380b, 0xe0 }, /* height low */
+-	{ 0x380c, 0x03 }, /* total horiz timing high */
+-	{ 0x380d, 0xa0 }, /* total horiz timing low */
+-	{ 0x380e, 0x03 }, /* total vertical timing high */
+-	{ 0x380f, 0x5c }, /* total vertical timing low */
+-	{ 0x3810, 0x00 },
+-	{ 0x3811, 0x04 },
+-	{ 0x3812, 0x00 },
+-	{ 0x3813, 0x05 },
+-	{ 0x3814, 0x11 },
+-	{ 0x3815, 0x11 },
+-	{ 0x3820, 0x40 },
+-	{ 0x3821, 0x00 },
+-	{ 0x382f, 0x0e },
+-	{ 0x3832, 0x00 },
+-	{ 0x3833, 0x05 },
+-	{ 0x3834, 0x00 },
+-	{ 0x3835, 0x0c },
+-	{ 0x3837, 0x00 },
+-	{ 0x3b80, 0x00 },
+-	{ 0x3b81, 0xa5 },
+-	{ 0x3b82, 0x10 },
+-	{ 0x3b83, 0x00 },
+-	{ 0x3b84, 0x08 },
+-	{ 0x3b85, 0x00 },
+-	{ 0x3b86, 0x01 },
+-	{ 0x3b87, 0x00 },
+-	{ 0x3b88, 0x00 },
+-	{ 0x3b89, 0x00 },
+-	{ 0x3b8a, 0x00 },
+-	{ 0x3b8b, 0x05 },
+-	{ 0x3b8c, 0x00 },
+-	{ 0x3b8d, 0x00 },
+-	{ 0x3b8e, 0x00 },
+-	{ 0x3b8f, 0x1a },
+-	{ 0x3b94, 0x05 },
+-	{ 0x3b95, 0xf2 },
+-	{ 0x3b96, 0x40 },
+-	{ 0x3c00, 0x89 },
+-	{ 0x3c01, 0x63 },
+-	{ 0x3c02, 0x01 },
+-	{ 0x3c03, 0x00 },
+-	{ 0x3c04, 0x00 },
+-	{ 0x3c05, 0x03 },
+-	{ 0x3c06, 0x00 },
+-	{ 0x3c07, 0x06 },
+-	{ 0x3c0c, 0x01 },
+-	{ 0x3c0d, 0xd0 },
+-	{ 0x3c0e, 0x02 },
+-	{ 0x3c0f, 0x0a },
+-	{ 0x4001, 0x42 },
+-	{ 0x4004, 0x04 },
+-	{ 0x4005, 0x00 },
+-	{ 0x404e, 0x01 },
+-	{ 0x4300, 0xff },
+-	{ 0x4301, 0x00 },
+-	{ 0x4315, 0x00 },
+-	{ 0x4501, 0x48 },
+-	{ 0x4600, 0x00 },
+-	{ 0x4601, 0x4e },
+-	{ 0x4801, 0x0f },
+-	{ 0x4806, 0x0f },
+-	{ 0x4819, 0xaa },
+-	{ 0x4823, 0x3e },
+-	{ 0x4837, 0x19 },
+-	{ 0x4a0d, 0x00 },
+-	{ 0x4a47, 0x7f },
+-	{ 0x4a49, 0xf0 },
+-	{ 0x4a4b, 0x30 },
+-	{ 0x5000, 0x85 },
+-	{ 0x5001, 0x80 },
+-};
+-
+-static const struct reg_value ov7251_setting_vga_90fps[] = {
++static const struct reg_value ov7251_setting_vga[] = {
+ 	{ 0x3005, 0x00 },
+ 	{ 0x3012, 0xc0 },
+ 	{ 0x3013, 0xd2 },
+@@ -518,8 +265,6 @@ static const struct reg_value ov7251_set
+ 	{ 0x380b, 0xe0 }, /* height low */
+ 	{ 0x380c, 0x03 }, /* total horiz timing high */
+ 	{ 0x380d, 0xa0 }, /* total horiz timing low */
+-	{ 0x380e, 0x02 }, /* total vertical timing high */
+-	{ 0x380f, 0x3c }, /* total vertical timing low */
+ 	{ 0x3810, 0x00 },
+ 	{ 0x3811, 0x04 },
+ 	{ 0x3812, 0x00 },
+@@ -601,10 +346,11 @@ static const struct ov7251_mode_info ov7
+ 	{
+ 		.width = 640,
+ 		.height = 480,
+-		.data = ov7251_setting_vga_30fps,
+-		.data_size = ARRAY_SIZE(ov7251_setting_vga_30fps),
++		.data = ov7251_setting_vga,
++		.data_size = ARRAY_SIZE(ov7251_setting_vga),
+ 		.exposure_max = 1704,
+ 		.exposure_def = 504,
++		.vts = 0x6bc,
+ 		.timeperframe = {
+ 			.numerator = 100,
+ 			.denominator = 3000
+@@ -613,10 +359,11 @@ static const struct ov7251_mode_info ov7
+ 	{
+ 		.width = 640,
+ 		.height = 480,
+-		.data = ov7251_setting_vga_60fps,
+-		.data_size = ARRAY_SIZE(ov7251_setting_vga_60fps),
++		.data = ov7251_setting_vga,
++		.data_size = ARRAY_SIZE(ov7251_setting_vga),
+ 		.exposure_max = 840,
+ 		.exposure_def = 504,
++		.vts = 0x35c,
+ 		.timeperframe = {
+ 			.numerator = 100,
+ 			.denominator = 6014
+@@ -625,10 +372,11 @@ static const struct ov7251_mode_info ov7
+ 	{
+ 		.width = 640,
+ 		.height = 480,
+-		.data = ov7251_setting_vga_90fps,
+-		.data_size = ARRAY_SIZE(ov7251_setting_vga_90fps),
++		.data = ov7251_setting_vga,
++		.data_size = ARRAY_SIZE(ov7251_setting_vga),
+ 		.exposure_max = 552,
+ 		.exposure_def = 504,
++		.vts = 0x23c,
+ 		.timeperframe = {
+ 			.numerator = 100,
+ 			.denominator = 9043
+@@ -1289,6 +1037,14 @@ static int ov7251_s_stream(struct v4l2_s
+ 				ov7251->current_mode->height);
+ 			goto err_power_down;
+ 		}
++		ret = ov7251_write_reg(ov7251, OV7251_VTS_HIGH,
++				       ov7251->current_mode->vts >> 8);
++		if (ret)
++			goto err_power_down;
++		ret = ov7251_write_reg(ov7251, OV7251_VTS_LOW,
++				       ov7251->current_mode->vts & 0xff);
++		if (ret)
++			goto err_power_down;
+ 		ret = __v4l2_ctrl_handler_setup(&ov7251->ctrls);
+ 		if (ret < 0) {
+ 			dev_err(ov7251->dev, "could not sync v4l2 controls\n");
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0752-media-i2c-ov7251-Limit-exposure-based-on-VTS.patch b/root/target/linux/bcm27xx/patches-5.15/950-0752-media-i2c-ov7251-Limit-exposure-based-on-VTS.patch
new file mode 100644
index 00000000..7f133ec8
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0752-media-i2c-ov7251-Limit-exposure-based-on-VTS.patch
@@ -0,0 +1,78 @@
+From b4872742474ca62a22dc4e086c1f261255970697 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 17 Feb 2022 16:44:33 +0000
+Subject: [PATCH 752/828] media: i2c: ov7251: Limit exposure based on VTS
+
+The maximum exposure is dictated by VTS, so compute it rather
+than having the value in the mode table.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov7251.c | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -37,6 +37,8 @@
+ #define OV7251_AEC_EXPO_2		0x3502
+ #define OV7251_AEC_AGC_ADJ_0		0x350a
+ #define OV7251_AEC_AGC_ADJ_1		0x350b
++/* Exposure must be at least 20 lines shorter than VTS */
++#define OV7251_EXPOSURE_OFFSET		20
+  /* HTS is registers 0x380c and 0x380d */
+ #define OV7251_HTS			0x3a0
+ #define OV7251_VTS_HIGH			0x380e
+@@ -82,7 +84,6 @@ struct ov7251_mode_info {
+ 	u32 height;
+ 	const struct reg_value *data;
+ 	u32 data_size;
+-	u16 exposure_max;
+ 	u16 exposure_def;
+ 	u16 vts;
+ 	struct v4l2_fract timeperframe;
+@@ -348,7 +349,6 @@ static const struct ov7251_mode_info ov7
+ 		.height = 480,
+ 		.data = ov7251_setting_vga,
+ 		.data_size = ARRAY_SIZE(ov7251_setting_vga),
+-		.exposure_max = 1704,
+ 		.exposure_def = 504,
+ 		.vts = 0x6bc,
+ 		.timeperframe = {
+@@ -361,7 +361,6 @@ static const struct ov7251_mode_info ov7
+ 		.height = 480,
+ 		.data = ov7251_setting_vga,
+ 		.data_size = ARRAY_SIZE(ov7251_setting_vga),
+-		.exposure_max = 840,
+ 		.exposure_def = 504,
+ 		.vts = 0x35c,
+ 		.timeperframe = {
+@@ -374,7 +373,6 @@ static const struct ov7251_mode_info ov7
+ 		.height = 480,
+ 		.data = ov7251_setting_vga,
+ 		.data_size = ARRAY_SIZE(ov7251_setting_vga),
+-		.exposure_max = 552,
+ 		.exposure_def = 504,
+ 		.vts = 0x23c,
+ 		.timeperframe = {
+@@ -915,8 +913,8 @@ static int ov7251_set_format(struct v4l2
+ 					 h_blank, 1, h_blank);
+ 		__v4l2_ctrl_s_ctrl(ov7251->hblank, h_blank);
+ 
+-		ret = __v4l2_ctrl_modify_range(ov7251->exposure,
+-					       1, new_mode->exposure_max,
++		ret = __v4l2_ctrl_modify_range(ov7251->exposure, 1,
++					       new_mode->vts - OV7251_EXPOSURE_OFFSET,
+ 					       1, new_mode->exposure_def);
+ 		if (ret < 0)
+ 			goto exit;
+@@ -1092,8 +1090,8 @@ static int ov7251_set_frame_interval(str
+ 	new_mode = ov7251_find_mode_by_ival(ov7251, &fi->interval);
+ 
+ 	if (new_mode != ov7251->current_mode) {
+-		ret = __v4l2_ctrl_modify_range(ov7251->exposure,
+-					       1, new_mode->exposure_max,
++		ret = __v4l2_ctrl_modify_range(ov7251->exposure, 1,
++					       new_mode->vts - OV7251_EXPOSURE_OFFSET,
+ 					       1, new_mode->exposure_def);
+ 		if (ret < 0)
+ 			goto exit;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0753-media-i2c-ov7251-Separate-modes-from-frame-intervals.patch b/root/target/linux/bcm27xx/patches-5.15/950-0753-media-i2c-ov7251-Separate-modes-from-frame-intervals.patch
new file mode 100644
index 00000000..af05e490
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0753-media-i2c-ov7251-Separate-modes-from-frame-intervals.patch
@@ -0,0 +1,234 @@
+From bd8489a544cd7557e100ee63466f2da154ded554 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 17 Feb 2022 17:00:27 +0000
+Subject: [PATCH 753/828] media: i2c: ov7251: Separate modes from frame
+ intervals
+
+The modes and frame intervals are independent, therefore
+separate them into 2 structures.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov7251.c | 85 ++++++++++++++++++--------------------
+ 1 file changed, 41 insertions(+), 44 deletions(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -79,14 +79,17 @@ struct reg_value {
+ 	u8 val;
+ };
+ 
++struct ov7251_frame_ival_info {
++	u16 vts;
++	struct v4l2_fract timeperframe;
++};
++
+ struct ov7251_mode_info {
+ 	u32 width;
+ 	u32 height;
+ 	const struct reg_value *data;
+ 	u32 data_size;
+ 	u16 exposure_def;
+-	u16 vts;
+-	struct v4l2_fract timeperframe;
+ };
+ 
+ struct ov7251_pll1_config {
+@@ -128,6 +131,7 @@ struct ov7251 {
+ 	struct regulator *analog_regulator;
+ 
+ 	const struct ov7251_mode_info *current_mode;
++	const struct ov7251_frame_ival_info *current_ival;
+ 
+ 	struct v4l2_ctrl_handler ctrls;
+ 	struct v4l2_ctrl *exposure;
+@@ -343,13 +347,8 @@ static const s64 link_freq[] = {
+ 	240000000,
+ };
+ 
+-static const struct ov7251_mode_info ov7251_mode_info_data[] = {
++static const struct ov7251_frame_ival_info ov7251_frame_ival_info_data[] = {
+ 	{
+-		.width = 640,
+-		.height = 480,
+-		.data = ov7251_setting_vga,
+-		.data_size = ARRAY_SIZE(ov7251_setting_vga),
+-		.exposure_def = 504,
+ 		.vts = 0x6bc,
+ 		.timeperframe = {
+ 			.numerator = 100,
+@@ -357,11 +356,6 @@ static const struct ov7251_mode_info ov7
+ 		}
+ 	},
+ 	{
+-		.width = 640,
+-		.height = 480,
+-		.data = ov7251_setting_vga,
+-		.data_size = ARRAY_SIZE(ov7251_setting_vga),
+-		.exposure_def = 504,
+ 		.vts = 0x35c,
+ 		.timeperframe = {
+ 			.numerator = 100,
+@@ -369,11 +363,6 @@ static const struct ov7251_mode_info ov7
+ 		}
+ 	},
+ 	{
+-		.width = 640,
+-		.height = 480,
+-		.data = ov7251_setting_vga,
+-		.data_size = ARRAY_SIZE(ov7251_setting_vga),
+-		.exposure_def = 504,
+ 		.vts = 0x23c,
+ 		.timeperframe = {
+ 			.numerator = 100,
+@@ -382,6 +371,16 @@ static const struct ov7251_mode_info ov7
+ 	},
+ };
+ 
++static const struct ov7251_mode_info ov7251_mode_info_data[] = {
++	{
++		.width = 640,
++		.height = 480,
++		.data = ov7251_setting_vga,
++		.data_size = ARRAY_SIZE(ov7251_setting_vga),
++		.exposure_def = 504,
++	},
++};
++
+ static int ov7251_regulators_enable(struct ov7251 *ov7251)
+ {
+ 	int ret;
+@@ -789,13 +788,13 @@ static int ov7251_enum_frame_ival(struct
+ 	unsigned int index = fie->index;
+ 	unsigned int i;
+ 
+-	for (i = 0; i < ARRAY_SIZE(ov7251_mode_info_data); i++) {
+-		if (fie->width != ov7251_mode_info_data[i].width ||
+-		    fie->height != ov7251_mode_info_data[i].height)
++	for (i = 0; i < ARRAY_SIZE(ov7251_frame_ival_info_data); i++) {
++		if (fie->width != ov7251_mode_info_data[0].width ||
++		    fie->height != ov7251_mode_info_data[0].height)
+ 			continue;
+ 
+ 		if (index-- == 0) {
+-			fie->interval = ov7251_mode_info_data[i].timeperframe;
++			fie->interval = ov7251_frame_ival_info_data[i].timeperframe;
+ 			return 0;
+ 		}
+ 	}
+@@ -854,23 +853,18 @@ static inline u32 avg_fps(const struct v
+ 	return (t->denominator + (t->numerator >> 1)) / t->numerator;
+ }
+ 
+-static const struct ov7251_mode_info *
+-ov7251_find_mode_by_ival(struct ov7251 *ov7251, struct v4l2_fract *timeperframe)
++static const struct ov7251_frame_ival_info *
++ov7251_find_frame_ival_by_ival(struct ov7251 *ov7251, struct v4l2_fract *timeperframe)
+ {
+-	const struct ov7251_mode_info *mode = ov7251->current_mode;
+ 	unsigned int fps_req = avg_fps(timeperframe);
+ 	unsigned int max_dist_match = (unsigned int) -1;
+ 	unsigned int i, n = 0;
+ 
+-	for (i = 0; i < ARRAY_SIZE(ov7251_mode_info_data); i++) {
++	for (i = 0; i < ARRAY_SIZE(ov7251_frame_ival_info_data); i++) {
+ 		unsigned int dist;
+ 		unsigned int fps_tmp;
+ 
+-		if (mode->width != ov7251_mode_info_data[i].width ||
+-		    mode->height != ov7251_mode_info_data[i].height)
+-			continue;
+-
+-		fps_tmp = avg_fps(&ov7251_mode_info_data[i].timeperframe);
++		fps_tmp = avg_fps(&ov7251_frame_ival_info_data[i].timeperframe);
+ 
+ 		dist = abs(fps_req - fps_tmp);
+ 
+@@ -880,7 +874,7 @@ ov7251_find_mode_by_ival(struct ov7251 *
+ 		}
+ 	}
+ 
+-	return &ov7251_mode_info_data[n];
++	return &ov7251_frame_ival_info_data[n];
+ }
+ 
+ static int ov7251_set_format(struct v4l2_subdev *sd,
+@@ -914,7 +908,8 @@ static int ov7251_set_format(struct v4l2
+ 		__v4l2_ctrl_s_ctrl(ov7251->hblank, h_blank);
+ 
+ 		ret = __v4l2_ctrl_modify_range(ov7251->exposure, 1,
+-					       new_mode->vts - OV7251_EXPOSURE_OFFSET,
++					       ov7251->current_ival->vts -
++							OV7251_EXPOSURE_OFFSET,
+ 					       1, new_mode->exposure_def);
+ 		if (ret < 0)
+ 			goto exit;
+@@ -1036,11 +1031,11 @@ static int ov7251_s_stream(struct v4l2_s
+ 			goto err_power_down;
+ 		}
+ 		ret = ov7251_write_reg(ov7251, OV7251_VTS_HIGH,
+-				       ov7251->current_mode->vts >> 8);
++				       ov7251->current_ival->vts >> 8);
+ 		if (ret)
+ 			goto err_power_down;
+ 		ret = ov7251_write_reg(ov7251, OV7251_VTS_LOW,
+-				       ov7251->current_mode->vts & 0xff);
++				       ov7251->current_ival->vts & 0xff);
+ 		if (ret)
+ 			goto err_power_down;
+ 		ret = __v4l2_ctrl_handler_setup(&ov7251->ctrls);
+@@ -1073,7 +1068,7 @@ static int ov7251_get_frame_interval(str
+ 	struct ov7251 *ov7251 = to_ov7251(subdev);
+ 
+ 	mutex_lock(&ov7251->lock);
+-	fi->interval = ov7251->current_mode->timeperframe;
++	fi->interval = ov7251->current_ival->timeperframe;
+ 	mutex_unlock(&ov7251->lock);
+ 
+ 	return 0;
+@@ -1083,28 +1078,29 @@ static int ov7251_set_frame_interval(str
+ 				     struct v4l2_subdev_frame_interval *fi)
+ {
+ 	struct ov7251 *ov7251 = to_ov7251(subdev);
+-	const struct ov7251_mode_info *new_mode;
++	const struct ov7251_frame_ival_info *new_ival;
+ 	int ret = 0;
+ 
+ 	mutex_lock(&ov7251->lock);
+-	new_mode = ov7251_find_mode_by_ival(ov7251, &fi->interval);
++	new_ival = ov7251_find_frame_ival_by_ival(ov7251, &fi->interval);
+ 
+-	if (new_mode != ov7251->current_mode) {
++	if (new_ival != ov7251->current_ival) {
+ 		ret = __v4l2_ctrl_modify_range(ov7251->exposure, 1,
+-					       new_mode->vts - OV7251_EXPOSURE_OFFSET,
+-					       1, new_mode->exposure_def);
++					       new_ival->vts -
++							OV7251_EXPOSURE_OFFSET,
++					       1, ov7251->current_mode->exposure_def);
+ 		if (ret < 0)
+ 			goto exit;
+ 
+ 		ret = __v4l2_ctrl_s_ctrl(ov7251->exposure,
+-					 new_mode->exposure_def);
++					 ov7251->current_mode->exposure_def);
+ 		if (ret < 0)
+ 			goto exit;
+ 
+-		ov7251->current_mode = new_mode;
++		ov7251->current_ival = new_ival;
+ 	}
+ 
+-	fi->interval = ov7251->current_mode->timeperframe;
++	fi->interval = ov7251->current_ival->timeperframe;
+ 
+ exit:
+ 	mutex_unlock(&ov7251->lock);
+@@ -1316,6 +1312,7 @@ static int ov7251_probe(struct i2c_clien
+ 	mutex_init(&ov7251->lock);
+ 
+ 	ov7251->current_mode = &ov7251_mode_info_data[0];
++	ov7251->current_ival = &ov7251_frame_ival_info_data[0];
+ 
+ 	v4l2_ctrl_handler_init(&ov7251->ctrls, 10);
+ 	ov7251->ctrls.lock = &ov7251->lock;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0754-media-i2c-ov7251-Add-V4L2_CID_VBLANK.patch b/root/target/linux/bcm27xx/patches-5.15/950-0754-media-i2c-ov7251-Add-V4L2_CID_VBLANK.patch
new file mode 100644
index 00000000..72d57a3b
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0754-media-i2c-ov7251-Add-V4L2_CID_VBLANK.patch
@@ -0,0 +1,153 @@
+From 1e5b0cfa700fa10f9df495a66a57aba0aa8ce0c6 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 17 Feb 2022 18:08:39 +0000
+Subject: [PATCH 754/828] media: i2c: ov7251: Add V4L2_CID_VBLANK
+
+This is a raw sensor so should be implementing V4L2_CID_VBLANK
+instead of the frame_interval ops, as per docs at
+https://www.kernel.org/doc/html/latest/driver-api/media/camera-sensor.html#frame-interval-configuration
+
+This driver already implemented the frame_interval ops, so
+removing them would be a regression.
+Implement V4L2_CID_VBLANK, with the frame_interval ops setting
+that control.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov7251.c | 56 +++++++++++++++++++++++++++++---------
+ 1 file changed, 43 insertions(+), 13 deletions(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -43,6 +43,8 @@
+ #define OV7251_HTS			0x3a0
+ #define OV7251_VTS_HIGH			0x380e
+ #define OV7251_VTS_LOW			0x380f
++#define OV7251_VTS_MIN_OFFSET		92
++#define OV7251_VTS_MAX			0x7fff
+ #define OV7251_TIMING_FORMAT1		0x3820
+ #define OV7251_TIMING_FORMAT1_VFLIP	BIT(2)
+ #define OV7251_TIMING_FORMAT2		0x3821
+@@ -136,6 +138,7 @@ struct ov7251 {
+ 	struct v4l2_ctrl_handler ctrls;
+ 	struct v4l2_ctrl *exposure;
+ 	struct v4l2_ctrl *hblank;
++	struct v4l2_ctrl *vblank;
+ 
+ 	/* Cached register values */
+ 	u8 aec_pk_manual;
+@@ -688,6 +691,19 @@ static int ov7251_set_vflip(struct ov725
+ 	return ret;
+ }
+ 
++static int ov7251_set_vblank(struct ov7251 *ov7251, s32 value)
++{
++	u16 reg;
++	u8 val[2];
++
++	reg = OV7251_VTS_HIGH;
++	value += ov7251->current_mode->height;
++	val[0] = (value & 0xff00) >> 8; /* goes to OV7251_VTS_HIGH */
++	val[1] = value & 0xff;          /* goes to OV7251_VTS_LOW */
++
++	return ov7251_write_seq_regs(ov7251, reg, val, 2);
++}
++
+ static int ov7251_set_test_pattern(struct ov7251 *ov7251, s32 value)
+ {
+ 	u8 val = ov7251->pre_isp_00;
+@@ -714,9 +730,20 @@ static int ov7251_s_ctrl(struct v4l2_ctr
+ {
+ 	struct ov7251 *ov7251 = container_of(ctrl->handler,
+ 					     struct ov7251, ctrls);
++	s64 max;
+ 	int ret;
+ 
+ 	/* v4l2_ctrl_lock() locks our mutex */
++	switch (ctrl->id) {
++	case V4L2_CID_VBLANK:
++		/* Update max exposure while meeting expected vblanking */
++		max = ov7251->current_mode->height + ctrl->val - OV7251_EXPOSURE_OFFSET;
++		__v4l2_ctrl_modify_range(ov7251->exposure,
++					 ov7251->exposure->minimum, max,
++					 ov7251->exposure->step,
++					 ov7251->exposure->default_value);
++		break;
++	}
+ 
+ 	if (!pm_runtime_get_if_in_use(ov7251->dev))
+ 		return 0;
+@@ -737,6 +764,9 @@ static int ov7251_s_ctrl(struct v4l2_ctr
+ 	case V4L2_CID_VFLIP:
+ 		ret = ov7251_set_vflip(ov7251, ctrl->val);
+ 		break;
++	case V4L2_CID_VBLANK:
++		ret = ov7251_set_vblank(ov7251, ctrl->val);
++		break;
+ 	default:
+ 		ret = -EINVAL;
+ 		break;
+@@ -1030,14 +1060,6 @@ static int ov7251_s_stream(struct v4l2_s
+ 				ov7251->current_mode->height);
+ 			goto err_power_down;
+ 		}
+-		ret = ov7251_write_reg(ov7251, OV7251_VTS_HIGH,
+-				       ov7251->current_ival->vts >> 8);
+-		if (ret)
+-			goto err_power_down;
+-		ret = ov7251_write_reg(ov7251, OV7251_VTS_LOW,
+-				       ov7251->current_ival->vts & 0xff);
+-		if (ret)
+-			goto err_power_down;
+ 		ret = __v4l2_ctrl_handler_setup(&ov7251->ctrls);
+ 		if (ret < 0) {
+ 			dev_err(ov7251->dev, "could not sync v4l2 controls\n");
+@@ -1088,12 +1110,13 @@ static int ov7251_set_frame_interval(str
+ 		ret = __v4l2_ctrl_modify_range(ov7251->exposure, 1,
+ 					       new_ival->vts -
+ 							OV7251_EXPOSURE_OFFSET,
+-					       1, ov7251->current_mode->exposure_def);
++					       1, ov7251->exposure->val);
+ 		if (ret < 0)
+ 			goto exit;
+ 
+-		ret = __v4l2_ctrl_s_ctrl(ov7251->exposure,
+-					 ov7251->current_mode->exposure_def);
++		ret = __v4l2_ctrl_s_ctrl(ov7251->vblank,
++					 new_ival->vts -
++						ov7251->current_mode->height);
+ 		if (ret < 0)
+ 			goto exit;
+ 
+@@ -1233,7 +1256,7 @@ static int ov7251_probe(struct i2c_clien
+ 	struct v4l2_ctrl *ctrl;
+ 	struct ov7251 *ov7251;
+ 	unsigned int rate = 0;
+-	u32 h_blank;
++	u32 h_blank, v_blank, v_blank_max;
+ 	int ret;
+ 	int i;
+ 
+@@ -1314,7 +1337,7 @@ static int ov7251_probe(struct i2c_clien
+ 	ov7251->current_mode = &ov7251_mode_info_data[0];
+ 	ov7251->current_ival = &ov7251_frame_ival_info_data[0];
+ 
+-	v4l2_ctrl_handler_init(&ov7251->ctrls, 10);
++	v4l2_ctrl_handler_init(&ov7251->ctrls, 11);
+ 	ov7251->ctrls.lock = &ov7251->lock;
+ 
+ 	v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
+@@ -1345,6 +1368,13 @@ static int ov7251_probe(struct i2c_clien
+ 	if (ov7251->hblank)
+ 		ov7251->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
+ 
++	v_blank = ov7251->current_ival->vts - ov7251->current_mode->height;
++	v_blank_max = OV7251_VTS_MAX - ov7251->current_mode->width;
++	ov7251->vblank = v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
++					   V4L2_CID_VBLANK,
++					   OV7251_VTS_MIN_OFFSET,
++					   v_blank_max, 1, v_blank);
++
+ 	ov7251->sd.ctrl_handler = &ov7251->ctrls;
+ 
+ 	if (ov7251->ctrls.error) {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0755-media-i2c-ov7251-Switch-from-V4L2_CID_GAIN-to-V4L2_C.patch b/root/target/linux/bcm27xx/patches-5.15/950-0755-media-i2c-ov7251-Switch-from-V4L2_CID_GAIN-to-V4L2_C.patch
new file mode 100644
index 00000000..0d81b0d0
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0755-media-i2c-ov7251-Switch-from-V4L2_CID_GAIN-to-V4L2_C.patch
@@ -0,0 +1,36 @@
+From 2a02813713c4cb051e409942db3e97443d4485e1 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 17 Feb 2022 18:31:56 +0000
+Subject: [PATCH 755/828] media: i2c: ov7251: Switch from V4L2_CID_GAIN to
+ V4L2_CID_ANALOGUE_GAIN
+
+The control is specifically for analogue gain, therefore switch
+to using the control for that.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov7251.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/media/i2c/ov7251.c
++++ b/drivers/media/i2c/ov7251.c
+@@ -752,7 +752,7 @@ static int ov7251_s_ctrl(struct v4l2_ctr
+ 	case V4L2_CID_EXPOSURE:
+ 		ret = ov7251_set_exposure(ov7251, ctrl->val);
+ 		break;
+-	case V4L2_CID_GAIN:
++	case V4L2_CID_ANALOGUE_GAIN:
+ 		ret = ov7251_set_gain(ov7251, ctrl->val);
+ 		break;
+ 	case V4L2_CID_TEST_PATTERN:
+@@ -1346,8 +1346,8 @@ static int ov7251_probe(struct i2c_clien
+ 			  V4L2_CID_VFLIP, 0, 1, 1, 0);
+ 	ov7251->exposure = v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
+ 					     V4L2_CID_EXPOSURE, 1, 32, 1, 32);
+-	v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops, V4L2_CID_GAIN,
+-			  16, 1023, 1, 16);
++	v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
++			  V4L2_CID_ANALOGUE_GAIN, 16, 1023, 1, 16);
+ 	v4l2_ctrl_new_std_menu_items(&ov7251->ctrls, &ov7251_ctrl_ops,
+ 				     V4L2_CID_TEST_PATTERN,
+ 				     ARRAY_SIZE(ov7251_test_pattern_menu) - 1,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0756-dtoverlays-Switch-ov7251-to-using-Media-Controller-b.patch b/root/target/linux/bcm27xx/patches-5.15/950-0756-dtoverlays-Switch-ov7251-to-using-Media-Controller-b.patch
new file mode 100644
index 00000000..0136a52e
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0756-dtoverlays-Switch-ov7251-to-using-Media-Controller-b.patch
@@ -0,0 +1,24 @@
+From c9eb304b14c24dca748669294d2c5f30f852efd2 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 17 Feb 2022 18:12:36 +0000
+Subject: [PATCH 756/828] dtoverlays: Switch ov7251 to using Media Controller
+ by default
+
+We should have all the functionality required by now, so switch
+to using Media Controller so that it can be used with libcamera.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/ov7251-overlay.dts | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/arm/boot/dts/overlays/ov7251-overlay.dts
++++ b/arch/arm/boot/dts/overlays/ov7251-overlay.dts
+@@ -49,6 +49,7 @@
+ 		target = <&csi1>;
+ 		csi: __overlay__ {
+ 			status = "okay";
++			brcm,media-controller;
+ 
+ 			port {
+ 				csi1_ep: endpoint {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0757-drm-vc4-hvs-Fix-frame-count-register-readout.patch b/root/target/linux/bcm27xx/patches-5.15/950-0757-drm-vc4-hvs-Fix-frame-count-register-readout.patch
new file mode 100644
index 00000000..211cab72
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0757-drm-vc4-hvs-Fix-frame-count-register-readout.patch
@@ -0,0 +1,114 @@
+From 2cc3c38e4ca2039142891d115881e2765b17b878 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Thu, 17 Feb 2022 10:55:26 +0100
+Subject: [PATCH 757/828] drm/vc4: hvs: Fix frame count register readout
+
+In order to get the field currently being output, the driver has been
+using the display FIFO frame count in the HVS, reading a 6-bit field at
+the offset 12 in the DISPSTATx register.
+
+While that field is indeed at that location for the FIFO 1 and 2, the
+one for the FIFO0 is actually in the DISPSTAT1 register, at the offset
+18.
+
+Fixes: e538092cb15c ("drm/vc4: Enable precise vblank timestamping for interlaced modes.")
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c |  2 +-
+ drivers/gpu/drm/vc4/vc4_drv.h  |  1 +
+ drivers/gpu/drm/vc4/vc4_hvs.c  | 23 +++++++++++++++++++++++
+ drivers/gpu/drm/vc4/vc4_regs.h | 12 ++++++++++--
+ 4 files changed, 35 insertions(+), 3 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -123,7 +123,7 @@ static bool vc4_crtc_get_scanout_positio
+ 		*vpos /= 2;
+ 
+ 		/* Use hpos to correct for field offset in interlaced mode. */
+-		if (VC4_GET_FIELD(val, SCALER_DISPSTATX_FRAME_COUNT) % 2)
++		if (vc4_hvs_get_fifo_frame_count(dev, vc4_crtc_state->assigned_channel) % 2)
+ 			*hpos += mode->crtc_htotal / 2;
+ 	}
+ 
+--- a/drivers/gpu/drm/vc4/vc4_drv.h
++++ b/drivers/gpu/drm/vc4/vc4_drv.h
+@@ -967,6 +967,7 @@ void vc4_irq_reset(struct drm_device *de
+ extern struct platform_driver vc4_hvs_driver;
+ void vc4_hvs_stop_channel(struct drm_device *dev, unsigned int output);
+ int vc4_hvs_get_fifo_from_output(struct drm_device *dev, unsigned int output);
++u8 vc4_hvs_get_fifo_frame_count(struct drm_device *dev, unsigned int fifo);
+ int vc4_hvs_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state);
+ void vc4_hvs_atomic_begin(struct drm_crtc *crtc, struct drm_atomic_state *state);
+ void vc4_hvs_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state);
+--- a/drivers/gpu/drm/vc4/vc4_hvs.c
++++ b/drivers/gpu/drm/vc4/vc4_hvs.c
+@@ -388,6 +388,29 @@ static void vc5_hvs_update_gamma_lut(str
+ 	vc5_hvs_lut_load(crtc);
+ }
+ 
++u8 vc4_hvs_get_fifo_frame_count(struct drm_device *dev, unsigned int fifo)
++{
++	struct vc4_dev *vc4 = to_vc4_dev(dev);
++	u8 field = 0;
++
++	switch (fifo) {
++	case 0:
++		field = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTAT1),
++				      SCALER_DISPSTAT1_FRCNT0);
++		break;
++	case 1:
++		field = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTAT1),
++				      SCALER_DISPSTAT1_FRCNT1);
++		break;
++	case 2:
++		field = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTAT2),
++				      SCALER_DISPSTAT2_FRCNT2);
++		break;
++	}
++
++	return field;
++}
++
+ int vc4_hvs_get_fifo_from_output(struct drm_device *dev, unsigned int output)
+ {
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
+--- a/drivers/gpu/drm/vc4/vc4_regs.h
++++ b/drivers/gpu/drm/vc4/vc4_regs.h
+@@ -379,8 +379,6 @@
+ # define SCALER_DISPSTATX_MODE_EOF		3
+ # define SCALER_DISPSTATX_FULL			BIT(29)
+ # define SCALER_DISPSTATX_EMPTY			BIT(28)
+-# define SCALER_DISPSTATX_FRAME_COUNT_MASK	VC4_MASK(17, 12)
+-# define SCALER_DISPSTATX_FRAME_COUNT_SHIFT	12
+ # define SCALER_DISPSTATX_LINE_MASK		VC4_MASK(11, 0)
+ # define SCALER_DISPSTATX_LINE_SHIFT		0
+ 
+@@ -403,9 +401,15 @@
+ 						 (x) * (SCALER_DISPBKGND1 - \
+ 							SCALER_DISPBKGND0))
+ #define SCALER_DISPSTAT1                        0x00000058
++# define SCALER_DISPSTAT1_FRCNT0_MASK		VC4_MASK(23, 18)
++# define SCALER_DISPSTAT1_FRCNT0_SHIFT		18
++# define SCALER_DISPSTAT1_FRCNT1_MASK		VC4_MASK(17, 12)
++# define SCALER_DISPSTAT1_FRCNT1_SHIFT		12
++
+ #define SCALER_DISPSTATX(x)			(SCALER_DISPSTAT0 +        \
+ 						 (x) * (SCALER_DISPSTAT1 - \
+ 							SCALER_DISPSTAT0))
++
+ #define SCALER_DISPBASE1                        0x0000005c
+ #define SCALER_DISPBASEX(x)			(SCALER_DISPBASE0 +        \
+ 						 (x) * (SCALER_DISPBASE1 - \
+@@ -415,7 +419,11 @@
+ 						 (x) * (SCALER_DISPCTRL1 - \
+ 							SCALER_DISPCTRL0))
+ #define SCALER_DISPBKGND2                       0x00000064
++
+ #define SCALER_DISPSTAT2                        0x00000068
++# define SCALER_DISPSTAT2_FRCNT2_MASK		VC4_MASK(17, 12)
++# define SCALER_DISPSTAT2_FRCNT2_SHIFT		12
++
+ #define SCALER_DISPBASE2                        0x0000006c
+ #define SCALER_DISPALPHA2                       0x00000070
+ #define SCALER_GAMADDR                          0x00000078
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0758-drm-vc4-hvs-Use-pointer-to-HVS-in-HVS_READ-and-HVS_W.patch b/root/target/linux/bcm27xx/patches-5.15/950-0758-drm-vc4-hvs-Use-pointer-to-HVS-in-HVS_READ-and-HVS_W.patch
new file mode 100644
index 00000000..781b6de8
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0758-drm-vc4-hvs-Use-pointer-to-HVS-in-HVS_READ-and-HVS_W.patch
@@ -0,0 +1,496 @@
+From 0cdbae386a5017130e41962a8efc11d7a6d973d2 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Mon, 14 Feb 2022 17:21:05 +0100
+Subject: [PATCH 758/828] drm/vc4: hvs: Use pointer to HVS in HVS_READ and
+ HVS_WRITE macros
+
+Those macros are really about the HVS itself, and thus its associated
+structure vc4_hvs, rather than the entire (virtual) vc4 device.
+
+Let's change those macros to use the hvs pointer directly, and change
+the calling sites accordingly.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c |  14 +++--
+ drivers/gpu/drm/vc4/vc4_drv.h  |  16 ++---
+ drivers/gpu/drm/vc4/vc4_hvs.c  | 109 +++++++++++++++++----------------
+ drivers/gpu/drm/vc4/vc4_kms.c  |   5 +-
+ 4 files changed, 77 insertions(+), 67 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -70,6 +70,7 @@ static const struct debugfs_reg32 crtc_r
+ static unsigned int
+ vc4_crtc_get_cob_allocation(struct vc4_dev *vc4, unsigned int channel)
+ {
++	struct vc4_hvs *hvs = vc4->hvs;
+ 	u32 dispbase = HVS_READ(SCALER_DISPBASEX(channel));
+ 	/* Top/base are supposed to be 4-pixel aligned, but the
+ 	 * Raspberry Pi firmware fills the low bits (which are
+@@ -89,6 +90,7 @@ static bool vc4_crtc_get_scanout_positio
+ {
+ 	struct drm_device *dev = crtc->dev;
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
++	struct vc4_hvs *hvs = vc4->hvs;
+ 	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
+ 	struct vc4_crtc_state *vc4_crtc_state = to_vc4_crtc_state(crtc->state);
+ 	unsigned int cob_size;
+@@ -123,7 +125,7 @@ static bool vc4_crtc_get_scanout_positio
+ 		*vpos /= 2;
+ 
+ 		/* Use hpos to correct for field offset in interlaced mode. */
+-		if (vc4_hvs_get_fifo_frame_count(dev, vc4_crtc_state->assigned_channel) % 2)
++		if (vc4_hvs_get_fifo_frame_count(hvs, vc4_crtc_state->assigned_channel) % 2)
+ 			*hpos += mode->crtc_htotal / 2;
+ 	}
+ 
+@@ -449,6 +451,7 @@ static void vc4_crtc_config_pv(struct dr
+ static void require_hvs_enabled(struct drm_device *dev)
+ {
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
++	struct vc4_hvs *hvs = vc4->hvs;
+ 
+ 	WARN_ON_ONCE((HVS_READ(SCALER_DISPCTRL) & SCALER_DISPCTRL_ENABLE) !=
+ 		     SCALER_DISPCTRL_ENABLE);
+@@ -462,6 +465,7 @@ static int vc4_crtc_disable(struct drm_c
+ 	struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder);
+ 	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
+ 	struct drm_device *dev = crtc->dev;
++	struct vc4_dev *vc4 = to_vc4_dev(dev);
+ 	int ret;
+ 
+ 	CRTC_WRITE(PV_V_CONTROL,
+@@ -491,7 +495,7 @@ static int vc4_crtc_disable(struct drm_c
+ 		vc4_encoder->post_crtc_disable(encoder, state);
+ 
+ 	vc4_crtc_pixelvalve_reset(crtc);
+-	vc4_hvs_stop_channel(dev, channel);
++	vc4_hvs_stop_channel(vc4->hvs, channel);
+ 
+ 	if (vc4_encoder && vc4_encoder->post_crtc_powerdown)
+ 		vc4_encoder->post_crtc_powerdown(encoder, state);
+@@ -517,6 +521,7 @@ static struct drm_encoder *vc4_crtc_get_
+ int vc4_crtc_disable_at_boot(struct drm_crtc *crtc)
+ {
+ 	struct drm_device *drm = crtc->dev;
++	struct vc4_dev *vc4 = to_vc4_dev(drm);
+ 	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
+ 	enum vc4_encoder_type encoder_type;
+ 	const struct vc4_pv_data *pv_data;
+@@ -538,7 +543,7 @@ int vc4_crtc_disable_at_boot(struct drm_
+ 	if (!(CRTC_READ(PV_V_CONTROL) & PV_VCONTROL_VIDEN))
+ 		return 0;
+ 
+-	channel = vc4_hvs_get_fifo_from_output(drm, vc4_crtc->data->hvs_output);
++	channel = vc4_hvs_get_fifo_from_output(vc4->hvs, vc4_crtc->data->hvs_output);
+ 	if (channel < 0)
+ 		return 0;
+ 
+@@ -754,6 +759,7 @@ static void vc4_crtc_handle_page_flip(st
+ 	struct drm_crtc *crtc = &vc4_crtc->base;
+ 	struct drm_device *dev = crtc->dev;
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
++	struct vc4_hvs *hvs = vc4->hvs;
+ 	u32 chan = vc4_crtc->current_hvs_channel;
+ 	unsigned long flags;
+ 
+@@ -772,7 +778,7 @@ static void vc4_crtc_handle_page_flip(st
+ 		 * the CRTC and encoder already reconfigured, leading to
+ 		 * underruns. This can be seen when reconfiguring the CRTC.
+ 		 */
+-		vc4_hvs_unmask_underrun(dev, chan);
++		vc4_hvs_unmask_underrun(hvs, chan);
+ 	}
+ 	spin_unlock(&vc4_crtc->irq_lock);
+ 	spin_unlock_irqrestore(&dev->event_lock, flags);
+--- a/drivers/gpu/drm/vc4/vc4_drv.h
++++ b/drivers/gpu/drm/vc4/vc4_drv.h
+@@ -603,8 +603,8 @@ to_vc4_crtc_state(struct drm_crtc_state
+ 
+ #define V3D_READ(offset) readl(vc4->v3d->regs + offset)
+ #define V3D_WRITE(offset, val) writel(val, vc4->v3d->regs + offset)
+-#define HVS_READ(offset) readl(vc4->hvs->regs + offset)
+-#define HVS_WRITE(offset, val) writel(val, vc4->hvs->regs + offset)
++#define HVS_READ(offset) readl(hvs->regs + offset)
++#define HVS_WRITE(offset, val) writel(val, hvs->regs + offset)
+ 
+ #define VC4_REG32(reg) { .name = #reg, .offset = reg }
+ 
+@@ -965,17 +965,17 @@ void vc4_irq_reset(struct drm_device *de
+ 
+ /* vc4_hvs.c */
+ extern struct platform_driver vc4_hvs_driver;
+-void vc4_hvs_stop_channel(struct drm_device *dev, unsigned int output);
+-int vc4_hvs_get_fifo_from_output(struct drm_device *dev, unsigned int output);
+-u8 vc4_hvs_get_fifo_frame_count(struct drm_device *dev, unsigned int fifo);
++void vc4_hvs_stop_channel(struct vc4_hvs *hvs, unsigned int output);
++int vc4_hvs_get_fifo_from_output(struct vc4_hvs *hvs, unsigned int output);
++u8 vc4_hvs_get_fifo_frame_count(struct vc4_hvs *hvs, unsigned int fifo);
+ int vc4_hvs_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state);
+ void vc4_hvs_atomic_begin(struct drm_crtc *crtc, struct drm_atomic_state *state);
+ void vc4_hvs_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state);
+ void vc4_hvs_atomic_disable(struct drm_crtc *crtc, struct drm_atomic_state *state);
+ void vc4_hvs_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state);
+-void vc4_hvs_dump_state(struct drm_device *dev);
+-void vc4_hvs_unmask_underrun(struct drm_device *dev, int channel);
+-void vc4_hvs_mask_underrun(struct drm_device *dev, int channel);
++void vc4_hvs_dump_state(struct vc4_hvs *hvs);
++void vc4_hvs_unmask_underrun(struct vc4_hvs *hvs, int channel);
++void vc4_hvs_mask_underrun(struct vc4_hvs *hvs, int channel);
+ 
+ /* vc4_kms.c */
+ int vc4_kms_load(struct drm_device *dev);
+--- a/drivers/gpu/drm/vc4/vc4_hvs.c
++++ b/drivers/gpu/drm/vc4/vc4_hvs.c
+@@ -64,22 +64,21 @@ static const struct debugfs_reg32 hvs_re
+ 	VC4_REG32(SCALER_OLEDCOEF2),
+ };
+ 
+-void vc4_hvs_dump_state(struct drm_device *dev)
++void vc4_hvs_dump_state(struct vc4_hvs *hvs)
+ {
+-	struct vc4_dev *vc4 = to_vc4_dev(dev);
+-	struct drm_printer p = drm_info_printer(&vc4->hvs->pdev->dev);
++	struct drm_printer p = drm_info_printer(&hvs->pdev->dev);
+ 	int i;
+ 
+-	drm_print_regset32(&p, &vc4->hvs->regset);
++	drm_print_regset32(&p, &hvs->regset);
+ 
+ 	DRM_INFO("HVS ctx:\n");
+ 	for (i = 0; i < 64; i += 4) {
+ 		DRM_INFO("0x%08x (%s): 0x%08x 0x%08x 0x%08x 0x%08x\n",
+ 			 i * 4, i < HVS_BOOTLOADER_DLIST_END ? "B" : "D",
+-			 readl((u32 __iomem *)vc4->hvs->dlist + i + 0),
+-			 readl((u32 __iomem *)vc4->hvs->dlist + i + 1),
+-			 readl((u32 __iomem *)vc4->hvs->dlist + i + 2),
+-			 readl((u32 __iomem *)vc4->hvs->dlist + i + 3));
++			 readl((u32 __iomem *)hvs->dlist + i + 0),
++			 readl((u32 __iomem *)hvs->dlist + i + 1),
++			 readl((u32 __iomem *)hvs->dlist + i + 2),
++			 readl((u32 __iomem *)hvs->dlist + i + 3));
+ 	}
+ }
+ 
+@@ -100,6 +99,7 @@ static int vc4_hvs_debugfs_dlist(struct
+ 	struct drm_info_node *node = m->private;
+ 	struct drm_device *dev = node->minor->dev;
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
++	struct vc4_hvs *hvs = vc4->hvs;
+ 	struct drm_printer p = drm_seq_file_printer(m);
+ 	unsigned int next_entry_start = 0;
+ 	unsigned int i, j;
+@@ -139,6 +139,7 @@ static int vc5_hvs_debugfs_gamma(struct
+ 	struct drm_info_node *node = m->private;
+ 	struct drm_device *dev = node->minor->dev;
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
++	struct vc4_hvs *hvs = vc4->hvs;
+ 	struct drm_printer p = drm_seq_file_printer(m);
+ 	unsigned int i, chan;
+ 	u32 dispstat, dispbkgndx;
+@@ -274,11 +275,10 @@ static int vc4_hvs_upload_linear_kernel(
+ 	return 0;
+ }
+ 
+-static void vc4_hvs_lut_load(struct drm_crtc *crtc)
++static void vc4_hvs_lut_load(struct vc4_hvs *hvs,
++			     struct vc4_crtc *vc4_crtc)
+ {
+-	struct drm_device *dev = crtc->dev;
+-	struct vc4_dev *vc4 = to_vc4_dev(dev);
+-	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
++	struct drm_crtc *crtc = &vc4_crtc->base;
+ 	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state);
+ 	u32 i;
+ 
+@@ -298,11 +298,12 @@ static void vc4_hvs_lut_load(struct drm_
+ 		HVS_WRITE(SCALER_GAMDATA, vc4_crtc->lut_b[i]);
+ }
+ 
+-static void vc4_hvs_update_gamma_lut(struct drm_crtc *crtc)
++static void vc4_hvs_update_gamma_lut(struct vc4_hvs *hvs,
++				     struct vc4_crtc *vc4_crtc)
+ {
+-	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
+-	struct drm_color_lut *lut = crtc->state->gamma_lut->data;
+-	u32 length = drm_color_lut_size(crtc->state->gamma_lut);
++	struct drm_crtc_state *crtc_state = vc4_crtc->base.state;
++	struct drm_color_lut *lut = crtc_state->gamma_lut->data;
++	u32 length = drm_color_lut_size(crtc_state->gamma_lut);
+ 	u32 i;
+ 
+ 	for (i = 0; i < length; i++) {
+@@ -311,10 +312,10 @@ static void vc4_hvs_update_gamma_lut(str
+ 		vc4_crtc->lut_b[i] = drm_color_lut_extract(lut[i].blue, 8);
+ 	}
+ 
+-	vc4_hvs_lut_load(crtc);
++	vc4_hvs_lut_load(hvs, vc4_crtc);
+ }
+ 
+-static void vc5_hvs_write_gamma_entry(struct vc4_dev *vc4,
++static void vc5_hvs_write_gamma_entry(struct vc4_hvs *hvs,
+ 				      u32 offset,
+ 				      struct vc5_gamma_entry *gamma)
+ {
+@@ -322,33 +323,33 @@ static void vc5_hvs_write_gamma_entry(st
+ 	HVS_WRITE(offset + 4, gamma->grad_term);
+ }
+ 
+-static void vc5_hvs_lut_load(struct drm_crtc *crtc)
++static void vc5_hvs_lut_load(struct vc4_hvs *hvs,
++			     struct vc4_crtc *vc4_crtc)
+ {
+-	struct drm_device *dev = crtc->dev;
+-	struct vc4_dev *vc4 = to_vc4_dev(dev);
+-	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
+-	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state);
++	struct drm_crtc_state *crtc_state = vc4_crtc->base.state;
++	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state);
+ 	u32 i;
+ 	u32 offset = SCALER5_DSPGAMMA_START +
+ 		vc4_state->assigned_channel * SCALER5_DSPGAMMA_CHAN_OFFSET;
+ 
+ 	for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8)
+-		vc5_hvs_write_gamma_entry(vc4, offset, &vc4_crtc->pwl_r[i]);
++		vc5_hvs_write_gamma_entry(hvs, offset, &vc4_crtc->pwl_r[i]);
+ 	for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8)
+-		vc5_hvs_write_gamma_entry(vc4, offset, &vc4_crtc->pwl_g[i]);
++		vc5_hvs_write_gamma_entry(hvs, offset, &vc4_crtc->pwl_g[i]);
+ 	for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8)
+-		vc5_hvs_write_gamma_entry(vc4, offset, &vc4_crtc->pwl_b[i]);
++		vc5_hvs_write_gamma_entry(hvs, offset, &vc4_crtc->pwl_b[i]);
+ 
+ 	if (vc4_state->assigned_channel == 2) {
+ 		/* Alpha only valid on channel 2 */
+ 		for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8)
+-			vc5_hvs_write_gamma_entry(vc4, offset, &vc4_crtc->pwl_a[i]);
++			vc5_hvs_write_gamma_entry(hvs, offset, &vc4_crtc->pwl_a[i]);
+ 	}
+ }
+ 
+-static void vc5_hvs_update_gamma_lut(struct drm_crtc *crtc)
++static void vc5_hvs_update_gamma_lut(struct vc4_hvs *hvs,
++				     struct vc4_crtc *vc4_crtc)
+ {
+-	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
++	struct drm_crtc *crtc = &vc4_crtc->base;
+ 	struct drm_color_lut *lut = crtc->state->gamma_lut->data;
+ 	unsigned int step, i;
+ 	u32 start, end;
+@@ -385,12 +386,11 @@ static void vc5_hvs_update_gamma_lut(str
+ 		VC5_HVS_UPDATE_GAMMA_ENTRY_FROM_LUT(pwl_b, blue);
+ 	}
+ 
+-	vc5_hvs_lut_load(crtc);
++	vc5_hvs_lut_load(hvs, vc4_crtc);
+ }
+ 
+-u8 vc4_hvs_get_fifo_frame_count(struct drm_device *dev, unsigned int fifo)
++u8 vc4_hvs_get_fifo_frame_count(struct vc4_hvs *hvs, unsigned int fifo)
+ {
+-	struct vc4_dev *vc4 = to_vc4_dev(dev);
+ 	u8 field = 0;
+ 
+ 	switch (fifo) {
+@@ -411,13 +411,12 @@ u8 vc4_hvs_get_fifo_frame_count(struct d
+ 	return field;
+ }
+ 
+-int vc4_hvs_get_fifo_from_output(struct drm_device *dev, unsigned int output)
++int vc4_hvs_get_fifo_from_output(struct vc4_hvs *hvs, unsigned int output)
+ {
+-	struct vc4_dev *vc4 = to_vc4_dev(dev);
+ 	u32 reg;
+ 	int ret;
+ 
+-	if (!vc4->hvs->hvs5)
++	if (!hvs->hvs5)
+ 		return output;
+ 
+ 	switch (output) {
+@@ -464,9 +463,10 @@ int vc4_hvs_get_fifo_from_output(struct
+ 	}
+ }
+ 
+-static int vc4_hvs_init_channel(struct vc4_dev *vc4, struct drm_crtc *crtc,
++static int vc4_hvs_init_channel(struct vc4_hvs *hvs, struct drm_crtc *crtc,
+ 				struct drm_display_mode *mode, bool oneshot)
+ {
++	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
+ 	struct vc4_crtc_state *vc4_crtc_state = to_vc4_crtc_state(crtc->state);
+ 	unsigned int chan = vc4_crtc_state->assigned_channel;
+ 	bool interlace = mode->flags & DRM_MODE_FLAG_INTERLACE;
+@@ -484,7 +484,7 @@ static int vc4_hvs_init_channel(struct v
+ 	 */
+ 	dispctrl = SCALER_DISPCTRLX_ENABLE;
+ 
+-	if (!vc4->hvs->hvs5)
++	if (!hvs->hvs5)
+ 		dispctrl |= VC4_SET_FIELD(mode->hdisplay,
+ 					  SCALER_DISPCTRLX_WIDTH) |
+ 			    VC4_SET_FIELD(mode->vdisplay,
+@@ -514,18 +514,16 @@ static int vc4_hvs_init_channel(struct v
+ 	/* Reload the LUT, since the SRAMs would have been disabled if
+ 	 * all CRTCs had SCALER_DISPBKGND_GAMMA unset at once.
+ 	 */
+-	if (!vc4->hvs->hvs5)
+-		vc4_hvs_lut_load(crtc);
++	if (!hvs->hvs5)
++		vc4_hvs_lut_load(hvs, vc4_crtc);
+ 	else
+-		vc5_hvs_lut_load(crtc);
++		vc5_hvs_lut_load(hvs, vc4_crtc);
+ 
+ 	return 0;
+ }
+ 
+-void vc4_hvs_stop_channel(struct drm_device *dev, unsigned int chan)
++void vc4_hvs_stop_channel(struct vc4_hvs *hvs, unsigned int chan)
+ {
+-	struct vc4_dev *vc4 = to_vc4_dev(dev);
+-
+ 	if (HVS_READ(SCALER_DISPCTRLX(chan)) & SCALER_DISPCTRLX_ENABLE)
+ 		return;
+ 
+@@ -623,6 +621,7 @@ static void vc4_hvs_install_dlist(struct
+ {
+ 	struct drm_device *dev = crtc->dev;
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
++	struct vc4_hvs *hvs = vc4->hvs;
+ 	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state);
+ 
+ 	HVS_WRITE(SCALER_DISPLISTX(vc4_state->assigned_channel),
+@@ -679,18 +678,19 @@ void vc4_hvs_atomic_enable(struct drm_cr
+ 
+ 	vc4_hvs_install_dlist(crtc);
+ 	vc4_hvs_update_dlist(crtc);
+-	vc4_hvs_init_channel(vc4, crtc, mode, oneshot);
++	vc4_hvs_init_channel(vc4->hvs, crtc, mode, oneshot);
+ }
+ 
+ void vc4_hvs_atomic_disable(struct drm_crtc *crtc,
+ 			    struct drm_atomic_state *state)
+ {
+ 	struct drm_device *dev = crtc->dev;
++	struct vc4_dev *vc4 = to_vc4_dev(dev);
+ 	struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc);
+ 	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(old_state);
+ 	unsigned int chan = vc4_state->assigned_channel;
+ 
+-	vc4_hvs_stop_channel(dev, chan);
++	vc4_hvs_stop_channel(vc4->hvs, chan);
+ }
+ 
+ void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
+@@ -700,6 +700,8 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 									 crtc);
+ 	struct drm_device *dev = crtc->dev;
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
++	struct vc4_hvs *hvs = vc4->hvs;
++	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
+ 	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state);
+ 	unsigned int channel = vc4_state->assigned_channel;
+ 	struct drm_plane *plane;
+@@ -714,7 +716,7 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 
+ 	if (debug_dump_regs) {
+ 		DRM_INFO("CRTC %d HVS before:\n", drm_crtc_index(crtc));
+-		vc4_hvs_dump_state(dev);
++		vc4_hvs_dump_state(hvs);
+ 	}
+ 
+ 	/* Copy all the active planes' dlist contents to the hardware dlist. */
+@@ -766,10 +768,10 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 
+ 		if (crtc->state->gamma_lut) {
+ 			if (!vc4->hvs->hvs5) {
+-				vc4_hvs_update_gamma_lut(crtc);
++				vc4_hvs_update_gamma_lut(hvs, vc4_crtc);
+ 				dispbkgndx |= SCALER_DISPBKGND_GAMMA;
+ 			} else {
+-				vc5_hvs_update_gamma_lut(crtc);
++				vc5_hvs_update_gamma_lut(hvs, vc4_crtc);
+ 			}
+ 		} else {
+ 			/* Unsetting DISPBKGND_GAMMA skips the gamma lut step
+@@ -790,13 +792,12 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 
+ 	if (debug_dump_regs) {
+ 		DRM_INFO("CRTC %d HVS after:\n", drm_crtc_index(crtc));
+-		vc4_hvs_dump_state(dev);
++		vc4_hvs_dump_state(hvs);
+ 	}
+ }
+ 
+-void vc4_hvs_mask_underrun(struct drm_device *dev, int channel)
++void vc4_hvs_mask_underrun(struct vc4_hvs *hvs, int channel)
+ {
+-	struct vc4_dev *vc4 = to_vc4_dev(dev);
+ 	u32 dispctrl = HVS_READ(SCALER_DISPCTRL);
+ 
+ 	dispctrl &= ~SCALER_DISPCTRL_DSPEISLUR(channel);
+@@ -804,9 +805,8 @@ void vc4_hvs_mask_underrun(struct drm_de
+ 	HVS_WRITE(SCALER_DISPCTRL, dispctrl);
+ }
+ 
+-void vc4_hvs_unmask_underrun(struct drm_device *dev, int channel)
++void vc4_hvs_unmask_underrun(struct vc4_hvs *hvs, int channel)
+ {
+-	struct vc4_dev *vc4 = to_vc4_dev(dev);
+ 	u32 dispctrl = HVS_READ(SCALER_DISPCTRL);
+ 
+ 	dispctrl |= SCALER_DISPCTRL_DSPEISLUR(channel);
+@@ -828,6 +828,7 @@ static irqreturn_t vc4_hvs_irq_handler(i
+ {
+ 	struct drm_device *dev = data;
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
++	struct vc4_hvs *hvs = vc4->hvs;
+ 	irqreturn_t irqret = IRQ_NONE;
+ 	int channel;
+ 	u32 control;
+@@ -840,7 +841,7 @@ static irqreturn_t vc4_hvs_irq_handler(i
+ 		/* Interrupt masking is not always honored, so check it here. */
+ 		if (status & SCALER_DISPSTAT_EUFLOW(channel) &&
+ 		    control & SCALER_DISPCTRL_DSPEISLUR(channel)) {
+-			vc4_hvs_mask_underrun(dev, channel);
++			vc4_hvs_mask_underrun(hvs, channel);
+ 			vc4_hvs_report_underrun(dev);
+ 
+ 			irqret = IRQ_HANDLED;
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -158,6 +158,7 @@ static u16 vc4_ctm_s31_32_to_s0_9(u64 in
+ static void
+ vc4_ctm_commit(struct vc4_dev *vc4, struct drm_atomic_state *state)
+ {
++	struct vc4_hvs *hvs = vc4->hvs;
+ 	struct vc4_ctm_state *ctm_state = to_vc4_ctm_state(vc4->ctm_manager.state);
+ 	struct drm_color_ctm *ctm = ctm_state->ctm;
+ 
+@@ -234,6 +235,7 @@ vc4_hvs_get_global_state(struct drm_atom
+ static void vc4_hvs_pv_muxing_commit(struct vc4_dev *vc4,
+ 				     struct drm_atomic_state *state)
+ {
++	struct vc4_hvs *hvs = vc4->hvs;
+ 	struct drm_crtc_state *crtc_state;
+ 	struct drm_crtc *crtc;
+ 	unsigned int i;
+@@ -274,6 +276,7 @@ static void vc4_hvs_pv_muxing_commit(str
+ static void vc5_hvs_pv_muxing_commit(struct vc4_dev *vc4,
+ 				     struct drm_atomic_state *state)
+ {
++	struct vc4_hvs *hvs = vc4->hvs;
+ 	struct drm_crtc_state *crtc_state;
+ 	struct drm_crtc *crtc;
+ 	unsigned char mux;
+@@ -367,7 +370,7 @@ static void vc4_atomic_commit_tail(struc
+ 			continue;
+ 
+ 		vc4_crtc_state = to_vc4_crtc_state(new_crtc_state);
+-		vc4_hvs_mask_underrun(dev, vc4_crtc_state->assigned_channel);
++		vc4_hvs_mask_underrun(hvs, vc4_crtc_state->assigned_channel);
+ 	}
+ 
+ 	for (channel = 0; channel < HVS_NUM_CHANNELS; channel++) {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0759-drm-vc4-hvs-Defer-dlist-slots-deallocation.patch b/root/target/linux/bcm27xx/patches-5.15/950-0759-drm-vc4-hvs-Defer-dlist-slots-deallocation.patch
new file mode 100644
index 00000000..ed1d1499
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0759-drm-vc4-hvs-Defer-dlist-slots-deallocation.patch
@@ -0,0 +1,409 @@
+From 226fdd486b14cccb6606d293215cd33f40ef50fd Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Thu, 16 Dec 2021 14:54:54 +0100
+Subject: [PATCH 759/828] drm/vc4: hvs: Defer dlist slots deallocation
+
+During normal operations, the cursor position update is done through an
+asynchronous plane update, which on the vc4 driver basically just
+modifies the right dlist word to move the plane to the new coordinates.
+
+However, when we have the overscan margins setup, we fall back to a
+regular commit when we are next to the edges. And since that commit
+happens to be on a cursor plane, it's considered a legacy cursor update
+by KMS.
+
+The main difference it makes is that it won't wait for its completion
+(ie, next vblank) before returning. This means if we have multiple
+commits happening in rapid succession, we can have several of them
+happening before the next vblank.
+
+In parallel, our dlist allocation is tied to a CRTC state, and each time
+we do a commit we end up with a new CRTC state, with the previous one
+being freed. This means that we free our previous dlist entry (but don't
+clear it though) every time a new one is being committed.
+
+Now, if we were to have two commits happening before the next vblank, we
+could end up freeing reusing the same dlist entries before the next
+vblank.
+
+Indeed, we would start from an initial state taking, for example, the
+dlist entries 10 to 20, then start a commit taking the entries 20 to 30
+and setting the dlist pointer to 20, and freeing the dlist entries 10 to
+20. However, since we haven't reach vblank yet, the HVS is still using
+the entries 10 to 20.
+
+If we were to make a new commit now, chances are the allocator are going
+to give the 10 to 20 entries back, and we would change their content to
+match the new state. If vblank hasn't happened yet, we just corrupted
+the active dlist entries.
+
+A first attempt to solve this was made by creating an intermediate dlist
+buffer to store the current (ie, as of the last commit) dlist content,
+that we would update each time the HVS is done with a frame. However, if
+the interrupt handler missed the vblank window, we would end up copying
+our intermediate dlist to the hardware one during the composition,
+essentially creating the same issue.
+
+Since making sure that our interrupt handler runs within a fixed,
+constrained, time window would require to make Linux a real-time kernel,
+this seems a bit out of scope.
+
+Instead, we can work around our original issue by keeping the dlist
+slots allocation longer. That way, we won't reuse a dlist slot while
+it's still in flight. In order to achieve this, instead of freeing the
+dlist slot when its associated CRTC state is destroyed, we'll queue it
+in a list.
+
+A naive implementation would free the buffers in that queue when we get
+our end of frame interrupt. However, there's still a race since, just
+like in the shadow dlist case, we don't control when the handler for
+that interrupt is going to run. Thus, we can end up with a commit adding
+an old dlist allocation to our queue during the window between our
+actual interrupt and when our handler will run. And since that buffer is
+still being used for the composition of the current frame, we can't free
+it right away, exposing us to the original bug.
+
+Fortunately for us, the hardware provides a frame counter that is
+increased each time the first line of a frame is being generated.
+Associating the frame counter the image is supposed to go away to the
+allocation, and then only deallocate buffers that have a counter below
+or equal to the one we see when the deallocation code should prevent the
+above race from occuring.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c |  10 +-
+ drivers/gpu/drm/vc4/vc4_drv.h  |  15 ++-
+ drivers/gpu/drm/vc4/vc4_hvs.c  | 181 ++++++++++++++++++++++++++++++---
+ drivers/gpu/drm/vc4/vc4_regs.h |   1 +
+ 4 files changed, 184 insertions(+), 23 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -959,14 +959,8 @@ void vc4_crtc_destroy_state(struct drm_c
+ 	struct vc4_dev *vc4 = to_vc4_dev(crtc->dev);
+ 	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(state);
+ 
+-	if (drm_mm_node_allocated(&vc4_state->mm)) {
+-		unsigned long flags;
+-
+-		spin_lock_irqsave(&vc4->hvs->mm_lock, flags);
+-		drm_mm_remove_node(&vc4_state->mm);
+-		spin_unlock_irqrestore(&vc4->hvs->mm_lock, flags);
+-
+-	}
++	vc4_hvs_mark_dlist_entry_stale(vc4->hvs, vc4_state->mm);
++	vc4_state->mm = NULL;
+ 
+ 	drm_atomic_helper_crtc_destroy_state(crtc, state);
+ }
+--- a/drivers/gpu/drm/vc4/vc4_drv.h
++++ b/drivers/gpu/drm/vc4/vc4_drv.h
+@@ -335,6 +335,9 @@ struct vc4_hvs {
+ 	struct drm_mm lbm_mm;
+ 	spinlock_t mm_lock;
+ 
++	struct list_head stale_dlist_entries;
++	struct work_struct free_dlist_work;
++
+ 	struct drm_mm_node mitchell_netravali_filter;
+ 
+ 	struct debugfs_regset32 regset;
+@@ -573,10 +576,16 @@ struct drm_connector *vc4_get_crtc_conne
+ struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
+ 					 struct drm_crtc_state *state);
+ 
++struct vc4_hvs_dlist_allocation {
++	struct list_head node;
++	struct drm_mm_node mm_node;
++	unsigned int channel;
++	u8 target_frame_count;
++};
++
+ struct vc4_crtc_state {
+ 	struct drm_crtc_state base;
+-	/* Dlist area for this CRTC configuration. */
+-	struct drm_mm_node mm;
++	struct vc4_hvs_dlist_allocation *mm;
+ 	bool txp_armed;
+ 	unsigned int assigned_channel;
+ 
+@@ -968,6 +977,8 @@ extern struct platform_driver vc4_hvs_dr
+ void vc4_hvs_stop_channel(struct vc4_hvs *hvs, unsigned int output);
+ int vc4_hvs_get_fifo_from_output(struct vc4_hvs *hvs, unsigned int output);
+ u8 vc4_hvs_get_fifo_frame_count(struct vc4_hvs *hvs, unsigned int fifo);
++void vc4_hvs_mark_dlist_entry_stale(struct vc4_hvs *hvs,
++				    struct vc4_hvs_dlist_allocation *alloc);
+ int vc4_hvs_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state);
+ void vc4_hvs_atomic_begin(struct drm_crtc *crtc, struct drm_atomic_state *state);
+ void vc4_hvs_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state);
+--- a/drivers/gpu/drm/vc4/vc4_hvs.c
++++ b/drivers/gpu/drm/vc4/vc4_hvs.c
+@@ -389,6 +389,150 @@ static void vc5_hvs_update_gamma_lut(str
+ 	vc5_hvs_lut_load(hvs, vc4_crtc);
+ }
+ 
++static void vc4_hvs_irq_enable_eof(const struct vc4_hvs *hvs,
++				   unsigned int channel)
++{
++	u32 irq_mask = hvs->hvs5 ?
++		SCALER5_DISPCTRL_DSPEIEOF(channel) :
++		SCALER_DISPCTRL_DSPEIEOF(channel);
++
++	HVS_WRITE(SCALER_DISPCTRL,
++		  HVS_READ(SCALER_DISPCTRL) | irq_mask);
++}
++
++static void vc4_hvs_irq_clear_eof(const struct vc4_hvs *hvs,
++				  unsigned int channel)
++{
++	u32 irq_mask = hvs->hvs5 ?
++		SCALER5_DISPCTRL_DSPEIEOF(channel) :
++		SCALER_DISPCTRL_DSPEIEOF(channel);
++
++	HVS_WRITE(SCALER_DISPCTRL,
++		  HVS_READ(SCALER_DISPCTRL) & ~irq_mask);
++}
++
++static struct vc4_hvs_dlist_allocation *
++vc4_hvs_alloc_dlist_entry(struct vc4_hvs *hvs,
++			  unsigned int channel,
++			  size_t dlist_count)
++{
++	struct vc4_hvs_dlist_allocation *alloc;
++	unsigned long flags;
++	int ret;
++
++	if (channel == VC4_HVS_CHANNEL_DISABLED)
++		return NULL;
++
++	alloc = kzalloc(sizeof(*alloc), GFP_KERNEL);
++	if (!alloc)
++		return ERR_PTR(-ENOMEM);
++
++	spin_lock_irqsave(&hvs->mm_lock, flags);
++	ret = drm_mm_insert_node(&hvs->dlist_mm, &alloc->mm_node,
++				 dlist_count);
++	spin_unlock_irqrestore(&hvs->mm_lock, flags);
++	if (ret)
++		return ERR_PTR(ret);
++
++	alloc->channel = channel;
++
++	return alloc;
++}
++
++void vc4_hvs_mark_dlist_entry_stale(struct vc4_hvs *hvs,
++				    struct vc4_hvs_dlist_allocation *alloc)
++{
++	unsigned long flags;
++	u8 frcnt;
++
++	if (!alloc)
++		return;
++
++	if (!drm_mm_node_allocated(&alloc->mm_node))
++		return;
++
++	frcnt = vc4_hvs_get_fifo_frame_count(hvs, alloc->channel);
++	alloc->target_frame_count = (frcnt + 1) & ((1 << 6) - 1);
++
++	spin_lock_irqsave(&hvs->mm_lock, flags);
++
++	list_add_tail(&alloc->node, &hvs->stale_dlist_entries);
++
++	HVS_WRITE(SCALER_DISPSTAT, SCALER_DISPSTAT_EOF(alloc->channel));
++	vc4_hvs_irq_enable_eof(hvs, alloc->channel);
++
++	spin_unlock_irqrestore(&hvs->mm_lock, flags);
++}
++
++static void vc4_hvs_schedule_dlist_sweep(struct vc4_hvs *hvs,
++					 unsigned int channel)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&hvs->mm_lock, flags);
++
++	if (!list_empty(&hvs->stale_dlist_entries))
++		queue_work(system_unbound_wq, &hvs->free_dlist_work);
++
++	vc4_hvs_irq_clear_eof(hvs, channel);
++
++	spin_unlock_irqrestore(&hvs->mm_lock, flags);
++}
++
++/*
++ * Frame counts are essentially sequence numbers over 6 bits, and we
++ * thus can use sequence number arithmetic and follow the RFC1982 to
++ * implement proper comparison between them.
++ */
++static bool vc4_hvs_frcnt_lte(u8 cnt1, u8 cnt2)
++{
++	return (s8)((cnt1 << 2) - (cnt2 << 2)) <= 0;
++}
++
++/*
++ * Some atomic commits (legacy cursor updates, mostly) will not wait for
++ * the next vblank and will just return once the commit has been pushed
++ * to the hardware.
++ *
++ * On the hardware side, our HVS stores the planes parameters in its
++ * context RAM, and will use part of the RAM to store data during the
++ * frame rendering.
++ *
++ * This interacts badly if we get multiple commits before the next
++ * vblank since we could end up overwriting the DLIST entries used by
++ * previous commits if our dlist allocation reuses that entry. In such a
++ * case, we would overwrite the data currently being used by the
++ * hardware, resulting in a corrupted frame.
++ *
++ * In order to work around this, we'll queue the dlist entries in a list
++ * once the associated CRTC state is destroyed. The HVS only allows us
++ * to know which entry is being active, but not which one are no longer
++ * being used, so in order to avoid freeing entries that are still used
++ * by the hardware we add a guesstimate of the frame count where our
++ * entry will no longer be used, and thus will only free those entries
++ * when we will have reached that frame count.
++ */
++static void vc4_hvs_dlist_free_work(struct work_struct *work)
++{
++	struct vc4_hvs *hvs = container_of(work, struct vc4_hvs, free_dlist_work);
++	struct vc4_hvs_dlist_allocation *cur, *next;
++	unsigned long flags;
++
++	spin_lock_irqsave(&hvs->mm_lock, flags);
++	list_for_each_entry_safe(cur, next, &hvs->stale_dlist_entries, node) {
++		u8 frcnt;
++
++		frcnt = vc4_hvs_get_fifo_frame_count(hvs, cur->channel);
++		if (!vc4_hvs_frcnt_lte(cur->target_frame_count, frcnt))
++			continue;
++
++		list_del(&cur->node);
++		drm_mm_remove_node(&cur->mm_node);
++		kfree(cur);
++	}
++	spin_unlock_irqrestore(&hvs->mm_lock, flags);
++}
++
+ u8 vc4_hvs_get_fifo_frame_count(struct vc4_hvs *hvs, unsigned int fifo)
+ {
+ 	u8 field = 0;
+@@ -588,13 +732,12 @@ int vc4_hvs_atomic_check(struct drm_crtc
+ {
+ 	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
+ 	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state);
++	struct vc4_hvs_dlist_allocation *alloc;
+ 	struct drm_device *dev = crtc->dev;
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
+ 	struct drm_plane *plane;
+-	unsigned long flags;
+ 	const struct drm_plane_state *plane_state;
+ 	u32 dlist_count = 0;
+-	int ret;
+ 
+ 	/* The pixelvalve can only feed one encoder (and encoders are
+ 	 * 1:1 with connectors.)
+@@ -607,12 +750,11 @@ int vc4_hvs_atomic_check(struct drm_crtc
+ 
+ 	dlist_count++; /* Account for SCALER_CTL0_END. */
+ 
+-	spin_lock_irqsave(&vc4->hvs->mm_lock, flags);
+-	ret = drm_mm_insert_node(&vc4->hvs->dlist_mm, &vc4_state->mm,
+-				 dlist_count);
+-	spin_unlock_irqrestore(&vc4->hvs->mm_lock, flags);
+-	if (ret)
+-		return ret;
++	alloc = vc4_hvs_alloc_dlist_entry(vc4->hvs, vc4_state->assigned_channel, dlist_count);
++	if (IS_ERR(alloc))
++		return PTR_ERR(alloc);
++
++	vc4_state->mm = alloc;
+ 
+ 	return vc4_hvs_gamma_check(crtc, state);
+ }
+@@ -624,8 +766,9 @@ static void vc4_hvs_install_dlist(struct
+ 	struct vc4_hvs *hvs = vc4->hvs;
+ 	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state);
+ 
++	WARN_ON(!vc4_state->mm);
+ 	HVS_WRITE(SCALER_DISPLISTX(vc4_state->assigned_channel),
+-		  vc4_state->mm.start);
++		  vc4_state->mm->mm_node.start);
+ }
+ 
+ static void vc4_hvs_update_dlist(struct drm_crtc *crtc)
+@@ -650,8 +793,10 @@ static void vc4_hvs_update_dlist(struct
+ 		spin_unlock_irqrestore(&dev->event_lock, flags);
+ 	}
+ 
++	WARN_ON(!vc4_state->mm);
++
+ 	spin_lock_irqsave(&vc4_crtc->irq_lock, flags);
+-	vc4_crtc->current_dlist = vc4_state->mm.start;
++	vc4_crtc->current_dlist = vc4_state->mm->mm_node.start;
+ 	spin_unlock_irqrestore(&vc4_crtc->irq_lock, flags);
+ }
+ 
+@@ -708,8 +853,7 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 	struct vc4_plane_state *vc4_plane_state;
+ 	bool debug_dump_regs = false;
+ 	bool enable_bg_fill = false;
+-	u32 __iomem *dlist_start = vc4->hvs->dlist + vc4_state->mm.start;
+-	u32 __iomem *dlist_next = dlist_start;
++	u32 __iomem *dlist_start, *dlist_next;
+ 
+ 	if (vc4_state->assigned_channel == VC4_HVS_CHANNEL_DISABLED)
+ 		return;
+@@ -719,6 +863,9 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 		vc4_hvs_dump_state(hvs);
+ 	}
+ 
++	dlist_start = vc4->hvs->dlist + vc4_state->mm->mm_node.start;
++	dlist_next = dlist_start;
++
+ 	/* Copy all the active planes' dlist contents to the hardware dlist. */
+ 	drm_atomic_crtc_for_each_plane(plane, crtc) {
+ 		/* Is this the first active plane? */
+@@ -741,7 +888,8 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 	writel(SCALER_CTL0_END, dlist_next);
+ 	dlist_next++;
+ 
+-	WARN_ON_ONCE(dlist_next - dlist_start != vc4_state->mm.size);
++	WARN_ON(!vc4_state->mm);
++	WARN_ON_ONCE(dlist_next - dlist_start != vc4_state->mm->mm_node.size);
+ 
+ 	if (enable_bg_fill)
+ 		/* This sets a black background color fill, as is the case
+@@ -846,6 +994,11 @@ static irqreturn_t vc4_hvs_irq_handler(i
+ 
+ 			irqret = IRQ_HANDLED;
+ 		}
++
++		if (status & SCALER_DISPSTAT_EOF(channel)) {
++			vc4_hvs_schedule_dlist_sweep(hvs, channel);
++			irqret = IRQ_HANDLED;
++		}
+ 	}
+ 
+ 	/* Clear every per-channel interrupt flag. */
+@@ -902,6 +1055,8 @@ static int vc4_hvs_bind(struct device *d
+ 		hvs->dlist = hvs->regs + SCALER5_DLIST_START;
+ 
+ 	spin_lock_init(&hvs->mm_lock);
++	INIT_LIST_HEAD(&hvs->stale_dlist_entries);
++	INIT_WORK(&hvs->free_dlist_work, vc4_hvs_dlist_free_work);
+ 
+ 	/* Set up the HVS display list memory manager.  We never
+ 	 * overwrite the setup from the bootloader (just 128b out of
+--- a/drivers/gpu/drm/vc4/vc4_regs.h
++++ b/drivers/gpu/drm/vc4/vc4_regs.h
+@@ -234,6 +234,7 @@
+ # define SCALER_DISPCTRL_DSPEIEOLN(x)		BIT(8 + ((x) * 2))
+ /* Enables Display 0 EOF contribution to SCALER_DISPSTAT_IRQDISP0 */
+ # define SCALER_DISPCTRL_DSPEIEOF(x)		BIT(7 + ((x) * 2))
++# define SCALER5_DISPCTRL_DSPEIEOF(x)		BIT(7 + ((x) * 4))
+ 
+ # define SCALER_DISPCTRL_SLVRDEIRQ		BIT(6)
+ # define SCALER_DISPCTRL_SLVWREIRQ		BIT(5)
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0760-ARM-dts-Add-GPIO-line-names-for-downstream-RPis.patch b/root/target/linux/bcm27xx/patches-5.15/950-0760-ARM-dts-Add-GPIO-line-names-for-downstream-RPis.patch
new file mode 100644
index 00000000..b1291c54
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0760-ARM-dts-Add-GPIO-line-names-for-downstream-RPis.patch
@@ -0,0 +1,974 @@
+From 18a4f7fbb36d118aa3c6097b344f81b4b29625d3 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Sun, 20 Feb 2022 16:27:11 +0000
+Subject: [PATCH 760/828] ARM: dts: Add GPIO line names for downstream RPis
+
+Largely copied from the upstream dts files, with a few additions and
+tweaks.
+
+See: https://github.com/raspberrypi/linux/issues/2760
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/boot/dts/bcm2708-rpi-b-plus.dts   | 66 +++++++++++++++++++
+ arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts   | 67 +++++++++++++++++++
+ arch/arm/boot/dts/bcm2708-rpi-b.dts        | 66 +++++++++++++++++++
+ arch/arm/boot/dts/bcm2708-rpi-cm.dts       | 65 ++++++++++++++++++
+ arch/arm/boot/dts/bcm2708-rpi-zero-w.dts   | 67 +++++++++++++++++++
+ arch/arm/boot/dts/bcm2708-rpi-zero.dts     | 65 ++++++++++++++++++
+ arch/arm/boot/dts/bcm2709-rpi-2-b.dts      | 66 +++++++++++++++++++
+ arch/arm/boot/dts/bcm2710-rpi-2-b.dts      | 66 +++++++++++++++++++
+ arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 76 ++++++++++++++++++++++
+ arch/arm/boot/dts/bcm2710-rpi-3-b.dts      | 76 ++++++++++++++++++++++
+ arch/arm/boot/dts/bcm2710-rpi-cm3.dts      | 72 ++++++++++++++++++++
+ arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts | 67 +++++++++++++++++++
+ 12 files changed, 819 insertions(+)
+
+--- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
+@@ -12,6 +12,72 @@
+ };
+ 
+ &gpio {
++	/*
++	 * Taken from Raspberry-Pi-B-Plus-V1.2-Schematics.pdf
++	 * RPI-BPLUS sheet 1
++	 *
++	 * Legend:
++	 * "NC" = not connected (no rail from the SoC)
++	 * "FOO" = GPIO line named "FOO" on the schematic
++	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
++	 */
++	gpio-line-names = "ID_SDA",
++			  "ID_SCL",
++			  "SDA1",
++			  "SCL1",
++			  "GPIO_GCLK",
++			  "GPIO5",
++			  "GPIO6",
++			  "SPI_CE1_N",
++			  "SPI_CE0_N",
++			  "SPI_MISO",
++			  "SPI_MOSI",
++			  "SPI_SCLK",
++			  "GPIO12",
++			  "GPIO13",
++			  /* Serial port */
++			  "TXD0",
++			  "RXD0",
++			  "GPIO16",
++			  "GPIO17",
++			  "GPIO18",
++			  "GPIO19",
++			  "GPIO20",
++			  "GPIO21",
++			  "GPIO22",
++			  "GPIO23",
++			  "GPIO24",
++			  "GPIO25",
++			  "GPIO26",
++			  "GPIO27",
++			  "SDA0",
++			  "SCL0",
++			  "NC", /* GPIO30 */
++			  "LAN_RUN", /* GPIO31 */
++			  "CAM_GPIO1", /* GPIO32 */
++			  "NC", /* GPIO33 */
++			  "NC", /* GPIO34 */
++			  "PWR_LOW_N", /* GPIO35 */
++			  "NC", /* GPIO36 */
++			  "NC", /* GPIO37 */
++			  "USB_LIMIT", /* GPIO38 */
++			  "NC", /* GPIO39 */
++			  "PWM0_OUT", /* GPIO40 */
++			  "CAM_GPIO0", /* GPIO41 */
++			  "NC", /* GPIO42 */
++			  "NC", /* GPIO43 */
++			  "ETH_CLK", /* GPIO44 */
++			  "PWM1_OUT", /* GPIO45 */
++			  "HDMI_HPD_N",
++			  "STATUS_LED",
++			  /* Used by SD Card */
++			  "SD_CLK_R",
++			  "SD_CMD_R",
++			  "SD_DATA0_R",
++			  "SD_DATA1_R",
++			  "SD_DATA2_R",
++			  "SD_DATA3_R";
++
+ 	spi0_pins: spi0_pins {
+ 		brcm,pins = <9 10 11>;
+ 		brcm,function = <4>; /* alt0 */
+--- a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
+@@ -11,6 +11,73 @@
+ };
+ 
+ &gpio {
++	/*
++	 * Taken from Raspberry-Pi-Rev-1.0-Model-AB-Schematics.pdf
++	 * RPI00021 sheet 02
++	 *
++	 * Legend:
++	 * "NC" = not connected (no rail from the SoC)
++	 * "FOO" = GPIO line named "FOO" on the schematic
++	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
++	 */
++	gpio-line-names = "SDA0",
++			  "SCL0",
++			  "SDA1",
++			  "SCL1",
++			  "GPIO_GCLK",
++			  "CAM_GPIO1",
++			  "LAN_RUN",
++			  "SPI_CE1_N",
++			  "SPI_CE0_N",
++			  "SPI_MISO",
++			  "SPI_MOSI",
++			  "SPI_SCLK",
++			  "NC", /* GPIO12 */
++			  "NC", /* GPIO13 */
++			  /* Serial port */
++			  "TXD0",
++			  "RXD0",
++			  "STATUS_LED_N",
++			  "GPIO17",
++			  "GPIO18",
++			  "NC", /* GPIO19 */
++			  "NC", /* GPIO20 */
++			  "GPIO21",
++			  "GPIO22",
++			  "GPIO23",
++			  "GPIO24",
++			  "GPIO25",
++			  "NC", /* GPIO26 */
++			  "CAM_GPIO0",
++			  /* Binary number representing build/revision */
++			  "CONFIG0",
++			  "CONFIG1",
++			  "CONFIG2",
++			  "CONFIG3",
++			  "NC", /* GPIO32 */
++			  "NC", /* GPIO33 */
++			  "NC", /* GPIO34 */
++			  "NC", /* GPIO35 */
++			  "NC", /* GPIO36 */
++			  "NC", /* GPIO37 */
++			  "NC", /* GPIO38 */
++			  "NC", /* GPIO39 */
++			  "PWM0_OUT",
++			  "NC", /* GPIO41 */
++			  "NC", /* GPIO42 */
++			  "NC", /* GPIO43 */
++			  "NC", /* GPIO44 */
++			  "PWM1_OUT",
++			  "HDMI_HPD_P",
++			  "SD_CARD_DET",
++			  /* Used by SD Card */
++			  "SD_CLK_R",
++			  "SD_CMD_R",
++			  "SD_DATA0_R",
++			  "SD_DATA1_R",
++			  "SD_DATA2_R",
++			  "SD_DATA3_R";
++
+ 	spi0_pins: spi0_pins {
+ 		brcm,pins = <9 10 11>;
+ 		brcm,function = <4>; /* alt0 */
+--- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
+@@ -12,6 +12,72 @@
+ };
+ 
+ &gpio {
++	/*
++	 * Taken from Raspberry-Pi-Rev-2.0-Model-AB-Schematics.pdf
++	 * RPI00022 sheet 02
++	 *
++	 * Legend:
++	 * "NC" = not connected (no rail from the SoC)
++	 * "FOO" = GPIO line named "FOO" on the schematic
++	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
++	 */
++	gpio-line-names = "SDA0",
++			  "SCL0",
++			  "SDA1",
++			  "SCL1",
++			  "GPIO_GCLK",
++			  "CAM_GPIO1",
++			  "LAN_RUN",
++			  "SPI_CE1_N",
++			  "SPI_CE0_N",
++			  "SPI_MISO",
++			  "SPI_MOSI",
++			  "SPI_SCLK",
++			  "NC", /* GPIO12 */
++			  "NC", /* GPIO13 */
++			  /* Serial port */
++			  "TXD0",
++			  "RXD0",
++			  "STATUS_LED_N",
++			  "GPIO17",
++			  "GPIO18",
++			  "NC", /* GPIO19 */
++			  "NC", /* GPIO20 */
++			  "CAM_GPIO0",
++			  "GPIO22",
++			  "GPIO23",
++			  "GPIO24",
++			  "GPIO25",
++			  "NC", /* GPIO26 */
++			  "GPIO27",
++			  "GPIO28",
++			  "GPIO29",
++			  "GPIO30",
++			  "GPIO31",
++			  "NC", /* GPIO32 */
++			  "NC", /* GPIO33 */
++			  "NC", /* GPIO34 */
++			  "NC", /* GPIO35 */
++			  "NC", /* GPIO36 */
++			  "NC", /* GPIO37 */
++			  "NC", /* GPIO38 */
++			  "NC", /* GPIO39 */
++			  "PWM0_OUT",
++			  "NC", /* GPIO41 */
++			  "NC", /* GPIO42 */
++			  "NC", /* GPIO43 */
++			  "NC", /* GPIO44 */
++			  "PWM1_OUT",
++			  "HDMI_HPD_P",
++			  "SD_CARD_DET",
++			  /* Used by SD Card */
++			  "SD_CLK_R",
++			  "SD_CMD_R",
++			  "SD_DATA0_R",
++			  "SD_DATA1_R",
++			  "SD_DATA2_R",
++			  "SD_DATA3_R";
++
+ 	spi0_pins: spi0_pins {
+ 		brcm,pins = <9 10 11>;
+ 		brcm,function = <4>; /* alt0 */
+--- a/arch/arm/boot/dts/bcm2708-rpi-cm.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
+@@ -24,6 +24,71 @@ cam0_reg: &cam0_regulator {
+ };
+ 
+ &gpio {
++	/*
++	 * This is based on the official GPU firmware DT blob.
++	 *
++	 * Legend:
++	 * "NC" = not connected (no rail from the SoC)
++	 * "FOO" = GPIO line named "FOO" on the schematic
++	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
++	 */
++	gpio-line-names = "GPIO0",
++			  "GPIO1",
++			  "GPIO2",
++			  "GPIO3",
++			  "GPIO4",
++			  "GPIO5",
++			  "GPIO6",
++			  "GPIO7",
++			  "GPIO8",
++			  "GPIO9",
++			  "GPIO10",
++			  "GPIO11",
++			  "GPIO12",
++			  "GPIO13",
++			  "GPIO14",
++			  "GPIO15",
++			  "GPIO16",
++			  "GPIO17",
++			  "GPIO18",
++			  "GPIO19",
++			  "GPIO20",
++			  "GPIO21",
++			  "GPIO22",
++			  "GPIO23",
++			  "GPIO24",
++			  "GPIO25",
++			  "GPIO26",
++			  "GPIO27",
++			  "GPIO28",
++			  "GPIO29",
++			  "GPIO30",
++			  "GPIO31",
++			  "GPIO32",
++			  "GPIO33",
++			  "GPIO34",
++			  "GPIO35",
++			  "GPIO36",
++			  "GPIO37",
++			  "GPIO38",
++			  "GPIO39",
++			  "GPIO40",
++			  "GPIO41",
++			  "GPIO42",
++			  "GPIO43",
++			  "GPIO44",
++			  "GPIO45",
++			  "HDMI_HPD_N",
++			  /* Also used as ACT LED */
++			  "EMMC_EN_N",
++			  /* Used by eMMC */
++			  "SD_CLK_R",
++			  "SD_CMD_R",
++			  "SD_DATA0_R",
++			  "SD_DATA1_R",
++			  "SD_DATA2_R",
++			  "SD_DATA3_R";
++
+ 	spi0_pins: spi0_pins {
+ 		brcm,pins = <9 10 11>;
+ 		brcm,function = <4>; /* alt0 */
+--- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
+@@ -22,6 +22,73 @@
+ };
+ 
+ &gpio {
++	/*
++	 * This is based on the official GPU firmware DT blob.
++	 *
++	 * Legend:
++	 * "NC" = not connected (no rail from the SoC)
++	 * "FOO" = GPIO line named "FOO" on the schematic
++	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
++	 */
++	gpio-line-names = "ID_SDA",
++			  "ID_SCL",
++			  "SDA1",
++			  "SCL1",
++			  "GPIO_GCLK",
++			  "GPIO5",
++			  "GPIO6",
++			  "SPI_CE1_N",
++			  "SPI_CE0_N",
++			  "SPI_MISO",
++			  "SPI_MOSI",
++			  "SPI_SCLK",
++			  "GPIO12",
++			  "GPIO13",
++			  /* Serial port */
++			  "TXD0",
++			  "RXD0",
++			  "GPIO16",
++			  "GPIO17",
++			  "GPIO18",
++			  "GPIO19",
++			  "GPIO20",
++			  "GPIO21",
++			  "GPIO22",
++			  "GPIO23",
++			  "GPIO24",
++			  "GPIO25",
++			  "GPIO26",
++			  "GPIO27",
++			  "SDA0",
++			  "SCL0",
++			  /* Used by BT module */
++			  "CTS0",
++			  "RTS0",
++			  "TXD0",
++			  "RXD0",
++			  /* Used by Wifi */
++			  "SD1_CLK",
++			  "SD1_CMD",
++			  "SD1_DATA0",
++			  "SD1_DATA1",
++			  "SD1_DATA2",
++			  "SD1_DATA3",
++			  "CAM_GPIO1", /* GPIO40 */
++			  "WL_ON", /* GPIO41 */
++			  "NC", /* GPIO42 */
++			  "WIFI_CLK", /* GPIO43 */
++			  "CAM_GPIO0", /* GPIO44 */
++			  "BT_ON", /* GPIO45 */
++			  "HDMI_HPD_N",
++			  "STATUS_LED_N",
++			  /* Used by SD Card */
++			  "SD_CLK_R",
++			  "SD_CMD_R",
++			  "SD_DATA0_R",
++			  "SD_DATA1_R",
++			  "SD_DATA2_R",
++			  "SD_DATA3_R";
++
+ 	spi0_pins: spi0_pins {
+ 		brcm,pins = <9 10 11>;
+ 		brcm,function = <4>; /* alt0 */
+--- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
++++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
+@@ -15,6 +15,71 @@
+ };
+ 
+ &gpio {
++	/*
++	 * This is based on the official GPU firmware DT blob.
++	 *
++	 * Legend:
++	 * "NC" = not connected (no rail from the SoC)
++	 * "FOO" = GPIO line named "FOO" on the schematic
++	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
++	 */
++	gpio-line-names = "ID_SDA",
++			  "ID_SCL",
++			  "SDA1",
++			  "SCL1",
++			  "GPIO_GCLK",
++			  "GPIO5",
++			  "GPIO6",
++			  "SPI_CE1_N",
++			  "SPI_CE0_N",
++			  "SPI_MISO",
++			  "SPI_MOSI",
++			  "SPI_SCLK",
++			  "GPIO12",
++			  "GPIO13",
++			  /* Serial port */
++			  "TXD0",
++			  "RXD0",
++			  "GPIO16",
++			  "GPIO17",
++			  "GPIO18",
++			  "GPIO19",
++			  "GPIO20",
++			  "GPIO21",
++			  "GPIO22",
++			  "GPIO23",
++			  "GPIO24",
++			  "GPIO25",
++			  "GPIO26",
++			  "GPIO27",
++			  "SDA0",
++			  "SCL0",
++			  "NC", /* GPIO30 */
++			  "NC", /* GPIO31 */
++			  "CAM_GPIO1", /* GPIO32 */
++			  "NC", /* GPIO33 */
++			  "NC", /* GPIO34 */
++			  "NC", /* GPIO35 */
++			  "NC", /* GPIO36 */
++			  "NC", /* GPIO37 */
++			  "NC", /* GPIO38 */
++			  "NC", /* GPIO39 */
++			  "NC", /* GPIO40 */
++			  "CAM_GPIO0", /* GPIO41 */
++			  "NC", /* GPIO42 */
++			  "NC", /* GPIO43 */
++			  "NC", /* GPIO44 */
++			  "NC", /* GPIO45 */
++			  "HDMI_HPD_N",
++			  "STATUS_LED_N",
++			  /* Used by SD Card */
++			  "SD_CLK_R",
++			  "SD_CMD_R",
++			  "SD_DATA0_R",
++			  "SD_DATA1_R",
++			  "SD_DATA2_R",
++			  "SD_DATA3_R";
++
+ 	spi0_pins: spi0_pins {
+ 		brcm,pins = <9 10 11>;
+ 		brcm,function = <4>; /* alt0 */
+--- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
++++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
+@@ -12,6 +12,72 @@
+ };
+ 
+ &gpio {
++	/*
++	 * Taken from rpi_SCH_2b_1p2_reduced.pdf and
++	 * the official GPU firmware DT blob.
++	 *
++	 * Legend:
++	 * "NC" = not connected (no rail from the SoC)
++	 * "FOO" = GPIO line named "FOO" on the schematic
++	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
++	 */
++	gpio-line-names = "ID_SDA",
++			  "ID_SCL",
++			  "SDA1",
++			  "SCL1",
++			  "GPIO_GCLK",
++			  "GPIO5",
++			  "GPIO6",
++			  "SPI_CE1_N",
++			  "SPI_CE0_N",
++			  "SPI_MISO",
++			  "SPI_MOSI",
++			  "SPI_SCLK",
++			  "GPIO12",
++			  "GPIO13",
++			  /* Serial port */
++			  "TXD0",
++			  "RXD0",
++			  "GPIO16",
++			  "GPIO17",
++			  "GPIO18",
++			  "GPIO19",
++			  "GPIO20",
++			  "GPIO21",
++			  "GPIO22",
++			  "GPIO23",
++			  "GPIO24",
++			  "GPIO25",
++			  "GPIO26",
++			  "GPIO27",
++			  "SDA0",
++			  "SCL0",
++			  "NC", /* GPIO30 */
++			  "LAN_RUN",
++			  "CAM_GPIO1",
++			  "NC", /* GPIO33 */
++			  "NC", /* GPIO34 */
++			  "PWR_LOW_N",
++			  "NC", /* GPIO36 */
++			  "NC", /* GPIO37 */
++			  "USB_LIMIT",
++			  "NC", /* GPIO39 */
++			  "PWM0_OUT",
++			  "CAM_GPIO0",
++			  "SMPS_SCL",
++			  "SMPS_SDA",
++			  "ETH_CLK",
++			  "PWM1_OUT",
++			  "HDMI_HPD_N",
++			  "STATUS_LED",
++			  /* Used by SD Card */
++			  "SD_CLK_R",
++			  "SD_CMD_R",
++			  "SD_DATA0_R",
++			  "SD_DATA1_R",
++			  "SD_DATA2_R",
++			  "SD_DATA3_R";
++
+ 	spi0_pins: spi0_pins {
+ 		brcm,pins = <9 10 11>;
+ 		brcm,function = <4>; /* alt0 */
+--- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
++++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
+@@ -12,6 +12,72 @@
+ };
+ 
+ &gpio {
++	/*
++	 * Taken from rpi_SCH_2b_1p2_reduced.pdf and
++	 * the official GPU firmware DT blob.
++	 *
++	 * Legend:
++	 * "NC" = not connected (no rail from the SoC)
++	 * "FOO" = GPIO line named "FOO" on the schematic
++	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
++	 */
++	gpio-line-names = "ID_SDA",
++			  "ID_SCL",
++			  "SDA1",
++			  "SCL1",
++			  "GPIO_GCLK",
++			  "GPIO5",
++			  "GPIO6",
++			  "SPI_CE1_N",
++			  "SPI_CE0_N",
++			  "SPI_MISO",
++			  "SPI_MOSI",
++			  "SPI_SCLK",
++			  "GPIO12",
++			  "GPIO13",
++			  /* Serial port */
++			  "TXD0",
++			  "RXD0",
++			  "GPIO16",
++			  "GPIO17",
++			  "GPIO18",
++			  "GPIO19",
++			  "GPIO20",
++			  "GPIO21",
++			  "GPIO22",
++			  "GPIO23",
++			  "GPIO24",
++			  "GPIO25",
++			  "GPIO26",
++			  "GPIO27",
++			  "SDA0",
++			  "SCL0",
++			  "NC", /* GPIO30 */
++			  "LAN_RUN",
++			  "CAM_GPIO1",
++			  "NC", /* GPIO33 */
++			  "NC", /* GPIO34 */
++			  "PWR_LOW_N",
++			  "NC", /* GPIO36 */
++			  "NC", /* GPIO37 */
++			  "USB_LIMIT",
++			  "NC", /* GPIO39 */
++			  "PWM0_OUT",
++			  "CAM_GPIO0",
++			  "SMPS_SCL",
++			  "SMPS_SDA",
++			  "ETH_CLK",
++			  "PWM1_OUT",
++			  "HDMI_HPD_N",
++			  "STATUS_LED",
++			  /* Used by SD Card */
++			  "SD_CLK_R",
++			  "SD_CMD_R",
++			  "SD_DATA0_R",
++			  "SD_DATA1_R",
++			  "SD_DATA2_R",
++			  "SD_DATA3_R";
++
+ 	spi0_pins: spi0_pins {
+ 		brcm,pins = <9 10 11>;
+ 		brcm,function = <4>; /* alt0 */
+--- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
++++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
+@@ -23,6 +23,74 @@
+ };
+ 
+ &gpio {
++	/*
++	 * Taken from rpi_SCH_3bplus_1p0_reduced.pdf and
++	 * the official GPU firmware DT blob.
++	 *
++	 * Legend:
++	 * "NC" = not connected (no rail from the SoC)
++	 * "FOO" = GPIO line named "FOO" on the schematic
++	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
++	 */
++	gpio-line-names = "ID_SDA",
++			  "ID_SCL",
++			  "SDA1",
++			  "SCL1",
++			  "GPIO_GCLK",
++			  "GPIO5",
++			  "GPIO6",
++			  "SPI_CE1_N",
++			  "SPI_CE0_N",
++			  "SPI_MISO",
++			  "SPI_MOSI",
++			  "SPI_SCLK",
++			  "GPIO12",
++			  "GPIO13",
++			  /* Serial port */
++			  "TXD1",
++			  "RXD1",
++			  "GPIO16",
++			  "GPIO17",
++			  "GPIO18",
++			  "GPIO19",
++			  "GPIO20",
++			  "GPIO21",
++			  "GPIO22",
++			  "GPIO23",
++			  "GPIO24",
++			  "GPIO25",
++			  "GPIO26",
++			  "GPIO27",
++			  "HDMI_HPD_N",
++			  "STATUS_LED_G",
++			  /* Used by BT module */
++			  "CTS0",
++			  "RTS0",
++			  "TXD0",
++			  "RXD0",
++			  /* Used by Wifi */
++			  "SD1_CLK",
++			  "SD1_CMD",
++			  "SD1_DATA0",
++			  "SD1_DATA1",
++			  "SD1_DATA2",
++			  "SD1_DATA3",
++			  "PWM0_OUT",
++			  "PWM1_OUT",
++			  "ETH_CLK",
++			  "WIFI_CLK",
++			  "SDA0",
++			  "SCL0",
++			  "SMPS_SCL",
++			  "SMPS_SDA",
++			  /* Used by SD Card */
++			  "SD_CLK_R",
++			  "SD_CMD_R",
++			  "SD_DATA0_R",
++			  "SD_DATA1_R",
++			  "SD_DATA2_R",
++			  "SD_DATA3_R";
++
+ 	spi0_pins: spi0_pins {
+ 		brcm,pins = <9 10 11>;
+ 		brcm,function = <4>; /* alt0 */
+@@ -97,6 +165,14 @@
+ 		compatible = "raspberrypi,firmware-gpio";
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
++		gpio-line-names = "BT_ON",
++				  "WL_ON",
++				  "PWR_LED_R",
++				  "LAN_RUN",
++				  "NC",
++				  "CAM_GPIO0",
++				  "CAM_GPIO1",
++				  "NC";
+ 		status = "okay";
+ 	};
+ };
+--- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
++++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
+@@ -23,6 +23,74 @@
+ };
+ 
+ &gpio {
++	/*
++	 * Taken from rpi_SCH_3b_1p2_reduced.pdf and
++	 * the official GPU firmware DT blob.
++	 *
++	 * Legend:
++	 * "NC" = not connected (no rail from the SoC)
++	 * "FOO" = GPIO line named "FOO" on the schematic
++	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
++	 */
++	gpio-line-names = "ID_SDA",
++			  "ID_SCL",
++			  "SDA1",
++			  "SCL1",
++			  "GPIO_GCLK",
++			  "GPIO5",
++			  "GPIO6",
++			  "SPI_CE1_N",
++			  "SPI_CE0_N",
++			  "SPI_MISO",
++			  "SPI_MOSI",
++			  "SPI_SCLK",
++			  "GPIO12",
++			  "GPIO13",
++			  /* Serial port */
++			  "TXD1",
++			  "RXD1",
++			  "GPIO16",
++			  "GPIO17",
++			  "GPIO18",
++			  "GPIO19",
++			  "GPIO20",
++			  "GPIO21",
++			  "GPIO22",
++			  "GPIO23",
++			  "GPIO24",
++			  "GPIO25",
++			  "GPIO26",
++			  "GPIO27",
++			  "NC", /* GPIO 28 */
++			  "LAN_RUN_BOOT",
++			  /* Used by BT module */
++			  "CTS0",
++			  "RTS0",
++			  "TXD0",
++			  "RXD0",
++			  /* Used by Wifi */
++			  "SD1_CLK",
++			  "SD1_CMD",
++			  "SD1_DATA0",
++			  "SD1_DATA1",
++			  "SD1_DATA2",
++			  "SD1_DATA3",
++			  "PWM0_OUT",
++			  "PWM1_OUT",
++			  "ETH_CLK",
++			  "WIFI_CLK",
++			  "SDA0",
++			  "SCL0",
++			  "SMPS_SCL",
++			  "SMPS_SDA",
++			  /* Used by SD Card */
++			  "SD_CLK_R",
++			  "SD_CMD_R",
++			  "SD_DATA0_R",
++			  "SD_DATA1_R",
++			  "SD_DATA2_R",
++			  "SD_DATA3_R";
++
+ 	spi0_pins: spi0_pins {
+ 		brcm,pins = <9 10 11>;
+ 		brcm,function = <4>; /* alt0 */
+@@ -108,6 +176,14 @@
+ 		compatible = "raspberrypi,firmware-gpio";
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
++		gpio-line-names = "BT_ON",
++				  "WL_ON",
++				  "STATUS_LED",
++				  "LAN_RUN",
++				  "HDMI_HPD_N",
++				  "CAM_GPIO0",
++				  "CAM_GPIO1",
++				  "PWR_LOW_N";
+ 		status = "okay";
+ 	};
+ };
+--- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
++++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
+@@ -24,6 +24,70 @@ cam0_reg: &cam0_regulator {
+ };
+ 
+ &gpio {
++	/*
++	 * This is based on the official GPU firmware DT blob.
++	 *
++	 * Legend:
++	 * "NC" = not connected (no rail from the SoC)
++	 * "FOO" = GPIO line named "FOO" on the schematic
++	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
++	 */
++	gpio-line-names = "GPIO0",
++			  "GPIO1",
++			  "GPIO2",
++			  "GPIO3",
++			  "GPIO4",
++			  "GPIO5",
++			  "GPIO6",
++			  "GPIO7",
++			  "GPIO8",
++			  "GPIO9",
++			  "GPIO10",
++			  "GPIO11",
++			  "GPIO12",
++			  "GPIO13",
++			  "GPIO14",
++			  "GPIO15",
++			  "GPIO16",
++			  "GPIO17",
++			  "GPIO18",
++			  "GPIO19",
++			  "GPIO20",
++			  "GPIO21",
++			  "GPIO22",
++			  "GPIO23",
++			  "GPIO24",
++			  "GPIO25",
++			  "GPIO26",
++			  "GPIO27",
++			  "GPIO28",
++			  "GPIO29",
++			  "GPIO30",
++			  "GPIO31",
++			  "GPIO32",
++			  "GPIO33",
++			  "GPIO34",
++			  "GPIO35",
++			  "GPIO36",
++			  "GPIO37",
++			  "GPIO38",
++			  "GPIO39",
++			  "GPIO40",
++			  "GPIO41",
++			  "GPIO42",
++			  "GPIO43",
++			  "GPIO44",
++			  "GPIO45",
++			  "SMPS_SCL",
++			  "SMPS_SDA",
++			  /* Used by eMMC */
++			  "SD_CLK_R",
++			  "SD_CMD_R",
++			  "SD_DATA0_R",
++			  "SD_DATA1_R",
++			  "SD_DATA2_R",
++			  "SD_DATA3_R";
++
+ 	spi0_pins: spi0_pins {
+ 		brcm,pins = <9 10 11>;
+ 		brcm,function = <4>; /* alt0 */
+@@ -71,6 +135,14 @@ cam0_reg: &cam0_regulator {
+ 		compatible = "raspberrypi,firmware-gpio";
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
++		gpio-line-names = "HDMI_HPD_N",
++				  "EMMC_EN_N",
++				  "NC",
++				  "NC",
++				  "NC",
++				  "NC",
++				  "NC",
++				  "NC";
+ 		status = "okay";
+ 	};
+ };
+--- a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
++++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
+@@ -22,6 +22,73 @@
+ };
+ 
+ &gpio {
++	/*
++	 * This is based on the official GPU firmware DT blob.
++	 *
++	 * Legend:
++	 * "NC" = not connected (no rail from the SoC)
++	 * "FOO" = GPIO line named "FOO" on the schematic
++	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
++	 */
++	gpio-line-names = "ID_SDA",
++			  "ID_SCL",
++			  "SDA1",
++			  "SCL1",
++			  "GPIO_GCLK",
++			  "GPIO5",
++			  "GPIO6",
++			  "SPI_CE1_N",
++			  "SPI_CE0_N",
++			  "SPI_MISO",
++			  "SPI_MOSI",
++			  "SPI_SCLK",
++			  "GPIO12",
++			  "GPIO13",
++			  /* Serial port */
++			  "TXD0",
++			  "RXD0",
++			  "GPIO16",
++			  "GPIO17",
++			  "GPIO18",
++			  "GPIO19",
++			  "GPIO20",
++			  "GPIO21",
++			  "GPIO22",
++			  "GPIO23",
++			  "GPIO24",
++			  "GPIO25",
++			  "GPIO26",
++			  "GPIO27",
++			  "HDMI_HPD_N",
++			  "STATUS_LED_N",
++			  /* Used by BT module */
++			  "CTS0",
++			  "RTS0",
++			  "TXD0",
++			  "RXD0",
++			  /* Used by Wifi */
++			  "SD1_CLK",
++			  "SD1_CMD",
++			  "SD1_DATA0",
++			  "SD1_DATA1",
++			  "SD1_DATA2",
++			  "SD1_DATA3",
++			  "CAM_GPIO1", /* GPIO40 */
++			  "WL_ON", /* GPIO41 */
++			  "BT_ON", /* GPIO42 */
++			  "WIFI_CLK", /* GPIO43 */
++			  "SDA0", /* GPIO44 */
++			  "SCL0", /* GPIO45 */
++			  "SMPS_SCL", /* GPIO46 */
++			  "SMPS_SDA", /* GPIO47 */
++			  /* Used by SD Card */
++			  "SD_CLK_R",
++			  "SD_CMD_R",
++			  "SD_DATA0_R",
++			  "SD_DATA1_R",
++			  "SD_DATA2_R",
++			  "SD_DATA3_R";
++
+ 	spi0_pins: spi0_pins {
+ 		brcm,pins = <9 10 11>;
+ 		brcm,function = <4>; /* alt0 */
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0761-overlays-fixes-probing-of-Hifiberry-DAC2-HD.patch b/root/target/linux/bcm27xx/patches-5.15/950-0761-overlays-fixes-probing-of-Hifiberry-DAC2-HD.patch
new file mode 100644
index 00000000..679cbcc2
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0761-overlays-fixes-probing-of-Hifiberry-DAC2-HD.patch
@@ -0,0 +1,65 @@
+From 4d92999522e0281983b3445304ac89ebfba08995 Mon Sep 17 00:00:00 2001
+From: Joerg Schambacher <joerg@hifiberry.com>
+Date: Wed, 23 Feb 2022 12:08:42 +0100
+Subject: [PATCH 761/828] overlays:fixes probing of Hifiberry DAC2 HD
+
+Removed clocks-declarations in I2C sections of the DT-overlay
+which kept the devices from probing.
+
+Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
+---
+ .../dts/overlays/hifiberry-dacplushd-overlay.dts | 16 ++--------------
+ 1 file changed, 2 insertions(+), 14 deletions(-)
+
+--- a/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts
++++ b/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts
+@@ -8,23 +8,13 @@
+ 	compatible = "brcm,bcm2835";
+ 
+ 	fragment@0 {
+-		target-path = "/";
+-		__overlay__ {
+-			dachd_osc: pll_dachd_osc {
+-				compatible = "hifiberry,dachd-clk";
+-				#clock-cells = <0>;
+-			};
+-		};
+-	};
+-
+-	fragment@1 {
+ 		target = <&i2s>;
+ 		__overlay__ {
+ 			status = "okay";
+ 		};
+ 	};
+ 
+-	fragment@2 {
++	fragment@1 {
+ 		target = <&i2c1>;
+ 		__overlay__ {
+ 			#address-cells = <1>;
+@@ -35,7 +25,6 @@
+ 				compatible = "ti,pcm1792a";
+ 				#sound-dai-cells = <0>;
+ 				#clock-cells = <0>;
+-				clocks = <&dachd_osc>;
+ 				reg = <0x4c>;
+ 				status = "okay";
+ 			};
+@@ -43,7 +32,6 @@
+ 				compatible = "hifiberry,dachd-clk";
+ 				#clock-cells = <0>;
+ 				reg = <0x62>;
+-				clocks = <&dachd_osc>;
+ 				status = "okay";
+ 				common_pll_regs = [
+ 					02 53 03 00 07 20 0F 00
+@@ -92,7 +80,7 @@
+ 		};
+ 	};
+ 
+-	fragment@3 {
++	fragment@2 {
+ 		target = <&sound>;
+ 		__overlay__ {
+ 			compatible = "hifiberry,hifiberry-dacplushd";
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0762-overlays-Overlays-for-WaveShare-2-Chan-CAN-FD-HAT.patch b/root/target/linux/bcm27xx/patches-5.15/950-0762-overlays-Overlays-for-WaveShare-2-Chan-CAN-FD-HAT.patch
new file mode 100644
index 00000000..73da6ba3
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0762-overlays-Overlays-for-WaveShare-2-Chan-CAN-FD-HAT.patch
@@ -0,0 +1,321 @@
+From 4c2f3d8b9d293b8fd820727aad573f9431f00715 Mon Sep 17 00:00:00 2001
+From: nmbath <mark@baggywrinkle.co.uk>
+Date: Thu, 24 Feb 2022 13:10:01 +0000
+Subject: [PATCH 762/828] overlays: Overlays for WaveShare 2-Chan CAN FD HAT
+
+This patch adds the overlays for the Waveshare 2-Channel Isolated
+CAN FD Expansion HAT for Raspberry Pi, Multi Protections. This HAT
+is based on the mcp2518fd chip and can be run in two modes
+
+Mode A: can0 on spi0.0 and can1 on spi1.0 (cs = pin 26)
+Mode B: can1 on spi0.0 and can1 in spi0.1
+
+Interupts: can0 pin 25 / can1 pin 16
+
+https://www.waveshare.com/2-ch-can-fd-hat.htm
+
+Overlays generated by:
+Mode A: ovmerge -c spi1-1cs-overlay.dts,cs0_pin=26,cs0_spidev=false \
+              mcp251xfd-overlay.dts,spi0-0,interrupt=25 \
+              mcp251xfd-overlay.dts,spi1-0,interrupt=16
+
+Mode B: ovmerge -c mcp251xfd-overlay.dts,spi0-0,interrupt=25 \
+              mcp251xfd-overlay.dts,spi0-1,interrupt=16
+---
+ arch/arm/boot/dts/overlays/Makefile           |   2 +
+ arch/arm/boot/dts/overlays/README             |  20 +++
+ .../waveshare-can-fd-hat-mode-a-overlay.dts   | 140 ++++++++++++++++++
+ .../waveshare-can-fd-hat-mode-b-overlay.dts   | 103 +++++++++++++
+ 4 files changed, 265 insertions(+)
+ create mode 100644 arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-a-overlay.dts
+ create mode 100644 arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-b-overlay.dts
+
+--- a/arch/arm/boot/dts/overlays/Makefile
++++ b/arch/arm/boot/dts/overlays/Makefile
+@@ -251,6 +251,8 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
+ 	w1-gpio.dtbo \
+ 	w1-gpio-pullup.dtbo \
+ 	w5500.dtbo \
++	waveshare-can-fd-hat-mode-a.dtbo \
++	waveshare-can-fd-hat-mode-b.dtbo \
+ 	wittypi.dtbo \
+ 	wm8960-soundcard.dtbo
+ 
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -3879,6 +3879,26 @@ Params: int_pin                 GPIO use
+         cs                      SPI bus Chip Select (default 0)
+ 
+ 
++Name:   waveshare-can-fd-hat-mode-a
++Info:   Overlay for the Waveshare 2-Channel Isolated CAN FD Expansion HAT
++        for Raspberry Pi, Multi Protections. Use this overlay when the
++        HAT is configured in Mode A (Default), with can0 on spi0.0
++        and can1 on spi1.0.
++        https://www.waveshare.com/2-ch-can-fd-hat.htm
++Load:   dtoverlay=waveshare-can-fd-hat-mode-a
++Params: <None>
++
++
++Name:   waveshare-can-fd-hat-mode-b
++Info:   Overlay for the Waveshare 2-Channel Isolated CAN FD Expansion HAT
++        for Raspberry Pi, Multi Protections. Use this overlay when the
++        HAT is configured in Mode B (requires hardware modification), with
++        can0 on spi0.0 and can1 on spi0.1.
++        https://www.waveshare.com/2-ch-can-fd-hat.htm
++Load:   dtoverlay=waveshare-can-fd-hat-mode-b
++Params: <None>
++
++
+ Name:   wittypi
+ Info:   Configures the wittypi RTC module.
+ Load:   dtoverlay=wittypi,<param>=<val>
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-a-overlay.dts
+@@ -0,0 +1,140 @@
++// redo: ovmerge -c spi1-1cs-overlay.dts,cs0_pin=26,cs0_spidev=false mcp251xfd-overlay.dts,spi0-0,interrupt=25 mcp251xfd-overlay.dts,spi1-0,interrupt=16
++
++// Device tree overlay for https://www.waveshare.com/2-ch-can-fd-hat.htm
++// in "Mode A" (default) configuration
++// for details see https://www.waveshare.com/wiki/2-CH_CAN_FD_HAT
++
++/dts-v1/;
++/plugin/;
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/interrupt-controller/irq.h>
++#include <dt-bindings/pinctrl/bcm2835.h>
++
++/ {
++	compatible = "brcm,bcm2835";
++	fragment@0 {
++		target = <&gpio>;
++		__overlay__ {
++			spi1_pins: spi1_pins {
++				brcm,pins = <19 20 21>;
++				brcm,function = <3>;
++			};
++			spi1_cs_pins: spi1_cs_pins {
++				brcm,pins = <26>;
++				brcm,function = <1>;
++			};
++		};
++	};
++	fragment@1 {
++		target = <&spi1>;
++		__overlay__ {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			pinctrl-names = "default";
++			pinctrl-0 = <&spi1_pins &spi1_cs_pins>;
++			cs-gpios = <&gpio 26 1>;
++			status = "okay";
++			spidev@0 {
++				compatible = "spidev";
++				reg = <0>;
++				#address-cells = <1>;
++				#size-cells = <0>;
++				spi-max-frequency = <125000000>;
++				status = "disabled";
++			};
++		};
++	};
++	fragment@2 {
++		target = <&aux>;
++		__overlay__ {
++			status = "okay";
++		};
++	};
++	fragment@3 {
++		target = <&spidev0>;
++		__overlay__ {
++			status = "disabled";
++		};
++	};
++	fragment@4 {
++		target = <&gpio>;
++		__overlay__ {
++			mcp251xfd_pins: mcp251xfd_spi0_0_pins {
++				brcm,pins = <25>;
++				brcm,function = <BCM2835_FSEL_GPIO_IN>;
++			};
++		};
++	};
++	fragment@5 {
++		target-path = "/clocks";
++		__overlay__ {
++			clk_mcp251xfd_osc: mcp251xfd-spi0-0-osc {
++				#clock-cells = <0>;
++				compatible = "fixed-clock";
++				clock-frequency = <40000000>;
++			};
++		};
++	};
++	fragment@6 {
++		target = <&spi0>;
++		__overlay__ {
++			status = "okay";
++			#address-cells = <1>;
++			#size-cells = <0>;
++			mcp251xfd@0 {
++				compatible = "microchip,mcp251xfd";
++				reg = <0>;
++				pinctrl-names = "default";
++				pinctrl-0 = <&mcp251xfd_pins>;
++				spi-max-frequency = <20000000>;
++				interrupt-parent = <&gpio>;
++				interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
++				clocks = <&clk_mcp251xfd_osc>;
++			};
++		};
++	};
++	fragment@7 {
++		target-path = "spi1/spidev@0";
++		__overlay__ {
++			status = "disabled";
++		};
++	};
++	fragment@8 {
++		target = <&gpio>;
++		__overlay__ {
++			mcp251xfd_pins_1: mcp251xfd_spi1_0_pins {
++				brcm,pins = <16>;
++				brcm,function = <BCM2835_FSEL_GPIO_IN>;
++			};
++		};
++	};
++	fragment@9 {
++		target-path = "/clocks";
++		__overlay__ {
++			clk_mcp251xfd_osc_1: mcp251xfd-spi1-0-osc {
++				#clock-cells = <0>;
++				compatible = "fixed-clock";
++				clock-frequency = <40000000>;
++			};
++		};
++	};
++	fragment@10 {
++		target = <&spi1>;
++		__overlay__ {
++			status = "okay";
++			#address-cells = <1>;
++			#size-cells = <0>;
++			mcp251xfd@0 {
++				compatible = "microchip,mcp251xfd";
++				reg = <0>;
++				pinctrl-names = "default";
++				pinctrl-0 = <&mcp251xfd_pins_1>;
++				spi-max-frequency = <20000000>;
++				interrupt-parent = <&gpio>;
++				interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
++				clocks = <&clk_mcp251xfd_osc_1>;
++			};
++		};
++	};
++};
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-b-overlay.dts
+@@ -0,0 +1,103 @@
++// redo: ovmerge -c mcp251xfd-overlay.dts,spi0-0,interrupt=25 mcp251xfd-overlay.dts,spi0-1,interrupt=16
++
++// Device tree overlay for https://www.waveshare.com/2-ch-can-fd-hat.htm
++// in "Mode B" (requried hardware modification) configuration
++// for details see https://www.waveshare.com/wiki/2-CH_CAN_FD_HAT
++
++
++/dts-v1/;
++/plugin/;
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/interrupt-controller/irq.h>
++#include <dt-bindings/pinctrl/bcm2835.h>
++
++/ {
++	compatible = "brcm,bcm2835";
++	fragment@0 {
++		target = <&spidev0>;
++		__overlay__ {
++			status = "disabled";
++		};
++	};
++	fragment@1 {
++		target = <&gpio>;
++		__overlay__ {
++			mcp251xfd_pins: mcp251xfd_spi0_0_pins {
++				brcm,pins = <25>;
++				brcm,function = <BCM2835_FSEL_GPIO_IN>;
++			};
++		};
++	};
++	fragment@2 {
++		target-path = "/clocks";
++		__overlay__ {
++			clk_mcp251xfd_osc: mcp251xfd-spi0-0-osc {
++				#clock-cells = <0>;
++				compatible = "fixed-clock";
++				clock-frequency = <40000000>;
++			};
++		};
++	};
++	fragment@3 {
++		target = <&spi0>;
++		__overlay__ {
++			status = "okay";
++			#address-cells = <1>;
++			#size-cells = <0>;
++			mcp251xfd@0 {
++				compatible = "microchip,mcp251xfd";
++				reg = <0>;
++				pinctrl-names = "default";
++				pinctrl-0 = <&mcp251xfd_pins>;
++				spi-max-frequency = <20000000>;
++				interrupt-parent = <&gpio>;
++				interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
++				clocks = <&clk_mcp251xfd_osc>;
++			};
++		};
++	};
++	fragment@4 {
++		target = <&spidev1>;
++		__overlay__ {
++			status = "disabled";
++		};
++	};
++	fragment@5 {
++		target = <&gpio>;
++		__overlay__ {
++			mcp251xfd_pins_1: mcp251xfd_spi0_1_pins {
++				brcm,pins = <16>;
++				brcm,function = <BCM2835_FSEL_GPIO_IN>;
++			};
++		};
++	};
++	fragment@6 {
++		target-path = "/clocks";
++		__overlay__ {
++			clk_mcp251xfd_osc_1: mcp251xfd-spi0-1-osc {
++				#clock-cells = <0>;
++				compatible = "fixed-clock";
++				clock-frequency = <40000000>;
++			};
++		};
++	};
++	fragment@7 {
++		target = <&spi0>;
++		__overlay__ {
++			status = "okay";
++			#address-cells = <1>;
++			#size-cells = <0>;
++			mcp251xfd@1 {
++				compatible = "microchip,mcp251xfd";
++				reg = <1>;
++				pinctrl-names = "default";
++				pinctrl-0 = <&mcp251xfd_pins_1>;
++				spi-max-frequency = <20000000>;
++				interrupt-parent = <&gpio>;
++				interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
++				clocks = <&clk_mcp251xfd_osc_1>;
++			};
++		};
++	};
++};
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0763-overlays-Add-drm-parameter-to-pitft35-resistive.patch b/root/target/linux/bcm27xx/patches-5.15/950-0763-overlays-Add-drm-parameter-to-pitft35-resistive.patch
new file mode 100644
index 00000000..e30f24dc
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0763-overlays-Add-drm-parameter-to-pitft35-resistive.patch
@@ -0,0 +1,38 @@
+From ed13ffb415737602bdc4c62de7c38e58a2feb964 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Fri, 25 Feb 2022 09:53:56 +0000
+Subject: [PATCH 763/828] overlays: Add "drm" parameter to pitft35-resistive
+
+The "drm" parameter forces the use of the hx8357d DRM driver, when by
+default the fb_hx8357d framebuffer driver will be used in preference.
+
+See: https://forums.raspberrypi.com/viewtopic.php?t=330088
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/README                        | 4 ++++
+ arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts | 1 +
+ 2 files changed, 5 insertions(+)
+
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -2689,6 +2689,10 @@ Params: speed                   Display
+ 
+         debug                   Debug output level {0-7}
+ 
++        drm                     Force the use of the hx8357d DRM driver (by
++                                default the fb_hx8357d framebuffer driver will
++                                be used in preference if available)
++
+ 
+ Name:   pps-gpio
+ Info:   Configures the pps-gpio (pulse-per-second time signal via GPIO).
+--- a/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
++++ b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
+@@ -115,5 +115,6 @@
+ 		rotate =  <&pitft>,"rotate:0";
+ 		fps =     <&pitft>,"fps:0";
+ 		debug =   <&pitft>,"debug:0";
++		drm =     <&pitft>,"compatible=adafruit,yx350hv15";
+ 	};
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0764-usb-xhci-rework-XHCI_VLI_SS_BULK_OUT_BUG-quirk.patch b/root/target/linux/bcm27xx/patches-5.15/950-0764-usb-xhci-rework-XHCI_VLI_SS_BULK_OUT_BUG-quirk.patch
new file mode 100644
index 00000000..98094563
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0764-usb-xhci-rework-XHCI_VLI_SS_BULK_OUT_BUG-quirk.patch
@@ -0,0 +1,51 @@
+From 1896e3f23f2cb417d4c83984e0524acd04144e41 Mon Sep 17 00:00:00 2001
+From: Jonathan Bell <jonathan@raspberrypi.com>
+Date: Tue, 1 Mar 2022 15:12:15 +0000
+Subject: [PATCH 764/828] usb: xhci: rework XHCI_VLI_SS_BULK_OUT_BUG quirk
+
+Fix incorrectly applying the quirk for bulk IN endpoints and remove the
+commentary which is not completely accurate based on observed behaviour.
+
+Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
+---
+ drivers/usb/host/xhci-ring.c | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+
+--- a/drivers/usb/host/xhci-ring.c
++++ b/drivers/usb/host/xhci-ring.c
+@@ -3607,7 +3607,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
+ 	unsigned int num_trbs;
+ 	unsigned int start_cycle, num_sgs = 0;
+ 	unsigned int enqd_len, block_len, trb_buff_len, full_len;
+-	int sent_len, ret, vli_quirk = 0;
++	int sent_len, ret, vli_bulk_quirk = 0;
+ 	u32 field, length_field, remainder, maxpacket;
+ 	u64 addr, send_addr;
+ 
+@@ -3653,14 +3653,9 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
+ 	send_addr = addr;
+ 
+ 	if (xhci->quirks & XHCI_VLI_SS_BULK_OUT_BUG &&
+-	    !usb_urb_dir_in(urb) && urb->dev->speed >= USB_SPEED_SUPER) {
+-		/*
+-		 * VL805 - superspeed bulk OUT traffic can cause
+-		 * an internal fifo overflow if the TRB buffer is larger
+-		 * than wMaxPacket and the length is not an integer
+-		 * multiple of wMaxPacket.
+-		 */
+-		vli_quirk = 1;
++	    usb_endpoint_is_bulk_out(&urb->ep->desc)
++	    && urb->dev->speed >= USB_SPEED_SUPER) {
++		vli_bulk_quirk = 1;
+ 	}
+ 
+ 	/* Queue the TRBs, even if they are zero-length */
+@@ -3675,7 +3670,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
+ 		if (enqd_len + trb_buff_len > full_len)
+ 			trb_buff_len = full_len - enqd_len;
+ 
+-		if (vli_quirk && trb_buff_len > maxpacket) {
++		if (vli_bulk_quirk && trb_buff_len > maxpacket) {
+ 			/* SS bulk wMaxPacket is 1024B */
+ 			remainder = trb_buff_len & (maxpacket - 1);
+ 			trb_buff_len -= remainder;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0765-usb-xhci-expand-the-scope-of-XHCI_VLI_SS_BULK_OUT_BU.patch b/root/target/linux/bcm27xx/patches-5.15/950-0765-usb-xhci-expand-the-scope-of-XHCI_VLI_SS_BULK_OUT_BU.patch
new file mode 100644
index 00000000..3e6e4007
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0765-usb-xhci-expand-the-scope-of-XHCI_VLI_SS_BULK_OUT_BU.patch
@@ -0,0 +1,64 @@
+From 7548f896d50cdadca3de7d02d7c40c4c65927b35 Mon Sep 17 00:00:00 2001
+From: Jonathan Bell <jonathan@raspberrypi.com>
+Date: Tue, 1 Mar 2022 15:17:04 +0000
+Subject: [PATCH 765/828] usb: xhci: expand the scope of
+ XHCI_VLI_SS_BULK_OUT_BUG
+
+Further testing has revealed that any TRB with buffer length that is not
+a multiple of wMaxPacket and not the last TRB in a TD can cause data
+corruption.
+
+Work around this by linearising any vulnerable Bulk OUT scatter-gather
+URBs prior to URB submission. Normal XHCI TRB formation will split
+buffers on 64K boundaries and align TRBs prior to a Link TRB to
+wMaxPacket, so keep the residue TRB generation added with the first
+iteration of the quirk which will guarantee the last TRB is the only TRB
+with an odd buffer size.
+
+Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
+---
+ drivers/usb/host/xhci.c | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+--- a/drivers/usb/host/xhci.c
++++ b/drivers/usb/host/xhci.c
+@@ -1393,9 +1393,12 @@ static void xhci_unmap_temp_buf(struct u
+ static int xhci_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb,
+ 				gfp_t mem_flags)
+ {
++	unsigned int i, maxpacket;
++	struct scatterlist *sg;
+ 	struct xhci_hcd *xhci;
+ 
+ 	xhci = hcd_to_xhci(hcd);
++	maxpacket = usb_endpoint_maxp(&urb->ep->desc);
+ 
+ 	if (xhci_urb_suitable_for_idt(urb))
+ 		return 0;
+@@ -1404,6 +1407,16 @@ static int xhci_map_urb_for_dma(struct u
+ 		if (xhci_urb_temp_buffer_required(hcd, urb))
+ 			return xhci_map_temp_buffer(hcd, urb);
+ 	}
++
++	if (xhci->quirks & XHCI_VLI_SS_BULK_OUT_BUG &&
++	    usb_endpoint_is_bulk_out(&urb->ep->desc) &&
++	    urb->dev->speed >= USB_SPEED_SUPER &&
++	    urb->transfer_buffer_length != 0) {
++		for_each_sg(urb->sg, sg, urb->num_sgs, i) {
++			if (sg->length % maxpacket)
++				return xhci_map_temp_buffer(hcd, urb);
++		}
++	}
+ 	return usb_hcd_map_urb_for_dma(hcd, urb, mem_flags);
+ }
+ 
+@@ -1417,7 +1430,8 @@ static void xhci_unmap_urb_for_dma(struc
+ 	if (urb->num_sgs && (urb->transfer_flags & URB_DMA_MAP_SINGLE))
+ 		unmap_temp_buf = true;
+ 
+-	if ((xhci->quirks & XHCI_SG_TRB_CACHE_SIZE_QUIRK) && unmap_temp_buf)
++	if ((xhci->quirks & (XHCI_SG_TRB_CACHE_SIZE_QUIRK | XHCI_VLI_SS_BULK_OUT_BUG))
++	     && unmap_temp_buf)
+ 		xhci_unmap_temp_buf(hcd, urb);
+ 	else
+ 		usb_hcd_unmap_urb_for_dma(hcd, urb);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0766-media-i2c-Add-driver-for-Omnivision-OV2311.patch b/root/target/linux/bcm27xx/patches-5.15/950-0766-media-i2c-Add-driver-for-Omnivision-OV2311.patch
new file mode 100644
index 00000000..6a3aa5be
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0766-media-i2c-Add-driver-for-Omnivision-OV2311.patch
@@ -0,0 +1,1230 @@
+From a617213f2a48d8ed33f3ec8a1504160a8f2a13fa Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Fri, 25 Feb 2022 18:16:13 +0000
+Subject: [PATCH 766/828] media/i2c: Add driver for Omnivision OV2311
+
+Omnivision OV2311 is a CSI2 1600x1300 global shutter image sensor.
+Add a driver for it.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/Kconfig  |   11 +
+ drivers/media/i2c/Makefile |    1 +
+ drivers/media/i2c/ov2311.c | 1181 ++++++++++++++++++++++++++++++++++++
+ 3 files changed, 1193 insertions(+)
+ create mode 100644 drivers/media/i2c/ov2311.c
+
+--- a/drivers/media/i2c/Kconfig
++++ b/drivers/media/i2c/Kconfig
+@@ -918,6 +918,17 @@ config VIDEO_OV02A10
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called ov02a10.
+ 
++config VIDEO_OV2311
++	tristate "OmniVision OV2311 sensor support"
++	depends on I2C && VIDEO_V4L2
++	depends on MEDIA_CAMERA_SUPPORT
++	help
++	  This is a Video4Linux2 sensor-level driver for the OmniVision
++	  OV2311 camera.
++
++	  To compile this driver as a module, choose M here: the
++	  module will be called ov2311.
++
+ config VIDEO_OV2640
+ 	tristate "OmniVision OV2640 sensor support"
+ 	depends on VIDEO_V4L2 && I2C
+--- a/drivers/media/i2c/Makefile
++++ b/drivers/media/i2c/Makefile
+@@ -65,6 +65,7 @@ obj-$(CONFIG_VIDEO_SONY_BTF_MPX) += sony
+ obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o
+ obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o
+ obj-$(CONFIG_VIDEO_OV02A10) += ov02a10.o
++obj-$(CONFIG_VIDEO_OV2311) += ov2311.o
+ obj-$(CONFIG_VIDEO_OV2640) += ov2640.o
+ obj-$(CONFIG_VIDEO_OV2680) += ov2680.o
+ obj-$(CONFIG_VIDEO_OV2685) += ov2685.o
+--- /dev/null
++++ b/drivers/media/i2c/ov2311.c
+@@ -0,0 +1,1181 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Omnivision OV2311 1600x1300 global shutter image sensor driver
++ * Copyright (C) 2022, Raspberry Pi (Trading) Ltd
++ *
++ * This driver is based on the OV9281 driver.
++ * Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd.
++ * Register configuration from
++ * https://github.com/ArduCAM/ArduCAM_USB_Camera_Shield/tree/master/Config/USB3.0_UC-425_Rev.C%2BUC-628_Rev.B/OV2311
++ * with additional exposure and gain register information from
++ * https://github.com/renesas-rcar/linux-bsp/tree/0cf6e36f5bf49e1c2aab87139ec5b588623c56f8/drivers/media/i2c/imagers
++ */
++
++#include <linux/clk.h>
++#include <linux/device.h>
++#include <linux/delay.h>
++#include <linux/gpio/consumer.h>
++#include <linux/i2c.h>
++#include <linux/module.h>
++#include <linux/pm_runtime.h>
++#include <linux/regulator/consumer.h>
++#include <media/media-entity.h>
++#include <media/v4l2-async.h>
++#include <media/v4l2-ctrls.h>
++#include <media/v4l2-event.h>
++#include <media/v4l2-fwnode.h>
++#include <media/v4l2-subdev.h>
++
++#define OV2311_LINK_FREQ		400000000
++#define OV2311_LANES			2
++
++/* pixel rate = link frequency * 2 * lanes / BITS_PER_SAMPLE */
++#define OV2311_PIXEL_RATE_10BIT		(OV2311_LINK_FREQ * 2 * \
++					 OV2311_LANES / 10)
++#define OV2311_PIXEL_RATE_8BIT		(OV2311_LINK_FREQ * 2 * \
++					 OV2311_LANES / 8)
++#define OV2311_XVCLK_FREQ		24000000
++
++#define CHIP_ID				0x2311
++#define OV2311_REG_CHIP_ID		0x300a
++
++#define OV2311_REG_CTRL_MODE		0x0100
++#define OV2311_MODE_SW_STANDBY		0x0
++#define OV2311_MODE_STREAMING		BIT(0)
++
++#define OV2311_REG_V_FLIP		0x3820
++#define OV2311_REG_H_FLIP		0x3821
++#define OV2311_FLIP_BIT			BIT(2)
++
++#define OV2311_REG_EXPOSURE		0x3501
++#define	OV2311_EXPOSURE_MIN		4
++#define	OV2311_EXPOSURE_STEP		1
++#define OV2311_VTS_MAX			0xffff
++
++#define OV2311_REG_GAIN_H		0x3508
++#define OV2311_REG_GAIN_L		0x3509
++#define OV2311_GAIN_H_MASK		0x07
++#define OV2311_GAIN_H_SHIFT		8
++#define OV2311_GAIN_L_MASK		0xff
++#define OV2311_GAIN_MIN			0x100
++#define OV2311_GAIN_MAX			0x780
++#define OV2311_GAIN_STEP		1
++#define OV2311_GAIN_DEFAULT		OV2311_GAIN_MIN
++
++#define OV2311_REG_TEST_PATTERN		0x5e00
++#define OV2311_TEST_PATTERN_ENABLE	0x80
++#define OV2311_TEST_PATTERN_DISABLE	0x0
++
++#define OV2311_REG_VTS			0x380e
++
++/*
++ * OV2311 native and active pixel array size.
++ * Datasheet not available to confirm these values. renesas-rcar linux-bsp tree
++ * has these values.
++ */
++#define OV2311_NATIVE_WIDTH		1616U
++#define OV2311_NATIVE_HEIGHT		1316U
++#define OV2311_PIXEL_ARRAY_LEFT		8U
++#define OV2311_PIXEL_ARRAY_TOP		8U
++#define OV2311_PIXEL_ARRAY_WIDTH	1600U
++#define OV2311_PIXEL_ARRAY_HEIGHT	1300U
++
++#define REG_NULL			0xFFFF
++
++#define OV2311_REG_VALUE_08BIT		1
++#define OV2311_REG_VALUE_16BIT		2
++#define OV2311_REG_VALUE_24BIT		3
++
++#define OV2311_NAME			"ov2311"
++
++static const char * const ov2311_supply_names[] = {
++	"avdd",		/* Analog power */
++	"dovdd",	/* Digital I/O power */
++	"dvdd",		/* Digital core power */
++};
++
++#define OV2311_NUM_SUPPLIES ARRAY_SIZE(ov2311_supply_names)
++
++struct regval {
++	u16 addr;
++	u8 val;
++};
++
++struct ov2311_mode {
++	u32 width;
++	u32 height;
++	u32 hts_def;
++	u32 vts_def;
++	u32 exp_def;
++	struct v4l2_rect crop;
++	const struct regval *reg_list;
++};
++
++struct ov2311 {
++	struct i2c_client	*client;
++	struct clk		*xvclk;
++	struct gpio_desc	*reset_gpio;
++	struct gpio_desc	*pwdn_gpio;
++	struct regulator_bulk_data supplies[OV2311_NUM_SUPPLIES];
++
++	struct v4l2_subdev	subdev;
++	struct media_pad	pad;
++	struct v4l2_ctrl_handler ctrl_handler;
++	struct v4l2_ctrl	*exposure;
++	struct v4l2_ctrl	*hblank;
++	struct v4l2_ctrl	*vblank;
++	struct v4l2_ctrl	*pixel_rate;
++	/*
++	 * Mutex for serialized access:
++	 * Protect sensor module set pad format and start/stop streaming safely.
++	 */
++	struct mutex		mutex;
++
++	/* Streaming on/off */
++	bool streaming;
++
++	const struct ov2311_mode *cur_mode;
++	u32			code;
++};
++
++#define to_ov2311(sd) container_of(sd, struct ov2311, subdev)
++
++/*
++ * Xclk 24Mhz
++ * max_framerate 60fps for 10 bit, 74.6fps for 8 bit.
++ */
++static const struct regval ov2311_common_regs[] = {
++	{ 0x0103, 0x01 },
++	{ 0x0100, 0x00 },
++	{ 0x0300, 0x01 },
++	{ 0x0302, 0x32 },
++	{ 0x0303, 0x00 },
++	{ 0x0304, 0x03 },
++	{ 0x0305, 0x02 },
++	{ 0x0306, 0x01 },
++	{ 0x030e, 0x04 },
++	{ 0x3001, 0x02 },
++	{ 0x3004, 0x00 },
++	{ 0x3005, 0x00 },
++	{ 0x3006, 0x00 },
++	{ 0x3011, 0x0d },
++	{ 0x3014, 0x04 },
++	{ 0x301c, 0xf0 },
++	{ 0x3020, 0x00 },
++	{ 0x302c, 0x00 },
++	{ 0x302d, 0x12 },
++	{ 0x302e, 0x4c },
++	{ 0x302f, 0x8c },
++	{ 0x3030, 0x10 },
++	{ 0x303f, 0x03 },
++	{ 0x3103, 0x00 },
++	{ 0x3106, 0x08 },
++	{ 0x31ff, 0x01 },
++	{ 0x3501, 0x05 },
++	{ 0x3502, 0xba },
++	{ 0x3506, 0x00 },
++	{ 0x3507, 0x00 },
++	{ 0x3620, 0x67 },
++	{ 0x3633, 0x78 },
++	{ 0x3666, 0x00 },
++	{ 0x3670, 0x68 },
++	{ 0x3674, 0x10 },
++	{ 0x3675, 0x00 },
++	{ 0x3680, 0x84 },
++	{ 0x36a2, 0x04 },
++	{ 0x36a3, 0x80 },
++	{ 0x36b0, 0x00 },
++	{ 0x3700, 0x35 },
++	{ 0x3704, 0x59 },
++	{ 0x3712, 0x00 },
++	{ 0x3713, 0x02 },
++	{ 0x379b, 0x01 },
++	{ 0x379c, 0x10 },
++	{ 0x3800, 0x00 },
++	{ 0x3801, 0x00 },
++	{ 0x3804, 0x06 },
++	{ 0x3805, 0x4f },
++	{ 0x3810, 0x00 },
++	{ 0x3811, 0x08 },
++	{ 0x3812, 0x00 },
++	{ 0x3813, 0x08 },
++	{ 0x3814, 0x11 },
++	{ 0x3815, 0x11 },
++	{ 0x3816, 0x00 },
++	{ 0x3817, 0x00 },
++	{ 0x3818, 0x04 },
++	{ 0x3819, 0x00 },
++	{ 0x382b, 0x5a },
++	{ 0x382c, 0x09 },
++	{ 0x382d, 0x9a },
++	{ 0x3882, 0x02 },
++	{ 0x3883, 0x6c },
++	{ 0x3885, 0x07 },
++	{ 0x389d, 0x03 },
++	{ 0x38a6, 0x00 },
++	{ 0x38a7, 0x01 },
++	{ 0x38b3, 0x07 },
++	{ 0x38b1, 0x00 },
++	{ 0x38e5, 0x02 },
++	{ 0x38e7, 0x00 },
++	{ 0x38e8, 0x00 },
++	{ 0x3910, 0xff },
++	{ 0x3911, 0xff },
++	{ 0x3912, 0x08 },
++	{ 0x3913, 0x00 },
++	{ 0x3914, 0x00 },
++	{ 0x3915, 0x00 },
++	{ 0x391c, 0x00 },
++	{ 0x3920, 0xa5 },
++	{ 0x3921, 0x00 },
++	{ 0x3922, 0x00 },
++	{ 0x3923, 0x00 },
++	{ 0x3924, 0x05 },
++	{ 0x3925, 0x00 },
++	{ 0x3926, 0x00 },
++	{ 0x3927, 0x00 },
++	{ 0x3928, 0x1a },
++	{ 0x392d, 0x05 },
++	{ 0x392e, 0xf2 },
++	{ 0x392f, 0x40 },
++	{ 0x4001, 0x00 },
++	{ 0x4003, 0x40 },
++	{ 0x4008, 0x12 },
++	{ 0x4009, 0x1b },
++	{ 0x400c, 0x0c },
++	{ 0x400d, 0x13 },
++	{ 0x4010, 0xf0 },
++	{ 0x4011, 0x00 },
++	{ 0x4016, 0x00 },
++	{ 0x4017, 0x04 },
++	{ 0x4042, 0x11 },
++	{ 0x4043, 0x70 },
++	{ 0x4045, 0x00 },
++	{ 0x4409, 0x5f },
++	{ 0x450b, 0x00 },
++	{ 0x4600, 0x00 },
++	{ 0x4601, 0xa0 },
++	{ 0x4708, 0x09 },
++	{ 0x470c, 0x81 },
++	{ 0x4710, 0x06 },
++	{ 0x4711, 0x00 },
++	{ 0x4800, 0x00 },
++	{ 0x481f, 0x30 },
++	{ 0x4837, 0x14 },
++	{ 0x4f00, 0x00 },
++	{ 0x4f07, 0x00 },
++	{ 0x4f08, 0x03 },
++	{ 0x4f09, 0x08 },
++	{ 0x4f0c, 0x06 },
++	{ 0x4f0d, 0x02 },
++	{ 0x4f10, 0x00 },
++	{ 0x4f11, 0x00 },
++	{ 0x4f12, 0x07 },
++	{ 0x4f13, 0xe2 },
++	{ 0x5000, 0x9f },
++	{ 0x5001, 0x20 },
++	{ 0x5026, 0x00 },
++	{ 0x5c00, 0x00 },
++	{ 0x5c01, 0x2c },
++	{ 0x5c02, 0x00 },
++	{ 0x5c03, 0x7f },
++	{ 0x5e00, 0x00 },
++	{ 0x5e01, 0x41 },
++	{REG_NULL, 0x00},
++};
++
++static const struct regval ov2311_1600x1300_regs[] = {
++	{ 0x3802, 0x00 },
++	{ 0x3803, 0x00 },
++	{ 0x3806, 0x05 },
++	{ 0x3807, 0x23 },
++	{ 0x3808, 0x06 },
++	{ 0x3809, 0x40 },
++	{ 0x380a, 0x05 },
++	{ 0x380b, 0x14 },
++	{ 0x380c, 0x03 },
++	{ 0x380d, 0x88 },
++	{REG_NULL, 0x00},
++};
++
++static const struct regval ov2311_1600x1080_regs[] = {
++	{ 0x3802, 0x00 },
++	{ 0x3803, 0x6e },
++	{ 0x3806, 0x04 },
++	{ 0x3807, 0xae },
++	{ 0x3808, 0x06 },
++	{ 0x3809, 0x40 },
++	{ 0x380a, 0x04 },
++	{ 0x380b, 0x38 },
++	{ 0x380c, 0x03 },
++	{ 0x380d, 0x88 },
++
++	{ 0x5d01, 0x00 },
++	{ 0x5d02, 0x04 },
++	{ 0x5d03, 0x00 },
++	{ 0x5d04, 0x04 },
++	{ 0x5d05, 0x00 },
++	{REG_NULL, 0x00},
++};
++
++static const struct regval op_10bit[] = {
++	{ 0x030d, 0x5a },
++	{ 0x3662, 0x65 },
++	{REG_NULL, 0x00},
++};
++
++static const struct regval op_8bit[] = {
++	{ 0x030d, 0x70 },
++	{ 0x3662, 0x67 },
++	{REG_NULL, 0x00},
++};
++
++static const struct ov2311_mode supported_modes[] = {
++	{
++		.width = 1600,
++		.height = 1300,
++		.exp_def = 0x0320,
++		.hts_def = (0x0388 * 2),/* Registers 0x380c / 0x380d  * 2 */
++		.vts_def = 0x5c2,	/* Registers 0x380e / 0x380f
++					 * 60fps for 10bpp
++					 */
++		.crop = {
++			.left = OV2311_PIXEL_ARRAY_LEFT,
++			.top = OV2311_PIXEL_ARRAY_TOP,
++			.width = 1600,
++			.height = 1300
++		},
++		.reg_list = ov2311_1600x1300_regs,
++	},
++	{
++		.width = 1600,
++		.height = 1080,
++		.exp_def = 0x0320,
++		.hts_def = (0x0388 * 2),/* Registers 0x380c / 0x380d  * 2 */
++		.vts_def = 0x5c2,	/* Registers 0x380e / 0x380f
++					 * 60fps for 10bpp
++					 */
++		.crop = {
++			.left = OV2311_PIXEL_ARRAY_LEFT,
++			.top = 110 + OV2311_PIXEL_ARRAY_TOP,
++			.width = 1600,
++			.height = 1080
++		},
++		.reg_list = ov2311_1600x1080_regs,
++	},
++};
++
++static const s64 link_freq_menu_items[] = {
++	OV2311_LINK_FREQ
++};
++
++static const char * const ov2311_test_pattern_menu[] = {
++	"Disabled",
++	"Vertical Color Bar Type 1",
++	"Vertical Color Bar Type 2",
++	"Vertical Color Bar Type 3",
++	"Vertical Color Bar Type 4"
++};
++
++/* Write registers up to 4 at a time */
++static int ov2311_write_reg(struct i2c_client *client, u16 reg,
++			    u32 len, u32 val)
++{
++	u32 buf_i, val_i;
++	u8 buf[6];
++	u8 *val_p;
++	__be32 val_be;
++
++	if (len > 4)
++		return -EINVAL;
++
++	buf[0] = reg >> 8;
++	buf[1] = reg & 0xff;
++
++	val_be = cpu_to_be32(val);
++	val_p = (u8 *)&val_be;
++	buf_i = 2;
++	val_i = 4 - len;
++
++	while (val_i < 4)
++		buf[buf_i++] = val_p[val_i++];
++
++	if (i2c_master_send(client, buf, len + 2) != len + 2)
++		return -EIO;
++
++	return 0;
++}
++
++static int ov2311_write_array(struct i2c_client *client,
++			      const struct regval *regs)
++{
++	u32 i;
++	int ret = 0;
++
++	for (i = 0; ret == 0 && regs[i].addr != REG_NULL; i++)
++		ret = ov2311_write_reg(client, regs[i].addr,
++				       OV2311_REG_VALUE_08BIT, regs[i].val);
++
++	return ret;
++}
++
++/* Read registers up to 4 at a time */
++static int ov2311_read_reg(struct i2c_client *client, u16 reg, unsigned int len,
++			   u32 *val)
++{
++	struct i2c_msg msgs[2];
++	u8 *data_be_p;
++	__be32 data_be = 0;
++	__be16 reg_addr_be = cpu_to_be16(reg);
++	int ret;
++
++	if (len > 4 || !len)
++		return -EINVAL;
++
++	data_be_p = (u8 *)&data_be;
++	/* Write register address */
++	msgs[0].addr = client->addr;
++	msgs[0].flags = 0;
++	msgs[0].len = 2;
++	msgs[0].buf = (u8 *)&reg_addr_be;
++
++	/* Read data from register */
++	msgs[1].addr = client->addr;
++	msgs[1].flags = I2C_M_RD;
++	msgs[1].len = len;
++	msgs[1].buf = &data_be_p[4 - len];
++
++	ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
++	if (ret != ARRAY_SIZE(msgs))
++		return -EIO;
++
++	*val = be32_to_cpu(data_be);
++
++	return 0;
++}
++
++static int ov2311_set_fmt(struct v4l2_subdev *sd,
++			  struct v4l2_subdev_state *sd_state,
++			  struct v4l2_subdev_format *fmt)
++{
++	struct ov2311 *ov2311 = to_ov2311(sd);
++	const struct ov2311_mode *mode;
++	s64 h_blank, vblank_def, pixel_rate;
++
++	mutex_lock(&ov2311->mutex);
++
++	mode = v4l2_find_nearest_size(supported_modes,
++				      ARRAY_SIZE(supported_modes),
++				      width, height,
++				      fmt->format.width,
++				      fmt->format.height);
++	if (fmt->format.code != MEDIA_BUS_FMT_Y8_1X8)
++		fmt->format.code = MEDIA_BUS_FMT_Y10_1X10;
++	fmt->format.width = mode->width;
++	fmt->format.height = mode->height;
++	fmt->format.field = V4L2_FIELD_NONE;
++	fmt->format.colorspace = V4L2_COLORSPACE_RAW;
++	fmt->format.ycbcr_enc =
++			V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->format.colorspace);
++	fmt->format.quantization =
++		V4L2_MAP_QUANTIZATION_DEFAULT(true, fmt->format.colorspace,
++					      fmt->format.ycbcr_enc);
++	fmt->format.xfer_func =
++		V4L2_MAP_XFER_FUNC_DEFAULT(fmt->format.colorspace);
++
++	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
++		*v4l2_subdev_get_try_format(sd, sd_state, fmt->pad) =
++								fmt->format;
++	} else {
++		ov2311->cur_mode = mode;
++		ov2311->code = fmt->format.code;
++		h_blank = mode->hts_def - mode->width;
++		__v4l2_ctrl_modify_range(ov2311->hblank, h_blank,
++					 h_blank, 1, h_blank);
++		__v4l2_ctrl_s_ctrl(ov2311->hblank, h_blank);
++		vblank_def = mode->vts_def - mode->height;
++		__v4l2_ctrl_modify_range(ov2311->vblank, vblank_def,
++					 OV2311_VTS_MAX - mode->height,
++					 1, vblank_def);
++		__v4l2_ctrl_s_ctrl(ov2311->vblank, vblank_def);
++
++		pixel_rate = (fmt->format.code == MEDIA_BUS_FMT_Y10_1X10) ?
++			OV2311_PIXEL_RATE_10BIT : OV2311_PIXEL_RATE_8BIT;
++		__v4l2_ctrl_modify_range(ov2311->pixel_rate, pixel_rate,
++					 pixel_rate, 1, pixel_rate);
++	}
++
++	mutex_unlock(&ov2311->mutex);
++
++	return 0;
++}
++
++static int ov2311_get_fmt(struct v4l2_subdev *sd,
++			  struct v4l2_subdev_state *sd_state,
++			  struct v4l2_subdev_format *fmt)
++{
++	struct ov2311 *ov2311 = to_ov2311(sd);
++	const struct ov2311_mode *mode = ov2311->cur_mode;
++
++	mutex_lock(&ov2311->mutex);
++	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
++		fmt->format = *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
++	} else {
++		fmt->format.width = mode->width;
++		fmt->format.height = mode->height;
++		fmt->format.code = ov2311->code;
++		fmt->format.field = V4L2_FIELD_NONE;
++		fmt->format.colorspace = V4L2_COLORSPACE_SRGB;
++		fmt->format.ycbcr_enc =
++			V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->format.colorspace);
++		fmt->format.quantization =
++			V4L2_MAP_QUANTIZATION_DEFAULT(true,
++						      fmt->format.colorspace,
++						      fmt->format.ycbcr_enc);
++		fmt->format.xfer_func =
++			V4L2_MAP_XFER_FUNC_DEFAULT(fmt->format.colorspace);
++	}
++	mutex_unlock(&ov2311->mutex);
++
++	return 0;
++}
++
++static int ov2311_enum_mbus_code(struct v4l2_subdev *sd,
++				 struct v4l2_subdev_state *sd_state,
++				 struct v4l2_subdev_mbus_code_enum *code)
++{
++	switch (code->index) {
++	default:
++		return -EINVAL;
++	case 0:
++		code->code = MEDIA_BUS_FMT_Y10_1X10;
++		break;
++	case 1:
++		code->code = MEDIA_BUS_FMT_Y8_1X8;
++		break;
++	}
++
++	return 0;
++}
++
++static int ov2311_enum_frame_sizes(struct v4l2_subdev *sd,
++				   struct v4l2_subdev_state *sd_state,
++				   struct v4l2_subdev_frame_size_enum *fse)
++{
++	if (fse->index >= ARRAY_SIZE(supported_modes))
++		return -EINVAL;
++
++	if (fse->code != MEDIA_BUS_FMT_Y10_1X10 &&
++	    fse->code != MEDIA_BUS_FMT_Y8_1X8)
++		return -EINVAL;
++
++	fse->min_width  = supported_modes[fse->index].width;
++	fse->max_width  = supported_modes[fse->index].width;
++	fse->max_height = supported_modes[fse->index].height;
++	fse->min_height = supported_modes[fse->index].height;
++
++	return 0;
++}
++
++static int ov2311_enable_test_pattern(struct ov2311 *ov2311, u32 pattern)
++{
++	u32 val;
++
++	if (pattern)
++		val = (pattern - 1) | OV2311_TEST_PATTERN_ENABLE;
++	else
++		val = OV2311_TEST_PATTERN_DISABLE;
++
++	return ov2311_write_reg(ov2311->client, OV2311_REG_TEST_PATTERN,
++				OV2311_REG_VALUE_08BIT, val);
++}
++
++static const struct v4l2_rect *
++__ov2311_get_pad_crop(struct ov2311 *ov2311, struct v4l2_subdev_state *sd_state,
++		      unsigned int pad, enum v4l2_subdev_format_whence which)
++{
++	switch (which) {
++	case V4L2_SUBDEV_FORMAT_TRY:
++		return v4l2_subdev_get_try_crop(&ov2311->subdev, sd_state, pad);
++	case V4L2_SUBDEV_FORMAT_ACTIVE:
++		return &ov2311->cur_mode->crop;
++	}
++
++	return NULL;
++}
++
++static int ov2311_get_selection(struct v4l2_subdev *sd,
++				struct v4l2_subdev_state *sd_state,
++				struct v4l2_subdev_selection *sel)
++{
++	switch (sel->target) {
++	case V4L2_SEL_TGT_CROP: {
++		struct ov2311 *ov2311 = to_ov2311(sd);
++
++		mutex_lock(&ov2311->mutex);
++		sel->r = *__ov2311_get_pad_crop(ov2311, sd_state, sel->pad,
++						sel->which);
++		mutex_unlock(&ov2311->mutex);
++
++		return 0;
++	}
++
++	case V4L2_SEL_TGT_NATIVE_SIZE:
++		sel->r.top = 0;
++		sel->r.left = 0;
++		sel->r.width = OV2311_NATIVE_WIDTH;
++		sel->r.height = OV2311_NATIVE_HEIGHT;
++
++		return 0;
++
++	case V4L2_SEL_TGT_CROP_DEFAULT:
++	case V4L2_SEL_TGT_CROP_BOUNDS:
++		sel->r.top = OV2311_PIXEL_ARRAY_TOP;
++		sel->r.left = OV2311_PIXEL_ARRAY_LEFT;
++		sel->r.width = OV2311_PIXEL_ARRAY_WIDTH;
++		sel->r.height = OV2311_PIXEL_ARRAY_HEIGHT;
++
++		return 0;
++	}
++
++	return -EINVAL;
++}
++
++static int ov2311_start_stream(struct ov2311 *ov2311)
++{
++	int ret;
++
++	ret = ov2311_write_array(ov2311->client, ov2311_common_regs);
++	if (ret)
++		return ret;
++
++	ret = ov2311_write_array(ov2311->client, ov2311->cur_mode->reg_list);
++	if (ret)
++		return ret;
++
++	if (ov2311->code == MEDIA_BUS_FMT_Y10_1X10)
++		ret = ov2311_write_array(ov2311->client, op_10bit);
++	else
++		ret = ov2311_write_array(ov2311->client, op_8bit);
++	if (ret)
++		return ret;
++
++	/* In case these controls are set before streaming */
++	mutex_unlock(&ov2311->mutex);
++	ret = v4l2_ctrl_handler_setup(&ov2311->ctrl_handler);
++	mutex_lock(&ov2311->mutex);
++	if (ret)
++		return ret;
++
++	return ov2311_write_reg(ov2311->client, OV2311_REG_CTRL_MODE,
++				OV2311_REG_VALUE_08BIT, OV2311_MODE_STREAMING);
++}
++
++static int ov2311_stop_stream(struct ov2311 *ov2311)
++{
++	return ov2311_write_reg(ov2311->client, OV2311_REG_CTRL_MODE,
++				OV2311_REG_VALUE_08BIT, OV2311_MODE_SW_STANDBY);
++}
++
++static int ov2311_s_stream(struct v4l2_subdev *sd, int enable)
++{
++	struct ov2311 *ov2311 = to_ov2311(sd);
++	struct i2c_client *client = ov2311->client;
++	int ret = 0;
++
++	mutex_lock(&ov2311->mutex);
++	if (ov2311->streaming == enable) {
++		mutex_unlock(&ov2311->mutex);
++		return 0;
++	}
++
++	if (enable) {
++		ret = pm_runtime_resume_and_get(&client->dev);
++		if (ret < 0)
++			goto unlock_and_return;
++
++		ret = ov2311_start_stream(ov2311);
++		if (ret) {
++			v4l2_err(sd, "start stream failed while write regs\n");
++			pm_runtime_put(&client->dev);
++			goto unlock_and_return;
++		}
++	} else {
++		ov2311_stop_stream(ov2311);
++		pm_runtime_put(&client->dev);
++	}
++
++	ov2311->streaming = enable;
++
++unlock_and_return:
++	mutex_unlock(&ov2311->mutex);
++
++	return ret;
++}
++
++static int ov2311_power_on(struct device *dev)
++{
++	struct v4l2_subdev *sd = dev_get_drvdata(dev);
++	struct ov2311 *ov2311 = to_ov2311(sd);
++	int ret;
++
++	ret = clk_set_rate(ov2311->xvclk, OV2311_XVCLK_FREQ);
++	if (ret < 0)
++		dev_warn(dev, "Failed to set xvclk rate (24MHz)\n");
++	if (clk_get_rate(ov2311->xvclk) != OV2311_XVCLK_FREQ)
++		dev_warn(dev, "xvclk mismatched, modes are based on 24MHz - rate is %lu\n",
++			 clk_get_rate(ov2311->xvclk));
++
++	ret = clk_prepare_enable(ov2311->xvclk);
++	if (ret < 0) {
++		dev_err(dev, "Failed to enable xvclk\n");
++		return ret;
++	}
++
++	gpiod_set_value_cansleep(ov2311->reset_gpio, 0);
++
++	ret = regulator_bulk_enable(OV2311_NUM_SUPPLIES, ov2311->supplies);
++	if (ret < 0) {
++		dev_err(dev, "Failed to enable regulators\n");
++		goto disable_clk;
++	}
++
++	gpiod_set_value_cansleep(ov2311->reset_gpio, 1);
++
++	usleep_range(500, 1000);
++	gpiod_set_value_cansleep(ov2311->pwdn_gpio, 1);
++
++	usleep_range(1000, 2000);
++
++	return 0;
++
++disable_clk:
++	clk_disable_unprepare(ov2311->xvclk);
++
++	return ret;
++}
++
++static int ov2311_power_off(struct device *dev)
++{
++	struct v4l2_subdev *sd = dev_get_drvdata(dev);
++	struct ov2311 *ov2311 = to_ov2311(sd);
++
++	gpiod_set_value_cansleep(ov2311->pwdn_gpio, 0);
++	clk_disable_unprepare(ov2311->xvclk);
++	gpiod_set_value_cansleep(ov2311->reset_gpio, 0);
++	regulator_bulk_disable(OV2311_NUM_SUPPLIES, ov2311->supplies);
++
++	return 0;
++}
++
++static int ov2311_runtime_resume(struct device *dev)
++{
++	struct v4l2_subdev *sd = dev_get_drvdata(dev);
++	struct ov2311 *ov2311 = to_ov2311(sd);
++	int ret;
++
++	if (ov2311->streaming) {
++		ret = ov2311_start_stream(ov2311);
++		if (ret)
++			goto error;
++	}
++	return 0;
++
++error:
++	ov2311_stop_stream(ov2311);
++	ov2311->streaming = 0;
++	return ret;
++}
++
++static int ov2311_runtime_suspend(struct device *dev)
++{
++	struct v4l2_subdev *sd = dev_get_drvdata(dev);
++	struct ov2311 *ov2311 = to_ov2311(sd);
++
++	if (ov2311->streaming)
++		ov2311_stop_stream(ov2311);
++
++	return 0;
++}
++
++static int ov2311_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
++{
++	struct ov2311 *ov2311 = to_ov2311(sd);
++	struct v4l2_mbus_framefmt *try_fmt =
++				v4l2_subdev_get_try_format(sd, fh->state, 0);
++	const struct ov2311_mode *def_mode = &supported_modes[0];
++
++	mutex_lock(&ov2311->mutex);
++	/* Initialize try_fmt */
++	try_fmt->width = def_mode->width;
++	try_fmt->height = def_mode->height;
++	try_fmt->code = MEDIA_BUS_FMT_Y10_1X10;
++	try_fmt->field = V4L2_FIELD_NONE;
++	try_fmt->colorspace = V4L2_COLORSPACE_RAW;
++	try_fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(try_fmt->colorspace);
++	try_fmt->quantization =
++		V4L2_MAP_QUANTIZATION_DEFAULT(true, try_fmt->colorspace,
++					      try_fmt->ycbcr_enc);
++	try_fmt->xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(try_fmt->colorspace);
++
++	mutex_unlock(&ov2311->mutex);
++	/* No crop or compose */
++
++	return 0;
++}
++
++static const struct dev_pm_ops ov2311_pm_ops = {
++	SET_RUNTIME_PM_OPS(ov2311_runtime_suspend, ov2311_runtime_resume, NULL)
++	SET_RUNTIME_PM_OPS(ov2311_power_off, ov2311_power_on, NULL)
++};
++
++static const struct v4l2_subdev_internal_ops ov2311_internal_ops = {
++	.open = ov2311_open,
++};
++
++static const struct v4l2_subdev_core_ops ov2311_core_ops = {
++	.subscribe_event = v4l2_ctrl_subdev_subscribe_event,
++	.unsubscribe_event = v4l2_event_subdev_unsubscribe,
++};
++
++static const struct v4l2_subdev_video_ops ov2311_video_ops = {
++	.s_stream = ov2311_s_stream,
++};
++
++static const struct v4l2_subdev_pad_ops ov2311_pad_ops = {
++	.enum_mbus_code = ov2311_enum_mbus_code,
++	.enum_frame_size = ov2311_enum_frame_sizes,
++	.get_fmt = ov2311_get_fmt,
++	.set_fmt = ov2311_set_fmt,
++	.get_selection = ov2311_get_selection,
++};
++
++static const struct v4l2_subdev_ops ov2311_subdev_ops = {
++	.core	= &ov2311_core_ops,
++	.video	= &ov2311_video_ops,
++	.pad	= &ov2311_pad_ops,
++};
++
++static int ov2311_set_ctrl(struct v4l2_ctrl *ctrl)
++{
++	struct ov2311 *ov2311 = container_of(ctrl->handler,
++					     struct ov2311, ctrl_handler);
++	struct i2c_client *client = ov2311->client;
++	s64 max;
++	int ret = 0;
++
++	/* Propagate change of current control to all related controls */
++	switch (ctrl->id) {
++	case V4L2_CID_VBLANK:
++		/* Update max exposure while meeting expected vblanking */
++		max = ov2311->cur_mode->height + ctrl->val - 4;
++		__v4l2_ctrl_modify_range(ov2311->exposure,
++					 ov2311->exposure->minimum, max,
++					 ov2311->exposure->step,
++					 ov2311->exposure->default_value);
++		break;
++	}
++
++	if (pm_runtime_get(&client->dev) <= 0)
++		return 0;
++
++	switch (ctrl->id) {
++	case V4L2_CID_EXPOSURE:
++		ret = ov2311_write_reg(ov2311->client, OV2311_REG_EXPOSURE,
++				       OV2311_REG_VALUE_16BIT, ctrl->val);
++		break;
++	case V4L2_CID_ANALOGUE_GAIN:
++		ret = ov2311_write_reg(ov2311->client, OV2311_REG_GAIN_H,
++				       OV2311_REG_VALUE_08BIT,
++				       (ctrl->val >> OV2311_GAIN_H_SHIFT) &
++							OV2311_GAIN_H_MASK);
++		ret |= ov2311_write_reg(ov2311->client, OV2311_REG_GAIN_L,
++				       OV2311_REG_VALUE_08BIT,
++				       ctrl->val & OV2311_GAIN_L_MASK);
++		break;
++	case V4L2_CID_VBLANK:
++		ret = ov2311_write_reg(ov2311->client, OV2311_REG_VTS,
++				       OV2311_REG_VALUE_16BIT,
++				       ctrl->val + ov2311->cur_mode->height);
++		break;
++	case V4L2_CID_TEST_PATTERN:
++		ret = ov2311_enable_test_pattern(ov2311, ctrl->val);
++		break;
++	case V4L2_CID_HFLIP:
++		ret = ov2311_write_reg(ov2311->client, OV2311_REG_H_FLIP,
++				       OV2311_REG_VALUE_08BIT,
++				       ctrl->val ? OV2311_FLIP_BIT : 0);
++		break;
++	case V4L2_CID_VFLIP:
++		ret = ov2311_write_reg(ov2311->client, OV2311_REG_V_FLIP,
++				       OV2311_REG_VALUE_08BIT,
++				       ctrl->val ? OV2311_FLIP_BIT : 0);
++		break;
++	default:
++		dev_warn(&client->dev, "%s Unhandled id:0x%x, val:0x%x\n",
++			 __func__, ctrl->id, ctrl->val);
++		break;
++	}
++
++	pm_runtime_put(&client->dev);
++
++	return ret;
++}
++
++static const struct v4l2_ctrl_ops ov2311_ctrl_ops = {
++	.s_ctrl = ov2311_set_ctrl,
++};
++
++static int ov2311_initialize_controls(struct ov2311 *ov2311)
++{
++	struct v4l2_fwnode_device_properties props;
++	const struct ov2311_mode *mode;
++	struct v4l2_ctrl_handler *handler;
++	struct v4l2_ctrl *ctrl;
++	s64 exposure_max, vblank_def;
++	u32 h_blank;
++	int ret;
++
++	handler = &ov2311->ctrl_handler;
++	mode = ov2311->cur_mode;
++	ret = v4l2_ctrl_handler_init(handler, 11);
++	if (ret)
++		return ret;
++	handler->lock = &ov2311->mutex;
++
++	ctrl = v4l2_ctrl_new_int_menu(handler, NULL, V4L2_CID_LINK_FREQ,
++				      0, 0, link_freq_menu_items);
++	if (ctrl)
++		ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
++
++	ov2311->pixel_rate = v4l2_ctrl_new_std(handler, NULL,
++					       V4L2_CID_PIXEL_RATE,
++					       OV2311_PIXEL_RATE_10BIT,
++					       OV2311_PIXEL_RATE_10BIT, 1,
++					       OV2311_PIXEL_RATE_10BIT);
++
++	h_blank = mode->hts_def - mode->width;
++	ov2311->hblank = v4l2_ctrl_new_std(handler, NULL, V4L2_CID_HBLANK,
++					   h_blank, h_blank, 1, h_blank);
++	if (ov2311->hblank)
++		ov2311->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
++
++	vblank_def = mode->vts_def - mode->height;
++	ov2311->vblank = v4l2_ctrl_new_std(handler, &ov2311_ctrl_ops,
++					   V4L2_CID_VBLANK, vblank_def,
++					   OV2311_VTS_MAX - mode->height, 1,
++					   vblank_def);
++
++	exposure_max = mode->vts_def - 4;
++	ov2311->exposure = v4l2_ctrl_new_std(handler, &ov2311_ctrl_ops,
++					     V4L2_CID_EXPOSURE,
++					     OV2311_EXPOSURE_MIN, exposure_max,
++					     OV2311_EXPOSURE_STEP,
++					     mode->exp_def);
++
++	v4l2_ctrl_new_std(handler, &ov2311_ctrl_ops, V4L2_CID_ANALOGUE_GAIN,
++			  OV2311_GAIN_MIN, OV2311_GAIN_MAX, OV2311_GAIN_STEP,
++			  OV2311_GAIN_DEFAULT);
++
++	v4l2_ctrl_new_std_menu_items(handler, &ov2311_ctrl_ops,
++				     V4L2_CID_TEST_PATTERN,
++				     ARRAY_SIZE(ov2311_test_pattern_menu) - 1,
++				     0, 0, ov2311_test_pattern_menu);
++
++	v4l2_ctrl_new_std(handler, &ov2311_ctrl_ops,
++			  V4L2_CID_HFLIP, 0, 1, 1, 0);
++
++	v4l2_ctrl_new_std(handler, &ov2311_ctrl_ops,
++			  V4L2_CID_VFLIP, 0, 1, 1, 0);
++
++	ret = v4l2_fwnode_device_parse(&ov2311->client->dev, &props);
++	if (ret)
++		goto err_free_handler;
++
++	ret = v4l2_ctrl_new_fwnode_properties(handler, &ov2311_ctrl_ops,
++					      &props);
++	if (ret)
++		goto err_free_handler;
++
++	if (handler->error) {
++		ret = handler->error;
++		dev_err(&ov2311->client->dev,
++			"Failed to init controls(%d)\n", ret);
++		goto err_free_handler;
++	}
++
++	ov2311->subdev.ctrl_handler = handler;
++
++	return 0;
++
++err_free_handler:
++	v4l2_ctrl_handler_free(handler);
++
++	return ret;
++}
++
++static int ov2311_check_sensor_id(struct ov2311 *ov2311,
++				  struct i2c_client *client)
++{
++	struct device *dev = &ov2311->client->dev;
++	u32 id = 0, id_msb;
++	int ret;
++
++	ret = ov2311_read_reg(client, OV2311_REG_CHIP_ID + 1,
++			      OV2311_REG_VALUE_08BIT, &id);
++	if (!ret)
++		ret = ov2311_read_reg(client, OV2311_REG_CHIP_ID,
++				      OV2311_REG_VALUE_08BIT, &id_msb);
++	id |= (id_msb << 8);
++	if (ret || id != CHIP_ID) {
++		dev_err(dev, "Unexpected sensor id(%04x), ret(%d)\n", id, ret);
++		return -ENODEV;
++	}
++
++	dev_info(dev, "Detected OV%06x sensor\n", CHIP_ID);
++
++	return 0;
++}
++
++static int ov2311_configure_regulators(struct ov2311 *ov2311)
++{
++	unsigned int i;
++
++	for (i = 0; i < OV2311_NUM_SUPPLIES; i++)
++		ov2311->supplies[i].supply = ov2311_supply_names[i];
++
++	return devm_regulator_bulk_get(&ov2311->client->dev,
++				       OV2311_NUM_SUPPLIES,
++				       ov2311->supplies);
++}
++
++static int ov2311_probe(struct i2c_client *client,
++			const struct i2c_device_id *id)
++{
++	struct device *dev = &client->dev;
++	struct ov2311 *ov2311;
++	struct v4l2_subdev *sd;
++	int ret;
++
++	ov2311 = devm_kzalloc(dev, sizeof(*ov2311), GFP_KERNEL);
++	if (!ov2311)
++		return -ENOMEM;
++
++	ov2311->client = client;
++	ov2311->cur_mode = &supported_modes[0];
++
++	ov2311->xvclk = devm_clk_get(dev, "xvclk");
++	if (IS_ERR(ov2311->xvclk)) {
++		dev_err(dev, "Failed to get xvclk\n");
++		return -EINVAL;
++	}
++
++	ov2311->reset_gpio = devm_gpiod_get_optional(dev, "reset",
++						     GPIOD_OUT_LOW);
++	if (IS_ERR(ov2311->reset_gpio))
++		dev_warn(dev, "Failed to get reset-gpios\n");
++
++	ov2311->pwdn_gpio = devm_gpiod_get_optional(dev, "pwdn", GPIOD_OUT_LOW);
++	if (IS_ERR(ov2311->pwdn_gpio))
++		dev_warn(dev, "Failed to get pwdn-gpios\n");
++
++	ret = ov2311_configure_regulators(ov2311);
++	if (ret) {
++		dev_err(dev, "Failed to get power regulators\n");
++		return ret;
++	}
++
++	mutex_init(&ov2311->mutex);
++
++	sd = &ov2311->subdev;
++	v4l2_i2c_subdev_init(sd, client, &ov2311_subdev_ops);
++	ret = ov2311_initialize_controls(ov2311);
++	if (ret)
++		goto err_destroy_mutex;
++
++	ret = ov2311_power_on(&client->dev);
++	if (ret)
++		goto err_free_handler;
++
++	ret = ov2311_check_sensor_id(ov2311, client);
++	if (ret)
++		goto err_power_off;
++
++	sd->internal_ops = &ov2311_internal_ops;
++	sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
++
++	ov2311->pad.flags = MEDIA_PAD_FL_SOURCE;
++	sd->entity.function = MEDIA_ENT_F_CAM_SENSOR;
++	ret = media_entity_pads_init(&sd->entity, 1, &ov2311->pad);
++	if (ret < 0)
++		goto err_power_off;
++
++	ret = v4l2_async_register_subdev(sd);
++	if (ret) {
++		dev_err(dev, "v4l2 async register subdev failed\n");
++		goto err_clean_entity;
++	}
++
++	pm_runtime_set_active(dev);
++	pm_runtime_enable(dev);
++	pm_runtime_idle(dev);
++
++	return 0;
++
++err_clean_entity:
++	media_entity_cleanup(&sd->entity);
++err_power_off:
++	ov2311_power_off(&client->dev);
++err_free_handler:
++	v4l2_ctrl_handler_free(&ov2311->ctrl_handler);
++err_destroy_mutex:
++	mutex_destroy(&ov2311->mutex);
++
++	return ret;
++}
++
++static int ov2311_remove(struct i2c_client *client)
++{
++	struct v4l2_subdev *sd = i2c_get_clientdata(client);
++	struct ov2311 *ov2311 = to_ov2311(sd);
++
++	v4l2_async_unregister_subdev(sd);
++	media_entity_cleanup(&sd->entity);
++	v4l2_ctrl_handler_free(&ov2311->ctrl_handler);
++	mutex_destroy(&ov2311->mutex);
++
++	pm_runtime_disable(&client->dev);
++	if (!pm_runtime_status_suspended(&client->dev))
++		ov2311_power_off(&client->dev);
++	pm_runtime_set_suspended(&client->dev);
++
++	return 0;
++}
++
++static const struct of_device_id ov2311_of_match[] = {
++	{ .compatible = "ovti,ov2311" },
++	{},
++};
++MODULE_DEVICE_TABLE(of, ov2311_of_match);
++
++static const struct i2c_device_id ov2311_match_id[] = {
++	{ "ovti,ov2311", 0 },
++	{ },
++};
++
++static struct i2c_driver ov2311_i2c_driver = {
++	.driver = {
++		.name = OV2311_NAME,
++		.pm = &ov2311_pm_ops,
++		.of_match_table = of_match_ptr(ov2311_of_match),
++	},
++	.probe		= &ov2311_probe,
++	.remove		= &ov2311_remove,
++	.id_table	= ov2311_match_id,
++};
++
++module_i2c_driver(ov2311_i2c_driver);
++
++MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.com");
++MODULE_DESCRIPTION("OmniVision OV2311 sensor driver");
++MODULE_LICENSE("GPL v2");
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0767-dtoverlays-Add-overlay-for-Omnivision-OV2311-image-s.patch b/root/target/linux/bcm27xx/patches-5.15/950-0767-dtoverlays-Add-overlay-for-Omnivision-OV2311-image-s.patch
new file mode 100644
index 00000000..87c440b9
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0767-dtoverlays-Add-overlay-for-Omnivision-OV2311-image-s.patch
@@ -0,0 +1,147 @@
+From 6df582a45c4489edd4ac95cfdd086be42d496fec Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Fri, 25 Feb 2022 18:16:26 +0000
+Subject: [PATCH 767/828] dtoverlays: Add overlay for Omnivision OV2311 image
+ sensor
+
+Adds an overlay for the OV2311 1600x1300 monochrome global
+shutter image sensor.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/Makefile           |  1 +
+ arch/arm/boot/dts/overlays/README             | 15 +++
+ arch/arm/boot/dts/overlays/ov2311-overlay.dts | 93 +++++++++++++++++++
+ 3 files changed, 109 insertions(+)
+ create mode 100644 arch/arm/boot/dts/overlays/ov2311-overlay.dts
+
+--- a/arch/arm/boot/dts/overlays/Makefile
++++ b/arch/arm/boot/dts/overlays/Makefile
+@@ -139,6 +139,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
+ 	mmc.dtbo \
+ 	mpu6050.dtbo \
+ 	mz61581.dtbo \
++	ov2311.dtbo \
+ 	ov5647.dtbo \
+ 	ov7251.dtbo \
+ 	ov9281.dtbo \
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -2421,6 +2421,21 @@ Params: speed                   Display
+         xohms                   Touchpanel sensitivity (X-plate resistance)
+ 
+ 
++Name:   ov2311
++Info:   Omnivision OV2311 camera module.
++        Uses Unicam 1, which is the standard camera connector on most Pi
++        variants.
++Load:   dtoverlay=ov2311,<param>=<val>
++Params: rotation                Mounting rotation of the camera sensor (0 or
++                                180, default 0)
++        orientation             Sensor orientation (0 = front, 1 = rear,
++                                2 = external, default external)
++        media-controller        Configure use of Media Controller API for
++                                configuring the sensor (default on)
++        cam0                    Adopt the default configuration for CAM0 on a
++                                Compute Module (CSI0, i2c_vc, and cam0_reg).
++
++
+ Name:   ov5647
+ Info:   Omnivision OV5647 camera module.
+         Uses Unicam 1, which is the standard camera connector on most Pi
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/ov2311-overlay.dts
+@@ -0,0 +1,93 @@
++// SPDX-License-Identifier: GPL-2.0-only
++// Definitions for OV2311 camera module on VC I2C bus
++/dts-v1/;
++/plugin/;
++
++#include <dt-bindings/gpio/gpio.h>
++
++/{
++	compatible = "brcm,bcm2835";
++
++	i2c_frag: fragment@0 {
++		target = <&i2c_csi_dsi>;
++		__overlay__ {
++			#address-cells = <1>;
++			#size-cells = <0>;
++			status = "okay";
++
++			ov2311: ov2311@60 {
++				compatible = "ovti,ov2311";
++				reg = <0x60>;
++				status = "okay";
++
++				clocks = <&cam1_clk>;
++				clock-names = "xvclk";
++
++				avdd-supply = <&cam1_reg>;
++				dovdd-supply = <&cam_dummy_reg>;
++				dvdd-supply = <&cam_dummy_reg>;
++
++				rotation = <0>;
++				orientation = <2>;
++
++				port {
++					ov2311_0: endpoint {
++						remote-endpoint = <&csi1_ep>;
++						clock-lanes = <0>;
++						data-lanes = <1 2>;
++						link-frequencies =
++							/bits/ 64 <400000000>;
++					};
++				};
++			};
++		};
++	};
++
++	csi_frag: fragment@1 {
++		target = <&csi1>;
++		csi: __overlay__ {
++			status = "okay";
++			brcm,media-controller;
++
++			port {
++				csi1_ep: endpoint {
++					remote-endpoint = <&ov2311_0>;
++					data-lanes = <1 2>;
++				};
++			};
++		};
++	};
++
++	fragment@2 {
++		target = <&i2c0if>;
++		__overlay__ {
++			status = "okay";
++		};
++	};
++
++	fragment@3 {
++		target = <&i2c0mux>;
++		__overlay__ {
++			status = "okay";
++		};
++	};
++
++	clk_frag: fragment@4 {
++		target = <&cam1_clk>;
++		__overlay__ {
++			status = "okay";
++			clock-frequency = <24000000>;
++		};
++	};
++
++	__overrides__ {
++		rotation = <&ov2311>,"rotation:0";
++		orientation = <&ov2311>,"orientation:0";
++		media-controller = <&csi>,"brcm,media-controller?";
++		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
++		       <&csi_frag>, "target:0=",<&csi0>,
++		       <&clk_frag>, "target:0=",<&cam0_clk>,
++		       <&ov2311>, "clocks:0=",<&cam0_clk>,
++		       <&ov2311>, "avdd-supply:0=",<&cam0_reg>;
++	};
++};
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0768-staging-vc-sm-cma-Avoid-log-spamming-on-Pi0-1-over-c.patch b/root/target/linux/bcm27xx/patches-5.15/950-0768-staging-vc-sm-cma-Avoid-log-spamming-on-Pi0-1-over-c.patch
new file mode 100644
index 00000000..5e44dae8
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0768-staging-vc-sm-cma-Avoid-log-spamming-on-Pi0-1-over-c.patch
@@ -0,0 +1,41 @@
+From 3a1b38364fae36170ebd04fdfce2005e7316944d Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 2 Mar 2022 17:23:16 +0000
+Subject: [PATCH 768/828] staging/vc-sm-cma: Avoid log spamming on Pi0/1 over
+ cache alias.
+
+Pi 0/1 use the 0x80000000 cache alias as the ARM also sees the world
+through the VPU L2 cache.
+vc-sm-cma was trying to ensure it was in an uncached alias (0xc), and
+complaining on every allocation if it weren't. Reduce this logging.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/staging/vc04_services/vc-sm-cma/vc_sm.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
++++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
+@@ -720,6 +720,7 @@ vc_sm_cma_import_dmabuf_internal(struct
+ 	struct dma_buf_attachment *attach = NULL;
+ 	struct sg_table *sgt = NULL;
+ 	dma_addr_t dma_addr;
++	u32 cache_alias;
+ 	int ret = 0;
+ 	int status;
+ 
+@@ -762,9 +763,13 @@ vc_sm_cma_import_dmabuf_internal(struct
+ 	import.type = VC_SM_ALLOC_NON_CACHED;
+ 	dma_addr = sg_dma_address(sgt->sgl);
+ 	import.addr = (u32)dma_addr;
+-	if ((import.addr & 0xC0000000) != 0xC0000000) {
++	cache_alias = import.addr & 0xC0000000;
++	if (cache_alias != 0xC0000000 && cache_alias != 0x80000000) {
+ 		pr_err("%s: Expecting an uncached alias for dma_addr %pad\n",
+ 		       __func__, &dma_addr);
++		/* Note that this assumes we're on >= Pi2, but it implies a
++		 * DT configuration error.
++		 */
+ 		import.addr |= 0xC0000000;
+ 	}
+ 	import.size = sg_dma_len(sgt->sgl);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0769-staging-vc04_services-isp-Permit-all-sRGB-colour-spa.patch b/root/target/linux/bcm27xx/patches-5.15/950-0769-staging-vc04_services-isp-Permit-all-sRGB-colour-spa.patch
new file mode 100644
index 00000000..a8d599eb
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0769-staging-vc04_services-isp-Permit-all-sRGB-colour-spa.patch
@@ -0,0 +1,161 @@
+From 13338ad1899f33603cbd88bce8c33d1d153788d9 Mon Sep 17 00:00:00 2001
+From: David Plowman <david.plowman@raspberrypi.com>
+Date: Wed, 2 Mar 2022 16:47:37 +0000
+Subject: [PATCH 769/828] staging: vc04_services: isp: Permit all sRGB colour
+ spaces on ISP outputs
+
+ISP outputs actually support all colour spaces that are fundamentally
+sRGB underneath, regardless of whether an RGB or YUV output format is
+actually requested.
+
+Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
+---
+ .../bcm2835-isp/bcm2835-isp-fmts.h            | 45 ++++++++++---------
+ 1 file changed, 25 insertions(+), 20 deletions(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
++++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
+@@ -34,14 +34,19 @@ struct bcm2835_isp_fmt {
+ #define V4L2_COLORSPACE_MASK_RAW V4L2_COLORSPACE_MASK(V4L2_COLORSPACE_RAW)
+ 
+ /*
+- * The colour spaces we support for YUV outputs. SRGB features here because,
+- * once you assign the default transfer func and so on, it and JPEG effectively
+- * mean the same.
++ * All three colour spaces JPEG, SMPTE170M and REC709 are fundamentally sRGB
++ * underneath (as near as makes no difference to us), just with different YCbCr
++ * encodings. Therefore the ISP can generate sRGB on its main output and any of
++ * the others on its low resolution output. Applications should, when using both
++ * outputs, program the colour spaces on them to be the same, matching whatever
++ * is requested for the low resolution output, even if the main output is
++ * producing an RGB format. In turn this requires us to allow all these colour
++ * spaces for every YUV/RGB output format.
+  */
+-#define V4L2_COLORSPACE_MASK_YUV (V4L2_COLORSPACE_MASK_JPEG | \
+-				  V4L2_COLORSPACE_MASK_SRGB | \
+-				  V4L2_COLORSPACE_MASK_SMPTE170M | \
+-				  V4L2_COLORSPACE_MASK_REC709)
++#define V4L2_COLORSPACE_MASK_ALL_SRGB (V4L2_COLORSPACE_MASK_JPEG |	\
++				       V4L2_COLORSPACE_MASK_SRGB |	\
++				       V4L2_COLORSPACE_MASK_SMPTE170M |	\
++				       V4L2_COLORSPACE_MASK_REC709)
+ 
+ static const struct bcm2835_isp_fmt supported_formats[] = {
+ 	{
+@@ -51,7 +56,7 @@ static const struct bcm2835_isp_fmt supp
+ 		.bytesperline_align = 64,
+ 		.mmal_fmt	    = MMAL_ENCODING_I420,
+ 		.size_multiplier_x2 = 3,
+-		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
++		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
+ 		.colorspace_default = V4L2_COLORSPACE_JPEG,
+ 		.step_size	    = 2,
+ 	}, {
+@@ -60,7 +65,7 @@ static const struct bcm2835_isp_fmt supp
+ 		.bytesperline_align = 64,
+ 		.mmal_fmt	    = MMAL_ENCODING_YV12,
+ 		.size_multiplier_x2 = 3,
+-		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
++		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
+ 		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
+ 		.step_size	    = 2,
+ 	}, {
+@@ -69,7 +74,7 @@ static const struct bcm2835_isp_fmt supp
+ 		.bytesperline_align = 32,
+ 		.mmal_fmt	    = MMAL_ENCODING_NV12,
+ 		.size_multiplier_x2 = 3,
+-		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
++		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
+ 		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
+ 		.step_size	    = 2,
+ 	}, {
+@@ -78,7 +83,7 @@ static const struct bcm2835_isp_fmt supp
+ 		.bytesperline_align = 32,
+ 		.mmal_fmt	    = MMAL_ENCODING_NV21,
+ 		.size_multiplier_x2 = 3,
+-		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
++		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
+ 		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
+ 		.step_size	    = 2,
+ 	}, {
+@@ -87,7 +92,7 @@ static const struct bcm2835_isp_fmt supp
+ 		.bytesperline_align = 64,
+ 		.mmal_fmt	    = MMAL_ENCODING_YUYV,
+ 		.size_multiplier_x2 = 2,
+-		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
++		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
+ 		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
+ 		.step_size	    = 2,
+ 	}, {
+@@ -96,7 +101,7 @@ static const struct bcm2835_isp_fmt supp
+ 		.bytesperline_align = 64,
+ 		.mmal_fmt	    = MMAL_ENCODING_UYVY,
+ 		.size_multiplier_x2 = 2,
+-		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
++		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
+ 		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
+ 		.step_size	    = 2,
+ 	}, {
+@@ -105,7 +110,7 @@ static const struct bcm2835_isp_fmt supp
+ 		.bytesperline_align = 64,
+ 		.mmal_fmt	    = MMAL_ENCODING_YVYU,
+ 		.size_multiplier_x2 = 2,
+-		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
++		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
+ 		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
+ 		.step_size	    = 2,
+ 	}, {
+@@ -114,7 +119,7 @@ static const struct bcm2835_isp_fmt supp
+ 		.bytesperline_align = 64,
+ 		.mmal_fmt	    = MMAL_ENCODING_VYUY,
+ 		.size_multiplier_x2 = 2,
+-		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
++		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
+ 		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
+ 		.step_size	    = 2,
+ 	}, {
+@@ -124,7 +129,7 @@ static const struct bcm2835_isp_fmt supp
+ 		.bytesperline_align = 32,
+ 		.mmal_fmt	    = MMAL_ENCODING_RGB24,
+ 		.size_multiplier_x2 = 2,
+-		.colorspace_mask    = V4L2_COLORSPACE_MASK_SRGB,
++		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
+ 		.colorspace_default = V4L2_COLORSPACE_SRGB,
+ 		.step_size	    = 1,
+ 	}, {
+@@ -133,7 +138,7 @@ static const struct bcm2835_isp_fmt supp
+ 		.bytesperline_align = 32,
+ 		.mmal_fmt	    = MMAL_ENCODING_RGB16,
+ 		.size_multiplier_x2 = 2,
+-		.colorspace_mask    = V4L2_COLORSPACE_MASK_SRGB,
++		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
+ 		.colorspace_default = V4L2_COLORSPACE_SRGB,
+ 		.step_size	    = 1,
+ 	}, {
+@@ -142,7 +147,7 @@ static const struct bcm2835_isp_fmt supp
+ 		.bytesperline_align = 32,
+ 		.mmal_fmt	    = MMAL_ENCODING_BGR24,
+ 		.size_multiplier_x2 = 2,
+-		.colorspace_mask    = V4L2_COLORSPACE_MASK_SRGB,
++		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
+ 		.colorspace_default = V4L2_COLORSPACE_SRGB,
+ 		.step_size	    = 1,
+ 	}, {
+@@ -151,7 +156,7 @@ static const struct bcm2835_isp_fmt supp
+ 		.bytesperline_align = 64,
+ 		.mmal_fmt	    = MMAL_ENCODING_BGRA,
+ 		.size_multiplier_x2 = 2,
+-		.colorspace_mask    = V4L2_COLORSPACE_MASK_SRGB,
++		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
+ 		.colorspace_default = V4L2_COLORSPACE_SRGB,
+ 		.step_size	    = 1,
+ 	}, {
+@@ -160,7 +165,7 @@ static const struct bcm2835_isp_fmt supp
+ 		.bytesperline_align = 64,
+ 		.mmal_fmt	    = MMAL_ENCODING_RGBA,
+ 		.size_multiplier_x2 = 2,
+-		.colorspace_mask    = V4L2_COLORSPACE_MASK_SRGB,
++		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
+ 		.colorspace_default = V4L2_COLORSPACE_SRGB,
+ 		.step_size	    = 1,
+ 	}, {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0770-drivers-staging-bcm2835-isp-Do-not-cleanup-mmal-vcsm.patch b/root/target/linux/bcm27xx/patches-5.15/950-0770-drivers-staging-bcm2835-isp-Do-not-cleanup-mmal-vcsm.patch
new file mode 100644
index 00000000..e9522a98
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0770-drivers-staging-bcm2835-isp-Do-not-cleanup-mmal-vcsm.patch
@@ -0,0 +1,43 @@
+From c7c793257527c0ef824cb79b5cf0faa893681408 Mon Sep 17 00:00:00 2001
+From: Naushir Patuck <naush@raspberrypi.com>
+Date: Thu, 3 Mar 2022 16:45:53 +0000
+Subject: [PATCH 770/828] drivers: staging: bcm2835-isp: Do not cleanup mmal
+ vcsm buffer on stop_streaming
+
+On stop_streaming() the vcsm buffer handle gets released by the buffer cleanup
+code.  This will subsequently cause and error if userland re-queues the same
+buffer on the next start_streaming() call.
+
+Remove this cleanup code and rely on the vb2_ops->buf_cleanup() call to do the
+cleanups instead.
+
+Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
+---
+ .../staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
++++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
+@@ -622,7 +622,6 @@ static void bcm2835_isp_node_stop_stream
+ {
+ 	struct bcm2835_isp_node *node = vb2_get_drv_priv(q);
+ 	struct bcm2835_isp_dev *dev = node_get_dev(node);
+-	unsigned int i;
+ 	int ret;
+ 
+ 	v4l2_dbg(1, debug, &dev->v4l2_dev, "%s: node %s[%d], mmal port %p\n",
+@@ -653,14 +652,6 @@ static void bcm2835_isp_node_stop_stream
+ 		}
+ 	}
+ 
+-	/* Release the VCSM handle here to release the associated dmabuf */
+-	for (i = 0; i < q->num_buffers; i++) {
+-		struct vb2_v4l2_buffer *vb2 = to_vb2_v4l2_buffer(q->bufs[i]);
+-		struct bcm2835_isp_buffer *buf =
+-			container_of(vb2, struct bcm2835_isp_buffer, vb);
+-		bcm2835_isp_mmal_buf_cleanup(&buf->mmal);
+-	}
+-
+ 	atomic_dec(&dev->num_streaming);
+ 	/* If all ports disabled, then disable the component */
+ 	if (atomic_read(&dev->num_streaming) == 0) {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0771-drm-vc4-Fix-out-of-order-frames-during-asynchronous-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0771-drm-vc4-Fix-out-of-order-frames-during-asynchronous-.patch
new file mode 100644
index 00000000..e99372b9
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0771-drm-vc4-Fix-out-of-order-frames-during-asynchronous-.patch
@@ -0,0 +1,97 @@
+From 60241456b82e7a0b83aabb6fe1a09b85eb57b667 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Wed, 8 Sep 2021 21:12:26 +0200
+Subject: [PATCH 771/828] drm/vc4: Fix out of order frames during asynchronous
+ page flips
+
+When doing an asynchronous page flip (PAGE_FLIP ioctl with the
+DRM_MODE_PAGE_FLIP_ASYNC flag set), the current code waits for the
+possible GPU buffer being rendered through a call to
+vc4_queue_seqno_cb().
+
+On the BCM2835-37, the GPU driver is part of the vc4 driver and that
+function is defined in vc4_gem.c to wait for the buffer to be rendered,
+and once it's done, call a callback.
+
+However, on the BCM2711 used on the RaspberryPi4, the GPU driver is
+separate (v3d) and that function won't do anything. This was working
+because we were going into a path, due to uninitialized variables, that
+was always scheduling the callback.
+
+However, we were never actually waiting for the buffer to be rendered
+which was resulting in frames being displayed out of order.
+
+The generic API to signal those kind of completion in the kernel are the
+DMA fences, and fortunately the v3d drivers supports them and signal
+when its job is done. That API also provides an equivalent function that
+allows to have a callback being executed when the fence is signalled as
+done.
+
+Let's change our driver a bit to rely on the previous function for the
+older SoCs, and on DMA fences for the BCM2711.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c | 37 ++++++++++++++++++++++++++++++++--
+ 1 file changed, 35 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -813,6 +813,7 @@ struct vc4_async_flip_state {
+ 	struct drm_pending_vblank_event *event;
+ 
+ 	struct vc4_seqno_cb cb;
++	struct dma_fence_cb fence_cb;
+ };
+ 
+ /* Called when the V3D execution for the BO being flipped to is done, so that
+@@ -858,6 +859,39 @@ vc4_async_page_flip_complete(struct vc4_
+ 	kfree(flip_state);
+ }
+ 
++static void vc4_async_page_flip_fence_complete(struct dma_fence *fence,
++					       struct dma_fence_cb *cb)
++{
++	struct vc4_async_flip_state *flip_state =
++		container_of(cb, struct vc4_async_flip_state, fence_cb);
++
++	vc4_async_page_flip_complete(&flip_state->cb);
++	dma_fence_put(fence);
++}
++
++static int vc4_async_set_fence_cb(struct drm_device *dev,
++				  struct vc4_async_flip_state *flip_state)
++{
++	struct drm_framebuffer *fb = flip_state->fb;
++	struct drm_gem_cma_object *cma_bo = drm_fb_cma_get_gem_obj(fb, 0);
++	struct vc4_dev *vc4 = to_vc4_dev(dev);
++	struct dma_fence *fence;
++
++	if (!vc4->hvs->hvs5) {
++		struct vc4_bo *bo = to_vc4_bo(&cma_bo->base);
++
++		return vc4_queue_seqno_cb(dev, &flip_state->cb, bo->seqno,
++					  vc4_async_page_flip_complete);
++	}
++
++	fence = dma_fence_get(dma_resv_excl_fence(cma_bo->base.resv));
++	if (dma_fence_add_callback(fence, &flip_state->fence_cb,
++				   vc4_async_page_flip_fence_complete))
++		vc4_async_page_flip_fence_complete(fence, &flip_state->fence_cb);
++
++	return 0;
++}
++
+ /* Implements async (non-vblank-synced) page flips.
+  *
+  * The page flip ioctl needs to return immediately, so we grab the
+@@ -918,8 +952,7 @@ static int vc4_async_page_flip(struct dr
+ 	 */
+ 	drm_atomic_set_fb_for_plane(plane->state, fb);
+ 
+-	vc4_queue_seqno_cb(dev, &flip_state->cb, bo->seqno,
+-			   vc4_async_page_flip_complete);
++	vc4_async_set_fence_cb(dev, flip_state);
+ 
+ 	/* Driver takes ownership of state on successful async commit. */
+ 	return 0;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0772-staging-vc04_services-codec-Add-support-for-V4L2_PIX.patch b/root/target/linux/bcm27xx/patches-5.15/950-0772-staging-vc04_services-codec-Add-support-for-V4L2_PIX.patch
new file mode 100644
index 00000000..a73b4f8f
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0772-staging-vc04_services-codec-Add-support-for-V4L2_PIX.patch
@@ -0,0 +1,30 @@
+From 20b6fa1af63b4d4941b686af64e02fad3b60d1b0 Mon Sep 17 00:00:00 2001
+From: David Plowman <david.plowman@raspberrypi.com>
+Date: Mon, 7 Mar 2022 10:00:33 +0000
+Subject: [PATCH 772/828] staging: vc04_services: codec: Add support for
+ V4L2_PIX_FMT_RGBA32 format
+
+We already support V4L2_PIX_FMT_BGR32 which is the same thing with red
+and blue swapped, so it makes sense to include this variant as well.
+
+Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
+---
+ .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c       | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
+@@ -241,6 +241,13 @@ static const struct bcm2835_codec_fmt su
+ 		.mmal_fmt		= MMAL_ENCODING_BGRA,
+ 		.size_multiplier_x2	= 2,
+ 	}, {
++		.fourcc			= V4L2_PIX_FMT_RGBA32,
++		.depth			= 32,
++		.bytesperline_align	= { 32, 32, 32, 32 },
++		.flags			= 0,
++		.mmal_fmt		= MMAL_ENCODING_RGBA,
++		.size_multiplier_x2	= 2,
++	}, {
+ 		/* Bayer formats */
+ 		/* 8 bit */
+ 		.fourcc			= V4L2_PIX_FMT_SRGGB8,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0773-drm-vc4-hvs-Reset-muxes-at-probe-time.patch b/root/target/linux/bcm27xx/patches-5.15/950-0773-drm-vc4-hvs-Reset-muxes-at-probe-time.patch
new file mode 100644
index 00000000..87444211
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0773-drm-vc4-hvs-Reset-muxes-at-probe-time.patch
@@ -0,0 +1,78 @@
+From 01846d2b8fa77381a3fcde21de8f7a65d4d992e6 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Fri, 4 Mar 2022 16:24:00 +0100
+Subject: [PATCH 773/828] drm/vc4: hvs: Reset muxes at probe time
+
+By default, the HVS driver will force the HVS output 3 to be muxed to
+the HVS channel 2. However, the Transposer can only be assigned to the
+HVS channel 2, so whenever we try to use the writeback connector, we'll
+mux its associated output (Output 2) to the channel 2.
+
+This leads to both the output 2 and 3 feeding from the same channel,
+which is explicitly discouraged in the documentation.
+
+In order to avoid this, let's reset all the output muxes to their reset
+value.
+
+Fixes: 87ebcd42fb7b ("drm/vc4: crtc: Assign output to channel automatically")
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_hvs.c | 26 +++++++++++++++++++++-----
+ 1 file changed, 21 insertions(+), 5 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hvs.c
++++ b/drivers/gpu/drm/vc4/vc4_hvs.c
+@@ -1017,6 +1017,7 @@ static int vc4_hvs_bind(struct device *d
+ 	struct vc4_hvs *hvs = NULL;
+ 	int ret;
+ 	u32 dispctrl;
++	u32 reg;
+ 
+ 	hvs = devm_kzalloc(&pdev->dev, sizeof(*hvs), GFP_KERNEL);
+ 	if (!hvs)
+@@ -1090,6 +1091,26 @@ static int vc4_hvs_bind(struct device *d
+ 
+ 	vc4->hvs = hvs;
+ 
++	reg = HVS_READ(SCALER_DISPECTRL);
++	reg &= ~SCALER_DISPECTRL_DSP2_MUX_MASK;
++	HVS_WRITE(SCALER_DISPECTRL,
++		  reg | VC4_SET_FIELD(0, SCALER_DISPECTRL_DSP2_MUX));
++
++	reg = HVS_READ(SCALER_DISPCTRL);
++	reg &= ~SCALER_DISPCTRL_DSP3_MUX_MASK;
++	HVS_WRITE(SCALER_DISPCTRL,
++		  reg | VC4_SET_FIELD(3, SCALER_DISPCTRL_DSP3_MUX));
++
++	reg = HVS_READ(SCALER_DISPEOLN);
++	reg &= ~SCALER_DISPEOLN_DSP4_MUX_MASK;
++	HVS_WRITE(SCALER_DISPEOLN,
++		  reg | VC4_SET_FIELD(3, SCALER_DISPEOLN_DSP4_MUX));
++
++	reg = HVS_READ(SCALER_DISPDITHER);
++	reg &= ~SCALER_DISPDITHER_DSP5_MUX_MASK;
++	HVS_WRITE(SCALER_DISPDITHER,
++		  reg | VC4_SET_FIELD(3, SCALER_DISPDITHER_DSP5_MUX));
++
+ 	dispctrl = HVS_READ(SCALER_DISPCTRL);
+ 
+ 	dispctrl |= SCALER_DISPCTRL_ENABLE;
+@@ -1097,10 +1118,6 @@ static int vc4_hvs_bind(struct device *d
+ 		    SCALER_DISPCTRL_DISPEIRQ(1) |
+ 		    SCALER_DISPCTRL_DISPEIRQ(2);
+ 
+-	/* Set DSP3 (PV1) to use HVS channel 2, which would otherwise
+-	 * be unused.
+-	 */
+-	dispctrl &= ~SCALER_DISPCTRL_DSP3_MUX_MASK;
+ 	dispctrl &= ~(SCALER_DISPCTRL_DMAEIRQ |
+ 		      SCALER_DISPCTRL_SLVWREIRQ |
+ 		      SCALER_DISPCTRL_SLVRDEIRQ |
+@@ -1114,7 +1131,6 @@ static int vc4_hvs_bind(struct device *d
+ 		      SCALER_DISPCTRL_DSPEISLUR(1) |
+ 		      SCALER_DISPCTRL_DSPEISLUR(2) |
+ 		      SCALER_DISPCTRL_SCLEIRQ);
+-	dispctrl |= VC4_SET_FIELD(2, SCALER_DISPCTRL_DSP3_MUX);
+ 
+ 	HVS_WRITE(SCALER_DISPCTRL, dispctrl);
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0774-drm-vc4-kms-Store-channel-in-local-variable.patch b/root/target/linux/bcm27xx/patches-5.15/950-0774-drm-vc4-kms-Store-channel-in-local-variable.patch
new file mode 100644
index 00000000..ef717a25
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0774-drm-vc4-kms-Store-channel-in-local-variable.patch
@@ -0,0 +1,70 @@
+From 0e45255323781bbb519d060363e10aeb032c4fe5 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Fri, 4 Mar 2022 15:58:51 +0100
+Subject: [PATCH 774/828] drm/vc4: kms: Store channel in local variable
+
+We use the channel from our vc4_crtc_state structure in multiple places,
+let's store it in a local variable to make it cleaner.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_kms.c | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -286,13 +286,14 @@ static void vc5_hvs_pv_muxing_commit(str
+ 	for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
+ 		struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state);
+ 		struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
++		unsigned int channel = vc4_state->assigned_channel;
+ 
+ 		if (!vc4_state->update_muxing)
+ 			continue;
+ 
+ 		switch (vc4_crtc->data->hvs_output) {
+ 		case 2:
+-			mux = (vc4_state->assigned_channel == 2) ? 0 : 1;
++			mux = (channel == 2) ? 0 : 1;
+ 			reg = HVS_READ(SCALER_DISPECTRL);
+ 			HVS_WRITE(SCALER_DISPECTRL,
+ 				  (reg & ~SCALER_DISPECTRL_DSP2_MUX_MASK) |
+@@ -300,10 +301,10 @@ static void vc5_hvs_pv_muxing_commit(str
+ 			break;
+ 
+ 		case 3:
+-			if (vc4_state->assigned_channel == VC4_HVS_CHANNEL_DISABLED)
++			if (channel == VC4_HVS_CHANNEL_DISABLED)
+ 				mux = 3;
+ 			else
+-				mux = vc4_state->assigned_channel;
++				mux = channel;
+ 
+ 			reg = HVS_READ(SCALER_DISPCTRL);
+ 			HVS_WRITE(SCALER_DISPCTRL,
+@@ -312,10 +313,10 @@ static void vc5_hvs_pv_muxing_commit(str
+ 			break;
+ 
+ 		case 4:
+-			if (vc4_state->assigned_channel == VC4_HVS_CHANNEL_DISABLED)
++			if (channel == VC4_HVS_CHANNEL_DISABLED)
+ 				mux = 3;
+ 			else
+-				mux = vc4_state->assigned_channel;
++				mux = channel;
+ 
+ 			reg = HVS_READ(SCALER_DISPEOLN);
+ 			HVS_WRITE(SCALER_DISPEOLN,
+@@ -325,10 +326,10 @@ static void vc5_hvs_pv_muxing_commit(str
+ 			break;
+ 
+ 		case 5:
+-			if (vc4_state->assigned_channel == VC4_HVS_CHANNEL_DISABLED)
++			if (channel == VC4_HVS_CHANNEL_DISABLED)
+ 				mux = 3;
+ 			else
+-				mux = vc4_state->assigned_channel;
++				mux = channel;
+ 
+ 			reg = HVS_READ(SCALER_DISPDITHER);
+ 			HVS_WRITE(SCALER_DISPDITHER,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0775-drm-vc4-kms-Warn-if-we-have-an-incompatible-muxing-s.patch b/root/target/linux/bcm27xx/patches-5.15/950-0775-drm-vc4-kms-Warn-if-we-have-an-incompatible-muxing-s.patch
new file mode 100644
index 00000000..9fb184a9
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0775-drm-vc4-kms-Warn-if-we-have-an-incompatible-muxing-s.patch
@@ -0,0 +1,29 @@
+From 9eec55cefe7f16bf1b587d5776a4f0dc8c48a9fb Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Fri, 4 Mar 2022 15:59:08 +0100
+Subject: [PATCH 775/828] drm/vc4: kms: Warn if we have an incompatible muxing
+ setup
+
+The documentation explicitly states we must prevent the output
+2 and 3 from feeding from the same HVS channel.
+
+Let's add a warning to make some noise if we ever find ourselves in such
+a case.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_kms.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -293,6 +293,9 @@ static void vc5_hvs_pv_muxing_commit(str
+ 
+ 		switch (vc4_crtc->data->hvs_output) {
+ 		case 2:
++			WARN_ON(VC4_GET_FIELD(HVS_READ(SCALER_DISPCTRL),
++					      SCALER_DISPCTRL_DSP3_MUX) == channel);
++
+ 			mux = (channel == 2) ? 0 : 1;
+ 			reg = HVS_READ(SCALER_DISPECTRL);
+ 			HVS_WRITE(SCALER_DISPECTRL,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0776-drm-vc4-kms-Improve-logging.patch b/root/target/linux/bcm27xx/patches-5.15/950-0776-drm-vc4-kms-Improve-logging.patch
new file mode 100644
index 00000000..a26361e4
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0776-drm-vc4-kms-Improve-logging.patch
@@ -0,0 +1,66 @@
+From 2dba286edccde4d667e6d54d9b9b1591dc5eb48b Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Fri, 4 Mar 2022 15:59:40 +0100
+Subject: [PATCH 776/828] drm/vc4: kms: Improve logging
+
+When debugging, finding out what muxing decisions were made and what the
+actual core clock rate is is always useful, so let's add some more
+messages.
+
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_kms.c | 20 +++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -447,6 +447,9 @@ static void vc4_atomic_commit_tail(struc
+ 
+ 		/* And drop the temporary request */
+ 		clk_request_done(core_req);
++
++		drm_dbg(dev, "Core clock actual rate: %lu Hz\n",
++			clk_get_rate(hvs->core_clk));
+ 	}
+ }
+ 
+@@ -827,9 +830,18 @@ static int vc4_pv_muxing_atomic_check(st
+ 		if (vc4->firmware_kms)
+ 			continue;
+ 
++		drm_dbg(dev, "%s: Trying to find a channel.\n", crtc->name);
++
+ 		/* Nothing to do here, let's skip it */
+-		if (old_crtc_state->enable == new_crtc_state->enable)
++		if (old_crtc_state->enable == new_crtc_state->enable) {
++			if (new_crtc_state->enable)
++				drm_dbg(dev, "%s: Already enabled, reusing channel %d.\n",
++					crtc->name, new_vc4_crtc_state->assigned_channel);
++			else
++				drm_dbg(dev, "%s: Disabled, ignoring.\n", crtc->name);
++
+ 			continue;
++		}
+ 
+ 		/* Muxing will need to be modified, mark it as such */
+ 		new_vc4_crtc_state->update_muxing = true;
+@@ -837,6 +849,10 @@ static int vc4_pv_muxing_atomic_check(st
+ 		/* If we're disabling our CRTC, we put back our channel */
+ 		if (!new_crtc_state->enable) {
+ 			channel = old_vc4_crtc_state->assigned_channel;
++
++			drm_dbg(dev, "%s: Disabling, Freeing channel %d\n",
++				crtc->name, channel);
++
+ 			hvs_new_state->fifo_state[channel].in_use = false;
+ 			new_vc4_crtc_state->assigned_channel = VC4_HVS_CHANNEL_DISABLED;
+ 			continue;
+@@ -871,6 +887,8 @@ static int vc4_pv_muxing_atomic_check(st
+ 			return -EINVAL;
+ 
+ 		channel = ffs(matching_channels) - 1;
++
++		drm_dbg(dev, "Assigned HVS channel %d to CRTC %s\n", channel, crtc->name);
+ 		new_vc4_crtc_state->assigned_channel = channel;
+ 		unassigned_channels &= ~BIT(channel);
+ 		hvs_new_state->fifo_state[channel].in_use = true;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0777-drm-vc4-txp-Don-t-set-TXP_VSTART_AT_EOF.patch b/root/target/linux/bcm27xx/patches-5.15/950-0777-drm-vc4-txp-Don-t-set-TXP_VSTART_AT_EOF.patch
new file mode 100644
index 00000000..8b08f2b0
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0777-drm-vc4-txp-Don-t-set-TXP_VSTART_AT_EOF.patch
@@ -0,0 +1,31 @@
+From 98a1684f00477f8446c14e9e3be4549b1b92b865 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Fri, 4 Mar 2022 15:55:25 +0100
+Subject: [PATCH 777/828] drm/vc4: txp: Don't set TXP_VSTART_AT_EOF
+
+The TXP_VSTART_AT_EOF will generate a second VSTART signal to the HVS.
+However, the HVS waits for VSTART to enable the FIFO and will thus start
+filling the FIFO before the start of the frame.
+
+This leads to corruption at the beginning of the first frame, and
+content from the previous frame at the beginning of the next frames.
+
+Since one VSTART is enough, let's get rid of it.
+
+Fixes: 008095e065a8 ("drm/vc4: Add support for the transposer block")
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_txp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_txp.c
++++ b/drivers/gpu/drm/vc4/vc4_txp.c
+@@ -298,7 +298,7 @@ static void vc4_txp_connector_atomic_com
+ 	if (WARN_ON(i == ARRAY_SIZE(drm_fmts)))
+ 		return;
+ 
+-	ctrl = TXP_GO | TXP_VSTART_AT_EOF | TXP_EI |
++	ctrl = TXP_GO | TXP_EI |
+ 	       VC4_SET_FIELD(0xf, TXP_BYTE_ENABLE) |
+ 	       VC4_SET_FIELD(txp_fmts[i], TXP_FORMAT);
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0778-drm-vc4-txp-Force-alpha-to-be-0xff-if-it-s-disabled.patch b/root/target/linux/bcm27xx/patches-5.15/950-0778-drm-vc4-txp-Force-alpha-to-be-0xff-if-it-s-disabled.patch
new file mode 100644
index 00000000..d9015130
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0778-drm-vc4-txp-Force-alpha-to-be-0xff-if-it-s-disabled.patch
@@ -0,0 +1,29 @@
+From 438da7bc6e3769a9b60e806256905eca7e9414ec Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Fri, 4 Mar 2022 16:00:16 +0100
+Subject: [PATCH 778/828] drm/vc4: txp: Force alpha to be 0xff if it's disabled
+
+If we use a format that has padding instead of the alpha component (such
+as XRGB8888), it appears that the Transposer will fill the padding to 0,
+disregarding what was stored in the input buffer padding.
+
+This leads to issues with IGT, since it will set the padding to 0xff,
+but will then compare the CRC of the two frames which will thus fail.
+
+Fixes: 008095e065a8 ("drm/vc4: Add support for the transposer block")
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/vc4/vc4_txp.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_txp.c
++++ b/drivers/gpu/drm/vc4/vc4_txp.c
+@@ -304,6 +304,8 @@ static void vc4_txp_connector_atomic_com
+ 
+ 	if (fb->format->has_alpha)
+ 		ctrl |= TXP_ALPHA_ENABLE;
++	else
++		ctrl |= TXP_ALPHA_INVERT;
+ 
+ 	gem = drm_fb_cma_get_gem_obj(fb, 0);
+ 	TXP_WRITE(TXP_DST_PTR, gem->paddr + fb->offsets[0]);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0779-ARM-dts-bcm2711-rpi-ds-Disable-the-BCM2835-STC.patch b/root/target/linux/bcm27xx/patches-5.15/950-0779-ARM-dts-bcm2711-rpi-ds-Disable-the-BCM2835-STC.patch
new file mode 100644
index 00000000..4432b91b
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0779-ARM-dts-bcm2711-rpi-ds-Disable-the-BCM2835-STC.patch
@@ -0,0 +1,27 @@
+From 0275b7904a05d1a42416566e49632aa0b3885a56 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Tue, 8 Mar 2022 12:47:49 +0000
+Subject: [PATCH 779/828] ARM: dts: bcm2711-rpi-ds: Disable the BCM2835 STC
+
+Although BCM2711 still includes the old BCM2835 system timer, the newer
+per-core local timers are preferred because they are more efficient to
+access and can generate core-specific interrupts. Make the usage clear
+by disabling the driver for the old STC.
+
+See: https://github.com/raspberrypi/firmware/issues/1702
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/boot/dts/bcm2711-rpi-ds.dtsi | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
++++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
+@@ -203,3 +203,7 @@
+ &dvp {
+ 	status = "disabled";
+ };
++
++&system_timer {
++	status = "disabled";
++};
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0780-drm-bridge-Introduce-pre_enable_upstream_first-to-al.patch b/root/target/linux/bcm27xx/patches-5.15/950-0780-drm-bridge-Introduce-pre_enable_upstream_first-to-al.patch
new file mode 100644
index 00000000..ad9f4e65
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0780-drm-bridge-Introduce-pre_enable_upstream_first-to-al.patch
@@ -0,0 +1,308 @@
+From 3279cd13fe7211b367f0b53abdbc2a9880d2afe3 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 16 Dec 2021 15:25:35 +0000
+Subject: [PATCH 780/828] drm/bridge: Introduce pre_enable_upstream_first to
+ alter bridge init order
+
+DSI sink devices typically want the DSI host powered up and configured
+before they are powered up. pre_enable is the place this would normally
+happen, but they are called in reverse order from panel/connector towards
+the encoder, which is the "wrong" order.
+
+Add a new flag pre_enable_upstream_first that any bridge can set
+to swap the order of pre_enable (and post_disable) for that and the
+immediately upstream bridge.
+Should the immediately upstream bridge also set the
+pre_enable_upstream_first flag, the bridge upstream of that will be called
+before either of those which requested pre_enable_upstream_first.
+
+eg:
+- Panel
+- Bridge 1
+- Bridge 2 pre_enable_upstream_first
+- Bridge 3
+- Bridge 4 pre_enable_upstream_first
+- Bridge 5 pre_enable_upstream_first
+- Bridge 6
+- Encoder
+Would result in pre_enable's being called as Panel, Bridge 1, Bridge 3,
+Bridge 2, Bridge 6, Bridge 5, Bridge 4, Encoder.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/drm_bridge.c | 177 +++++++++++++++++++++++++----------
+ include/drm/drm_bridge.h     |   8 ++
+ 2 files changed, 137 insertions(+), 48 deletions(-)
+
+--- a/drivers/gpu/drm/drm_bridge.c
++++ b/drivers/gpu/drm/drm_bridge.c
+@@ -463,20 +463,15 @@ EXPORT_SYMBOL(drm_bridge_chain_disable);
+  * encoder chain, starting from the first bridge to the last. These are called
+  * after completing the encoder's prepare op.
+  *
++ * If a bridge sets @pre_enable_upstream_first, then the @post_disable for that
++ * bridge will be called before the previous one to reverse the @pre_enable
++ * calling direction.
++ *
+  * Note: the bridge passed should be the one closest to the encoder
+  */
+ void drm_bridge_chain_post_disable(struct drm_bridge *bridge)
+ {
+-	struct drm_encoder *encoder;
+-
+-	if (!bridge)
+-		return;
+-
+-	encoder = bridge->encoder;
+-	list_for_each_entry_from(bridge, &encoder->bridge_chain, chain_node) {
+-		if (bridge->funcs->post_disable)
+-			bridge->funcs->post_disable(bridge);
+-	}
++	drm_atomic_bridge_chain_post_disable(bridge, NULL);
+ }
+ EXPORT_SYMBOL(drm_bridge_chain_post_disable);
+ 
+@@ -518,24 +513,14 @@ EXPORT_SYMBOL(drm_bridge_chain_mode_set)
+  * chain, starting from the last bridge to the first. These are called
+  * before calling the encoder's commit op.
+  *
++ * If a bridge sets @pre_enable_upstream_first, then the @pre_enable for the
++ * previous bridge will be called before @pre_enable of this bridge.
++ *
+  * Note: the bridge passed should be the one closest to the encoder
+  */
+ void drm_bridge_chain_pre_enable(struct drm_bridge *bridge)
+ {
+-	struct drm_encoder *encoder;
+-	struct drm_bridge *iter;
+-
+-	if (!bridge)
+-		return;
+-
+-	encoder = bridge->encoder;
+-	list_for_each_entry_reverse(iter, &encoder->bridge_chain, chain_node) {
+-		if (iter->funcs->pre_enable)
+-			iter->funcs->pre_enable(iter);
+-
+-		if (iter == bridge)
+-			break;
+-	}
++	drm_atomic_bridge_chain_pre_enable(bridge, NULL);
+ }
+ EXPORT_SYMBOL(drm_bridge_chain_pre_enable);
+ 
+@@ -607,6 +592,25 @@ void drm_atomic_bridge_chain_disable(str
+ }
+ EXPORT_SYMBOL(drm_atomic_bridge_chain_disable);
+ 
++static void drm_atomic_bridge_call_post_disable(struct drm_bridge *bridge,
++						struct drm_atomic_state *old_state)
++{
++	if (old_state && bridge->funcs->atomic_post_disable) {
++		struct drm_bridge_state *old_bridge_state;
++
++		old_bridge_state =
++			drm_atomic_get_old_bridge_state(old_state,
++							bridge);
++		if (WARN_ON(!old_bridge_state))
++			return;
++
++		bridge->funcs->atomic_post_disable(bridge,
++						   old_bridge_state);
++	} else if (bridge->funcs->post_disable) {
++		bridge->funcs->post_disable(bridge);
++	}
++}
++
+ /**
+  * drm_atomic_bridge_chain_post_disable - cleans up after disabling all bridges
+  *					  in the encoder chain
+@@ -617,6 +621,9 @@ EXPORT_SYMBOL(drm_atomic_bridge_chain_di
+  * &drm_bridge_funcs.post_disable) op for all the bridges in the encoder chain,
+  * starting from the first bridge to the last. These are called after completing
+  * &drm_encoder_helper_funcs.atomic_disable
++ * If a bridge sets @pre_enable_upstream_first, then the @post_disable for that
++ * bridge will be called before the previous one to reverse the @pre_enable
++ * calling direction.
+  *
+  * Note: the bridge passed should be the one closest to the encoder
+  */
+@@ -624,30 +631,75 @@ void drm_atomic_bridge_chain_post_disabl
+ 					  struct drm_atomic_state *old_state)
+ {
+ 	struct drm_encoder *encoder;
++	struct drm_bridge *next, *limit;
+ 
+ 	if (!bridge)
+ 		return;
+ 
+ 	encoder = bridge->encoder;
++
+ 	list_for_each_entry_from(bridge, &encoder->bridge_chain, chain_node) {
+-		if (bridge->funcs->atomic_post_disable) {
+-			struct drm_bridge_state *old_bridge_state;
++		limit = NULL;
+ 
+-			old_bridge_state =
+-				drm_atomic_get_old_bridge_state(old_state,
+-								bridge);
+-			if (WARN_ON(!old_bridge_state))
+-				return;
++		if (!list_is_last(&bridge->chain_node, &encoder->bridge_chain)) {
++			next = list_next_entry(bridge, chain_node);
+ 
+-			bridge->funcs->atomic_post_disable(bridge,
+-							   old_bridge_state);
+-		} else if (bridge->funcs->post_disable) {
+-			bridge->funcs->post_disable(bridge);
++			if (next->pre_enable_upstream_first) {
++				/* Downstream bridge had requested that upstream
++				 * was enabled first, so disabled last
++				 */
++				limit = next;
++
++				/* Find the next bridge that has NOT requested
++				 * upstream to be enabled first / disabled last
++				 */
++				list_for_each_entry_from(next, &encoder->bridge_chain,
++							 chain_node) {
++					if (next->pre_enable_upstream_first) {
++						next = list_prev_entry(next, chain_node);
++						limit = next;
++						break;
++					}
++				}
++
++				/* Call these bridges in reverse order */
++				list_for_each_entry_from_reverse(next, &encoder->bridge_chain,
++								 chain_node) {
++					if (next == bridge)
++						break;
++
++					drm_atomic_bridge_call_post_disable(next,
++									    old_state);
++				}
++			}
+ 		}
++
++		drm_atomic_bridge_call_post_disable(bridge, old_state);
++
++		if (limit)
++			bridge = limit;
+ 	}
+ }
+ EXPORT_SYMBOL(drm_atomic_bridge_chain_post_disable);
+ 
++static void drm_atomic_bridge_call_pre_enable(struct drm_bridge *bridge,
++					      struct drm_atomic_state *old_state)
++{
++	if (old_state && bridge->funcs->atomic_pre_enable) {
++		struct drm_bridge_state *old_bridge_state;
++
++		old_bridge_state =
++			drm_atomic_get_old_bridge_state(old_state,
++							bridge);
++		if (WARN_ON(!old_bridge_state))
++			return;
++
++		bridge->funcs->atomic_pre_enable(bridge, old_bridge_state);
++	} else if (bridge->funcs->pre_enable) {
++		bridge->funcs->pre_enable(bridge);
++	}
++}
++
+ /**
+  * drm_atomic_bridge_chain_pre_enable - prepares for enabling all bridges in
+  *					the encoder chain
+@@ -659,33 +711,62 @@ EXPORT_SYMBOL(drm_atomic_bridge_chain_po
+  * starting from the last bridge to the first. These are called before calling
+  * &drm_encoder_helper_funcs.atomic_enable
+  *
++ * If a bridge sets @pre_enable_upstream_first, then the pre_enable for the
++ * upstream bridge will be called before pre_enable of this bridge.
++ *
+  * Note: the bridge passed should be the one closest to the encoder
+  */
+ void drm_atomic_bridge_chain_pre_enable(struct drm_bridge *bridge,
+ 					struct drm_atomic_state *old_state)
+ {
+ 	struct drm_encoder *encoder;
+-	struct drm_bridge *iter;
++	struct drm_bridge *iter, *next, *limit;
+ 
+ 	if (!bridge)
+ 		return;
+ 
+ 	encoder = bridge->encoder;
+-	list_for_each_entry_reverse(iter, &encoder->bridge_chain, chain_node) {
+-		if (iter->funcs->atomic_pre_enable) {
+-			struct drm_bridge_state *old_bridge_state;
+ 
+-			old_bridge_state =
+-				drm_atomic_get_old_bridge_state(old_state,
+-								iter);
+-			if (WARN_ON(!old_bridge_state))
+-				return;
++	list_for_each_entry_reverse(iter, &encoder->bridge_chain, chain_node) {
++		if (iter->pre_enable_upstream_first) {
++			next = iter;
++			limit = bridge;
++			list_for_each_entry_from_reverse(next,
++							 &encoder->bridge_chain,
++							 chain_node) {
++				if (next == bridge)
++					break;
++
++				if (!next->pre_enable_upstream_first) {
++					/* Found first bridge that does NOT
++					 * request upstream to be enabled first
++					 */
++					limit = list_prev_entry(next, chain_node);
++					break;
++				}
++			}
++
++			list_for_each_entry_from(next, &encoder->bridge_chain, chain_node) {
++				/* Call requested upstream bridge pre_enable
++				 * in order.
++				 */
++				if (next == iter)
++					/* At the first bridgge to request upstream
++					 * bridges called first.
++					 */
++					break;
+ 
+-			iter->funcs->atomic_pre_enable(iter, old_bridge_state);
+-		} else if (iter->funcs->pre_enable) {
+-			iter->funcs->pre_enable(iter);
++				drm_atomic_bridge_call_pre_enable(next, old_state);
++			}
+ 		}
+ 
++		drm_atomic_bridge_call_pre_enable(iter, old_state);
++
++		if (iter->pre_enable_upstream_first)
++			/* Jump all bridges that we have already pre_enabled
++			 */
++			iter = limit;
++
+ 		if (iter == bridge)
+ 			break;
+ 	}
+--- a/include/drm/drm_bridge.h
++++ b/include/drm/drm_bridge.h
+@@ -762,6 +762,14 @@ struct drm_bridge {
+ 	 */
+ 	bool interlace_allowed;
+ 	/**
++	 * @pre_enable_upstream_first: The bridge requires that the upstream
++	 * bridge @pre_enable function is called before its @pre_enable,
++	 * and conversely for post_disable. This is most frequently a
++	 * requirement for DSI devices which need the host to be initialised
++	 * before the peripheral.
++	 */
++	bool pre_enable_upstream_first;
++	/**
+ 	 * @ddc: Associated I2C adapter for DDC access, if any.
+ 	 */
+ 	struct i2c_adapter *ddc;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0781-drm-panel-Add-prepare_upstream_first-flag-to-drm_pan.patch b/root/target/linux/bcm27xx/patches-5.15/950-0781-drm-panel-Add-prepare_upstream_first-flag-to-drm_pan.patch
new file mode 100644
index 00000000..34b95e18
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0781-drm-panel-Add-prepare_upstream_first-flag-to-drm_pan.patch
@@ -0,0 +1,48 @@
+From fc46216dc37a0caab55962599753775696a15f04 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 23 Feb 2022 15:36:56 +0000
+Subject: [PATCH 781/828] drm/panel: Add prepare_upstream_first flag to
+ drm_panel
+
+Mapping to the drm_bridge flag pre_enable_upstream_first,
+add a new flag prepare_upstream_first to drm_panel to allow
+the panel driver to request that the upstream bridge should
+be pre_enabled before the panel prepare.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/bridge/panel.c |  3 +++
+ include/drm/drm_panel.h        | 10 ++++++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/drivers/gpu/drm/bridge/panel.c
++++ b/drivers/gpu/drm/bridge/panel.c
+@@ -225,6 +225,9 @@ struct drm_bridge *drm_panel_bridge_add_
+ 	panel_bridge->bridge.ops = DRM_BRIDGE_OP_MODES;
+ 	panel_bridge->bridge.type = connector_type;
+ 
++	panel_bridge->bridge.pre_enable_upstream_first =
++						panel->prepare_upstream_first;
++
+ 	drm_bridge_add(&panel_bridge->bridge);
+ 
+ 	return &panel_bridge->bridge;
+--- a/include/drm/drm_panel.h
++++ b/include/drm/drm_panel.h
+@@ -179,6 +179,16 @@ struct drm_panel {
+ 	 * Panel entry in registry.
+ 	 */
+ 	struct list_head list;
++
++	/**
++	 * @prepare_upstream_first:
++	 *
++	 * The upstream controller should be prepared first, before the prepare
++	 * for the panel is called. This is largely required for DSI panels
++	 * where the DSI host controller should be initialised to LP-11 before
++	 * the panel is powered up.
++	 */
++	bool prepare_upstream_first;
+ };
+ 
+ void drm_panel_init(struct drm_panel *panel, struct device *dev,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0782-drm-Include-drm_connector.h-from-drm_panel.h.patch b/root/target/linux/bcm27xx/patches-5.15/950-0782-drm-Include-drm_connector.h-from-drm_panel.h.patch
new file mode 100644
index 00000000..5c8c740e
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0782-drm-Include-drm_connector.h-from-drm_panel.h.patch
@@ -0,0 +1,36 @@
+From 03a47ba36c511603824a5e6697b1be6e37ccdcee Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Fri, 11 Mar 2022 17:24:37 +0000
+Subject: [PATCH 782/828] drm: Include drm_connector.h from drm_panel.h
+
+drm_panel.h wants to reference enum drm_panel_orientation which is defined
+in drm_connector.h (despite the name).
+Include drm_connector.h in drm_panel.h to avoid the rare situation where
+drm_panel.h is used with drm_connector.h
+
+https://github.com/raspberrypi/linux/issues/4919
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ include/drm/drm_panel.h | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/include/drm/drm_panel.h
++++ b/include/drm/drm_panel.h
+@@ -24,6 +24,7 @@
+ #ifndef __DRM_PANEL_H__
+ #define __DRM_PANEL_H__
+ 
++#include <drm/drm_connector.h>
+ #include <linux/err.h>
+ #include <linux/errno.h>
+ #include <linux/list.h>
+@@ -35,8 +36,6 @@ struct drm_device;
+ struct drm_panel;
+ struct display_timing;
+ 
+-enum drm_panel_orientation;
+-
+ /**
+  * struct drm_panel_funcs - perform operations on a given panel
+  *
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0783-drm-tc358762-Set-the-pre_enable_upstream_first-flag-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0783-drm-tc358762-Set-the-pre_enable_upstream_first-flag-.patch
new file mode 100644
index 00000000..c64d135f
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0783-drm-tc358762-Set-the-pre_enable_upstream_first-flag-.patch
@@ -0,0 +1,25 @@
+From 422e48298ae8d0f14e10088f6f2048fb6c7a4dbf Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 16 Dec 2021 15:33:43 +0000
+Subject: [PATCH 783/828] drm/tc358762: Set the pre_enable_upstream_first flag
+ to configure DSI host
+
+TC358762 wants the DSI host to be prepared before it is powered up, so
+set the flag to request that the upstream bridges have their
+pre_enable called first.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/bridge/tc358762.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/gpu/drm/bridge/tc358762.c
++++ b/drivers/gpu/drm/bridge/tc358762.c
+@@ -237,6 +237,7 @@ static int tc358762_probe(struct mipi_ds
+ 	ctx->bridge.funcs = &tc358762_bridge_funcs;
+ 	ctx->bridge.type = DRM_MODE_CONNECTOR_DPI;
+ 	ctx->bridge.of_node = dev->of_node;
++	ctx->bridge.pre_enable_upstream_first = true;
+ 
+ 	drm_bridge_add(&ctx->bridge);
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0784-bcm2835-codec-dev-video31-as-interface-to-image_enco.patch b/root/target/linux/bcm27xx/patches-5.15/950-0784-bcm2835-codec-dev-video31-as-interface-to-image_enco.patch
new file mode 100644
index 00000000..e3e23749
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0784-bcm2835-codec-dev-video31-as-interface-to-image_enco.patch
@@ -0,0 +1,799 @@
+From 0bc425311b144e015f7ec38a9e8f2c7b8262189b Mon Sep 17 00:00:00 2001
+From: Maxim Devaev <mdevaev@gmail.com>
+Date: Thu, 3 Mar 2022 23:06:15 +0300
+Subject: [PATCH 784/828] bcm2835-codec: /dev/video31 as interface to
+ image_encode JPEG encoder
+
+Signed-off-by: Maxim Devaev <mdevaev@gmail.com>
+---
+ .../bcm2835-codec/bcm2835-v4l2-codec.c        | 246 ++++++++++++------
+ .../vchiq-mmal/mmal-parameters.h              |   2 +
+ 2 files changed, 165 insertions(+), 83 deletions(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
+@@ -62,6 +62,10 @@ static int deinterlace_video_nr = 18;
+ module_param(deinterlace_video_nr, int, 0644);
+ MODULE_PARM_DESC(deinterlace_video_nr, "deinterlace video device number");
+ 
++static int encode_image_nr = 31;
++module_param(encode_image_nr, int, 0644);
++MODULE_PARM_DESC(encode_image_nr, "encoder image device number");
++
+ /*
+  * Workaround for GStreamer v4l2convert component not considering Bayer formats
+  * as raw, and therefore not considering a V4L2 device that supports them as
+@@ -88,6 +92,7 @@ enum bcm2835_codec_role {
+ 	ENCODE,
+ 	ISP,
+ 	DEINTERLACE,
++	ENCODE_IMAGE,
+ 	NUM_ROLES
+ };
+ 
+@@ -96,6 +101,7 @@ static const char * const roles[] = {
+ 	"encode",
+ 	"isp",
+ 	"image_fx",
++	"encode_image",
+ };
+ 
+ static const char * const components[] = {
+@@ -103,6 +109,7 @@ static const char * const components[] =
+ 	"ril.video_encode",
+ 	"ril.isp",
+ 	"ril.image_fx",
++	"ril.image_encode",
+ };
+ 
+ /* Timeout for stop_streaming to allow all buffers to return */
+@@ -136,6 +143,8 @@ static const char * const components[] =
+  */
+ #define DEF_COMP_BUF_SIZE_GREATER_720P	(768 << 10)
+ #define DEF_COMP_BUF_SIZE_720P_OR_LESS	(512 << 10)
++/* JPEG image can be very large. For paranoid reasons 4MB is used */
++#define DEF_COMP_BUF_SIZE_JPEG (4096 << 10)
+ 
+ /* Flags that indicate a format can be used for capture/output */
+ #define MEM2MEM_CAPTURE		BIT(0)
+@@ -158,63 +167,63 @@ static const struct bcm2835_codec_fmt su
+ 		/* YUV formats */
+ 		.fourcc			= V4L2_PIX_FMT_YUV420,
+ 		.depth			= 8,
+-		.bytesperline_align	= { 32, 64, 64, 32 },
++		.bytesperline_align	= { 32, 64, 64, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_I420,
+ 		.size_multiplier_x2	= 3,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_YVU420,
+ 		.depth			= 8,
+-		.bytesperline_align	= { 32, 64, 64, 32 },
++		.bytesperline_align	= { 32, 64, 64, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_YV12,
+ 		.size_multiplier_x2	= 3,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_NV12,
+ 		.depth			= 8,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_NV12,
+ 		.size_multiplier_x2	= 3,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_NV21,
+ 		.depth			= 8,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_NV21,
+ 		.size_multiplier_x2	= 3,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_RGB565,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_RGB16,
+ 		.size_multiplier_x2	= 2,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_YUYV,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_YUYV,
+ 		.size_multiplier_x2	= 2,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_UYVY,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_UYVY,
+ 		.size_multiplier_x2	= 2,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_YVYU,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_YVYU,
+ 		.size_multiplier_x2	= 2,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_VYUY,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_VYUY,
+ 		.size_multiplier_x2	= 2,
+@@ -222,21 +231,21 @@ static const struct bcm2835_codec_fmt su
+ 		/* RGB formats */
+ 		.fourcc			= V4L2_PIX_FMT_RGB24,
+ 		.depth			= 24,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_RGB24,
+ 		.size_multiplier_x2	= 2,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_BGR24,
+ 		.depth			= 24,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BGR24,
+ 		.size_multiplier_x2	= 2,
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_BGR32,
+ 		.depth			= 32,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BGRA,
+ 		.size_multiplier_x2	= 2,
+@@ -252,7 +261,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 8 bit */
+ 		.fourcc			= V4L2_PIX_FMT_SRGGB8,
+ 		.depth			= 8,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB8,
+ 		.size_multiplier_x2	= 2,
+@@ -260,7 +269,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SBGGR8,
+ 		.depth			= 8,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR8,
+ 		.size_multiplier_x2	= 2,
+@@ -268,7 +277,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGRBG8,
+ 		.depth			= 8,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG8,
+ 		.size_multiplier_x2	= 2,
+@@ -276,7 +285,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGBRG8,
+ 		.depth			= 8,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG8,
+ 		.size_multiplier_x2	= 2,
+@@ -285,7 +294,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 10 bit */
+ 		.fourcc			= V4L2_PIX_FMT_SRGGB10P,
+ 		.depth			= 10,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB10P,
+ 		.size_multiplier_x2	= 2,
+@@ -293,7 +302,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SBGGR10P,
+ 		.depth			= 10,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR10P,
+ 		.size_multiplier_x2	= 2,
+@@ -301,7 +310,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGRBG10P,
+ 		.depth			= 10,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG10P,
+ 		.size_multiplier_x2	= 2,
+@@ -309,7 +318,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGBRG10P,
+ 		.depth			= 10,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG10P,
+ 		.size_multiplier_x2	= 2,
+@@ -318,7 +327,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 12 bit */
+ 		.fourcc			= V4L2_PIX_FMT_SRGGB12P,
+ 		.depth			= 12,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB12P,
+ 		.size_multiplier_x2	= 2,
+@@ -326,7 +335,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SBGGR12P,
+ 		.depth			= 12,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR12P,
+ 		.size_multiplier_x2	= 2,
+@@ -334,7 +343,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGRBG12P,
+ 		.depth			= 12,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG12P,
+ 		.size_multiplier_x2	= 2,
+@@ -342,7 +351,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGBRG12P,
+ 		.depth			= 12,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG12P,
+ 		.size_multiplier_x2	= 2,
+@@ -351,7 +360,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 14 bit */
+ 		.fourcc			= V4L2_PIX_FMT_SRGGB14P,
+ 		.depth			= 14,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB14P,
+ 		.size_multiplier_x2	= 2,
+@@ -359,7 +368,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SBGGR14P,
+ 		.depth			= 14,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR14P,
+ 		.size_multiplier_x2	= 2,
+@@ -368,7 +377,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGRBG14P,
+ 		.depth			= 14,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG14P,
+ 		.size_multiplier_x2	= 2,
+@@ -376,7 +385,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGBRG14P,
+ 		.depth			= 14,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG14P,
+ 		.size_multiplier_x2	= 2,
+@@ -385,7 +394,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 16 bit */
+ 		.fourcc			= V4L2_PIX_FMT_SRGGB16,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB16,
+ 		.size_multiplier_x2	= 2,
+@@ -393,7 +402,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SBGGR16,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR16,
+ 		.size_multiplier_x2	= 2,
+@@ -401,7 +410,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGRBG16,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG16,
+ 		.size_multiplier_x2	= 2,
+@@ -409,7 +418,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGBRG16,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG16,
+ 		.size_multiplier_x2	= 2,
+@@ -419,7 +428,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 10 bit */
+ 		.fourcc			= V4L2_PIX_FMT_SRGGB10,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB10,
+ 		.size_multiplier_x2	= 2,
+@@ -427,7 +436,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SBGGR10,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR10,
+ 		.size_multiplier_x2	= 2,
+@@ -435,7 +444,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGRBG10,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG10,
+ 		.size_multiplier_x2	= 2,
+@@ -443,7 +452,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGBRG10,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG10,
+ 		.size_multiplier_x2	= 2,
+@@ -452,7 +461,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 12 bit */
+ 		.fourcc			= V4L2_PIX_FMT_SRGGB12,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB12,
+ 		.size_multiplier_x2	= 2,
+@@ -460,7 +469,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SBGGR12,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR12,
+ 		.size_multiplier_x2	= 2,
+@@ -468,7 +477,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGRBG12,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG12,
+ 		.size_multiplier_x2	= 2,
+@@ -476,7 +485,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGBRG12,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG12,
+ 		.size_multiplier_x2	= 2,
+@@ -485,7 +494,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 14 bit */
+ 		.fourcc			= V4L2_PIX_FMT_SRGGB14,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB14,
+ 		.size_multiplier_x2	= 2,
+@@ -493,7 +502,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SBGGR14,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR14,
+ 		.size_multiplier_x2	= 2,
+@@ -501,7 +510,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGRBG14,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG14,
+ 		.size_multiplier_x2	= 2,
+@@ -509,7 +518,7 @@ static const struct bcm2835_codec_fmt su
+ 	}, {
+ 		.fourcc			= V4L2_PIX_FMT_SGBRG14,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG14,
+ 		.size_multiplier_x2	= 2,
+@@ -519,7 +528,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 8 bit */
+ 		.fourcc			= V4L2_PIX_FMT_GREY,
+ 		.depth			= 8,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_GREY,
+ 		.size_multiplier_x2	= 2,
+@@ -527,7 +536,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 10 bit */
+ 		.fourcc			= V4L2_PIX_FMT_Y10P,
+ 		.depth			= 10,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_Y10P,
+ 		.size_multiplier_x2	= 2,
+@@ -535,7 +544,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 12 bit */
+ 		.fourcc			= V4L2_PIX_FMT_Y12P,
+ 		.depth			= 12,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_Y12P,
+ 		.size_multiplier_x2	= 2,
+@@ -543,7 +552,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 14 bit */
+ 		.fourcc			= V4L2_PIX_FMT_Y14P,
+ 		.depth			= 14,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_Y14P,
+ 		.size_multiplier_x2	= 2,
+@@ -551,7 +560,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 16 bit */
+ 		.fourcc			= V4L2_PIX_FMT_Y16,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_Y16,
+ 		.size_multiplier_x2	= 2,
+@@ -559,7 +568,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 10 bit as 16bpp */
+ 		.fourcc			= V4L2_PIX_FMT_Y10,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_Y10,
+ 		.size_multiplier_x2	= 2,
+@@ -567,7 +576,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 12 bit as 16bpp */
+ 		.fourcc			= V4L2_PIX_FMT_Y12,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_Y12,
+ 		.size_multiplier_x2	= 2,
+@@ -575,7 +584,7 @@ static const struct bcm2835_codec_fmt su
+ 		/* 14 bit as 16bpp */
+ 		.fourcc			= V4L2_PIX_FMT_Y14,
+ 		.depth			= 16,
+-		.bytesperline_align	= { 32, 32, 32, 32 },
++		.bytesperline_align	= { 32, 32, 32, 32, 32 },
+ 		.flags			= 0,
+ 		.mmal_fmt		= MMAL_ENCODING_Y14,
+ 		.size_multiplier_x2	= 2,
+@@ -586,6 +595,11 @@ static const struct bcm2835_codec_fmt su
+ 		.flags			= V4L2_FMT_FLAG_COMPRESSED,
+ 		.mmal_fmt		= MMAL_ENCODING_H264,
+ 	}, {
++		.fourcc			= V4L2_PIX_FMT_JPEG,
++		.depth			= 0,
++		.flags			= V4L2_FMT_FLAG_COMPRESSED,
++		.mmal_fmt		= MMAL_ENCODING_JPEG,
++	}, {
+ 		.fourcc			= V4L2_PIX_FMT_MJPEG,
+ 		.depth			= 0,
+ 		.flags			= V4L2_FMT_FLAG_COMPRESSED,
+@@ -705,6 +719,7 @@ struct bcm2835_codec_driver {
+ 	struct bcm2835_codec_dev *decode;
+ 	struct bcm2835_codec_dev *isp;
+ 	struct bcm2835_codec_dev *deinterlace;
++	struct bcm2835_codec_dev *encode_image;
+ };
+ 
+ enum {
+@@ -838,6 +853,9 @@ static inline unsigned int get_sizeimage
+ 					 struct bcm2835_codec_fmt *fmt)
+ {
+ 	if (fmt->flags & V4L2_FMT_FLAG_COMPRESSED) {
++		if (fmt->fourcc == V4L2_PIX_FMT_JPEG)
++			return DEF_COMP_BUF_SIZE_JPEG;
++
+ 		if (width * height > 1280 * 720)
+ 			return DEF_COMP_BUF_SIZE_GREATER_720P;
+ 		else
+@@ -1422,12 +1440,12 @@ static int vidioc_try_fmt(struct bcm2835
+ 			f->fmt.pix_mp.height = MIN_H;
+ 
+ 		/*
+-		 * For decoders the buffer must have a vertical alignment of 16
+-		 * lines.
++		 * For decoders and image encoders the buffer must have
++		 * a vertical alignment of 16 lines.
+ 		 * The selection will reflect any cropping rectangle when only
+ 		 * some of the pixels are active.
+ 		 */
+-		if (ctx->dev->role == DECODE)
++		if (ctx->dev->role == DECODE || ctx->dev->role == ENCODE_IMAGE)
+ 			f->fmt.pix_mp.height = ALIGN(f->fmt.pix_mp.height, 16);
+ 	}
+ 	f->fmt.pix_mp.num_planes = 1;
+@@ -1573,12 +1591,13 @@ static int vidioc_s_fmt(struct bcm2835_c
+ 	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev,	"Calculated bpl as %u, size %u\n",
+ 		 q_data->bytesperline, q_data->sizeimage);
+ 
+-	if (ctx->dev->role == DECODE &&
++	if ((ctx->dev->role == DECODE || ctx->dev->role == ENCODE_IMAGE) &&
+ 	    q_data->fmt->flags & V4L2_FMT_FLAG_COMPRESSED &&
+ 	    q_data->crop_width && q_data->height) {
+ 		/*
+-		 * On the decoder, if provided with a resolution on the input
+-		 * side, then replicate that to the output side.
++		 * On the decoder or image encoder, if provided with
++		 * a resolution on the input side, then replicate that
++		 * to the output side.
+ 		 * GStreamer appears not to support V4L2_EVENT_SOURCE_CHANGE,
+ 		 * nor set up a resolution on the output side, therefore
+ 		 * we can't decode anything at a resolution other than the
+@@ -1719,7 +1738,7 @@ static int vidioc_g_selection(struct fil
+ 	switch (s->type) {
+ 	case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+ 		/* CAPTURE on encoder is not valid. */
+-		if (ctx->dev->role == ENCODE)
++		if (ctx->dev->role == ENCODE || ctx->dev->role == ENCODE_IMAGE)
+ 			return -EINVAL;
+ 		q_data = &ctx->q_data[V4L2_M2M_DST];
+ 		break;
+@@ -1762,6 +1781,7 @@ static int vidioc_g_selection(struct fil
+ 		}
+ 		break;
+ 	case ENCODE:
++	case ENCODE_IMAGE:
+ 		switch (s->target) {
+ 		case V4L2_SEL_TGT_CROP_DEFAULT:
+ 		case V4L2_SEL_TGT_CROP_BOUNDS:
+@@ -1846,7 +1866,7 @@ static int vidioc_s_selection(struct fil
+ 	switch (s->type) {
+ 	case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+ 		/* CAPTURE on encoder is not valid. */
+-		if (ctx->dev->role == ENCODE)
++		if (ctx->dev->role == ENCODE || ctx->dev->role == ENCODE_IMAGE)
+ 			return -EINVAL;
+ 		q_data = &ctx->q_data[V4L2_M2M_DST];
+ 		break;
+@@ -1882,6 +1902,7 @@ static int vidioc_s_selection(struct fil
+ 		}
+ 		break;
+ 	case ENCODE:
++	case ENCODE_IMAGE:
+ 		switch (s->target) {
+ 		case V4L2_SEL_TGT_CROP:
+ 			/* Only support crop from (0,0) */
+@@ -2266,6 +2287,16 @@ static int bcm2835_codec_s_ctrl(struct v
+ 						    sizeof(u32_value));
+ 		break;
+ 	}
++	case V4L2_CID_JPEG_COMPRESSION_QUALITY:
++		if (!ctx->component)
++			break;
++
++		ret = vchiq_mmal_port_parameter_set(ctx->dev->instance,
++						    &ctx->component->output[0],
++						    MMAL_PARAMETER_JPEG_Q_FACTOR,
++						    &ctrl->val,
++						    sizeof(ctrl->val));
++		break;
+ 
+ 	default:
+ 		v4l2_err(&ctx->dev->v4l2_dev, "Invalid control\n");
+@@ -2364,7 +2395,7 @@ static int vidioc_try_encoder_cmd(struct
+ {
+ 	struct bcm2835_codec_ctx *ctx = file2ctx(file);
+ 
+-	if (ctx->dev->role != ENCODE)
++	if (ctx->dev->role != ENCODE && ctx->dev->role != ENCODE_IMAGE)
+ 		return -EINVAL;
+ 
+ 	switch (cmd->cmd) {
+@@ -2567,6 +2598,20 @@ static int bcm2835_codec_create_componen
+ 					      MMAL_PARAMETER_IMAGE_EFFECT_PARAMETERS,
+ 					      &params,
+ 					      sizeof(params));
++
++	} else if (dev->role == ENCODE_IMAGE) {
++		enable = 0;
++		vchiq_mmal_port_parameter_set(dev->instance,
++					      &ctx->component->control,
++					      MMAL_PARAMETER_EXIF_DISABLE,
++					      &enable,
++					      sizeof(enable));
++		enable = 1;
++		vchiq_mmal_port_parameter_set(dev->instance,
++					      &ctx->component->output[0],
++						  MMAL_PARAMETER_JPEG_IJG_SCALING,
++					      &enable,
++					      sizeof(enable));
+ 	}
+ 
+ 	setup_mmal_port_format(ctx, &ctx->q_data[V4L2_M2M_SRC],
+@@ -2595,7 +2640,7 @@ static int bcm2835_codec_create_componen
+ 		goto destroy_component;
+ 	}
+ 
+-	if (dev->role == ENCODE) {
++	if (dev->role == ENCODE || dev->role == ENCODE_IMAGE) {
+ 		u32 param = 1;
+ 
+ 		if (ctx->q_data[V4L2_M2M_SRC].sizeimage <
+@@ -2604,27 +2649,29 @@ static int bcm2835_codec_create_componen
+ 				 ctx->q_data[V4L2_M2M_SRC].sizeimage,
+ 				 ctx->component->output[0].minimum_buffer.size);
+ 
+-		/* Enable SPS Timing header so framerate information is encoded
+-		 * in the H264 header.
+-		 */
+-		vchiq_mmal_port_parameter_set(ctx->dev->instance,
+-					      &ctx->component->output[0],
+-					      MMAL_PARAMETER_VIDEO_ENCODE_SPS_TIMING,
+-					      &param, sizeof(param));
+-
+-		/* Enable inserting headers into the first frame */
+-		vchiq_mmal_port_parameter_set(ctx->dev->instance,
+-					      &ctx->component->control,
+-					      MMAL_PARAMETER_VIDEO_ENCODE_HEADERS_WITH_FRAME,
+-					      &param, sizeof(param));
+-		/*
+-		 * Avoid fragmenting the buffers over multiple frames (unless
+-		 * the frame is bigger than the whole buffer)
+-		 */
+-		vchiq_mmal_port_parameter_set(ctx->dev->instance,
+-					      &ctx->component->control,
+-					      MMAL_PARAMETER_MINIMISE_FRAGMENTATION,
+-					      &param, sizeof(param));
++		if (dev->role == ENCODE) {
++			/* Enable SPS Timing header so framerate information is encoded
++			 * in the H264 header.
++			 */
++			vchiq_mmal_port_parameter_set(ctx->dev->instance,
++						      &ctx->component->output[0],
++						      MMAL_PARAMETER_VIDEO_ENCODE_SPS_TIMING,
++						      &param, sizeof(param));
++
++			/* Enable inserting headers into the first frame */
++			vchiq_mmal_port_parameter_set(ctx->dev->instance,
++						      &ctx->component->control,
++						      MMAL_PARAMETER_VIDEO_ENCODE_HEADERS_WITH_FRAME,
++						      &param, sizeof(param));
++			/*
++			 * Avoid fragmenting the buffers over multiple frames (unless
++			 * the frame is bigger than the whole buffer)
++			 */
++			vchiq_mmal_port_parameter_set(ctx->dev->instance,
++						      &ctx->component->control,
++						      MMAL_PARAMETER_MINIMISE_FRAGMENTATION,
++						      &param, sizeof(param));
++		}
+ 	} else {
+ 		if (ctx->q_data[V4L2_M2M_DST].sizeimage <
+ 			ctx->component->output[0].minimum_buffer.size)
+@@ -3248,6 +3295,23 @@ static int bcm2835_codec_open(struct fil
+ 		v4l2_ctrl_handler_init(hdl, 0);
+ 	}
+ 	break;
++	case ENCODE_IMAGE:
++	{
++		/* Encode image controls */
++		v4l2_ctrl_handler_init(hdl, 1);
++
++		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
++				  V4L2_CID_JPEG_COMPRESSION_QUALITY,
++				  1, 100,
++				  1, 80);
++		if (hdl->error) {
++			rc = hdl->error;
++			goto free_ctrl_handler;
++		}
++		ctx->fh.ctrl_handler = hdl;
++		v4l2_ctrl_handler_setup(hdl);
++	}
++	break;
+ 	case NUM_ROLES:
+ 	break;
+ 	}
+@@ -3527,6 +3591,12 @@ static int bcm2835_codec_create(struct b
+ 		function = MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER;
+ 		video_nr = deinterlace_video_nr;
+ 		break;
++	case ENCODE_IMAGE:
++		v4l2_disable_ioctl(vfd, VIDIOC_DECODER_CMD);
++		v4l2_disable_ioctl(vfd, VIDIOC_TRY_DECODER_CMD);
++		function = MEDIA_ENT_F_PROC_VIDEO_ENCODER;
++		video_nr = encode_image_nr;
++		break;
+ 	default:
+ 		ret = -EINVAL;
+ 		goto unreg_dev;
+@@ -3626,6 +3696,10 @@ static int bcm2835_codec_probe(struct pl
+ 	if (ret)
+ 		goto out;
+ 
++	ret = bcm2835_codec_create(drv, &drv->encode_image, ENCODE_IMAGE);
++	if (ret)
++		goto out;
++
+ 	/* Register the media device node */
+ 	if (media_device_register(mdev) < 0)
+ 		goto out;
+@@ -3635,6 +3709,10 @@ static int bcm2835_codec_probe(struct pl
+ 	return 0;
+ 
+ out:
++	if (drv->encode_image) {
++		bcm2835_codec_destroy(drv->encode_image);
++		drv->encode_image = NULL;
++	}
+ 	if (drv->deinterlace) {
+ 		bcm2835_codec_destroy(drv->deinterlace);
+ 		drv->deinterlace = NULL;
+@@ -3660,6 +3738,8 @@ static int bcm2835_codec_remove(struct p
+ 
+ 	media_device_unregister(&drv->mdev);
+ 
++	bcm2835_codec_destroy(drv->encode_image);
++
+ 	bcm2835_codec_destroy(drv->deinterlace);
+ 
+ 	bcm2835_codec_destroy(drv->isp);
+--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
++++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
+@@ -279,6 +279,8 @@ enum mmal_parameter_camera_type {
+ 	MMAL_PARAMETER_GAMMA,
+ 		/**< Takes a @ref MMAL_PARAMETER_CDN_T */
+ 	MMAL_PARAMETER_CDN,
++		/**< Takes a @ref MMAL_PARAMETER_BOOLEAN_T */
++	MMAL_PARAMETER_JPEG_IJG_SCALING,
+ };
+ 
+ struct mmal_parameter_rational {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0785-media-entity-Skip-non-data-links-in-graph-iteration.patch b/root/target/linux/bcm27xx/patches-5.15/950-0785-media-entity-Skip-non-data-links-in-graph-iteration.patch
new file mode 100644
index 00000000..7e2435f9
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0785-media-entity-Skip-non-data-links-in-graph-iteration.patch
@@ -0,0 +1,29 @@
+From 785c31b5c35960cf7651702b61694bc9ccf9467d Mon Sep 17 00:00:00 2001
+From: Daniel Scally <djrscally@gmail.com>
+Date: Wed, 2 Mar 2022 22:03:00 +0000
+Subject: [PATCH 785/828] media: entity: Skip non-data links in graph iteration
+
+When iterating over the media graph, don't follow links that are not
+data links.
+
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Signed-off-by: Daniel Scally <djrscally@gmail.com>
+---
+ drivers/media/mc/mc-entity.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/media/mc/mc-entity.c
++++ b/drivers/media/mc/mc-entity.c
+@@ -313,6 +313,12 @@ static void media_graph_walk_iter(struct
+ 
+ 	link = list_entry(link_top(graph), typeof(*link), list);
+ 
++	/* If the link is not a data link, don't follow it */
++	if ((link->flags & MEDIA_LNK_FL_LINK_TYPE) != MEDIA_LNK_FL_DATA_LINK) {
++		link_top(graph) = link_top(graph)->next;
++		return;
++	}
++
+ 	/* The link is not enabled so we do not follow. */
+ 	if (!(link->flags & MEDIA_LNK_FL_ENABLED)) {
+ 		link_top(graph) = link_top(graph)->next;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0786-media-media.h-Add-new-media-link-type.patch b/root/target/linux/bcm27xx/patches-5.15/950-0786-media-media.h-Add-new-media-link-type.patch
new file mode 100644
index 00000000..51126f27
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0786-media-media.h-Add-new-media-link-type.patch
@@ -0,0 +1,74 @@
+From 9599cdf9c07e6d9df40e40ba6674ba56acc86cbb Mon Sep 17 00:00:00 2001
+From: Daniel Scally <djrscally@gmail.com>
+Date: Wed, 2 Mar 2022 22:03:01 +0000
+Subject: [PATCH 786/828] media: media.h: Add new media link type
+
+To describe in the kernel the connection between devices and their
+supporting peripherals (for example, a camera sensor and the vcm
+driving the focusing lens for it), add a new type of media link
+to introduce the concept of these ancillary links.
+
+Add some elements to the uAPI documentation to explain the new link
+type, their purpose and some aspects of their current implementation.
+
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Signed-off-by: Daniel Scally <djrscally@gmail.com>
+---
+ .../media/mediactl/media-controller-model.rst   |  6 ++++++
+ .../media/mediactl/media-types.rst              | 17 ++++++++++++-----
+ include/uapi/linux/media.h                      |  1 +
+ 3 files changed, 19 insertions(+), 5 deletions(-)
+
+--- a/Documentation/userspace-api/media/mediactl/media-controller-model.rst
++++ b/Documentation/userspace-api/media/mediactl/media-controller-model.rst
+@@ -33,3 +33,9 @@ are:
+ 
+ -  An **interface link** is a point-to-point bidirectional control
+    connection between a Linux Kernel interface and an entity.
++
++- An **ancillary link** is a point-to-point connection denoting that two
++  entities form a single logical unit. For example this could represent the
++  fact that a particular camera sensor and lens controller form a single
++  physical module, meaning this lens controller drives the lens for this
++  camera sensor.
+\ No newline at end of file
+--- a/Documentation/userspace-api/media/mediactl/media-types.rst
++++ b/Documentation/userspace-api/media/mediactl/media-types.rst
+@@ -412,14 +412,21 @@ must be set for every pad.
+ 	  is set by drivers and is read-only for applications.
+ 
+     *  -  ``MEDIA_LNK_FL_LINK_TYPE``
+-       -  This is a bitmask that defines the type of the link. Currently,
+-	  two types of links are supported:
++       -  This is a bitmask that defines the type of the link. The following
++	  link types are currently supported:
+ 
+ 	  .. _MEDIA-LNK-FL-DATA-LINK:
+ 
+-	  ``MEDIA_LNK_FL_DATA_LINK`` if the link is between two pads
++	  ``MEDIA_LNK_FL_DATA_LINK`` for links that represent a data connection
++     between two pads.
+ 
+ 	  .. _MEDIA-LNK-FL-INTERFACE-LINK:
+ 
+-	  ``MEDIA_LNK_FL_INTERFACE_LINK`` if the link is between an
+-	  interface and an entity
++	  ``MEDIA_LNK_FL_INTERFACE_LINK`` for links that associate an entity to its
++     interface.
++
++	  .. _MEDIA-LNK-FL-ANCILLARY-LINK:
++
++	  ``MEDIA_LNK_FL_ANCILLARY_LINK`` for links that represent a physical
++     relationship between two entities. The link may or may not be ummutable, so
++     applications must not assume either case.
+\ No newline at end of file
+--- a/include/uapi/linux/media.h
++++ b/include/uapi/linux/media.h
+@@ -226,6 +226,7 @@ struct media_pad_desc {
+ #define MEDIA_LNK_FL_LINK_TYPE			(0xf << 28)
+ #  define MEDIA_LNK_FL_DATA_LINK		(0 << 28)
+ #  define MEDIA_LNK_FL_INTERFACE_LINK		(1 << 28)
++#  define MEDIA_LNK_FL_ANCILLARY_LINK		(2 << 28)
+ 
+ struct media_link_desc {
+ 	struct media_pad_desc source;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0787-media-entity-Add-link_type_name-helper.patch b/root/target/linux/bcm27xx/patches-5.15/950-0787-media-entity-Add-link_type_name-helper.patch
new file mode 100644
index 00000000..c9eb7c07
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0787-media-entity-Add-link_type_name-helper.patch
@@ -0,0 +1,49 @@
+From 82b54a129d08eec988ccaa7efeef4b8087d26af7 Mon Sep 17 00:00:00 2001
+From: Daniel Scally <djrscally@gmail.com>
+Date: Wed, 2 Mar 2022 22:03:02 +0000
+Subject: [PATCH 787/828] media: entity: Add link_type_name() helper
+
+Now we have three types of media link, printing the right name during
+debug output is slightly more complicated. Add a helper function to
+make it easier.
+
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Signed-off-by: Daniel Scally <djrscally@gmail.com>
+---
+ drivers/media/mc/mc-entity.c | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+
+--- a/drivers/media/mc/mc-entity.c
++++ b/drivers/media/mc/mc-entity.c
+@@ -60,6 +60,20 @@ static inline const char *intf_type(stru
+ 	}
+ };
+ 
++static inline const char *link_type_name(struct media_link *link)
++{
++	switch (link->flags & MEDIA_LNK_FL_LINK_TYPE) {
++	case MEDIA_LNK_FL_DATA_LINK:
++		return "data";
++	case MEDIA_LNK_FL_INTERFACE_LINK:
++		return "interface";
++	case MEDIA_LNK_FL_ANCILLARY_LINK:
++		return "ancillary";
++	default:
++		return "unknown";
++	}
++}
++
+ __must_check int __media_entity_enum_init(struct media_entity_enum *ent_enum,
+ 					  int idx_max)
+ {
+@@ -107,9 +121,7 @@ static void dev_dbg_obj(const char *even
+ 
+ 		dev_dbg(gobj->mdev->dev,
+ 			"%s id %u: %s link id %u ==> id %u\n",
+-			event_name, media_id(gobj),
+-			media_type(link->gobj0) == MEDIA_GRAPH_PAD ?
+-				"data" : "interface",
++			event_name, media_id(gobj), link_type_name(link),
+ 			media_id(link->gobj0),
+ 			media_id(link->gobj1));
+ 		break;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0788-media-entity-Add-support-for-ancillary-links.patch b/root/target/linux/bcm27xx/patches-5.15/950-0788-media-entity-Add-support-for-ancillary-links.patch
new file mode 100644
index 00000000..ad57a519
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0788-media-entity-Add-support-for-ancillary-links.patch
@@ -0,0 +1,69 @@
+From dc71fc38588afa08a49a9e6029b86d40af92a269 Mon Sep 17 00:00:00 2001
+From: Daniel Scally <djrscally@gmail.com>
+Date: Wed, 2 Mar 2022 22:03:03 +0000
+Subject: [PATCH 788/828] media: entity: Add support for ancillary links
+
+Add functions to create ancillary links, so that they don't need to
+be manually created by users.
+
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Signed-off-by: Daniel Scally <djrscally@gmail.com>
+---
+ drivers/media/mc/mc-entity.c | 22 ++++++++++++++++++++++
+ include/media/media-entity.h | 19 +++++++++++++++++++
+ 2 files changed, 41 insertions(+)
+
+--- a/drivers/media/mc/mc-entity.c
++++ b/drivers/media/mc/mc-entity.c
+@@ -1050,3 +1050,25 @@ void media_remove_intf_links(struct medi
+ 	mutex_unlock(&mdev->graph_mutex);
+ }
+ EXPORT_SYMBOL_GPL(media_remove_intf_links);
++
++struct media_link *media_create_ancillary_link(struct media_entity *primary,
++					       struct media_entity *ancillary)
++{
++	struct media_link *link;
++
++	link = media_add_link(&primary->links);
++	if (!link)
++		return ERR_PTR(-ENOMEM);
++
++	link->gobj0 = &primary->graph_obj;
++	link->gobj1 = &ancillary->graph_obj;
++	link->flags = MEDIA_LNK_FL_IMMUTABLE | MEDIA_LNK_FL_ENABLED |
++		      MEDIA_LNK_FL_ANCILLARY_LINK;
++
++	/* Initialize graph object embedded in the new link */
++	media_gobj_create(primary->graph_obj.mdev, MEDIA_GRAPH_LINK,
++			  &link->graph_obj);
++
++	return link;
++}
++EXPORT_SYMBOL_GPL(media_create_ancillary_link);
+--- a/include/media/media-entity.h
++++ b/include/media/media-entity.h
+@@ -1107,4 +1107,23 @@ void media_remove_intf_links(struct medi
+ 	(((entity)->ops && (entity)->ops->operation) ?			\
+ 	 (entity)->ops->operation((entity) , ##args) : -ENOIOCTLCMD)
+ 
++/**
++ * media_create_ancillary_link() - create an ancillary link between two
++ *				   instances of &media_entity
++ *
++ * @primary:	pointer to the primary &media_entity
++ * @ancillary:	pointer to the ancillary &media_entity
++ *
++ * Create an ancillary link between two entities, indicating that they
++ * represent two connected pieces of hardware that form a single logical unit.
++ * A typical example is a camera lens controller being linked to the sensor that
++ * it is supporting.
++ *
++ * The function sets both MEDIA_LNK_FL_ENABLED and MEDIA_LNK_FL_IMMUTABLE for
++ * the new link.
++ */
++struct media_link *
++media_create_ancillary_link(struct media_entity *primary,
++			    struct media_entity *ancillary);
++
+ #endif
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0789-media-v4l2-async-Create-links-during-v4l2_async_matc.patch b/root/target/linux/bcm27xx/patches-5.15/950-0789-media-v4l2-async-Create-links-during-v4l2_async_matc.patch
new file mode 100644
index 00000000..bf926808
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0789-media-v4l2-async-Create-links-during-v4l2_async_matc.patch
@@ -0,0 +1,67 @@
+From 5ff7118c78e3caab6f8d0f07e41526325cceadb8 Mon Sep 17 00:00:00 2001
+From: Daniel Scally <djrscally@gmail.com>
+Date: Wed, 2 Mar 2022 22:03:04 +0000
+Subject: [PATCH 789/828] media: v4l2-async: Create links during
+ v4l2_async_match_notify()
+
+Upon an async fwnode match, there's some typical behaviour that the
+notifier and matching subdev will want to do. For example, a notifier
+representing a sensor matching to an async subdev representing its
+VCM will want to create an ancillary link to expose that relationship
+to userspace.
+
+To avoid lots of code in individual drivers, try to build these links
+within v4l2 core.
+
+Signed-off-by: Daniel Scally <djrscally@gmail.com>
+---
+ drivers/media/v4l2-core/v4l2-async.c | 31 ++++++++++++++++++++++++++++
+ 1 file changed, 31 insertions(+)
+
+--- a/drivers/media/v4l2-core/v4l2-async.c
++++ b/drivers/media/v4l2-core/v4l2-async.c
+@@ -275,6 +275,24 @@ v4l2_async_notifier_try_complete(struct
+ static int
+ v4l2_async_notifier_try_all_subdevs(struct v4l2_async_notifier *notifier);
+ 
++static int v4l2_async_create_ancillary_links(struct v4l2_async_notifier *n,
++					     struct v4l2_subdev *sd)
++{
++	struct media_link *link = NULL;
++
++#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)
++
++	if (sd->entity.function != MEDIA_ENT_F_LENS &&
++	    sd->entity.function != MEDIA_ENT_F_FLASH)
++		return 0;
++
++	link = media_create_ancillary_link(&n->sd->entity, &sd->entity);
++
++#endif
++
++	return IS_ERR(link) ? PTR_ERR(link) : 0;
++}
++
+ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
+ 				   struct v4l2_device *v4l2_dev,
+ 				   struct v4l2_subdev *sd,
+@@ -292,6 +310,19 @@ static int v4l2_async_match_notify(struc
+ 		v4l2_device_unregister_subdev(sd);
+ 		return ret;
+ 	}
++
++	/*
++	 * Depending of the function of the entities involved, we may want to
++	 * create links between them (for example between a sensor and its lens
++	 * or between a sensor's source pad and the connected device's sink
++	 * pad).
++	 */
++	ret = v4l2_async_create_ancillary_links(notifier, sd);
++	if (ret) {
++		v4l2_async_notifier_call_unbind(notifier, sd, asd);
++		v4l2_device_unregister_subdev(sd);
++		return ret;
++	}
+ 
+ 	/* Remove from the waiting list */
+ 	list_del(&asd->list);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0790-dt-bindings-media-i2c-Add-binding-for-ad5398-VCM.patch b/root/target/linux/bcm27xx/patches-5.15/950-0790-dt-bindings-media-i2c-Add-binding-for-ad5398-VCM.patch
new file mode 100644
index 00000000..1db0a33a
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0790-dt-bindings-media-i2c-Add-binding-for-ad5398-VCM.patch
@@ -0,0 +1,39 @@
+From d559d9a6fa4e5baf9628635ab3f44e8eadcd05c1 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 29 Sep 2021 12:33:35 +0100
+Subject: [PATCH 790/828] dt-bindings: media: i2c: Add binding for ad5398 VCM
+
+Add a binding for Analog Devices AD5398 10bit current
+sinking DAC when used as a lens VCM driver.
+
+FIXME: Convert to YAML
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ .../devicetree/bindings/media/i2c/ad5398.txt  | 20 +++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/ad5398.txt
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/media/i2c/ad5398.txt
+@@ -0,0 +1,20 @@
++* Analog Devices AD5398 autofocus coil
++
++Required Properties:
++
++  - compatible: Must contain one of:
++		- "adi,ad5398"
++
++  - reg: I2C slave address
++
++  - VANA-supply: supply of voltage for VANA pin
++
++Example:
++
++       ad5398: coil@c {
++               compatible = "adi,ad5398";
++               reg = <0x0c>;
++
++               VANA-supply = <&vaux4>;
++       };
++
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0791-media-i2c-Add-driver-for-AD5398-VCM-lens-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0791-media-i2c-Add-driver-for-AD5398-VCM-lens-driver.patch
new file mode 100644
index 00000000..0a7c1109
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0791-media-i2c-Add-driver-for-AD5398-VCM-lens-driver.patch
@@ -0,0 +1,388 @@
+From a7b85d81a2d8dcef758314648ec52565be914eac Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 29 Sep 2021 14:04:28 +0100
+Subject: [PATCH 791/828] media: i2c: Add driver for AD5398 VCM lens driver
+
+Adds a driver for the Analog Devices AD5398 10 bit
+I2C DAC which is commonly used for driving VCM lens
+mechanisms.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/Kconfig  |   7 +
+ drivers/media/i2c/Makefile |   1 +
+ drivers/media/i2c/ad5398.c | 342 +++++++++++++++++++++++++++++++++++++
+ 3 files changed, 350 insertions(+)
+ create mode 100644 drivers/media/i2c/ad5398.c
+
+--- a/drivers/media/i2c/Kconfig
++++ b/drivers/media/i2c/Kconfig
+@@ -1451,6 +1451,13 @@ endmenu
+ menu "Lens drivers"
+ 	visible if MEDIA_CAMERA_SUPPORT
+ 
++config VIDEO_AD5398
++	tristate "AD5398 lens voice coil support"
++	depends on GPIOLIB && I2C && VIDEO_V4L2
++	select MEDIA_CONTROLLER
++	help
++	  This is a driver for the AD5398 camera lens voice coil.
++
+ config VIDEO_AD5820
+ 	tristate "AD5820 lens voice coil support"
+ 	depends on GPIOLIB && I2C && VIDEO_V4L2
+--- a/drivers/media/i2c/Makefile
++++ b/drivers/media/i2c/Makefile
+@@ -21,6 +21,7 @@ obj-$(CONFIG_VIDEO_SAA717X) += saa717x.o
+ obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
+ obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o
+ obj-$(CONFIG_VIDEO_SAA6752HS) += saa6752hs.o
++obj-$(CONFIG_VIDEO_AD5398)  += ad5398.o
+ obj-$(CONFIG_VIDEO_AD5820)  += ad5820.o
+ obj-$(CONFIG_VIDEO_AK7375)  += ak7375.o
+ obj-$(CONFIG_VIDEO_DW9714)  += dw9714.o
+--- /dev/null
++++ b/drivers/media/i2c/ad5398.c
+@@ -0,0 +1,342 @@
++// SPDX-License-Identifier: GPL-2.0-only
++/*
++ * AD5398 DAC driver for camera voice coil focus.
++ * Copyright (C) 2021 Raspberry Pi (Trading) Ltd.
++ *
++ * Based on AD5820 DAC driver by Nokia and TI.
++ *
++ * This driver uses the regulator framework notification hooks on the
++ * assumption that the VCM and sensor share a regulator. This means the VCM
++ * position will be restored when either the sensor or VCM subdevices are opened
++ * or powered up. The client can therefore choose to ignore the VCM subdevice,
++ * and the lens position will be as previously requested. Without that, there
++ * is a hard requirement to have the VCM subdevice open in order for the VCM
++ * to be powered and at the requested position.
++ */
++
++#include <linux/errno.h>
++#include <linux/i2c.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/regulator/consumer.h>
++#include <linux/gpio/consumer.h>
++
++#include <media/v4l2-ctrls.h>
++#include <media/v4l2-device.h>
++#include <media/v4l2-subdev.h>
++
++/* Register definitions */
++#define AD5398_POWER_DOWN		BIT(15)
++#define AD5398_DAC_SHIFT		4
++
++#define to_ad5398_device(sd)	container_of(sd, struct ad5398_device, subdev)
++
++struct ad5398_device {
++	struct v4l2_subdev subdev;
++	struct ad5398_platform_data *platform_data;
++	struct regulator *vana;
++	struct notifier_block nb;
++
++	struct v4l2_ctrl_handler ctrls;
++	u32 focus_absolute;
++
++	bool standby;
++};
++
++static int ad5398_write(struct ad5398_device *coil, u16 data)
++{
++	struct i2c_client *client = v4l2_get_subdevdata(&coil->subdev);
++	struct i2c_msg msg;
++	__be16 be_data;
++	int r;
++
++	if (!client->adapter)
++		return -ENODEV;
++
++	be_data = cpu_to_be16(data);
++	msg.addr  = client->addr;
++	msg.flags = 0;
++	msg.len   = 2;
++	msg.buf   = (u8 *)&be_data;
++
++	r = i2c_transfer(client->adapter, &msg, 1);
++	if (r < 0) {
++		dev_err(&client->dev, "write failed, error %d\n", r);
++		return r;
++	}
++
++	return 0;
++}
++
++/*
++ * Calculate status word and write it to the device based on current
++ * values of V4L2 controls. It is assumed that the stored V4L2 control
++ * values are properly limited and rounded.
++ */
++static int ad5398_update_hw(struct ad5398_device *coil)
++{
++	u16 status;
++
++	status = coil->focus_absolute << AD5398_DAC_SHIFT;
++
++	if (coil->standby)
++		status |= AD5398_POWER_DOWN;
++
++	return ad5398_write(coil, status);
++}
++
++/*
++ * Power handling
++ */
++static int ad5398_power_off(struct ad5398_device *coil)
++{
++	int ret = 0;
++
++	coil->standby = true;
++	ret = ad5398_update_hw(coil);
++
++	return ret;
++}
++
++static int ad5398_power_on(struct ad5398_device *coil)
++{
++	int ret;
++
++	/* Restore the hardware settings. */
++	coil->standby = false;
++	ret = ad5398_update_hw(coil);
++	if (ret)
++		goto fail;
++
++	return 0;
++
++fail:
++	coil->standby = true;
++
++	return ret;
++}
++
++/*
++ * V4L2 controls
++ */
++static int ad5398_set_ctrl(struct v4l2_ctrl *ctrl)
++{
++	struct ad5398_device *coil =
++		container_of(ctrl->handler, struct ad5398_device, ctrls);
++
++	switch (ctrl->id) {
++	case V4L2_CID_FOCUS_ABSOLUTE:
++		coil->focus_absolute = ctrl->val;
++		return ad5398_update_hw(coil);
++	}
++
++	return 0;
++}
++
++static const struct v4l2_ctrl_ops ad5398_ctrl_ops = {
++	.s_ctrl = ad5398_set_ctrl,
++};
++
++static int ad5398_init_controls(struct ad5398_device *coil)
++{
++	v4l2_ctrl_handler_init(&coil->ctrls, 1);
++
++	/*
++	 * V4L2_CID_FOCUS_ABSOLUTE
++	 *
++	 * Minimum current is 0 mA, maximum is 120 mA. Thus, 1 code is
++	 * equivalent to 120/1023 = 0.1173 mA. Nevertheless, we do not use [mA]
++	 * for focus position, because it is meaningless for user. Meaningful
++	 * would be to use focus distance or even its inverse, but since the
++	 * driver doesn't have sufficient knowledge to do the conversion, we
++	 * will just use abstract codes here. In any case, smaller value = focus
++	 * position farther from camera. The default zero value means focus at
++	 * infinity, and also least current consumption.
++	 */
++	v4l2_ctrl_new_std(&coil->ctrls, &ad5398_ctrl_ops,
++			  V4L2_CID_FOCUS_ABSOLUTE, 0, 1023, 1, 0);
++
++	if (coil->ctrls.error)
++		return coil->ctrls.error;
++
++	coil->focus_absolute = 0;
++
++	coil->subdev.ctrl_handler = &coil->ctrls;
++
++	return 0;
++}
++
++/*
++ * V4L2 subdev operations
++ */
++static int ad5398_registered(struct v4l2_subdev *subdev)
++{
++	struct ad5398_device *coil = to_ad5398_device(subdev);
++
++	return ad5398_init_controls(coil);
++}
++
++static int
++ad5398_set_power(struct v4l2_subdev *subdev, int on)
++{
++	struct ad5398_device *coil = to_ad5398_device(subdev);
++	int ret;
++
++	if (on)
++		ret = regulator_enable(coil->vana);
++	else
++		ret = regulator_disable(coil->vana);
++
++	return ret;
++}
++
++static int ad5398_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
++{
++	struct ad5398_device *coil = to_ad5398_device(sd);
++
++	return regulator_enable(coil->vana);
++}
++
++static int ad5398_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
++{
++	struct ad5398_device *coil = to_ad5398_device(sd);
++
++	return regulator_disable(coil->vana);
++}
++
++static const struct v4l2_subdev_core_ops ad5398_core_ops = {
++	.s_power = ad5398_set_power,
++};
++
++static const struct v4l2_subdev_ops ad5398_ops = {
++	.core = &ad5398_core_ops,
++};
++
++static const struct v4l2_subdev_internal_ops ad5398_internal_ops = {
++	.registered = ad5398_registered,
++	.open = ad5398_open,
++	.close = ad5398_close,
++};
++
++/*
++ * I2C driver
++ */
++static int __maybe_unused ad5398_suspend(struct device *dev)
++{
++	struct i2c_client *client = container_of(dev, struct i2c_client, dev);
++	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
++	struct ad5398_device *coil = to_ad5398_device(subdev);
++
++	return regulator_enable(coil->vana);
++}
++
++static int __maybe_unused ad5398_resume(struct device *dev)
++{
++	struct i2c_client *client = container_of(dev, struct i2c_client, dev);
++	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
++	struct ad5398_device *coil = to_ad5398_device(subdev);
++
++	return regulator_disable(coil->vana);
++}
++
++static int ad5398_regulator_notifier(struct notifier_block *nb,
++				     unsigned long event,
++				     void *ignored)
++{
++	struct ad5398_device *coil = container_of(nb, struct ad5398_device, nb);
++
++	if (event == REGULATOR_EVENT_ENABLE)
++		ad5398_power_on(coil);
++	else if (event == REGULATOR_EVENT_PRE_DISABLE)
++		ad5398_power_off(coil);
++
++	return NOTIFY_OK;
++}
++
++static int ad5398_probe(struct i2c_client *client,
++			const struct i2c_device_id *devid)
++{
++	struct ad5398_device *coil;
++	int ret;
++
++	coil = devm_kzalloc(&client->dev, sizeof(*coil), GFP_KERNEL);
++	if (!coil)
++		return -ENOMEM;
++
++	coil->vana = devm_regulator_get(&client->dev, "VANA");
++	if (IS_ERR(coil->vana)) {
++		ret = PTR_ERR(coil->vana);
++		if (ret != -EPROBE_DEFER)
++			dev_err(&client->dev, "could not get regulator for vana\n");
++		return ret;
++	}
++
++	v4l2_i2c_subdev_init(&coil->subdev, client, &ad5398_ops);
++	coil->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
++	coil->subdev.internal_ops = &ad5398_internal_ops;
++	coil->subdev.entity.function = MEDIA_ENT_F_LENS;
++	strscpy(coil->subdev.name, "ad5398 focus", sizeof(coil->subdev.name));
++
++	coil->nb.notifier_call = &ad5398_regulator_notifier;
++	ret = regulator_register_notifier(coil->vana, &coil->nb);
++	if (ret < 0)
++		return ret;
++
++	ret = media_entity_pads_init(&coil->subdev.entity, 0, NULL);
++	if (ret < 0)
++		goto cleanup2;
++
++	ret = v4l2_async_register_subdev(&coil->subdev);
++	if (ret < 0)
++		goto cleanup;
++
++	return ret;
++
++cleanup:
++	media_entity_cleanup(&coil->subdev.entity);
++cleanup2:
++	regulator_unregister_notifier(coil->vana, &coil->nb);
++	return ret;
++}
++
++static int ad5398_remove(struct i2c_client *client)
++{
++	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
++	struct ad5398_device *coil = to_ad5398_device(subdev);
++
++	v4l2_async_unregister_subdev(&coil->subdev);
++	v4l2_ctrl_handler_free(&coil->ctrls);
++	media_entity_cleanup(&coil->subdev.entity);
++	return 0;
++}
++
++static const struct i2c_device_id ad5398_id_table[] = {
++	{ "ad5398", 0 },
++	{ }
++};
++MODULE_DEVICE_TABLE(i2c, ad5398_id_table);
++
++static const struct of_device_id ad5398_of_table[] = {
++	{ .compatible = "adi,ad5398" },
++	{ }
++};
++MODULE_DEVICE_TABLE(of, ad5398_of_table);
++
++static SIMPLE_DEV_PM_OPS(ad5398_pm, ad5398_suspend, ad5398_resume);
++
++static struct i2c_driver ad5398_i2c_driver = {
++	.driver		= {
++		.name	= "ad5398",
++		.pm	= &ad5398_pm,
++		.of_match_table = ad5398_of_table,
++	},
++	.probe		= ad5398_probe,
++	.remove		= ad5398_remove,
++	.id_table	= ad5398_id_table,
++};
++
++module_i2c_driver(ad5398_i2c_driver);
++
++MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.com>");
++MODULE_DESCRIPTION("AD5398 camera lens driver");
++MODULE_LICENSE("GPL");
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0792-media-i2c-ov5647-Use-v4l2_async_register_subdev_sens.patch b/root/target/linux/bcm27xx/patches-5.15/950-0792-media-i2c-ov5647-Use-v4l2_async_register_subdev_sens.patch
new file mode 100644
index 00000000..5639b87f
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0792-media-i2c-ov5647-Use-v4l2_async_register_subdev_sens.patch
@@ -0,0 +1,26 @@
+From aa8614a0374f9a6b5d06272fc4c05c6d63dcdbae Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Wed, 16 Mar 2022 12:15:41 +0000
+Subject: [PATCH 792/828] media: i2c: ov5647: Use
+ v4l2_async_register_subdev_sensor for lens binding
+
+v4l2_async_register_subdev doesn't bind in lens or flash drivers,
+but v4l2_async_register_subdev_sensor does.
+Switch to using v4l2_async_register_subdev_sensor.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/ov5647.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/media/i2c/ov5647.c
++++ b/drivers/media/i2c/ov5647.c
+@@ -1558,7 +1558,7 @@ static int ov5647_probe(struct i2c_clien
+ 	if (ret < 0)
+ 		goto power_off;
+ 
+-	ret = v4l2_async_register_subdev(sd);
++	ret = v4l2_async_register_subdev_sensor(sd);
+ 	if (ret < 0)
+ 		goto power_off;
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0793-dtoverlays-Add-VCM-option-to-imx219.patch b/root/target/linux/bcm27xx/patches-5.15/950-0793-dtoverlays-Add-VCM-option-to-imx219.patch
new file mode 100644
index 00000000..b9715dcf
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0793-dtoverlays-Add-VCM-option-to-imx219.patch
@@ -0,0 +1,48 @@
+From a4e1000c42bb1b0270d30848d1c329c6e19b2df4 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Fri, 11 Mar 2022 15:32:00 +0000
+Subject: [PATCH 793/828] dtoverlays: Add VCM option to imx219
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/README             |  1 +
+ arch/arm/boot/dts/overlays/imx219-overlay.dts | 12 +++++++++++-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -1869,6 +1869,7 @@ Params: rotation                Mounting
+                                 configuring the sensor (default on)
+         cam0                    Adopt the default configuration for CAM0 on a
+                                 Compute Module (CSI0, i2c_vc, and cam0_reg).
++        vcm                     Configure a VCM focus drive on the sensor.
+ 
+ 
+ Name:   imx290
+--- a/arch/arm/boot/dts/overlays/imx219-overlay.dts
++++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts
+@@ -63,6 +63,13 @@
+ 					};
+ 				};
+ 			};
++
++			vcm: ad5398@0c {
++				compatible = "adi,ad5398";
++				reg = <0x0c>;
++				status = "disabled";
++				VANA-supply = <&cam1_reg>;
++			};
+ 		};
+ 	};
+ 
+@@ -91,6 +98,9 @@
+ 		       <&csi_frag>, "target:0=",<&csi0>,
+ 		       <&clk_frag>, "target:0=",<&cam0_clk>,
+ 		       <&imx219>, "clocks:0=",<&cam0_clk>,
+-		       <&imx219>, "VANA-supply:0=",<&cam0_reg>;
++		       <&imx219>, "VANA-supply:0=",<&cam0_reg>,
++		       <&vcm>, "VANA-supply:0=", <&cam0_reg>;
++		vcm = <&vcm>, "status=okay",
++		      <&imx219>,"lens-focus:0=", <&vcm>;
+ 	};
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0794-dtoverlay-Add-VCM-option-to-ov5647-overlay.patch b/root/target/linux/bcm27xx/patches-5.15/950-0794-dtoverlay-Add-VCM-option-to-ov5647-overlay.patch
new file mode 100644
index 00000000..9e7d2d53
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0794-dtoverlay-Add-VCM-option-to-ov5647-overlay.patch
@@ -0,0 +1,45 @@
+From 63bf16e79a7dc9ae43249f70bb84f261d3c2f3e0 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Tue, 15 Mar 2022 18:36:10 +0000
+Subject: [PATCH 794/828] dtoverlay: Add VCM option to ov5647 overlay
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/README             | 1 +
+ arch/arm/boot/dts/overlays/ov5647-overlay.dts | 9 +++++++++
+ 2 files changed, 10 insertions(+)
+
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -2450,6 +2450,7 @@ Params: rotation                Mounting
+                                 configuring the sensor (default on)
+         cam0                    Adopt the default configuration for CAM0 on a
+                                 Compute Module (CSI0, i2c_vc, and cam0_reg).
++        vcm                     Configure a VCM focus drive on the sensor.
+ 
+ 
+ Name:   ov7251
+--- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts
++++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
+@@ -38,6 +38,13 @@
+ 					};
+ 				};
+ 			};
++
++			vcm: ad5398@0c {
++				compatible = "adi,ad5398";
++				reg = <0x0c>;
++				status = "disabled";
++				VANA-supply = <&cam1_reg>;
++			};
+ 		};
+ 	};
+ 
+@@ -95,5 +102,7 @@
+ 		       <&clk_frag>, "target:0=",<&cam0_clk>,
+ 		       <&ov5647>, "clocks:0=",<&cam0_clk>,
+ 		       <&ov5647>, "avdd-supply:0=",<&cam0_reg>;
++		vcm = <&vcm>, "status=okay",
++		      <&ov5647>,"lens-focus:0=", <&vcm>;
+ 	};
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0795-media-i2c-Rename-ad5398-to-ad5398_vcm.patch b/root/target/linux/bcm27xx/patches-5.15/950-0795-media-i2c-Rename-ad5398-to-ad5398_vcm.patch
new file mode 100644
index 00000000..968e90bd
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0795-media-i2c-Rename-ad5398-to-ad5398_vcm.patch
@@ -0,0 +1,719 @@
+From 38b6a909c324db57175c68728c47d49e5fa3e6e0 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 17 Mar 2022 15:13:10 +0000
+Subject: [PATCH 795/828] media: i2c: Rename ad5398 to ad5398_vcm
+
+There's already a regulator module called ad5398 that exposes
+this device through the regulator API. That is meaningless in
+the terms that it uses and how it maps to V4L2, so a new driver
+was added. However the module name collision wasn't noted, so
+rename it now.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/media/i2c/Makefile                   | 2 +-
+ drivers/media/i2c/{ad5398.c => ad5398_vcm.c} | 0
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename drivers/media/i2c/{ad5398.c => ad5398_vcm.c} (100%)
+
+--- a/drivers/media/i2c/Makefile
++++ b/drivers/media/i2c/Makefile
+@@ -21,7 +21,7 @@ obj-$(CONFIG_VIDEO_SAA717X) += saa717x.o
+ obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
+ obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o
+ obj-$(CONFIG_VIDEO_SAA6752HS) += saa6752hs.o
+-obj-$(CONFIG_VIDEO_AD5398)  += ad5398.o
++obj-$(CONFIG_VIDEO_AD5398)  += ad5398_vcm.o
+ obj-$(CONFIG_VIDEO_AD5820)  += ad5820.o
+ obj-$(CONFIG_VIDEO_AK7375)  += ak7375.o
+ obj-$(CONFIG_VIDEO_DW9714)  += dw9714.o
+--- a/drivers/media/i2c/ad5398.c
++++ /dev/null
+@@ -1,342 +0,0 @@
+-// SPDX-License-Identifier: GPL-2.0-only
+-/*
+- * AD5398 DAC driver for camera voice coil focus.
+- * Copyright (C) 2021 Raspberry Pi (Trading) Ltd.
+- *
+- * Based on AD5820 DAC driver by Nokia and TI.
+- *
+- * This driver uses the regulator framework notification hooks on the
+- * assumption that the VCM and sensor share a regulator. This means the VCM
+- * position will be restored when either the sensor or VCM subdevices are opened
+- * or powered up. The client can therefore choose to ignore the VCM subdevice,
+- * and the lens position will be as previously requested. Without that, there
+- * is a hard requirement to have the VCM subdevice open in order for the VCM
+- * to be powered and at the requested position.
+- */
+-
+-#include <linux/errno.h>
+-#include <linux/i2c.h>
+-#include <linux/kernel.h>
+-#include <linux/module.h>
+-#include <linux/regulator/consumer.h>
+-#include <linux/gpio/consumer.h>
+-
+-#include <media/v4l2-ctrls.h>
+-#include <media/v4l2-device.h>
+-#include <media/v4l2-subdev.h>
+-
+-/* Register definitions */
+-#define AD5398_POWER_DOWN		BIT(15)
+-#define AD5398_DAC_SHIFT		4
+-
+-#define to_ad5398_device(sd)	container_of(sd, struct ad5398_device, subdev)
+-
+-struct ad5398_device {
+-	struct v4l2_subdev subdev;
+-	struct ad5398_platform_data *platform_data;
+-	struct regulator *vana;
+-	struct notifier_block nb;
+-
+-	struct v4l2_ctrl_handler ctrls;
+-	u32 focus_absolute;
+-
+-	bool standby;
+-};
+-
+-static int ad5398_write(struct ad5398_device *coil, u16 data)
+-{
+-	struct i2c_client *client = v4l2_get_subdevdata(&coil->subdev);
+-	struct i2c_msg msg;
+-	__be16 be_data;
+-	int r;
+-
+-	if (!client->adapter)
+-		return -ENODEV;
+-
+-	be_data = cpu_to_be16(data);
+-	msg.addr  = client->addr;
+-	msg.flags = 0;
+-	msg.len   = 2;
+-	msg.buf   = (u8 *)&be_data;
+-
+-	r = i2c_transfer(client->adapter, &msg, 1);
+-	if (r < 0) {
+-		dev_err(&client->dev, "write failed, error %d\n", r);
+-		return r;
+-	}
+-
+-	return 0;
+-}
+-
+-/*
+- * Calculate status word and write it to the device based on current
+- * values of V4L2 controls. It is assumed that the stored V4L2 control
+- * values are properly limited and rounded.
+- */
+-static int ad5398_update_hw(struct ad5398_device *coil)
+-{
+-	u16 status;
+-
+-	status = coil->focus_absolute << AD5398_DAC_SHIFT;
+-
+-	if (coil->standby)
+-		status |= AD5398_POWER_DOWN;
+-
+-	return ad5398_write(coil, status);
+-}
+-
+-/*
+- * Power handling
+- */
+-static int ad5398_power_off(struct ad5398_device *coil)
+-{
+-	int ret = 0;
+-
+-	coil->standby = true;
+-	ret = ad5398_update_hw(coil);
+-
+-	return ret;
+-}
+-
+-static int ad5398_power_on(struct ad5398_device *coil)
+-{
+-	int ret;
+-
+-	/* Restore the hardware settings. */
+-	coil->standby = false;
+-	ret = ad5398_update_hw(coil);
+-	if (ret)
+-		goto fail;
+-
+-	return 0;
+-
+-fail:
+-	coil->standby = true;
+-
+-	return ret;
+-}
+-
+-/*
+- * V4L2 controls
+- */
+-static int ad5398_set_ctrl(struct v4l2_ctrl *ctrl)
+-{
+-	struct ad5398_device *coil =
+-		container_of(ctrl->handler, struct ad5398_device, ctrls);
+-
+-	switch (ctrl->id) {
+-	case V4L2_CID_FOCUS_ABSOLUTE:
+-		coil->focus_absolute = ctrl->val;
+-		return ad5398_update_hw(coil);
+-	}
+-
+-	return 0;
+-}
+-
+-static const struct v4l2_ctrl_ops ad5398_ctrl_ops = {
+-	.s_ctrl = ad5398_set_ctrl,
+-};
+-
+-static int ad5398_init_controls(struct ad5398_device *coil)
+-{
+-	v4l2_ctrl_handler_init(&coil->ctrls, 1);
+-
+-	/*
+-	 * V4L2_CID_FOCUS_ABSOLUTE
+-	 *
+-	 * Minimum current is 0 mA, maximum is 120 mA. Thus, 1 code is
+-	 * equivalent to 120/1023 = 0.1173 mA. Nevertheless, we do not use [mA]
+-	 * for focus position, because it is meaningless for user. Meaningful
+-	 * would be to use focus distance or even its inverse, but since the
+-	 * driver doesn't have sufficient knowledge to do the conversion, we
+-	 * will just use abstract codes here. In any case, smaller value = focus
+-	 * position farther from camera. The default zero value means focus at
+-	 * infinity, and also least current consumption.
+-	 */
+-	v4l2_ctrl_new_std(&coil->ctrls, &ad5398_ctrl_ops,
+-			  V4L2_CID_FOCUS_ABSOLUTE, 0, 1023, 1, 0);
+-
+-	if (coil->ctrls.error)
+-		return coil->ctrls.error;
+-
+-	coil->focus_absolute = 0;
+-
+-	coil->subdev.ctrl_handler = &coil->ctrls;
+-
+-	return 0;
+-}
+-
+-/*
+- * V4L2 subdev operations
+- */
+-static int ad5398_registered(struct v4l2_subdev *subdev)
+-{
+-	struct ad5398_device *coil = to_ad5398_device(subdev);
+-
+-	return ad5398_init_controls(coil);
+-}
+-
+-static int
+-ad5398_set_power(struct v4l2_subdev *subdev, int on)
+-{
+-	struct ad5398_device *coil = to_ad5398_device(subdev);
+-	int ret;
+-
+-	if (on)
+-		ret = regulator_enable(coil->vana);
+-	else
+-		ret = regulator_disable(coil->vana);
+-
+-	return ret;
+-}
+-
+-static int ad5398_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+-{
+-	struct ad5398_device *coil = to_ad5398_device(sd);
+-
+-	return regulator_enable(coil->vana);
+-}
+-
+-static int ad5398_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
+-{
+-	struct ad5398_device *coil = to_ad5398_device(sd);
+-
+-	return regulator_disable(coil->vana);
+-}
+-
+-static const struct v4l2_subdev_core_ops ad5398_core_ops = {
+-	.s_power = ad5398_set_power,
+-};
+-
+-static const struct v4l2_subdev_ops ad5398_ops = {
+-	.core = &ad5398_core_ops,
+-};
+-
+-static const struct v4l2_subdev_internal_ops ad5398_internal_ops = {
+-	.registered = ad5398_registered,
+-	.open = ad5398_open,
+-	.close = ad5398_close,
+-};
+-
+-/*
+- * I2C driver
+- */
+-static int __maybe_unused ad5398_suspend(struct device *dev)
+-{
+-	struct i2c_client *client = container_of(dev, struct i2c_client, dev);
+-	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
+-	struct ad5398_device *coil = to_ad5398_device(subdev);
+-
+-	return regulator_enable(coil->vana);
+-}
+-
+-static int __maybe_unused ad5398_resume(struct device *dev)
+-{
+-	struct i2c_client *client = container_of(dev, struct i2c_client, dev);
+-	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
+-	struct ad5398_device *coil = to_ad5398_device(subdev);
+-
+-	return regulator_disable(coil->vana);
+-}
+-
+-static int ad5398_regulator_notifier(struct notifier_block *nb,
+-				     unsigned long event,
+-				     void *ignored)
+-{
+-	struct ad5398_device *coil = container_of(nb, struct ad5398_device, nb);
+-
+-	if (event == REGULATOR_EVENT_ENABLE)
+-		ad5398_power_on(coil);
+-	else if (event == REGULATOR_EVENT_PRE_DISABLE)
+-		ad5398_power_off(coil);
+-
+-	return NOTIFY_OK;
+-}
+-
+-static int ad5398_probe(struct i2c_client *client,
+-			const struct i2c_device_id *devid)
+-{
+-	struct ad5398_device *coil;
+-	int ret;
+-
+-	coil = devm_kzalloc(&client->dev, sizeof(*coil), GFP_KERNEL);
+-	if (!coil)
+-		return -ENOMEM;
+-
+-	coil->vana = devm_regulator_get(&client->dev, "VANA");
+-	if (IS_ERR(coil->vana)) {
+-		ret = PTR_ERR(coil->vana);
+-		if (ret != -EPROBE_DEFER)
+-			dev_err(&client->dev, "could not get regulator for vana\n");
+-		return ret;
+-	}
+-
+-	v4l2_i2c_subdev_init(&coil->subdev, client, &ad5398_ops);
+-	coil->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
+-	coil->subdev.internal_ops = &ad5398_internal_ops;
+-	coil->subdev.entity.function = MEDIA_ENT_F_LENS;
+-	strscpy(coil->subdev.name, "ad5398 focus", sizeof(coil->subdev.name));
+-
+-	coil->nb.notifier_call = &ad5398_regulator_notifier;
+-	ret = regulator_register_notifier(coil->vana, &coil->nb);
+-	if (ret < 0)
+-		return ret;
+-
+-	ret = media_entity_pads_init(&coil->subdev.entity, 0, NULL);
+-	if (ret < 0)
+-		goto cleanup2;
+-
+-	ret = v4l2_async_register_subdev(&coil->subdev);
+-	if (ret < 0)
+-		goto cleanup;
+-
+-	return ret;
+-
+-cleanup:
+-	media_entity_cleanup(&coil->subdev.entity);
+-cleanup2:
+-	regulator_unregister_notifier(coil->vana, &coil->nb);
+-	return ret;
+-}
+-
+-static int ad5398_remove(struct i2c_client *client)
+-{
+-	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
+-	struct ad5398_device *coil = to_ad5398_device(subdev);
+-
+-	v4l2_async_unregister_subdev(&coil->subdev);
+-	v4l2_ctrl_handler_free(&coil->ctrls);
+-	media_entity_cleanup(&coil->subdev.entity);
+-	return 0;
+-}
+-
+-static const struct i2c_device_id ad5398_id_table[] = {
+-	{ "ad5398", 0 },
+-	{ }
+-};
+-MODULE_DEVICE_TABLE(i2c, ad5398_id_table);
+-
+-static const struct of_device_id ad5398_of_table[] = {
+-	{ .compatible = "adi,ad5398" },
+-	{ }
+-};
+-MODULE_DEVICE_TABLE(of, ad5398_of_table);
+-
+-static SIMPLE_DEV_PM_OPS(ad5398_pm, ad5398_suspend, ad5398_resume);
+-
+-static struct i2c_driver ad5398_i2c_driver = {
+-	.driver		= {
+-		.name	= "ad5398",
+-		.pm	= &ad5398_pm,
+-		.of_match_table = ad5398_of_table,
+-	},
+-	.probe		= ad5398_probe,
+-	.remove		= ad5398_remove,
+-	.id_table	= ad5398_id_table,
+-};
+-
+-module_i2c_driver(ad5398_i2c_driver);
+-
+-MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.com>");
+-MODULE_DESCRIPTION("AD5398 camera lens driver");
+-MODULE_LICENSE("GPL");
+--- /dev/null
++++ b/drivers/media/i2c/ad5398_vcm.c
+@@ -0,0 +1,342 @@
++// SPDX-License-Identifier: GPL-2.0-only
++/*
++ * AD5398 DAC driver for camera voice coil focus.
++ * Copyright (C) 2021 Raspberry Pi (Trading) Ltd.
++ *
++ * Based on AD5820 DAC driver by Nokia and TI.
++ *
++ * This driver uses the regulator framework notification hooks on the
++ * assumption that the VCM and sensor share a regulator. This means the VCM
++ * position will be restored when either the sensor or VCM subdevices are opened
++ * or powered up. The client can therefore choose to ignore the VCM subdevice,
++ * and the lens position will be as previously requested. Without that, there
++ * is a hard requirement to have the VCM subdevice open in order for the VCM
++ * to be powered and at the requested position.
++ */
++
++#include <linux/errno.h>
++#include <linux/i2c.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/regulator/consumer.h>
++#include <linux/gpio/consumer.h>
++
++#include <media/v4l2-ctrls.h>
++#include <media/v4l2-device.h>
++#include <media/v4l2-subdev.h>
++
++/* Register definitions */
++#define AD5398_POWER_DOWN		BIT(15)
++#define AD5398_DAC_SHIFT		4
++
++#define to_ad5398_device(sd)	container_of(sd, struct ad5398_device, subdev)
++
++struct ad5398_device {
++	struct v4l2_subdev subdev;
++	struct ad5398_platform_data *platform_data;
++	struct regulator *vana;
++	struct notifier_block nb;
++
++	struct v4l2_ctrl_handler ctrls;
++	u32 focus_absolute;
++
++	bool standby;
++};
++
++static int ad5398_write(struct ad5398_device *coil, u16 data)
++{
++	struct i2c_client *client = v4l2_get_subdevdata(&coil->subdev);
++	struct i2c_msg msg;
++	__be16 be_data;
++	int r;
++
++	if (!client->adapter)
++		return -ENODEV;
++
++	be_data = cpu_to_be16(data);
++	msg.addr  = client->addr;
++	msg.flags = 0;
++	msg.len   = 2;
++	msg.buf   = (u8 *)&be_data;
++
++	r = i2c_transfer(client->adapter, &msg, 1);
++	if (r < 0) {
++		dev_err(&client->dev, "write failed, error %d\n", r);
++		return r;
++	}
++
++	return 0;
++}
++
++/*
++ * Calculate status word and write it to the device based on current
++ * values of V4L2 controls. It is assumed that the stored V4L2 control
++ * values are properly limited and rounded.
++ */
++static int ad5398_update_hw(struct ad5398_device *coil)
++{
++	u16 status;
++
++	status = coil->focus_absolute << AD5398_DAC_SHIFT;
++
++	if (coil->standby)
++		status |= AD5398_POWER_DOWN;
++
++	return ad5398_write(coil, status);
++}
++
++/*
++ * Power handling
++ */
++static int ad5398_power_off(struct ad5398_device *coil)
++{
++	int ret = 0;
++
++	coil->standby = true;
++	ret = ad5398_update_hw(coil);
++
++	return ret;
++}
++
++static int ad5398_power_on(struct ad5398_device *coil)
++{
++	int ret;
++
++	/* Restore the hardware settings. */
++	coil->standby = false;
++	ret = ad5398_update_hw(coil);
++	if (ret)
++		goto fail;
++
++	return 0;
++
++fail:
++	coil->standby = true;
++
++	return ret;
++}
++
++/*
++ * V4L2 controls
++ */
++static int ad5398_set_ctrl(struct v4l2_ctrl *ctrl)
++{
++	struct ad5398_device *coil =
++		container_of(ctrl->handler, struct ad5398_device, ctrls);
++
++	switch (ctrl->id) {
++	case V4L2_CID_FOCUS_ABSOLUTE:
++		coil->focus_absolute = ctrl->val;
++		return ad5398_update_hw(coil);
++	}
++
++	return 0;
++}
++
++static const struct v4l2_ctrl_ops ad5398_ctrl_ops = {
++	.s_ctrl = ad5398_set_ctrl,
++};
++
++static int ad5398_init_controls(struct ad5398_device *coil)
++{
++	v4l2_ctrl_handler_init(&coil->ctrls, 1);
++
++	/*
++	 * V4L2_CID_FOCUS_ABSOLUTE
++	 *
++	 * Minimum current is 0 mA, maximum is 120 mA. Thus, 1 code is
++	 * equivalent to 120/1023 = 0.1173 mA. Nevertheless, we do not use [mA]
++	 * for focus position, because it is meaningless for user. Meaningful
++	 * would be to use focus distance or even its inverse, but since the
++	 * driver doesn't have sufficient knowledge to do the conversion, we
++	 * will just use abstract codes here. In any case, smaller value = focus
++	 * position farther from camera. The default zero value means focus at
++	 * infinity, and also least current consumption.
++	 */
++	v4l2_ctrl_new_std(&coil->ctrls, &ad5398_ctrl_ops,
++			  V4L2_CID_FOCUS_ABSOLUTE, 0, 1023, 1, 0);
++
++	if (coil->ctrls.error)
++		return coil->ctrls.error;
++
++	coil->focus_absolute = 0;
++
++	coil->subdev.ctrl_handler = &coil->ctrls;
++
++	return 0;
++}
++
++/*
++ * V4L2 subdev operations
++ */
++static int ad5398_registered(struct v4l2_subdev *subdev)
++{
++	struct ad5398_device *coil = to_ad5398_device(subdev);
++
++	return ad5398_init_controls(coil);
++}
++
++static int
++ad5398_set_power(struct v4l2_subdev *subdev, int on)
++{
++	struct ad5398_device *coil = to_ad5398_device(subdev);
++	int ret;
++
++	if (on)
++		ret = regulator_enable(coil->vana);
++	else
++		ret = regulator_disable(coil->vana);
++
++	return ret;
++}
++
++static int ad5398_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
++{
++	struct ad5398_device *coil = to_ad5398_device(sd);
++
++	return regulator_enable(coil->vana);
++}
++
++static int ad5398_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
++{
++	struct ad5398_device *coil = to_ad5398_device(sd);
++
++	return regulator_disable(coil->vana);
++}
++
++static const struct v4l2_subdev_core_ops ad5398_core_ops = {
++	.s_power = ad5398_set_power,
++};
++
++static const struct v4l2_subdev_ops ad5398_ops = {
++	.core = &ad5398_core_ops,
++};
++
++static const struct v4l2_subdev_internal_ops ad5398_internal_ops = {
++	.registered = ad5398_registered,
++	.open = ad5398_open,
++	.close = ad5398_close,
++};
++
++/*
++ * I2C driver
++ */
++static int __maybe_unused ad5398_suspend(struct device *dev)
++{
++	struct i2c_client *client = container_of(dev, struct i2c_client, dev);
++	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
++	struct ad5398_device *coil = to_ad5398_device(subdev);
++
++	return regulator_enable(coil->vana);
++}
++
++static int __maybe_unused ad5398_resume(struct device *dev)
++{
++	struct i2c_client *client = container_of(dev, struct i2c_client, dev);
++	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
++	struct ad5398_device *coil = to_ad5398_device(subdev);
++
++	return regulator_disable(coil->vana);
++}
++
++static int ad5398_regulator_notifier(struct notifier_block *nb,
++				     unsigned long event,
++				     void *ignored)
++{
++	struct ad5398_device *coil = container_of(nb, struct ad5398_device, nb);
++
++	if (event == REGULATOR_EVENT_ENABLE)
++		ad5398_power_on(coil);
++	else if (event == REGULATOR_EVENT_PRE_DISABLE)
++		ad5398_power_off(coil);
++
++	return NOTIFY_OK;
++}
++
++static int ad5398_probe(struct i2c_client *client,
++			const struct i2c_device_id *devid)
++{
++	struct ad5398_device *coil;
++	int ret;
++
++	coil = devm_kzalloc(&client->dev, sizeof(*coil), GFP_KERNEL);
++	if (!coil)
++		return -ENOMEM;
++
++	coil->vana = devm_regulator_get(&client->dev, "VANA");
++	if (IS_ERR(coil->vana)) {
++		ret = PTR_ERR(coil->vana);
++		if (ret != -EPROBE_DEFER)
++			dev_err(&client->dev, "could not get regulator for vana\n");
++		return ret;
++	}
++
++	v4l2_i2c_subdev_init(&coil->subdev, client, &ad5398_ops);
++	coil->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
++	coil->subdev.internal_ops = &ad5398_internal_ops;
++	coil->subdev.entity.function = MEDIA_ENT_F_LENS;
++	strscpy(coil->subdev.name, "ad5398 focus", sizeof(coil->subdev.name));
++
++	coil->nb.notifier_call = &ad5398_regulator_notifier;
++	ret = regulator_register_notifier(coil->vana, &coil->nb);
++	if (ret < 0)
++		return ret;
++
++	ret = media_entity_pads_init(&coil->subdev.entity, 0, NULL);
++	if (ret < 0)
++		goto cleanup2;
++
++	ret = v4l2_async_register_subdev(&coil->subdev);
++	if (ret < 0)
++		goto cleanup;
++
++	return ret;
++
++cleanup:
++	media_entity_cleanup(&coil->subdev.entity);
++cleanup2:
++	regulator_unregister_notifier(coil->vana, &coil->nb);
++	return ret;
++}
++
++static int ad5398_remove(struct i2c_client *client)
++{
++	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
++	struct ad5398_device *coil = to_ad5398_device(subdev);
++
++	v4l2_async_unregister_subdev(&coil->subdev);
++	v4l2_ctrl_handler_free(&coil->ctrls);
++	media_entity_cleanup(&coil->subdev.entity);
++	return 0;
++}
++
++static const struct i2c_device_id ad5398_id_table[] = {
++	{ "ad5398", 0 },
++	{ }
++};
++MODULE_DEVICE_TABLE(i2c, ad5398_id_table);
++
++static const struct of_device_id ad5398_of_table[] = {
++	{ .compatible = "adi,ad5398" },
++	{ }
++};
++MODULE_DEVICE_TABLE(of, ad5398_of_table);
++
++static SIMPLE_DEV_PM_OPS(ad5398_pm, ad5398_suspend, ad5398_resume);
++
++static struct i2c_driver ad5398_i2c_driver = {
++	.driver		= {
++		.name	= "ad5398",
++		.pm	= &ad5398_pm,
++		.of_match_table = ad5398_of_table,
++	},
++	.probe		= ad5398_probe,
++	.remove		= ad5398_remove,
++	.id_table	= ad5398_id_table,
++};
++
++module_i2c_driver(ad5398_i2c_driver);
++
++MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.com>");
++MODULE_DESCRIPTION("AD5398 camera lens driver");
++MODULE_LICENSE("GPL");
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0796-drm-object-Add-drm_object_property_get_default_value.patch b/root/target/linux/bcm27xx/patches-5.15/950-0796-drm-object-Add-drm_object_property_get_default_value.patch
new file mode 100644
index 00000000..b6969fa4
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0796-drm-object-Add-drm_object_property_get_default_value.patch
@@ -0,0 +1,129 @@
+From 5bf6e6a0497c9a4633b91a9ec3e92f31a4bde04b Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 21 Feb 2022 10:59:02 +0100
+Subject: [PATCH 796/828] drm/object: Add
+ drm_object_property_get_default_value() function
+
+Upstream commit adf47b75297ebc71c53b6dc2d3c55f42b8fb79fd.
+
+Some functions to create properties (drm_plane_create_zpos_property or
+drm_plane_create_color_properties for example) will ask for a range of
+acceptable value and an initial one.
+
+This initial value is then stored in the values array for that property.
+
+Let's provide an helper to access this property.
+
+Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Link: https://patchwork.freedesktop.org/patch/msgid/20220221095918.18763-7-maxime@cerno.tech
+---
+ drivers/gpu/drm/drm_mode_object.c | 53 +++++++++++++++++++++++++------
+ include/drm/drm_mode_object.h     |  7 ++++
+ 2 files changed, 50 insertions(+), 10 deletions(-)
+
+--- a/drivers/gpu/drm/drm_mode_object.c
++++ b/drivers/gpu/drm/drm_mode_object.c
+@@ -297,11 +297,26 @@ int drm_object_property_set_value(struct
+ }
+ EXPORT_SYMBOL(drm_object_property_set_value);
+ 
++static int __drm_object_property_get_prop_value(struct drm_mode_object *obj,
++						struct drm_property *property,
++						uint64_t *val)
++{
++	int i;
++
++	for (i = 0; i < obj->properties->count; i++) {
++		if (obj->properties->properties[i] == property) {
++			*val = obj->properties->values[i];
++			return 0;
++		}
++	}
++
++	return -EINVAL;
++}
++
+ static int __drm_object_property_get_value(struct drm_mode_object *obj,
+ 					   struct drm_property *property,
+ 					   uint64_t *val)
+ {
+-	int i;
+ 
+ 	/* read-only properties bypass atomic mechanism and still store
+ 	 * their value in obj->properties->values[].. mostly to avoid
+@@ -311,15 +326,7 @@ static int __drm_object_property_get_val
+ 			!(property->flags & DRM_MODE_PROP_IMMUTABLE))
+ 		return drm_atomic_get_property(obj, property, val);
+ 
+-	for (i = 0; i < obj->properties->count; i++) {
+-		if (obj->properties->properties[i] == property) {
+-			*val = obj->properties->values[i];
+-			return 0;
+-		}
+-
+-	}
+-
+-	return -EINVAL;
++	return __drm_object_property_get_prop_value(obj, property, val);
+ }
+ 
+ /**
+@@ -348,6 +355,32 @@ int drm_object_property_get_value(struct
+ }
+ EXPORT_SYMBOL(drm_object_property_get_value);
+ 
++/**
++ * drm_object_property_get_default_value - retrieve the default value of a
++ * property when in atomic mode.
++ * @obj: drm mode object to get property value from
++ * @property: property to retrieve
++ * @val: storage for the property value
++ *
++ * This function retrieves the default state of the given property as passed in
++ * to drm_object_attach_property
++ *
++ * Only atomic drivers should call this function directly, as for non-atomic
++ * drivers it will return the current value.
++ *
++ * Returns:
++ * Zero on success, error code on failure.
++ */
++int drm_object_property_get_default_value(struct drm_mode_object *obj,
++					  struct drm_property *property,
++					  uint64_t *val)
++{
++	WARN_ON(!drm_drv_uses_atomic_modeset(property->dev));
++
++	return __drm_object_property_get_prop_value(obj, property, val);
++}
++EXPORT_SYMBOL(drm_object_property_get_default_value);
++
+ /* helper for getconnector and getproperties ioctls */
+ int drm_mode_object_get_properties(struct drm_mode_object *obj, bool atomic,
+ 				   uint32_t __user *prop_ptr,
+--- a/include/drm/drm_mode_object.h
++++ b/include/drm/drm_mode_object.h
+@@ -98,6 +98,10 @@ struct drm_object_properties {
+ 	 * Hence atomic drivers should not use drm_object_property_set_value()
+ 	 * and drm_object_property_get_value() on mutable objects, i.e. those
+ 	 * without the DRM_MODE_PROP_IMMUTABLE flag set.
++	 *
++	 * For atomic drivers the default value of properties is stored in this
++	 * array, so drm_object_property_get_default_value can be used to
++	 * retrieve it.
+ 	 */
+ 	uint64_t values[DRM_OBJECT_MAX_PROPERTY];
+ };
+@@ -126,6 +130,9 @@ int drm_object_property_set_value(struct
+ int drm_object_property_get_value(struct drm_mode_object *obj,
+ 				  struct drm_property *property,
+ 				  uint64_t *value);
++int drm_object_property_get_default_value(struct drm_mode_object *obj,
++					  struct drm_property *property,
++					  uint64_t *val);
+ 
+ void drm_object_attach_property(struct drm_mode_object *obj,
+ 				struct drm_property *property,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0797-drm-object-Add-default-zpos-value-at-reset.patch b/root/target/linux/bcm27xx/patches-5.15/950-0797-drm-object-Add-default-zpos-value-at-reset.patch
new file mode 100644
index 00000000..dacd4aed
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0797-drm-object-Add-default-zpos-value-at-reset.patch
@@ -0,0 +1,54 @@
+From 460aca1a30e3384672a156f6a5393656eed4f3fe Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 21 Feb 2022 10:59:03 +0100
+Subject: [PATCH 797/828] drm/object: Add default zpos value at reset
+
+Upstream commit 1a7998dab5dd3d11bada7e3921781922082e7fe6
+
+The drm_plane_create_zpos_property() function asks for an initial value,
+and will set the associated plane state variable with that value if a
+state is present.
+
+However, that function is usually called at a time where there's no
+state yet. Since the drm_plane_state reset helper doesn't take care of
+reading that value when it's called, it means that in most cases the
+initial value will be 0, or the drivers will have to work around it.
+
+Let's add some code in __drm_atomic_helper_plane_state_reset() to get
+the initial zpos value if the property has been attached in order to fix
+this.
+
+Reviewed-by: Harry Wentland <harry.wentland@amd.com>
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Link: https://patchwork.freedesktop.org/patch/msgid/20220221095918.18763-8-maxime@cerno.tech
+---
+ drivers/gpu/drm/drm_atomic_state_helper.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+--- a/drivers/gpu/drm/drm_atomic_state_helper.c
++++ b/drivers/gpu/drm/drm_atomic_state_helper.c
+@@ -243,11 +243,22 @@ EXPORT_SYMBOL(drm_atomic_helper_crtc_des
+ void __drm_atomic_helper_plane_state_reset(struct drm_plane_state *plane_state,
+ 					   struct drm_plane *plane)
+ {
++	u64 val;
++
+ 	plane_state->plane = plane;
+ 	plane_state->rotation = DRM_MODE_ROTATE_0;
+ 
+ 	plane_state->alpha = DRM_BLEND_ALPHA_OPAQUE;
+ 	plane_state->pixel_blend_mode = DRM_MODE_BLEND_PREMULTI;
++
++	if (plane->zpos_property) {
++		if (!drm_object_property_get_default_value(&plane->base,
++							   plane->zpos_property,
++							   &val)) {
++			plane_state->zpos = val;
++			plane_state->normalized_zpos = val;
++		}
++	}
+ }
+ EXPORT_SYMBOL(__drm_atomic_helper_plane_state_reset);
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0798-drm-object-Add-default-color-encoding-and-range-valu.patch b/root/target/linux/bcm27xx/patches-5.15/950-0798-drm-object-Add-default-color-encoding-and-range-valu.patch
new file mode 100644
index 00000000..660312fc
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0798-drm-object-Add-default-color-encoding-and-range-valu.patch
@@ -0,0 +1,54 @@
+From 5abd885ce74974e8ba33f43ad9a9982baaaab0e2 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 21 Feb 2022 10:59:14 +0100
+Subject: [PATCH 798/828] drm/object: Add default color encoding and range
+ value at reset
+
+Upstream commit 9a48ab11714c955456fefdd4ab532d324fbef563
+
+The drm_plane_create_color_properties() function asks for an initial
+value for the color encoding and range, and will set the associated
+plane state variable with that value if a state is present.
+
+However, that function is usually called at a time where there's no
+state yet. Since the drm_plane_state reset helper doesn't take care of
+reading that value when it's called, it means that in most cases the
+initial value will be 0 (so DRM_COLOR_YCBCR_BT601 and
+DRM_COLOR_YCBCR_LIMITED_RANGE, respectively), or the drivers will have
+to work around it.
+
+Let's add some code in __drm_atomic_helper_plane_state_reset() to get
+the initial encoding and range value if the property has been attached
+in order to fix this.
+
+Reviewed-by: Harry Wentland <harry.wentland@amd.com>
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Link: https://patchwork.freedesktop.org/patch/msgid/20220221095918.18763-19-maxime@cerno.tech
+---
+ drivers/gpu/drm/drm_atomic_state_helper.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+--- a/drivers/gpu/drm/drm_atomic_state_helper.c
++++ b/drivers/gpu/drm/drm_atomic_state_helper.c
+@@ -251,6 +251,20 @@ void __drm_atomic_helper_plane_state_res
+ 	plane_state->alpha = DRM_BLEND_ALPHA_OPAQUE;
+ 	plane_state->pixel_blend_mode = DRM_MODE_BLEND_PREMULTI;
+ 
++	if (plane->color_encoding_property) {
++		if (!drm_object_property_get_default_value(&plane->base,
++							   plane->color_encoding_property,
++							   &val))
++			plane_state->color_encoding = val;
++	}
++
++	if (plane->color_range_property) {
++		if (!drm_object_property_get_default_value(&plane->base,
++							   plane->color_range_property,
++							   &val))
++			plane_state->color_range = val;
++	}
++
+ 	if (plane->zpos_property) {
+ 		if (!drm_object_property_get_default_value(&plane->base,
+ 							   plane->zpos_property,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0799-drm-vc4-Support-zpos-on-all-planes.patch b/root/target/linux/bcm27xx/patches-5.15/950-0799-drm-vc4-Support-zpos-on-all-planes.patch
new file mode 100644
index 00000000..f1605e7a
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0799-drm-vc4-Support-zpos-on-all-planes.patch
@@ -0,0 +1,145 @@
+From 8eef1c7a4ef9b59ef40f5314bb42c4dcd48ec0e6 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Tue, 25 Jan 2022 17:28:18 +0000
+Subject: [PATCH 799/828] drm/vc4: Support zpos on all planes
+
+Adds the zpos property to all planes, and creates the dlist
+by placing the fragments in the correct order based on zpos.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_hvs.c   | 43 +++++++++++++++++++++------------
+ drivers/gpu/drm/vc4/vc4_kms.c   |  3 +--
+ drivers/gpu/drm/vc4/vc4_plane.c | 22 ++++++++++++++---
+ 3 files changed, 48 insertions(+), 20 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hvs.c
++++ b/drivers/gpu/drm/vc4/vc4_hvs.c
+@@ -854,6 +854,8 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 	bool debug_dump_regs = false;
+ 	bool enable_bg_fill = false;
+ 	u32 __iomem *dlist_start, *dlist_next;
++	unsigned int zpos = 0;
++	bool found = false;
+ 
+ 	if (vc4_state->assigned_channel == VC4_HVS_CHANNEL_DISABLED)
+ 		return;
+@@ -867,23 +869,34 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 	dlist_next = dlist_start;
+ 
+ 	/* Copy all the active planes' dlist contents to the hardware dlist. */
+-	drm_atomic_crtc_for_each_plane(plane, crtc) {
+-		/* Is this the first active plane? */
+-		if (dlist_next == dlist_start) {
+-			/* We need to enable background fill when a plane
+-			 * could be alpha blending from the background, i.e.
+-			 * where no other plane is underneath. It suffices to
+-			 * consider the first active plane here since we set
+-			 * needs_bg_fill such that either the first plane
+-			 * already needs it or all planes on top blend from
+-			 * the first or a lower plane.
+-			 */
+-			vc4_plane_state = to_vc4_plane_state(plane->state);
+-			enable_bg_fill = vc4_plane_state->needs_bg_fill;
++	do {
++		found = false;
++
++		drm_atomic_crtc_for_each_plane(plane, crtc) {
++			if (plane->state->normalized_zpos != zpos)
++				continue;
++
++			/* Is this the first active plane? */
++			if (dlist_next == dlist_start) {
++				/* We need to enable background fill when a plane
++				 * could be alpha blending from the background, i.e.
++				 * where no other plane is underneath. It suffices to
++				 * consider the first active plane here since we set
++				 * needs_bg_fill such that either the first plane
++				 * already needs it or all planes on top blend from
++				 * the first or a lower plane.
++				 */
++				vc4_plane_state = to_vc4_plane_state(plane->state);
++				enable_bg_fill = vc4_plane_state->needs_bg_fill;
++			}
++
++			dlist_next += vc4_plane_write_dlist(plane, dlist_next);
++
++			found = true;
+ 		}
+ 
+-		dlist_next += vc4_plane_write_dlist(plane, dlist_next);
+-	}
++		zpos++;
++	} while (found);
+ 
+ 	writel(SCALER_CTL0_END, dlist_next);
+ 	dlist_next++;
+--- a/drivers/gpu/drm/vc4/vc4_kms.c
++++ b/drivers/gpu/drm/vc4/vc4_kms.c
+@@ -1042,8 +1042,7 @@ int vc4_kms_load(struct drm_device *dev)
+ 	dev->mode_config.helper_private = &vc4_mode_config_helpers;
+ 	dev->mode_config.preferred_depth = 24;
+ 	dev->mode_config.async_page_flip = true;
+-	if (vc4->firmware_kms)
+-		dev->mode_config.normalize_zpos = true;
++	dev->mode_config.normalize_zpos = true;
+ 
+ 	ret = vc4_ctm_obj_init(vc4);
+ 	if (ret)
+--- a/drivers/gpu/drm/vc4/vc4_plane.c
++++ b/drivers/gpu/drm/vc4/vc4_plane.c
+@@ -1572,9 +1572,14 @@ struct drm_plane *vc4_plane_init(struct
+ 					  DRM_COLOR_YCBCR_BT709,
+ 					  DRM_COLOR_YCBCR_LIMITED_RANGE);
+ 
++	if (type == DRM_PLANE_TYPE_PRIMARY)
++		drm_plane_create_zpos_immutable_property(plane, 0);
++
+ 	return plane;
+ }
+ 
++#define VC4_NUM_OVERLAY_PLANES	16
++
+ int vc4_plane_create_additional_planes(struct drm_device *drm)
+ {
+ 	struct drm_plane *cursor_plane;
+@@ -1590,7 +1595,7 @@ int vc4_plane_create_additional_planes(s
+ 	 * modest number of planes to expose, that should hopefully
+ 	 * still cover any sane usecase.
+ 	 */
+-	for (i = 0; i < 16; i++) {
++	for (i = 0; i < VC4_NUM_OVERLAY_PLANES; i++) {
+ 		struct drm_plane *plane =
+ 			vc4_plane_init(drm, DRM_PLANE_TYPE_OVERLAY);
+ 
+@@ -1599,17 +1604,28 @@ int vc4_plane_create_additional_planes(s
+ 
+ 		plane->possible_crtcs =
+ 			GENMASK(drm->mode_config.num_crtc - 1, 0);
++
++		/* Create zpos property. Max of all the overlays + 1 primary +
++		 * 1 cursor plane on a crtc.
++		 */
++		drm_plane_create_zpos_property(plane, i + 1, 1,
++					       VC4_NUM_OVERLAY_PLANES + 1);
+ 	}
+ 
+ 	drm_for_each_crtc(crtc, drm) {
+ 		/* Set up the legacy cursor after overlay initialization,
+-		 * since we overlay planes on the CRTC in the order they were
+-		 * initialized.
++		 * since the zpos fallback is that planes are rendered by plane
++		 * ID order, and that then puts the cursor on top.
+ 		 */
+ 		cursor_plane = vc4_plane_init(drm, DRM_PLANE_TYPE_CURSOR);
+ 		if (!IS_ERR(cursor_plane)) {
+ 			cursor_plane->possible_crtcs = drm_crtc_mask(crtc);
+ 			crtc->cursor = cursor_plane;
++
++			drm_plane_create_zpos_property(cursor_plane,
++						       VC4_NUM_OVERLAY_PLANES + 1,
++						       1,
++						       VC4_NUM_OVERLAY_PLANES + 1);
+ 		}
+ 	}
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0800-CM3-cam1_reg-and-cam1_reg_gpio-fix.patch b/root/target/linux/bcm27xx/patches-5.15/950-0800-CM3-cam1_reg-and-cam1_reg_gpio-fix.patch
new file mode 100644
index 00000000..71c60065
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0800-CM3-cam1_reg-and-cam1_reg_gpio-fix.patch
@@ -0,0 +1,23 @@
+From b4cdfe3b85ef4661007016c74c54c76f919129c3 Mon Sep 17 00:00:00 2001
+From: Rafael Sobral <rafaelsobral@pm.me>
+Date: Fri, 18 Mar 2022 23:25:16 -0300
+Subject: [PATCH 800/828] CM3 cam1_reg and cam1_reg_gpio fix
+
+property name is gpio and not gpios
+---
+ arch/arm/boot/dts/bcm2710-rpi-cm3.dts | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
++++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
+@@ -211,8 +211,8 @@ cam0_reg: &cam0_regulator {
+ 		act_led_activelow = <&act_led>,"gpios:8";
+ 		act_led_trigger = <&act_led>,"linux,default-trigger";
+ 		cam0_reg = <&cam0_reg>,"status";
+-		cam0_reg_gpio = <&cam0_reg>,"gpios:4";
++		cam0_reg_gpio = <&cam0_reg>,"gpio:4";
+ 		cam1_reg = <&cam1_reg>,"status";
+-		cam1_reg_gpio = <&cam1_reg>,"gpios:4";
++		cam1_reg_gpio = <&cam1_reg>,"gpio:4";
+ 	};
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0801-overlays-Fix-cam-_reg_gpio-parameter-on-CM1.patch b/root/target/linux/bcm27xx/patches-5.15/950-0801-overlays-Fix-cam-_reg_gpio-parameter-on-CM1.patch
new file mode 100644
index 00000000..b6f4a24b
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0801-overlays-Fix-cam-_reg_gpio-parameter-on-CM1.patch
@@ -0,0 +1,25 @@
+From 566b8dfa5006744a883d4e9fa6a599cbf4e7f56a Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Sat, 19 Mar 2022 22:19:51 +0000
+Subject: [PATCH 801/828] overlays: Fix cam*_reg_gpio parameter on CM1
+
+See: https://github.com/raspberrypi/linux/pull/4945
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ arch/arm/boot/dts/bcm2708-rpi-cm.dtsi | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
++++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
+@@ -15,8 +15,8 @@
+ 		act_led_activelow = <&act_led>,"gpios:8";
+ 		act_led_trigger = <&act_led>,"linux,default-trigger";
+ 		cam0_reg = <&cam0_reg>,"status";
+-		cam0_reg_gpio = <&cam0_reg>,"gpios:4";
++		cam0_reg_gpio = <&cam0_reg>,"gpio:4";
+ 		cam1_reg = <&cam1_reg>,"status";
+-		cam1_reg_gpio = <&cam1_reg>,"gpios:4";
++		cam1_reg_gpio = <&cam1_reg>,"gpio:4";
+ 	};
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0802-overlays-iqs550-Enable-interrupt-pull-down.patch b/root/target/linux/bcm27xx/patches-5.15/950-0802-overlays-iqs550-Enable-interrupt-pull-down.patch
new file mode 100644
index 00000000..13c5d85d
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0802-overlays-iqs550-Enable-interrupt-pull-down.patch
@@ -0,0 +1,46 @@
+From 04fc9de9b8ed528a039f53412166c86bcc7feda7 Mon Sep 17 00:00:00 2001
+From: Jeff LaBundy <jeff@labundy.com>
+Date: Sat, 19 Mar 2022 20:31:30 -0500
+Subject: [PATCH 802/828] overlays: iqs550: Enable interrupt pull-down
+
+The device's active-high interrupt normally serves as a push-pull
+output, but becomes high-impedance during bootloader mode. Enable
+a pull-down to hold the pin in the inactive state.
+
+Signed-off-by: Jeff LaBundy <jeff@labundy.com>
+---
+ arch/arm/boot/dts/overlays/iqs550-overlay.dts | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/overlays/iqs550-overlay.dts
++++ b/arch/arm/boot/dts/overlays/iqs550-overlay.dts
+@@ -20,6 +20,8 @@
+ 				reg = <0x74>;
+ 				interrupt-parent = <&gpio>;
+ 				interrupts = <4 IRQ_TYPE_LEVEL_HIGH>;
++				pinctrl-names = "default";
++				pinctrl-0 = <&iqs550_pins>;
+ 				touchscreen-size-x = <800>;
+ 				touchscreen-size-y = <480>;
+ 			};
+@@ -34,8 +36,19 @@
+ 		};
+ 	};
+ 
++	fragment@2 {
++		target = <&gpio>;
++		__overlay__ {
++			iqs550_pins: iqs550_pins {
++				brcm,pins = <4>;
++				brcm,pull = <1>;
++			};
++		};
++	};
++
+ 	__overrides__ {
+-		interrupt = <&iqs550>,"interrupts:0";
++		interrupt = <&iqs550>,"interrupts:0",
++			    <&iqs550_pins>,"brcm,pins:0";
+ 		reset = <0>,"+1", <&iqs550_reset>,"reset-gpios:4";
+ 		sizex = <&iqs550>,"touchscreen-size-x:0";
+ 		sizey = <&iqs550>,"touchscreen-size-y:0";
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0803-dtoverlays-Connect-the-backlight-to-the-pitft35-disp.patch b/root/target/linux/bcm27xx/patches-5.15/950-0803-dtoverlays-Connect-the-backlight-to-the-pitft35-disp.patch
new file mode 100644
index 00000000..1eb44bb7
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0803-dtoverlays-Connect-the-backlight-to-the-pitft35-disp.patch
@@ -0,0 +1,34 @@
+From fb864178b5a3baf305f23439639d77aae3a04643 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 21 Mar 2022 18:27:45 +0000
+Subject: [PATCH 803/828] dtoverlays: Connect the backlight to the pitft35
+ display
+
+DRM will automatically handle the backlight with the display if
+told about the linking, so link the two together.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
++++ b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
+@@ -102,7 +102,7 @@
+ 	fragment@5 {
+ 		target-path = "/soc";
+ 		__overlay__ {
+-			backlight {
++			backlight: backlight {
+ 				compatible = "gpio-backlight";
+ 				gpios = <&stmpe_gpio 2 0>;
+ 				default-on;
+@@ -115,6 +115,7 @@
+ 		rotate =  <&pitft>,"rotate:0";
+ 		fps =     <&pitft>,"fps:0";
+ 		debug =   <&pitft>,"debug:0";
+-		drm =     <&pitft>,"compatible=adafruit,yx350hv15";
++		drm =     <&pitft>,"compatible=adafruit,yx350hv15",
++			  <&pitft>,"backlight:0=",<&backlight>;
+ 	};
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0804-drm-vc4-hdmi-Add-CSC-for-BT601-709-2020-limited-and-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0804-drm-vc4-hdmi-Add-CSC-for-BT601-709-2020-limited-and-.patch
new file mode 100644
index 00000000..fc1f181d
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0804-drm-vc4-hdmi-Add-CSC-for-BT601-709-2020-limited-and-.patch
@@ -0,0 +1,308 @@
+From 6d3f80fe83b924d8ec4879a7d84eb2b464e0a7d8 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 7 Mar 2022 15:19:38 +0000
+Subject: [PATCH 804/828] drm/vc4: hdmi: Add CSC for BT601/709/2020 limited and
+ full range output
+
+The HVS always composes in the RGB domain, but there is a colourspace
+conversion block on the output to allow for sending YCbCr over the
+HDMI interface.
+The colourspace on that link is configurable via the "Colorspace"
+property on the connector, and that updates the infoframes. There
+is also selection of limited or full range based on the mode selected
+or an override.
+
+Add code to update the CSC as well so that the metadata matches the
+image data.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 198 ++++++++++++++++++++++++---------
+ 1 file changed, 146 insertions(+), 52 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
+@@ -138,8 +138,8 @@ static bool vc4_hdmi_mode_needs_scrambli
+ 	return clock > HDMI_14_MAX_TMDS_CLK;
+ }
+ 
+-static bool vc4_hdmi_is_full_range_rgb(struct vc4_hdmi *vc4_hdmi,
+-				       const struct drm_display_mode *mode)
++static bool vc4_hdmi_is_full_range(struct vc4_hdmi *vc4_hdmi,
++				   const struct drm_display_mode *mode)
+ {
+ 	struct vc4_hdmi_encoder *vc4_encoder = &vc4_hdmi->encoder;
+ 
+@@ -679,7 +679,7 @@ static void vc4_hdmi_set_avi_infoframe(s
+ 
+ 	drm_hdmi_avi_infoframe_quant_range(&frame.avi,
+ 					   connector, mode,
+-					   vc4_hdmi_is_full_range_rgb(vc4_hdmi, mode) ?
++					   vc4_hdmi_is_full_range(vc4_hdmi, mode) ?
+ 					   HDMI_QUANTIZATION_RANGE_FULL :
+ 					   HDMI_QUANTIZATION_RANGE_LIMITED);
+ 	drm_hdmi_avi_infoframe_colorimetry(&frame.avi, cstate);
+@@ -913,7 +913,7 @@ static void vc4_hdmi_csc_setup(struct vc
+ 	csc_ctl = VC4_SET_FIELD(VC4_HD_CSC_CTL_ORDER_BGR,
+ 				VC4_HD_CSC_CTL_ORDER);
+ 
+-	if (!vc4_hdmi_is_full_range_rgb(vc4_hdmi, mode)) {
++	if (!vc4_hdmi_is_full_range(vc4_hdmi, mode)) {
+ 		/* CEA VICs other than #1 requre limited range RGB
+ 		 * output unless overridden by an AVI infoframe.
+ 		 * Apply a colorspace conversion to squash 0-255 down
+@@ -943,7 +943,6 @@ static void vc4_hdmi_csc_setup(struct vc
+ 	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
+ }
+ 
+-
+ /*
+  * If we need to output Full Range RGB, then use the unity matrix
+  *
+@@ -951,15 +950,6 @@ static void vc4_hdmi_csc_setup(struct vc
+  * [ 0      1      0      0]
+  * [ 0      0      1      0]
+  *
+- * Matrix is signed 2p13 fixed point, with signed 9p6 offsets
+- */
+-static const u16 vc5_hdmi_csc_full_rgb_unity[3][4] = {
+-	{ 0x2000, 0x0000, 0x0000, 0x0000 },
+-	{ 0x0000, 0x2000, 0x0000, 0x0000 },
+-	{ 0x0000, 0x0000, 0x2000, 0x0000 },
+-};
+-
+-/*
+  * CEA VICs other than #1 require limited range RGB output unless
+  * overridden by an AVI infoframe. Apply a colorspace conversion to
+  * squash 0-255 down to 16-235. The matrix here is:
+@@ -970,42 +960,105 @@ static const u16 vc5_hdmi_csc_full_rgb_u
+  *
+  * Matrix is signed 2p13 fixed point, with signed 9p6 offsets
+  */
+-static const u16 vc5_hdmi_csc_full_rgb_to_limited_rgb[3][4] = {
+-	{ 0x1b80, 0x0000, 0x0000, 0x0400 },
+-	{ 0x0000, 0x1b80, 0x0000, 0x0400 },
+-	{ 0x0000, 0x0000, 0x1b80, 0x0400 },
++static const u16 vc5_hdmi_csc_full_rgb_to_rgb[2][3][4] = {
++	{
++		/* Full range - unity */
++		{ 0x2000, 0x0000, 0x0000, 0x0000 },
++		{ 0x0000, 0x2000, 0x0000, 0x0000 },
++		{ 0x0000, 0x0000, 0x2000, 0x0000 },
++	}, {
++		/* Limited range */
++		{ 0x1b80, 0x0000, 0x0000, 0x0400 },
++		{ 0x0000, 0x1b80, 0x0000, 0x0400 },
++		{ 0x0000, 0x0000, 0x1b80, 0x0400 },
++	}
++};
++
++/*
++ * Conversion between Full Range RGB and YUV using the BT.601 Colorspace
++ *
++ * Full range
++ * [    0.299000   0.587000   0.114000   0.000000 ]
++ * [   -0.168736  -0.331264   0.500000 128.000000 ]
++ * [    0.500000  -0.418688  -0.081312 128.000000 ]
++ *
++ * Limited range
++ * [    0.255785   0.502160   0.097523  16.000000 ]
++ * [   -0.147644  -0.289856   0.437500 128.000000 ]
++ * [    0.437500  -0.366352  -0.071148 128.000000 ]
++ *
++ * Matrix is signed 2p13 fixed point, with signed 9p6 offsets
++ */
++static const u16 vc5_hdmi_csc_full_rgb_to_yuv_bt601[2][3][4] = {
++	{
++		/* Full range */
++		{ 0x0991, 0x12c9, 0x03a6, 0x0000 },
++		{ 0xfa9b, 0xf567, 0x1000, 0x2000 },
++		{ 0x1000, 0xf29b, 0xfd67, 0x2000 },
++	}, {
++		/* Limited range */
++		{ 0x082f, 0x1012, 0x031f, 0x0400 },
++		{ 0xfb48, 0xf6ba, 0x0e00, 0x2000 },
++		{ 0x0e00, 0xf448, 0xfdba, 0x2000 },
++	}
+ };
+ 
+ /*
+- * Conversion between Full Range RGB and Full Range YUV422 using the
+- * BT.709 Colorspace
++ * Conversion between Full Range RGB and YUV using the BT.709 Colorspace
++ *
++ * Full range
++ * [    0.212600   0.715200   0.072200   0.000000 ]
++ * [   -0.114572  -0.385428   0.500000 128.000000 ]
++ * [    0.500000  -0.454153  -0.045847 128.000000 ]
+  *
+- * [  0.212639  0.715169  0.072192  0   ]
+- * [ -0.117208 -0.394207  0.511416  128 ]
+- * [  0.511416 -0.464524 -0.046891  128 ]
++ * Limited range
++ * [    0.181873   0.611831   0.061765  16.000000 ]
++ * [   -0.100251  -0.337249   0.437500 128.000000 ]
++ * [    0.437500  -0.397384  -0.040116 128.000000 ]
+  *
+  * Matrix is signed 2p13 fixed point, with signed 9p6 offsets
+  */
+-static const u16 vc5_hdmi_csc_full_rgb_to_full_yuv422_bt709[3][4] = {
+-	{ 0x06ce, 0x16e3, 0x024f, 0x0000 },
+-	{ 0xfc41, 0xf364, 0x105e, 0x2000 },
+-	{ 0x105e, 0xf124, 0xfe81, 0x2000 },
++static const u16 vc5_hdmi_csc_full_rgb_to_yuv_bt709[2][3][4] = {
++	{
++		/* Full range */
++		{ 0x06ce, 0x16e3, 0x024f, 0x0000 },
++		{ 0xfc56, 0xf3ac, 0x1000, 0x2000 },
++		{ 0x1000, 0xf179, 0xfe89, 0x2000 },
++	}, {
++		/* Limited range	*/
++		{ 0x05d2, 0x1394, 0x01fa, 0x0400 },
++		{ 0xfccc, 0xf536, 0x0e00, 0x2000 },
++		{ 0x0e00, 0xf34a, 0xfeb8, 0x2000 },
++	}
+ };
+ 
+ /*
+- * Conversion between Full Range RGB and Full Range YUV444 using the
+- * BT.709 Colorspace
++ * Conversion between Full Range RGB and YUV using the BT.2020 Colorspace
++ *
++ * Full range
++ * [    0.262700   0.678000   0.059300   0.000000 ]
++ * [   -0.139630  -0.360370   0.500000 128.000000 ]
++ * [    0.500000  -0.459786  -0.040214 128.000000 ]
+  *
+- * [ -0.117208 -0.394207  0.511416  128 ]
+- * [  0.511416 -0.464524 -0.046891  128 ]
+- * [  0.212639  0.715169  0.072192  0   ]
++ * Limited range
++ * [    0.224732   0.580008   0.050729  16.000000 ]
++ * [   -0.122176  -0.315324   0.437500 128.000000 ]
++ * [    0.437500  -0.402312  -0.035188 128.000000 ]
+  *
+  * Matrix is signed 2p13 fixed point, with signed 9p6 offsets
+  */
+-static const u16 vc5_hdmi_csc_full_rgb_to_full_yuv444_bt709[3][4] = {
+-	{ 0xfc41, 0xf364, 0x105e, 0x2000 },
+-	{ 0x105e, 0xf124, 0xfe81, 0x2000 },
+-	{ 0x06ce, 0x16e3, 0x024f, 0x0000 },
++static const u16 vc5_hdmi_csc_full_rgb_to_yuv_bt2020[2][3][4] = {
++	{
++		/* Full range */
++		{ 0x0868, 0x15b2, 0x01e6, 0x0000 },
++		{ 0xfb89, 0xf479, 0x1000, 0x2000 },
++		{ 0x1000, 0xf14a, 0xfeb8, 0x2000 },
++	}, {
++		/* Limited range */
++		{ 0x0731, 0x128f, 0x01a0, 0x0400 },
++		{ 0xfc18, 0xf5ea, 0x0e00, 0x2000 },
++		{ 0x0e00, 0xf321, 0xfee1, 0x2000 },
++	}
+ };
+ 
+ static void vc5_hdmi_set_csc_coeffs(struct vc4_hdmi *vc4_hdmi,
+@@ -1021,12 +1074,28 @@ static void vc5_hdmi_set_csc_coeffs(stru
+ 	HDMI_WRITE(HDMI_CSC_34_33, (coeffs[2][3] << 16) | coeffs[2][2]);
+ }
+ 
++static void vc5_hdmi_set_csc_coeffs_swap(struct vc4_hdmi *vc4_hdmi,
++					 const u16 coeffs[3][4])
++{
++	lockdep_assert_held(&vc4_hdmi->hw_lock);
++
++	/* YUV444 needs the CSC matrices using the channels in a different order */
++	HDMI_WRITE(HDMI_CSC_12_11, (coeffs[2][1] << 16) | coeffs[2][0]);
++	HDMI_WRITE(HDMI_CSC_14_13, (coeffs[2][3] << 16) | coeffs[2][2]);
++	HDMI_WRITE(HDMI_CSC_22_21, (coeffs[0][1] << 16) | coeffs[0][0]);
++	HDMI_WRITE(HDMI_CSC_24_23, (coeffs[0][3] << 16) | coeffs[0][2]);
++	HDMI_WRITE(HDMI_CSC_32_31, (coeffs[1][1] << 16) | coeffs[1][0]);
++	HDMI_WRITE(HDMI_CSC_34_33, (coeffs[1][3] << 16) | coeffs[1][2]);
++}
++
+ static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi,
+ 			       struct drm_connector_state *state,
+ 			       const struct drm_display_mode *mode)
+ {
+ 	struct vc4_hdmi_connector_state *vc4_state =
+ 		conn_state_to_vc4_hdmi_conn_state(state);
++	unsigned int lim_range = vc4_hdmi_is_full_range(vc4_hdmi, mode) ? 0 : 1;
++	const u16 (*csc)[4];
+ 	unsigned long flags;
+ 	u32 if_cfg = 0;
+ 	u32 if_xbar = 0x543210;
+@@ -1038,31 +1107,56 @@ static void vc5_hdmi_csc_setup(struct vc
+ 
+ 	switch (vc4_state->output_format) {
+ 	case VC4_HDMI_OUTPUT_YUV444:
+-		vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_to_full_yuv444_bt709);
+-		break;
+-
+ 	case VC4_HDMI_OUTPUT_YUV422:
+-		csc_ctl |= VC4_SET_FIELD(VC5_MT_CP_CSC_CTL_FILTER_MODE_444_TO_422_STANDARD,
+-					 VC5_MT_CP_CSC_CTL_FILTER_MODE_444_TO_422) |
+-			VC5_MT_CP_CSC_CTL_USE_444_TO_422 |
+-			VC5_MT_CP_CSC_CTL_USE_RNG_SUPPRESSION;
+-
+-		csc_chan_ctl |= VC4_SET_FIELD(VC5_MT_CP_CHANNEL_CTL_OUTPUT_REMAP_LEGACY_STYLE,
+-					      VC5_MT_CP_CHANNEL_CTL_OUTPUT_REMAP);
++		switch (state->colorspace) {
++		default:
++		case DRM_MODE_COLORIMETRY_NO_DATA:
++		case DRM_MODE_COLORIMETRY_BT709_YCC:
++		case DRM_MODE_COLORIMETRY_XVYCC_709:
++		case DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED:
++		case DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT:
++			csc = vc5_hdmi_csc_full_rgb_to_yuv_bt709[lim_range];
++			break;
++		case DRM_MODE_COLORIMETRY_SMPTE_170M_YCC:
++		case DRM_MODE_COLORIMETRY_XVYCC_601:
++		case DRM_MODE_COLORIMETRY_SYCC_601:
++		case DRM_MODE_COLORIMETRY_OPYCC_601:
++		case DRM_MODE_COLORIMETRY_BT601_YCC:
++			csc = vc5_hdmi_csc_full_rgb_to_yuv_bt601[lim_range];
++			break;
++		case DRM_MODE_COLORIMETRY_BT2020_CYCC:
++		case DRM_MODE_COLORIMETRY_BT2020_YCC:
++		case DRM_MODE_COLORIMETRY_BT2020_RGB:
++		case DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65:
++		case DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER:
++			csc = vc5_hdmi_csc_full_rgb_to_yuv_bt2020[lim_range];
++			break;
++		}
+ 
+-		if_cfg |= VC4_SET_FIELD(VC5_DVP_HT_VEC_INTERFACE_CFG_SEL_422_FORMAT_422_LEGACY,
+-					VC5_DVP_HT_VEC_INTERFACE_CFG_SEL_422);
++		if (vc4_state->output_format == VC4_HDMI_OUTPUT_YUV422) {
++			csc_ctl |= VC4_SET_FIELD(VC5_MT_CP_CSC_CTL_FILTER_MODE_444_TO_422_STANDARD,
++						 VC5_MT_CP_CSC_CTL_FILTER_MODE_444_TO_422) |
++				VC5_MT_CP_CSC_CTL_USE_444_TO_422 |
++				VC5_MT_CP_CSC_CTL_USE_RNG_SUPPRESSION;
++
++			csc_chan_ctl |= VC4_SET_FIELD(VC5_MT_CP_CHANNEL_CTL_OUTPUT_REMAP_LEGACY_STYLE,
++						      VC5_MT_CP_CHANNEL_CTL_OUTPUT_REMAP);
++
++			if_cfg |= VC4_SET_FIELD(VC5_DVP_HT_VEC_INTERFACE_CFG_SEL_422_FORMAT_422_LEGACY,
++						VC5_DVP_HT_VEC_INTERFACE_CFG_SEL_422);
++
++			vc5_hdmi_set_csc_coeffs(vc4_hdmi, csc);
++		} else {
++			vc5_hdmi_set_csc_coeffs_swap(vc4_hdmi, csc);
++		}
+ 
+-		vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_to_full_yuv422_bt709);
+ 		break;
+ 
+ 	case VC4_HDMI_OUTPUT_RGB:
+ 		if_xbar = 0x354021;
+ 
+-		if (!vc4_hdmi_is_full_range_rgb(vc4_hdmi, mode))
+-			vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_to_limited_rgb);
+-		else
+-			vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_unity);
++		vc5_hdmi_set_csc_coeffs(vc4_hdmi,
++					vc5_hdmi_csc_full_rgb_to_rgb[lim_range]);
+ 		break;
+ 
+ 	default:
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0805-Revert-usb-xhci-expand-the-scope-of-XHCI_VLI_SS_BULK.patch b/root/target/linux/bcm27xx/patches-5.15/950-0805-Revert-usb-xhci-expand-the-scope-of-XHCI_VLI_SS_BULK.patch
new file mode 100644
index 00000000..2f7d5c1c
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0805-Revert-usb-xhci-expand-the-scope-of-XHCI_VLI_SS_BULK.patch
@@ -0,0 +1,57 @@
+From 266f8511f55617449883f8057e852053ca939454 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Wed, 23 Mar 2022 14:44:49 +0000
+Subject: [PATCH 805/828] Revert "usb: xhci: expand the scope of
+ XHCI_VLI_SS_BULK_OUT_BUG"
+
+This reverts commit 40686d87f87a46b3abf48a8dcaee5e0a031deafb.
+
+See: https://github.com/raspberrypi/linux/issues/4930
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ drivers/usb/host/xhci.c | 16 +---------------
+ 1 file changed, 1 insertion(+), 15 deletions(-)
+
+--- a/drivers/usb/host/xhci.c
++++ b/drivers/usb/host/xhci.c
+@@ -1393,12 +1393,9 @@ static void xhci_unmap_temp_buf(struct u
+ static int xhci_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb,
+ 				gfp_t mem_flags)
+ {
+-	unsigned int i, maxpacket;
+-	struct scatterlist *sg;
+ 	struct xhci_hcd *xhci;
+ 
+ 	xhci = hcd_to_xhci(hcd);
+-	maxpacket = usb_endpoint_maxp(&urb->ep->desc);
+ 
+ 	if (xhci_urb_suitable_for_idt(urb))
+ 		return 0;
+@@ -1407,16 +1404,6 @@ static int xhci_map_urb_for_dma(struct u
+ 		if (xhci_urb_temp_buffer_required(hcd, urb))
+ 			return xhci_map_temp_buffer(hcd, urb);
+ 	}
+-
+-	if (xhci->quirks & XHCI_VLI_SS_BULK_OUT_BUG &&
+-	    usb_endpoint_is_bulk_out(&urb->ep->desc) &&
+-	    urb->dev->speed >= USB_SPEED_SUPER &&
+-	    urb->transfer_buffer_length != 0) {
+-		for_each_sg(urb->sg, sg, urb->num_sgs, i) {
+-			if (sg->length % maxpacket)
+-				return xhci_map_temp_buffer(hcd, urb);
+-		}
+-	}
+ 	return usb_hcd_map_urb_for_dma(hcd, urb, mem_flags);
+ }
+ 
+@@ -1430,8 +1417,7 @@ static void xhci_unmap_urb_for_dma(struc
+ 	if (urb->num_sgs && (urb->transfer_flags & URB_DMA_MAP_SINGLE))
+ 		unmap_temp_buf = true;
+ 
+-	if ((xhci->quirks & (XHCI_SG_TRB_CACHE_SIZE_QUIRK | XHCI_VLI_SS_BULK_OUT_BUG))
+-	     && unmap_temp_buf)
++	if ((xhci->quirks & XHCI_SG_TRB_CACHE_SIZE_QUIRK) && unmap_temp_buf)
+ 		xhci_unmap_temp_buf(hcd, urb);
+ 	else
+ 		usb_hcd_unmap_urb_for_dma(hcd, urb);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0806-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch b/root/target/linux/bcm27xx/patches-5.15/950-0806-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch
new file mode 100644
index 00000000..4329e96f
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0806-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch
@@ -0,0 +1,211 @@
+From 1ad4f84c823fddffc7ada32e4d22a23c1a2c18bd Mon Sep 17 00:00:00 2001
+From: Dom Cobley <popcornmix@gmail.com>
+Date: Mon, 14 Mar 2022 17:56:10 +0000
+Subject: [PATCH 806/828] vc4/drm: vc4_plane: Keep fractional source coords
+ inside state
+
+Signed-off-by: Dom Cobley <popcornmix@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_drv.h   |  2 +-
+ drivers/gpu/drm/vc4/vc4_plane.c | 67 ++++++++++++++++-----------------
+ 2 files changed, 34 insertions(+), 35 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_drv.h
++++ b/drivers/gpu/drm/vc4/vc4_drv.h
+@@ -386,7 +386,7 @@ struct vc4_plane_state {
+ 
+ 	/* Clipped coordinates of the plane on the display. */
+ 	int crtc_x, crtc_y, crtc_w, crtc_h;
+-	/* Clipped area being scanned from in the FB. */
++	/* Clipped area being scanned from in the FB in u16.16 format */
+ 	u32 src_x, src_y;
+ 
+ 	u32 src_w[2], src_h[2];
+--- a/drivers/gpu/drm/vc4/vc4_plane.c
++++ b/drivers/gpu/drm/vc4/vc4_plane.c
+@@ -179,9 +179,9 @@ static const struct hvs_format *vc4_get_
+ 
+ static enum vc4_scaling_mode vc4_get_scaling_mode(u32 src, u32 dst)
+ {
+-	if (dst == src)
++	if (dst == src >> 16)
+ 		return VC4_SCALING_NONE;
+-	if (3 * dst >= 2 * src)
++	if (3 * dst >= 2 * (src >> 16))
+ 		return VC4_SCALING_PPF;
+ 	else
+ 		return VC4_SCALING_TPZ;
+@@ -388,14 +388,10 @@ static int vc4_plane_setup_clipping_and_
+ 	for (i = 0; i < num_planes; i++)
+ 		vc4_state->offsets[i] = bo->paddr + fb->offsets[i];
+ 
+-	/* We don't support subpixel source positioning for scaling,
+-	 * but fractional coordinates can be generated by clipping
+-	 * so just round for now
+-	 */
+-	vc4_state->src_x = DIV_ROUND_CLOSEST(state->src.x1, 1<<16);
+-	vc4_state->src_y = DIV_ROUND_CLOSEST(state->src.y1, 1<<16);
+-	vc4_state->src_w[0] = DIV_ROUND_CLOSEST(state->src.x2, 1<<16) - vc4_state->src_x;
+-	vc4_state->src_h[0] = DIV_ROUND_CLOSEST(state->src.y2, 1<<16) - vc4_state->src_y;
++	vc4_state->src_x = state->src.x1;
++	vc4_state->src_y = state->src.y1;
++	vc4_state->src_w[0] = state->src.x2 - vc4_state->src_x;
++	vc4_state->src_h[0] = state->src.y2 - vc4_state->src_y;
+ 
+ 	vc4_state->crtc_x = state->dst.x1;
+ 	vc4_state->crtc_y = state->dst.y1;
+@@ -448,7 +444,7 @@ static void vc4_write_tpz(struct vc4_pla
+ {
+ 	u32 scale, recip;
+ 
+-	scale = (1 << 16) * src / dst;
++	scale = src / dst;
+ 
+ 	/* The specs note that while the reciprocal would be defined
+ 	 * as (1<<32)/scale, ~0 is close enough.
+@@ -494,7 +490,7 @@ static u32 vc4_lbm_size(struct drm_plane
+ 	if (vc4_state->x_scaling[0] == VC4_SCALING_TPZ)
+ 		pix_per_line = vc4_state->crtc_w;
+ 	else
+-		pix_per_line = vc4_state->src_w[0];
++		pix_per_line = vc4_state->src_w[0] >> 16;
+ 
+ 	if (!vc4_state->is_yuv) {
+ 		if (vc4_state->y_scaling[0] == VC4_SCALING_TPZ)
+@@ -585,7 +581,8 @@ static void vc4_plane_calc_load(struct d
+ 	for (i = 0; i < fb->format->num_planes; i++) {
+ 		/* Even if the bandwidth/plane required for a single frame is
+ 		 *
+-		 * vc4_state->src_w[i] * vc4_state->src_h[i] * cpp * vrefresh
++		 * (vc4_state->src_w[i] >> 16) * (vc4_state->src_h[i] >> 16) *
++		 *  cpp * vrefresh
+ 		 *
+ 		 * when downscaling, we have to read more pixels per line in
+ 		 * the time frame reserved for a single line, so the bandwidth
+@@ -594,11 +591,11 @@ static void vc4_plane_calc_load(struct d
+ 		 * load by this number. We're likely over-estimating the read
+ 		 * demand, but that's better than under-estimating it.
+ 		 */
+-		vscale_factor = DIV_ROUND_UP(vc4_state->src_h[i],
++		vscale_factor = DIV_ROUND_UP(vc4_state->src_h[i] >> 16,
+ 					     vc4_state->crtc_h);
+-		vc4_state->membus_load += vc4_state->src_w[i] *
+-					  vc4_state->src_h[i] * vscale_factor *
+-					  fb->format->cpp[i];
++		vc4_state->membus_load += (vc4_state->src_w[i] >> 16) *
++					  (vc4_state->src_h[i] >> 16) *
++					  vscale_factor * fb->format->cpp[i];
+ 		vc4_state->hvs_load += vc4_state->crtc_h * vc4_state->crtc_w;
+ 	}
+ 
+@@ -751,7 +748,8 @@ static int vc4_plane_mode_set(struct drm
+ 	bool mix_plane_alpha;
+ 	bool covers_screen;
+ 	u32 scl0, scl1, pitch0;
+-	u32 tiling, src_y;
++	u32 tiling, src_x, src_y;
++	u32 width, height;
+ 	u32 hvs_format = format->hvs;
+ 	unsigned int rotation;
+ 	int ret, i;
+@@ -763,6 +761,9 @@ static int vc4_plane_mode_set(struct drm
+ 	if (ret)
+ 		return ret;
+ 
++	width = vc4_state->src_w[0] >> 16;
++	height = vc4_state->src_h[0] >> 16;
++
+ 	/* SCL1 is used for Cb/Cr scaling of planar formats.  For RGB
+ 	 * and 4:4:4, scl1 should be set to scl0 so both channels of
+ 	 * the scaler do the same thing.  For YUV, the Y plane needs
+@@ -783,9 +784,11 @@ static int vc4_plane_mode_set(struct drm
+ 					 DRM_MODE_REFLECT_Y);
+ 
+ 	/* We must point to the last line when Y reflection is enabled. */
+-	src_y = vc4_state->src_y;
++	src_y = vc4_state->src_y >> 16;
+ 	if (rotation & DRM_MODE_REFLECT_Y)
+-		src_y += vc4_state->src_h[0] - 1;
++		src_y += height - 1;
++
++	src_x = vc4_state->src_x >> 16;
+ 
+ 	switch (base_format_mod) {
+ 	case DRM_FORMAT_MOD_LINEAR:
+@@ -800,7 +803,7 @@ static int vc4_plane_mode_set(struct drm
+ 						 (i ? v_subsample : 1) *
+ 						 fb->pitches[i];
+ 
+-			vc4_state->offsets[i] += vc4_state->src_x /
++			vc4_state->offsets[i] += src_x /
+ 						 (i ? h_subsample : 1) *
+ 						 fb->format->cpp[i];
+ 		}
+@@ -823,7 +826,7 @@ static int vc4_plane_mode_set(struct drm
+ 		 *	pitch * tile_h == tile_size * tiles_per_row
+ 		 */
+ 		u32 tiles_w = fb->pitches[0] >> (tile_size_shift - tile_h_shift);
+-		u32 tiles_l = vc4_state->src_x >> tile_w_shift;
++		u32 tiles_l = src_x >> tile_w_shift;
+ 		u32 tiles_r = tiles_w - tiles_l;
+ 		u32 tiles_t = src_y >> tile_h_shift;
+ 		/* Intra-tile offsets, which modify the base address (the
+@@ -833,7 +836,7 @@ static int vc4_plane_mode_set(struct drm
+ 		u32 tile_y = (src_y >> 4) & 1;
+ 		u32 subtile_y = (src_y >> 2) & 3;
+ 		u32 utile_y = src_y & 3;
+-		u32 x_off = vc4_state->src_x & tile_w_mask;
++		u32 x_off = src_x & tile_w_mask;
+ 		u32 y_off = src_y & tile_h_mask;
+ 
+ 		/* When Y reflection is requested we must set the
+@@ -929,7 +932,7 @@ static int vc4_plane_mode_set(struct drm
+ 				 * of the 12-pixels in that 128-bit word is the
+ 				 * first pixel to be used
+ 				 */
+-				u32 remaining_pixels = vc4_state->src_x % 96;
++				u32 remaining_pixels = src_x % 96;
+ 				u32 aligned = remaining_pixels / 12;
+ 				u32 last_bits = remaining_pixels % 12;
+ 
+@@ -951,12 +954,12 @@ static int vc4_plane_mode_set(struct drm
+ 					return -EINVAL;
+ 				}
+ 				pix_per_tile = tile_w / fb->format->cpp[0];
+-				x_off = (vc4_state->src_x % pix_per_tile) /
++				x_off = (src_x % pix_per_tile) /
+ 					(i ? h_subsample : 1) *
+ 					fb->format->cpp[i];
+ 			}
+ 
+-			tile = vc4_state->src_x / pix_per_tile;
++			tile = src_x / pix_per_tile;
+ 
+ 			vc4_state->offsets[i] += param * tile_w * tile;
+ 			vc4_state->offsets[i] += src_y /
+@@ -1017,10 +1020,8 @@ static int vc4_plane_mode_set(struct drm
+ 		vc4_dlist_write(vc4_state,
+ 				(mix_plane_alpha ? SCALER_POS2_ALPHA_MIX : 0) |
+ 				vc4_hvs4_get_alpha_blend_mode(state) |
+-				VC4_SET_FIELD(vc4_state->src_w[0],
+-					      SCALER_POS2_WIDTH) |
+-				VC4_SET_FIELD(vc4_state->src_h[0],
+-					      SCALER_POS2_HEIGHT));
++				VC4_SET_FIELD(width, SCALER_POS2_WIDTH) |
++				VC4_SET_FIELD(height, SCALER_POS2_HEIGHT));
+ 
+ 		/* Position Word 3: Context.  Written by the HVS. */
+ 		vc4_dlist_write(vc4_state, 0xc0c0c0c0);
+@@ -1078,10 +1079,8 @@ static int vc4_plane_mode_set(struct drm
+ 		/* Position Word 2: Source Image Size */
+ 		vc4_state->pos2_offset = vc4_state->dlist_count;
+ 		vc4_dlist_write(vc4_state,
+-				VC4_SET_FIELD(vc4_state->src_w[0],
+-					      SCALER5_POS2_WIDTH) |
+-				VC4_SET_FIELD(vc4_state->src_h[0],
+-					      SCALER5_POS2_HEIGHT));
++				VC4_SET_FIELD(width, SCALER5_POS2_WIDTH) |
++				VC4_SET_FIELD(height, SCALER5_POS2_HEIGHT));
+ 
+ 		/* Position Word 3: Context.  Written by the HVS. */
+ 		vc4_dlist_write(vc4_state, 0xc0c0c0c0);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0807-vc4-drm-Handle-fractional-coordinates-using-the-phas.patch b/root/target/linux/bcm27xx/patches-5.15/950-0807-vc4-drm-Handle-fractional-coordinates-using-the-phas.patch
new file mode 100644
index 00000000..bfd0bcb7
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0807-vc4-drm-Handle-fractional-coordinates-using-the-phas.patch
@@ -0,0 +1,105 @@
+From 07d22187f77773a03f4c50183fa8721557477f2d Mon Sep 17 00:00:00 2001
+From: Dom Cobley <popcornmix@gmail.com>
+Date: Fri, 9 Apr 2021 15:00:40 +0100
+Subject: [PATCH 807/828] vc4/drm: Handle fractional coordinates using the
+ phase field
+
+Signed-off-by: Dom Cobley <popcornmix@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_plane.c | 61 ++++++++++++++++++++++++++++++---
+ 1 file changed, 56 insertions(+), 5 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_plane.c
++++ b/drivers/gpu/drm/vc4/vc4_plane.c
+@@ -458,14 +458,47 @@ static void vc4_write_tpz(struct vc4_pla
+ 			VC4_SET_FIELD(recip, SCALER_TPZ1_RECIP));
+ }
+ 
+-static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst)
++/* phase magnitude bits */
++#define PHASE_BITS 6
++
++static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst, u32 xy, int channel)
+ {
+-	u32 scale = (1 << 16) * src / dst;
++	u32 scale = src / dst;
++	s32 offset, offset2;
++	s32 phase;
++
++	/* Start the phase at 1/2 pixel from the 1st pixel at src_x.
++	   1/4 pixel for YUV. */
++	if (channel) {
++		/* the phase is relative to scale_src->x, so shift it for display list's x value */
++		offset = (xy & 0x1ffff) >> (16 - PHASE_BITS) >> 1;
++		offset += -(1 << PHASE_BITS >> 2);
++	} else {
++		/* the phase is relative to scale_src->x, so shift it for display list's x value */
++		offset = (xy & 0xffff) >> (16 - PHASE_BITS);
++		offset += -(1 << PHASE_BITS >> 1);
++
++		/* This is a kludge to make sure the scaling factors are consitent with YUV's luma scaling.
++		   we lose 1bit precision because of this. */
++		scale &= ~1;
++	}
++
++	/* There may be a also small error introduced by precision of scale.
++	   Add half of that as a compromise */
++	offset2 = src - dst * scale;
++	offset2 >>= 16 - PHASE_BITS;
++	phase = offset + (offset2 >> 1);
++
++	/* Ensure +ve values don't touch the sign bit, then truncate negative values */
++	if (phase >= 1 << PHASE_BITS)
++		phase = (1 << PHASE_BITS) - 1;
++
++	phase &= SCALER_PPF_IPHASE_MASK;
+ 
+ 	vc4_dlist_write(vc4_state,
+ 			SCALER_PPF_AGC |
+ 			VC4_SET_FIELD(scale, SCALER_PPF_SCALE) |
+-			VC4_SET_FIELD(0, SCALER_PPF_IPHASE));
++			VC4_SET_FIELD(phase, SCALER_PPF_IPHASE));
+ }
+ 
+ static u32 vc4_lbm_size(struct drm_plane_state *state)
+@@ -524,13 +557,13 @@ static void vc4_write_scaling_parameters
+ 	/* Ch0 H-PPF Word 0: Scaling Parameters */
+ 	if (vc4_state->x_scaling[channel] == VC4_SCALING_PPF) {
+ 		vc4_write_ppf(vc4_state,
+-			      vc4_state->src_w[channel], vc4_state->crtc_w);
++			      vc4_state->src_w[channel], vc4_state->crtc_w, vc4_state->src_x, channel);
+ 	}
+ 
+ 	/* Ch0 V-PPF Words 0-1: Scaling Parameters, Context */
+ 	if (vc4_state->y_scaling[channel] == VC4_SCALING_PPF) {
+ 		vc4_write_ppf(vc4_state,
+-			      vc4_state->src_h[channel], vc4_state->crtc_h);
++			      vc4_state->src_h[channel], vc4_state->crtc_h, vc4_state->src_y, channel);
+ 		vc4_dlist_write(vc4_state, 0xc0c0c0c0);
+ 	}
+ 
+@@ -978,6 +1011,24 @@ static int vc4_plane_mode_set(struct drm
+ 		return -EINVAL;
+ 	}
+ 
++	/* fetch an extra pixel if we don't actually line up with the left edge. */
++	if ((vc4_state->src_x & 0xffff) && vc4_state->src_x < (state->fb->width << 16))
++		width++;
++
++	/* same for the right side */
++	if (((vc4_state->src_x + vc4_state->src_w[0]) & 0xffff) &&
++	       vc4_state->src_x + vc4_state->src_w[0] < (state->fb->width << 16))
++		width++;
++
++	/* now for the top */
++	if ((vc4_state->src_y & 0xffff) && vc4_state->src_y < (state->fb->height << 16))
++		height++;
++
++	/* and the bottom */
++	if (((vc4_state->src_y + vc4_state->src_h[0]) & 0xffff) &&
++	       vc4_state->src_y + vc4_state->src_h[0] < (state->fb->height << 16))
++		height++;
++
+ 	/* Don't waste cycles mixing with plane alpha if the set alpha
+ 	 * is opaque or there is no per-pixel alpha information.
+ 	 * In any case we use the alpha property value as the fixed alpha.
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0808-drm-Add-chroma-siting-properties.patch b/root/target/linux/bcm27xx/patches-5.15/950-0808-drm-Add-chroma-siting-properties.patch
new file mode 100644
index 00000000..6e2600ed
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0808-drm-Add-chroma-siting-properties.patch
@@ -0,0 +1,170 @@
+From 2170e803286a744622ee56d7e7bca47fd09ec2f1 Mon Sep 17 00:00:00 2001
+From: Dom Cobley <popcornmix@gmail.com>
+Date: Wed, 26 Jan 2022 15:58:13 +0000
+Subject: [PATCH 808/828] drm: Add chroma siting properties
+
+Signed-off-by: Dom Cobley <popcornmix@gmail.com>
+---
+ drivers/gpu/drm/drm_atomic_state_helper.c | 14 +++++++++
+ drivers/gpu/drm/drm_atomic_uapi.c         |  8 +++++
+ drivers/gpu/drm/drm_color_mgmt.c          | 36 +++++++++++++++++++++++
+ include/drm/drm_color_mgmt.h              |  3 ++
+ include/drm/drm_plane.h                   | 36 +++++++++++++++++++++++
+ 5 files changed, 97 insertions(+)
+
+--- a/drivers/gpu/drm/drm_atomic_state_helper.c
++++ b/drivers/gpu/drm/drm_atomic_state_helper.c
+@@ -265,6 +265,20 @@ void __drm_atomic_helper_plane_state_res
+ 			plane_state->color_range = val;
+ 	}
+ 
++	if (plane->chroma_siting_h_property) {
++		if (!drm_object_property_get_default_value(&plane->base,
++							   plane->chroma_siting_h_property,
++							   &val))
++			plane_state->chroma_siting_h = val;
++	}
++
++	if (plane->chroma_siting_v_property) {
++		if (!drm_object_property_get_default_value(&plane->base,
++							   plane->chroma_siting_v_property,
++							   &val))
++			plane_state->chroma_siting_v = val;
++	}
++
+ 	if (plane->zpos_property) {
+ 		if (!drm_object_property_get_default_value(&plane->base,
+ 							   plane->zpos_property,
+--- a/drivers/gpu/drm/drm_atomic_uapi.c
++++ b/drivers/gpu/drm/drm_atomic_uapi.c
+@@ -598,6 +598,10 @@ static int drm_atomic_plane_set_property
+ 		state->color_encoding = val;
+ 	} else if (property == plane->color_range_property) {
+ 		state->color_range = val;
++	} else if (property == plane->chroma_siting_h_property) {
++		state->chroma_siting_h = val;
++	} else if (property == plane->chroma_siting_v_property) {
++		state->chroma_siting_v = val;
+ 	} else if (property == config->prop_fb_damage_clips) {
+ 		ret = drm_atomic_replace_property_blob_from_id(dev,
+ 					&state->fb_damage_clips,
+@@ -664,6 +668,10 @@ drm_atomic_plane_get_property(struct drm
+ 		*val = state->color_encoding;
+ 	} else if (property == plane->color_range_property) {
+ 		*val = state->color_range;
++	} else if (property == plane->chroma_siting_h_property) {
++		*val = state->chroma_siting_h;
++	} else if (property == plane->chroma_siting_v_property) {
++		*val = state->chroma_siting_v;
+ 	} else if (property == config->prop_fb_damage_clips) {
+ 		*val = (state->fb_damage_clips) ?
+ 			state->fb_damage_clips->base.id : 0;
+--- a/drivers/gpu/drm/drm_color_mgmt.c
++++ b/drivers/gpu/drm/drm_color_mgmt.c
+@@ -587,6 +587,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
++ *
++ * Create and attach plane specific CHROMA_SITING
++ * properties to @plane.
++ */
++int drm_plane_create_chroma_siting_properties(struct drm_plane *plane,
++						int32_t default_chroma_siting_h,
++						int32_t default_chroma_siting_v)
++{
++	struct drm_device *dev = plane->dev;
++	struct drm_property *prop;
++
++	prop = drm_property_create_range(dev, 0, "CHROMA_SITING_H",
++					0, 1<<16);
++	if (!prop)
++		return -ENOMEM;
++	plane->chroma_siting_h_property = prop;
++	drm_object_attach_property(&plane->base, prop, default_chroma_siting_h);
++
++	prop = drm_property_create_range(dev, 0, "CHROMA_SITING_V",
++					0, 1<<16);
++	if (!prop)
++		return -ENOMEM;
++	plane->chroma_siting_v_property = prop;
++	drm_object_attach_property(&plane->base, prop, default_chroma_siting_v);
++
++	if (plane->state) {
++		plane->state->chroma_siting_h = default_chroma_siting_h;
++		plane->state->chroma_siting_v = default_chroma_siting_v;
++	}
++	return 0;
++}
++EXPORT_SYMBOL(drm_plane_create_chroma_siting_properties);
++
++/**
+  * drm_color_lut_check - check validity of lookup table
+  * @lut: property blob containing LUT to check
+  * @tests: bitmask of tests to run
+--- a/include/drm/drm_color_mgmt.h
++++ b/include/drm/drm_color_mgmt.h
+@@ -93,6 +93,9 @@ int drm_plane_create_color_properties(st
+ 				      enum drm_color_encoding default_encoding,
+ 				      enum drm_color_range default_range);
+ 
++int drm_plane_create_chroma_siting_properties(struct drm_plane *plane,
++						int32_t default_chroma_siting_h, int32_t default_chroma_siting_v);
++
+ /**
+  * enum drm_color_lut_tests - hw-specific LUT tests to perform
+  *
+--- a/include/drm/drm_plane.h
++++ b/include/drm/drm_plane.h
+@@ -180,6 +180,24 @@ struct drm_plane_state {
+ 	enum drm_color_range color_range;
+ 
+ 	/**
++	 * @chroma_siting_h:
++	 *
++	 * Location of chroma samples horizontally compared to luma
++	 * 0 means chroma is sited with left luma
++	 * 0x8000 is interstitial. 0x10000 is sited with right luma
++	 */
++	int32_t chroma_siting_h;
++
++	/**
++	 * @chroma_siting_v:
++	 *
++	 * Location of chroma samples vertically compared to luma
++	 * 0 means chroma is sited with top luma
++	 * 0x8000 is interstitial. 0x10000 is sited with bottom luma
++	 */
++	int32_t chroma_siting_v;
++
++	/**
+ 	 * @fb_damage_clips:
+ 	 *
+ 	 * Blob representing damage (area in plane framebuffer that changed
+@@ -750,6 +768,24 @@ struct drm_plane {
+ 	 * scaling.
+ 	 */
+ 	struct drm_property *scaling_filter_property;
++
++	/**
++	 * @chroma_siting_h_property:
++	 *
++	 * Optional "CHROMA_SITING_H" property for specifying
++	 * chroma siting for YUV formats.
++	 * See drm_plane_create_chroma_siting_properties().
++	 */
++	struct drm_property *chroma_siting_h_property;
++
++	/**
++	 * @chroma_siting_v_property:
++	 *
++	 * Optional "CHROMA_SITING_V" property for specifying
++	 * chroma siting for YUV formats.
++	 * See drm_plane_create_chroma_siting_properties().
++	 */
++	struct drm_property *chroma_siting_v_property;
+ };
+ 
+ #define obj_to_plane(x) container_of(x, struct drm_plane, base)
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0809-vc4-drm-plane-Make-use-of-chroma-siting-parameter.patch b/root/target/linux/bcm27xx/patches-5.15/950-0809-vc4-drm-plane-Make-use-of-chroma-siting-parameter.patch
new file mode 100644
index 00000000..92924a9b
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0809-vc4-drm-plane-Make-use-of-chroma-siting-parameter.patch
@@ -0,0 +1,60 @@
+From 8e0273d4d0e000ab5cd32a66034a352d137bfe67 Mon Sep 17 00:00:00 2001
+From: Dom Cobley <popcornmix@gmail.com>
+Date: Thu, 27 Jan 2022 15:32:04 +0000
+Subject: [PATCH 809/828] vc4/drm:plane: Make use of chroma siting parameter
+
+Signed-off-by: Dom Cobley <popcornmix@gmail.com>
+---
+ drivers/gpu/drm/vc4/vc4_plane.c | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_plane.c
++++ b/drivers/gpu/drm/vc4/vc4_plane.c
+@@ -461,17 +461,18 @@ static void vc4_write_tpz(struct vc4_pla
+ /* phase magnitude bits */
+ #define PHASE_BITS 6
+ 
+-static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst, u32 xy, int channel)
++static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst, u32 xy, int channel, int chroma_offset)
+ {
+ 	u32 scale = src / dst;
+ 	s32 offset, offset2;
+ 	s32 phase;
+ 
+ 	/* Start the phase at 1/2 pixel from the 1st pixel at src_x.
+-	   1/4 pixel for YUV. */
++	   1/4 pixel for YUV, plus the offset for chroma siting */
+ 	if (channel) {
+ 		/* the phase is relative to scale_src->x, so shift it for display list's x value */
+ 		offset = (xy & 0x1ffff) >> (16 - PHASE_BITS) >> 1;
++		offset -= chroma_offset >> (17 - PHASE_BITS);
+ 		offset += -(1 << PHASE_BITS >> 2);
+ 	} else {
+ 		/* the phase is relative to scale_src->x, so shift it for display list's x value */
+@@ -557,13 +558,15 @@ static void vc4_write_scaling_parameters
+ 	/* Ch0 H-PPF Word 0: Scaling Parameters */
+ 	if (vc4_state->x_scaling[channel] == VC4_SCALING_PPF) {
+ 		vc4_write_ppf(vc4_state,
+-			      vc4_state->src_w[channel], vc4_state->crtc_w, vc4_state->src_x, channel);
++			      vc4_state->src_w[channel], vc4_state->crtc_w, vc4_state->src_x, channel,
++			      state->chroma_siting_h);
+ 	}
+ 
+ 	/* Ch0 V-PPF Words 0-1: Scaling Parameters, Context */
+ 	if (vc4_state->y_scaling[channel] == VC4_SCALING_PPF) {
+ 		vc4_write_ppf(vc4_state,
+-			      vc4_state->src_h[channel], vc4_state->crtc_h, vc4_state->src_y, channel);
++			      vc4_state->src_h[channel], vc4_state->crtc_h, vc4_state->src_y, channel,
++			      state->chroma_siting_v);
+ 		vc4_dlist_write(vc4_state, 0xc0c0c0c0);
+ 	}
+ 
+@@ -1622,6 +1625,8 @@ struct drm_plane *vc4_plane_init(struct
+ 					  DRM_COLOR_YCBCR_BT709,
+ 					  DRM_COLOR_YCBCR_LIMITED_RANGE);
+ 
++	drm_plane_create_chroma_siting_properties(plane, 0, 0);
++
+ 	if (type == DRM_PLANE_TYPE_PRIMARY)
+ 		drm_plane_create_zpos_immutable_property(plane, 0);
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0810-drivers-staging-bcm2835-isp-Clear-LS-table-handle-in.patch b/root/target/linux/bcm27xx/patches-5.15/950-0810-drivers-staging-bcm2835-isp-Clear-LS-table-handle-in.patch
new file mode 100644
index 00000000..c5d8b5e7
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0810-drivers-staging-bcm2835-isp-Clear-LS-table-handle-in.patch
@@ -0,0 +1,37 @@
+From eb13979a9be244b6888f06f4a592ea11d3eb7941 Mon Sep 17 00:00:00 2001
+From: Naushir Patuck <naush@raspberrypi.com>
+Date: Tue, 22 Mar 2022 15:16:40 +0000
+Subject: [PATCH 810/828] drivers: staging: bcm2835-isp: Clear LS table handle
+ in the firmware
+
+When all nodes have stopped streaming, ensure the firmware has released its
+handle on the LS table dmabuf. This is done by passing a null handle in the
+LS params.
+
+Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
+---
+ .../vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c    | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
++++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
+@@ -655,6 +655,19 @@ static void bcm2835_isp_node_stop_stream
+ 	atomic_dec(&dev->num_streaming);
+ 	/* If all ports disabled, then disable the component */
+ 	if (atomic_read(&dev->num_streaming) == 0) {
++		struct bcm2835_isp_lens_shading ls;
++		/*
++		 * The ISP component on the firmware has a reference to the
++		 * dmabuf handle for the lens shading table.  Pass a null handle
++		 * to remove that reference now.
++		 */
++		memset(&ls, 0, sizeof(ls));
++		/* Must set a valid grid size for the FW */
++		ls.grid_cell_size = 16;
++		set_isp_param(&dev->node[0],
++			      MMAL_PARAMETER_LENS_SHADING_OVERRIDE,
++			      &ls, sizeof(ls));
++
+ 		ret = vchiq_mmal_component_disable(dev->mmal_instance,
+ 						   dev->component);
+ 		if (ret) {
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0811-dt-bindings-display-add-bindings-for-MIPI-DBI-compat.patch b/root/target/linux/bcm27xx/patches-5.15/950-0811-dt-bindings-display-add-bindings-for-MIPI-DBI-compat.patch
new file mode 100644
index 00000000..8da7ac01
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0811-dt-bindings-display-add-bindings-for-MIPI-DBI-compat.patch
@@ -0,0 +1,176 @@
+From 457519fa7227b9cbc1f762e2398ba9889f5346ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
+Date: Sun, 27 Feb 2022 13:47:09 +0100
+Subject: [PATCH 811/828] dt-bindings: display: add bindings for MIPI DBI
+ compatible SPI panels
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+commit 2f3468b upstream.
+
+Add binding for MIPI DBI compatible SPI panels.
+
+v6:
+- Fix indentation (Rob)
+
+v5:
+- Add sainsmart18 to compatible items (Rob)
+- Expand write-only description (Sam)
+
+v4:
+- There should only be two compatible (Maxime)
+- s/panel-dbi-spi/panel-mipi-dbi-spi/in compatible
+
+v3:
+- Move properties to Device Tree (Maxime)
+- Use contains for compatible (Maxime)
+- Add backlight property to example
+- Flesh out description
+
+v2:
+- Fix path for panel-common.yaml
+- Use unevaluatedProperties
+- Drop properties which are in the allOf section
+- Drop model property (Rob)
+
+Acked-by: Maxime Ripard <maxime@cerno.tech>
+Acked-by: Sam Ravnborg <sam@ravnborg.org>
+Reviewed-by: Rob Herring <robh@kernel.org>
+Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Link: https://patchwork.freedesktop.org/patch/msgid/20220227124713.39766-2-noralf@tronnes.org
+---
+ .../display/panel/panel-mipi-dbi-spi.yaml     | 126 ++++++++++++++++++
+ 1 file changed, 126 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/display/panel/panel-mipi-dbi-spi.yaml
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/display/panel/panel-mipi-dbi-spi.yaml
+@@ -0,0 +1,126 @@
++# SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause)
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/display/panel/panel-mipi-dbi-spi.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: MIPI DBI SPI Panel
++
++maintainers:
++  - Noralf Trønnes <noralf@tronnes.org>
++
++description: |
++  This binding is for display panels using a MIPI DBI compatible controller
++  in SPI mode.
++
++  The MIPI Alliance Standard for Display Bus Interface defines the electrical
++  and logical interfaces for display controllers historically used in mobile
++  phones. The standard defines 4 display architecture types and this binding is
++  for type 1 which has full frame memory. There are 3 interface types in the
++  standard and type C is the serial interface.
++
++  The standard defines the following interface signals for type C:
++  - Power:
++    - Vdd: Power supply for display module
++    - Vddi: Logic level supply for interface signals
++    Combined into one in this binding called: power-supply
++  - Interface:
++    - CSx: Chip select
++    - SCL: Serial clock
++    - Dout: Serial out
++    - Din: Serial in
++    - SDA: Bidrectional in/out
++    - D/CX: Data/command selection, high=data, low=command
++      Called dc-gpios in this binding.
++    - RESX: Reset when low
++      Called reset-gpios in this binding.
++
++  The type C interface has 3 options:
++
++    - Option 1: 9-bit mode and D/CX as the 9th bit
++      |              Command              |  the next command or following data  |
++      |<0><D7><D6><D5><D4><D3><D2><D1><D0>|<D/CX><D7><D6><D5><D4><D3><D2><D1><D0>|
++
++    - Option 2: 16-bit mode and D/CX as a 9th bit
++      |              Command or data                              |
++      |<X><X><X><X><X><X><X><D/CX><D7><D6><D5><D4><D3><D2><D1><D0>|
++
++    - Option 3: 8-bit mode and D/CX as a separate interface line
++      |        Command or data         |
++      |<D7><D6><D5><D4><D3><D2><D1><D0>|
++
++  The panel resolution is specified using the panel-timing node properties
++  hactive (width) and vactive (height). The other mandatory panel-timing
++  properties should be set to zero except clock-frequency which can be
++  optionally set to inform about the actual pixel clock frequency.
++
++  If the panel is wired to the controller at an offset specify this using
++  hback-porch (x-offset) and vback-porch (y-offset).
++
++allOf:
++  - $ref: panel-common.yaml#
++  - $ref: /schemas/spi/spi-peripheral-props.yaml#
++
++properties:
++  compatible:
++    items:
++      - enum:
++          - sainsmart18
++      - const: panel-mipi-dbi-spi
++
++  write-only:
++    type: boolean
++    description:
++      Controller is not readable (ie. Din (MISO on the SPI interface) is not
++      wired up).
++
++  dc-gpios:
++    maxItems: 1
++    description: |
++      Controller data/command selection (D/CX) in 4-line SPI mode.
++      If not set, the controller is in 3-line SPI mode.
++
++required:
++  - compatible
++  - reg
++  - panel-timing
++
++unevaluatedProperties: false
++
++examples:
++  - |
++    #include <dt-bindings/gpio/gpio.h>
++
++    spi {
++        #address-cells = <1>;
++        #size-cells = <0>;
++
++        display@0{
++            compatible = "sainsmart18", "panel-mipi-dbi-spi";
++            reg = <0>;
++            spi-max-frequency = <40000000>;
++
++            dc-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
++            reset-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
++            write-only;
++
++            backlight = <&backlight>;
++
++            width-mm = <35>;
++            height-mm = <28>;
++
++            panel-timing {
++                hactive = <160>;
++                vactive = <128>;
++                hback-porch = <0>;
++                vback-porch = <0>;
++                clock-frequency = <0>;
++                hfront-porch = <0>;
++                hsync-len = <0>;
++                vfront-porch = <0>;
++                vsync-len = <0>;
++            };
++        };
++    };
++
++...
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0812-drm-modes-Add-of_get_drm_panel_display_mode.patch b/root/target/linux/bcm27xx/patches-5.15/950-0812-drm-modes-Add-of_get_drm_panel_display_mode.patch
new file mode 100644
index 00000000..839a0e45
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0812-drm-modes-Add-of_get_drm_panel_display_mode.patch
@@ -0,0 +1,112 @@
+From d6878d5e12d3a070a5dcb03c627fb0394b7857bd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
+Date: Sun, 27 Feb 2022 13:47:11 +0100
+Subject: [PATCH 812/828] drm/modes: Add of_get_drm_panel_display_mode()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+commit 95ae342 upstream.
+
+Add a function to get a drm_display_mode from a panel-timing
+device tree subnode.
+
+Suggested-by: Sam Ravnborg <sam@ravnborg.org>
+Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
+Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Link: https://patchwork.freedesktop.org/patch/msgid/20220227124713.39766-4-noralf@tronnes.org
+---
+ drivers/gpu/drm/drm_modes.c | 49 +++++++++++++++++++++++++++++++++++++
+ include/drm/drm_modes.h     |  8 ++++++
+ 2 files changed, 57 insertions(+)
+
+--- a/drivers/gpu/drm/drm_modes.c
++++ b/drivers/gpu/drm/drm_modes.c
+@@ -35,6 +35,7 @@
+ #include <linux/list_sort.h>
+ #include <linux/export.h>
+ 
++#include <video/of_display_timing.h>
+ #include <video/of_videomode.h>
+ #include <video/videomode.h>
+ 
+@@ -727,6 +728,54 @@ int of_get_drm_display_mode(struct devic
+ 	return 0;
+ }
+ EXPORT_SYMBOL_GPL(of_get_drm_display_mode);
++
++/**
++ * of_get_drm_panel_display_mode - get a panel-timing drm_display_mode from devicetree
++ * @np: device_node with the panel-timing specification
++ * @dmode: will be set to the return value
++ * @bus_flags: information about pixelclk, sync and DE polarity
++ *
++ * The Device Tree properties width-mm and height-mm will be read and set on
++ * the display mode if they are present.
++ *
++ * Returns:
++ * Zero on success, negative error code on failure.
++ */
++int of_get_drm_panel_display_mode(struct device_node *np,
++				  struct drm_display_mode *dmode, u32 *bus_flags)
++{
++	u32 width_mm = 0, height_mm = 0;
++	struct display_timing timing;
++	struct videomode vm;
++	int ret;
++
++	ret = of_get_display_timing(np, "panel-timing", &timing);
++	if (ret)
++		return ret;
++
++	videomode_from_timing(&timing, &vm);
++
++	memset(dmode, 0, sizeof(*dmode));
++	drm_display_mode_from_videomode(&vm, dmode);
++	if (bus_flags)
++		drm_bus_flags_from_videomode(&vm, bus_flags);
++
++	ret = of_property_read_u32(np, "width-mm", &width_mm);
++	if (ret && ret != -EINVAL)
++		return ret;
++
++	ret = of_property_read_u32(np, "height-mm", &height_mm);
++	if (ret && ret != -EINVAL)
++		return ret;
++
++	dmode->width_mm = width_mm;
++	dmode->height_mm = height_mm;
++
++	drm_mode_debug_printmodeline(dmode);
++
++	return 0;
++}
++EXPORT_SYMBOL_GPL(of_get_drm_panel_display_mode);
+ #endif /* CONFIG_OF */
+ #endif /* CONFIG_VIDEOMODE_HELPERS */
+ 
+--- a/include/drm/drm_modes.h
++++ b/include/drm/drm_modes.h
+@@ -466,6 +466,8 @@ void drm_bus_flags_from_videomode(const
+ int of_get_drm_display_mode(struct device_node *np,
+ 			    struct drm_display_mode *dmode, u32 *bus_flags,
+ 			    int index);
++int of_get_drm_panel_display_mode(struct device_node *np,
++				  struct drm_display_mode *dmode, u32 *bus_flags);
+ #else
+ static inline int of_get_drm_display_mode(struct device_node *np,
+ 					  struct drm_display_mode *dmode,
+@@ -473,6 +475,12 @@ static inline int of_get_drm_display_mod
+ {
+ 	return -EINVAL;
+ }
++
++static inline int of_get_drm_panel_display_mode(struct device_node *np,
++						struct drm_display_mode *dmode, u32 *bus_flags)
++{
++	return -EINVAL;
++}
+ #endif
+ 
+ void drm_mode_set_name(struct drm_display_mode *mode);
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0813-drm-mipi-dbi-Add-driver_private-member-to-struct-mip.patch b/root/target/linux/bcm27xx/patches-5.15/950-0813-drm-mipi-dbi-Add-driver_private-member-to-struct-mip.patch
new file mode 100644
index 00000000..871e828a
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0813-drm-mipi-dbi-Add-driver_private-member-to-struct-mip.patch
@@ -0,0 +1,45 @@
+From a552ce80d00565414abfedea04ab7c79d3e2cf53 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
+Date: Sun, 27 Feb 2022 13:47:12 +0100
+Subject: [PATCH 813/828] drm/mipi-dbi: Add driver_private member to struct
+ mipi_dbi_dev
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+commit 1e7e8e1 upstream.
+
+devm_drm_dev_alloc() can't allocate structures that embed a structure
+which then again embeds drm_device. Workaround this by adding a
+driver_private pointer to struct mipi_dbi_dev which the driver can use for
+its additional state.
+
+v3:
+- Add documentation
+
+Acked-by: Maxime Ripard <maxime@cerno.tech>
+Acked-by: Sam Ravnborg <sam@ravnborg.org>
+Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Link: https://patchwork.freedesktop.org/patch/msgid/20220227124713.39766-5-noralf@tronnes.org
+---
+ include/drm/drm_mipi_dbi.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/include/drm/drm_mipi_dbi.h
++++ b/include/drm/drm_mipi_dbi.h
+@@ -130,6 +130,14 @@ struct mipi_dbi_dev {
+ 	 * @dbi: MIPI DBI interface
+ 	 */
+ 	struct mipi_dbi dbi;
++
++	/**
++	 * @driver_private: Driver private data.
++	 *                  Necessary for drivers with private data since devm_drm_dev_alloc()
++	 *                  can't allocate structures that embed a structure which then again
++	 *                  embeds drm_device.
++	 */
++	void *driver_private;
+ };
+ 
+ static inline struct mipi_dbi_dev *drm_to_mipi_dbi_dev(struct drm_device *drm)
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0814-drm-tiny-Add-MIPI-DBI-compatible-SPI-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0814-drm-tiny-Add-MIPI-DBI-compatible-SPI-driver.patch
new file mode 100644
index 00000000..64f7a237
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0814-drm-tiny-Add-MIPI-DBI-compatible-SPI-driver.patch
@@ -0,0 +1,515 @@
+From 923c9d6265d3fe402ac64c0b15e82372c183b29e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
+Date: Sun, 27 Feb 2022 13:47:13 +0100
+Subject: [PATCH 814/828] drm/tiny: Add MIPI DBI compatible SPI driver
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+commit 0e65e2e upstream.
+
+Add a driver that will work with most MIPI DBI compatible SPI panels.
+This avoids adding a driver for every new MIPI DBI compatible controller
+that is to be used by Linux. The 'compatible' Device Tree property with
+a '.bin' suffix will be used to load a firmware file that contains the
+controller configuration.
+
+Example (driver will load sainsmart18.bin):
+
+display@0 {
+	compatible = "sainsmart18", "panel-mipi-dbi-spi";
+...
+};
+
+v5:
+- kconfig: s/DRM_KMS_CMA_HELPER/DRM_GEM_CMA_HELPER/ (Sam)
+- kconfig: Add select VIDEOMODE_HELPERS (Sam)
+- kconfig: Add wiki url in the description (Sam)
+- Split out and use of_get_drm_panel_display_mode()(Sam)
+- Only use the first compatible to look for a firmware file since the
+  binding mandates 2 compatibles.
+- Make having a firmware file mandatory so we can print an error
+  message if it's missing to improve the user experience. It's very
+  unlikely that a controller doesn't need to be initialized and if
+  it doesn't, it's possible to have a firmware file containing only
+  a DCS NOP.
+
+v4:
+- Move driver to drm/tiny where the other drivers of its kind are located.
+  The driver module will not be shared with a future DPI driver after all.
+
+v3:
+- Move properties to DT (Maxime)
+- The MIPI DPI spec has optional support for DPI where the controller is
+  configured over DBI. Rework the command functions so they can be moved
+  to drm_mipi_dbi and shared with a future panel-mipi-dpi-spi driver
+
+v2:
+- Drop model property and use compatible instead (Rob)
+- Add wiki entry in MAINTAINERS
+
+Acked-by: Maxime Ripard <maxime@cerno.tech>
+Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
+Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+Link: https://patchwork.freedesktop.org/patch/msgid/20220227124713.39766-6-noralf@tronnes.org
+---
+ MAINTAINERS                           |   8 +
+ drivers/gpu/drm/tiny/Kconfig          |  15 +
+ drivers/gpu/drm/tiny/Makefile         |   1 +
+ drivers/gpu/drm/tiny/panel-mipi-dbi.c | 398 ++++++++++++++++++++++++++
+ 4 files changed, 422 insertions(+)
+ create mode 100644 drivers/gpu/drm/tiny/panel-mipi-dbi.c
+
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -5976,6 +5976,14 @@ T:	git git://anongit.freedesktop.org/drm
+ F:	Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt
+ F:	drivers/gpu/drm/tiny/mi0283qt.c
+ 
++DRM DRIVER FOR MIPI DBI compatible panels
++M:	Noralf Trønnes <noralf@tronnes.org>
++S:	Maintained
++W:	https://github.com/notro/panel-mipi-dbi/wiki
++T:	git git://anongit.freedesktop.org/drm/drm-misc
++F:	Documentation/devicetree/bindings/display/panel/panel-mipi-dbi-spi.yaml
++F:	drivers/gpu/drm/tiny/panel-mipi-dbi.c
++
+ DRM DRIVER FOR MSM ADRENO GPU
+ M:	Rob Clark <robdclark@gmail.com>
+ M:	Sean Paul <sean@poorly.run>
+--- a/drivers/gpu/drm/tiny/Kconfig
++++ b/drivers/gpu/drm/tiny/Kconfig
+@@ -51,6 +51,21 @@ config DRM_GM12U320
+ 	 This is a KMS driver for projectors which use the GM12U320 chipset
+ 	 for video transfer over USB2/3, such as the Acer C120 mini projector.
+ 
++config DRM_PANEL_MIPI_DBI
++	tristate "DRM support for MIPI DBI compatible panels"
++	depends on DRM && SPI
++	select DRM_KMS_HELPER
++	select DRM_GEM_CMA_HELPER
++	select DRM_MIPI_DBI
++	select BACKLIGHT_CLASS_DEVICE
++	select VIDEOMODE_HELPERS
++	help
++	  Say Y here if you want to enable support for MIPI DBI compatible
++	  panels. The controller command setup can be provided using a
++	  firmware file. For more information see
++	  https://github.com/notro/panel-mipi-dbi/wiki.
++	  To compile this driver as a module, choose M here.
++
+ config DRM_SIMPLEDRM
+ 	tristate "Simple framebuffer driver"
+ 	depends on DRM
+--- a/drivers/gpu/drm/tiny/Makefile
++++ b/drivers/gpu/drm/tiny/Makefile
+@@ -4,6 +4,7 @@ obj-$(CONFIG_DRM_ARCPGU)		+= arcpgu.o
+ obj-$(CONFIG_DRM_BOCHS)			+= bochs.o
+ obj-$(CONFIG_DRM_CIRRUS_QEMU)		+= cirrus.o
+ obj-$(CONFIG_DRM_GM12U320)		+= gm12u320.o
++obj-$(CONFIG_DRM_PANEL_MIPI_DBI)	+= panel-mipi-dbi.o
+ obj-$(CONFIG_DRM_SIMPLEDRM)		+= simpledrm.o
+ obj-$(CONFIG_TINYDRM_HX8357D)		+= hx8357d.o
+ obj-$(CONFIG_TINYDRM_ILI9225)		+= ili9225.o
+--- /dev/null
++++ b/drivers/gpu/drm/tiny/panel-mipi-dbi.c
+@@ -0,0 +1,398 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * DRM driver for MIPI DBI compatible display panels
++ *
++ * Copyright 2022 Noralf Trønnes
++ */
++
++#include <linux/backlight.h>
++#include <linux/delay.h>
++#include <linux/firmware.h>
++#include <linux/gpio/consumer.h>
++#include <linux/module.h>
++#include <linux/property.h>
++#include <linux/regulator/consumer.h>
++#include <linux/spi/spi.h>
++
++#include <drm/drm_atomic_helper.h>
++#include <drm/drm_drv.h>
++#include <drm/drm_fb_helper.h>
++#include <drm/drm_gem_atomic_helper.h>
++#include <drm/drm_gem_cma_helper.h>
++#include <drm/drm_managed.h>
++#include <drm/drm_mipi_dbi.h>
++#include <drm/drm_modes.h>
++#include <drm/drm_modeset_helper.h>
++
++#include <video/mipi_display.h>
++
++static const u8 panel_mipi_dbi_magic[15] = { 'M', 'I', 'P', 'I', ' ', 'D', 'B', 'I',
++					     0, 0, 0, 0, 0, 0, 0 };
++
++/*
++ * The display controller configuration is stored in a firmware file.
++ * The Device Tree 'compatible' property value with a '.bin' suffix is passed
++ * to request_firmware() to fetch this file.
++ */
++struct panel_mipi_dbi_config {
++	/* Magic string: panel_mipi_dbi_magic */
++	u8 magic[15];
++
++	/* Config file format version */
++	u8 file_format_version;
++
++	/*
++	 * MIPI commands to execute when the display pipeline is enabled.
++	 * This is used to configure the display controller.
++	 *
++	 * The commands are stored in a byte array with the format:
++	 *     command, num_parameters, [ parameter, ...], command, ...
++	 *
++	 * Some commands require a pause before the next command can be received.
++	 * Inserting a delay in the command sequence is done by using the NOP command with one
++	 * parameter: delay in miliseconds (the No Operation command is part of the MIPI Display
++	 * Command Set where it has no parameters).
++	 *
++	 * Example:
++	 *     command 0x11
++	 *     sleep 120ms
++	 *     command 0xb1 parameters 0x01, 0x2c, 0x2d
++	 *     command 0x29
++	 *
++	 * Byte sequence:
++	 *     0x11 0x00
++	 *     0x00 0x01 0x78
++	 *     0xb1 0x03 0x01 0x2c 0x2d
++	 *     0x29 0x00
++	 */
++	u8 commands[];
++};
++
++struct panel_mipi_dbi_commands {
++	const u8 *buf;
++	size_t len;
++};
++
++static struct panel_mipi_dbi_commands *
++panel_mipi_dbi_check_commands(struct device *dev, const struct firmware *fw)
++{
++	const struct panel_mipi_dbi_config *config = (struct panel_mipi_dbi_config *)fw->data;
++	struct panel_mipi_dbi_commands *commands;
++	size_t size = fw->size, commands_len;
++	unsigned int i = 0;
++
++	if (size < sizeof(*config) + 2) { /* At least 1 command */
++		dev_err(dev, "config: file size=%zu is too small\n", size);
++		return ERR_PTR(-EINVAL);
++	}
++
++	if (memcmp(config->magic, panel_mipi_dbi_magic, sizeof(config->magic))) {
++		dev_err(dev, "config: Bad magic: %15ph\n", config->magic);
++		return ERR_PTR(-EINVAL);
++	}
++
++	if (config->file_format_version != 1) {
++		dev_err(dev, "config: version=%u is not supported\n", config->file_format_version);
++		return ERR_PTR(-EINVAL);
++	}
++
++	drm_dev_dbg(dev, DRM_UT_DRIVER, "size=%zu version=%u\n", size, config->file_format_version);
++
++	commands_len = size - sizeof(*config);
++
++	while ((i + 1) < commands_len) {
++		u8 command = config->commands[i++];
++		u8 num_parameters = config->commands[i++];
++		const u8 *parameters = &config->commands[i];
++
++		i += num_parameters;
++		if (i > commands_len) {
++			dev_err(dev, "config: command=0x%02x num_parameters=%u overflows\n",
++				command, num_parameters);
++			return ERR_PTR(-EINVAL);
++		}
++
++		if (command == 0x00 && num_parameters == 1)
++			drm_dev_dbg(dev, DRM_UT_DRIVER, "sleep %ums\n", parameters[0]);
++		else
++			drm_dev_dbg(dev, DRM_UT_DRIVER, "command %02x %*ph\n",
++				    command, num_parameters, parameters);
++	}
++
++	if (i != commands_len) {
++		dev_err(dev, "config: malformed command array\n");
++		return ERR_PTR(-EINVAL);
++	}
++
++	commands = devm_kzalloc(dev, sizeof(*commands), GFP_KERNEL);
++	if (!commands)
++		return ERR_PTR(-ENOMEM);
++
++	commands->len = commands_len;
++	commands->buf = devm_kmemdup(dev, config->commands, commands->len, GFP_KERNEL);
++	if (!commands->buf)
++		return ERR_PTR(-ENOMEM);
++
++	return commands;
++}
++
++static struct panel_mipi_dbi_commands *panel_mipi_dbi_commands_from_fw(struct device *dev)
++{
++	struct panel_mipi_dbi_commands *commands;
++	const struct firmware *fw;
++	const char *compatible;
++	char fw_name[40];
++	int ret;
++
++	ret = of_property_read_string_index(dev->of_node, "compatible", 0, &compatible);
++	if (ret)
++		return ERR_PTR(ret);
++
++	snprintf(fw_name, sizeof(fw_name), "%s.bin", compatible);
++	ret = request_firmware(&fw, fw_name, dev);
++	if (ret) {
++		dev_err(dev, "No config file found for compatible '%s' (error=%d)\n",
++			compatible, ret);
++
++		return ERR_PTR(ret);
++	}
++
++	commands = panel_mipi_dbi_check_commands(dev, fw);
++	release_firmware(fw);
++
++	return commands;
++}
++
++static void panel_mipi_dbi_commands_execute(struct mipi_dbi *dbi,
++					    struct panel_mipi_dbi_commands *commands)
++{
++	unsigned int i = 0;
++
++	if (!commands)
++		return;
++
++	while (i < commands->len) {
++		u8 command = commands->buf[i++];
++		u8 num_parameters = commands->buf[i++];
++		const u8 *parameters = &commands->buf[i];
++
++		if (command == 0x00 && num_parameters == 1)
++			msleep(parameters[0]);
++		else if (num_parameters)
++			mipi_dbi_command_stackbuf(dbi, command, parameters, num_parameters);
++		else
++			mipi_dbi_command(dbi, command);
++
++		i += num_parameters;
++	}
++}
++
++static void panel_mipi_dbi_enable(struct drm_simple_display_pipe *pipe,
++				  struct drm_crtc_state *crtc_state,
++				  struct drm_plane_state *plane_state)
++{
++	struct mipi_dbi_dev *dbidev = drm_to_mipi_dbi_dev(pipe->crtc.dev);
++	struct mipi_dbi *dbi = &dbidev->dbi;
++	int ret, idx;
++
++	if (!drm_dev_enter(pipe->crtc.dev, &idx))
++		return;
++
++	drm_dbg(pipe->crtc.dev, "\n");
++
++	ret = mipi_dbi_poweron_conditional_reset(dbidev);
++	if (ret < 0)
++		goto out_exit;
++	if (!ret)
++		panel_mipi_dbi_commands_execute(dbi, dbidev->driver_private);
++
++	mipi_dbi_enable_flush(dbidev, crtc_state, plane_state);
++out_exit:
++	drm_dev_exit(idx);
++}
++
++static const struct drm_simple_display_pipe_funcs panel_mipi_dbi_pipe_funcs = {
++	.enable = panel_mipi_dbi_enable,
++	.disable = mipi_dbi_pipe_disable,
++	.update = mipi_dbi_pipe_update,
++};
++
++DEFINE_DRM_GEM_CMA_FOPS(panel_mipi_dbi_fops);
++
++static const struct drm_driver panel_mipi_dbi_driver = {
++	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
++	.fops			= &panel_mipi_dbi_fops,
++	DRM_GEM_CMA_DRIVER_OPS_VMAP,
++	.debugfs_init		= mipi_dbi_debugfs_init,
++	.name			= "panel-mipi-dbi",
++	.desc			= "MIPI DBI compatible display panel",
++	.date			= "20220103",
++	.major			= 1,
++	.minor			= 0,
++};
++
++static int panel_mipi_dbi_get_mode(struct mipi_dbi_dev *dbidev, struct drm_display_mode *mode)
++{
++	struct device *dev = dbidev->drm.dev;
++	u16 hback_porch, vback_porch;
++	int ret;
++
++	ret = of_get_drm_panel_display_mode(dev->of_node, mode, NULL);
++	if (ret) {
++		dev_err(dev, "%pOF: failed to get panel-timing (error=%d)\n", dev->of_node, ret);
++		return ret;
++	}
++
++	mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
++
++	hback_porch = mode->htotal - mode->hsync_end;
++	vback_porch = mode->vtotal - mode->vsync_end;
++
++	/*
++	 * Make sure width and height are set and that only back porch and
++	 * pixelclock are set in the other timing values. Also check that
++	 * width and height don't exceed the 16-bit value specified by MIPI DCS.
++	 */
++	if (!mode->hdisplay || !mode->vdisplay || mode->flags ||
++	    mode->hsync_end > mode->hdisplay || (hback_porch + mode->hdisplay) > 0xffff ||
++	    mode->vsync_end > mode->vdisplay || (vback_porch + mode->vdisplay) > 0xffff) {
++		dev_err(dev, "%pOF: panel-timing out of bounds\n", dev->of_node);
++		return -EINVAL;
++	}
++
++	/* The driver doesn't use the pixel clock but it is mandatory so fake one if not set */
++	if (!mode->clock)
++		mode->clock = mode->htotal * mode->vtotal * 60 / 1000;
++
++	dbidev->top_offset = vback_porch;
++	dbidev->left_offset = hback_porch;
++
++	return 0;
++}
++
++static int panel_mipi_dbi_spi_probe(struct spi_device *spi)
++{
++	struct device *dev = &spi->dev;
++	struct drm_display_mode mode;
++	struct mipi_dbi_dev *dbidev;
++	struct drm_device *drm;
++	struct mipi_dbi *dbi;
++	struct gpio_desc *dc;
++	int ret;
++
++	dbidev = devm_drm_dev_alloc(dev, &panel_mipi_dbi_driver, struct mipi_dbi_dev, drm);
++	if (IS_ERR(dbidev))
++		return PTR_ERR(dbidev);
++
++	dbi = &dbidev->dbi;
++	drm = &dbidev->drm;
++
++	ret = panel_mipi_dbi_get_mode(dbidev, &mode);
++	if (ret)
++		return ret;
++
++	dbidev->regulator = devm_regulator_get(dev, "power");
++	if (IS_ERR(dbidev->regulator))
++		return dev_err_probe(dev, PTR_ERR(dbidev->regulator),
++				     "Failed to get regulator 'power'\n");
++
++	dbidev->backlight = devm_of_find_backlight(dev);
++	if (IS_ERR(dbidev->backlight))
++		return dev_err_probe(dev, PTR_ERR(dbidev->backlight), "Failed to get backlight\n");
++
++	dbi->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
++	if (IS_ERR(dbi->reset))
++		return dev_err_probe(dev, PTR_ERR(dbi->reset), "Failed to get GPIO 'reset'\n");
++
++	dc = devm_gpiod_get_optional(dev, "dc", GPIOD_OUT_LOW);
++	if (IS_ERR(dc))
++		return dev_err_probe(dev, PTR_ERR(dc), "Failed to get GPIO 'dc'\n");
++
++	ret = mipi_dbi_spi_init(spi, dbi, dc);
++	if (ret)
++		return ret;
++
++	if (device_property_present(dev, "write-only"))
++		dbi->read_commands = NULL;
++
++	dbidev->driver_private = panel_mipi_dbi_commands_from_fw(dev);
++	if (IS_ERR(dbidev->driver_private))
++		return PTR_ERR(dbidev->driver_private);
++
++	ret = mipi_dbi_dev_init(dbidev, &panel_mipi_dbi_pipe_funcs, &mode, 0);
++	if (ret)
++		return ret;
++
++	drm_mode_config_reset(drm);
++
++	ret = drm_dev_register(drm, 0);
++	if (ret)
++		return ret;
++
++	spi_set_drvdata(spi, drm);
++
++	drm_fbdev_generic_setup(drm, 0);
++
++	return 0;
++}
++
++static int panel_mipi_dbi_spi_remove(struct spi_device *spi)
++{
++	struct drm_device *drm = spi_get_drvdata(spi);
++
++	drm_dev_unplug(drm);
++	drm_atomic_helper_shutdown(drm);
++
++	return 0;
++}
++
++static void panel_mipi_dbi_spi_shutdown(struct spi_device *spi)
++{
++	drm_atomic_helper_shutdown(spi_get_drvdata(spi));
++}
++
++static int __maybe_unused panel_mipi_dbi_pm_suspend(struct device *dev)
++{
++	return drm_mode_config_helper_suspend(dev_get_drvdata(dev));
++}
++
++static int __maybe_unused panel_mipi_dbi_pm_resume(struct device *dev)
++{
++	drm_mode_config_helper_resume(dev_get_drvdata(dev));
++
++	return 0;
++}
++
++static const struct dev_pm_ops panel_mipi_dbi_pm_ops = {
++	SET_SYSTEM_SLEEP_PM_OPS(panel_mipi_dbi_pm_suspend, panel_mipi_dbi_pm_resume)
++};
++
++static const struct of_device_id panel_mipi_dbi_spi_of_match[] = {
++	{ .compatible = "panel-mipi-dbi-spi" },
++	{},
++};
++MODULE_DEVICE_TABLE(of, panel_mipi_dbi_spi_of_match);
++
++static const struct spi_device_id panel_mipi_dbi_spi_id[] = {
++	{ "panel-mipi-dbi-spi", 0 },
++	{ },
++};
++MODULE_DEVICE_TABLE(spi, panel_mipi_dbi_spi_id);
++
++static struct spi_driver panel_mipi_dbi_spi_driver = {
++	.driver = {
++		.name = "panel-mipi-dbi-spi",
++		.owner = THIS_MODULE,
++		.of_match_table = panel_mipi_dbi_spi_of_match,
++		.pm = &panel_mipi_dbi_pm_ops,
++	},
++	.id_table = panel_mipi_dbi_spi_id,
++	.probe = panel_mipi_dbi_spi_probe,
++	.remove = panel_mipi_dbi_spi_remove,
++	.shutdown = panel_mipi_dbi_spi_shutdown,
++};
++module_spi_driver(panel_mipi_dbi_spi_driver);
++
++MODULE_DESCRIPTION("MIPI DBI compatible display panel driver");
++MODULE_AUTHOR("Noralf Trønnes");
++MODULE_LICENSE("GPL");
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0815-overlays-Add-overlay-for-MIPI-DBI-displays.patch b/root/target/linux/bcm27xx/patches-5.15/950-0815-overlays-Add-overlay-for-MIPI-DBI-displays.patch
new file mode 100644
index 00000000..13b7145e
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0815-overlays-Add-overlay-for-MIPI-DBI-displays.patch
@@ -0,0 +1,280 @@
+From 089299c266b8f6e3aca4533768657713502e58ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
+Date: Mon, 7 Mar 2022 17:05:49 +0100
+Subject: [PATCH 815/828] overlays: Add overlay for MIPI DBI displays
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add an overlay that can be used with all displays that have a
+MIPI DBI compatible controller (pixels over SPI).
+
+Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
+---
+ arch/arm/boot/dts/overlays/Makefile           |   1 +
+ arch/arm/boot/dts/overlays/README             |  67 +++++++
+ .../dts/overlays/mipi-dbi-spi-overlay.dts     | 172 ++++++++++++++++++
+ 3 files changed, 240 insertions(+)
+ create mode 100644 arch/arm/boot/dts/overlays/mipi-dbi-spi-overlay.dts
+
+--- a/arch/arm/boot/dts/overlays/Makefile
++++ b/arch/arm/boot/dts/overlays/Makefile
+@@ -135,6 +135,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
+ 	midi-uart5.dtbo \
+ 	minipitft13.dtbo \
+ 	miniuart-bt.dtbo \
++	mipi-dbi-spi.dtbo \
+ 	mlx90640.dtbo \
+ 	mmc.dtbo \
+ 	mpu6050.dtbo \
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -2386,6 +2386,73 @@ Params: krnbt                   Set to "
+                                 driver without need of hciattach/btattach
+ 
+ 
++Name:   mipi-dbi-spi
++Info:   Overlay for SPI-connected MIPI DBI displays using the panel-mipi-dbi
++        driver. The driver will load a file /lib/firmware/panel.bin containing
++        the initialisation commands.
++
++        Example:
++          dtoverlay=mipi-dbi-spi,spi0-0,speed=70000000
++          dtparam=width=320,height=240
++          dtparam=reset-gpio=23,dc-gpio=24
++          dtparam=backlight-gpio=18
++
++        Compared to fbtft panel-mipi-dbi runs pixel data at spi-max-frequency
++        and init commands at 10MHz. This makes it possible to push the envelope
++        without messing up the controller configuration due to command
++        transmission errors.
++
++        For devices on spi1 or spi2, the interfaces should be enabled
++        with one of the spi1-1/2/3cs and/or spi2-1/2/3cs overlays.
++
++        See https://github.com/notro/panel-mipi-dbi/wiki for more info.
++
++Load:   dtoverlay=mipi-dbi-spi,<param>=<val>
++Params:
++        compatible              Set the compatible string to load a different
++                                firmware file. Both the panel compatible value
++                                used to load the firmware file and the value
++                                used to load the driver has to be set having a
++                                NUL (\0) separator between them.
++                                Example:
++                                dtparam=compatible=mypanel\0panel-mipi-dbi-spi
++        spi<n>-<m>              Configure device at spi<n>, cs<m>
++                                (boolean, required)
++        speed                   SPI bus speed in Hz (default 32000000)
++        cpha                    Shifted SPI clock phase (CPHA) mode
++        cpol                    Inverse SPI clock polarity (CPOL) mode
++        write-only              Controller is not readable
++                                (ie. MISO is not wired up).
++
++        width                   Panel width in pixels (required)
++        height                  Panel height in pixels (required)
++        width-mm                Panel width in mm
++        height-mm               Panel height in mm
++        x-offset                Panel x-offset in controller RAM
++        y-offset                Panel y-offset in controller RAM
++
++        clock-frequency         Panel clock frequency in Hz
++                                (optional, just informational).
++
++        reset-gpio              GPIO pin to be used for RESET
++        dc-gpio                 GPIO pin to be used for D/C
++
++        backlight-gpio          GPIO pin to be used for backlight control
++                                (default of none).
++        backlight-pwm           PWM channel to be used for backlight control
++                                (default of none). NB Disables audio headphone
++                                output as that also uses PWM.
++        backlight-pwm-chan      Choose channel on &pwm node for backlight
++                                control (default 0).
++        backlight-pwm-gpio      GPIO pin to be used for the PWM backlight. See
++                                pwm-2chan for valid options (default 18).
++        backlight-pwm-func      Pin function of GPIO used for the PWM backlight.
++                                See pwm-2chan for valid options (default 2).
++        backlight-def-brightness
++                                Set the default brightness. Normal range 1-16.
++                                (default 16).
++
++
+ Name:   mlx90640
+ Info:   Overlay for i2c connected mlx90640 thermal camera
+ Load:   dtoverlay=mlx90640
+--- /dev/null
++++ b/arch/arm/boot/dts/overlays/mipi-dbi-spi-overlay.dts
+@@ -0,0 +1,172 @@
++/*
++ * mipi-dbi-spi-overlay.dts
++ */
++
++#include <dt-bindings/gpio/gpio.h>
++
++/dts-v1/;
++/plugin/;
++
++/ {
++	compatible = "brcm,bcm2835";
++
++	spidev_fragment: fragment@0 {
++		target-path = "spi0/spidev@0";
++		__overlay__ {
++			status = "disabled";
++		};
++	};
++
++	panel_fragment: fragment@1 {
++		target = <&spi0>;
++		__overlay__ {
++			/* needed to avoid dtc warning */
++			#address-cells = <1>;
++			#size-cells = <0>;
++
++			status = "okay";
++
++			panel: panel@0 {
++				compatible = "panel", "panel-mipi-dbi-spi";
++				reg = <0>;
++				spi-max-frequency = <32000000>;
++
++				timing: panel-timing {
++					hactive = <320>;
++					vactive = <240>;
++					hback-porch = <0>;
++					vback-porch = <0>;
++
++					clock-frequency = <0>;
++					hfront-porch = <0>;
++					hsync-len = <0>;
++					vfront-porch = <0>;
++					vsync-len = <0>;
++				};
++			};
++		};
++	};
++
++	fragment@10 {
++		target = <&panel>;
++		__dormant__  {
++			backlight = <&backlight_gpio>;
++		};
++	};
++
++	fragment@11 {
++		target-path = "/";
++		__dormant__  {
++			backlight_gpio: backlight_gpio {
++				compatible = "gpio-backlight";
++				gpios = <&gpio 255 GPIO_ACTIVE_HIGH>;
++			};
++		};
++	};
++
++	fragment@20 {
++		target = <&panel>;
++		__dormant__  {
++			backlight = <&backlight_pwm>;
++		};
++	};
++
++	fragment@21 {
++		target-path = "/";
++		__dormant__  {
++			backlight_pwm: backlight_pwm {
++				compatible = "pwm-backlight";
++				brightness-levels = <0 6 8 12 16 24 32 40 48 64 96 128 160 192 224 255>;
++				default-brightness-level = <16>;
++				pwms = <&pwm 0 200000>;
++			};
++		};
++	};
++
++	fragment@22 {
++		target = <&pwm>;
++		__dormant__ {
++			pinctrl-names = "default";
++			pinctrl-0 = <&pwm_pins>;
++			assigned-clock-rates = <1000000>;
++			status = "okay";
++		};
++	};
++
++	fragment@23 {
++		target = <&gpio>;
++		__dormant__ {
++			pwm_pins: pwm_pins {
++				brcm,pins = <18>;
++				brcm,function = <2>; /* Alt5 */
++			};
++		};
++	};
++
++	fragment@24 {
++		target = <&audio>;
++		__dormant__  {
++		    brcm,disable-headphones;
++		};
++	};
++
++	__overrides__ {
++		compatible    = <&panel>, "compatible";
++
++		spi0-0        = <&panel_fragment>, "target:0=",<&spi0>,
++				<&spidev_fragment>, "target-path=spi0/spidev@0",
++				<&panel>, "reg:0=0";
++		spi0-1        = <&panel_fragment>, "target:0=",<&spi0>,
++				<&spidev_fragment>, "target-path=spi0/spidev@1",
++				<&panel>, "reg:0=1";
++		spi1-0        = <&panel_fragment>, "target:0=",<&spi1>,
++				<&spidev_fragment>, "target-path=spi1/spidev@0",
++				<&panel>, "reg:0=0";
++		spi1-1        = <&panel_fragment>, "target:0=",<&spi1>,
++				<&spidev_fragment>, "target-path=spi1/spidev@1",
++				<&panel>, "reg:0=1";
++		spi1-2        = <&panel_fragment>, "target:0=",<&spi1>,
++				<&spidev_fragment>, "target-path=spi1/spidev@2",
++				<&panel>, "reg:0=2";
++		spi2-0        = <&panel_fragment>, "target:0=",<&spi2>,
++				<&spidev_fragment>, "target-path=spi2/spidev@0",
++				<&panel>, "reg:0=0";
++		spi2-1        = <&panel_fragment>, "target:0=",<&spi2>,
++				<&spidev_fragment>, "target-path=spi2/spidev@1",
++				<&panel>, "reg:0=1";
++		spi2-2        = <&panel_fragment>, "target:0=",<&spi2>,
++				<&spidev_fragment>, "target-path=spi2/spidev@2",
++				<&panel>, "reg:0=2";
++
++		speed         = <&panel>, "spi-max-frequency:0";
++		cpha          = <&panel>, "spi-cpha?";
++		cpol          = <&panel>, "spi-cpol?";
++
++		write-only    = <&panel>, "write-only?";
++
++		width         = <&timing>, "hactive:0";
++		height        = <&timing>, "vactive:0";
++		x-offset      = <&timing>, "hback-porch:0";
++		y-offset      = <&timing>, "vback-porch:0";
++		clock-frequency = <&timing>, "clock-frequency:0";
++
++		width-mm      = <&panel>, "width-mm:0";
++		height-mm     = <&panel>, "height-mm:0";
++
++		/* optional gpios */
++		reset-gpio    = <&panel>, "reset-gpios:0=", <&gpio>,
++				<&panel>, "reset-gpios:4",
++				<&panel>, "reset-gpios:8=0"; /* GPIO_ACTIVE_HIGH */
++		dc-gpio       = <&panel>, "dc-gpios:0=", <&gpio>,
++				<&panel>, "dc-gpios:4",
++				<&panel>, "dc-gpios:8=0"; /* GPIO_ACTIVE_HIGH */
++
++		backlight-gpio        = <0>, "+10+11",
++					<&backlight_gpio>, "gpios:4";
++		backlight-pwm         = <0>, "+20+21+22+23+24";
++		backlight-pwm-chan    = <&backlight_pwm>, "pwms:4";
++		backlight-pwm-gpio    = <&pwm_pins>, "brcm,pins:0";
++		backlight-pwm-func    = <&pwm_pins>, "brcm,function:0";
++		backlight-def-brightness = <&backlight_pwm>, "default-brightness-level:0";
++	};
++};
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0816-audioinjector.net-stereo-and-zero-use-dev_err_probe-.patch b/root/target/linux/bcm27xx/patches-5.15/950-0816-audioinjector.net-stereo-and-zero-use-dev_err_probe-.patch
new file mode 100644
index 00000000..166f5a5c
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0816-audioinjector.net-stereo-and-zero-use-dev_err_probe-.patch
@@ -0,0 +1,29 @@
+From c45232e3d8f21a52fff7ed16da572173d8b295fa Mon Sep 17 00:00:00 2001
+From: Matt Flax <flatmax@flatmax.org>
+Date: Sun, 27 Mar 2022 22:42:47 +1100
+Subject: [PATCH 816/828] audioinjector.net: stereo and zero, use
+ dev_err_probe, report success
+
+Use dev_err_probe to follow best practice, and leave a message in
+the kernel log indicate the driver was started successfully.
+---
+ sound/soc/bcm/audioinjector-pi-soundcard.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+--- a/sound/soc/bcm/audioinjector-pi-soundcard.c
++++ b/sound/soc/bcm/audioinjector-pi-soundcard.c
+@@ -158,9 +158,11 @@ static int audioinjector_pi_soundcard_pr
+ 			}
+ 	}
+ 
+-	if ((ret = devm_snd_soc_register_card(&pdev->dev, card))) {
+-		dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
+-	}
++	if ((ret = devm_snd_soc_register_card(&pdev->dev, card)))
++		return dev_err_probe(&pdev->dev, ret, "%s\n", __func__);
++
++	dev_info(&pdev->dev, "successfully loaded\n");
++
+ 	return ret;
+ }
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0817-Revert-update-rpi-display-overlay.dts-pins-for-5.10.patch b/root/target/linux/bcm27xx/patches-5.15/950-0817-Revert-update-rpi-display-overlay.dts-pins-for-5.10.patch
new file mode 100644
index 00000000..d32c3e76
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0817-Revert-update-rpi-display-overlay.dts-pins-for-5.10.patch
@@ -0,0 +1,32 @@
+From f1443614684f4d4537f981f1a89ea15f9638689b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
+Date: Sat, 26 Mar 2022 18:59:27 +0100
+Subject: [PATCH 817/828] Revert "update rpi-display-overlay.dts pins for
+ 5.10+"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit 97d1b136be6dbc81316259690fd15b4110a3606f.
+
+The fbtft backlight problem was fixed in 5.15.6 so this workaround has to
+be reverted to make backlight work again.
+
+Ref: https://github.com/notro/fbtft/issues/571
+
+Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
+---
+ arch/arm/boot/dts/overlays/rpi-display-overlay.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/overlays/rpi-display-overlay.dts
++++ b/arch/arm/boot/dts/overlays/rpi-display-overlay.dts
+@@ -61,7 +61,7 @@
+ 				buswidth = <8>;
+ 				reset-gpios = <&gpio 23 1>;
+ 				dc-gpios = <&gpio 24 0>;
+-				led-gpios = <&gpio 18 1>;
++				led-gpios = <&gpio 18 0>;
+ 				debug = <0>;
+ 			};
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0818-overlays-rpi-display-Add-support-for-DRM-driver.patch b/root/target/linux/bcm27xx/patches-5.15/950-0818-overlays-rpi-display-Add-support-for-DRM-driver.patch
new file mode 100644
index 00000000..44830d2d
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0818-overlays-rpi-display-Add-support-for-DRM-driver.patch
@@ -0,0 +1,136 @@
+From 6fd2192ba2db7a165d898e860e63bdcb7e51927e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
+Date: Sun, 27 Mar 2022 18:54:17 +0200
+Subject: [PATCH 818/828] overlays/rpi-display: Add support for DRM driver
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add a "drm" parameter that enables use of the drm/mi0283qt driver instead
+of fbtft/fb_ili9341. Also add a "backlight-pwm" parameter that can be used
+with the "drm" parameter.
+
+Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
+---
+ arch/arm/boot/dts/overlays/README             | 26 +++++++-
+ .../boot/dts/overlays/rpi-display-overlay.dts | 61 ++++++++++++++++++-
+ 2 files changed, 84 insertions(+), 3 deletions(-)
+
+--- a/arch/arm/boot/dts/overlays/README
++++ b/arch/arm/boot/dts/overlays/README
+@@ -2913,14 +2913,36 @@ Params: <None>
+ 
+ Name:   rpi-display
+ Info:   RPi-Display - 2.8" Touch Display by Watterott
++        Linux has 2 drivers that support this display and this overlay supports
++        both.
++
++        Examples:
++          fbtft/fb_ili9341: dtoverlay=rpi-display
++          drm/mi0283qt: dtoverlay=rpi-display,drm,backlight-pwm,rotate=180
++
++        Some notable differences with the DRM driver compared to fbtft:
++        - The display is turned on when it's first used and not on driver load
++          as with fbtft. So if nothing uses the display it stays off.
++        - Can run with a higher SPI clock increasing framerate. This is possible
++          since the driver avoids messing up the controller configuration due to
++          transmission errors by running config commands at 10MHz and only pixel
++          data at full speed (occasional pixel glitch might occur).
++        - PWM backlight is supported.
++
+ Load:   dtoverlay=rpi-display,<param>=<val>
+ Params: speed                   Display SPI bus speed
+         rotate                  Display rotation {0,90,180,270}
+-        fps                     Delay between frame updates
+-        debug                   Debug output level {0-7}
++        fps                     Delay between frame updates (fbtft only)
++        debug                   Debug output level {0-7} (fbtft only)
+         xohms                   Touchpanel sensitivity (X-plate resistance)
+         swapxy                  Swap x and y axis
+         backlight               Change backlight GPIO pin {e.g. 12, 18}
++                                (fbtft only)
++        drm                     Use DRM/KMS driver mi0283qt instead of fbtft.
++                                Set the SPI clock to 70MHz.
++                                This has to be the first parameter.
++        backlight-pwm           Use pwm for backlight (drm only). NB: Disables
++                                audio headphone output as that also uses PWM.
+ 
+ 
+ Name:   rpi-ft5406
+--- a/arch/arm/boot/dts/overlays/rpi-display-overlay.dts
++++ b/arch/arm/boot/dts/overlays/rpi-display-overlay.dts
+@@ -78,14 +78,73 @@
+ 			};
+ 		};
+ 	};
++
++	fragment@10 {
++		target = <&rpidisplay>;
++		__dormant__  {
++			backlight = <&backlight_gpio>;
++		};
++	};
++
++	fragment@11 {
++		target-path = "/";
++		__dormant__  {
++			backlight_gpio: backlight_gpio {
++				compatible = "gpio-backlight";
++				gpios = <&gpio 18 0>; /* GPIO_ACTIVE_HIGH */
++			};
++		};
++	};
++
++	fragment@20 {
++		target = <&rpidisplay>;
++		__dormant__  {
++			backlight = <&backlight_pwm>;
++		};
++	};
++
++	fragment@21 {
++		target-path = "/";
++		__dormant__  {
++			backlight_pwm: backlight_pwm {
++				compatible = "pwm-backlight";
++				brightness-levels = <0 6 8 12 16 24 32 40 48 64 96 128 160 192 224 255>;
++				default-brightness-level = <16>;
++				pwms = <&pwm 0 200000>;
++			};
++		};
++	};
++
++	fragment@22 {
++		target = <&pwm>;
++		__dormant__ {
++			assigned-clock-rates = <1000000>;
++			status = "okay";
++		};
++	};
++
++	fragment@23 {
++		target = <&audio>;
++		__dormant__  {
++		    brcm,disable-headphones;
++		};
++	};
++
+ 	__overrides__ {
+ 		speed =     <&rpidisplay>,"spi-max-frequency:0";
+-		rotate =    <&rpidisplay>,"rotate:0";
++		rotate =    <&rpidisplay>,"rotate:0", /* fbtft */
++			    <&rpidisplay>,"rotation:0"; /* drm */
+ 		fps =       <&rpidisplay>,"fps:0";
+ 		debug =     <&rpidisplay>,"debug:0";
+ 		xohms =     <&rpidisplay_ts>,"ti,x-plate-ohms;0";
+ 		swapxy =    <&rpidisplay_ts>,"ti,swap-xy?";
+ 		backlight = <&rpidisplay>,"led-gpios:4",
+ 		            <&rpi_display_pins>,"brcm,pins:0";
++		drm =       <&rpidisplay>, "compatible=multi-inno,mi0283qt",
++			    <&rpidisplay>, "spi-max-frequency:0=70000000",
++			    <&rpidisplay>, "reset-gpios:8=0", /* GPIO_ACTIVE_HIGH */
++			    <0>, "+10+11";
++		backlight-pwm = <0>, "-10-11+20+21+22+23",
++				<&rpi_display_pins>, "brcm,function:0=2"; /* Alt5 */
+ 	};
+ };
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0819-bcm2835-codec-Return-empty-buffers-to-the-VPU-instea.patch b/root/target/linux/bcm27xx/patches-5.15/950-0819-bcm2835-codec-Return-empty-buffers-to-the-VPU-instea.patch
new file mode 100644
index 00000000..2e34d5ef
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0819-bcm2835-codec-Return-empty-buffers-to-the-VPU-instea.patch
@@ -0,0 +1,49 @@
+From b9859135c2cfd435a2bcf1f25fc53f95bc579655 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Mon, 28 Mar 2022 11:52:48 +0100
+Subject: [PATCH 819/828] bcm2835-codec: Return empty buffers to the VPU
+ instead of queueing to vbuf2
+
+The encoder can skip frames totally should rate control overshoot
+the target bitrate too far. In this situation it generates an
+output buffer of length 0.
+V4L2 treats a buffer of length 0 as an end of stream flag, which is
+not appropriate in this case, therefore we can not return that buffer
+to the client.
+
+The driver was returning the buffer to videobuf2 in the QUEUED state,
+however that buffer was then not dequeued again, so the number of
+buffers was reduced each time this happened. In the pathological
+case of using GStreamer's videotestsrc in mode 1 for noise, this happens
+sufficiently frequently to totally stall the pipeline.
+
+If the port is still enabled then return the buffer straight back to
+the VPU rather than to videobuf2.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ .../bcm2835-codec/bcm2835-v4l2-codec.c              | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
++++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
+@@ -1159,10 +1159,15 @@ static void op_buffer_cb(struct vchiq_mm
+ 		v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: Empty buffer - flags %04x",
+ 			 __func__, mmal_buf->mmal_flags);
+ 		if (!(mmal_buf->mmal_flags & MMAL_BUFFER_HEADER_FLAG_EOS)) {
+-			vb2_buffer_done(&vb2->vb2_buf, VB2_BUF_STATE_QUEUED);
+-			if (!port->enabled &&
+-			    atomic_read(&port->buffers_with_vpu))
+-				complete(&ctx->frame_cmplt);
++			if (!port->enabled) {
++				vb2_buffer_done(&vb2->vb2_buf, VB2_BUF_STATE_QUEUED);
++				if (atomic_read(&port->buffers_with_vpu))
++					complete(&ctx->frame_cmplt);
++			} else {
++				vchiq_mmal_submit_buffer(ctx->dev->instance,
++							 &ctx->component->output[0],
++							 mmal_buf);
++			}
+ 			return;
+ 		}
+ 	}
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0820-mm-page_alloc-cma-introduce-a-customisable-threshold.patch b/root/target/linux/bcm27xx/patches-5.15/950-0820-mm-page_alloc-cma-introduce-a-customisable-threshold.patch
new file mode 100644
index 00000000..23c05cc5
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0820-mm-page_alloc-cma-introduce-a-customisable-threshold.patch
@@ -0,0 +1,67 @@
+From 1cad2f1eef8d711c7935fb37bee31556a5d1046a Mon Sep 17 00:00:00 2001
+From: David Plowman <david.plowman@raspberrypi.com>
+Date: Tue, 29 Mar 2022 16:10:06 +0100
+Subject: [PATCH 820/828] mm,page_alloc,cma: introduce a customisable threshold
+ for allocating pages in cma
+
+On some platforms the cma area can be half the entire system memory,
+meaning that allocations start happening in the cma area immediately.
+This leads to fragmentation and subsequent fatal cma_alloc failures.
+
+We introduce an "alloc_in_cma_threshold" parameter which requires that
+this many sixteenths of the free pages must be in cma before it will
+try to use them. By default this is set to 12, but the previous
+behaviour can be restored by setting it to 8 on startup.
+
+Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
+---
+ mm/page_alloc.c | 28 +++++++++++++++++++++++++---
+ 1 file changed, 25 insertions(+), 3 deletions(-)
+
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -190,6 +190,27 @@ EXPORT_SYMBOL(init_on_alloc);
+ DEFINE_STATIC_KEY_MAYBE(CONFIG_INIT_ON_FREE_DEFAULT_ON, init_on_free);
+ EXPORT_SYMBOL(init_on_free);
+ 
++#define ALLOC_IN_CMA_THRESHOLD_MAX 16
++#define ALLOC_IN_CMA_THRESHOLD_DEFAULT 12
++
++static unsigned long _alloc_in_cma_threshold __read_mostly
++				= ALLOC_IN_CMA_THRESHOLD_DEFAULT;
++
++static int __init alloc_in_cma_threshold_setup(char *buf)
++{
++	unsigned long res;
++
++	if (kstrtoul(buf, 10, &res) < 0 ||
++	    res > ALLOC_IN_CMA_THRESHOLD_MAX) {
++		pr_err("Bad alloc_cma_threshold value\n");
++		return 0;
++	}
++	_alloc_in_cma_threshold = res;
++	pr_info("Setting alloc_in_cma_threshold to %lu\n", res);
++	return 0;
++}
++early_param("alloc_in_cma_threshold", alloc_in_cma_threshold_setup);
++
+ static bool _init_on_alloc_enabled_early __read_mostly
+ 				= IS_ENABLED(CONFIG_INIT_ON_ALLOC_DEFAULT_ON);
+ static int __init early_init_on_alloc(char *buf)
+@@ -2980,12 +3001,13 @@ __rmqueue(struct zone *zone, unsigned in
+ 	if (IS_ENABLED(CONFIG_CMA)) {
+ 		/*
+ 		 * Balance movable allocations between regular and CMA areas by
+-		 * allocating from CMA when over half of the zone's free memory
+-		 * is in the CMA area.
++		 * allocating from CMA when over more than a given proportion of
++		 * the zone's free memory is in the CMA area.
+ 		 */
+ 		if (alloc_flags & ALLOC_CMA &&
+ 		    zone_page_state(zone, NR_FREE_CMA_PAGES) >
+-		    zone_page_state(zone, NR_FREE_PAGES) / 2) {
++		    zone_page_state(zone, NR_FREE_PAGES) / ALLOC_IN_CMA_THRESHOLD_MAX
++		    * _alloc_in_cma_threshold) {
+ 			page = __rmqueue_cma_fallback(zone, order);
+ 			if (page)
+ 				goto out;
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0821-pinctrl-bcm2835-Only-return-non-GPIOs-to-inputs.patch b/root/target/linux/bcm27xx/patches-5.15/950-0821-pinctrl-bcm2835-Only-return-non-GPIOs-to-inputs.patch
new file mode 100644
index 00000000..0d2f3051
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0821-pinctrl-bcm2835-Only-return-non-GPIOs-to-inputs.patch
@@ -0,0 +1,42 @@
+From e91eaefb91262e9451ec114b4aebad7154a73225 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Wed, 30 Mar 2022 09:48:41 +0100
+Subject: [PATCH 821/828] pinctrl: bcm2835: Only return non-GPIOs to inputs
+
+Allowing GPIO state to persist allows the use of gpioset to control
+GPIO levels without having to use the --mode=wait feature.
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ drivers/pinctrl/bcm/pinctrl-bcm2835.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
++++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
+@@ -892,9 +892,12 @@ static int bcm2835_pmx_free(struct pinct
+ 		unsigned offset)
+ {
+ 	struct bcm2835_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
++	enum bcm2835_fsel fsel = bcm2835_pinctrl_fsel_get(pc, offset);
++
++	/* Return non-GPIOs to GPIO_IN */
++	if (fsel != BCM2835_FSEL_GPIO_IN && fsel != BCM2835_FSEL_GPIO_OUT)
++		bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);
+ 
+-	/* disable by setting to GPIO_IN */
+-	bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);
+ 	return 0;
+ }
+ 
+@@ -936,10 +939,7 @@ static void bcm2835_pmx_gpio_disable_fre
+ 		struct pinctrl_gpio_range *range,
+ 		unsigned offset)
+ {
+-	struct bcm2835_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
+-
+-	/* disable by setting to GPIO_IN */
+-	bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);
++	(void)bcm2835_pmx_free(pctldev, offset);
+ }
+ 
+ static int bcm2835_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0822-ARM-dts-Enable-PMU-on-Cortex-A72-in-AArch32-state.patch b/root/target/linux/bcm27xx/patches-5.15/950-0822-ARM-dts-Enable-PMU-on-Cortex-A72-in-AArch32-state.patch
new file mode 100644
index 00000000..37ed026c
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0822-ARM-dts-Enable-PMU-on-Cortex-A72-in-AArch32-state.patch
@@ -0,0 +1,24 @@
+From 71569d1764bffbab3aa8991d6d5bb127840cf822 Mon Sep 17 00:00:00 2001
+From: Ben Avison <bavison@riscosopen.org>
+Date: Wed, 30 Mar 2022 11:43:25 +0100
+Subject: [PATCH 822/828] ARM: dts: Enable PMU on Cortex-A72 in AArch32 state
+
+There is no specific AArch32 driver for the Cortex-A72 PMU, but the
+Cortex-A7 one works and is much better than no PMU driver at all.
+
+Signed-off-by: Ben Avison <bavison@riscosopen.org>
+---
+ arch/arm/boot/dts/bcm2711.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/bcm2711.dtsi
++++ b/arch/arm/boot/dts/bcm2711.dtsi
+@@ -445,7 +445,7 @@
+ 	};
+ 
+ 	arm-pmu {
+-		compatible = "arm,cortex-a72-pmu", "arm,armv8-pmuv3";
++		compatible = "arm,cortex-a72-pmu", "arm,armv8-pmuv3", "arm,cortex-a7-pmu";
+ 		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
+ 			<GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
+ 			<GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0823-drm-panel-ilitek-ili9881c-Clean-up-on-mipi_dsi_attac.patch b/root/target/linux/bcm27xx/patches-5.15/950-0823-drm-panel-ilitek-ili9881c-Clean-up-on-mipi_dsi_attac.patch
new file mode 100644
index 00000000..7ab25933
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0823-drm-panel-ilitek-ili9881c-Clean-up-on-mipi_dsi_attac.patch
@@ -0,0 +1,31 @@
+From b53ddab08c347ec0c5f2fe2316b96ff52331b245 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 31 Mar 2022 12:03:36 +0100
+Subject: [PATCH 823/828] drm/panel: ilitek-ili9881c: Clean up on
+ mipi_dsi_attach failure
+
+mipi_dsi_attach is allowed to fail, and currently the probe
+code doesn't clean up (mainly drm_panel_remove) if this happens.
+
+Add cleanup code on failure.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
++++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
+@@ -913,7 +913,11 @@ static int ili9881c_dsi_probe(struct mip
+ 	dsi->format = MIPI_DSI_FMT_RGB888;
+ 	dsi->lanes = 4;
+ 
+-	return mipi_dsi_attach(dsi);
++	ret = mipi_dsi_attach(dsi);
++	if (ret)
++		drm_panel_remove(&ctx->panel);
++
++	return ret;
+ }
+ 
+ static int ili9881c_dsi_remove(struct mipi_dsi_device *dsi)
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0824-drm-panel-panel-ilitek9881c-Add-prepare_upstream_fir.patch b/root/target/linux/bcm27xx/patches-5.15/950-0824-drm-panel-panel-ilitek9881c-Add-prepare_upstream_fir.patch
new file mode 100644
index 00000000..c99a6b8b
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0824-drm-panel-panel-ilitek9881c-Add-prepare_upstream_fir.patch
@@ -0,0 +1,28 @@
+From 71b34099f96f66adb8395adb2fcf521b876b088e Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.com>
+Date: Thu, 31 Mar 2022 12:05:04 +0100
+Subject: [PATCH 824/828] drm/panel: panel-ilitek9881c: Add
+ prepare_upstream_first flag
+
+The panel sends MIPI DCS commands during prepare and is expecting
+the bus to remain in LP-11 state in-between.
+
+Set the prepare_upstream_first flag so that the upstream DSI host
+is prepared / pre_enabled first, and therefore the bus is in a
+defined state.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
++++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
+@@ -888,6 +888,7 @@ static int ili9881c_dsi_probe(struct mip
+ 	ctx->dsi = dsi;
+ 	ctx->desc = of_device_get_match_data(&dsi->dev);
+ 
++	ctx->panel.prepare_upstream_first = true;
+ 	drm_panel_init(&ctx->panel, &dsi->dev, &ili9881c_funcs,
+ 		       DRM_MODE_CONNECTOR_DSI);
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0825-brcmfmac-Restore-ISO3166-and-0-rev-as-a-fallback.patch b/root/target/linux/bcm27xx/patches-5.15/950-0825-brcmfmac-Restore-ISO3166-and-0-rev-as-a-fallback.patch
new file mode 100644
index 00000000..e8ea2eed
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0825-brcmfmac-Restore-ISO3166-and-0-rev-as-a-fallback.patch
@@ -0,0 +1,51 @@
+From a701758f80a996e78c5400e4cc7ffe2bbcfde624 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Thu, 31 Mar 2022 17:55:51 +0100
+Subject: [PATCH 825/828] brcmfmac: Restore ISO3166 and 0 rev as a fallback
+
+Commit b0b524f079a2 ("brcmfmac: use ISO3166 country code and 0 rev
+as fallback") was a welcome addition for Raspberry Pi as it replaced
+an equivalent bit of downstream code. Commit 151a7c12c4fc reverted
+it because it broke BCM4359/9 devices.
+
+This is a renamed reversion of the reversion.
+
+See: https://github.com/raspberrypi/Raspberry-Pi-OS-64bit/issues/217
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+---
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c      | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+@@ -7465,18 +7465,23 @@ static s32 brcmf_translate_country_code(
+ 	s32 found_index;
+ 	int i;
+ 
+-	country_codes = drvr->settings->country_codes;
+-	if (!country_codes) {
+-		brcmf_dbg(TRACE, "No country codes configured for device\n");
+-		return -EINVAL;
+-	}
+-
+ 	if ((alpha2[0] == ccreq->country_abbrev[0]) &&
+ 	    (alpha2[1] == ccreq->country_abbrev[1])) {
+ 		brcmf_dbg(TRACE, "Country code already set\n");
+ 		return -EAGAIN;
+ 	}
+ 
++	country_codes = drvr->settings->country_codes;
++	if (!country_codes) {
++		brcmf_dbg(TRACE, "No country codes configured for device, using ISO3166 code and 0 rev\n");
++		memset(ccreq, 0, sizeof(*ccreq));
++		ccreq->country_abbrev[0] = alpha2[0];
++		ccreq->country_abbrev[1] = alpha2[1];
++		ccreq->ccode[0] = alpha2[0];
++		ccreq->ccode[1] = alpha2[1];
++		return 0;
++	}
++
+ 	found_index = -1;
+ 	for (i = 0; i < country_codes->table_size; i++) {
+ 		cc = &country_codes->table[i];
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0826-drm-vc4-Force-trigger-of-dlist-update-on-margins-cha.patch b/root/target/linux/bcm27xx/patches-5.15/950-0826-drm-vc4-Force-trigger-of-dlist-update-on-margins-cha.patch
new file mode 100644
index 00000000..1b41b966
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0826-drm-vc4-Force-trigger-of-dlist-update-on-margins-cha.patch
@@ -0,0 +1,58 @@
+From c6bba613386384fdae742651c97c8fa62093f8ee Mon Sep 17 00:00:00 2001
+From: 6by9 <6by9@users.noreply.github.com>
+Date: Fri, 1 Apr 2022 11:31:38 +0100
+Subject: [PATCH 826/828] drm/vc4: Force trigger of dlist update on margins
+ change (#4970)
+
+When the margins are changed, the dlist needs to be regenerated
+with the changed updated dest regions for each of the planes.
+
+Setting the zpos_changed flag is sufficient to trigger that
+without doing a full modeset, therefore set it should the
+margins be changed.
+
+Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c | 14 ++++++++++----
+ drivers/gpu/drm/vc4/vc4_drv.h  |  7 +------
+ 2 files changed, 11 insertions(+), 10 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -728,10 +728,16 @@ static int vc4_crtc_atomic_check(struct
+ 		if (conn_state->crtc != crtc)
+ 			continue;
+ 
+-		vc4_state->margins.left = conn_state->tv.margins.left;
+-		vc4_state->margins.right = conn_state->tv.margins.right;
+-		vc4_state->margins.top = conn_state->tv.margins.top;
+-		vc4_state->margins.bottom = conn_state->tv.margins.bottom;
++		if (memcmp(&vc4_state->margins, &conn_state->tv.margins,
++			   sizeof(vc4_state->margins))) {
++			memcpy(&vc4_state->margins, &conn_state->tv.margins,
++			       sizeof(vc4_state->margins));
++
++			/* Need to force the dlist entries for all planes to be
++			 * updated so that the dest rectangles are changed.
++			 */
++			crtc_state->zpos_changed = true;
++		}
+ 		break;
+ 	}
+ 
+--- a/drivers/gpu/drm/vc4/vc4_drv.h
++++ b/drivers/gpu/drm/vc4/vc4_drv.h
+@@ -589,12 +589,7 @@ struct vc4_crtc_state {
+ 	bool txp_armed;
+ 	unsigned int assigned_channel;
+ 
+-	struct {
+-		unsigned int left;
+-		unsigned int right;
+-		unsigned int top;
+-		unsigned int bottom;
+-	} margins;
++	struct drm_connector_tv_margins margins;
+ 
+ 	unsigned long hvs_load;
+ 
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0827-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch b/root/target/linux/bcm27xx/patches-5.15/950-0827-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch
new file mode 100644
index 00000000..29d7a171
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0827-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch
@@ -0,0 +1,121 @@
+From fea8def6003c0767e5dbfc47fc7cb57c4e5f29b7 Mon Sep 17 00:00:00 2001
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date: Fri, 23 Oct 2020 14:39:23 +0200
+Subject: [PATCH 827/828] drm/atomic-helpers: remove legacy_cursor_update hacks
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The stuff never really worked, and leads to lots of fun because it
+out-of-order frees atomic states. Which upsets KASAN, among other
+things.
+
+For async updates we now have a more solid solution with the
+->atomic_async_check and ->atomic_async_commit hooks. Support for that
+for msm and vc4 landed. nouveau and i915 have their own commit
+routines, doing something similar.
+
+For everyone else it's probably better to remove the use-after-free
+bug, and encourage folks to use the async support instead. The
+affected drivers which register a legacy cursor plane and don't either
+use the new async stuff or their own commit routine are: amdgpu,
+atmel, mediatek, qxl, rockchip, sti, sun4i, tegra, virtio, and vmwgfx.
+
+Inspired by an amdgpu bug report.
+
+v2: Drop RFC, I think with amdgpu converted over to use
+atomic_async_check/commit done in
+
+commit 674e78acae0dfb4beb56132e41cbae5b60f7d662
+Author: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
+Date:   Wed Dec 5 14:59:07 2018 -0500
+
+    drm/amd/display: Add fast path for cursor plane updates
+
+we don't have any driver anymore where we have userspace expecting
+solid legacy cursor support _and_ they are using the atomic helpers in
+their fully glory. So we can retire this.
+
+v3: Paper over msm and i915 regression. The complete_all is the only
+thing missing afaict.
+
+v4: Rebased on recent kernel, added extra link for vc4 bug.
+
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=199425
+Link: https://lore.kernel.org/all/20220221134155.125447-9-maxime@cerno.tech/
+Cc: mikita.lipski@amd.com
+Cc: Michel Dänzer <michel@daenzer.net>
+Cc: harry.wentland@amd.com
+Cc: Rob Clark <robdclark@gmail.com>
+Cc: "Kazlauskas, Nicholas" <nicholas.kazlauskas@amd.com>
+Tested-by: Maxime Ripard <maxime@cerno.tech>
+Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
+Signed-off-by: Maxime Ripard <maxime@cerno.tech>
+---
+ drivers/gpu/drm/drm_atomic_helper.c          | 13 -------------
+ drivers/gpu/drm/i915/display/intel_display.c | 13 +++++++++++++
+ drivers/gpu/drm/msm/msm_atomic.c             |  2 ++
+ 3 files changed, 15 insertions(+), 13 deletions(-)
+
+--- a/drivers/gpu/drm/drm_atomic_helper.c
++++ b/drivers/gpu/drm/drm_atomic_helper.c
+@@ -1488,13 +1488,6 @@ drm_atomic_helper_wait_for_vblanks(struc
+ 	int i, ret;
+ 	unsigned int crtc_mask = 0;
+ 
+-	 /*
+-	  * Legacy cursor ioctls are completely unsynced, and userspace
+-	  * relies on that (by doing tons of cursor updates).
+-	  */
+-	if (old_state->legacy_cursor_update)
+-		return;
+-
+ 	for_each_oldnew_crtc_in_state(old_state, crtc, old_crtc_state, new_crtc_state, i) {
+ 		if (!new_crtc_state->active)
+ 			continue;
+@@ -2122,12 +2115,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),
+--- a/drivers/gpu/drm/i915/display/intel_display.c
++++ b/drivers/gpu/drm/i915/display/intel_display.c
+@@ -10821,6 +10821,19 @@ static int intel_atomic_commit(struct dr
+ 				state->base.legacy_cursor_update = false;
+ 	}
+ 
++	/*
++	 * FIXME: Cut over to (async) commit helpers instead of hand-rolling
++	 * everything.
++	 */
++	if (state->base.legacy_cursor_update) {
++		struct intel_crtc_state *new_crtc_state;
++		struct intel_crtc *crtc;
++		int i;
++
++		for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i)
++			complete_all(&new_crtc_state->uapi.commit->flip_done);
++	}
++
+ 	ret = intel_atomic_prepare_commit(state);
+ 	if (ret) {
+ 		drm_dbg_atomic(&dev_priv->drm,
+--- a/drivers/gpu/drm/msm/msm_atomic.c
++++ b/drivers/gpu/drm/msm/msm_atomic.c
+@@ -246,6 +246,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));
+ 
++		complete_all(&async_crtc->state->commit->flip_done);
++
+ 		/*
+ 		 * Start timer if we don't already have an update pending
+ 		 * on this crtc:
diff --git a/root/target/linux/bcm27xx/patches-5.15/950-0828-Revert-drm-vc4-hvs-Defer-dlist-slots-deallocation.patch b/root/target/linux/bcm27xx/patches-5.15/950-0828-Revert-drm-vc4-hvs-Defer-dlist-slots-deallocation.patch
new file mode 100644
index 00000000..83af62af
--- /dev/null
+++ b/root/target/linux/bcm27xx/patches-5.15/950-0828-Revert-drm-vc4-hvs-Defer-dlist-slots-deallocation.patch
@@ -0,0 +1,342 @@
+From 79a22cf55968f7cfa5205bcc9e59a874b471d4c6 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime@cerno.tech>
+Date: Thu, 31 Mar 2022 15:27:43 +0200
+Subject: [PATCH 828/828] Revert "drm/vc4: hvs: Defer dlist slots deallocation"
+
+This reverts commit e99a1b69da07ee3b89a6b8005b854e6c04bfb450.
+---
+ drivers/gpu/drm/vc4/vc4_crtc.c |  10 +-
+ drivers/gpu/drm/vc4/vc4_drv.h  |  15 +--
+ drivers/gpu/drm/vc4/vc4_hvs.c  | 181 +++------------------------------
+ drivers/gpu/drm/vc4/vc4_regs.h |   1 -
+ 4 files changed, 23 insertions(+), 184 deletions(-)
+
+--- a/drivers/gpu/drm/vc4/vc4_crtc.c
++++ b/drivers/gpu/drm/vc4/vc4_crtc.c
+@@ -998,8 +998,14 @@ void vc4_crtc_destroy_state(struct drm_c
+ 	struct vc4_dev *vc4 = to_vc4_dev(crtc->dev);
+ 	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(state);
+ 
+-	vc4_hvs_mark_dlist_entry_stale(vc4->hvs, vc4_state->mm);
+-	vc4_state->mm = NULL;
++	if (drm_mm_node_allocated(&vc4_state->mm)) {
++		unsigned long flags;
++
++		spin_lock_irqsave(&vc4->hvs->mm_lock, flags);
++		drm_mm_remove_node(&vc4_state->mm);
++		spin_unlock_irqrestore(&vc4->hvs->mm_lock, flags);
++
++	}
+ 
+ 	drm_atomic_helper_crtc_destroy_state(crtc, state);
+ }
+--- a/drivers/gpu/drm/vc4/vc4_drv.h
++++ b/drivers/gpu/drm/vc4/vc4_drv.h
+@@ -335,9 +335,6 @@ struct vc4_hvs {
+ 	struct drm_mm lbm_mm;
+ 	spinlock_t mm_lock;
+ 
+-	struct list_head stale_dlist_entries;
+-	struct work_struct free_dlist_work;
+-
+ 	struct drm_mm_node mitchell_netravali_filter;
+ 
+ 	struct debugfs_regset32 regset;
+@@ -576,16 +573,10 @@ struct drm_connector *vc4_get_crtc_conne
+ struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
+ 					 struct drm_crtc_state *state);
+ 
+-struct vc4_hvs_dlist_allocation {
+-	struct list_head node;
+-	struct drm_mm_node mm_node;
+-	unsigned int channel;
+-	u8 target_frame_count;
+-};
+-
+ struct vc4_crtc_state {
+ 	struct drm_crtc_state base;
+-	struct vc4_hvs_dlist_allocation *mm;
++	/* Dlist area for this CRTC configuration. */
++	struct drm_mm_node mm;
+ 	bool txp_armed;
+ 	unsigned int assigned_channel;
+ 
+@@ -972,8 +963,6 @@ extern struct platform_driver vc4_hvs_dr
+ void vc4_hvs_stop_channel(struct vc4_hvs *hvs, unsigned int output);
+ int vc4_hvs_get_fifo_from_output(struct vc4_hvs *hvs, unsigned int output);
+ u8 vc4_hvs_get_fifo_frame_count(struct vc4_hvs *hvs, unsigned int fifo);
+-void vc4_hvs_mark_dlist_entry_stale(struct vc4_hvs *hvs,
+-				    struct vc4_hvs_dlist_allocation *alloc);
+ int vc4_hvs_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state);
+ void vc4_hvs_atomic_begin(struct drm_crtc *crtc, struct drm_atomic_state *state);
+ void vc4_hvs_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state);
+--- a/drivers/gpu/drm/vc4/vc4_hvs.c
++++ b/drivers/gpu/drm/vc4/vc4_hvs.c
+@@ -389,150 +389,6 @@ static void vc5_hvs_update_gamma_lut(str
+ 	vc5_hvs_lut_load(hvs, vc4_crtc);
+ }
+ 
+-static void vc4_hvs_irq_enable_eof(const struct vc4_hvs *hvs,
+-				   unsigned int channel)
+-{
+-	u32 irq_mask = hvs->hvs5 ?
+-		SCALER5_DISPCTRL_DSPEIEOF(channel) :
+-		SCALER_DISPCTRL_DSPEIEOF(channel);
+-
+-	HVS_WRITE(SCALER_DISPCTRL,
+-		  HVS_READ(SCALER_DISPCTRL) | irq_mask);
+-}
+-
+-static void vc4_hvs_irq_clear_eof(const struct vc4_hvs *hvs,
+-				  unsigned int channel)
+-{
+-	u32 irq_mask = hvs->hvs5 ?
+-		SCALER5_DISPCTRL_DSPEIEOF(channel) :
+-		SCALER_DISPCTRL_DSPEIEOF(channel);
+-
+-	HVS_WRITE(SCALER_DISPCTRL,
+-		  HVS_READ(SCALER_DISPCTRL) & ~irq_mask);
+-}
+-
+-static struct vc4_hvs_dlist_allocation *
+-vc4_hvs_alloc_dlist_entry(struct vc4_hvs *hvs,
+-			  unsigned int channel,
+-			  size_t dlist_count)
+-{
+-	struct vc4_hvs_dlist_allocation *alloc;
+-	unsigned long flags;
+-	int ret;
+-
+-	if (channel == VC4_HVS_CHANNEL_DISABLED)
+-		return NULL;
+-
+-	alloc = kzalloc(sizeof(*alloc), GFP_KERNEL);
+-	if (!alloc)
+-		return ERR_PTR(-ENOMEM);
+-
+-	spin_lock_irqsave(&hvs->mm_lock, flags);
+-	ret = drm_mm_insert_node(&hvs->dlist_mm, &alloc->mm_node,
+-				 dlist_count);
+-	spin_unlock_irqrestore(&hvs->mm_lock, flags);
+-	if (ret)
+-		return ERR_PTR(ret);
+-
+-	alloc->channel = channel;
+-
+-	return alloc;
+-}
+-
+-void vc4_hvs_mark_dlist_entry_stale(struct vc4_hvs *hvs,
+-				    struct vc4_hvs_dlist_allocation *alloc)
+-{
+-	unsigned long flags;
+-	u8 frcnt;
+-
+-	if (!alloc)
+-		return;
+-
+-	if (!drm_mm_node_allocated(&alloc->mm_node))
+-		return;
+-
+-	frcnt = vc4_hvs_get_fifo_frame_count(hvs, alloc->channel);
+-	alloc->target_frame_count = (frcnt + 1) & ((1 << 6) - 1);
+-
+-	spin_lock_irqsave(&hvs->mm_lock, flags);
+-
+-	list_add_tail(&alloc->node, &hvs->stale_dlist_entries);
+-
+-	HVS_WRITE(SCALER_DISPSTAT, SCALER_DISPSTAT_EOF(alloc->channel));
+-	vc4_hvs_irq_enable_eof(hvs, alloc->channel);
+-
+-	spin_unlock_irqrestore(&hvs->mm_lock, flags);
+-}
+-
+-static void vc4_hvs_schedule_dlist_sweep(struct vc4_hvs *hvs,
+-					 unsigned int channel)
+-{
+-	unsigned long flags;
+-
+-	spin_lock_irqsave(&hvs->mm_lock, flags);
+-
+-	if (!list_empty(&hvs->stale_dlist_entries))
+-		queue_work(system_unbound_wq, &hvs->free_dlist_work);
+-
+-	vc4_hvs_irq_clear_eof(hvs, channel);
+-
+-	spin_unlock_irqrestore(&hvs->mm_lock, flags);
+-}
+-
+-/*
+- * Frame counts are essentially sequence numbers over 6 bits, and we
+- * thus can use sequence number arithmetic and follow the RFC1982 to
+- * implement proper comparison between them.
+- */
+-static bool vc4_hvs_frcnt_lte(u8 cnt1, u8 cnt2)
+-{
+-	return (s8)((cnt1 << 2) - (cnt2 << 2)) <= 0;
+-}
+-
+-/*
+- * Some atomic commits (legacy cursor updates, mostly) will not wait for
+- * the next vblank and will just return once the commit has been pushed
+- * to the hardware.
+- *
+- * On the hardware side, our HVS stores the planes parameters in its
+- * context RAM, and will use part of the RAM to store data during the
+- * frame rendering.
+- *
+- * This interacts badly if we get multiple commits before the next
+- * vblank since we could end up overwriting the DLIST entries used by
+- * previous commits if our dlist allocation reuses that entry. In such a
+- * case, we would overwrite the data currently being used by the
+- * hardware, resulting in a corrupted frame.
+- *
+- * In order to work around this, we'll queue the dlist entries in a list
+- * once the associated CRTC state is destroyed. The HVS only allows us
+- * to know which entry is being active, but not which one are no longer
+- * being used, so in order to avoid freeing entries that are still used
+- * by the hardware we add a guesstimate of the frame count where our
+- * entry will no longer be used, and thus will only free those entries
+- * when we will have reached that frame count.
+- */
+-static void vc4_hvs_dlist_free_work(struct work_struct *work)
+-{
+-	struct vc4_hvs *hvs = container_of(work, struct vc4_hvs, free_dlist_work);
+-	struct vc4_hvs_dlist_allocation *cur, *next;
+-	unsigned long flags;
+-
+-	spin_lock_irqsave(&hvs->mm_lock, flags);
+-	list_for_each_entry_safe(cur, next, &hvs->stale_dlist_entries, node) {
+-		u8 frcnt;
+-
+-		frcnt = vc4_hvs_get_fifo_frame_count(hvs, cur->channel);
+-		if (!vc4_hvs_frcnt_lte(cur->target_frame_count, frcnt))
+-			continue;
+-
+-		list_del(&cur->node);
+-		drm_mm_remove_node(&cur->mm_node);
+-		kfree(cur);
+-	}
+-	spin_unlock_irqrestore(&hvs->mm_lock, flags);
+-}
+-
+ u8 vc4_hvs_get_fifo_frame_count(struct vc4_hvs *hvs, unsigned int fifo)
+ {
+ 	u8 field = 0;
+@@ -732,12 +588,13 @@ int vc4_hvs_atomic_check(struct drm_crtc
+ {
+ 	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
+ 	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state);
+-	struct vc4_hvs_dlist_allocation *alloc;
+ 	struct drm_device *dev = crtc->dev;
+ 	struct vc4_dev *vc4 = to_vc4_dev(dev);
+ 	struct drm_plane *plane;
++	unsigned long flags;
+ 	const struct drm_plane_state *plane_state;
+ 	u32 dlist_count = 0;
++	int ret;
+ 
+ 	/* The pixelvalve can only feed one encoder (and encoders are
+ 	 * 1:1 with connectors.)
+@@ -750,11 +607,12 @@ int vc4_hvs_atomic_check(struct drm_crtc
+ 
+ 	dlist_count++; /* Account for SCALER_CTL0_END. */
+ 
+-	alloc = vc4_hvs_alloc_dlist_entry(vc4->hvs, vc4_state->assigned_channel, dlist_count);
+-	if (IS_ERR(alloc))
+-		return PTR_ERR(alloc);
+-
+-	vc4_state->mm = alloc;
++	spin_lock_irqsave(&vc4->hvs->mm_lock, flags);
++	ret = drm_mm_insert_node(&vc4->hvs->dlist_mm, &vc4_state->mm,
++				 dlist_count);
++	spin_unlock_irqrestore(&vc4->hvs->mm_lock, flags);
++	if (ret)
++		return ret;
+ 
+ 	return vc4_hvs_gamma_check(crtc, state);
+ }
+@@ -766,9 +624,8 @@ static void vc4_hvs_install_dlist(struct
+ 	struct vc4_hvs *hvs = vc4->hvs;
+ 	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state);
+ 
+-	WARN_ON(!vc4_state->mm);
+ 	HVS_WRITE(SCALER_DISPLISTX(vc4_state->assigned_channel),
+-		  vc4_state->mm->mm_node.start);
++		  vc4_state->mm.start);
+ }
+ 
+ static void vc4_hvs_update_dlist(struct drm_crtc *crtc)
+@@ -793,10 +650,8 @@ static void vc4_hvs_update_dlist(struct
+ 		spin_unlock_irqrestore(&dev->event_lock, flags);
+ 	}
+ 
+-	WARN_ON(!vc4_state->mm);
+-
+ 	spin_lock_irqsave(&vc4_crtc->irq_lock, flags);
+-	vc4_crtc->current_dlist = vc4_state->mm->mm_node.start;
++	vc4_crtc->current_dlist = vc4_state->mm.start;
+ 	spin_unlock_irqrestore(&vc4_crtc->irq_lock, flags);
+ }
+ 
+@@ -853,7 +708,8 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 	struct vc4_plane_state *vc4_plane_state;
+ 	bool debug_dump_regs = false;
+ 	bool enable_bg_fill = false;
+-	u32 __iomem *dlist_start, *dlist_next;
++	u32 __iomem *dlist_start = vc4->hvs->dlist + vc4_state->mm.start;
++	u32 __iomem *dlist_next = dlist_start;
+ 	unsigned int zpos = 0;
+ 	bool found = false;
+ 
+@@ -865,9 +721,6 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 		vc4_hvs_dump_state(hvs);
+ 	}
+ 
+-	dlist_start = vc4->hvs->dlist + vc4_state->mm->mm_node.start;
+-	dlist_next = dlist_start;
+-
+ 	/* Copy all the active planes' dlist contents to the hardware dlist. */
+ 	do {
+ 		found = false;
+@@ -901,8 +754,7 @@ void vc4_hvs_atomic_flush(struct drm_crt
+ 	writel(SCALER_CTL0_END, dlist_next);
+ 	dlist_next++;
+ 
+-	WARN_ON(!vc4_state->mm);
+-	WARN_ON_ONCE(dlist_next - dlist_start != vc4_state->mm->mm_node.size);
++	WARN_ON_ONCE(dlist_next - dlist_start != vc4_state->mm.size);
+ 
+ 	if (enable_bg_fill)
+ 		/* This sets a black background color fill, as is the case
+@@ -1007,11 +859,6 @@ static irqreturn_t vc4_hvs_irq_handler(i
+ 
+ 			irqret = IRQ_HANDLED;
+ 		}
+-
+-		if (status & SCALER_DISPSTAT_EOF(channel)) {
+-			vc4_hvs_schedule_dlist_sweep(hvs, channel);
+-			irqret = IRQ_HANDLED;
+-		}
+ 	}
+ 
+ 	/* Clear every per-channel interrupt flag. */
+@@ -1069,8 +916,6 @@ static int vc4_hvs_bind(struct device *d
+ 		hvs->dlist = hvs->regs + SCALER5_DLIST_START;
+ 
+ 	spin_lock_init(&hvs->mm_lock);
+-	INIT_LIST_HEAD(&hvs->stale_dlist_entries);
+-	INIT_WORK(&hvs->free_dlist_work, vc4_hvs_dlist_free_work);
+ 
+ 	/* Set up the HVS display list memory manager.  We never
+ 	 * overwrite the setup from the bootloader (just 128b out of
+--- a/drivers/gpu/drm/vc4/vc4_regs.h
++++ b/drivers/gpu/drm/vc4/vc4_regs.h
+@@ -234,7 +234,6 @@
+ # define SCALER_DISPCTRL_DSPEIEOLN(x)		BIT(8 + ((x) * 2))
+ /* Enables Display 0 EOF contribution to SCALER_DISPSTAT_IRQDISP0 */
+ # define SCALER_DISPCTRL_DSPEIEOF(x)		BIT(7 + ((x) * 2))
+-# define SCALER5_DISPCTRL_DSPEIEOF(x)		BIT(7 + ((x) * 4))
+ 
+ # define SCALER_DISPCTRL_SLVRDEIRQ		BIT(6)
+ # define SCALER_DISPCTRL_SLVWREIRQ		BIT(5)