Commit 019cddc8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull second i2c update from Wolfram Sang:
 "As promised, here is my 2nd pull request for I2C, containing:

   - removal of the attach_adapter callback, converting its last user

   - removal of any __deprecated usage within I2C

   - one email address update

   - some SPDX conversion"

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: don't use any __deprecated handling anymore
  i2c: use SPDX identifier for Renesas drivers
  i2c: ocores: update my email address
  i2c: remove deprecated attach_adapter callback
  macintosh: therm_windtunnel: drop using attach_adapter
parents d002924f 00efcdce

Documentation/i2c/busses/i2c-ocores

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Supported adapters: 
  * OpenCores.org I2C controller by Richard Herveille (see datasheet link)

    https://opencores.org/project/i2c/overview



Author: Peter Korsgaard <jacmet@sunsite.dk>

Author: Peter Korsgaard <peter@korsgaard.com>



Description

-----------

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10787,7 +10787,7 @@ F: arch/*/boot/dts/ 
F:	include/dt-bindings/



OPENCORES I2C BUS DRIVER

M:	Peter Korsgaard <jacmet@sunsite.dk>

M:	Peter Korsgaard <peter@korsgaard.com>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	Documentation/i2c/busses/i2c-ocores

drivers/i2c/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -18,4 +18,3 @@ obj-$(CONFIG_I2C_STUB) += i2c-stub.o 
obj-$(CONFIG_I2C_SLAVE_EEPROM)	+= i2c-slave-eeprom.o



ccflags-$(CONFIG_I2C_DEBUG_CORE) := -DDEBUG
 
CFLAGS_i2c-core-base.o := -Wno-deprecated-declarations

drivers/i2c/busses/i2c-emev2.c

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

/*

 * I2C driver for the Renesas EMEV2 SoC

 *

 * Copyright (C) 2015 Wolfram Sang <wsa@sang-engineering.com>

 * Copyright 2013 Codethink Ltd.

 * Copyright 2010-2015 Renesas Electronics Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2

 * as published by the Free Software Foundation.

 */



#include <linux/clk.h>

drivers/i2c/busses/i2c-highlander.c

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

/*

 * Renesas Solutions Highlander FPGA I2C/SMBus support.

 *
@@ -6,10 +7,6 @@ 
 * Copyright (C) 2008  Paul Mundt

 * Copyright (C) 2008  Renesas Solutions Corp.

 * Copyright (C) 2008  Atom Create Engineering Co., Ltd.

 *

 * This file is subject to the terms and conditions of the GNU General

 * Public License version 2. See the file "COPYING" in the main directory

 * of this archive for more details.

 */

#include <linux/module.h>

#include <linux/interrupt.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE