From aa3bef2c09fad28ff7bb9a8f2126a92b85bfb214 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Tue, 21 Jun 2016 10:20:45 +0200 Subject: [PATCH] Clearfog fixes for Vanilla kernel, configuration update --- config/boards/armada.conf | 2 +- config/kernel/linux-marvell-next.config | 132 ++++++++++++------ general.sh | 2 +- ...-add-SFP-module-support-for-Clearfog.patch | 42 ++---- ...044-gpio-report-all-gpios-in-debugfs.patch | 12 +- 5 files changed, 115 insertions(+), 75 deletions(-) diff --git a/config/boards/armada.conf b/config/boards/armada.conf index 840e23afe6..cd2813087c 100644 --- a/config/boards/armada.conf +++ b/config/boards/armada.conf @@ -3,7 +3,7 @@ BOARD_NAME="Clearfog" LINUXFAMILY=marvell BOOTCONFIG=armada_38x_clearfog_config MODULES="" -MODULES_NEXT="" +MODULES_NEXT="mv88e6xxx_drv mv_cesa" SERIALCON=ttyS0 CLI_TARGET="jessie,trusty:default,next" KERNEL_TARGET="default,next" diff --git a/config/kernel/linux-marvell-next.config b/config/kernel/linux-marvell-next.config index 63dbfec631..278e937a63 100644 --- a/config/kernel/linux-marvell-next.config +++ b/config/kernel/linux-marvell-next.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.5.1 Kernel Configuration +# Linux/arm 4.6.2 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -161,6 +161,8 @@ CONFIG_SYSFS_SYSCALL=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set +CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y @@ -339,6 +341,7 @@ CONFIG_MACH_ARMADA_39X=y CONFIG_MACH_ARMADA_XP=y CONFIG_MACH_DOVE=y # CONFIG_ARCH_ALPINE is not set +# CONFIG_ARCH_ARTPEC is not set # CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_BCM is not set # CONFIG_ARCH_BERLIN is not set @@ -429,7 +432,8 @@ CONFIG_ARM_L1_CACHE_SHIFT=6 CONFIG_ARM_DMA_MEM_BUFFERABLE=y CONFIG_ARM_HEAVY_MB=y CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y -# CONFIG_ARM_KERNMEM_PERMS is not set +CONFIG_DEBUG_RODATA=y +CONFIG_DEBUG_ALIGN_RODATA=y CONFIG_IWMMXT=y CONFIG_MULTI_IRQ_HANDLER=y CONFIG_PJ4B_ERRATA_4742=y @@ -449,6 +453,7 @@ CONFIG_ARM_ERRATA_720789=y CONFIG_PCI=y # CONFIG_PCI_DOMAINS_GENERIC is not set CONFIG_PCI_SYSCALL=y +# CONFIG_PCIEPORTBUS is not set # CONFIG_PCI_MSI is not set # CONFIG_PCI_DEBUG is not set # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set @@ -456,15 +461,16 @@ CONFIG_PCI_SYSCALL=y # CONFIG_PCI_IOV is not set # CONFIG_PCI_PRI is not set # CONFIG_PCI_PASID is not set +# CONFIG_HOTPLUG_PCI is not set # # PCI host controller drivers # CONFIG_PCI_MVEBU=y +# CONFIG_PCIE_DW_PLAT is not set # CONFIG_PCI_HOST_GENERIC is not set # CONFIG_PCI_LAYERSCAPE is not set # CONFIG_PCIE_ALTERA is not set -# CONFIG_PCIEPORTBUS is not set # CONFIG_PCCARD is not set # @@ -711,7 +717,6 @@ CONFIG_INET_TUNNEL=y CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=y -CONFIG_INET_LRO=y CONFIG_INET_DIAG=m CONFIG_INET_TCP_DIAG=m CONFIG_INET_UDP_DIAG=m @@ -1245,6 +1250,7 @@ CONFIG_NET_ACT_SKBEDIT=m CONFIG_NET_ACT_VLAN=m CONFIG_NET_ACT_BPF=m CONFIG_NET_ACT_CONNMARK=m +# CONFIG_NET_ACT_IFE is not set CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y CONFIG_DCB=y @@ -1255,7 +1261,6 @@ CONFIG_OPENVSWITCH_GRE=m CONFIG_OPENVSWITCH_VXLAN=m CONFIG_OPENVSWITCH_GENEVE=m # CONFIG_VSOCKETS is not set -CONFIG_NETLINK_MMAP=y CONFIG_NETLINK_DIAG=m CONFIG_MPLS=y CONFIG_NET_MPLS_GSO=m @@ -1266,6 +1271,7 @@ CONFIG_NET_SWITCHDEV=y CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y +CONFIG_HWBM=y CONFIG_SOCK_CGROUP_DATA=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y @@ -1290,6 +1296,7 @@ CONFIG_BT_RFCOMM=m CONFIG_BT_HS=y CONFIG_BT_LE=y CONFIG_BT_6LOWPAN=m +# CONFIG_BT_LEDS is not set # CONFIG_BT_SELFTEST is not set CONFIG_BT_DEBUGFS=y @@ -1311,6 +1318,7 @@ CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m # CONFIG_BT_ATH3K is not set # CONFIG_AF_RXRPC is not set +# CONFIG_AF_KCM is not set CONFIG_FIB_RULES=y CONFIG_WIRELESS=y CONFIG_WEXT_CORE=y @@ -1318,7 +1326,6 @@ CONFIG_WEXT_PROC=y CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set -# CONFIG_CFG80211_REG_DEBUG is not set # CONFIG_CFG80211_CERTIFICATION_ONUS is not set CONFIG_CFG80211_DEFAULT_PS=y # CONFIG_CFG80211_DEBUGFS is not set @@ -1352,6 +1359,9 @@ CONFIG_CEPH_LIB=m # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set # CONFIG_NFC is not set CONFIG_LWTUNNEL=y +CONFIG_DST_CACHE=y +CONFIG_NET_DEVLINK=m +CONFIG_MAY_USE_DEVLINK=m CONFIG_HAVE_BPF_JIT=y # @@ -1390,7 +1400,7 @@ CONFIG_REGMAP_MMIO=y # Bus devices # # CONFIG_ARM_CCI400_PMU is not set -# CONFIG_ARM_CCI500_PMU is not set +# CONFIG_ARM_CCI5xx_PMU is not set # CONFIG_ARM_CCN is not set # CONFIG_BRCMSTB_GISB_ARB is not set CONFIG_MVEBU_MBUS=y @@ -1536,7 +1546,9 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_MG_DISK is not set # CONFIG_BLK_DEV_RBD is not set # CONFIG_BLK_DEV_RSXX is not set -# CONFIG_BLK_DEV_NVME is not set +CONFIG_NVME_CORE=m +CONFIG_BLK_DEV_NVME=m +# CONFIG_BLK_DEV_NVME_SCSI is not set # # Misc devices @@ -1598,6 +1610,10 @@ CONFIG_EEPROM_AT24=y # SCIF Bus Driver # +# +# VOP Bus Driver +# + # # Intel MIC Host Driver # @@ -1613,6 +1629,10 @@ CONFIG_EEPROM_AT24=y # # Intel MIC Coprocessor State Management (COSM) Drivers # + +# +# VOP Driver +# # CONFIG_ECHO is not set # CONFIG_CXL_BASE is not set # CONFIG_CXL_KERNEL_API is not set @@ -1808,7 +1828,6 @@ CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_CACHE=m -CONFIG_DM_CACHE_MQ=m CONFIG_DM_CACHE_SMQ=m CONFIG_DM_CACHE_CLEANER=m # CONFIG_DM_ERA is not set @@ -1843,6 +1862,7 @@ CONFIG_MACVTAP=y CONFIG_IPVLAN=y CONFIG_VXLAN=y CONFIG_GENEVE=m +CONFIG_MACSEC=m # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set @@ -1876,7 +1896,7 @@ CONFIG_NET_DSA_MV88E6XXX=m # CONFIG_NET_DSA_MV88E6060 is not set # CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set # CONFIG_NET_DSA_MV88E6131 is not set -# CONFIG_NET_DSA_MV88E6123_61_65 is not set +CONFIG_NET_DSA_MV88E6123=m # CONFIG_NET_DSA_MV88E6171 is not set CONFIG_NET_DSA_MV88E6352=m # CONFIG_NET_DSA_BCM_SF2 is not set @@ -1966,7 +1986,9 @@ CONFIG_NET_VENDOR_I825XX=y CONFIG_NET_VENDOR_MARVELL=y CONFIG_MV643XX_ETH=y CONFIG_MVMDIO=y +CONFIG_MVNETA_BM_ENABLE=m CONFIG_MVNETA=y +CONFIG_MVNETA_BM=y CONFIG_MVPP2=y # CONFIG_SKGE is not set # CONFIG_SKY2 is not set @@ -2274,6 +2296,7 @@ CONFIG_KEYBOARD_GPIO=y CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_BYD=y CONFIG_MOUSE_PS2_LOGIPS2PP=y CONFIG_MOUSE_PS2_SYNAPTICS=y CONFIG_MOUSE_PS2_CYPRESS=y @@ -2295,6 +2318,7 @@ CONFIG_MOUSE_PS2_FOCALTECH=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set +# CONFIG_RMI4_CORE is not set # # Hardware I/O ports @@ -2348,8 +2372,8 @@ CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_8250_DW=y # CONFIG_SERIAL_8250_EM is not set # CONFIG_SERIAL_8250_RT288X is not set -# CONFIG_SERIAL_8250_INGENIC is not set # CONFIG_SERIAL_8250_MID is not set +CONFIG_SERIAL_8250_MOXA=m CONFIG_SERIAL_OF_PLATFORM=y # @@ -2375,6 +2399,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set # CONFIG_SERIAL_ST_ASC is not set # CONFIG_SERIAL_STM32 is not set +CONFIG_SERIAL_MVEBU_UART=y +CONFIG_SERIAL_MVEBU_CONSOLE=y # CONFIG_TTY_PRINTK is not set # CONFIG_HVC_DCC is not set # CONFIG_IPMI_HANDLER is not set @@ -2460,8 +2486,10 @@ CONFIG_SPI_MASTER=y # SPI Master Controller Drivers # # CONFIG_SPI_ALTERA is not set +# CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_CADENCE is not set +# CONFIG_SPI_DESIGNWARE is not set # CONFIG_SPI_GPIO is not set # CONFIG_SPI_FSL_SPI is not set # CONFIG_SPI_OC_TINY is not set @@ -2473,7 +2501,6 @@ CONFIG_SPI_ORION=y # CONFIG_SPI_XCOMM is not set # CONFIG_SPI_XILINX is not set # CONFIG_SPI_ZYNQMP_GQSPI is not set -# CONFIG_SPI_DESIGNWARE is not set # # SPI Protocol Masters @@ -2542,6 +2569,7 @@ CONFIG_GPIO_SYSFS=y # CONFIG_GPIO_EM is not set # CONFIG_GPIO_GENERIC_PLATFORM is not set # CONFIG_GPIO_GRGPIO is not set +# CONFIG_GPIO_MPC8XXX is not set CONFIG_GPIO_MVEBU=y # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_VX855 is not set @@ -2560,6 +2588,7 @@ CONFIG_GPIO_PCA953X=y # CONFIG_GPIO_PCA953X_IRQ is not set # CONFIG_GPIO_PCF857X is not set # CONFIG_GPIO_SX150X is not set +# CONFIG_GPIO_TPIC2810 is not set # # MFD GPIO expanders @@ -2579,6 +2608,7 @@ CONFIG_GPIO_PCA953X=y # CONFIG_GPIO_74X164 is not set # CONFIG_GPIO_MAX7301 is not set # CONFIG_GPIO_MC33880 is not set +CONFIG_GPIO_PISOSR=m # # SPI or I2C GPIO expanders @@ -2633,6 +2663,7 @@ CONFIG_SENSORS_GPIO_FAN=y # CONFIG_SENSORS_POWR1220 is not set # CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LTC2945 is not set +CONFIG_SENSORS_LTC2990=m # CONFIG_SENSORS_LTC4151 is not set # CONFIG_SENSORS_LTC4215 is not set # CONFIG_SENSORS_LTC4222 is not set @@ -2749,11 +2780,9 @@ CONFIG_WATCHDOG_CORE=y # CONFIG_CADENCE_WATCHDOG is not set # CONFIG_DW_WATCHDOG is not set CONFIG_ORION_WATCHDOG=y -# CONFIG_TS4800_WATCHDOG is not set # CONFIG_MAX63XX_WATCHDOG is not set # CONFIG_ALIM7101_WDT is not set # CONFIG_I6300ESB_WDT is not set -CONFIG_BCM7038_WDT=m # CONFIG_MEN_A21_WDT is not set # @@ -2790,6 +2819,7 @@ CONFIG_BCMA_DRIVER_PCI=y # Multifunction device drivers # # CONFIG_MFD_CORE is not set +# CONFIG_MFD_ACT8945A is not set # CONFIG_MFD_AS3711 is not set # CONFIG_MFD_AS3722 is not set # CONFIG_PMIC_ADP5520 is not set @@ -2797,7 +2827,7 @@ CONFIG_BCMA_DRIVER_PCI=y # CONFIG_MFD_ATMEL_FLEXCOM is not set # CONFIG_MFD_ATMEL_HLCDC is not set # CONFIG_MFD_BCM590XX is not set -# CONFIG_MFD_AXP20X is not set +# CONFIG_MFD_AXP20X_I2C is not set # CONFIG_MFD_CROS_EC is not set # CONFIG_MFD_ASIC3 is not set # CONFIG_PMIC_DA903X is not set @@ -2859,12 +2889,12 @@ CONFIG_MFD_SYSCON=y # CONFIG_TPS6105X is not set # CONFIG_TPS65010 is not set # CONFIG_TPS6507X is not set +# CONFIG_MFD_TPS65086 is not set # CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_TPS65217 is not set # CONFIG_MFD_TPS65218 is not set # CONFIG_MFD_TPS6586X is not set # CONFIG_MFD_TPS65910 is not set -# CONFIG_MFD_TPS65912 is not set # CONFIG_MFD_TPS65912_I2C is not set # CONFIG_MFD_TPS65912_SPI is not set # CONFIG_MFD_TPS80031 is not set @@ -2927,6 +2957,11 @@ CONFIG_VGA_ARB=y CONFIG_VGA_ARB_MAX_GPUS=16 # CONFIG_DRM is not set +# +# ACP (Audio CoProcessor) Configuration +# +# CONFIG_DRM_AMD_ACP is not set + # # Frame buffer Devices # @@ -2944,6 +2979,7 @@ CONFIG_SND=y CONFIG_SND_TIMER=y CONFIG_SND_PCM=y CONFIG_SND_JACK=y +CONFIG_SND_JACK_INPUT_DEV=y # CONFIG_SND_SEQUENCER is not set # CONFIG_SND_MIXER_OSS is not set # CONFIG_SND_PCM_OSS is not set @@ -3064,6 +3100,7 @@ CONFIG_SND_KIRKWOOD_SOC=y # Allwinner SoC Audio support # # CONFIG_SND_SUN4I_CODEC is not set +# CONFIG_SND_SUN4I_SPDIF is not set # CONFIG_SND_SOC_XTFPGA_I2S is not set CONFIG_SND_SOC_I2C_AND_SPI=y @@ -3094,11 +3131,14 @@ CONFIG_SND_SOC_CS42L51_I2C=y # CONFIG_SND_SOC_GTM601 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set # CONFIG_SND_SOC_PCM1681 is not set -# CONFIG_SND_SOC_PCM179X is not set +# CONFIG_SND_SOC_PCM179X_I2C is not set +# CONFIG_SND_SOC_PCM179X_SPI is not set # CONFIG_SND_SOC_PCM3168A_I2C is not set # CONFIG_SND_SOC_PCM3168A_SPI is not set # CONFIG_SND_SOC_PCM512x_I2C is not set # CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RT5616=m # CONFIG_SND_SOC_RT5631 is not set # CONFIG_SND_SOC_RT5677_SPI is not set # CONFIG_SND_SOC_SGTL5000 is not set @@ -3164,6 +3204,7 @@ CONFIG_HID_GENERIC=y # CONFIG_HID_CHICONY is not set # CONFIG_HID_CORSAIR is not set # CONFIG_HID_PRODIKEYS is not set +CONFIG_HID_CMEDIA=m # CONFIG_HID_CP2112 is not set # CONFIG_HID_CYPRESS is not set # CONFIG_HID_DRAGONRISE is not set @@ -3434,6 +3475,7 @@ CONFIG_LEDS_CLASS=m # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TLC591XX is not set # CONFIG_LEDS_LM355x is not set +CONFIG_LEDS_IS31FL32XX=m # # LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) @@ -3486,7 +3528,6 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_DS1307 is not set # CONFIG_RTC_DRV_DS1374 is not set # CONFIG_RTC_DRV_DS1672 is not set -# CONFIG_RTC_DRV_DS3232 is not set # CONFIG_RTC_DRV_HYM8563 is not set # CONFIG_RTC_DRV_MAX6900 is not set # CONFIG_RTC_DRV_RS5C372 is not set @@ -3494,10 +3535,9 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_ISL12022 is not set # CONFIG_RTC_DRV_ISL12057 is not set # CONFIG_RTC_DRV_X1205 is not set -# CONFIG_RTC_DRV_PCF2127 is not set # CONFIG_RTC_DRV_PCF8523 is not set -# CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF85063 is not set +# CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set # CONFIG_RTC_DRV_BQ32K is not set @@ -3519,13 +3559,20 @@ CONFIG_RTC_DRV_S35390A=y # CONFIG_RTC_DRV_DS1343 is not set # CONFIG_RTC_DRV_DS1347 is not set # CONFIG_RTC_DRV_DS1390 is not set -# CONFIG_RTC_DRV_MAX6902 is not set # CONFIG_RTC_DRV_R9701 is not set -# CONFIG_RTC_DRV_RS5C348 is not set -# CONFIG_RTC_DRV_DS3234 is not set -# CONFIG_RTC_DRV_PCF2123 is not set # CONFIG_RTC_DRV_RX4581 is not set +CONFIG_RTC_DRV_RX6110=m +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_PCF2123 is not set # CONFIG_RTC_DRV_MCP795 is not set +CONFIG_RTC_I2C_AND_SPI=y + +# +# SPI and I2C RTC drivers +# +# CONFIG_RTC_DRV_DS3232 is not set +# CONFIG_RTC_DRV_PCF2127 is not set # # Platform RTC drivers @@ -3571,6 +3618,8 @@ CONFIG_DMA_OF=y # CONFIG_INTEL_IDMA64 is not set CONFIG_MV_XOR=y # CONFIG_NBPFAXI_DMA is not set +CONFIG_QCOM_HIDMA_MGMT=m +CONFIG_QCOM_HIDMA=m # CONFIG_DW_DMAC is not set # CONFIG_DW_DMAC_PCI is not set @@ -3609,24 +3658,25 @@ CONFIG_STAGING=y # Speakup console speech # # CONFIG_SPEAKUP is not set -# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set # CONFIG_STAGING_MEDIA is not set # # Android # # CONFIG_STAGING_BOARD is not set -# CONFIG_WIMAX_GDM72XX is not set # CONFIG_LTE_GDM724X is not set # CONFIG_MTD_SPINAND_MT29F is not set +CONFIG_LNET=m +CONFIG_LNET_MAX_PAYLOAD=1048576 +# CONFIG_LNET_SELFTEST is not set # CONFIG_LUSTRE_FS is not set # CONFIG_DGNC is not set -# CONFIG_DGAP is not set # CONFIG_GS_FPGABOOT is not set # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set # CONFIG_WILC1000_SDIO is not set # CONFIG_WILC1000_SPI is not set # CONFIG_MOST is not set +# CONFIG_GOLDFISH is not set # CONFIG_CHROME_PLATFORMS is not set CONFIG_CLKDEV_LOOKUP=y CONFIG_HAVE_CLK_PREPARE=y @@ -3638,12 +3688,12 @@ CONFIG_COMMON_CLK=y # CONFIG_COMMON_CLK_SI5351 is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI570 is not set +# CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set CONFIG_CLK_QORIQ=y # CONFIG_COMMON_CLK_NXP is not set # CONFIG_COMMON_CLK_PXA is not set -# CONFIG_COMMON_CLK_CDCE706 is not set CONFIG_MVEBU_CLK_COMMON=y CONFIG_MVEBU_CLK_CPU=y CONFIG_MVEBU_CLK_COREDIV=y @@ -3701,8 +3751,8 @@ CONFIG_MVEBU_DEVBUS=y CONFIG_IRQCHIP=y CONFIG_ARM_GIC=y CONFIG_ARM_GIC_MAX_NR=1 +CONFIG_ARMADA_370_XP_IRQ=y CONFIG_ORION_IRQCHIP=y -# CONFIG_TS4800_IRQ is not set # CONFIG_IPACK_BUS is not set # CONFIG_RESET_CONTROLLER is not set # CONFIG_FMC is not set @@ -3712,8 +3762,8 @@ CONFIG_ORION_IRQCHIP=y # CONFIG_GENERIC_PHY=y CONFIG_ARMADA375_USBCLUSTER_PHY=y -# CONFIG_PHY_PXA_28NM_HSIC is not set -# CONFIG_PHY_PXA_28NM_USB2 is not set +CONFIG_PHY_PXA_28NM_HSIC=m +CONFIG_PHY_PXA_28NM_USB2=m CONFIG_PHY_MVEBU_SATA=y # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_POWERCAP is not set @@ -3730,10 +3780,8 @@ CONFIG_ARM_PMU=y # Android # # CONFIG_ANDROID is not set -CONFIG_NVMEM=m +CONFIG_NVMEM=y # CONFIG_STM is not set -# CONFIG_STM_DUMMY is not set -# CONFIG_STM_SOURCE_CONSOLE is not set # CONFIG_INTEL_TH is not set # @@ -3745,6 +3793,7 @@ CONFIG_NVMEM=m # Firmware Drivers # # CONFIG_FIRMWARE_MEMMAP is not set +# CONFIG_FW_CFG_SYSFS is not set CONFIG_HAVE_ARM_SMCCC=y # @@ -3799,6 +3848,7 @@ CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_MANDATORY_FILE_LOCKING=y +CONFIG_FS_ENCRYPTION=m CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y CONFIG_INOTIFY_USER=y @@ -3833,6 +3883,7 @@ CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_FAT_DEFAULT_UTF8 is not set CONFIG_NTFS_FS=m # CONFIG_NTFS_DEBUG is not set CONFIG_NTFS_RW=y @@ -3852,6 +3903,7 @@ CONFIG_TMPFS_XATTR=y # CONFIG_HUGETLB_PAGE is not set # CONFIG_CONFIGFS_FS is not set CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ORANGEFS_FS is not set # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set # CONFIG_ECRYPT_FS is not set @@ -3904,7 +3956,8 @@ CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y -# CONFIG_NFSD_PNFS is not set +# CONFIG_NFSD_BLOCKLAYOUT is not set +# CONFIG_NFSD_SCSILAYOUT is not set # CONFIG_NFSD_FAULT_INJECTION is not set CONFIG_GRACE_PERIOD=y CONFIG_LOCKD=y @@ -4020,6 +4073,7 @@ CONFIG_DEBUG_KERNEL=y # # CONFIG_PAGE_EXTENSION is not set # CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_PAGE_POISONING is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_SLAB is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y @@ -4081,6 +4135,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=21 # CONFIG_RCU_EQS_DEBUG is not set # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +CONFIG_CPU_HOTPLUG_STATE_CONTROL=y # CONFIG_NOTIFIER_ERROR_INJECTION is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set @@ -4107,6 +4162,7 @@ CONFIG_TEST_HEXDUMP=m # CONFIG_TEST_STRING_HELPERS is not set # CONFIG_TEST_KSTRTOX is not set # CONFIG_TEST_PRINTF is not set +# CONFIG_TEST_BITMAP is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_DMA_API_DEBUG is not set # CONFIG_TEST_LKM is not set @@ -4139,6 +4195,7 @@ CONFIG_DEBUG_UART_PHYS=0x01c28000 CONFIG_DEBUG_UART_VIRT=0xf1c28000 CONFIG_DEBUG_UART_8250_SHIFT=2 # CONFIG_DEBUG_UART_8250_WORD is not set +# CONFIG_DEBUG_UART_8250_PALMCHIP is not set # CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set CONFIG_DEBUG_UNCOMPRESS=y CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" @@ -4176,8 +4233,6 @@ CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_RNG_DEFAULT=y -CONFIG_CRYPTO_PCOMP=m -CONFIG_CRYPTO_PCOMP2=y CONFIG_CRYPTO_AKCIPHER2=y CONFIG_CRYPTO_AKCIPHER=y CONFIG_CRYPTO_RSA=y @@ -4228,7 +4283,7 @@ CONFIG_CRYPTO_XCBC=m # Digest # CONFIG_CRYPTO_CRC32C=y -CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRC32=y # CONFIG_CRYPTO_CRCT10DIF is not set CONFIG_CRYPTO_GHASH=y # CONFIG_CRYPTO_POLY1305 is not set @@ -4272,7 +4327,6 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m # Compression # CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_842=m CONFIG_CRYPTO_LZ4=m diff --git a/general.sh b/general.sh index fe14767ef6..1e0674b4ee 100644 --- a/general.sh +++ b/general.sh @@ -132,7 +132,7 @@ if [ -d "$SOURCES/$2/$GITHUBSUBDIR" ]; then if [[ "$3" != "" ]] && [[ "$bar_1" == "$localbar" || "$bar_2" == "$localbar" ]] || [[ "$3" == "" && "$bar_3" == "$localbar" ]] || [[ $bar_1 == "" && $bar_2 == "" ]]; then display_alert "... you have latest sources" "$2 $3" "info" else - if [ $DEBUG_MODE != yes ]; then + if [ "$DEBUG_MODE" != yes ]; then display_alert "... your sources are outdated - creating new shallow clone" "$2 $3" "info" if [[ -z "$GITHUBSUBDIR" ]]; then rm -rf $SOURCES/$2".old" diff --git a/patch/kernel/marvell-next/0029-ARM-dts-add-SFP-module-support-for-Clearfog.patch b/patch/kernel/marvell-next/0029-ARM-dts-add-SFP-module-support-for-Clearfog.patch index 562b413947..6361b4ff3e 100644 --- a/patch/kernel/marvell-next/0029-ARM-dts-add-SFP-module-support-for-Clearfog.patch +++ b/patch/kernel/marvell-next/0029-ARM-dts-add-SFP-module-support-for-Clearfog.patch @@ -1,27 +1,18 @@ -From: Russell King -Subject: [PATCH 29/30] ARM: dts: add SFP module support for Clearfog -MIME-Version: 1.0 -Content-Disposition: inline -Content-Transfer-Encoding: 8bit -Content-Type: text/plain; charset="utf-8" - -Add SFP module support for Clearfog using the SFP phylink support. - -Signed-off-by: Russell King ---- - arch/arm/boot/dts/armada-388-clearfog.dts | 44 ++++++++----------------------- - 1 file changed, 11 insertions(+), 33 deletions(-) - diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts -index c6e180eb3b11..bf0409b8cfd1 100644 +old mode 100644 +new mode 100755 +index bfc9ecc..99a3acf --- a/arch/arm/boot/dts/armada-388-clearfog.dts +++ b/arch/arm/boot/dts/armada-388-clearfog.dts -@@ -87,13 +87,9 @@ - }; - - ethernet@34000 { +@@ -77,16 +77,12 @@ + soc { + internal-regs { + ethernet@30000 { + managed = "in-band-status"; phy-mode = "sgmii"; + buffer-manager = <&bm>; + bm,pool-long = <2>; + bm,pool-short = <1>; status = "okay"; - - fixed-link { @@ -30,8 +21,8 @@ index c6e180eb3b11..bf0409b8cfd1 100644 - }; }; - i2c@11000 { -@@ -177,34 +173,6 @@ + ethernet@34000 { +@@ -183,34 +179,6 @@ output-low; line-name = "m.2 devslp"; }; @@ -66,7 +57,7 @@ index c6e180eb3b11..bf0409b8cfd1 100644 }; /* The MCP3021 is 100kHz clock only */ -@@ -384,6 +352,16 @@ +@@ -390,6 +358,16 @@ }; }; @@ -78,11 +69,8 @@ index c6e180eb3b11..bf0409b8cfd1 100644 + sfp,ethernet = <ð2>; + tx-disable-gpio = <&expander0 14 GPIO_ACTIVE_HIGH>; + tx-fault-gpio = <&expander0 13 GPIO_ACTIVE_HIGH>; -+ }; -+ ++ }; ++ dsa@0 { compatible = "marvell,dsa"; dsa,ethernet = <ð1>; --- -2.1.0 - diff --git a/patch/kernel/marvell-next/0044-gpio-report-all-gpios-in-debugfs.patch b/patch/kernel/marvell-next/0044-gpio-report-all-gpios-in-debugfs.patch index 021b661a32..b371da62f8 100644 --- a/patch/kernel/marvell-next/0044-gpio-report-all-gpios-in-debugfs.patch +++ b/patch/kernel/marvell-next/0044-gpio-report-all-gpios-in-debugfs.patch @@ -24,13 +24,13 @@ index d428b97..fe172b7 100644 msk = 1 << i; is_out = !(io_conf & msk); diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c -index 4e4c308..96ac8c1 100644 +index b747c76..d61fb66 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -2438,13 +2438,14 @@ static void gpiolib_dbg_show(struct seq_file *s, struct gpio_chip *chip) +@@ -2895,14 +2895,14 @@ static void gpiolib_dbg_show(struct seq_file *s, struct gpio_device *gdev) int is_irq; - for (i = 0; i < chip->ngpio; i++, gpio++, gdesc++) { + for (i = 0; i < gdev->ngpio; i++, gpio++, gdesc++) { - if (!test_bit(FLAG_REQUESTED, &gdesc->flags)) { +/* if (!test_bit(FLAG_REQUESTED, &gdesc->flags)) { if (gdesc->name) { @@ -39,10 +39,8 @@ index 4e4c308..96ac8c1 100644 } continue; } +- +*/ - gpiod_get_direction(gdesc); is_out = test_bit(FLAG_IS_OUT, &gdesc->flags); --- -1.9.1 - + is_irq = test_bit(FLAG_USED_AS_IRQ, &gdesc->flags);