Merge branch 'lr/olpc-xo175' of salsa.debian.org:lkundrak-guest/linux

debian/config/armhf/config

@@ -72,6 +72,12 @@ CONFIG_SOC_IMX6UL=y
 ##
 CONFIG_ARCH_MESON=y
 
+##
+## file: arch/arm/mach-mmp/Kconfig
+##
+CONFIG_ARCH_MMP=y
+CONFIG_MACH_MMP2_DT=y
+
 ##
 ## file: arch/arm/mach-mvebu/Kconfig
 ##
@@ -287,6 +293,12 @@ CONFIG_GPIO_TWL6040=y
 ##
 CONFIG_DRM=m
 
+##
+## file: drivers/gpu/drm/armada/Kconfig
+##
+
+CONFIG_DRM_ARMADA=m
+
 ##
 ## file: drivers/gpu/drm/bridge/synopsys/Kconfig
 ##
@@ -448,6 +460,7 @@ CONFIG_I2C_IMX=m
 CONFIG_I2C_MESON=m
 CONFIG_I2C_MV64XXX=m
 CONFIG_I2C_OMAP=y
+CONFIG_I2C_PXA=m
 CONFIG_I2C_RK3X=m
 CONFIG_I2C_S3C2410=y
 CONFIG_I2C_SUN6I_P2WI=m
@@ -520,6 +533,7 @@ CONFIG_MOUSE_ELAN_I2C=m
 ## file: drivers/input/serio/Kconfig
 ##
 CONFIG_SERIO_AMBAKMI=m
+CONFIG_SERIO_OLPC_APSP=m
 CONFIG_SERIO_SUN4I_PS2=m
 
 ##
@@ -643,6 +657,11 @@ CONFIG_TI_ST=m
 ##
 CONFIG_MMC=y
 
+##
+## file: drivers/mmc/core/Kconfig
+##
+CONFIG_PWRSEQ_SD8787=m
+
 ##
 ## file: drivers/mmc/host/Kconfig
 ##
@@ -916,6 +935,11 @@ CONFIG_PCI_IMX6=y
 CONFIG_PHY_SUN4I_USB=m
 CONFIG_PHY_SUN9I_USB=m
 
+##
+## file: drivers/phy/marvell/Kconfig
+##
+CONFIG_PHY_PXA_USB=m
+
 ##
 ## file: drivers/phy/rockchip/Kconfig
 ##
@@ -1101,6 +1125,7 @@ CONFIG_ARCH_TEGRA_124_SOC=y
 ## file: drivers/spi/Kconfig
 ##
 CONFIG_SPI=y
+CONFIG_SPI_SLAVE=y
 CONFIG_SPI_BCM2835=m
 CONFIG_SPI_BCM2835AUX=m
 CONFIG_SPI_GPIO=y
@@ -1111,6 +1136,7 @@ CONFIG_SPI_OMAP24XX=m
 CONFIG_SPI_TI_QSPI=m
 CONFIG_SPI_ORION=m
 CONFIG_SPI_PL022=m
+CONFIG_SPI_PXA2XX=m
 CONFIG_SPI_ROCKCHIP=m
 CONFIG_SPI_SUN4I=m
 CONFIG_SPI_SUN6I=m
@@ -1231,6 +1257,7 @@ CONFIG_USB_G_NOKIA=m
 CONFIG_USB_XHCI_MVEBU=m
 CONFIG_USB_XHCI_TEGRA=m
 CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_MV=m
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_EHCI_HCD_OMAP=y
 CONFIG_USB_EHCI_TEGRA=m