mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 21:02:19 +00:00
2dc24b0d06
This is a small follow-up to the larger ARM SoC updates merged last week, almost entirely for the keystone platform. The main change here is to use the new dma-ranges parsing code that came in through Russell's ARM tree. This allows the keystone platform to do cache-coherent DMA and to finally support all the available physical memory when LPAE is enabled. Aside from this, the keystone reset driver has been rewritten, and there is a small bug fix to allow building the orion5x platform again. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAU5harmCrR//JCVInAQJuXhAA2v+IVK4HqkIric4Hj/7monhv/Gxm+7Fj +3GYX9QHncSnILQm0ke+OYKYoLNPDbDVyvsY5JWbewLC3TbvnKZoM25Q4Aj6Fcj5 GAVgggMtc7dkk8VIDfUvjyYZsiiWcvhATvwlQg70oOC0LmRjPwQnBvyP+zvUiBUJ ++xBGiVsfScIRhbjB+cYZl7dhLXA+GKzaCw9sKVCS+ExmlAYBSy4cUkRCkw4AQI6 s4udVuPtFi7++rNTdn2MBeyLyk0pOjQu+jepo/bwmKGaKS88KwZjTCPI1YRtrkrv ZjF4AY0kjUenoJuN9Dj9q6I6Ivc8YFDr411hF/LwiBF7+QUk0EnAEeAhDGan/ZCG 1+xZbY54tQk+TNNgR2V/RzUWilhPmG3rdtq9MnvYrmQnyGeF07MCCAIqoH+B+hDm AvApocOT9sReD4yTNIBHYPKsp04jLXR5XKRZ98QkAOInEQaYTpFOU3LyrdgFLLB3 fIfDf2ZHCc6cmp/wXKk83LVxFQqYbyw0Q93xB/X/8yqb/NyJ8hVaKWgAcofUuj3t M87I+XcljA/dx8FsELM3B+qSZXakdDUgXBkfNePkm7GGlq5NziBTMJnhbXiIVMe+ 4kZIyxRD3OZj0d1K3mHMSvoX/FY/98AJWk2eizwwIx64PskatiKQTkX9XFnYPXLb AtdWv8t3Ozc= =AqkT -----END PGP SIGNATURE----- Merge tag 'soc2-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull part two of ARM SoC updates from Arnd Bergmann: "This is a small follow-up to the larger ARM SoC updates merged last week, almost entirely for the keystone platform. The main change here is to use the new dma-ranges parsing code that came in through Russell's ARM tree. This allows the keystone platform to do cache-coherent DMA and to finally support all the available physical memory when LPAE is enabled. Aside from this, the keystone reset driver has been rewritten, and there is a small bug fix to allow building the orion5x platform again" * tag 'soc2-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: keystone: Drop use of meminfo since its not available anymore ARM: orion5x: fix mvebu_mbus_dt_init call ARM: configs: keystone: enable reset driver support ARM: dts: keystone: update reset node to work with reset driver ARM: keystone: remove redundant reset stuff ARM: keystone: Update the dma offset for non-dt platform devices ARM: keystone: Switch over to coherent memory address space ARM: configs: keystone: add MTD_SPI_NOR (new dependency for M25P80) ARM: configs: keystone: drop CONFIG_COMMON_CLK_DEBUG
197 lines
4.4 KiB
Plaintext
197 lines
4.4 KiB
Plaintext
# CONFIG_SWAP is not set
|
|
CONFIG_POSIX_MQUEUE=y
|
|
CONFIG_HIGH_RES_TIMERS=y
|
|
CONFIG_IKCONFIG=y
|
|
CONFIG_IKCONFIG_PROC=y
|
|
CONFIG_LOG_BUF_SHIFT=14
|
|
CONFIG_BLK_DEV_INITRD=y
|
|
CONFIG_SYSCTL_SYSCALL=y
|
|
CONFIG_KALLSYMS_ALL=y
|
|
# CONFIG_ELF_CORE is not set
|
|
# CONFIG_BASE_FULL is not set
|
|
CONFIG_EMBEDDED=y
|
|
CONFIG_PROFILING=y
|
|
CONFIG_OPROFILE=y
|
|
CONFIG_KPROBES=y
|
|
CONFIG_MODULES=y
|
|
CONFIG_MODULE_FORCE_LOAD=y
|
|
CONFIG_MODULE_UNLOAD=y
|
|
CONFIG_MODULE_FORCE_UNLOAD=y
|
|
CONFIG_MODVERSIONS=y
|
|
CONFIG_ARCH_KEYSTONE=y
|
|
CONFIG_ARM_LPAE=y
|
|
CONFIG_SMP=y
|
|
CONFIG_PREEMPT=y
|
|
CONFIG_AEABI=y
|
|
CONFIG_HIGHMEM=y
|
|
CONFIG_VFP=y
|
|
CONFIG_NEON=y
|
|
# CONFIG_SUSPEND is not set
|
|
CONFIG_PM_RUNTIME=y
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_UNIX=y
|
|
CONFIG_UNIX_DIAG=y
|
|
CONFIG_XFRM_USER=y
|
|
CONFIG_XFRM_SUB_POLICY=y
|
|
CONFIG_XFRM_STATISTICS=y
|
|
CONFIG_NET_KEY=y
|
|
CONFIG_NET_KEY_MIGRATE=y
|
|
CONFIG_INET=y
|
|
CONFIG_IP_MULTICAST=y
|
|
CONFIG_IP_ADVANCED_ROUTER=y
|
|
CONFIG_IP_MULTIPLE_TABLES=y
|
|
CONFIG_IP_ROUTE_MULTIPATH=y
|
|
CONFIG_IP_ROUTE_VERBOSE=y
|
|
CONFIG_IP_PNP=y
|
|
CONFIG_IP_PNP_DHCP=y
|
|
CONFIG_IP_PNP_BOOTP=y
|
|
CONFIG_NET_IPIP=y
|
|
CONFIG_NET_IPGRE_DEMUX=y
|
|
CONFIG_NET_IPGRE=y
|
|
CONFIG_IP_MROUTE=y
|
|
CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
|
|
CONFIG_IP_PIMSM_V2=y
|
|
CONFIG_INET_AH=y
|
|
CONFIG_INET_IPCOMP=y
|
|
CONFIG_IPV6=y
|
|
CONFIG_INET6_XFRM_MODE_TRANSPORT=m
|
|
CONFIG_INET6_XFRM_MODE_TUNNEL=m
|
|
CONFIG_INET6_XFRM_MODE_BEET=m
|
|
CONFIG_IPV6_SIT=m
|
|
CONFIG_IPV6_MULTIPLE_TABLES=y
|
|
CONFIG_IPV6_SUBTREES=y
|
|
CONFIG_IPV6_MROUTE=y
|
|
CONFIG_IPV6_PIMSM_V2=y
|
|
CONFIG_NETFILTER=y
|
|
CONFIG_NF_CONNTRACK=y
|
|
CONFIG_NF_CT_NETLINK=y
|
|
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
|
|
CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
|
|
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
|
|
CONFIG_NETFILTER_XT_TARGET_MARK=y
|
|
CONFIG_NETFILTER_XT_MATCH_COMMENT=y
|
|
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
|
|
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
|
|
CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
|
|
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
|
|
CONFIG_NETFILTER_XT_MATCH_CPU=y
|
|
CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
|
|
CONFIG_NETFILTER_XT_MATCH_LENGTH=y
|
|
CONFIG_NETFILTER_XT_MATCH_MAC=y
|
|
CONFIG_NETFILTER_XT_MATCH_MARK=y
|
|
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
|
|
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
|
|
CONFIG_NETFILTER_XT_MATCH_STATE=y
|
|
CONFIG_NF_CONNTRACK_IPV4=y
|
|
CONFIG_IP_NF_IPTABLES=y
|
|
CONFIG_IP_NF_MATCH_AH=y
|
|
CONFIG_IP_NF_MATCH_ECN=y
|
|
CONFIG_IP_NF_MATCH_TTL=y
|
|
CONFIG_IP_NF_FILTER=y
|
|
CONFIG_IP_NF_TARGET_REJECT=y
|
|
CONFIG_IP_NF_TARGET_ULOG=y
|
|
CONFIG_IP_NF_MANGLE=y
|
|
CONFIG_IP_NF_TARGET_CLUSTERIP=y
|
|
CONFIG_IP_NF_TARGET_ECN=y
|
|
CONFIG_IP_NF_TARGET_TTL=y
|
|
CONFIG_IP_NF_RAW=y
|
|
CONFIG_IP_NF_ARPTABLES=y
|
|
CONFIG_IP_NF_ARPFILTER=y
|
|
CONFIG_IP_NF_ARP_MANGLE=y
|
|
CONFIG_IP6_NF_IPTABLES=m
|
|
CONFIG_IP_SCTP=y
|
|
CONFIG_VLAN_8021Q=y
|
|
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
|
CONFIG_CMA=y
|
|
CONFIG_DMA_CMA=y
|
|
CONFIG_MTD=y
|
|
CONFIG_MTD_CMDLINE_PARTS=y
|
|
CONFIG_MTD_BLOCK=y
|
|
CONFIG_MTD_PLATRAM=y
|
|
CONFIG_MTD_M25P80=y
|
|
CONFIG_MTD_NAND=y
|
|
CONFIG_MTD_NAND_DAVINCI=y
|
|
CONFIG_MTD_SPI_NOR=y
|
|
CONFIG_MTD_UBI=y
|
|
CONFIG_PROC_DEVICETREE=y
|
|
CONFIG_BLK_DEV_LOOP=y
|
|
CONFIG_EEPROM_AT24=y
|
|
CONFIG_SCSI=y
|
|
CONFIG_BLK_DEV_SD=y
|
|
CONFIG_NETDEVICES=y
|
|
CONFIG_SERIAL_8250=y
|
|
CONFIG_SERIAL_8250_CONSOLE=y
|
|
CONFIG_SERIAL_OF_PLATFORM=y
|
|
# CONFIG_HW_RANDOM is not set
|
|
CONFIG_I2C=y
|
|
# CONFIG_I2C_COMPAT is not set
|
|
CONFIG_I2C_CHARDEV=y
|
|
CONFIG_I2C_DAVINCI=y
|
|
CONFIG_SPI=y
|
|
CONFIG_SPI_DAVINCI=y
|
|
CONFIG_SPI_SPIDEV=y
|
|
# CONFIG_HWMON is not set
|
|
CONFIG_POWER_SUPPLY=y
|
|
CONFIG_POWER_RESET=y
|
|
CONFIG_POWER_RESET_KEYSTONE=y
|
|
CONFIG_WATCHDOG=y
|
|
CONFIG_WATCHDOG_CORE=y
|
|
CONFIG_DAVINCI_WATCHDOG=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
|
|
CONFIG_USB_MON=y
|
|
CONFIG_USB_XHCI_HCD=y
|
|
CONFIG_USB_STORAGE=y
|
|
CONFIG_USB_DWC3=y
|
|
CONFIG_USB_DWC3_DEBUG=y
|
|
CONFIG_USB_DWC3_VERBOSE=y
|
|
CONFIG_KEYSTONE_USB_PHY=y
|
|
CONFIG_DMADEVICES=y
|
|
CONFIG_TI_EDMA=y
|
|
CONFIG_MEMORY=y
|
|
CONFIG_TI_AEMIF=y
|
|
CONFIG_EXT4_FS=y
|
|
CONFIG_EXT4_FS_POSIX_ACL=y
|
|
CONFIG_MSDOS_FS=y
|
|
CONFIG_VFAT_FS=y
|
|
CONFIG_NTFS_FS=y
|
|
CONFIG_TMPFS=y
|
|
CONFIG_JFFS2_FS=y
|
|
CONFIG_JFFS2_FS_WBUF_VERIFY=y
|
|
CONFIG_UBIFS_FS=y
|
|
CONFIG_CRAMFS=y
|
|
CONFIG_NFS_FS=y
|
|
CONFIG_NFS_V3_ACL=y
|
|
CONFIG_ROOT_NFS=y
|
|
CONFIG_NFSD=y
|
|
CONFIG_NFSD_V3=y
|
|
CONFIG_NFSD_V3_ACL=y
|
|
CONFIG_NLS_CODEPAGE_437=y
|
|
CONFIG_NLS_ISO8859_1=y
|
|
CONFIG_PRINTK_TIME=y
|
|
CONFIG_DEBUG_SHIRQ=y
|
|
CONFIG_DEBUG_INFO=y
|
|
CONFIG_DEBUG_USER=y
|
|
CONFIG_CRYPTO_USER=y
|
|
CONFIG_CRYPTO_NULL=y
|
|
CONFIG_CRYPTO_AUTHENC=y
|
|
CONFIG_CRYPTO_CBC=y
|
|
CONFIG_CRYPTO_CTR=y
|
|
CONFIG_CRYPTO_XCBC=y
|
|
CONFIG_CRYPTO_DES=y
|
|
CONFIG_CRYPTO_ANSI_CPRNG=y
|
|
CONFIG_CRYPTO_USER_API_HASH=y
|
|
CONFIG_CRYPTO_USER_API_SKCIPHER=y
|
|
CONFIG_GPIOLIB=y
|
|
CONFIG_GPIO_SYSFS=y
|
|
CONFIG_GPIO_DAVINCI=y
|
|
CONFIG_LEDS_CLASS=y
|
|
CONFIG_NEW_LEDS=y
|
|
CONFIG_LEDS_GPIO=y
|
|
CONFIG_LEDS_TRIGGERS=y
|
|
CONFIG_LEDS_TRIGGER_ONESHOT=y
|
|
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
|
|
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
|
|
CONFIG_LEDS_TRIGGER_GPIO=y
|