History

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

Pull i2c updates from Wolfram Sang: - mostly driver updates. Bigger ones for mlxcpld and iproc. But most of them are all over the place. - removal of the efm32, sirf, u300, and zte zx bus drivers because of platform removal. So, we have a pleasant diffstat this time. - first set of cleanups in the I2C core as preparation to increase maximum length of SMBus transfers to 255 (as specified in the new standard). Better documentation of struct i2c_msg and its flags stand out here. - the testunit can now respond to SMBus block process calls which is the testcase when implementing the above new maximum length. * 'i2c/for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (62 commits) i2c: remove redundant error print in stm32f7_i2c_probe i2c: testunit: add support for block process calls i2c: busses: Replace spin_lock_irqsave with spin_lock in hard IRQ dt-bindings: eeprom: at24: Document ROHM BR24G01 i2c: i801: Add support for Intel Alder Lake PCH-P i2c: mv64xxx: Fix check for missing clock after adding RPM i2c: mux: mlxcpld: Add callback to notify mux creation completion i2c: mux: mlxcpld: Extend supported mux number i2c: mux: mlxcpld: Extend driver to support word address space devices i2c: mux: mlxcpld: Get rid of adapter numbers enforcement i2c: mux: mlxcpld: Prepare mux selection infrastructure for two-byte support i2c: mux: mlxcpld: Convert driver to platform driver i2c: imx: Synthesize end of transaction events without idle interrupts i2c: i2c-qcom-geni: Add shutdown callback for i2c i2c: mv64xxx: Add runtime PM support i2c: amd-mp2: Remove unused macro i2c: amd-mp2: convert to PCI logging functions i2c: mux: mlxcpld: Move header file out of x86 realm platform/x86: mlxcpld: Update module license i2c: mux: mlxcpld: Update module license ...

Linus Torvalds committed 5 years ago

Commit 32c080c2 parents a26a9d8 0b16cfd44 files · +906 −3201Browse files

Showing the changes to include/linux/platform_data (2 of 44 files). Show all

Unified · Split

2 files
  1. include/linux/platform_data/mlxcpld.h +31 −0
  2. include/linux/platform_data/x86/mlxcpld.h +0 −52
include/linux/platform_data/mlxcpld.h+31−0
@@ -0,0 +1,31 @@
1+/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */
2+/*
3+ * Mellanox I2C multiplexer support in CPLD
4+ *
5+ * Copyright (C) 2016-2020 Mellanox Technologies
6+ */
7+
8+#ifndef _LINUX_I2C_MLXCPLD_H
9+#define _LINUX_I2C_MLXCPLD_H
10+
11+/* Platform data for the CPLD I2C multiplexers */
12+
13+/* mlxcpld_mux_plat_data - per mux data, used with i2c_register_board_info
14+ * @chan_ids - channels array
15+ * @num_adaps - number of adapters
16+ * @sel_reg_addr - mux select register offset in CPLD space
17+ * @reg_size: register size in bytes
18+ * @handle: handle to be passed by callback
19+ * @completion_notify: callback to notify when all the adapters are created
20+ */
21+struct mlxcpld_mux_plat_data {
22+ int *chan_ids;
23+ int num_adaps;
24+ int sel_reg_addr;
25+ u8 reg_size;
26+ void *handle;
27+ int (*completion_notify)(void *handle, struct i2c_adapter *parent,
28+ struct i2c_adapter *adapters[]);
29+};
30+
31+#endif /* _LINUX_I2C_MLXCPLD_H */
include/linux/platform_data/x86/mlxcpld.h+0−52
@@ -1,52 +0,0 @@
1−/*
2− * mlxcpld.h - Mellanox I2C multiplexer support in CPLD
3− *
4− * Copyright (c) 2016 Mellanox Technologies. All rights reserved.
5− * Copyright (c) 2016 Michael Shych <michaels@mellanox.com>
6− *
7− * Redistribution and use in source and binary forms, with or without
8− * modification, are permitted provided that the following conditions are met:
9− *
10− * 1. Redistributions of source code must retain the above copyright
11− * notice, this list of conditions and the following disclaimer.
12− * 2. Redistributions in binary form must reproduce the above copyright
13− * notice, this list of conditions and the following disclaimer in the
14− * documentation and/or other materials provided with the distribution.
15− * 3. Neither the names of the copyright holders nor the names of its
16− * contributors may be used to endorse or promote products derived from
17− * this software without specific prior written permission.
18− *
19− * Alternatively, this software may be distributed under the terms of the
20− * GNU General Public License ("GPL") version 2 as published by the Free
21− * Software Foundation.
22− *
23− * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
24− * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
25− * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26− * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
27− * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
28− * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
29− * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
30− * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
31− * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
32− * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33− * POSSIBILITY OF SUCH DAMAGE.
34− */
35−
36−#ifndef _LINUX_I2C_MLXCPLD_H
37−#define _LINUX_I2C_MLXCPLD_H
38−
39−/* Platform data for the CPLD I2C multiplexers */
40−
41−/* mlxcpld_mux_plat_data - per mux data, used with i2c_register_board_info
42− * @adap_ids - adapter array
43− * @num_adaps - number of adapters
44− * @sel_reg_addr - mux select register offset in CPLD space
45− */
46−struct mlxcpld_mux_plat_data {
47− int *adap_ids;
48− int num_adaps;
49− int sel_reg_addr;
50−};
51−
52−#endif /* _LINUX_I2C_MLXCPLD_H */