Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

01539ba2 · Linus Torvalds <[email protected]> · 2011-01-06 19:13:58 -08:00

* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (243 commits)
  omap2: Make OMAP2PLUS select OMAP_DM_TIMER
  OMAP4: hwmod data: Fix alignment and end of line in structurefields
  OMAP4: hwmod data: Move the DMA structures
  OMAP4: hwmod data: Move the smartreflex structures
  OMAP4: hwmod data: Fix missing SIDLE_SMART_WKUP in smartreflexsysc
  arm: omap: tusb6010: add name for MUSB IRQ
  arm: omap: craneboard: Add USB EHCI support
  omap2+: Initialize serial port for dynamic remuxing for n8x0
  omap2+: Add struct omap_board_data and use it for platform level serial init
  omap2+: Allow hwmod state changes to mux pads based on the state changes
  omap2+: Add support for hwmod specific muxing of devices
  omap2+: Add omap_mux_get_by_name
  OMAP2: PM: fix compile error when !CONFIG_SUSPEND
  MAINTAINERS: OMAP: hwmod: update hwmod code, data maintainership
  OMAP4: Smartreflex framework extensions
  OMAP4: hwmod: Add inital data for smartreflex modules.
  OMAP4: PM: Program correct init voltages for scalable VDDs
  OMAP4: Adding voltage driver support
  OMAP4: Register voltage PMIC parameters with the voltage layer
  OMAP3: PM: Program correct init voltages for VDD1 and VDD2
  ...

Fix up trivial conflict in arch/arm/plat-omap/Kconfig

Commit: 01539ba2a706ab7d35fc0667dff919ade7f87d63
Parents: 9e9bc973 · dc69d1af

Merge commit. Changes below are compared with the first parent: 9e9bc973.

Changes

253 files changed · +20822 −8467

