Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f25e2295 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:
 "Two bugfixes for the AT24 I2C eeprom driver and some minor corrections
  for I2C bus drivers"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: piix4: Fix port number check on release
  i2c: stm32: Fix copyrights
  i2c-cht-wc: constify platform_device_id
  eeprom: at24: change nvmem stride to 1
  eeprom: at24: fix I2C device selection for runtime PM
parents d025fbf1 45fd4470

drivers/i2c/busses/i2c-cht-wc.c

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static int cht_wc_i2c_adap_i2c_remove(struct platform_device *pdev) 
	return 0;

}



static struct platform_device_id cht_wc_i2c_adap_id_table[] = {

static const struct platform_device_id cht_wc_i2c_adap_id_table[] = {

	{ .name = "cht_wcove_ext_chgr" },

	{},

};

drivers/i2c/busses/i2c-piix4.c

+1 −1
Original line number Diff line number Diff line
@@ -983,7 +983,7 @@ static void piix4_adap_remove(struct i2c_adapter *adap) 


	if (adapdata->smba) {

		i2c_del_adapter(adap);

		if (adapdata->port == (0 << 1)) {

		if (adapdata->port == (0 << piix4_port_shift_sb800)) {

			release_region(adapdata->smba, SMBIOSIZE);

			if (adapdata->sb800_main)

				release_region(SB800_PIIX4_SMB_IDX, 2);

drivers/i2c/busses/i2c-stm32.h

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * i2c-stm32.h

 *

 * Copyright (C) M'boumba Cedric Madianga 2017

 * Copyright (C) STMicroelectronics 2017

 * Author: M'boumba Cedric Madianga <cedric.madianga@gmail.com>

 *

 * License terms:  GNU General Public License (GPL), version 2

 */



#ifndef _I2C_STM32_H

drivers/i2c/busses/i2c-stm32f4.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Driver for STMicroelectronics STM32 I2C controller

 *
@@ -6,11 +7,11 @@ 
 * http://www.st.com/resource/en/reference_manual/DM00031020.pdf

 *

 * Copyright (C) M'boumba Cedric Madianga 2016

 * Copyright (C) STMicroelectronics 2017

 * Author: M'boumba Cedric Madianga <cedric.madianga@gmail.com>

 *

 * This driver is based on i2c-st.c

 *

 * License terms:  GNU General Public License (GPL), version 2

 */



#include <linux/clk.h>

drivers/i2c/busses/i2c-stm32f7.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Driver for STMicroelectronics STM32F7 I2C controller

 *
@@ -7,11 +8,11 @@ 
 * http://www.st.com/resource/en/reference_manual/dm00124865.pdf

 *

 * Copyright (C) M'boumba Cedric Madianga 2017

 * Copyright (C) STMicroelectronics 2017

 * Author: M'boumba Cedric Madianga <cedric.madianga@gmail.com>

 *

 * This driver is based on i2c-stm32f4.c

 *

 * License terms:  GNU General Public License (GPL), version 2

 */

#include <linux/clk.h>

#include <linux/delay.h>