kernel: bump 5.4 to 5.4.133
Manually rebased: pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us>
This commit is contained in:
committed by
Hauke Mehrtens
parent
2b2ac841e0
commit
5408e811b2
@@ -267,7 +267,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com>
|
||||
goto out;
|
||||
--- a/drivers/mmc/core/core.c
|
||||
+++ b/drivers/mmc/core/core.c
|
||||
@@ -1922,7 +1922,8 @@ EXPORT_SYMBOL(mmc_erase);
|
||||
@@ -1925,7 +1925,8 @@ EXPORT_SYMBOL(mmc_erase);
|
||||
int mmc_can_erase(struct mmc_card *card)
|
||||
{
|
||||
if ((card->host->caps & MMC_CAP_ERASE) &&
|
||||
|
||||
@@ -82,7 +82,7 @@ Cc: linux-rockchip@lists.infradead.org
|
||||
|
||||
--- a/drivers/pci/controller/pci-aardvark.c
|
||||
+++ b/drivers/pci/controller/pci-aardvark.c
|
||||
@@ -1049,7 +1049,8 @@ static int advk_pcie_probe(struct platfo
|
||||
@@ -1060,7 +1060,8 @@ static int advk_pcie_probe(struct platfo
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
||||
|
||||
#define MAX_TUNING_LOOP 40
|
||||
|
||||
@@ -2758,7 +2758,7 @@ static void sdhci_timeout_timer(struct t
|
||||
@@ -2762,7 +2762,7 @@ static void sdhci_timeout_timer(struct t
|
||||
spin_lock_irqsave(&host->lock, flags);
|
||||
|
||||
if (host->cmd && !sdhci_data_line_cmd(host->cmd)) {
|
||||
@@ -31,7 +31,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
||||
mmc_hostname(host->mmc));
|
||||
sdhci_dumpregs(host);
|
||||
|
||||
@@ -2780,7 +2780,7 @@ static void sdhci_timeout_data_timer(str
|
||||
@@ -2784,7 +2784,7 @@ static void sdhci_timeout_data_timer(str
|
||||
|
||||
if (host->data || host->data_cmd ||
|
||||
(host->cmd && sdhci_data_line_cmd(host->cmd))) {
|
||||
|
||||
@@ -20,7 +20,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
|
||||
|
||||
--- a/include/media/v4l2-subdev.h
|
||||
+++ b/include/media/v4l2-subdev.h
|
||||
@@ -670,6 +670,29 @@ struct v4l2_subdev_pad_config {
|
||||
@@ -674,6 +674,29 @@ struct v4l2_subdev_pad_config {
|
||||
*
|
||||
* @set_frame_desc: set the low level media bus frame parameters, @fd array
|
||||
* may be adjusted by the subdev driver to device capabilities.
|
||||
@@ -50,7 +50,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
|
||||
*/
|
||||
struct v4l2_subdev_pad_ops {
|
||||
int (*init_cfg)(struct v4l2_subdev *sd,
|
||||
@@ -710,6 +733,10 @@ struct v4l2_subdev_pad_ops {
|
||||
@@ -714,6 +737,10 @@ struct v4l2_subdev_pad_ops {
|
||||
struct v4l2_mbus_frame_desc *fd);
|
||||
int (*set_frame_desc)(struct v4l2_subdev *sd, unsigned int pad,
|
||||
struct v4l2_mbus_frame_desc *fd);
|
||||
|
||||
@@ -17,7 +17,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
|
||||
|
||||
--- a/include/media/v4l2-subdev.h
|
||||
+++ b/include/media/v4l2-subdev.h
|
||||
@@ -402,12 +402,6 @@ struct v4l2_mbus_frame_desc {
|
||||
@@ -406,12 +406,6 @@ struct v4l2_mbus_frame_desc {
|
||||
*
|
||||
* @query_dv_timings: callback for VIDIOC_QUERY_DV_TIMINGS() ioctl handler code.
|
||||
*
|
||||
@@ -30,7 +30,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
|
||||
* @s_rx_buffer: set a host allocated memory buffer for the subdev. The subdev
|
||||
* can adjust @size to a lower value and must not write more data to the
|
||||
* buffer starting at @data than the original value of @size.
|
||||
@@ -435,10 +429,6 @@ struct v4l2_subdev_video_ops {
|
||||
@@ -439,10 +433,6 @@ struct v4l2_subdev_video_ops {
|
||||
struct v4l2_dv_timings *timings);
|
||||
int (*query_dv_timings)(struct v4l2_subdev *sd,
|
||||
struct v4l2_dv_timings *timings);
|
||||
|
||||
Reference in New Issue
Block a user