Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit d5e4bfd196e114c885c5c42cf0a7b3edc7e54829

Authored by Dan Murphy
2 parents ba42f1918e 0bde8afc3a
Exists in ti-linux-3.12.y and in 3 other branches newt-ti-linux-3.12.y, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y

Merge branch 'connectivity-ti-linux-3.12.y' of git://git.ti.com/connectivity-int… 

…egration-tree/connectivity-ti-linux-kernel into ti-linux-3.12.y

TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-3.12.y

* 'connectivity-ti-linux-3.12.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
  Revert "arm: dts: am335x-evm: add sleep states for i2c-1"
  ARM: config: omap: Disable extra debug options
  ARM: config: omap: Make advanced networking features as modules

Signed-off-by: Dan Murphy <DMurphy@ti.com>

Showing 2 changed files Side-by-side Diff

arch/arm/boot/dts/am335x-evm.dts
Diff comments   View file @ d5e4bfd
... ... @@ -59,20 +59,13 @@
59 59 >;
60 60 };
61 61  
62   - i2c1_pins_default: pinmux_i2c1_pins {
  62 + i2c1_pins: pinmux_i2c1_pins {
63 63 pinctrl-single,pins = <
64 64 0x158 (PIN_INPUT_PULLUP | MUX_MODE2) /* spi0_d1.i2c1_sda */
65 65 0x15c (PIN_INPUT_PULLUP | MUX_MODE2) /* spi0_cs0.i2c1_scl */
66 66 >;
67 67 };
68 68  
69   - i2c1_pins_sleep: i2c1_pins_sleep {
70   - pinctrl-single,pins = <
71   - 0x158 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* spi0_d1.i2c1_sda */
72   - 0x15c (PIN_INPUT_PULLDOWN | MUX_MODE7) /* spi0_cs0.i2c1_scl */
73   - >;
74   - };
75   -
76 69 uart0_pins: pinmux_uart0_pins {
77 70 pinctrl-single,pins = <
78 71 0x170 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart0_rxd.uart0_rxd */
... ... @@ -407,9 +400,8 @@
407 400 };
408 401  
409 402 i2c1: i2c@4802a000 {
410   - pinctrl-names = "default", "sleep";
411   - pinctrl-0 = <&i2c1_pins_default>;
412   - pinctrl-1 = <&i2c1_pins_sleep>;
  403 + pinctrl-names = "default";
  404 + pinctrl-0 = <&i2c1_pins>;
413 405  
414 406 status = "okay";
415 407 clock-frequency = <100000>;
arch/arm/configs/omap2plus_defconfig
Diff comments   View file @ d5e4bfd
... ... @@ -12,6 +12,7 @@
12 12 CONFIG_PROFILING=y
13 13 CONFIG_OPROFILE=y
14 14 CONFIG_KPROBES=y
  15 +CONFIG_JUMP_LABEL=y
15 16 CONFIG_MODULES=y
16 17 CONFIG_MODULE_FORCE_LOAD=y
17 18 CONFIG_MODULE_UNLOAD=y
18 19  
19 20  
20 21  
21 22  
... ... @@ -23,25 +24,22 @@
23 24 CONFIG_ARCH_OMAP2PLUS=y
24 25 CONFIG_ARCH_MULTI_V6=y
25 26 CONFIG_GPIO_PCA953X=y
  27 +CONFIG_OMAP_RESET_CLOCKS=y
  28 +CONFIG_OMAP_MUX_DEBUG=y
26 29 CONFIG_ARCH_OMAP2=y
27 30 CONFIG_ARCH_OMAP3=y
28 31 CONFIG_ARCH_OMAP4=y
29 32 CONFIG_SOC_OMAP5=y
30   -CONFIG_SOC_AM33XX=y
31 33 CONFIG_SOC_AM43XX=y
32 34 CONFIG_SOC_DRA7XX=y
33   -CONFIG_OMAP_RESET_CLOCKS=y
34   -CONFIG_OMAP_MUX_DEBUG=y
35   -CONFIG_ARCH_VEXPRESS_CA9X4=y
36 35 CONFIG_OMAP4_ERRATA_I688=y
37 36 CONFIG_ARM_THUMBEE=y
38 37 CONFIG_ARM_ERRATA_411920=y
39 38 CONFIG_PCIE_DRA7XX=y
40 39 CONFIG_SMP=y
41 40 CONFIG_NR_CPUS=2
42   -CONFIG_CMA=y
43 41 CONFIG_PREEMPT=y
44   -CONFIG_LEDS=y
  42 +CONFIG_CMA=y
45 43 CONFIG_ZBOOT_ROM_TEXT=0x0
46 44 CONFIG_ZBOOT_ROM_BSS=0x0
47 45 CONFIG_ARM_APPENDED_DTB=y
48 46  
49 47  
... ... @@ -72,33 +70,20 @@
72 70 CONFIG_IP_PNP_DHCP=y
73 71 CONFIG_IP_PNP_BOOTP=y
74 72 CONFIG_IP_PNP_RARP=y
  73 +CONFIG_INET_XFRM_MODE_TRANSPORT=m
  74 +CONFIG_INET_XFRM_MODE_TUNNEL=m
  75 +CONFIG_INET_XFRM_MODE_BEET=m
75 76 # CONFIG_INET_LRO is not set
  77 +CONFIG_INET_DIAG=m
76 78 # CONFIG_IPV6 is not set
77 79 CONFIG_NETFILTER=y
78   -CONFIG_NETFILTER_ADVANCED=y
79   -CONFIG_NETFILTER_XTABLES=y
80   -CONFIG_NF_NAT=y
81   -CONFIG_NF_NAT_NEEDED=y
82   -CONFIG_NF_NAT_IPV4=y
83   -CONFIG_NF_DEFRAG_IPV4=y
84   -CONFIG_NF_CONNTRACK=y
85   -CONFIG_NF_CONNTRACK_IPV4=y
86   -CONFIG_NF_CONNTRACK_PROC_COMPAT=y
87   -CONFIG_IP_NF_IPTABLES=y
88   -CONFIG_IP_NF_FILTER=y
89   -CONFIG_IP_NF_TARGET_LOG=y
90   -CONFIG_IP_NF_TARGET_MASQUERADE=y
91   -CONFIG_BRIDGE=y
92   -CONFIG_BRIDGE_IGMP_SNOOPING=y
93   -CONFIG_BRIDGE_NETFILTER=y
94   -CONFIG_STP=y
95   -CONFIG_LLC=y
96   -CONFIG_INPUT_UINPUT=y
97   -CONFIG_HAS_IOMEM=y
98   -CONFIG_HAS_IOPORT=y
99   -CONFIG_HAS_DMA=y
100   -CONFIG_NLATTR=y
101   -CONFIG_AVERAGE=y
  80 +CONFIG_NF_CONNTRACK=m
  81 +CONFIG_NF_CONNTRACK_IPV4=m
  82 +CONFIG_IP_NF_IPTABLES=m
  83 +CONFIG_IP_NF_FILTER=m
  84 +CONFIG_NF_NAT_IPV4=m
  85 +CONFIG_IP_NF_TARGET_MASQUERADE=m
  86 +CONFIG_BRIDGE=m
102 87 CONFIG_VLAN_8021Q=y
103 88 CONFIG_CAN=m
104 89 CONFIG_CAN_C_CAN=m
105 90  
106 91  
... ... @@ -110,16 +95,13 @@
110 95 CONFIG_BT_HCIUART_LL=y
111 96 CONFIG_BT_HCIBCM203X=m
112 97 CONFIG_BT_HCIBPA10X=m
113   -CONFIG_NL80211_TESTMODE=y
  98 +CONFIG_BT_WILINK=m
114 99 CONFIG_CFG80211=m
  100 +CONFIG_NL80211_TESTMODE=y
115 101 CONFIG_MAC80211=m
116 102 CONFIG_MAC80211_RC_PID=y
117 103 CONFIG_MAC80211_RC_DEFAULT_PID=y
118   -CONFIG_WL_TI=y
119   -CONFIG_WL12XX=m
120   -CONFIG_WL18XX=m
121   -CONFIG_WLCORE=m
122   -CONFIG_WLCORE_SDIO=m
  104 +CONFIG_RFKILL=y
123 105 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
124 106 CONFIG_DEVTMPFS=y
125 107 CONFIG_DEVTMPFS_MOUNT=y
... ... @@ -171,6 +153,10 @@
171 153 CONFIG_LIBERTAS_USB=m
172 154 CONFIG_LIBERTAS_SDIO=m
173 155 CONFIG_LIBERTAS_DEBUG=y
  156 +CONFIG_WL_TI=y
  157 +CONFIG_WL12XX=m
  158 +CONFIG_WL18XX=m
  159 +CONFIG_WLCORE_SDIO=m
174 160 CONFIG_INPUT_JOYDEV=y
175 161 CONFIG_INPUT_EVDEV=y
176 162 CONFIG_KEYBOARD_GPIO=y
... ... @@ -183,6 +169,7 @@
183 169 CONFIG_TOUCHSCREEN_PIXCIR=m
184 170 CONFIG_INPUT_MISC=y
185 171 CONFIG_INPUT_TWL4030_PWRBUTTON=y
  172 +CONFIG_INPUT_UINPUT=y
186 173 # CONFIG_LEGACY_PTYS is not set
187 174 CONFIG_SERIAL_8250=y
188 175 CONFIG_SERIAL_8250_CONSOLE=y
... ... @@ -226,7 +213,6 @@
226 213 CONFIG_MFD_TPS65218=y
227 214 CONFIG_MFD_TPS65910=y
228 215 CONFIG_TWL6040_CORE=y
229   -CONFIG_REGULATOR_FIXED_VOLTAGE=y
230 216 CONFIG_REGULATOR_PALMAS=y
231 217 CONFIG_REGULATOR_PBIAS=y
232 218 CONFIG_REGULATOR_TPS65023=y
... ... @@ -240,6 +226,10 @@
240 226 CONFIG_MEDIA_CAMERA_SUPPORT=y
241 227 CONFIG_MEDIA_USB_SUPPORT=y
242 228 CONFIG_USB_VIDEO_CLASS=m
  229 +CONFIG_V4L_PLATFORM_DRIVERS=y
  230 +CONFIG_VIDEO_AM437X_VPFE=y
  231 +# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
  232 +CONFIG_VIDEO_OV2659=y
243 233 CONFIG_FB=y
244 234 CONFIG_FIRMWARE_EDID=y
245 235 CONFIG_FB_TILEBLITTING=y
... ... @@ -252,6 +242,7 @@
252 242 CONFIG_DISPLAY_ENCODER_TFP410=y
253 243 CONFIG_DISPLAY_ENCODER_TPD12S015=y
254 244 CONFIG_DISPLAY_DRA_EVM_ENCODER_TPD12S015=y
  245 +CONFIG_DISPLAY_ENCODER_SIL9022=y
255 246 CONFIG_DISPLAY_CONNECTOR_DVI=y
256 247 CONFIG_DISPLAY_CONNECTOR_HDMI=y
257 248 CONFIG_DISPLAY_PANEL_DPI=y
... ... @@ -276,6 +267,7 @@
276 267 CONFIG_SND_AM33XX_SOC_EVM=m
277 268 CONFIG_SND_AM43XX_SOC_EPOS_EVM=m
278 269 CONFIG_SND_OMAP_SOC=m
  270 +CONFIG_SND_OMAP_SOC_DRA7EVM=m
279 271 CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
280 272 CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
281 273 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
... ... @@ -287,7 +279,6 @@
287 279 CONFIG_USB_MUSB_HDRC=m
288 280 CONFIG_USB_MUSB_OMAP2PLUS=m
289 281 CONFIG_USB_MUSB_DSPS=m
290   -CONFIG_USB_MUSB_AM335X_CHILD=m
291 282 CONFIG_USB_TI_CPPI41_DMA=y
292 283 CONFIG_USB_WDM=y
293 284 CONFIG_USB_STORAGE=y
294 285  
295 286  
296 287  
297 288  
... ... @@ -386,21 +377,15 @@
386 377 CONFIG_PRINTK_TIME=y
387 378 CONFIG_DEBUG_INFO=y
388 379 CONFIG_MAGIC_SYSRQ=y
389   -CONFIG_SCHEDSTATS=y
390   -CONFIG_TIMER_STATS=y
391   -CONFIG_PROVE_LOCKING=y
  380 +# CONFIG_SCHED_DEBUG is not set
392 381 # CONFIG_DEBUG_BUGVERBOSE is not set
393   -CONFIG_RFKILL=y
394   -CONFIG_KEYS=y
395   -CONFIG_BT_WILINK=m
396   -CONFIG_WIRELESS_EXT=y
  382 +# CONFIG_FTRACE is not set
  383 +# CONFIG_ARM_UNWIND is not set
397 384 CONFIG_SECURITY=y
398   -CONFIG_CRYPTO=y
399   -CONFIG_CRYPTO_ARC4=y
400   -CONFIG_CRYPTO_ECB=y
401   -CONFIG_CRYPTO_AES=y
402 385 CONFIG_CRYPTO_TEST=m
  386 +CONFIG_CRYPTO_ECB=y
403 387 CONFIG_CRYPTO_MICHAEL_MIC=y
  388 +CONFIG_CRYPTO_ARC4=y
404 389 # CONFIG_CRYPTO_ANSI_CPRNG is not set
405 390 CONFIG_CRYPTO_USER_API_HASH=y
406 391 CONFIG_CRYPTO_USER_API_SKCIPHER=y
... ... @@ -415,11 +400,4 @@
415 400 CONFIG_FONTS=y
416 401 CONFIG_FONT_8x8=y
417 402 CONFIG_FONT_8x16=y
418   -CONFIG_SND_OMAP_SOC_DRA7EVM=y
419   -CONFIG_DISPLAY_ENCODER_SIL9022=y
420   -CONFIG_VIDEO_V4L2=y
421   -CONFIG_V4L_PLATFORM_DRIVERS=y
422   -# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
423   -CONFIG_VIDEO_AM437X_VPFE=y
424   -CONFIG_VIDEO_OV2659=y