diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 5f15265be5..9109ac6dba 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_DM_KEYBOARD) += keyboard-uclass.o
 obj-$(CONFIG_I8042_KEYB) += i8042.o
 obj-$(CONFIG_TEGRA_KEYBOARD) += tegra-kbc.o
 obj-$(CONFIG_TWL4030_INPUT) += twl4030.o
+obj-$(CONFIG_TWL6030_INPUT) += twl6030.o
 obj-$(CONFIG_CROS_EC_KEYB) += cros_ec_keyb.o
 ifdef CONFIG_PS2KBD
 obj-y += keyboard.o pc_keyb.o
diff --git a/drivers/input/twl6030.c b/drivers/input/twl6030.c
new file mode 100644
index 0000000000..8de032a1cd
--- /dev/null
+++ b/drivers/input/twl6030.c
@@ -0,0 +1,48 @@
+/*
+ * TWL6030 input
+ *
+ * Copyright (C) 2016 Paul Kocialkowski <contact@paulk.fr>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <twl6030.h>
+
+int twl6030_input_power_button(void)
+{
+	u8 value;
+
+	twl6030_i2c_read_u8(TWL6030_CHIP_PM, TWL6030_STS_HW_CONDITIONS, &value);
+
+	/* Power button is active low. */
+	if (value & TWL6030_STS_HW_CONDITIONS_PWRON)
+		return 0;
+
+	return 1;
+}
+
+int twl6030_input_charger(void)
+{
+	u8 value;
+
+	twl6030_i2c_read_u8(TWL6030_CHIP_CHARGER, TWL6030_CONTROLLER_STAT1,
+		&value);
+
+	if (value & TWL6030_CONTROLLER_STAT1_VAC_DET)
+		return 1;
+
+	return 0;
+}
+
+int twl6030_input_usb(void)
+{
+	u8 value;
+
+	twl6030_i2c_read_u8(TWL6030_CHIP_CHARGER, TWL6030_CONTROLLER_STAT1,
+		&value);
+
+	if (value & TWL6030_CONTROLLER_STAT1_VBUS_DET)
+		return 1;
+
+	return 0;
+}
diff --git a/include/twl6030.h b/include/twl6030.h
index 26c27a4448..40e2c111d7 100644
--- a/include/twl6030.h
+++ b/include/twl6030.h
@@ -20,6 +20,10 @@
 #define TWL6030_CHIP_PWM	0x49
 
 /* Slave Address 0x48 */
+#define TWL6030_STS_HW_CONDITIONS	0x21
+
+#define TWL6030_STS_HW_CONDITIONS_PWRON	(1 << 0)
+
 #define TWL6030_PHOENIX_DEV_ON		0x25
 
 #define TWL6030_PHOENIX_APP_DEVOFF	(1 << 0)
@@ -59,6 +63,11 @@
 
 /* Slave Address 0x49 */
 
+#define TWL6030_CONTROLLER_STAT1		0xE3
+
+#define TWL6030_CONTROLLER_STAT1_VAC_DET	(1 << 3)
+#define TWL6030_CONTROLLER_STAT1_VBUS_DET	(1 << 2)
+
 /* Battery CHARGER REGISTERS */
 #define CONTROLLER_INT_MASK	0xE0
 #define CONTROLLER_CTRL1	0xE1
@@ -188,6 +197,10 @@ static inline int twl6030_i2c_read_u8(u8 chip_no, u8 reg, u8 *val)
 	return i2c_read(chip_no, reg, 1, val, 1);
 }
 
+/*
+ * Power
+ */
+
 void twl6030_power_off(void);
 void twl6030_init_battery_charging(void);
 void twl6030_usb_device_settings(void);
@@ -197,4 +210,12 @@ int twl6030_get_battery_voltage(void);
 int twl6030_get_battery_current(void);
 void twl6030_power_mmc_init(int dev_index);
 
+/*
+ * Input
+ */
+
+int twl6030_input_power_button(void);
+int twl6030_input_charger(void);
+int twl6030_input_usb(void);
+
 #endif /* TWL6030_H */