File	Status	Add	Del	Content
Documentation/arm/OMAP/omap_pm	modified	+25	−0	View file
MAINTAINERS	modified	+14	−0	View file
arch/arm/configs/ams_delta_defconfig	deleted	+0	−121	View before deletion
arch/arm/configs/htcherald_defconfig	deleted	+0	−73	View before deletion
arch/arm/configs/n770_defconfig	deleted	+0	−138	View before deletion
arch/arm/configs/omap1_defconfig	added	+286	−0	View file
arch/arm/configs/omap_generic_1510_defconfig	deleted	+0	−84	View before deletion
arch/arm/configs/omap_generic_1610_defconfig	deleted	+0	−87	View before deletion
arch/arm/configs/omap_generic_1710_defconfig	deleted	+0	−75	View before deletion
arch/arm/configs/omap_h2_1610_defconfig	deleted	+0	−109	View before deletion
arch/arm/configs/omap_innovator_1510_defconfig	deleted	+0	−102	View before deletion
arch/arm/configs/omap_innovator_1610_defconfig	deleted	+0	−58	View before deletion
arch/arm/configs/omap_osk_5912_defconfig	deleted	+0	−87	View before deletion
arch/arm/configs/omap_perseus2_730_defconfig	deleted	+0	−65	View before deletion
arch/arm/configs/palmte_defconfig	deleted	+0	−48	View before deletion
arch/arm/configs/palmtt_defconfig	deleted	+0	−56	View before deletion
arch/arm/configs/palmz71_defconfig	deleted	+0	−53	View before deletion
arch/arm/configs/sx1_defconfig	deleted	+0	−110	View before deletion
arch/arm/include/asm/hardware/cache-l2x0.h	modified	+11	−1	View file
arch/arm/mach-omap1/Kconfig	modified	+1	−10	View file
arch/arm/mach-omap1/Makefile	modified	+9	−3	View file
arch/arm/mach-omap1/board-ams-delta.c	modified	+70	−67	View file
arch/arm/mach-omap1/board-fsample.c	modified	+46	−43	View file
arch/arm/mach-omap1/board-h2.c	modified	+41	−38	View file
arch/arm/mach-omap1/board-h3.c	modified	+50	−47	View file
arch/arm/mach-omap1/board-htcherald.c	modified	+52	−50	View file
arch/arm/mach-omap1/board-innovator.c	modified	+16	−16	View file
arch/arm/mach-omap1/board-nokia770.c	modified	+16	−14	View file
arch/arm/mach-omap1/board-osk.c	modified	+15	−12	View file
arch/arm/mach-omap1/board-palmte.c	modified	+16	−13	View file
arch/arm/mach-omap1/board-palmtt.c	modified	+16	−12	View file
arch/arm/mach-omap1/board-palmz71.c	modified	+17	−14	View file
arch/arm/mach-omap1/board-perseus2.c	modified	+47	−44	View file
arch/arm/mach-omap1/board-sx1.c	modified	+30	−28	View file
arch/arm/mach-omap1/board-voiceblue.c	modified	+6	−1	View file
arch/arm/mach-omap1/clock_data.c	modified	+13	−14	View file
arch/arm/mach-omap1/devices.c	modified	+4	−0	View file
arch/arm/mach-omap1/dma.c	added	+390	−0	View file
arch/arm/mach-omap1/flash.c	modified	+1	−0	View file
arch/arm/mach-omap1/fpga.c	modified	+6	−4	View file
arch/arm/mach-omap1/gpio15xx.c	added	+99	−0	View file
arch/arm/mach-omap1/gpio16xx.c	added	+200	−0	View file
arch/arm/mach-omap1/gpio7xx.c	added	+262	−0	View file
arch/arm/mach-omap1/include/mach/entry-macro.S	modified	+14	−13	View file
arch/arm/mach-omap1/io.c	modified	+39	−0	View file
arch/arm/mach-omap1/irq.c	modified	+5	−0	View file
arch/arm/mach-omap1/lcd_dma.c	modified	+3	−0	View file
arch/arm/mach-omap1/leds.c	modified	+3	−0	View file
arch/arm/mach-omap1/mailbox.c	modified	+2	−3	View file
arch/arm/mach-omap1/mcbsp.c	modified	+4	−1	View file
arch/arm/mach-omap1/mux.c	modified	+1	−1	View file
arch/arm/mach-omap1/pm.c	modified	+3	−0	View file
arch/arm/mach-omap1/pm_bus.c	modified	+3	−1	View file
arch/arm/mach-omap1/serial.c	modified	+9	−2	View file
arch/arm/mach-omap1/time.c	modified	+1	−0	View file
arch/arm/mach-omap2/Kconfig	modified	+29	−5	View file
arch/arm/mach-omap2/Makefile	modified	+63	−20	View file
arch/arm/mach-omap2/board-2430sdp.c	modified	+3	−5	View file
arch/arm/mach-omap2/board-3430sdp.c	modified	+2	−4	View file
arch/arm/mach-omap2/board-3630sdp.c	modified	+3	−5	View file
arch/arm/mach-omap2/board-4430sdp.c	modified	+43	−2	View file
arch/arm/mach-omap2/board-am3517crane.c	added	+116	−0	View file
arch/arm/mach-omap2/board-am3517evm.c	modified	+2	−5	View file
arch/arm/mach-omap2/board-apollon.c	modified	+4	−6	View file
arch/arm/mach-omap2/board-cm-t35.c	modified	+5	−10	View file
arch/arm/mach-omap2/board-cm-t3517.c	modified	+2	−2	View file
arch/arm/mach-omap2/board-devkit8000.c	modified	+7	−7	View file
arch/arm/mach-omap2/board-generic.c	modified	+2	−1	View file
arch/arm/mach-omap2/board-h4.c	modified	+36	−35	View file
arch/arm/mach-omap2/board-igep0020.c	modified	+74	−50	View file
arch/arm/mach-omap2/board-igep0030.c	modified	+3	−4	View file
arch/arm/mach-omap2/board-ldp.c	modified	+3	−5	View file
arch/arm/mach-omap2/board-n8x0.c	modified	+48	−22	View file
arch/arm/mach-omap2/board-omap3beagle.c	modified	+3	−5	View file
arch/arm/mach-omap2/board-omap3evm.c	modified	+2	−4	View file
arch/arm/mach-omap2/board-omap3logic.c	modified	+2	−4	View file
arch/arm/mach-omap2/board-omap3pandora.c	modified	+4	−6	View file
arch/arm/mach-omap2/board-omap3stalker.c	modified	+2	−4	View file
arch/arm/mach-omap2/board-omap3touchbook.c	modified	+3	−5	View file
arch/arm/mach-omap2/board-omap4panda.c	modified	+20	−2	View file
arch/arm/mach-omap2/board-overo.c	modified	+3	−5	View file
arch/arm/mach-omap2/board-rm680.c	added	+187	−0	View file
arch/arm/mach-omap2/board-rx51-peripherals.c	modified	+41	−36	View file
arch/arm/mach-omap2/board-rx51-video.c	modified	+8	−1	View file
arch/arm/mach-omap2/board-rx51.c	modified	+4	−6	View file
arch/arm/mach-omap2/board-zoom-peripherals.c	modified	+1	−1	View file
arch/arm/mach-omap2/board-zoom3.c → arch/arm/mach-omap2/board-zoom.c	renamed	+60	−42	View file
arch/arm/mach-omap2/board-zoom2.c	deleted	+0	−117	View before deletion
arch/arm/mach-omap2/clkt2xxx_apll.c	modified	+6	−6	View file
arch/arm/mach-omap2/clkt2xxx_dpllcore.c	modified	+5	−5	View file
arch/arm/mach-omap2/clkt2xxx_osc.c	modified	+1	−1	View file
arch/arm/mach-omap2/clkt2xxx_sys.c	modified	+1	−1	View file
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c	modified	+7	−7	View file
arch/arm/mach-omap2/clkt_dpll.c	modified	+0	−1	View file
arch/arm/mach-omap2/clock.c	modified	+2	−4	View file
arch/arm/mach-omap2/clock.h	modified	+0	−1	View file
arch/arm/mach-omap2/clock2420_data.c	modified	+7	−7	View file
arch/arm/mach-omap2/clock2430.c	modified	+1	−1	View file
arch/arm/mach-omap2/clock2430_data.c	modified	+7	−7	View file
arch/arm/mach-omap2/clock34xx.c	modified	+1	−1	View file
arch/arm/mach-omap2/clock3517.c	modified	+1	−1	View file
arch/arm/mach-omap2/clock3xxx.c	modified	+3	−3	View file
arch/arm/mach-omap2/clock3xxx_data.c	modified	+118	−112	View file
arch/arm/mach-omap2/clock44xx_data.c	modified	+482	−208	View file
arch/arm/mach-omap2/clockdomain.c	modified	+124	−96	View file
arch/arm/plat-omap/include/plat/clockdomain.h → arch/arm/mach-omap2/clockdomain.h	renamed	+24	−16	View file
arch/arm/mach-omap2/clockdomains.h → arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c	renamed	+16	−93	View file
arch/arm/mach-omap2/clockdomains44xx.h → arch/arm/mach-omap2/clockdomains44xx_data.c	renamed	+115	−54	View file
arch/arm/mach-omap2/cm-regbits-24xx.h	modified	+9	−2	View file
arch/arm/mach-omap2/cm-regbits-34xx.h	modified	+11	−2	View file
arch/arm/mach-omap2/cm-regbits-44xx.h	modified	+0	−3	View file
arch/arm/mach-omap2/cm.c	deleted	+0	−68	View before deletion
arch/arm/mach-omap2/cm.h	modified	+3	−134	View file
arch/arm/mach-omap2/cm1_44xx.h	added	+261	−0	View file
arch/arm/mach-omap2/cm2_44xx.h	added	+508	−0	View file
arch/arm/mach-omap2/cm2xxx_3xxx.c	added	+471	−0	View file
arch/arm/mach-omap2/cm2xxx_3xxx.h	added	+147	−0	View file
arch/arm/mach-omap2/cm44xx.c	added	+52	−0	View file
arch/arm/mach-omap2/cm44xx.h	modified	+16	−652	View file
arch/arm/mach-omap2/cm4xxx.c	deleted	+0	−62	View before deletion
arch/arm/mach-omap2/cminst44xx.c	added	+214	−0	View file
arch/arm/mach-omap2/cminst44xx.h	added	+31	−0	View file
arch/arm/mach-omap2/control.c	modified	+110	−23	View file
arch/arm/mach-omap2/control.h	modified	+40	−2	View file
arch/arm/mach-omap2/cpuidle34xx.c	modified	+28	−12	View file
arch/arm/mach-omap2/devices.c	modified	+26	−82	View file
arch/arm/mach-omap2/dma.c	added	+297	−0	View file
arch/arm/mach-omap2/dpll3xxx.c	modified	+36	−21	View file
arch/arm/mach-omap2/dsp.c	modified	+15	−8	View file
arch/arm/mach-omap2/gpio.c	added	+104	−0	View file
arch/arm/mach-omap2/gpmc-nand.c	modified	+1	−1	View file
arch/arm/mach-omap2/gpmc-onenand.c	modified	+14	−5	View file
arch/arm/mach-omap2/gpmc.c	modified	+11	−1	View file
arch/arm/mach-omap2/include/mach/entry-macro.S	modified	+15	−29	View file
arch/arm/mach-omap2/io.c	modified	+120	−21	View file
arch/arm/mach-omap2/irq.c	modified	+4	−1	View file
arch/arm/mach-omap2/mailbox.c	modified	+11	−8	View file
arch/arm/mach-omap2/mux.c	modified	+395	−130	View file
arch/arm/mach-omap2/mux.h	modified	+142	−12	View file
arch/arm/mach-omap2/mux2420.c	modified	+6	−4	View file
arch/arm/mach-omap2/mux2430.c	modified	+6	−4	View file
arch/arm/mach-omap2/mux34xx.c	modified	+5	−4	View file
arch/arm/mach-omap2/mux44xx.c	added	+1625	−0	View file
arch/arm/mach-omap2/mux44xx.h	added	+298	−0	View file
arch/arm/mach-omap2/omap-iommu.c	modified	+9	−1	View file
arch/arm/mach-omap2/omap4-common.c	modified	+23	−7	View file
arch/arm/mach-omap2/omap_hwmod.c	modified	+292	−191	View file
arch/arm/mach-omap2/omap_hwmod_2420_data.c	modified	+460	−5	View file
arch/arm/mach-omap2/omap_hwmod_2430_data.c	modified	+515	−4	View file
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c	modified	+868	−2	View file
arch/arm/mach-omap2/omap_hwmod_44xx_data.c	modified	+1436	−208	View file
arch/arm/mach-omap2/omap_opp_data.h	added	+72	−0	View file
arch/arm/mach-omap2/omap_twl.c	added	+277	−0	View file
arch/arm/mach-omap2/opp.c	added	+93	−0	View file
arch/arm/mach-omap2/opp3xxx_data.c	added	+107	−0	View file
arch/arm/mach-omap2/opp4xxx_data.c	added	+57	−0	View file
arch/arm/mach-omap2/pm-debug.c	modified	+13	−8	View file
arch/arm/mach-omap2/pm.c	modified	+132	−12	View file
arch/arm/mach-omap2/pm.h	modified	+56	−3	View file
arch/arm/mach-omap2/pm24xx.c	modified	+108	−116	View file
arch/arm/mach-omap2/pm34xx.c	modified	+130	−106	View file
arch/arm/mach-omap2/pm44xx.c	modified	+3	−15	View file
arch/arm/mach-omap2/powerdomain-common.c	added	+110	−0	View file
arch/arm/mach-omap2/powerdomain.c	modified	+152	−289	View file
arch/arm/plat-omap/include/plat/powerdomain.h → arch/arm/mach-omap2/powerdomain.h	renamed	+75	−9	View file
arch/arm/mach-omap2/powerdomain2xxx_3xxx.c	added	+242	−0	View file
arch/arm/mach-omap2/powerdomain44xx.c	added	+225	−0	View file
arch/arm/mach-omap2/powerdomains.h → arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c	renamed	+5	−79	View file
arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.h	added	+22	−0	View file
arch/arm/mach-omap2/powerdomains24xx.h → arch/arm/mach-omap2/powerdomains2xxx_data.c	renamed	+28	−20	View file
arch/arm/mach-omap2/powerdomains34xx.h → arch/arm/mach-omap2/powerdomains3xxx_data.c	renamed	+42	−14	View file
arch/arm/mach-omap2/powerdomains44xx.h → arch/arm/mach-omap2/powerdomains44xx_data.c	renamed	+64	−28	View file
arch/arm/mach-omap2/prcm-common.h	modified	+13	−72	View file
arch/arm/mach-omap2/prcm.c	modified	+51	−505	View file
arch/arm/mach-omap2/prcm44xx.h	added	+42	−0	View file
arch/arm/mach-omap2/prcm_mpu44xx.c	added	+45	−0	View file
arch/arm/mach-omap2/prcm_mpu44xx.h	added	+104	−0	View file
arch/arm/mach-omap2/prm-regbits-24xx.h	modified	+1	−1	View file
arch/arm/mach-omap2/prm-regbits-34xx.h	modified	+7	−4	View file
arch/arm/mach-omap2/prm-regbits-44xx.h	modified	+0	−2	View file
arch/arm/mach-omap2/prm.h	modified	+4	−365	View file
arch/arm/mach-omap2/prm2xxx_3xxx.c	modified	+55	−9	View file
arch/arm/mach-omap2/prm2xxx_3xxx.h	added	+367	−0	View file
arch/arm/mach-omap2/prm44xx.c	modified	+80	−1	View file
arch/arm/mach-omap2/prm44xx.h	modified	+396	−370	View file
arch/arm/mach-omap2/prminst44xx.c	added	+66	−0	View file
arch/arm/mach-omap2/prminst44xx.h	added	+25	−0	View file
arch/arm/mach-omap2/scrm44xx.h	added	+175	−0	View file
arch/arm/mach-omap2/board-rx51-sdram.c → arch/arm/mach-omap2/sdram-nokia.c	renamed	+80	−22	View file
arch/arm/mach-omap2/sdram-nokia.h	added	+12	−0	View file
arch/arm/mach-omap2/sdrc.c	modified	+0	−2	View file
arch/arm/mach-omap2/sdrc.h	modified	+0	−1	View file
arch/arm/mach-omap2/sdrc2xxx.c	modified	+5	−1	View file
arch/arm/mach-omap2/serial.c	modified	+40	−29	View file
arch/arm/mach-omap2/sleep34xx.S	modified	+466	−370	View file
arch/arm/mach-omap2/smartreflex-class3.c	added	+59	−0	View file
arch/arm/mach-omap2/smartreflex.c	added	+1029	−0	View file
arch/arm/mach-omap2/sr_device.c	added	+146	−0	View file
arch/arm/mach-omap2/sram242x.S	modified	+8	−2	View file
arch/arm/mach-omap2/sram243x.S	modified	+8	−2	View file
arch/arm/mach-omap2/sram34xx.S	modified	+7	−1	View file
arch/arm/mach-omap2/timer-gp.c	modified	+1	−2	View file
arch/arm/mach-omap2/usb-tusb6010.c	modified	+3	−2	View file
arch/arm/mach-omap2/voltage.c	added	+1571	−0	View file
arch/arm/mach-omap2/wd_timer.c	added	+54	−0	View file
arch/arm/mach-omap2/wd_timer.h	added	+17	−0	View file
arch/arm/plat-omap/Kconfig	modified	+35	−0	View file
arch/arm/plat-omap/devices.c	modified	+0	−40	View file
arch/arm/plat-omap/dma.c	modified	+291	−404	View file
arch/arm/plat-omap/gpio.c	modified	+229	−441	View file
arch/arm/plat-omap/i2c.c	modified	+57	−71	View file
arch/arm/plat-omap/include/plat/clkdev_omap.h	modified	+10	−10	View file
arch/arm/plat-omap/include/plat/clock.h	modified	+11	−5	View file
arch/arm/plat-omap/include/plat/common.h	modified	+2	−0	View file
arch/arm/plat-omap/include/plat/dma.h	modified	+99	−133	View file
arch/arm/plat-omap/include/plat/fpga.h	modified	+0	−4	View file
arch/arm/plat-omap/include/plat/gpio.h	modified	+29	−19	View file
arch/arm/plat-omap/include/plat/gpmc.h	modified	+5	−4	View file
arch/arm/plat-omap/include/plat/i2c.h	modified	+13	−0	View file
arch/arm/plat-omap/include/plat/io.h	modified	+3	−2	View file
arch/arm/plat-omap/include/plat/iommu.h	modified	+5	−0	View file
arch/arm/plat-omap/include/plat/irqs.h	modified	+1	−1	View file
arch/arm/plat-omap/include/plat/keypad.h	modified	+20	−15	View file
arch/arm/plat-omap/include/plat/l4_3xxx.h	added	+24	−0	View file
arch/arm/plat-omap/include/plat/mailbox.h	modified	+5	−3	View file
arch/arm/plat-omap/include/plat/omap-pm.h	modified	+14	−25	View file
arch/arm/plat-omap/include/plat/omap-serial.h	modified	+1	−13	View file
arch/arm/plat-omap/include/plat/omap_device.h	modified	+1	−0	View file
arch/arm/plat-omap/include/plat/omap_hwmod.h	modified	+53	−20	View file
arch/arm/plat-omap/include/plat/prcm.h	modified	+4	−16	View file
arch/arm/plat-omap/include/plat/serial.h	modified	+4	−1	View file
arch/arm/plat-omap/include/plat/smartreflex.h	added	+245	−0	View file
arch/arm/plat-omap/include/plat/sram.h	modified	+11	−0	View file
arch/arm/plat-omap/include/plat/uncompress.h	modified	+3	−0	View file
arch/arm/plat-omap/include/plat/voltage.h	added	+146	−0	View file
arch/arm/plat-omap/io.c	modified	+0	−58	View file
arch/arm/plat-omap/iommu.c	modified	+24	−0	View file
arch/arm/plat-omap/iovmm.c	modified	+46	−35	View file
arch/arm/plat-omap/mailbox.c	modified	+76	−54	View file
arch/arm/plat-omap/mcbsp.c	modified	+11	−15	View file
arch/arm/plat-omap/omap-pm-noop.c	modified	+55	−23	View file
arch/arm/plat-omap/omap_device.c	modified	+28	−0	View file
arch/arm/plat-omap/sram.c	modified	+6	−8	View file
drivers/i2c/busses/i2c-omap.c	modified	+25	−48	View file
drivers/input/keyboard/omap-keypad.c	modified	+19	−22	View file
drivers/input/serio/Kconfig	modified	+0	−1	View file
drivers/mtd/onenand/omap2.c	modified	+3	−0	View file
drivers/serial/8250.c	modified	+13	−13	View file
drivers/serial/omap-serial.c	modified	+20	−20	View file
drivers/staging/tidspbridge/core/_tiomap.h	modified	+13	−2	View file
include/linux/i2c-omap.h	modified	+5	−0	View file
include/linux/input/matrix_keypad.h	modified	+1	−1	View file
include/linux/serial_reg.h	modified	+19	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/arm/OMAP/omap_pm

