kernel: clean up patch fuzz

[openwrt/openwrt.git] / target / linux / bcm27xx / patches-5.4 / 950-0577-drm-vc4-hdmi-Pass-vc4_hdmi-to-CEC-code.patch

diff --git a/target/linux/bcm27xx/patches-5.4/950-0577-drm-vc4-hdmi-Pass-vc4_hdmi-to-CEC-code.patch b/target/linux/bcm27xx/patches-5.4/950-0577-drm-vc4-hdmi-Pass-vc4_hdmi-to-CEC-code.patch
index b0abafc6998251341fcee75f3e4ab5d4b1e8191d..092efc17f57c9344cd1703656e297538ca6c5b7f 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0577-drm-vc4-hdmi-Pass-vc4_hdmi-to-CEC-code.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0577-drm-vc4-hdmi-Pass-vc4_hdmi-to-CEC-code.patch
@@ -17,7 +17,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -1043,8 +1043,7 @@ static int vc4_hdmi_audio_init(struct vc
+@@ -1044,8 +1044,7 @@ static int vc4_hdmi_audio_init(struct vc
  #ifdef CONFIG_DRM_VC4_HDMI_CEC
  static irqreturn_t vc4_cec_irq_handler_thread(int irq, void *priv)
  {
@@ -27,7 +27,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  
        if (vc4_hdmi->cec_irq_was_rx) {
                if (vc4_hdmi->cec_rx_msg.len)
-@@ -1064,9 +1063,8 @@ static irqreturn_t vc4_cec_irq_handler_t
+@@ -1065,9 +1064,8 @@ static irqreturn_t vc4_cec_irq_handler_t
        return IRQ_HANDLED;
  }
  
@@ -38,7 +38,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        struct cec_msg *msg = &vc4_hdmi->cec_rx_msg;
        unsigned int i;
  
-@@ -1084,8 +1082,7 @@ static void vc4_cec_read_msg(struct vc4_
+@@ -1085,8 +1083,7 @@ static void vc4_cec_read_msg(struct vc4_
  
  static irqreturn_t vc4_cec_irq_handler(int irq, void *priv)
  {
@@ -48,7 +48,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        u32 stat = HDMI_READ(VC4_HDMI_CPU_STATUS);
        u32 cntrl1, cntrl5;
  
-@@ -1096,7 +1093,7 @@ static irqreturn_t vc4_cec_irq_handler(i
+@@ -1097,7 +1094,7 @@ static irqreturn_t vc4_cec_irq_handler(i
        cntrl5 = HDMI_READ(VC4_HDMI_CEC_CNTRL_5);
        vc4_hdmi->cec_irq_was_rx = cntrl5 & VC4_HDMI_CEC_RX_CEC_INT;
        if (vc4_hdmi->cec_irq_was_rx) {
@@ -57,7 +57,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
                cntrl1 |= VC4_HDMI_CEC_CLEAR_RECEIVE_OFF;
                HDMI_WRITE(VC4_HDMI_CEC_CNTRL_1, cntrl1);
                cntrl1 &= ~VC4_HDMI_CEC_CLEAR_RECEIVE_OFF;
-@@ -1112,8 +1109,7 @@ static irqreturn_t vc4_cec_irq_handler(i
+@@ -1113,8 +1110,7 @@ static irqreturn_t vc4_cec_irq_handler(i
  
  static int vc4_hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable)
  {
@@ -67,7 +67,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);
-@@ -1156,8 +1152,7 @@ static int vc4_hdmi_cec_adap_enable(stru
+@@ -1157,8 +1153,7 @@ static int vc4_hdmi_cec_adap_enable(stru
  
  static int vc4_hdmi_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr)
  {
@@ -77,7 +77,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) |
-@@ -1168,8 +1163,7 @@ static int vc4_hdmi_cec_adap_log_addr(st
+@@ -1169,8 +1164,7 @@ static int vc4_hdmi_cec_adap_log_addr(st
  static int vc4_hdmi_cec_adap_transmit(struct cec_adapter *adap, u8 attempts,
                                      u32 signal_free_time, struct cec_msg *msg)
  {
@@ -87,7 +87,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        u32 val;
        unsigned int i;
  
-@@ -1315,7 +1309,7 @@ static int vc4_hdmi_bind(struct device *
+@@ -1316,7 +1310,7 @@ static int vc4_hdmi_bind(struct device *
  
  #ifdef CONFIG_DRM_VC4_HDMI_CEC
        vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops,
@@ -96,7 +96,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
                                              CEC_CAP_DEFAULTS |
                                              CEC_CAP_CONNECTOR_INFO, 1);
        ret = PTR_ERR_OR_ZERO(vc4_hdmi->cec_adap);
-@@ -1339,7 +1333,7 @@ static int vc4_hdmi_bind(struct device *
+@@ -1340,7 +1334,7 @@ static int vc4_hdmi_bind(struct device *
        ret = devm_request_threaded_irq(dev, platform_get_irq(pdev, 0),
                                        vc4_cec_irq_handler,
                                        vc4_cec_irq_handler_thread, 0,