kernel: bump 5.4 to 5.4.69

[openwrt/staging/blogic.git] / target / linux / bcm27xx / patches-5.4 / 950-0574-drm-vc4-hdmi-Move-accessors-to-vc4_hdmi.patch

diff --git a/target/linux/bcm27xx/patches-5.4/950-0574-drm-vc4-hdmi-Move-accessors-to-vc4_hdmi.patch b/target/linux/bcm27xx/patches-5.4/950-0574-drm-vc4-hdmi-Move-accessors-to-vc4_hdmi.patch
index 53296ecb4b3f466f1c04e60f0eeb075f9c093cd3..1e50c0c579238ff76cd1d0e07073b88da476f50d 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0574-drm-vc4-hdmi-Move-accessors-to-vc4_hdmi.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0574-drm-vc4-hdmi-Move-accessors-to-vc4_hdmi.patch
@@ -100,7 +100,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  
        switch (cmd) {
        case SNDRV_PCM_TRIGGER_START:
-@@ -1093,7 +1083,8 @@ static irqreturn_t vc4_cec_irq_handler_t
+@@ -1094,7 +1084,8 @@ static irqreturn_t vc4_cec_irq_handler_t
  
  static void vc4_cec_read_msg(struct vc4_dev *vc4, u32 cntrl1)
  {
@@ -110,7 +110,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        unsigned int i;
  
        msg->len = 1 + ((cntrl1 & VC4_HDMI_CEC_REC_WRD_CNT_MASK) >>
-@@ -1139,6 +1130,7 @@ static irqreturn_t vc4_cec_irq_handler(i
+@@ -1140,6 +1131,7 @@ static irqreturn_t vc4_cec_irq_handler(i
  static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable)
  {
        struct vc4_dev *vc4 = cec_get_drvdata(adap);
@@ -118,7 +118,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        /* clock period in microseconds */
        const u32 usecs = 1000000 / CEC_CLOCK_FREQ;
        u32 val = HDMI_READ(VC4_HDMI_CEC_CNTRL_5);
-@@ -1182,6 +1174,7 @@ static int vc4_hdmi_cec_adap_enable(stru
+@@ -1183,6 +1175,7 @@ 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_dev *vc4 = cec_get_drvdata(adap);
@@ -126,7 +126,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  
        HDMI_WRITE(VC4_HDMI_CEC_CNTRL_1,
                   (HDMI_READ(VC4_HDMI_CEC_CNTRL_1) & ~VC4_HDMI_CEC_ADDR_MASK) |
-@@ -1193,6 +1186,7 @@ static int vc4_hdmi_cec_adap_transmit(st
+@@ -1194,6 +1187,7 @@ static int vc4_hdmi_cec_adap_transmit(st
                                      u32 signal_free_time, struct cec_msg *msg)
  {
        struct vc4_dev *vc4 = cec_get_drvdata(adap);