View file

diff --git a/Documentation/arm/OMAP/omap_pm b/Documentation/arm/OMAP/omap_pm
index 5389440..9012bb0 100644
--- a/Documentation/arm/OMAP/omap_pm
+++ b/Documentation/arm/OMAP/omap_pm
@@ -127,3 +127,28 @@ implementation needs:
 10. (*pdata->cpu_set_freq)(unsigned long f)
 
 11. (*pdata->cpu_get_freq)(void)
+
+Customizing OPP for platform
+============================
+Defining CONFIG_PM should enable OPP layer for the silicon
+and the registration of OPP table should take place automatically.
+However, in special cases, the default OPP table may need to be
+tweaked, for e.g.:
+ * enable default OPPs which are disabled by default, but which
+   could be enabled on a platform
+ * Disable an unsupported OPP on the platform
+ * Define and add a custom opp table entry
+in these cases, the board file needs to do additional steps as follows:
+arch/arm/mach-omapx/board-xyz.c
+	#include "pm.h"
+	....
+	static void __init omap_xyz_init_irq(void)
+	{
+		....
+		/* Initialize the default table */
+		omapx_opp_init();
+		/* Do customization to the defaults */
+		....
+	}
+NOTE: omapx_opp_init will be omap3_opp_init or as required
+based on the omap family.

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index fd78afa..bcb7830 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4363,6 +4363,20 @@ M:	Deepak Saxena <[email protected]>
 S:	Maintained
 F:	drivers/char/hw_random/omap-rng.c
 
