Commit 1197b1b20abe84df9a88396eef12cf446d9ce4eb
1 parent
4b574d3067
Exists in
master
and in
2 other branches
spi
Showing
3 changed files
with
88 additions
and
33 deletions
Show diff stats
kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-prime-oven.dtsi
... | ... | @@ -323,6 +323,14 @@ |
323 | 323 | pinctrl-0 = <&pinctrl_ecspi1>; |
324 | 324 | status = "okay"; |
325 | 325 | |
326 | +#if 0 | |
327 | + spidev@0 { | |
328 | + compatible = "spidev"; | |
329 | + spi-max-frequency = <20000000>; | |
330 | + reg = <0>; | |
331 | + status = "okay"; | |
332 | + }; | |
333 | +#else | |
326 | 334 | flash: mb85rs16@0 { |
327 | 335 | #address-cells = <1>; |
328 | 336 | #size-cells = <1>; |
... | ... | @@ -331,6 +339,7 @@ |
331 | 339 | spi-max-frequency = <20000000>; |
332 | 340 | m25p,fast-read; |
333 | 341 | }; |
342 | +#endif | |
334 | 343 | }; |
335 | 344 | |
336 | 345 | &fec { | ... | ... |
kernel/linux-imx6_3.14.28/arch/arm/configs/imx6s_prime_oven_defconfig
... | ... | @@ -7,6 +7,7 @@ CONFIG_MIGHT_HAVE_PCI=y |
7 | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
8 | 8 | CONFIG_HAVE_PROC_CPU=y |
9 | 9 | CONFIG_STACKTRACE_SUPPORT=y |
10 | +CONFIG_HAVE_LATENCYTOP_SUPPORT=y | |
10 | 11 | CONFIG_LOCKDEP_SUPPORT=y |
11 | 12 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
12 | 13 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
... | ... | @@ -25,6 +26,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y |
25 | 26 | # |
26 | 27 | # General setup |
27 | 28 | # |
29 | +CONFIG_BROKEN_ON_SMP=y | |
28 | 30 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
29 | 31 | CONFIG_CROSS_COMPILE="" |
30 | 32 | # CONFIG_COMPILE_TEST is not set |
... | ... | @@ -62,8 +64,6 @@ CONFIG_SPARSE_IRQ=y |
62 | 64 | CONFIG_KTIME_SCALAR=y |
63 | 65 | CONFIG_GENERIC_CLOCKEVENTS=y |
64 | 66 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
65 | -CONFIG_ARCH_HAS_TICK_BROADCAST=y | |
66 | -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y | |
67 | 67 | |
68 | 68 | # |
69 | 69 | # Timers subsystem |
... | ... | @@ -72,7 +72,6 @@ CONFIG_TICK_ONESHOT=y |
72 | 72 | CONFIG_NO_HZ_COMMON=y |
73 | 73 | # CONFIG_HZ_PERIODIC is not set |
74 | 74 | CONFIG_NO_HZ_IDLE=y |
75 | -# CONFIG_NO_HZ_FULL is not set | |
76 | 75 | CONFIG_NO_HZ=y |
77 | 76 | CONFIG_HIGH_RES_TIMERS=y |
78 | 77 | |
... | ... | @@ -91,11 +90,9 @@ CONFIG_TICK_CPU_ACCOUNTING=y |
91 | 90 | CONFIG_TREE_PREEMPT_RCU=y |
92 | 91 | CONFIG_PREEMPT_RCU=y |
93 | 92 | CONFIG_RCU_STALL_COMMON=y |
94 | -# CONFIG_RCU_USER_QS is not set | |
95 | 93 | CONFIG_RCU_FANOUT=32 |
96 | 94 | CONFIG_RCU_FANOUT_LEAF=16 |
97 | 95 | # CONFIG_RCU_FANOUT_EXACT is not set |
98 | -# CONFIG_RCU_FAST_NO_HZ is not set | |
99 | 96 | # CONFIG_TREE_RCU_TRACE is not set |
100 | 97 | # CONFIG_RCU_BOOST is not set |
101 | 98 | # CONFIG_RCU_NOCB_CPU is not set |
... | ... | @@ -169,7 +166,6 @@ CONFIG_VM_EVENT_COUNTERS=y |
169 | 166 | # CONFIG_SLAB is not set |
170 | 167 | CONFIG_SLUB=y |
171 | 168 | # CONFIG_SLOB is not set |
172 | -CONFIG_SLUB_CPU_PARTIAL=y | |
173 | 169 | # CONFIG_SYSTEM_TRUSTED_KEYRING is not set |
174 | 170 | # CONFIG_PROFILING is not set |
175 | 171 | CONFIG_HAVE_OPROFILE=y |
... | ... | @@ -222,7 +218,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y |
222 | 218 | CONFIG_MODVERSIONS=y |
223 | 219 | CONFIG_MODULE_SRCVERSION_ALL=y |
224 | 220 | # CONFIG_MODULE_SIG is not set |
225 | -CONFIG_STOP_MACHINE=y | |
226 | 221 | CONFIG_BLOCK=y |
227 | 222 | CONFIG_LBDAF=y |
228 | 223 | # CONFIG_BLK_DEV_BSG is not set |
... | ... | @@ -266,7 +261,6 @@ CONFIG_DEFAULT_CFQ=y |
266 | 261 | CONFIG_DEFAULT_IOSCHED="cfq" |
267 | 262 | CONFIG_UNINLINE_SPIN_UNLOCK=y |
268 | 263 | CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y |
269 | -CONFIG_MUTEX_SPIN_ON_OWNER=y | |
270 | 264 | CONFIG_FREEZER=y |
271 | 265 | |
272 | 266 | # |
... | ... | @@ -420,16 +414,12 @@ CONFIG_ARM_NR_BANKS=8 |
420 | 414 | CONFIG_MULTI_IRQ_HANDLER=y |
421 | 415 | # CONFIG_ARM_ERRATA_430973 is not set |
422 | 416 | # CONFIG_PL310_ERRATA_588369 is not set |
423 | -# CONFIG_ARM_ERRATA_643719 is not set | |
424 | 417 | # CONFIG_ARM_ERRATA_720789 is not set |
425 | 418 | # CONFIG_PL310_ERRATA_727915 is not set |
426 | 419 | # CONFIG_PL310_ERRATA_753970 is not set |
427 | 420 | CONFIG_ARM_ERRATA_754322=y |
428 | -# CONFIG_ARM_ERRATA_754327 is not set | |
429 | -CONFIG_ARM_ERRATA_764369=y | |
430 | 421 | CONFIG_PL310_ERRATA_769419=y |
431 | 422 | CONFIG_ARM_ERRATA_775420=y |
432 | -# CONFIG_ARM_ERRATA_798181 is not set | |
433 | 423 | # CONFIG_ARM_ERRATA_773022 is not set |
434 | 424 | |
435 | 425 | # |
... | ... | @@ -443,22 +433,12 @@ CONFIG_ARM_ERRATA_775420=y |
443 | 433 | # Kernel Features |
444 | 434 | # |
445 | 435 | CONFIG_HAVE_SMP=y |
446 | -CONFIG_SMP=y | |
447 | -CONFIG_SMP_ON_UP=y | |
448 | -CONFIG_ARM_CPU_TOPOLOGY=y | |
449 | -# CONFIG_SCHED_MC is not set | |
450 | -# CONFIG_SCHED_SMT is not set | |
451 | -CONFIG_HAVE_ARM_SCU=y | |
436 | +# CONFIG_SMP is not set | |
452 | 437 | # CONFIG_HAVE_ARM_ARCH_TIMER is not set |
453 | -CONFIG_HAVE_ARM_TWD=y | |
454 | -# CONFIG_MCPM is not set | |
455 | -# CONFIG_BIG_LITTLE is not set | |
456 | 438 | # CONFIG_VMSPLIT_3G is not set |
457 | 439 | CONFIG_VMSPLIT_2G=y |
458 | 440 | # CONFIG_VMSPLIT_1G is not set |
459 | 441 | CONFIG_PAGE_OFFSET=0x80000000 |
460 | -CONFIG_NR_CPUS=4 | |
461 | -CONFIG_HOTPLUG_CPU=y | |
462 | 442 | # CONFIG_ARM_PSCI is not set |
463 | 443 | CONFIG_ARCH_NR_GPIO=0 |
464 | 444 | # CONFIG_PREEMPT_NONE is not set |
... | ... | @@ -500,6 +480,7 @@ CONFIG_BOUNCE=y |
500 | 480 | CONFIG_KSM=y |
501 | 481 | CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 |
502 | 482 | CONFIG_CROSS_MEMORY_ATTACH=y |
483 | +CONFIG_NEED_PER_CPU_KM=y | |
503 | 484 | # CONFIG_CLEANCACHE is not set |
504 | 485 | # CONFIG_FRONTSWAP is not set |
505 | 486 | CONFIG_CMA=y |
... | ... | @@ -604,7 +585,6 @@ CONFIG_COREDUMP=y |
604 | 585 | CONFIG_SUSPEND=y |
605 | 586 | CONFIG_SUSPEND_FREEZER=y |
606 | 587 | CONFIG_PM_SLEEP=y |
607 | -CONFIG_PM_SLEEP_SMP=y | |
608 | 588 | # CONFIG_PM_AUTOSLEEP is not set |
609 | 589 | # CONFIG_PM_WAKELOCKS is not set |
610 | 590 | CONFIG_PM_RUNTIME=y |
... | ... | @@ -831,15 +811,11 @@ CONFIG_DNS_RESOLVER=y |
831 | 811 | # CONFIG_NETLINK_DIAG is not set |
832 | 812 | # CONFIG_NET_MPLS_GSO is not set |
833 | 813 | # CONFIG_HSR is not set |
834 | -CONFIG_RPS=y | |
835 | -CONFIG_RFS_ACCEL=y | |
836 | -CONFIG_XPS=y | |
837 | 814 | # CONFIG_CGROUP_NET_PRIO is not set |
838 | 815 | # CONFIG_CGROUP_NET_CLASSID is not set |
839 | 816 | CONFIG_NET_RX_BUSY_POLL=y |
840 | 817 | CONFIG_BQL=y |
841 | 818 | # CONFIG_BPF_JIT is not set |
842 | -CONFIG_NET_FLOW_LIMIT=y | |
843 | 819 | |
844 | 820 | # |
845 | 821 | # Network testing |
... | ... | @@ -940,7 +916,78 @@ CONFIG_CMA_AREAS=7 |
940 | 916 | # CONFIG_ARM_CCI is not set |
941 | 917 | CONFIG_CONNECTOR=y |
942 | 918 | CONFIG_PROC_EVENTS=y |
943 | -# CONFIG_MTD is not set | |
919 | +CONFIG_MTD=y | |
920 | +# CONFIG_MTD_TESTS is not set | |
921 | +# CONFIG_MTD_REDBOOT_PARTS is not set | |
922 | +# CONFIG_MTD_CMDLINE_PARTS is not set | |
923 | +# CONFIG_MTD_AFS_PARTS is not set | |
924 | +# CONFIG_MTD_OF_PARTS is not set | |
925 | +# CONFIG_MTD_AR7_PARTS is not set | |
926 | + | |
927 | +# | |
928 | +# User Modules And Translation Layers | |
929 | +# | |
930 | +CONFIG_MTD_BLKDEVS=y | |
931 | +CONFIG_MTD_BLOCK=y | |
932 | +# CONFIG_FTL is not set | |
933 | +# CONFIG_NFTL is not set | |
934 | +# CONFIG_INFTL is not set | |
935 | +# CONFIG_RFD_FTL is not set | |
936 | +# CONFIG_SSFDC is not set | |
937 | +# CONFIG_SM_FTL is not set | |
938 | +# CONFIG_MTD_OOPS is not set | |
939 | +# CONFIG_MTD_SWAP is not set | |
940 | + | |
941 | +# | |
942 | +# RAM/ROM/Flash chip drivers | |
943 | +# | |
944 | +# CONFIG_MTD_CFI is not set | |
945 | +# CONFIG_MTD_JEDECPROBE is not set | |
946 | +CONFIG_MTD_MAP_BANK_WIDTH_1=y | |
947 | +CONFIG_MTD_MAP_BANK_WIDTH_2=y | |
948 | +CONFIG_MTD_MAP_BANK_WIDTH_4=y | |
949 | +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | |
950 | +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | |
951 | +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | |
952 | +CONFIG_MTD_CFI_I1=y | |
953 | +CONFIG_MTD_CFI_I2=y | |
954 | +# CONFIG_MTD_CFI_I4 is not set | |
955 | +# CONFIG_MTD_CFI_I8 is not set | |
956 | +# CONFIG_MTD_RAM is not set | |
957 | +# CONFIG_MTD_ROM is not set | |
958 | +# CONFIG_MTD_ABSENT is not set | |
959 | + | |
960 | +# | |
961 | +# Mapping drivers for chip access | |
962 | +# | |
963 | +# CONFIG_MTD_COMPLEX_MAPPINGS is not set | |
964 | +# CONFIG_MTD_PLATRAM is not set | |
965 | + | |
966 | +# | |
967 | +# Self-contained MTD device drivers | |
968 | +# | |
969 | +# CONFIG_MTD_DATAFLASH is not set | |
970 | +CONFIG_MTD_M25P80=y | |
971 | +CONFIG_MTD_SST25L=y | |
972 | +# CONFIG_MTD_SLRAM is not set | |
973 | +# CONFIG_MTD_PHRAM is not set | |
974 | +# CONFIG_MTD_MTDRAM is not set | |
975 | +# CONFIG_MTD_BLOCK2MTD is not set | |
976 | + | |
977 | +# | |
978 | +# Disk-On-Chip Device Drivers | |
979 | +# | |
980 | +# CONFIG_MTD_DOCG3 is not set | |
981 | +# CONFIG_MTD_NAND is not set | |
982 | +# CONFIG_MTD_ONENAND is not set | |
983 | + | |
984 | +# | |
985 | +# LPDDR flash memory drivers | |
986 | +# | |
987 | +# CONFIG_MTD_LPDDR is not set | |
988 | +CONFIG_MTD_SPI_NOR=y | |
989 | +# CONFIG_SPI_FSL_QUADSPI is not set | |
990 | +# CONFIG_MTD_UBI is not set | |
944 | 991 | CONFIG_DTC=y |
945 | 992 | CONFIG_OF=y |
946 | 993 | |
... | ... | @@ -955,6 +1002,7 @@ CONFIG_OF_ADDRESS=y |
955 | 1002 | CONFIG_OF_IRQ=y |
956 | 1003 | CONFIG_OF_NET=y |
957 | 1004 | CONFIG_OF_MDIO=y |
1005 | +CONFIG_OF_MTD=y | |
958 | 1006 | CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y |
959 | 1007 | # CONFIG_PARPORT is not set |
960 | 1008 | CONFIG_BLK_DEV=y |
... | ... | @@ -2638,7 +2686,6 @@ CONFIG_COMMON_CLK=y |
2638 | 2686 | # |
2639 | 2687 | # Hardware Spinlock drivers |
2640 | 2688 | # |
2641 | -CONFIG_CLKSRC_OF=y | |
2642 | 2689 | CONFIG_CLKSRC_MMIO=y |
2643 | 2690 | # CONFIG_MAILBOX is not set |
2644 | 2691 | # CONFIG_IOMMU_SUPPORT is not set |
... | ... | @@ -2891,6 +2938,7 @@ CONFIG_MISC_FILESYSTEMS=y |
2891 | 2938 | # CONFIG_BEFS_FS is not set |
2892 | 2939 | # CONFIG_BFS_FS is not set |
2893 | 2940 | # CONFIG_EFS_FS is not set |
2941 | +# CONFIG_JFFS2_FS is not set | |
2894 | 2942 | # CONFIG_LOGFS is not set |
2895 | 2943 | # CONFIG_CRAMFS is not set |
2896 | 2944 | # CONFIG_SQUASHFS is not set |
... | ... | @@ -3029,7 +3077,6 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y |
3029 | 3077 | # CONFIG_DEBUG_STACK_USAGE is not set |
3030 | 3078 | # CONFIG_DEBUG_VM is not set |
3031 | 3079 | # CONFIG_DEBUG_MEMORY_INIT is not set |
3032 | -# CONFIG_DEBUG_PER_CPU_MAPS is not set | |
3033 | 3080 | # CONFIG_DEBUG_HIGHMEM is not set |
3034 | 3081 | # CONFIG_DEBUG_SHIRQ is not set |
3035 | 3082 | |
... | ... | @@ -3080,6 +3127,7 @@ CONFIG_RCU_CPU_STALL_VERBOSE=y |
3080 | 3127 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set |
3081 | 3128 | # CONFIG_NOTIFIER_ERROR_INJECTION is not set |
3082 | 3129 | # CONFIG_FAULT_INJECTION is not set |
3130 | +# CONFIG_LATENCYTOP is not set | |
3083 | 3131 | CONFIG_HAVE_FUNCTION_TRACER=y |
3084 | 3132 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y |
3085 | 3133 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
... | ... | @@ -3155,7 +3203,6 @@ CONFIG_CRYPTO_USER=y |
3155 | 3203 | CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y |
3156 | 3204 | CONFIG_CRYPTO_GF128MUL=y |
3157 | 3205 | CONFIG_CRYPTO_NULL=y |
3158 | -# CONFIG_CRYPTO_PCRYPT is not set | |
3159 | 3206 | CONFIG_CRYPTO_WORKQUEUE=y |
3160 | 3207 | # CONFIG_CRYPTO_CRYPTD is not set |
3161 | 3208 | CONFIG_CRYPTO_AUTHENC=y |
... | ... | @@ -3300,7 +3347,6 @@ CONFIG_ASSOCIATIVE_ARRAY=y |
3300 | 3347 | CONFIG_HAS_IOMEM=y |
3301 | 3348 | CONFIG_HAS_IOPORT=y |
3302 | 3349 | CONFIG_HAS_DMA=y |
3303 | -CONFIG_CPU_RMAP=y | |
3304 | 3350 | CONFIG_DQL=y |
3305 | 3351 | CONFIG_NLATTR=y |
3306 | 3352 | CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y | ... | ... |
release/uImage
No preview for this file type