Merge remote-tracking branch 'origin/master'

1 files changed, 21 insertions, 13 deletions

diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 54f3be463..765f0f44e 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -150,6 +150,7 @@ CONFIG_ALI_FIR=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
 # CONFIG_ALTERA_MBOX is not set
+CONFIG_ALTERA_MSGDMA=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALTIVEC=y
@@ -1129,6 +1130,7 @@ CONFIG_DVB_BUDGET_PATCH=m
 CONFIG_DVB_CORE=m
 # CONFIG_DVB_CXD2099 is not set
 CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
 # CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
 CONFIG_DVB_DM1105=m
 CONFIG_DVB_DYNAMIC_MINORS=y
@@ -1488,6 +1490,7 @@ CONFIG_GIRBIL_DONGLE=m
 # CONFIG_GPIO_ADP5588 is not set
 # CONFIG_GPIO_ALTERA is not set
 # CONFIG_GPIO_AMDPT is not set
+CONFIG_GPIO_BD9571MWV=m
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_DWAPB is not set
 CONFIG_GPIO_EXAR=m
@@ -1514,6 +1517,7 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_SYSFS is not set
 # CONFIG_GPIO_TPIC2810 is not set
+CONFIG_GPIO_TPS68470=y
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
 # CONFIG_GPIO_UCB1400 is not set
@@ -1785,8 +1789,7 @@ CONFIG_I2C_NFORCE2=m
 # CONFIG_I2C_NFORCE2_S4985 is not set
 # CONFIG_I2C_OCORES is not set
 CONFIG_I2C_OPAL=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
 CONFIG_I2C_PCA_PLATFORM=m
 # CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_RK3X is not set
@@ -1978,6 +1981,7 @@ CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_RK805_PWRKEY=m
 CONFIG_INPUT_SPARSEKMAP=m
 CONFIG_INPUT_TABLET=y
 CONFIG_INPUT_TOUCHSCREEN=y
@@ -2153,6 +2157,7 @@ CONFIG_IRDA=m
 CONFIG_IR_ENE=m
 CONFIG_IR_FINTEK=m
 CONFIG_IR_GPIO_CIR=m
+CONFIG_IR_GPIO_TX=m
 CONFIG_IR_HIX5HD2=m
 CONFIG_IR_IGORPLUGUSB=m
 CONFIG_IR_IGUANA=m
@@ -2167,6 +2172,7 @@ CONFIG_IR_MCEUSB=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IRNET=m
 CONFIG_IR_NUVOTON=m
+CONFIG_IR_PWM_TX=m
 CONFIG_IRQ_ALL_CPUS=y
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 # CONFIG_IRQSOFF_TRACER is not set
@@ -2399,6 +2405,7 @@ CONFIG_LCD_PLATFORM=m
 # CONFIG_LDM_DEBUG is not set
 CONFIG_LDM_PARTITION=y
 # CONFIG_LEDS_AAT1290 is not set
+CONFIG_LEDS_AS3645A=m
 # CONFIG_LEDS_BCM6328 is not set
 # CONFIG_LEDS_BCM6358 is not set
 # CONFIG_LEDS_BD2802 is not set
@@ -2672,6 +2679,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_AXP20X_I2C is not set
 # CONFIG_MFD_AXP20X is not set
 # CONFIG_MFD_BCM590XX is not set
+CONFIG_MFD_BD9571MWV=m
 CONFIG_MFD_CORE=m
 # CONFIG_MFD_CPCAP is not set
 # CONFIG_MFD_CROS_EC is not set
@@ -2736,6 +2744,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_TPS65912_I2C is not set
 # CONFIG_MFD_TPS65912 is not set
 # CONFIG_MFD_TPS65912_SPI is not set
+CONFIG_MFD_TPS68470=y
 # CONFIG_MFD_TPS80031 is not set
 CONFIG_MFD_VIPERBOARD=m
 CONFIG_MFD_VX855=m
