From cc45741e1975a2c38d2f973931035d08a984f04f Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 5 May 2016 20:33:14 +0000 Subject: [PATCH 1/3] ARM: socfpga: Update socfpga_defconfig Enable the following bits: CONFIG_TOUCHSCREEN_STMPE - STMPE touchscreen support, needed on MCVEVK as it contains the chip. This also enables the STMPE MFD device and touchscreen input support. CONFIG_USB_STORAGE - USB storage support is often used, so enable it. Signed-off-by: Marek Vasut Cc: Dinh Nguyen Signed-off-by: Dinh Nguyen --- arch/arm/configs/socfpga_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig index 753f1a5defc7..c2671375730a 100644 --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig @@ -59,6 +59,8 @@ CONFIG_NETDEVICES=y CONFIG_STMMAC_ETH=y CONFIG_MICREL_PHY=y CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_STMPE=y # CONFIG_SERIO_SERPORT is not set CONFIG_SERIO_AMBAKMI=y CONFIG_LEGACY_PTY_COUNT=16 @@ -78,9 +80,11 @@ CONFIG_SENSORS_LTC2978=y CONFIG_SENSORS_LTC2978_REGULATOR=y CONFIG_WATCHDOG=y CONFIG_DW_WATCHDOG=y +CONFIG_MFD_STMPE=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_USB=y +CONFIG_USB_STORAGE=y CONFIG_USB_DWC2=y CONFIG_NOP_USB_XCEIV=y CONFIG_USB_GADGET=y From 417adec309702ba88d64ffd4a852b261685a8090 Mon Sep 17 00:00:00 2001 From: Ley Foon Tan Date: Wed, 15 Jun 2016 14:49:04 +0800 Subject: [PATCH 2/3] ARM: socfpga: add PCIe to socfpga_defconfig Enable Altera PCIe host driver, Altera MSI driver and PCIe devices. CONFIG_PCI=y CONFIG_PCI_MSI=y CONFIG_PCIE_ALTERA=y CONFIG_PCIE_ALTERA_MSI=y CONFIG_BLK_DEV_NVME=m CONFIG_E1000E=m CONFIG_IGB=m CONFIG_IXGBE=m Signed-off-by: Ley Foon Tan Signed-off-by: Tien Hock Loh Cc: Dinh Nguyen Signed-off-by: Dinh Nguyen --- arch/arm/configs/socfpga_defconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig index c2671375730a..e37c18bd3e6a 100644 --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig @@ -19,6 +19,10 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_SOCFPGA=y CONFIG_ARM_THUMBEE=y +CONFIG_PCI=y +CONFIG_PCI_MSI=y +CONFIG_PCIE_ALTERA=y +CONFIG_PCIE_ALTERA_MSI=y CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_AEABI=y @@ -50,12 +54,16 @@ CONFIG_DEVTMPFS_MOUNT=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=2 CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_BLK_DEV_NVME=m CONFIG_SRAM=y CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y # CONFIG_SCSI_LOWLEVEL is not set CONFIG_NETDEVICES=y +CONFIG_E1000E=m +CONFIG_IGB=m +CONFIG_IXGBE=m CONFIG_STMMAC_ETH=y CONFIG_MICREL_PHY=y CONFIG_INPUT_EVDEV=y From 2baf9e9ec0d2528c94f0af41ccc014f63bb3ca03 Mon Sep 17 00:00:00 2001 From: Dinh Nguyen Date: Tue, 14 Jun 2016 15:51:48 -0500 Subject: [PATCH 3/3] ARM: socfpga: enable PL330 DMA in socfpga_defconfig Enable the PL330 DMA and DMATEST on SoCFPGA. make savedefconfig says CONFIG_FHANDLE is not needed in the defconfig, remove it. Signed-off-by: Dinh Nguyen --- v2: Also enable DMATEST as a kernel module --- arch/arm/configs/socfpga_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig index e37c18bd3e6a..9f84be5b3ac5 100644 --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig @@ -1,5 +1,4 @@ CONFIG_SYSVIPC=y -CONFIG_FHANDLE=y CONFIG_HIGH_RES_TIMERS=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y @@ -98,6 +97,9 @@ CONFIG_NOP_USB_XCEIV=y CONFIG_USB_GADGET=y CONFIG_MMC=y CONFIG_MMC_DW=y +CONFIG_DMADEVICES=y +CONFIG_PL330_DMA=y +CONFIG_DMATEST=m CONFIG_FPGA=y CONFIG_FPGA_MGR_SOCFPGA=y CONFIG_EXT2_FS=y