Merge branch 'for-4.11/acpi' into for-next (776906ff) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/acpi/acpi_lpss.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include <linux/platform_data/clk-lpss.h>
		#include <linux/pm_domain.h>
		#include <linux/pm_runtime.h>
		#include <linux/pwm.h>
		#include <linux/delay.h>

		#include "internal.h"
		@@ -154,6 +155,18 @@ static void byt_i2c_setup(struct lpss_private_data *pdata)
		writel(0, pdata->mmio_base + LPSS_I2C_ENABLE);
		}

		/* BSW PWM used for backlight control by the i915 driver */
		static struct pwm_lookup bsw_pwm_lookup[] = {
		PWM_LOOKUP_WITH_MODULE("80862288:00", 0, "0000:00:02.0",
		"pwm_backlight", 0, PWM_POLARITY_NORMAL,
		"pwm-lpss-platform"),
		};

		static void bsw_pwm_setup(struct lpss_private_data *pdata)
		{
		pwm_add_table(bsw_pwm_lookup, ARRAY_SIZE(bsw_pwm_lookup));
		}

		static const struct lpss_device_desc lpt_dev_desc = {
		.flags = LPSS_CLK \| LPSS_CLK_GATE \| LPSS_CLK_DIVIDER \| LPSS_LTR,
		.prv_offset = 0x800,
		@@ -191,6 +204,7 @@ static const struct lpss_device_desc byt_pwm_dev_desc = {

		static const struct lpss_device_desc bsw_pwm_dev_desc = {
		.flags = LPSS_SAVE_CTX \| LPSS_NO_D3_DELAY,
		.setup = bsw_pwm_setup,
		};

		static const struct lpss_device_desc byt_uart_dev_desc = {