Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
omap3: Decrease cpufreq transition latency
omap3: update Pandora defconfig
omap3: 3430sdp: Enable Linux Regulator framework
omap3: beagle: Fix USB host port power control
omap3: pandora: Fix keypad keymap
omap1: Amstrad Delta defconfig fixes
omap: Fix omapfb/lcdc on OMAP1510 broken when PM set
omap: Use resource_size
omap: Fix race condition in omap dma driver
+126
-56
+17
-7
arch/arm/configs/ams_delta_defconfig
+17
-7
arch/arm/configs/ams_delta_defconfig
···
55
55
CONFIG_INITRAMFS_SOURCE=""
56
56
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
57
57
CONFIG_SYSCTL=y
58
-
# CONFIG_EMBEDDED is not set
58
+
CONFIG_EMBEDDED=y
59
59
CONFIG_UID16=y
60
60
CONFIG_SYSCTL_SYSCALL=y
61
-
CONFIG_KALLSYMS=y
61
+
# CONFIG_KALLSYMS is not set
62
62
# CONFIG_KALLSYMS_ALL is not set
63
63
# CONFIG_KALLSYMS_EXTRA_PASS is not set
64
64
CONFIG_HOTPLUG=y
···
224
224
#
225
225
# Processor Features
226
226
#
227
-
# CONFIG_ARM_THUMB is not set
227
+
CONFIG_ARM_THUMB=y
228
228
# CONFIG_CPU_ICACHE_DISABLE is not set
229
229
# CONFIG_CPU_DCACHE_DISABLE is not set
230
230
CONFIG_CPU_DCACHE_WRITETHROUGH=y
···
248
248
# CONFIG_HIGH_RES_TIMERS is not set
249
249
CONFIG_PREEMPT=y
250
250
CONFIG_HZ=100
251
-
# CONFIG_AEABI is not set
251
+
CONFIG_AEABI=y
252
252
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
253
253
CONFIG_SELECT_MEMORY_MODEL=y
254
254
CONFIG_FLATMEM_MANUAL=y
···
299
299
#
300
300
# Power management options
301
301
#
302
-
# CONFIG_PM is not set
302
+
CONFIG_PM=y
303
+
# CONFIG_SUSPEND is not set
304
+
CONFIG_PM_RUNTIME=y
303
305
304
306
#
305
307
# Networking
···
672
670
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
673
671
# CONFIG_INPUT_JOYDEV is not set
674
672
# CONFIG_INPUT_TSDEV is not set
675
-
# CONFIG_INPUT_EVDEV is not set
673
+
CONFIG_INPUT_EVDEV=y
676
674
# CONFIG_INPUT_EVBUG is not set
677
675
678
676
#
···
786
784
#
787
785
# CONFIG_SPI is not set
788
786
# CONFIG_SPI_MASTER is not set
787
+
CONFIG_GPIO_SYSFS=y
789
788
790
789
#
791
790
# Dallas's 1-wire bus
···
823
820
CONFIG_LEDS_TRIGGERS=y
824
821
CONFIG_LEDS_TRIGGER_TIMER=y
825
822
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
823
+
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
826
824
827
825
#
828
826
# Multimedia devices
···
900
896
#
901
897
# Sound
902
898
#
903
-
# CONFIG_SOUND is not set
899
+
CONFIG_SOUND=y
900
+
CONFIG_SND=y
901
+
CONFIG_SND_MIXER_OSS=y
902
+
CONFIG_SND_PCM_OSS=y
903
+
CONFIG_SND_SOC=y
904
+
CONFIG_SND_OMAP_SOC=y
905
+
CONFIG_SND_OMAP_SOC_AMS_DELTA=y
904
906
905
907
#
906
908
# HID Devices
+44
-5
arch/arm/configs/omap3_pandora_defconfig
+44
-5
arch/arm/configs/omap3_pandora_defconfig
···
611
611
# CONFIG_KEYBOARD_XTKBD is not set
612
612
# CONFIG_KEYBOARD_NEWTON is not set
613
613
# CONFIG_KEYBOARD_STOWAWAY is not set
614
-
# CONFIG_KEYBOARD_GPIO is not set
614
+
CONFIG_KEYBOARD_GPIO=y
615
615
CONFIG_INPUT_MOUSE=y
616
616
# CONFIG_MOUSE_PS2 is not set
617
617
# CONFIG_MOUSE_SERIAL is not set
···
634
634
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
635
635
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
636
636
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
637
-
# CONFIG_INPUT_MISC is not set
637
+
CONFIG_INPUT_MISC=y
638
+
CONFIG_INPUT_TWL4030_PWRBUTTON=y
638
639
639
640
#
640
641
# Hardware I/O ports
···
835
834
#
836
835
# CONFIG_VGA_CONSOLE is not set
837
836
CONFIG_DUMMY_CONSOLE=y
838
-
# CONFIG_SOUND is not set
837
+
CONFIG_SOUND=y
838
+
CONFIG_SOUND_OSS_CORE=y
839
+
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
840
+
CONFIG_SND=y
841
+
CONFIG_SND_TIMER=y
842
+
CONFIG_SND_PCM=y
843
+
CONFIG_SND_JACK=y
844
+
CONFIG_SND_OSSEMUL=y
845
+
CONFIG_SND_MIXER_OSS=y
846
+
CONFIG_SND_PCM_OSS=y
847
+
CONFIG_SND_PCM_OSS_PLUGINS=y
848
+
CONFIG_SND_SUPPORT_OLD_API=y
849
+
CONFIG_SND_VERBOSE_PROCFS=y
850
+
CONFIG_SND_VERBOSE_PRINTK=y
851
+
CONFIG_SND_DRIVERS=y
852
+
CONFIG_SND_USB=y
853
+
CONFIG_SND_SOC=y
854
+
CONFIG_SND_OMAP_SOC=y
855
+
CONFIG_SND_OMAP_SOC_MCBSP=y
856
+
CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y
857
+
CONFIG_SND_SOC_I2C_AND_SPI=y
858
+
CONFIG_SND_SOC_TWL4030=y
859
+
839
860
CONFIG_HID_SUPPORT=y
840
861
CONFIG_HID=y
841
862
# CONFIG_HID_DEBUG is not set
···
1043
1020
# CONFIG_MMC_SPI is not set
1044
1021
# CONFIG_MEMSTICK is not set
1045
1022
# CONFIG_ACCESSIBILITY is not set
1046
-
# CONFIG_NEW_LEDS is not set
1023
+
CONFIG_NEW_LEDS=y
1024
+
CONFIG_LEDS_CLASS=y
1025
+
CONFIG_LEDS_GPIO=y
1026
+
CONFIG_LEDS_GPIO_PLATFORM=y
1027
+
CONFIG_LEDS_TRIGGERS=y
1028
+
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
1029
+
1047
1030
CONFIG_RTC_LIB=y
1048
1031
CONFIG_RTC_CLASS=y
1049
1032
CONFIG_RTC_HCTOSYS=y
···
1113
1084
# on-CPU RTC drivers
1114
1085
#
1115
1086
# CONFIG_DMADEVICES is not set
1116
-
# CONFIG_REGULATOR is not set
1117
1087
# CONFIG_UIO is not set
1088
+
1089
+
CONFIG_REGULATOR=y
1090
+
CONFIG_REGULATOR_FIXED_VOLTAGE=y
1091
+
CONFIG_REGULATOR_TWL4030=y
1118
1092
1119
1093
#
1120
1094
# File systems
···
1439
1407
CONFIG_HAS_IOMEM=y
1440
1408
CONFIG_HAS_IOPORT=y
1441
1409
CONFIG_HAS_DMA=y
1410
+
1411
+
# added by hand for now
1412
+
CONFIG_KEYBOARD_TWL4030=y
1413
+
CONFIG_USB_OTG_UTILS=y
1414
+
CONFIG_TWL4030_USB=y
1415
+
CONFIG_MMC_OMAP_HS=y
1416
+
+8
-1
arch/arm/configs/omap_3430sdp_defconfig
+8
-1
arch/arm/configs/omap_3430sdp_defconfig
···
1703
1703
# on-CPU RTC drivers
1704
1704
#
1705
1705
# CONFIG_DMADEVICES is not set
1706
-
# CONFIG_REGULATOR is not set
1706
+
CONFIG_REGULATOR=y
1707
+
# CONFIG_REGULATOR_DEBUG is not set
1708
+
# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
1709
+
# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
1710
+
# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
1711
+
# CONFIG_REGULATOR_BQ24022 is not set
1712
+
# CONFIG_REGULATOR_MAX1586 is not set
1713
+
CONFIG_REGULATOR_TWL4030=y
1707
1714
# CONFIG_UIO is not set
1708
1715
# CONFIG_STAGING is not set
1709
1716
+1
-1
arch/arm/mach-omap2/board-omap3beagle.c
+1
-1
arch/arm/mach-omap2/board-omap3beagle.c
···
162
162
163
163
/* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */
164
164
gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR");
165
-
gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
165
+
gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
166
166
167
167
/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
168
168
gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
+39
-39
arch/arm/mach-omap2/board-omap3pandora.c
+39
-39
arch/arm/mach-omap2/board-omap3pandora.c
···
134
134
}
135
135
136
136
static int board_keymap[] = {
137
-
/* col, row, code */
137
+
/* row, col, code */
138
138
KEY(0, 0, KEY_9),
139
-
KEY(0, 1, KEY_0),
140
-
KEY(0, 2, KEY_BACKSPACE),
141
-
KEY(0, 3, KEY_O),
142
-
KEY(0, 4, KEY_P),
143
-
KEY(0, 5, KEY_K),
144
-
KEY(0, 6, KEY_L),
145
-
KEY(0, 7, KEY_ENTER),
146
-
KEY(1, 0, KEY_8),
139
+
KEY(0, 1, KEY_8),
140
+
KEY(0, 2, KEY_I),
141
+
KEY(0, 3, KEY_J),
142
+
KEY(0, 4, KEY_N),
143
+
KEY(0, 5, KEY_M),
144
+
KEY(1, 0, KEY_0),
147
145
KEY(1, 1, KEY_7),
148
-
KEY(1, 2, KEY_6),
149
-
KEY(1, 3, KEY_5),
150
-
KEY(1, 4, KEY_4),
151
-
KEY(1, 5, KEY_3),
152
-
KEY(1, 6, KEY_2),
153
-
KEY(1, 7, KEY_1),
154
-
KEY(2, 0, KEY_I),
155
-
KEY(2, 1, KEY_U),
146
+
KEY(1, 2, KEY_U),
147
+
KEY(1, 3, KEY_H),
148
+
KEY(1, 4, KEY_B),
149
+
KEY(1, 5, KEY_SPACE),
150
+
KEY(2, 0, KEY_BACKSPACE),
151
+
KEY(2, 1, KEY_6),
156
152
KEY(2, 2, KEY_Y),
157
-
KEY(2, 3, KEY_T),
158
-
KEY(2, 4, KEY_R),
159
-
KEY(2, 5, KEY_E),
160
-
KEY(2, 6, KEY_W),
161
-
KEY(2, 7, KEY_Q),
162
-
KEY(3, 0, KEY_J),
163
-
KEY(3, 1, KEY_H),
164
-
KEY(3, 2, KEY_G),
153
+
KEY(2, 3, KEY_G),
154
+
KEY(2, 4, KEY_V),
155
+
KEY(2, 5, KEY_FN),
156
+
KEY(3, 0, KEY_O),
157
+
KEY(3, 1, KEY_5),
158
+
KEY(3, 2, KEY_T),
165
159
KEY(3, 3, KEY_F),
166
-
KEY(3, 4, KEY_D),
167
-
KEY(3, 5, KEY_S),
168
-
KEY(3, 6, KEY_A),
169
-
KEY(3, 7, KEY_LEFTSHIFT),
170
-
KEY(4, 0, KEY_N),
171
-
KEY(4, 1, KEY_B),
172
-
KEY(4, 2, KEY_V),
173
-
KEY(4, 3, KEY_C),
160
+
KEY(3, 4, KEY_C),
161
+
KEY(4, 0, KEY_P),
162
+
KEY(4, 1, KEY_4),
163
+
KEY(4, 2, KEY_R),
164
+
KEY(4, 3, KEY_D),
174
165
KEY(4, 4, KEY_X),
175
-
KEY(4, 5, KEY_Z),
176
-
KEY(4, 6, KEY_DOT),
177
-
KEY(4, 7, KEY_COMMA),
178
-
KEY(5, 0, KEY_M),
179
-
KEY(5, 1, KEY_SPACE),
180
-
KEY(5, 2, KEY_FN),
166
+
KEY(5, 0, KEY_K),
167
+
KEY(5, 1, KEY_3),
168
+
KEY(5, 2, KEY_E),
169
+
KEY(5, 3, KEY_S),
170
+
KEY(5, 4, KEY_Z),
171
+
KEY(6, 0, KEY_L),
172
+
KEY(6, 1, KEY_2),
173
+
KEY(6, 2, KEY_W),
174
+
KEY(6, 3, KEY_A),
175
+
KEY(6, 4, KEY_DOT),
176
+
KEY(7, 0, KEY_ENTER),
177
+
KEY(7, 1, KEY_1),
178
+
KEY(7, 2, KEY_Q),
179
+
KEY(7, 3, KEY_LEFTSHIFT),
180
+
KEY(7, 4, KEY_COMMA),
181
181
};
182
182
183
183
static struct matrix_keymap_data board_map_data = {
+1
-1
arch/arm/mach-omap2/gpmc.c
+1
-1
arch/arm/mach-omap2/gpmc.c
+1
-1
arch/arm/mach-omap2/mailbox.c
+1
-1
arch/arm/mach-omap2/mailbox.c
+1
-1
arch/arm/plat-omap/cpu-omap.c
+1
-1
arch/arm/plat-omap/cpu-omap.c
+14
arch/arm/plat-omap/dma.c
+14
arch/arm/plat-omap/dma.c
···
691
691
static inline void omap2_enable_irq_lch(int lch)
692
692
{
693
693
u32 val;
694
+
unsigned long flags;
694
695
695
696
if (!cpu_class_is_omap2())
696
697
return;
697
698
699
+
spin_lock_irqsave(&dma_chan_lock, flags);
698
700
val = dma_read(IRQENABLE_L0);
699
701
val |= 1 << lch;
700
702
dma_write(val, IRQENABLE_L0);
703
+
spin_unlock_irqrestore(&dma_chan_lock, flags);
701
704
}
702
705
703
706
int omap_request_dma(int dev_id, const char *dev_name,
···
802
799
803
800
if (cpu_class_is_omap2()) {
804
801
u32 val;
802
+
803
+
spin_lock_irqsave(&dma_chan_lock, flags);
805
804
/* Disable interrupts */
806
805
val = dma_read(IRQENABLE_L0);
807
806
val &= ~(1 << lch);
808
807
dma_write(val, IRQENABLE_L0);
808
+
spin_unlock_irqrestore(&dma_chan_lock, flags);
809
809
810
810
/* Clear the CSR register and IRQ status register */
811
811
dma_write(OMAP2_DMA_CSR_CLEAR_MASK, CSR(lch));
···
1113
1107
int omap_dma_running(void)
1114
1108
{
1115
1109
int lch;
1110
+
1111
+
/*
1112
+
* On OMAP1510, internal LCD controller will start the transfer
1113
+
* when it gets enabled, so assume DMA running if LCD enabled.
1114
+
*/
1115
+
if (cpu_is_omap1510())
1116
+
if (omap_readw(0xfffec000 + 0x00) & (1 << 0))
1117
+
return 1;
1116
1118
1117
1119
/* Check if LCD DMA is running */
1118
1120
if (cpu_is_omap16xx())