diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-05-23 16:18:16 +0200 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2012-05-30 13:49:16 -0400 |
commit | 1d44de8f58cdfd71c90ce078070be1b6c6574832 (patch) | |
tree | d04fab15cda9a0dd4da4f3d123898f2fb3f1168a | |
parent | 2177f80076ebc15cc58fb521b58e49c83315f34e (diff) | |
download | meta-ti-1d44de8f58cdfd71c90ce078070be1b6c6574832.tar.gz |
linux-ti33x-psp 3.2: sgx fix from PSP + dvi cape audio fix
Also move more things to modules to speed up boot.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
4 files changed, 360 insertions, 44 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0062-da8xx-fb-Rounding-FB-size-to-satisfy-SGX-buffer-requ.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0062-da8xx-fb-Rounding-FB-size-to-satisfy-SGX-buffer-requ.patch new file mode 100644 index 00000000..f6860cb3 --- /dev/null +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0062-da8xx-fb-Rounding-FB-size-to-satisfy-SGX-buffer-requ.patch | |||
@@ -0,0 +1,59 @@ | |||
1 | From 02ad70ea366cb2946cc7d7c14ddcbd0dabf3d3ff Mon Sep 17 00:00:00 2001 | ||
2 | From: Aditya Nellutla <aditya.n@ti.com> | ||
3 | Date: Thu, 29 Mar 2012 15:45:39 +0530 | ||
4 | Subject: [PATCH 62/63] da8xx-fb: Rounding FB size to satisfy SGX buffer | ||
5 | requirements | ||
6 | |||
7 | In the real time use-case when SGX is used for rendering to FB buffers it has been | ||
8 | observed that, the available memory from framebuffer driver is not sufficient for | ||
9 | SGX under certain cases (like 16-bit WVGA resolution). SGX requires 2 swap buffers | ||
10 | with each of the buffers aligned to lcm(line_length, PAGE_SIZE). | ||
11 | |||
12 | Inorder to satisfy this requirement, we have two options, | ||
13 | |||
14 | - Increase number of FB buffers (LCD_NUM_BUFFERS) to 3. This is not | ||
15 | recommended as we end up wasting huge memory in most of the cases. | ||
16 | |||
17 | - Align FB buffers to lcm(line_length, PAGE_SIZE).This ensures framebuffer | ||
18 | size is increased to satisfy SGX requirements keeping alignment intact. | ||
19 | |||
20 | This patch makes sure that FB allocates buffers aligned to above formula. | ||
21 | |||
22 | Signed-off-by: Aditya Nellutla <aditya.n@ti.com> | ||
23 | --- | ||
24 | drivers/video/da8xx-fb.c | 5 ++++- | ||
25 | 1 files changed, 4 insertions(+), 1 deletions(-) | ||
26 | |||
27 | diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c | ||
28 | index 86b19ac..9aaca5d 100644 | ||
29 | --- a/drivers/video/da8xx-fb.c | ||
30 | +++ b/drivers/video/da8xx-fb.c | ||
31 | @@ -34,6 +34,7 @@ | ||
32 | #include <linux/slab.h> | ||
33 | #include <linux/delay.h> | ||
34 | #include <linux/pm_runtime.h> | ||
35 | +#include <linux/lcm.h> | ||
36 | #include <video/da8xx-fb.h> | ||
37 | #include <asm/mach-types.h> | ||
38 | |||
39 | @@ -1263,6 +1264,7 @@ static int __devinit fb_probe(struct platform_device *device) | ||
40 | struct da8xx_fb_par *par; | ||
41 | resource_size_t len; | ||
42 | int ret, i; | ||
43 | + unsigned long ulcm; | ||
44 | |||
45 | if (fb_pdata == NULL) { | ||
46 | dev_err(&device->dev, "Can not get platform data\n"); | ||
47 | @@ -1362,7 +1364,8 @@ static int __devinit fb_probe(struct platform_device *device) | ||
48 | |||
49 | /* allocate frame buffer */ | ||
50 | par->vram_size = lcdc_info->width * lcdc_info->height * lcd_cfg->bpp; | ||
51 | - par->vram_size = PAGE_ALIGN(par->vram_size/8); | ||
52 | + ulcm = lcm((lcdc_info->width * lcd_cfg->bpp)/8, PAGE_SIZE); | ||
53 | + par->vram_size = roundup(par->vram_size/8, ulcm); | ||
54 | par->vram_size = par->vram_size * LCD_NUM_BUFFERS; | ||
55 | |||
56 | par->vram_virt = dma_alloc_coherent(NULL, | ||
57 | -- | ||
58 | 1.7.7.6 | ||
59 | |||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0063-beaglebone-dvi-cape-audio-hacks.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0063-beaglebone-dvi-cape-audio-hacks.patch new file mode 100644 index 00000000..184d1689 --- /dev/null +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0063-beaglebone-dvi-cape-audio-hacks.patch | |||
@@ -0,0 +1,217 @@ | |||
1 | From 4c0991689b1e22f28d4827b218e31131f9f56be7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Wed, 23 May 2012 15:51:12 +0200 | ||
4 | Subject: [PATCH 63/63] beaglebone: dvi cape audio hacks | ||
5 | |||
6 | --- | ||
7 | arch/arm/mach-omap2/board-am335xevm.c | 72 ++++++++++++++++++++++++++------ | ||
8 | arch/arm/mach-omap2/devices.c | 2 +- | ||
9 | sound/soc/codecs/tlv320aic3x.c | 2 +- | ||
10 | sound/soc/davinci/davinci-evm.c | 7 ++- | ||
11 | 4 files changed, 64 insertions(+), 19 deletions(-) | ||
12 | |||
13 | diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c | ||
14 | index e8ce381..1f2d1fd 100644 | ||
15 | --- a/arch/arm/mach-omap2/board-am335xevm.c | ||
16 | +++ b/arch/arm/mach-omap2/board-am335xevm.c | ||
17 | @@ -43,6 +43,8 @@ | ||
18 | #include <linux/can/platform/mcp251x.h> | ||
19 | #include <linux/input/ti_tscadc.h> | ||
20 | |||
21 | +#include <sound/tlv320aic3x.h> | ||
22 | + | ||
23 | /* LCD controller is similar to DA850 */ | ||
24 | #include <video/da8xx-fb.h> | ||
25 | |||
26 | @@ -315,7 +317,7 @@ static struct tsc_data bone_touchscreen_data = { | ||
27 | }; | ||
28 | |||
29 | static u8 am335x_iis_serializer_direction1[] = { | ||
30 | - INACTIVE_MODE, INACTIVE_MODE, TX_MODE, RX_MODE, | ||
31 | + INACTIVE_MODE, INACTIVE_MODE, RX_MODE, TX_MODE, | ||
32 | INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, | ||
33 | INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, | ||
34 | INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, | ||
35 | @@ -334,6 +336,19 @@ static struct snd_platform_data am335x_evm_snd_data1 = { | ||
36 | .rxnumevt = 1, | ||
37 | }; | ||
38 | |||
39 | +static struct snd_platform_data bone_snd_data1 = { | ||
40 | + .tx_dma_offset = 0x46000000, /* McASP0*/ | ||
41 | + .rx_dma_offset = 0x46000000, | ||
42 | + .op_mode = DAVINCI_MCASP_IIS_MODE, | ||
43 | + .num_serializer = ARRAY_SIZE(am335x_iis_serializer_direction1), | ||
44 | + .tdm_slots = 2, | ||
45 | + .serial_dir = am335x_iis_serializer_direction1, | ||
46 | + .asp_chan_q = EVENTQ_2, | ||
47 | + .version = MCASP_VERSION_3, | ||
48 | + .txnumevt = 1, | ||
49 | + .rxnumevt = 1, | ||
50 | +}; | ||
51 | + | ||
52 | static struct omap2_hsmmc_info am335x_mmc[] __initdata = { | ||
53 | { | ||
54 | .mmc = 1, | ||
55 | @@ -796,11 +811,18 @@ static struct pinmux_config mcasp1_pin_mux[] = { | ||
56 | {"mii1_crs.mcasp1_aclkx", OMAP_MUX_MODE4 | AM33XX_PIN_INPUT_PULLDOWN}, | ||
57 | {"mii1_rxerr.mcasp1_fsx", OMAP_MUX_MODE4 | AM33XX_PIN_INPUT_PULLDOWN}, | ||
58 | {"mii1_col.mcasp1_axr2", OMAP_MUX_MODE4 | AM33XX_PIN_INPUT_PULLDOWN}, | ||
59 | - {"rmii1_refclk.mcasp1_axr3", OMAP_MUX_MODE4 | | ||
60 | - AM33XX_PIN_INPUT_PULLDOWN}, | ||
61 | + {"rmii1_refclk.mcasp1_axr3", OMAP_MUX_MODE4 | AM33XX_PIN_INPUT_PULLDOWN}, | ||
62 | {NULL, 0}, | ||
63 | }; | ||
64 | |||
65 | +/* Module pin mux for mcasp0 */ | ||
66 | +static struct pinmux_config mcasp0_pin_mux[] = { | ||
67 | + {"mcasp0_aclkx.mcasp0_aclkx", OMAP_MUX_MODE0 |AM33XX_PIN_INPUT_PULLDOWN}, | ||
68 | + {"mcasp0_fsx.mcasp0_fsx", OMAP_MUX_MODE0 | AM33XX_PIN_INPUT_PULLDOWN}, | ||
69 | + {"mcasp0_ahclkr.mcasp0_axr2", OMAP_MUX_MODE2 | AM33XX_PIN_INPUT_PULLDOWN}, | ||
70 | + {"mcasp0_ahclkx.mcasp0_axr3", OMAP_MUX_MODE2 | AM33XX_PIN_INPUT_PULLDOWN}, | ||
71 | + {NULL, 0}, | ||
72 | +}; | ||
73 | |||
74 | /* Module pin mux for mmc0 */ | ||
75 | static struct pinmux_config mmc0_pin_mux[] = { | ||
76 | @@ -1956,6 +1978,15 @@ static void evm_nand_init(int evm_id, int profile) | ||
77 | omap_init_elm(); | ||
78 | } | ||
79 | |||
80 | +static struct regulator_consumer_supply bone_audio_supplies[] = { | ||
81 | + /* tlv320aic3x analog supplies */ | ||
82 | + REGULATOR_SUPPLY("AVDD", "3-001b"), | ||
83 | + REGULATOR_SUPPLY("DRVDD", "3-001b"), | ||
84 | + /* tlv320aic3x digital supplies */ | ||
85 | + REGULATOR_SUPPLY("IOVDD", "3-001b"), | ||
86 | + REGULATOR_SUPPLY("DVDD", "3-001b"), | ||
87 | +}; | ||
88 | + | ||
89 | /* TPS65217 voltage regulator support */ | ||
90 | |||
91 | /* 1.8V */ | ||
92 | @@ -2229,6 +2260,25 @@ static void tt3201_init(int evm_id, int profile) | ||
93 | am33xx_d_can_init(1); | ||
94 | } | ||
95 | |||
96 | +/* Setup McASP 1 */ | ||
97 | +static void mcasp1_init(int evm_id, int profile) | ||
98 | +{ | ||
99 | + /* Configure McASP */ | ||
100 | + setup_pin_mux(mcasp1_pin_mux); | ||
101 | + am335x_register_mcasp(&am335x_evm_snd_data1, 1); | ||
102 | + return; | ||
103 | +} | ||
104 | + | ||
105 | +/* Setup McASP 0 */ | ||
106 | +static void mcasp0_init(int evm_id, int profile) | ||
107 | +{ | ||
108 | + printk("Beaglebone cape: mcasp0 init\n"); | ||
109 | + /* Configure McASP */ | ||
110 | + setup_pin_mux(mcasp0_pin_mux); | ||
111 | + am335x_register_mcasp(&bone_snd_data1, 0); | ||
112 | + return; | ||
113 | +} | ||
114 | + | ||
115 | static const char* cape_pins[] = { | ||
116 | /* | ||
117 | From SRM RevA5.0.1: | ||
118 | @@ -2567,7 +2617,8 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context | ||
119 | |||
120 | beaglebone_leds_free = 0; | ||
121 | dvileds_init(0,0); | ||
122 | - | ||
123 | + mcasp0_init(0,0); | ||
124 | + | ||
125 | if (!strncmp("00A1", cape_config.version, 4) || !strncmp("000A", cape_config.version, 4)) { | ||
126 | pr_info("BeagleBone cape: DVI init for revision A1 or older\n"); | ||
127 | setup_pin_mux(dvia1_pin_mux); | ||
128 | @@ -2715,6 +2766,9 @@ static struct at24_platform_data cape_eeprom_info = { | ||
129 | }; | ||
130 | |||
131 | static struct i2c_board_info __initdata cape_i2c_boardinfo[] = { | ||
132 | + { | ||
133 | + I2C_BOARD_INFO("tlv320aic3x", 0x1b), | ||
134 | + }, | ||
135 | { | ||
136 | I2C_BOARD_INFO("24c256", 0x54), | ||
137 | .platform_data = &cape_eeprom_info, | ||
138 | @@ -2741,16 +2795,6 @@ static void i2c2_init(int evm_id, int profile) | ||
139 | return; | ||
140 | } | ||
141 | |||
142 | - | ||
143 | -/* Setup McASP 1 */ | ||
144 | -static void mcasp1_init(int evm_id, int profile) | ||
145 | -{ | ||
146 | - /* Configure McASP */ | ||
147 | - setup_pin_mux(mcasp1_pin_mux); | ||
148 | - am335x_register_mcasp(&am335x_evm_snd_data1, 1); | ||
149 | - return; | ||
150 | -} | ||
151 | - | ||
152 | static void mmc1_init(int evm_id, int profile) | ||
153 | { | ||
154 | setup_pin_mux(mmc1_pin_mux); | ||
155 | diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c | ||
156 | index 9e029da..41c9b0f 100644 | ||
157 | --- a/arch/arm/mach-omap2/devices.c | ||
158 | +++ b/arch/arm/mach-omap2/devices.c | ||
159 | @@ -218,7 +218,6 @@ int __init am335x_register_mcasp(struct snd_platform_data *pdata, int ctrl_nr) | ||
160 | dev_name, oh->name); | ||
161 | return IS_ERR(pdev) ? PTR_ERR(pdev) : 0; | ||
162 | } | ||
163 | - | ||
164 | #else | ||
165 | int __init am335x_register_mcasp(struct snd_platform_data *pdata, int ctrl_nr) | ||
166 | { | ||
167 | @@ -234,6 +233,7 @@ struct platform_device am33xx_pcm_device = { | ||
168 | |||
169 | static void am33xx_init_pcm(void) | ||
170 | { | ||
171 | + printk("cape: pcm register"); | ||
172 | platform_device_register(&am33xx_pcm_device); | ||
173 | } | ||
174 | |||
175 | diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c | ||
176 | index d0dbac1..fc32b7f 100644 | ||
177 | --- a/sound/soc/codecs/tlv320aic3x.c | ||
178 | +++ b/sound/soc/codecs/tlv320aic3x.c | ||
179 | @@ -52,7 +52,7 @@ | ||
180 | |||
181 | #include "tlv320aic3x.h" | ||
182 | |||
183 | -#define AIC3X_NUM_SUPPLIES 4 | ||
184 | +#define AIC3X_NUM_SUPPLIES 0 | ||
185 | static const char *aic3x_supply_names[AIC3X_NUM_SUPPLIES] = { | ||
186 | "IOVDD", /* I/O Voltage */ | ||
187 | "DVDD", /* Digital Core Voltage */ | ||
188 | diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c | ||
189 | index f6a62c3..7ad7b37 100644 | ||
190 | --- a/sound/soc/davinci/davinci-evm.c | ||
191 | +++ b/sound/soc/davinci/davinci-evm.c | ||
192 | @@ -244,9 +244,9 @@ static struct snd_soc_dai_link da850_evm_dai = { | ||
193 | static struct snd_soc_dai_link am335x_evm_dai = { | ||
194 | .name = "TLV320AIC3X", | ||
195 | .stream_name = "AIC3X", | ||
196 | - .cpu_dai_name = "davinci-mcasp.1", | ||
197 | + .cpu_dai_name = "davinci-mcasp.0", | ||
198 | .codec_dai_name = "tlv320aic3x-hifi", | ||
199 | - .codec_name = "tlv320aic3x-codec.2-001b", | ||
200 | + .codec_name = "tlv320aic3x-codec.3-001b", | ||
201 | .platform_name = "davinci-pcm-audio", | ||
202 | .init = evm_aic3x_init, | ||
203 | .ops = &evm_ops, | ||
204 | @@ -331,8 +331,9 @@ static int __init evm_init(void) | ||
205 | return -EINVAL; | ||
206 | |||
207 | evm_snd_device = platform_device_alloc("soc-audio", index); | ||
208 | - if (!evm_snd_device) | ||
209 | + if (!evm_snd_device) { | ||
210 | return -ENOMEM; | ||
211 | + } | ||
212 | |||
213 | platform_set_drvdata(evm_snd_device, evm_snd_dev_data); | ||
214 | ret = platform_device_add(evm_snd_device); | ||
215 | -- | ||
216 | 1.7.7.6 | ||
217 | |||
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig index 315b6589..c9316db8 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated file; DO NOT EDIT. | 2 | # Automatically generated file; DO NOT EDIT. |
3 | # Linux/arm 3.2.14 Kernel Configuration | 3 | # Linux/arm 3.2.18 Kernel Configuration |
4 | # | 4 | # |
5 | CONFIG_ARM=y | 5 | CONFIG_ARM=y |
6 | CONFIG_HAVE_PWM=y | 6 | CONFIG_HAVE_PWM=y |
@@ -895,6 +895,9 @@ CONFIG_CFG80211_DEFAULT_PS=y | |||
895 | CONFIG_CFG80211_WEXT=y | 895 | CONFIG_CFG80211_WEXT=y |
896 | CONFIG_WIRELESS_EXT_SYSFS=y | 896 | CONFIG_WIRELESS_EXT_SYSFS=y |
897 | CONFIG_LIB80211=m | 897 | CONFIG_LIB80211=m |
898 | CONFIG_LIB80211_CRYPT_WEP=m | ||
899 | CONFIG_LIB80211_CRYPT_CCMP=m | ||
900 | CONFIG_LIB80211_CRYPT_TKIP=m | ||
898 | # CONFIG_LIB80211_DEBUG is not set | 901 | # CONFIG_LIB80211_DEBUG is not set |
899 | CONFIG_MAC80211=m | 902 | CONFIG_MAC80211=m |
900 | CONFIG_MAC80211_HAS_RC=y | 903 | CONFIG_MAC80211_HAS_RC=y |
@@ -905,7 +908,7 @@ CONFIG_MAC80211_RC_DEFAULT_PID=y | |||
905 | # CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set | 908 | # CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set |
906 | CONFIG_MAC80211_RC_DEFAULT="pid" | 909 | CONFIG_MAC80211_RC_DEFAULT="pid" |
907 | # CONFIG_MAC80211_MESH is not set | 910 | # CONFIG_MAC80211_MESH is not set |
908 | # CONFIG_MAC80211_LEDS is not set | 911 | CONFIG_MAC80211_LEDS=y |
909 | # CONFIG_MAC80211_DEBUGFS is not set | 912 | # CONFIG_MAC80211_DEBUGFS is not set |
910 | # CONFIG_MAC80211_DEBUG_MENU is not set | 913 | # CONFIG_MAC80211_DEBUG_MENU is not set |
911 | CONFIG_WIMAX=m | 914 | CONFIG_WIMAX=m |
@@ -1029,7 +1032,9 @@ CONFIG_EEPROM_AT24=y | |||
1029 | # CONFIG_EEPROM_MAX6875 is not set | 1032 | # CONFIG_EEPROM_MAX6875 is not set |
1030 | CONFIG_EEPROM_93CX6=m | 1033 | CONFIG_EEPROM_93CX6=m |
1031 | # CONFIG_EEPROM_93XX46 is not set | 1034 | # CONFIG_EEPROM_93XX46 is not set |
1032 | # CONFIG_IWMC3200TOP is not set | 1035 | CONFIG_IWMC3200TOP=m |
1036 | # CONFIG_IWMC3200TOP_DEBUG is not set | ||
1037 | # CONFIG_IWMC3200TOP_DEBUGFS is not set | ||
1033 | 1038 | ||
1034 | # | 1039 | # |
1035 | # Texas Instruments shared transport line discipline | 1040 | # Texas Instruments shared transport line discipline |
@@ -1204,16 +1209,16 @@ CONFIG_SLIP_SMART=y | |||
1204 | # | 1209 | # |
1205 | # USB Network Adapters | 1210 | # USB Network Adapters |
1206 | # | 1211 | # |
1207 | CONFIG_USB_CATC=y | 1212 | CONFIG_USB_CATC=m |
1208 | CONFIG_USB_KAWETH=y | 1213 | CONFIG_USB_KAWETH=m |
1209 | CONFIG_USB_PEGASUS=y | 1214 | CONFIG_USB_PEGASUS=m |
1210 | CONFIG_USB_RTL8150=y | 1215 | CONFIG_USB_RTL8150=m |
1211 | CONFIG_USB_USBNET=y | 1216 | CONFIG_USB_USBNET=m |
1212 | CONFIG_USB_NET_AX8817X=y | 1217 | CONFIG_USB_NET_AX8817X=m |
1213 | CONFIG_USB_NET_CDCETHER=y | 1218 | CONFIG_USB_NET_CDCETHER=m |
1214 | # CONFIG_USB_NET_CDC_EEM is not set | 1219 | # CONFIG_USB_NET_CDC_EEM is not set |
1215 | CONFIG_USB_NET_CDC_NCM=y | 1220 | CONFIG_USB_NET_CDC_NCM=m |
1216 | CONFIG_USB_NET_DM9601=y | 1221 | CONFIG_USB_NET_DM9601=m |
1217 | CONFIG_USB_NET_SMSC75XX=m | 1222 | CONFIG_USB_NET_SMSC75XX=m |
1218 | CONFIG_USB_NET_SMSC95XX=m | 1223 | CONFIG_USB_NET_SMSC95XX=m |
1219 | CONFIG_USB_NET_GL620A=m | 1224 | CONFIG_USB_NET_GL620A=m |
@@ -1221,14 +1226,14 @@ CONFIG_USB_NET_NET1080=m | |||
1221 | CONFIG_USB_NET_PLUSB=m | 1226 | CONFIG_USB_NET_PLUSB=m |
1222 | CONFIG_USB_NET_MCS7830=m | 1227 | CONFIG_USB_NET_MCS7830=m |
1223 | CONFIG_USB_NET_RNDIS_HOST=m | 1228 | CONFIG_USB_NET_RNDIS_HOST=m |
1224 | CONFIG_USB_NET_CDC_SUBSET=y | 1229 | CONFIG_USB_NET_CDC_SUBSET=m |
1225 | CONFIG_USB_ALI_M5632=y | 1230 | CONFIG_USB_ALI_M5632=y |
1226 | CONFIG_USB_AN2720=y | 1231 | CONFIG_USB_AN2720=y |
1227 | CONFIG_USB_BELKIN=y | 1232 | CONFIG_USB_BELKIN=y |
1228 | CONFIG_USB_ARMLINUX=y | 1233 | CONFIG_USB_ARMLINUX=y |
1229 | CONFIG_USB_EPSON2888=y | 1234 | CONFIG_USB_EPSON2888=y |
1230 | CONFIG_USB_KC2190=y | 1235 | CONFIG_USB_KC2190=y |
1231 | CONFIG_USB_NET_ZAURUS=y | 1236 | CONFIG_USB_NET_ZAURUS=m |
1232 | CONFIG_USB_NET_CX82310_ETH=m | 1237 | CONFIG_USB_NET_CX82310_ETH=m |
1233 | CONFIG_USB_NET_KALMIA=m | 1238 | CONFIG_USB_NET_KALMIA=m |
1234 | CONFIG_USB_HSO=m | 1239 | CONFIG_USB_HSO=m |
@@ -1242,14 +1247,35 @@ CONFIG_AT76C50X_USB=m | |||
1242 | CONFIG_USB_ZD1201=m | 1247 | CONFIG_USB_ZD1201=m |
1243 | CONFIG_USB_NET_RNDIS_WLAN=m | 1248 | CONFIG_USB_NET_RNDIS_WLAN=m |
1244 | CONFIG_RTL8187=m | 1249 | CONFIG_RTL8187=m |
1250 | CONFIG_RTL8187_LEDS=y | ||
1245 | # CONFIG_MAC80211_HWSIM is not set | 1251 | # CONFIG_MAC80211_HWSIM is not set |
1246 | # CONFIG_ATH_COMMON is not set | 1252 | CONFIG_ATH_COMMON=m |
1247 | # CONFIG_B43 is not set | 1253 | # CONFIG_ATH_DEBUG is not set |
1254 | # CONFIG_ATH9K is not set | ||
1255 | # CONFIG_ATH9K_HTC is not set | ||
1256 | CONFIG_CARL9170=m | ||
1257 | CONFIG_CARL9170_LEDS=y | ||
1258 | CONFIG_CARL9170_WPC=y | ||
1259 | # CONFIG_CARL9170_HWRNG is not set | ||
1260 | CONFIG_ATH6KL=m | ||
1261 | # CONFIG_ATH6KL_DEBUG is not set | ||
1262 | CONFIG_B43=m | ||
1263 | CONFIG_B43_SSB=y | ||
1264 | # CONFIG_B43_SDIO is not set | ||
1265 | CONFIG_B43_PIO=y | ||
1266 | CONFIG_B43_PHY_N=y | ||
1267 | CONFIG_B43_PHY_LP=y | ||
1268 | CONFIG_B43_PHY_HT=y | ||
1269 | CONFIG_B43_LEDS=y | ||
1270 | CONFIG_B43_HWRNG=y | ||
1271 | # CONFIG_B43_DEBUG is not set | ||
1248 | # CONFIG_B43LEGACY is not set | 1272 | # CONFIG_B43LEGACY is not set |
1249 | CONFIG_BRCMUTIL=m | 1273 | CONFIG_BRCMUTIL=m |
1250 | CONFIG_BRCMFMAC=m | 1274 | CONFIG_BRCMFMAC=m |
1251 | # CONFIG_BRCMDBG is not set | 1275 | # CONFIG_BRCMDBG is not set |
1252 | # CONFIG_HOSTAP is not set | 1276 | CONFIG_HOSTAP=m |
1277 | CONFIG_HOSTAP_FIRMWARE=y | ||
1278 | # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set | ||
1253 | # CONFIG_IWM is not set | 1279 | # CONFIG_IWM is not set |
1254 | CONFIG_LIBERTAS=m | 1280 | CONFIG_LIBERTAS=m |
1255 | CONFIG_LIBERTAS_USB=m | 1281 | CONFIG_LIBERTAS_USB=m |
@@ -1259,7 +1285,9 @@ CONFIG_LIBERTAS_DEBUG=y | |||
1259 | # CONFIG_LIBERTAS_MESH is not set | 1285 | # CONFIG_LIBERTAS_MESH is not set |
1260 | CONFIG_P54_COMMON=m | 1286 | CONFIG_P54_COMMON=m |
1261 | CONFIG_P54_USB=m | 1287 | CONFIG_P54_USB=m |
1262 | # CONFIG_P54_SPI is not set | 1288 | CONFIG_P54_SPI=m |
1289 | CONFIG_P54_SPI_DEFAULT_EEPROM=y | ||
1290 | CONFIG_P54_LEDS=y | ||
1263 | CONFIG_RT2X00=m | 1291 | CONFIG_RT2X00=m |
1264 | CONFIG_RT2500USB=m | 1292 | CONFIG_RT2500USB=m |
1265 | CONFIG_RT73USB=m | 1293 | CONFIG_RT73USB=m |
@@ -1294,7 +1322,8 @@ CONFIG_ZD1211RW=m | |||
1294 | # | 1322 | # |
1295 | CONFIG_WIMAX_I2400M=m | 1323 | CONFIG_WIMAX_I2400M=m |
1296 | CONFIG_WIMAX_I2400M_USB=m | 1324 | CONFIG_WIMAX_I2400M_USB=m |
1297 | # CONFIG_WIMAX_I2400M_SDIO is not set | 1325 | CONFIG_WIMAX_I2400M_SDIO=m |
1326 | CONFIG_WIMAX_IWMC3200_SDIO=y | ||
1298 | CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 | 1327 | CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 |
1299 | # CONFIG_WAN is not set | 1328 | # CONFIG_WAN is not set |
1300 | # CONFIG_ISDN is not set | 1329 | # CONFIG_ISDN is not set |
@@ -1800,7 +1829,12 @@ CONFIG_SSB_POSSIBLE=y | |||
1800 | # | 1829 | # |
1801 | # Sonics Silicon Backplane | 1830 | # Sonics Silicon Backplane |
1802 | # | 1831 | # |
1803 | # CONFIG_SSB is not set | 1832 | CONFIG_SSB=m |
1833 | CONFIG_SSB_BLOCKIO=y | ||
1834 | CONFIG_SSB_SDIOHOST_POSSIBLE=y | ||
1835 | # CONFIG_SSB_SDIOHOST is not set | ||
1836 | # CONFIG_SSB_SILENT is not set | ||
1837 | # CONFIG_SSB_DEBUG is not set | ||
1804 | CONFIG_BCMA_POSSIBLE=y | 1838 | CONFIG_BCMA_POSSIBLE=y |
1805 | 1839 | ||
1806 | # | 1840 | # |
@@ -1891,23 +1925,23 @@ CONFIG_VIDEO_MEDIA=m | |||
1891 | # | 1925 | # |
1892 | # Multimedia drivers | 1926 | # Multimedia drivers |
1893 | # | 1927 | # |
1894 | CONFIG_RC_CORE=y | 1928 | CONFIG_RC_CORE=m |
1895 | CONFIG_LIRC=y | 1929 | CONFIG_LIRC=m |
1896 | CONFIG_RC_MAP=y | 1930 | CONFIG_RC_MAP=m |
1897 | CONFIG_IR_NEC_DECODER=y | 1931 | CONFIG_IR_NEC_DECODER=m |
1898 | CONFIG_IR_RC5_DECODER=y | 1932 | CONFIG_IR_RC5_DECODER=m |
1899 | CONFIG_IR_RC6_DECODER=y | 1933 | CONFIG_IR_RC6_DECODER=m |
1900 | CONFIG_IR_JVC_DECODER=y | 1934 | CONFIG_IR_JVC_DECODER=m |
1901 | CONFIG_IR_SONY_DECODER=y | 1935 | CONFIG_IR_SONY_DECODER=m |
1902 | CONFIG_IR_RC5_SZ_DECODER=y | 1936 | CONFIG_IR_RC5_SZ_DECODER=m |
1903 | CONFIG_IR_MCE_KBD_DECODER=y | 1937 | CONFIG_IR_MCE_KBD_DECODER=m |
1904 | CONFIG_IR_LIRC_CODEC=y | 1938 | CONFIG_IR_LIRC_CODEC=m |
1905 | CONFIG_RC_ATI_REMOTE=m | 1939 | CONFIG_RC_ATI_REMOTE=m |
1906 | # CONFIG_IR_IMON is not set | 1940 | CONFIG_IR_IMON=m |
1907 | # CONFIG_IR_MCEUSB is not set | 1941 | CONFIG_IR_MCEUSB=m |
1908 | # CONFIG_IR_REDRAT3 is not set | 1942 | CONFIG_IR_REDRAT3=m |
1909 | # CONFIG_IR_STREAMZAP is not set | 1943 | CONFIG_IR_STREAMZAP=m |
1910 | # CONFIG_RC_LOOPBACK is not set | 1944 | CONFIG_RC_LOOPBACK=m |
1911 | CONFIG_MEDIA_ATTACH=y | 1945 | CONFIG_MEDIA_ATTACH=y |
1912 | CONFIG_MEDIA_TUNER=m | 1946 | CONFIG_MEDIA_TUNER=m |
1913 | CONFIG_MEDIA_TUNER_CUSTOMISE=y | 1947 | CONFIG_MEDIA_TUNER_CUSTOMISE=y |
@@ -1949,7 +1983,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y | |||
1949 | # CONFIG_VIDEO_ADV_DEBUG is not set | 1983 | # CONFIG_VIDEO_ADV_DEBUG is not set |
1950 | # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set | 1984 | # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set |
1951 | # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set | 1985 | # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set |
1952 | CONFIG_VIDEO_IR_I2C=y | 1986 | CONFIG_VIDEO_IR_I2C=m |
1953 | 1987 | ||
1954 | # | 1988 | # |
1955 | # Encoders, decoders, sensors and other helper chips | 1989 | # Encoders, decoders, sensors and other helper chips |
@@ -2047,7 +2081,7 @@ CONFIG_VIDEO_VIVI=m | |||
2047 | # CONFIG_VIDEO_AU0828 is not set | 2081 | # CONFIG_VIDEO_AU0828 is not set |
2048 | # CONFIG_SOC_CAMERA is not set | 2082 | # CONFIG_SOC_CAMERA is not set |
2049 | CONFIG_V4L_USB_DRIVERS=y | 2083 | CONFIG_V4L_USB_DRIVERS=y |
2050 | CONFIG_USB_VIDEO_CLASS=y | 2084 | CONFIG_USB_VIDEO_CLASS=m |
2051 | CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y | 2085 | CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y |
2052 | CONFIG_USB_GSPCA=m | 2086 | CONFIG_USB_GSPCA=m |
2053 | CONFIG_USB_M5602=m | 2087 | CONFIG_USB_M5602=m |
@@ -2588,7 +2622,7 @@ CONFIG_MUSB_PIO_ONLY=y | |||
2588 | CONFIG_USB_ACM=y | 2622 | CONFIG_USB_ACM=y |
2589 | CONFIG_USB_PRINTER=y | 2623 | CONFIG_USB_PRINTER=y |
2590 | CONFIG_USB_WDM=y | 2624 | CONFIG_USB_WDM=y |
2591 | # CONFIG_USB_TMC is not set | 2625 | CONFIG_USB_TMC=m |
2592 | 2626 | ||
2593 | # | 2627 | # |
2594 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may | 2628 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may |
@@ -3054,9 +3088,9 @@ CONFIG_AD2S1200=m | |||
3054 | # | 3088 | # |
3055 | # Triggers - standalone | 3089 | # Triggers - standalone |
3056 | # | 3090 | # |
3057 | # CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set | 3091 | CONFIG_IIO_PERIODIC_RTC_TRIGGER=m |
3058 | # CONFIG_IIO_GPIO_TRIGGER is not set | 3092 | CONFIG_IIO_GPIO_TRIGGER=m |
3059 | # CONFIG_IIO_SYSFS_TRIGGER is not set | 3093 | CONFIG_IIO_SYSFS_TRIGGER=m |
3060 | CONFIG_IIO_DUMMY_EVGEN=m | 3094 | CONFIG_IIO_DUMMY_EVGEN=m |
3061 | CONFIG_IIO_SIMPLE_DUMMY=m | 3095 | CONFIG_IIO_SIMPLE_DUMMY=m |
3062 | CONFIG_IIO_SIMPLE_DUMMY_EVENTS=y | 3096 | CONFIG_IIO_SIMPLE_DUMMY_EVENTS=y |
@@ -3075,7 +3109,11 @@ CONFIG_USB_ENESTORAGE=m | |||
3075 | # CONFIG_SPEAKUP is not set | 3109 | # CONFIG_SPEAKUP is not set |
3076 | # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set | 3110 | # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set |
3077 | # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set | 3111 | # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set |
3078 | # CONFIG_STAGING_MEDIA is not set | 3112 | CONFIG_STAGING_MEDIA=y |
3113 | CONFIG_DVB_AS102=m | ||
3114 | CONFIG_EASYCAP=m | ||
3115 | # CONFIG_EASYCAP_DEBUG is not set | ||
3116 | # CONFIG_LIRC_STAGING is not set | ||
3079 | CONFIG_CLKDEV_LOOKUP=y | 3117 | CONFIG_CLKDEV_LOOKUP=y |
3080 | 3118 | ||
3081 | # | 3119 | # |
diff --git a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb index cd788482..4c144e51 100644 --- a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb +++ b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb | |||
@@ -12,7 +12,7 @@ MULTI_CONFIG_BASE_SUFFIX = "" | |||
12 | 12 | ||
13 | BRANCH = "v3.2-staging" | 13 | BRANCH = "v3.2-staging" |
14 | SRCREV = "720e07b4c1f687b61b147b31c698cb6816d72f01" | 14 | SRCREV = "720e07b4c1f687b61b147b31c698cb6816d72f01" |
15 | MACHINE_KERNEL_PR_append = "a+gitr${SRCREV}" | 15 | MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}" |
16 | 16 | ||
17 | COMPATIBLE_MACHINE = "(ti33x)" | 17 | COMPATIBLE_MACHINE = "(ti33x)" |
18 | 18 | ||
@@ -1218,4 +1218,6 @@ PATCHES_OVER_PSP = " \ | |||
1218 | file://beaglebone/0059-beaglebone-fix-pin-free-thinko-this-method-doesn-t-g.patch \ | 1218 | file://beaglebone/0059-beaglebone-fix-pin-free-thinko-this-method-doesn-t-g.patch \ |
1219 | file://beaglebone/0060-beaglebone-switch-RS232-cape-to-ttyO2.patch \ | 1219 | file://beaglebone/0060-beaglebone-switch-RS232-cape-to-ttyO2.patch \ |
1220 | file://beaglebone/0061-beaglebone-make-uart2-pinmux-match-the-uart0-pinmux.patch \ | 1220 | file://beaglebone/0061-beaglebone-make-uart2-pinmux-match-the-uart0-pinmux.patch \ |
1221 | file://beaglebone/0062-da8xx-fb-Rounding-FB-size-to-satisfy-SGX-buffer-requ.patch \ | ||
1222 | file://beaglebone/0063-beaglebone-dvi-cape-audio-hacks.patch \ | ||
1221 | " | 1223 | " |