55a912f43e
Changelog: * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.22 * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.23 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47334
65 lines
2.0 KiB
Diff
65 lines
2.0 KiB
Diff
--- a/arch/arm/Kconfig
|
|
+++ b/arch/arm/Kconfig
|
|
@@ -267,7 +267,8 @@ config PHYS_OFFSET
|
|
ARCH_INTEGRATOR || \
|
|
ARCH_IOP13XX || \
|
|
ARCH_KS8695 || \
|
|
- (ARCH_REALVIEW && !REALVIEW_HIGH_PHYS_OFFSET)
|
|
+ (ARCH_REALVIEW && !REALVIEW_HIGH_PHYS_OFFSET) || \
|
|
+ ARCH_MCS814X
|
|
default 0x10000000 if ARCH_OMAP1 || ARCH_RPC
|
|
default 0x20000000 if ARCH_S5PV210
|
|
default 0x70000000 if REALVIEW_HIGH_PHYS_OFFSET
|
|
@@ -786,6 +787,21 @@ config ARCH_OMAP1
|
|
help
|
|
Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)
|
|
|
|
+config ARCH_MCS814X
|
|
+ bool "Moschip MCS814x"
|
|
+ select FIQ
|
|
+ select GENERIC_IRQ_CHIP
|
|
+ select GENERIC_GPIO
|
|
+ select ARCH_REQUIRE_GPIOLIB
|
|
+ select CLKDEV_LOOKUP
|
|
+ select ARCH_USES_GETTIMEOFFSET
|
|
+ select USB_ARCH_HAS_OHCI
|
|
+ select USB_ARCH_HAS_EHCI
|
|
+ select MULTI_IRQ_HANDLER
|
|
+ help
|
|
+ Support for Moschip MCS814x SoCs (MCS8140).
|
|
+
|
|
+
|
|
endchoice
|
|
|
|
menu "Multiple platform selection"
|
|
@@ -927,6 +943,8 @@ source "arch/arm/mach-picoxcell/Kconfig"
|
|
source "arch/arm/mach-pxa/Kconfig"
|
|
source "arch/arm/plat-pxa/Kconfig"
|
|
|
|
+source "arch/arm/mach-mcs814x/Kconfig"
|
|
+
|
|
source "arch/arm/mach-mmp/Kconfig"
|
|
|
|
source "arch/arm/mach-qcom/Kconfig"
|
|
--- a/arch/arm/Makefile
|
|
+++ b/arch/arm/Makefile
|
|
@@ -180,6 +180,7 @@ machine-$(CONFIG_ARCH_IXP4XX) += ixp4xx
|
|
machine-$(CONFIG_ARCH_KEYSTONE) += keystone
|
|
machine-$(CONFIG_ARCH_KS8695) += ks8695
|
|
machine-$(CONFIG_ARCH_LPC32XX) += lpc32xx
|
|
+machine-$(CONFIG_ARCH_MCS814X) += mcs814x
|
|
machine-$(CONFIG_ARCH_MESON) += meson
|
|
machine-$(CONFIG_ARCH_MMP) += mmp
|
|
machine-$(CONFIG_ARCH_MOXART) += moxart
|
|
--- a/arch/arm/boot/dts/Makefile
|
|
+++ b/arch/arm/boot/dts/Makefile
|
|
@@ -163,6 +163,8 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += kirkwood-
|
|
kirkwood-ts419-6282.dtb
|
|
dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
|
|
dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
|
|
+dtb-$(CONFIG_ARCH_MCS814X) += dlan-usb-extender.dtb \
|
|
+ rbt-832.dtb
|
|
dtb-$(CONFIG_MACH_MESON6) += meson6-atv1200.dtb
|
|
dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
|
|
dtb-$(CONFIG_ARCH_MXC) += \
|