@@ -3537,14 +3546,8 @@ CONFIG_PANIC_TIMEOUT=0
 CONFIG_PANTHERLORD_FF=y
 # CONFIG_PARIDE is not set
 CONFIG_PARMAN=m
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT is not set
+# CONFIG_PARPORT_PC is not set
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_PATA_ACPI=m
 CONFIG_PATA_ALI=m
@@ -3669,6 +3672,7 @@ CONFIG_PID_NS=y
 # CONFIG_PINCTRL_IPQ8074 is not set
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
+CONFIG_PINCTRL_RK805=m
 # CONFIG_PINCTRL_SPRD is not set
 # CONFIG_PINCTRL_SPRD_SC9860 is not set
 # CONFIG_PINCTRL_SX150X is not set
@@ -3732,6 +3736,7 @@ CONFIG_PPC_EMULATED_STATS=y
 # CONFIG_PPC_ICSWX_USE_SIGILL is not set
 CONFIG_PPC_ICSWX=y
 # CONFIG_PPC_MAPLE is not set
+# CONFIG_PPC_MEMTRACE is not set
 # CONFIG_PPC_MPC5200_LPBFIFO is not set
 CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
 # CONFIG_PPC_PASEMI is not set
@@ -3746,6 +3751,7 @@ CONFIG_PPC_SMLPAR=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_PPC_SUBPAGE_PROT=y
 CONFIG_PPC_TRANSACTIONAL_MEM=y
+CONFIG_PPC_VAS=y
 CONFIG_PPC=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -3762,9 +3768,7 @@ CONFIG_PPP_SYNC_TTY=m
 CONFIG_PPS_CLIENT_GPIO=m
 # CONFIG_PPS_CLIENT_KTIMER is not set
 CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
 # CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
 CONFIG_PPS=m
 CONFIG_PPTP=m
 # CONFIG_PREEMPT is not set
@@ -3907,6 +3911,7 @@ CONFIG_REALTEK_PHY=m
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP_I2C=m
 CONFIG_REGMAP=y
+CONFIG_REGULATOR_BD9571MWV=m
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR is not set
 # CONFIG_REGULATOR_TPS65132 is not set
@@ -3921,6 +3926,7 @@ CONFIG_RELAY=y
 # CONFIG_RELOCATABLE_TEST is not set
 CONFIG_RELOCATABLE=y
 CONFIG_REMOTEPROC=m
+CONFIG_RESET_ATTACK_MITIGATION=y
 # CONFIG_RESET_TI_SYSCON is not set
 # CONFIG_RFD_FTL is not set
 CONFIG_RFKILL_GPIO=m
@@ -4486,6 +4492,7 @@ CONFIG_SERIO_ALTERA_PS2=m
 # CONFIG_SERIO_APBPS2 is not set
 CONFIG_SERIO_ARC_PS2=m
 # CONFIG_SERIO_CT82C710 is not set
+CONFIG_SERIO_GPIO_PS2=m
 CONFIG_SERIO_I8042=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_OLPC_APSP is not set
@@ -4715,6 +4722,7 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
+CONFIG_SND_SOC_CS43130=m
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
 CONFIG_SND_SOC_DIO2125=m
@@ -4777,6 +4785,7 @@ CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_TS3A227E is not set
 # CONFIG_SND_SOC_WM8510 is not set
 # CONFIG_SND_SOC_WM8523 is not set
+CONFIG_SND_SOC_WM8524=m
 # CONFIG_SND_SOC_WM8580 is not set
 # CONFIG_SND_SOC_WM8711 is not set
 # CONFIG_SND_SOC_WM8728 is not set
@@ -5450,7 +5459,6 @@ CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
 # CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
 CONFIG_USB_SERIAL_MOS7720=m
 CONFIG_USB_SERIAL_MOS7840=m
 # CONFIG_USB_SERIAL_MXUPORT is not set