+OMAP HWMOD SUPPORT
+M:	Benoît Cousson <[email protected]>
+M:	Paul Walmsley <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	arch/arm/mach-omap2/omap_hwmod.c
+F:	arch/arm/plat-omap/include/plat/omap_hwmod.h
+
+OMAP HWMOD DATA FOR OMAP4-BASED DEVICES
+M:	Benoît Cousson <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+
 OMAP USB SUPPORT
 M:	Felipe Balbi <[email protected]>
 M:	David Brownell <[email protected]>

arch/arm/configs/ams_delta_defconfig

View before deletion

diff --git a/arch/arm/configs/ams_delta_defconfig b/arch/arm/configs/ams_delta_defconfig
deleted file mode 100644
index 75de45e..0000000
--- a/arch/arm/configs/ams_delta_defconfig
+++ /dev/null
@@ -1,121 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_EMBEDDED=y
-# CONFIG_KALLSYMS is not set
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_LBDAF is not set
-CONFIG_ARCH_OMAP=y
-CONFIG_ARCH_OMAP1=y
-CONFIG_OMAP_MBOX_FWK=m
-CONFIG_MACH_AMS_DELTA=y
-CONFIG_OMAP_ARM_150MHZ=y
-# CONFIG_OMAP_ARM_60MHZ is not set
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="mem=32M console=ttyS0,115200n8 root=/dev/ram0 initrd=0x11c00000,4M"
-CONFIG_FPE_NWFPE=y
-CONFIG_PM=y
-# CONFIG_SUSPEND is not set
-CONFIG_PM_RUNTIME=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IPV6=y
-# CONFIG_FW_LOADER is not set
-CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_AMS_DELTA=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
-CONFIG_USB_CATC=y
-CONFIG_USB_KAWETH=y
-CONFIG_USB_PEGASUS=y
-CONFIG_USB_RTL8150=y
-CONFIG_USB_USBNET=y
-CONFIG_PPP=y
-CONFIG_PPP_MULTILINK=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_KEYBOARD_OMAP=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_HW_RANDOM=y
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_OMAP=y
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_OMAP=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_6x11=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_MIXER_OSS=y
-CONFIG_SND_PCM_OSS=y
-CONFIG_SND_SOC=y
-CONFIG_SND_OMAP_SOC=y
-CONFIG_SND_OMAP_SOC_AMS_DELTA=y
-CONFIG_USB=y
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_MON=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_STORAGE=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_AMS_DELTA=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_OMAP=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_INOTIFY=y
-CONFIG_AUTOFS_FS=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_NFS_FS=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_CODEPAGE_852=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_BUGVERBOSE is not set

arch/arm/configs/htcherald_defconfig

View before deletion

diff --git a/arch/arm/configs/htcherald_defconfig b/arch/arm/configs/htcherald_defconfig
deleted file mode 100644
index edfa1c0..0000000
--- a/arch/arm/configs/htcherald_defconfig
+++ /dev/null
@@ -1,73 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_SYSVIPC=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_OMAP=y
-CONFIG_ARCH_OMAP1=y
-CONFIG_ARCH_OMAP850=y
-# CONFIG_ARCH_OMAP15XX is not set
-CONFIG_MACH_HERALD=y
-CONFIG_OMAP_ARM_195MHZ=y
-# CONFIG_OMAP_ARM_60MHZ is not set
-CONFIG_CPU_ARM925T=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_LEDS=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="mem=32M console=ttyS0,115200 ip=dhcp"
-CONFIG_FPE_NWFPE=y
-CONFIG_PM=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
-CONFIG_SMC91X=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_OMAP=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_SERIAL_8250=m
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_FB=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_OMAP=y
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-CONFIG_FONT_MINI_4x6=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_ETH=m
-# CONFIG_USB_ETH_RNDIS is not set
-CONFIG_MMC=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_OMAP=y
-CONFIG_RTC_CLASS=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_INOTIFY=y
-CONFIG_TMPFS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_ZLIB=y
-CONFIG_CRYPTO_LZO=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/arm/configs/n770_defconfig

