Commit 0d922f44 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ox810se-arm-v4.6-rc3' of https://github.com/superna9999/linux into next/soc 

Merge "ARM: Add OXNAS Platform Support" from Neil Armstrong

This is for the ARM926 based ox810 chip used in some older
NAS appliances. There is another related ox820 chip based on
ARM11 that might get added here later.

* tag 'ox810se-arm-v4.6-rc3' of https://github.com/superna9999/linux:
  MAINTAINERS: add maintainer entry for ARM/OXNAS platform
  ARM: Add new mach-oxnas
  irqchip: versatile-fpga: add new compatible for OX810SE SoC
parents 46a600ea e557959d

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -1355,6 +1355,15 @@ W: http://www.digriz.org.uk/ts78xx/kernel 
S:	Maintained

F:	arch/arm/mach-orion5x/ts78xx-*



ARM/OXNAS platform support

M:	Neil Armstrong <narmstrong@baylibre.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-oxnas/

F:	arch/arm/boot/dts/oxnas*

F:	arch/arm/boot/dts/wd-mbwe.dts

N:	oxnas



ARM/Mediatek RTC DRIVER

M:	Eddie Huang <eddie.huang@mediatek.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -804,6 +804,8 @@ source "arch/arm/plat-pxa/Kconfig" 


source "arch/arm/mach-mmp/Kconfig"



source "arch/arm/mach-oxnas/Kconfig"



source "arch/arm/mach-qcom/Kconfig"



source "arch/arm/mach-realview/Kconfig"

arch/arm/mach-oxnas/Kconfig

0 → 100644
+24 −0
Original line number Diff line number Diff line 
menuconfig ARCH_OXNAS

	bool "Oxford Semiconductor OXNAS Family SoCs"

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_RESET_CONTROLLER

	select PINCTRL

	depends on ARCH_MULTI_V5

	help

	  Support for OxNas SoC family developed by Oxford Semiconductor.



if ARCH_OXNAS



config MACH_OX810SE

	bool "Support OX810SE Based Products"

	select ARM_TIMER_SP804

	select COMMON_CLK_OXNAS

	select CPU_ARM926T

	select MFD_SYSCON

	select PINCTRL_OXNAS

	select RESET_OXNAS

	select VERSATILE_FPGA_IRQ

	help

	  Include Support for the Oxford Semiconductor OX810SE SoC Based Products.



endif

drivers/irqchip/irq-versatile-fpga.c

+1 −0
Original line number Diff line number Diff line
@@ -227,4 +227,5 @@ int __init fpga_irq_of_init(struct device_node *node, 
}

IRQCHIP_DECLARE(arm_fpga, "arm,versatile-fpga-irq", fpga_irq_of_init);

IRQCHIP_DECLARE(arm_fpga_sic, "arm,versatile-sic", fpga_irq_of_init);

IRQCHIP_DECLARE(ox810se_rps, "oxsemi,ox810se-rps-irq", fpga_irq_of_init);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE