mirror of
https://github.com/torvalds/linux.git
synced 2024-11-07 12:41:55 +00:00
f6a26ae769
While we generally attempt to get rid of board specific files and replace
them with device tree based descriptions, a lot of platforms have not
come that far:
In shmobile, we add two new board files because their recently started
effort to add DT support has not proceeded enough to use it for all of
the important hardware.
In Kirkwood, we are adding support for new boards with a combination of
DT and board file contents in multiple cases.
pxa/mmp and imx are extending support for existing board files but not
adding new ones.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJPueuIAAoJEIwa5zzehBx3VvAP/32RkCrrLCQoibsczjwDPQir
ryyT/lom005tlkXFOz9SFirlyNAn0kpDuj0xZ/HL2KgZ0FPlG0OUSRBJJvLZF2vT
qlhf3PqnM1d2Ui6+/QdU/EJyzNkMAtajgTSvp4zDZayoNomO/VTZhW0feRYChUIl
bJx7hnFA9VXnkhORzh9+HhKwVcdhU2R1/LMDUlYxKNnFdF0/kFgw4Gkj4MnmFlyy
NpeLP4H95SeFhKPvmXB/2lZroaRn6wCxhPhUCHShxsH3YFy0J7zaEnmHMFSOX24n
++6fyb0mqiJtZPwJVbF+snb/5hP4epbmkrU5+mqtDdK8HHowAsV0ScKki0wGGmka
Im5ryCMB+NZOD57XGajkpeQGZT+m0S8NilsZ5dy75o7el7WxnMLuUMyjlIbtnfet
3KRF22XnsyPuvldoej/RM1Eiz86qUFl3LPO63cYT+/c9aSw0+luMp+JZp+iOcAr3
xqyiciwOTu6CIP+DnYV72CuFa2IvLA06Eb3pgtpRUwATzS9weQ33X4Q80RaUVKxX
VfXxCcDFl7dfGwqO6HujbxI6oHmEmvBEF9eGmFW2ocVrKnWUmjlC6y9tQxfReQDV
SZkXKEkWPo/MLFl/AM+hTjGyu88ofOG4Vos0t3YmVyTuXekpPFb2DbPCvwnFdv8N
kX/bfsxWPBDl3EdCQU8y
=wkmj
-----END PGP SIGNATURE-----
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc board specific changes from Olof Johansson:
"While we generally attempt to get rid of board specific files and
replace them with device tree based descriptions, a lot of platforms
have not come that far:
In shmobile, we add two new board files because their recently started
effort to add DT support has not proceeded enough to use it for all of
the important hardware.
In Kirkwood, we are adding support for new boards with a combination
of DT and board file contents in multiple cases.
pxa/mmp and imx are extending support for existing board files but not
adding new ones."
Fix up trivial conflicts in arch/arm/mach-{mmp/ttc_dkb.c,shmobile/{Kconfig,Makefile}}
* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
ARM: shmobile: fix smp build
ARM: kirkwood: Add support for RaidSonic IB-NAS6210/6220 using devicetree
kirkwood: Add iconnect support
orion/kirkwood: create a generic function for gpio led blinking
kirkwood/orion: fix orion_gpio_set_blink
ARM: kirkwood: Define DNS-320/DNS-325 NAND in fdt
kirkwood: Allow nand to be configured via. devicetree
mtd: Add orion_nand devicetree bindings
ARM: kirkwood: Basic support for DNS-320 and DNS-325
ARM: mach-shmobile: Use DT_MACHINE for armadillo 800 eva
ARM: mach-shmobile: Use DT_MACHINE for KZM9G
ARM: pxa: hx4700: Add Synaptics NavPoint touchpad
ARM: pxa: Use REGULATOR_SUPPLY macro
ARM: mach-shmobile: kzm9g: enable SMP boot
ARM: mach-shmobile: kzm9g: defconfig update
ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key
ARM: mach-shmobile: kzm9g: add SDHI support
ARM: mach-shmobile: kzm9g: add MMCIF support
ARM: mach-shmobile: kzm9g: correct screen direction
ARM: mach-shmobile: sh73a0.h: add GPIO_NR
...
133 lines
3.4 KiB
Plaintext
133 lines
3.4 KiB
Plaintext
if ARCH_MMP
|
|
|
|
menu "Marvell PXA168/910/MMP2 Implmentations"
|
|
|
|
config MACH_ASPENITE
|
|
bool "Marvell's PXA168 Aspenite Development Board"
|
|
select CPU_PXA168
|
|
help
|
|
Say 'Y' here if you want to support the Marvell PXA168-based
|
|
Aspenite Development Board.
|
|
|
|
config MACH_ZYLONITE2
|
|
bool "Marvell's PXA168 Zylonite2 Development Board"
|
|
select CPU_PXA168
|
|
help
|
|
Say 'Y' here if you want to support the Marvell PXA168-based
|
|
Zylonite2 Development Board.
|
|
|
|
config MACH_AVENGERS_LITE
|
|
bool "Marvell's PXA168 Avengers Lite Development Board"
|
|
select CPU_PXA168
|
|
help
|
|
Say 'Y' here if you want to support the Marvell PXA168-based
|
|
Avengers Lite Development Board.
|
|
|
|
config MACH_TAVOREVB
|
|
bool "Marvell's PXA910 TavorEVB Development Board"
|
|
select CPU_PXA910
|
|
help
|
|
Say 'Y' here if you want to support the Marvell PXA910-based
|
|
TavorEVB Development Board.
|
|
|
|
config MACH_TTC_DKB
|
|
bool "Marvell's PXA910 TavorEVB Development Board"
|
|
select CPU_PXA910
|
|
help
|
|
Say 'Y' here if you want to support the Marvell PXA910-based
|
|
TTC_DKB Development Board.
|
|
|
|
config MACH_BROWNSTONE
|
|
bool "Marvell's Brownstone Development Platform"
|
|
depends on !CPU_MOHAWK
|
|
select CPU_MMP2
|
|
help
|
|
Say 'Y' here if you want to support the Marvell MMP2-based
|
|
Brown Development Platform.
|
|
MMP2-based board can't be co-existed with PXA168-based &
|
|
PXA910-based development board. Since MMP2 is compatible to
|
|
ARMv7 architecture.
|
|
|
|
config MACH_FLINT
|
|
bool "Marvell's Flint Development Platform"
|
|
depends on !CPU_MOHAWK
|
|
select CPU_MMP2
|
|
help
|
|
Say 'Y' here if you want to support the Marvell MMP2-based
|
|
Flint Development Platform.
|
|
MMP2-based board can't be co-existed with PXA168-based &
|
|
PXA910-based development board. Since MMP2 is compatible to
|
|
ARMv7 architecture.
|
|
|
|
config MACH_MARVELL_JASPER
|
|
bool "Marvell's Jasper Development Platform"
|
|
depends on !CPU_MOHAWK
|
|
select CPU_MMP2
|
|
help
|
|
Say 'Y' here if you want to support the Marvell MMP2-base
|
|
Jasper Development Platform.
|
|
MMP2-based board can't be co-existed with PXA168-based &
|
|
PXA910-based development board. Since MMP2 is compatible to
|
|
ARMv7 architecture.
|
|
|
|
config MACH_TETON_BGA
|
|
bool "Marvell's PXA168 Teton BGA Development Board"
|
|
select CPU_PXA168
|
|
help
|
|
Say 'Y' here if you want to support the Marvell PXA168-based
|
|
Teton BGA Development Board.
|
|
|
|
config MACH_GPLUGD
|
|
bool "Marvell's PXA168 GuruPlug Display (gplugD) Board"
|
|
select CPU_PXA168
|
|
help
|
|
Say 'Y' here if you want to support the Marvell PXA168-based
|
|
GuruPlug Display (gplugD) Board
|
|
|
|
config MACH_MMP_DT
|
|
bool "Support MMP (ARMv5) platforms from device tree"
|
|
select CPU_PXA168
|
|
select CPU_PXA910
|
|
select USE_OF
|
|
help
|
|
Include support for Marvell MMP2 based platforms using
|
|
the device tree. Needn't select any other machine while
|
|
MACH_MMP_DT is enabled.
|
|
|
|
config MACH_MMP2_DT
|
|
bool "Support MMP2 (ARMv7) platforms from device tree"
|
|
depends on !CPU_MOHAWK
|
|
select CPU_MMP2
|
|
select USE_OF
|
|
help
|
|
Include support for Marvell MMP2 based platforms using
|
|
the device tree.
|
|
|
|
endmenu
|
|
|
|
config CPU_PXA168
|
|
bool
|
|
select CPU_MOHAWK
|
|
help
|
|
Select code specific to PXA168
|
|
|
|
config CPU_PXA910
|
|
bool
|
|
select CPU_MOHAWK
|
|
help
|
|
Select code specific to PXA910
|
|
|
|
config CPU_MMP2
|
|
bool
|
|
select CPU_PJ4
|
|
help
|
|
Select code specific to MMP2. MMP2 is ARMv7 compatible.
|
|
|
|
config USB_EHCI_MV_U2O
|
|
bool "EHCI support for PXA USB OTG controller"
|
|
depends on USB_EHCI_MV
|
|
help
|
|
Enables support for OTG controller which can be switched to host mode.
|
|
|
|
endif
|