View before deletion

diff --git a/arch/arm/configs/n770_defconfig b/arch/arm/configs/n770_defconfig
deleted file mode 100644
index 993e94d..0000000
--- a/arch/arm/configs/n770_defconfig
+++ /dev/null
@@ -1,138 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_ARCH_OMAP=y
-CONFIG_ARCH_OMAP1=y
-CONFIG_OMAP_RESET_CLOCKS=y
-# CONFIG_OMAP_MUX is not set
-CONFIG_OMAP_MBOX_FWK=y
-CONFIG_OMAP_32K_TIMER=y
-CONFIG_OMAP_DM_TIMER=y
-# CONFIG_ARCH_OMAP15XX is not set
-CONFIG_ARCH_OMAP16XX=y
-CONFIG_MACH_NOKIA770=y
-CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y
-CONFIG_OMAP_ARM_216MHZ=y
-# CONFIG_OMAP_ARM_60MHZ is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="root=1f03 rootfstype=jffs2 time"
-CONFIG_FPE_NWFPE=y
-CONFIG_PM=y
-CONFIG_PM_RUNTIME=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-CONFIG_NETFILTER=y
-CONFIG_BT=y
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
-CONFIG_BT_RFCOMM=y
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=y
-CONFIG_BT_HIDP=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_CONNECTOR=y
-# CONFIG_PROC_EVENTS is not set
-CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_NAND=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_SCSI=y
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_BLK_DEV_SD=y
-CONFIG_NETDEVICES=y
-CONFIG_TUN=y
-CONFIG_NET_ETHERNET=y
-CONFIG_USB_USBNET=y
-# CONFIG_USB_NET_AX8817X is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-CONFIG_PPP=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=y
-CONFIG_PPP_DEFLATE=y
-CONFIG_PPP_BSDCOMP=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_OMAP=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_I2C=y
-CONFIG_I2C_OMAP=y
-CONFIG_SPI=y
-CONFIG_SPI_OMAP_UWIRE=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_NOWAYOUT=y
-CONFIG_OMAP_WATCHDOG=y
-CONFIG_FB=y
-CONFIG_FB_OMAP=y
-CONFIG_FB_OMAP_LCDC_EXTERNAL=y
-CONFIG_FB_OMAP_LCDC_HWA742=y
-CONFIG_FB_OMAP_MANUAL_UPDATE=y
-CONFIG_FB_OMAP_LCD_MIPID=y
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_SOUND=y
-CONFIG_SND=y
-# CONFIG_SND_SUPPORT_OLD_API is not set
-CONFIG_SND_DUMMY=y
-CONFIG_SND_USB_AUDIO=y
-CONFIG_USB=y
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_SUSPEND=y
-CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_WHITELIST is not set
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_SERIAL=y
-CONFIG_USB_SERIAL_CONSOLE=y
-CONFIG_USB_SERIAL_PL2303=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_ETH=m
-CONFIG_USB_FILE_STORAGE=m
-CONFIG_USB_FILE_STORAGE_TEST=y
-CONFIG_MMC=y
-CONFIG_MMC_OMAP=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_852=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=y
-CONFIG_NLS_UTF8=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_ERRORS=y
-CONFIG_SECURITY=y

