Skip to content

L
linux
Commit f87a2537 authored by Tony Lindgren's avatar Tony Lindgren
Browse files
Options

Merge branch 'omap-for-v5.5/omap1' into omap-for-v5.5/soc

parents bc794744 dafd24c7
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 21 deletions
arch/arm/mach-omap1/Kconfig
View file @ f87a2537
...@@ -4,30 +4,25 @@ if ARCH_OMAP1 ...@@ -4,30 +4,25 @@ if ARCH_OMAP1
menu "TI OMAP1 specific features" menu "TI OMAP1 specific features"
comment "OMAP Core Type" comment "OMAP Core Type"
depends on ARCH_OMAP1
config ARCH_OMAP730 config ARCH_OMAP730
depends on ARCH_OMAP1
bool "OMAP730 Based System" bool "OMAP730 Based System"
select ARCH_OMAP_OTG select ARCH_OMAP_OTG
select CPU_ARM926T select CPU_ARM926T
select OMAP_MPU_TIMER select OMAP_MPU_TIMER
config ARCH_OMAP850 config ARCH_OMAP850
depends on ARCH_OMAP1
bool "OMAP850 Based System" bool "OMAP850 Based System"
select ARCH_OMAP_OTG select ARCH_OMAP_OTG
select CPU_ARM926T select CPU_ARM926T
config ARCH_OMAP15XX config ARCH_OMAP15XX
depends on ARCH_OMAP1
default y default y
bool "OMAP15xx Based System" bool "OMAP15xx Based System"
select CPU_ARM925T select CPU_ARM925T
select OMAP_MPU_TIMER select OMAP_MPU_TIMER
config ARCH_OMAP16XX config ARCH_OMAP16XX
depends on ARCH_OMAP1
bool "OMAP16xx Based System" bool "OMAP16xx Based System"
select ARCH_OMAP_OTG select ARCH_OMAP_OTG
select CPU_ARM926T select CPU_ARM926T
...@@ -35,7 +30,6 @@ config ARCH_OMAP16XX ...@@ -35,7 +30,6 @@ config ARCH_OMAP16XX
config OMAP_MUX config OMAP_MUX
bool "OMAP multiplexing support" bool "OMAP multiplexing support"
depends on ARCH_OMAP
default y default y
help help
Pin multiplexing support for OMAP boards. If your bootloader Pin multiplexing support for OMAP boards. If your bootloader
...@@ -60,25 +54,24 @@ config OMAP_MUX_WARNINGS ...@@ -60,25 +54,24 @@ config OMAP_MUX_WARNINGS
printed, it's safe to deselect OMAP_MUX for your product. printed, it's safe to deselect OMAP_MUX for your product.
comment "OMAP Board Type" comment "OMAP Board Type"
depends on ARCH_OMAP1
config MACH_OMAP_INNOVATOR config MACH_OMAP_INNOVATOR
bool "TI Innovator" bool "TI Innovator"
depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX) depends on ARCH_OMAP15XX || ARCH_OMAP16XX
help help
TI OMAP 1510 or 1610 Innovator board support. Say Y here if you TI OMAP 1510 or 1610 Innovator board support. Say Y here if you
have such a board. have such a board.
config MACH_OMAP_H2 config MACH_OMAP_H2
bool "TI H2 Support" bool "TI H2 Support"
depends on ARCH_OMAP1 && ARCH_OMAP16XX depends on ARCH_OMAP16XX
help help
TI OMAP 1610/1611B H2 board support. Say Y here if you have such TI OMAP 1610/1611B H2 board support. Say Y here if you have such
a board. a board.
config MACH_OMAP_H3 config MACH_OMAP_H3
bool "TI H3 Support" bool "TI H3 Support"
depends on ARCH_OMAP1 && ARCH_OMAP16XX depends on ARCH_OMAP16XX
help help
TI OMAP 1710 H3 board support. Say Y here if you have such TI OMAP 1710 H3 board support. Say Y here if you have such
a board. a board.
...@@ -91,7 +84,7 @@ config MACH_HERALD ...@@ -91,7 +84,7 @@ config MACH_HERALD
config MACH_OMAP_OSK config MACH_OMAP_OSK
bool "TI OSK Support" bool "TI OSK Support"
depends on ARCH_OMAP1 && ARCH_OMAP16XX depends on ARCH_OMAP16XX
help help
TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
if you have such a board. if you have such a board.
...@@ -106,21 +99,21 @@ config OMAP_OSK_MISTRAL ...@@ -106,21 +99,21 @@ config OMAP_OSK_MISTRAL
config MACH_OMAP_PERSEUS2 config MACH_OMAP_PERSEUS2
bool "TI Perseus2" bool "TI Perseus2"
depends on ARCH_OMAP1 && ARCH_OMAP730 depends on ARCH_OMAP730
help help
Support for TI OMAP 730 Perseus2 board. Say Y here if you have such Support for TI OMAP 730 Perseus2 board. Say Y here if you have such
a board. a board.
config MACH_OMAP_FSAMPLE config MACH_OMAP_FSAMPLE
bool "TI F-Sample" bool "TI F-Sample"
depends on ARCH_OMAP1 && ARCH_OMAP730 depends on ARCH_OMAP730
help help
Support for TI OMAP 850 F-Sample board. Say Y here if you have such Support for TI OMAP 850 F-Sample board. Say Y here if you have such
a board. a board.
config MACH_OMAP_PALMTE config MACH_OMAP_PALMTE
bool "Palm Tungsten E" bool "Palm Tungsten E"
depends on ARCH_OMAP1 && ARCH_OMAP15XX depends on ARCH_OMAP15XX
help help
Support for the Palm Tungsten E PDA. To boot the kernel, you'll Support for the Palm Tungsten E PDA. To boot the kernel, you'll
need a PalmOS compatible bootloader; check out need a PalmOS compatible bootloader; check out
...@@ -129,7 +122,7 @@ config MACH_OMAP_PALMTE ...@@ -129,7 +122,7 @@ config MACH_OMAP_PALMTE
config MACH_OMAP_PALMZ71 config MACH_OMAP_PALMZ71
bool "Palm Zire71" bool "Palm Zire71"
depends on ARCH_OMAP1 && ARCH_OMAP15XX depends on ARCH_OMAP15XX
help help
Support for the Palm Zire71 PDA. To boot the kernel, Support for the Palm Zire71 PDA. To boot the kernel,
you'll need a PalmOS compatible bootloader; check out you'll need a PalmOS compatible bootloader; check out
...@@ -138,7 +131,7 @@ config MACH_OMAP_PALMZ71 ...@@ -138,7 +131,7 @@ config MACH_OMAP_PALMZ71
config MACH_OMAP_PALMTT config MACH_OMAP_PALMTT
bool "Palm Tungsten|T" bool "Palm Tungsten|T"
depends on ARCH_OMAP1 && ARCH_OMAP15XX depends on ARCH_OMAP15XX
help help
Support for the Palm Tungsten|T PDA. To boot the kernel, you'll Support for the Palm Tungsten|T PDA. To boot the kernel, you'll
need a PalmOS compatible bootloader (Garux); check out need a PalmOS compatible bootloader (Garux); check out
...@@ -147,7 +140,7 @@ config MACH_OMAP_PALMTT ...@@ -147,7 +140,7 @@ config MACH_OMAP_PALMTT
config MACH_SX1 config MACH_SX1
bool "Siemens SX1" bool "Siemens SX1"
depends on ARCH_OMAP1 && ARCH_OMAP15XX depends on ARCH_OMAP15XX
select I2C select I2C
help help
Support for the Siemens SX1 phone. To boot the kernel, Support for the Siemens SX1 phone. To boot the kernel,
...@@ -159,14 +152,14 @@ config MACH_SX1 ...@@ -159,14 +152,14 @@ config MACH_SX1
config MACH_NOKIA770 config MACH_NOKIA770
bool "Nokia 770" bool "Nokia 770"
depends on ARCH_OMAP1 && ARCH_OMAP16XX depends on ARCH_OMAP16XX
help help
Support for the Nokia 770 Internet Tablet. Say Y here if you Support for the Nokia 770 Internet Tablet. Say Y here if you
have such a device. have such a device.
config MACH_AMS_DELTA config MACH_AMS_DELTA
bool "Amstrad E3 (Delta)" bool "Amstrad E3 (Delta)"
depends on ARCH_OMAP1 && ARCH_OMAP15XX depends on ARCH_OMAP15XX
select FIQ select FIQ
select GPIO_GENERIC_PLATFORM select GPIO_GENERIC_PLATFORM
select LEDS_GPIO_REGISTER select LEDS_GPIO_REGISTER
...@@ -178,7 +171,7 @@ config MACH_AMS_DELTA ...@@ -178,7 +171,7 @@ config MACH_AMS_DELTA
config MACH_OMAP_GENERIC config MACH_OMAP_GENERIC
bool "Generic OMAP board" bool "Generic OMAP board"
depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX) depends on ARCH_OMAP15XX || ARCH_OMAP16XX
help help
Support for generic OMAP-1510, 1610 or 1710 board with Support for generic OMAP-1510, 1610 or 1710 board with
no FPGA. Can be used as template for porting Linux to no FPGA. Can be used as template for porting Linux to
......
arch/arm/mach-omap1/ams-delta-fiq.c
View file @ f87a2537
...@@ -110,7 +110,7 @@ void __init ams_delta_init_fiq(struct gpio_chip *chip, ...@@ -110,7 +110,7 @@ void __init ams_delta_init_fiq(struct gpio_chip *chip,
/* /*
* FIQ handler takes full control over serio data and clk GPIO * FIQ handler takes full control over serio data and clk GPIO
* pins. Initiaize them and keep requested so nobody can * pins. Initialize them and keep requested so nobody can
* interfere. Fail if any of those two couldn't be requested. * interfere. Fail if any of those two couldn't be requested.
*/ */
switch (i) { switch (i) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7