X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Flayerscape%2Fpatches-5.4%2F802-can-0009-can-flexcan-rename-macro-FLEXCAN_IFLAG_MB-FLEXCAN_IF.patch;fp=target%2Flinux%2Flayerscape%2Fpatches-5.4%2F802-can-0009-can-flexcan-rename-macro-FLEXCAN_IFLAG_MB-FLEXCAN_IF.patch;h=d867ef561e15a00d7f62e5f91ddc5bbfecde2a73;hp=6926a57f4a76ba16a16cc6445e1819446d1e380d;hb=4e39949dd1f7eb706d857e1c44a992ae752132a7;hpb=f29231ece747dc09c350aea90bd30d1ab6447a4a

diff --git a/target/linux/layerscape/patches-5.4/802-can-0009-can-flexcan-rename-macro-FLEXCAN_IFLAG_MB-FLEXCAN_IF.patch b/target/linux/layerscape/patches-5.4/802-can-0009-can-flexcan-rename-macro-FLEXCAN_IFLAG_MB-FLEXCAN_IF.patch
index 6926a57f4a..d867ef561e 100644
--- a/target/linux/layerscape/patches-5.4/802-can-0009-can-flexcan-rename-macro-FLEXCAN_IFLAG_MB-FLEXCAN_IF.patch
+++ b/target/linux/layerscape/patches-5.4/802-can-0009-can-flexcan-rename-macro-FLEXCAN_IFLAG_MB-FLEXCAN_IF.patch
@@ -23,7 +23,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  #define FLEXCAN_IFLAG_RX_FIFO_OVERFLOW	BIT(7)
  #define FLEXCAN_IFLAG_RX_FIFO_WARN	BIT(6)
  #define FLEXCAN_IFLAG_RX_FIFO_AVAILABLE	BIT(5)
-@@ -879,7 +879,7 @@ static inline u64 flexcan_read_reg_iflag
+@@ -881,7 +881,7 @@ static inline u64 flexcan_read_reg_iflag
  	u32 iflag1, iflag2;
  
  	iflag2 = priv->read(&regs->iflag2) & priv->reg_imask2_default &
@@ -32,7 +32,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  	iflag1 = priv->read(&regs->iflag1) & priv->reg_imask1_default;
  
  	return (u64)iflag2 << 32 | iflag1;
-@@ -929,7 +929,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -931,7 +931,7 @@ static irqreturn_t flexcan_irq(int irq,
  	reg_iflag2 = priv->read(&regs->iflag2);
  
  	/* transmission complete interrupt */
@@ -41,7 +41,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  		u32 reg_ctrl = priv->read(&priv->tx_mb->can_ctrl);
  
  		handled = IRQ_HANDLED;
-@@ -941,7 +941,7 @@ static irqreturn_t flexcan_irq(int irq,
+@@ -943,7 +943,7 @@ static irqreturn_t flexcan_irq(int irq,
  		/* after sending a RTR frame MB is in RX mode */
  		priv->write(FLEXCAN_MB_CODE_TX_INACTIVE,
  			    &priv->tx_mb->can_ctrl);
@@ -50,7 +50,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  		netif_wake_queue(dev);
  	}
  
-@@ -1320,7 +1320,7 @@ static int flexcan_open(struct net_devic
+@@ -1321,7 +1321,7 @@ static int flexcan_open(struct net_devic
  	priv->tx_mb = flexcan_get_mb(priv, priv->tx_mb_idx);
  
  	priv->reg_imask1_default = 0;