arch/arm/configs/omap1_defconfig

View file

diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig
new file mode 100644
index 0000000..a350cc6
--- /dev/null
+++ b/arch/arm/configs/omap1_defconfig
@@ -0,0 +1,286 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_IKCONFIG=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_EMBEDDED=y
+# CONFIG_KALLSYMS is not set
+# CONFIG_ELF_CORE is not set
+# CONFIG_BASE_FULL is not set
+# CONFIG_SHMEM is not set
+# CONFIG_VM_EVENT_COUNTERS is not set
+CONFIG_SLOB=y
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_LBDAF is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARCH_OMAP=y
+CONFIG_ARCH_OMAP1=y
+CONFIG_OMAP_RESET_CLOCKS=y
+# CONFIG_OMAP_MUX is not set
+CONFIG_OMAP_MBOX_FWK=y
+CONFIG_OMAP_32K_TIMER=y
+CONFIG_OMAP_DM_TIMER=y
+CONFIG_ARCH_OMAP730=y
+CONFIG_ARCH_OMAP850=y
+CONFIG_ARCH_OMAP16XX=y
+CONFIG_MACH_OMAP_INNOVATOR=y
+CONFIG_MACH_OMAP_H2=y
+CONFIG_MACH_OMAP_H3=y
+CONFIG_MACH_OMAP_HTCWIZARD=y
+CONFIG_MACH_HERALD=y
+CONFIG_MACH_OMAP_OSK=y
+CONFIG_MACH_OMAP_PERSEUS2=y
+CONFIG_MACH_OMAP_FSAMPLE=y
+CONFIG_MACH_VOICEBLUE=y
+CONFIG_MACH_OMAP_PALMTE=y
+CONFIG_MACH_OMAP_PALMZ71=y
+CONFIG_MACH_OMAP_PALMTT=y
+CONFIG_MACH_SX1=y
+CONFIG_MACH_NOKIA770=y
+CONFIG_MACH_AMS_DELTA=y
+CONFIG_MACH_OMAP_GENERIC=y
+CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y
+CONFIG_OMAP_ARM_216MHZ=y
+CONFIG_OMAP_ARM_195MHZ=y
+CONFIG_OMAP_ARM_192MHZ=y
+CONFIG_OMAP_ARM_182MHZ=y
+CONFIG_OMAP_ARM_168MHZ=y
+# CONFIG_OMAP_ARM_60MHZ is not set
+# CONFIG_ARM_THUMB is not set
+CONFIG_PCCARD=y
+CONFIG_OMAP_CF=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PREEMPT=y
+CONFIG_AEABI=y
+CONFIG_LEDS=y
+CONFIG_LEDS_CPU=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="root=1f03 rootfstype=jffs2"
+CONFIG_FPE_NWFPE=y
+CONFIG_BINFMT_MISC=y
+CONFIG_PM=y
+# CONFIG_SUSPEND is not set
+CONFIG_PM_RUNTIME=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+CONFIG_IPV6=y
+CONFIG_NETFILTER=y
+CONFIG_BT=y
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
+CONFIG_BT_RFCOMM=y
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=y
+CONFIG_BT_HIDP=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_STANDALONE is not set
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+CONFIG_CONNECTOR=y
+# CONFIG_PROC_EVENTS is not set
+CONFIG_MTD=y
+CONFIG_MTD_DEBUG=y
+CONFIG_MTD_DEBUG_VERBOSE=3
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_NAND=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=2
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_IDE=m
+CONFIG_BLK_DEV_IDECS=m
+CONFIG_SCSI=y
+# CONFIG_SCSI_PROC_FS is not set
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_NETDEVICES=y
+CONFIG_TUN=y
+CONFIG_PHYLIB=y
+CONFIG_NET_ETHERNET=y
+CONFIG_SMC91X=y
+CONFIG_USB_CATC=y
+CONFIG_USB_KAWETH=y
+CONFIG_USB_PEGASUS=y
+CONFIG_USB_RTL8150=y
+CONFIG_USB_USBNET=y
+# CONFIG_USB_NET_AX8817X is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+CONFIG_PPP=y
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=y
+CONFIG_PPP_DEFLATE=y
+CONFIG_PPP_BSDCOMP=y
+CONFIG_SLIP=y
+CONFIG_SLIP_COMPRESSED=y
+# CONFIG_INPUT_MOUSEDEV is not set
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVBUG=y
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=y
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
+# CONFIG_SERIO is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=3
+CONFIG_SERIAL_8250_RUNTIME_UARTS=3
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_HW_RANDOM=y
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_SPI=y
+CONFIG_SPI_OMAP_UWIRE=y
+# CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+CONFIG_OMAP_WATCHDOG=y
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_VIRTUAL=y
+CONFIG_FB_OMAP=y
+CONFIG_FB_OMAP_LCDC_EXTERNAL=y
+CONFIG_FB_OMAP_LCDC_HWA742=y
+CONFIG_FB_OMAP_MANUAL_UPDATE=y
+CONFIG_FB_OMAP_LCD_MIPID=y
+CONFIG_FB_OMAP_BOOTLOADER_INIT=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y