Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966692AbbBDPW7 (ORCPT ); Wed, 4 Feb 2015 10:22:59 -0500 Received: from mailapp01.imgtec.com ([195.59.15.196]:49318 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161185AbbBDPWv (ORCPT ); Wed, 4 Feb 2015 10:22:51 -0500 From: Zubair Lutfullah Kakakhel To: CC: , , , , , , , , , , , , Subject: [PATCH_V2 32/34] MIPS: initial Ingenic jz4780 support Date: Wed, 4 Feb 2015 15:22:01 +0000 Message-ID: <1423063323-19419-33-git-send-email-Zubair.Kakakhel@imgtec.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1423063323-19419-1-git-send-email-Zubair.Kakakhel@imgtec.com> References: <1423063323-19419-1-git-send-email-Zubair.Kakakhel@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.154.89] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6916 Lines: 255 From: Paul Burton Support the Ingenic jz4780 SoC using the code under arch/mips/jz4740 now that it has been generalised sufficiently. This is left unselectable in Kconfig until a jz4780 based board is added in a later commit. Signed-off-by: Paul Burton Cc: Lars-Peter Clausen --- arch/mips/Kconfig | 16 +++++ arch/mips/boot/dts/jz4780.dtsi | 101 +++++++++++++++++++++++++++++ arch/mips/include/asm/mach-jz4740/irq.h | 5 ++ arch/mips/include/asm/mach-jz4740/serial.h | 8 ++- arch/mips/jz4740/Makefile | 4 +- arch/mips/jz4740/Platform | 4 ++ arch/mips/jz4740/time.c | 7 +- 7 files changed, 142 insertions(+), 3 deletions(-) create mode 100644 arch/mips/boot/dts/jz4780.dtsi diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 622d0aa..296bafb 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -291,6 +291,22 @@ config MACH_JZ4740 select USE_OF select LIBFDT +config MACH_JZ4780 + bool + select SYS_HAS_CPU_MIPS32_R2 + select SYS_SUPPORTS_32BIT_KERNEL + select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_SUPPORTS_ZBOOT_UART16550 + select DMA_NONCOHERENT + select IRQ_CPU + select ARCH_REQUIRE_GPIOLIB + select COMMON_CLK + select GENERIC_IRQ_CHIP + select BUILTIN_DTB + select USE_OF + select LIBFDT + select MIPS_CPU_SCACHE + config LANTIQ bool "Lantiq based platforms" select DMA_NONCOHERENT diff --git a/arch/mips/boot/dts/jz4780.dtsi b/arch/mips/boot/dts/jz4780.dtsi new file mode 100644 index 0000000..d9b696f --- /dev/null +++ b/arch/mips/boot/dts/jz4780.dtsi @@ -0,0 +1,101 @@ +#include + +/ { + #address-cells = <1>; + #size-cells = <1>; + compatible = "ingenic,jz4780"; + + cpuintc: cpuintc@0 { + #address-cells = <0>; + #interrupt-cells = <1>; + interrupt-controller; + compatible = "mti,cpu-interrupt-controller"; + }; + + intc: intc@10001000 { + compatible = "ingenic,jz4780-intc"; + reg = <0x10001000 0x50>; + + interrupt-controller; + #interrupt-cells = <1>; + + interrupt-parent = <&cpuintc>; + interrupts = <2>; + }; + + ext: ext { + compatible = "fixed-clock"; + #clock-cells = <0>; + }; + + rtc: rtc { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + }; + + cgu: jz4780-cgu@10000000 { + compatible = "ingenic,jz4780-cgu"; + reg = <0x10000000 0x100>; + + clocks = <&ext>, <&rtc>; + clock-names = "ext", "rtc"; + + #clock-cells = <1>; + }; + + uart0: serial@10030000 { + compatible = "ingenic,jz4780-uart"; + reg = <0x10030000 0x100>; + + interrupt-parent = <&intc>; + interrupts = <51>; + + clocks = <&ext>, <&cgu JZ4780_CLK_UART0>; + clock-names = "baud", "module"; + }; + + uart1: serial@10031000 { + compatible = "ingenic,jz4780-uart"; + reg = <0x10031000 0x100>; + + interrupt-parent = <&intc>; + interrupts = <50>; + + clocks = <&ext>, <&cgu JZ4780_CLK_UART1>; + clock-names = "baud", "module"; + }; + + uart2: serial@10032000 { + compatible = "ingenic,jz4780-uart"; + reg = <0x10032000 0x100>; + + interrupt-parent = <&intc>; + interrupts = <49>; + + clocks = <&ext>, <&cgu JZ4780_CLK_UART2>; + clock-names = "baud", "module"; + }; + + uart3: serial@10033000 { + compatible = "ingenic,jz4780-uart"; + reg = <0x10033000 0x100>; + + interrupt-parent = <&intc>; + interrupts = <48>; + + clocks = <&ext>, <&cgu JZ4780_CLK_UART3>; + clock-names = "baud", "module"; + }; + + uart4: serial@10034000 { + compatible = "ingenic,jz4780-uart"; + reg = <0x10034000 0x100>; + + interrupt-parent = <&intc>; + interrupts = <34>; + + clocks = <&ext>, <&cgu JZ4780_CLK_UART4>; + clock-names = "baud", "module"; + }; +}; diff --git a/arch/mips/include/asm/mach-jz4740/irq.h b/arch/mips/include/asm/mach-jz4740/irq.h index b218f76..7e4ec21 100644 --- a/arch/mips/include/asm/mach-jz4740/irq.h +++ b/arch/mips/include/asm/mach-jz4740/irq.h @@ -22,6 +22,9 @@ #ifdef CONFIG_MACH_JZ4740 # define NR_INTC_IRQS 32 #endif +#ifdef CONFIG_MACH_JZ4780 +# define NR_INTC_IRQS 64 +#endif /* 1st-level interrupts */ #define JZ4740_IRQ(x) (JZ4740_IRQ_BASE + (x)) @@ -48,6 +51,8 @@ #define JZ4740_IRQ_IPU JZ4740_IRQ(29) #define JZ4740_IRQ_LCD JZ4740_IRQ(30) +#define JZ4780_IRQ_TCU2 JZ4740_IRQ(25) + /* 2nd-level interrupts */ #define JZ4740_IRQ_DMA(x) (JZ4740_IRQ(NR_INTC_IRQS) + (x)) diff --git a/arch/mips/include/asm/mach-jz4740/serial.h b/arch/mips/include/asm/mach-jz4740/serial.h index 9f93563..5001d34 100644 --- a/arch/mips/include/asm/mach-jz4740/serial.h +++ b/arch/mips/include/asm/mach-jz4740/serial.h @@ -16,6 +16,12 @@ #ifndef __JZ4740_SERIAL_H__ #define __JZ4740_SERIAL_H__ -#define BASE_BAUD (12000000 / 16) +#ifdef CONFIG_MACH_JZ4740 +# define BASE_BAUD (12000000 / 16) +#endif + +#ifdef CONFIG_MACH_JZ4780 +# define BASE_BAUD (48000000 / 16) +#endif #endif /* __JZ4740_SERIAL_H__ */ diff --git a/arch/mips/jz4740/Makefile b/arch/mips/jz4740/Makefile index ae72346..03e9f0a 100644 --- a/arch/mips/jz4740/Makefile +++ b/arch/mips/jz4740/Makefile @@ -5,7 +5,9 @@ # Object file lists. obj-y += prom.o irq.o time.o reset.o setup.o \ - gpio.o platform.o timer.o + platform.o timer.o + +obj-$(CONFIG_MACH_JZ4740) += gpio.o CFLAGS_setup.o = -I$(src)/../../../scripts/dtc/libfdt diff --git a/arch/mips/jz4740/Platform b/arch/mips/jz4740/Platform index ba91be9..ad1b443 100644 --- a/arch/mips/jz4740/Platform +++ b/arch/mips/jz4740/Platform @@ -1,3 +1,7 @@ platform-$(CONFIG_MACH_JZ4740) += jz4740/ cflags-$(CONFIG_MACH_JZ4740) += -I$(srctree)/arch/mips/include/asm/mach-jz4740 load-$(CONFIG_MACH_JZ4740) += 0xffffffff80010000 + +platform-$(CONFIG_MACH_JZ4780) += jz4740/ +cflags-$(CONFIG_MACH_JZ4780) += -I$(srctree)/arch/mips/include/asm/mach-jz4740 +load-$(CONFIG_MACH_JZ4780) += 0xffffffff80010000 diff --git a/arch/mips/jz4740/time.c b/arch/mips/jz4740/time.c index 121ec3a..e4e440d 100644 --- a/arch/mips/jz4740/time.c +++ b/arch/mips/jz4740/time.c @@ -96,7 +96,12 @@ static struct clock_event_device jz4740_clockevent = { .set_next_event = jz4740_clockevent_set_next, .set_mode = jz4740_clockevent_set_mode, .rating = 200, +#ifdef CONFIG_MACH_JZ4740 .irq = JZ4740_IRQ_TCU0, +#endif +#ifdef CONFIG_MACH_JZ4780 + .irq = JZ4780_IRQ_TCU2, +#endif }; static struct irqaction timer_irqaction = { @@ -136,7 +141,7 @@ void __init plat_time_init(void) if (ret) printk(KERN_ERR "Failed to register clocksource: %d\n", ret); - setup_irq(JZ4740_IRQ_TCU0, &timer_irqaction); + setup_irq(jz4740_clockevent.irq, &timer_irqaction); ctrl = JZ_TIMER_CTRL_PRESCALE_16 | JZ_TIMER_CTRL_SRC_EXT; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/