Commit b33a02aa authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Wolfram Sang
Browse files

i2c: acpi: Move I2C bits from acpi.h to i2c.h 

As discussed previously the best location for certain bus related bits,
e.g. I2C, is its own realm of the headers.

In order to uncontaminate acpi.h move the I2C bits to i2c.h.

There is no functional change intended.

Link: https://lkml.org/lkml/2018/11/28/744


Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent e1ab9a46

include/linux/acpi.h

+0 −11
Original line number Diff line number Diff line
@@ -1061,17 +1061,6 @@ static inline int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index) 
}

#endif



#if defined(CONFIG_ACPI) && IS_ENABLED(CONFIG_I2C)

bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,

			       struct acpi_resource_i2c_serialbus **i2c);

#else

static inline bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,

					     struct acpi_resource_i2c_serialbus **i2c)

{

	return false;

}

#endif



/* Device properties */



#ifdef CONFIG_ACPI

include/linux/i2c.h

+10 −0
Original line number Diff line number Diff line
@@ -967,11 +967,21 @@ static inline int of_i2c_get_board_info(struct device *dev, 


#endif /* CONFIG_OF */



struct acpi_resource;

struct acpi_resource_i2c_serialbus;



#if IS_ENABLED(CONFIG_ACPI)

bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,

			       struct acpi_resource_i2c_serialbus **i2c);

u32 i2c_acpi_find_bus_speed(struct device *dev);

struct i2c_client *i2c_acpi_new_device(struct device *dev, int index,

				       struct i2c_board_info *info);

#else

static inline bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,

					     struct acpi_resource_i2c_serialbus **i2c)

{

	return false;

}

static inline u32 i2c_acpi_find_bus_speed(struct device *dev)

{

	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE