From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/include/linux/i2c/atmel_mxt_ts.h | 25 ------------------------- kernel/include/linux/i2c/i2c-rcar.h | 10 ---------- kernel/include/linux/i2c/twl.h | 1 + 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 kernel/include/linux/i2c/atmel_mxt_ts.h delete mode 100644 kernel/include/linux/i2c/i2c-rcar.h (limited to 'kernel/include/linux/i2c') diff --git a/kernel/include/linux/i2c/atmel_mxt_ts.h b/kernel/include/linux/i2c/atmel_mxt_ts.h deleted file mode 100644 index 02bf6ea31..000000000 --- a/kernel/include/linux/i2c/atmel_mxt_ts.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Atmel maXTouch Touchscreen driver - * - * Copyright (C) 2010 Samsung Electronics Co.Ltd - * Author: Joonyoung Shim - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - */ - -#ifndef __LINUX_ATMEL_MXT_TS_H -#define __LINUX_ATMEL_MXT_TS_H - -#include - -/* The platform data for the Atmel maXTouch touchscreen driver */ -struct mxt_platform_data { - unsigned long irqflags; - u8 t19_num_keys; - const unsigned int *t19_keymap; -}; - -#endif /* __LINUX_ATMEL_MXT_TS_H */ diff --git a/kernel/include/linux/i2c/i2c-rcar.h b/kernel/include/linux/i2c/i2c-rcar.h deleted file mode 100644 index 496f5c2b2..000000000 --- a/kernel/include/linux/i2c/i2c-rcar.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __I2C_R_CAR_H__ -#define __I2C_R_CAR_H__ - -#include - -struct i2c_rcar_platform_data { - u32 bus_speed; -}; - -#endif /* __I2C_R_CAR_H__ */ diff --git a/kernel/include/linux/i2c/twl.h b/kernel/include/linux/i2c/twl.h index 0bc03f100..9ad7828d9 100644 --- a/kernel/include/linux/i2c/twl.h +++ b/kernel/include/linux/i2c/twl.h @@ -675,6 +675,7 @@ struct twl4030_power_data { struct twl4030_resconfig *board_config; #define TWL4030_RESCONFIG_UNDEF ((u8)-1) bool use_poweroff; /* Board is wired for TWL poweroff */ + bool ac_charger_quirk; /* Disable AC charger on board */ }; extern int twl4030_remove_script(u8 flags); -- cgit 1.2.3-korg