Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fbdev: smscufx: Make I2C terminology more inclusive

I2C v7, SMBus 3.2, and I3C 1.1.1 specifications have replaced "master/slave"
with more appropriate terms. Inspired by Wolfram's series to fix drivers/i2c/,
fix the terminology for users of I2C_ALGOBIT bitbanging interface, now that
the approved verbiage exists in the specification.

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com>
Signed-off-by: Helge Deller <deller@gmx.de>

authored by

Easwar Hariharan and committed by
Helge Deller
3cf12cab 7ee6cfe6

+2 -2
+2 -2
drivers/video/fbdev/smscufx.c
··· 1292 1292 return 0; 1293 1293 } 1294 1294 1295 - /* sets up I2C Controller for 100 Kbps, std. speed, 7-bit addr, master, 1295 + /* sets up DDC channel for 100 Kbps, std. speed, 7-bit addr, controller mode, 1296 1296 * restart enabled, but no start byte, enable controller */ 1297 1297 static int ufx_i2c_init(struct ufx_data *dev) 1298 1298 { ··· 1321 1321 /* 7-bit (not 10-bit) addressing */ 1322 1322 tmp &= ~(0x10); 1323 1323 1324 - /* enable restart conditions and master mode */ 1324 + /* enable restart conditions and controller mode */ 1325 1325 tmp |= 0x21; 1326 1326 1327 1327 status = ufx_reg_write(dev, 0x1000, tmp);