Add i2c-pxa updates queued for v5.8, which add bus recovery to this driver; this is needed for the uDPU platform. Signed-off-by: Russell King <linux@armlinux.org.uk>
		
			
				
	
	
		
			40 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			40 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From: Russell King <rmk+kernel@armlinux.org.uk>
 | 
						|
Bcc: linux@mail.armlinux.org.uk
 | 
						|
Subject: [PATCH 4/7] i2c: pxa: remove some unnecessary debug
 | 
						|
MIME-Version: 1.0
 | 
						|
Content-Disposition: inline
 | 
						|
Content-Transfer-Encoding: 8bit
 | 
						|
Content-Type: text/plain; charset="utf-8"
 | 
						|
 | 
						|
Remove unnecessary show_state() in the loop inside
 | 
						|
i2c_pxa_pio_set_master(), which can be unnecessarily verbose.
 | 
						|
 | 
						|
Remove the i2c_pxa_scream_blue_murder() in i2c_pxa_pio_xfer(), which
 | 
						|
will trigger if we are probing the I2C bus and a slave does not
 | 
						|
respond; this is a normal event, and not something to report.
 | 
						|
 | 
						|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
 | 
						|
---
 | 
						|
 drivers/i2c/busses/i2c-pxa.c | 4 +---
 | 
						|
 1 file changed, 1 insertion(+), 3 deletions(-)
 | 
						|
 | 
						|
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
 | 
						|
index 0becab239476..db739cce93ac 100644
 | 
						|
--- a/drivers/i2c/busses/i2c-pxa.c
 | 
						|
+++ b/drivers/i2c/busses/i2c-pxa.c
 | 
						|
@@ -1161,10 +1161,8 @@ static int i2c_pxa_pio_set_master(struct pxa_i2c *i2c)
 | 
						|
 	/*
 | 
						|
 	 * Wait for the bus to become free.
 | 
						|
 	 */
 | 
						|
-	while (timeout-- && readl(_ISR(i2c)) & (ISR_IBB | ISR_UB)) {
 | 
						|
+	while (timeout-- && readl(_ISR(i2c)) & (ISR_IBB | ISR_UB))
 | 
						|
 		udelay(1000);
 | 
						|
-		show_state(i2c);
 | 
						|
-	}
 | 
						|
 
 | 
						|
 	if (timeout < 0) {
 | 
						|
 		show_state(i2c);
 | 
						|
-- 
 | 
						|
2.20.1
 | 
						|
 |