Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161236Ab3DGAGf (ORCPT ); Sat, 6 Apr 2013 20:06:35 -0400 Received: from mail-da0-f53.google.com ([209.85.210.53]:45866 "EHLO mail-da0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161168Ab3DGAGd convert rfc822-to-8bit (ORCPT ); Sat, 6 Apr 2013 20:06:33 -0400 Content-Type: text/plain; charset=US-ASCII Mime-Version: 1.0 (Mac OS X Mail 6.3 \(1503\)) Subject: Re: [RFC PATCH arm: initial TI-Nspire support] From: Daniel Tang In-Reply-To: <201304061524.56502.arnd@arndb.de> Date: Sun, 7 Apr 2013 10:06:22 +1000 Cc: linux-arm-kernel@lists.infradead.org, linux@arm.linux.org.uk, fabian@ritter-vogt.de, Lionel Debroux , linux-kernel@vger.kernel.org Content-Transfer-Encoding: 7BIT Message-Id: <4B3FD561-84FC-40CD-B747-13851692D673@gmail.com> References: <6FE4B33E-A503-4A75-AEED-831CB2C06D83@gmail.com> <201304061351.00889.arnd@arndb.de> <201304061524.56502.arnd@arndb.de> To: Arnd Bergmann X-Mailer: Apple Mail (2.1503) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 19556 Lines: 705 Hi, On 07/04/2013, at 12:24 AM, Arnd Bergmann wrote: >> arch/arm/Kconfig | 13 ++ >> arch/arm/Makefile | 3 +- >> arch/arm/boot/dts/nspire-cx.dts | 85 +++++++++++++ >> arch/arm/boot/dts/nspire.dtsi | 154 +++++++++++++++++++++++ >> arch/arm/mach-nspire/Makefile | 3 + >> arch/arm/mach-nspire/include/mach/debug-macro.S | 25 ++++ >> arch/arm/mach-nspire/include/mach/timex.h | 15 +++ >> arch/arm/mach-nspire/include/mach/uncompress.h | 25 ++++ >> arch/arm/mach-nspire/mmio.h | 13 ++ >> arch/arm/mach-nspire/nspire.c | 107 ++++++++++++++++ > > A good next step before doing anything else might be to put it under > CONFIG_ARCH_MULTIPLATFORM and remove the include/mach directory. > > The only requirement for that should be to move debug-macro.S to > include/debug/nspire.S > Done. > > >> @@ -313,7 +314,7 @@ define archhelp >> echo ' Image - Uncompressed kernel image (arch/$(ARCH)/boot/Image)' >> echo '* xipImage - XIP kernel image, if configured (arch/$(ARCH)/boot/xipImage)' >> echo ' uImage - U-Boot wrapped zImage' >> - echo ' bootpImage - Combined zImage and initial RAM disk' >> + echo ' bootpImage - Combined zImage and initial RAM disk' >> echo ' (supply initrd image via make variable INITRD=)' >> echo '* dtbs - Build device tree blobs for enabled boards' >> echo ' install - Install uncompressed kernel' > > This looks like it wasn't meant to be in the patch. It probably isn't. I think there was trailing whitespace on that and my editor happened to remove it automatically. Should this be a separate patch to fix up formatting or should I leave it in as a drive-by fix? > >> + tdes: tdes@C8010000 { >> + reg = <0xC8010000 0x1000>; >> + }; >> + >> + sha256: sha256@CC000000 { >> + reg = <0xCC000000 0x1000>; >> + }; > > maybe rename the actual nodes to "crypto@c...". The device name should > be a really generic word in general. Done. > >> + uart: uart@90020000 { >> + reg = <0x90020000 0x1000>; >> + interrupts = <1>; >> + >> + clocks = <&uart_clk>; >> + clock-names = "uart_clk"; >> + }; > > The name for a uart should be "serial". Since this is a pl01x, please add > the required properties for the device, e.g. > > compatible = "arm,pl011", "arm,primecell"; > > You will need the "arm,primecell" bit to make the device appear on the > amba bus rather than the platform bus. That was actually deliberate because different models of the TI-NSPIRE have different serial hardware. On the newer CX models, it is a PL01x and on the older models, it has a 8250-like interface. They all reside at the same address with the same IRQ though. I thought it might be cleaner to specify the interrupts and registers in the common file and leave it to the board specific ones to implement the "compatible" property. > >> + timer0: timer0@900C0000 { >> + reg = <0x900C0000 0x1000>; >> + interrupts = <18>; >> + >> + clocks = <&timer_clk>; >> + clock-names = "timer_clk"; >> + }; >> + >> + timer1: timer1@900D0000 { >> + reg = <0x900D0000 0x1000>; >> + interrupts = <19>; >> + >> + clocks = <&timer_clk>; >> + clock-names = "timer_clk"; >> + }; > > Name the devices "timer", not "timer0" and "timer1", the address after @ is > used to disambiguate them. There are currently patches for sp804 under > discussion on the mailing list, you should probably watch those. > Done. Yep, I also noticed there were patches to have device tree bindings for SP804. I'll integrate them once they're in mainline. >> --- /dev/null >> +++ b/arch/arm/mach-nspire/Makefile >> @@ -0,0 +1,3 @@ >> +obj-y := >> + >> +obj-y += nspire.o > > The first line is not actually needed. Done. > >> + >> +#include "../../mmio.h" >> + >> +.macro addruart, rp, rv, tmp >> + ldr \rp, =(NSPIRE_EARLY_UART_PHYS_BASE) @ physical base address >> + ldr \rv, =(NSPIRE_EARLY_UART_VIRT_BASE) @ virtual base address >> +.endm >> + >> +#include >> + > > There is no nice solution for getting the addresses here, but the consensus > was to just define the macros in this file rather than try to include a > header from elsewhere. > Fair enough, I've added the macros in. > >> + err = of_property_read_string(of_aliases, "timer0", &path); >> + if (WARN_ON(err)) >> + return; >> + >> + timer = of_find_node_by_path(path); >> + base = of_iomap(timer, 0); >> + if (WARN_ON(!base)) >> + return; >> + >> + clk = of_clk_get_by_name(timer, NULL); >> + clk_register_clkdev(clk, timer->name, "sp804"); >> + >> + sp804_clocksource_init(base, timer->name); >> + >> + err = of_property_read_string(of_aliases, "timer1", &path); >> + if (WARN_ON(err)) >> + return; > > In particular, I think the method of using aliases to pick the right sp804 > instance is being deprecated now. If both timers are identical, the kernel > will now just pick one of them. Sorry, I don't quite understand. Out of the timers, I want to add one as a clocksource and one as a clockevent. If they're identical (i.e. without using aliases), how should I tell the kernel, "Take the first timer you see and make it a clocksource, take the next one you see and make it a clockevent"? > > Arnd Here's an updated patch: Signed-off-by: Daniel Tang --- arch/arm/Kconfig | 2 + arch/arm/Kconfig.debug | 16 ++++ arch/arm/Makefile | 3 +- arch/arm/boot/dts/nspire-cx.dts | 85 ++++++++++++++++++++ arch/arm/boot/dts/nspire.dtsi | 154 +++++++++++++++++++++++++++++++++++++ arch/arm/include/debug/nspire.S | 28 +++++++ arch/arm/mach-nspire/Kconfig | 12 +++ arch/arm/mach-nspire/Makefile | 1 + arch/arm/mach-nspire/Makefile.boot | 0 arch/arm/mach-nspire/mmio.h | 13 ++++ arch/arm/mach-nspire/nspire.c | 107 ++++++++++++++++++++++++++ 11 files changed, 420 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/nspire-cx.dts create mode 100644 arch/arm/boot/dts/nspire.dtsi create mode 100644 arch/arm/include/debug/nspire.S create mode 100644 arch/arm/mach-nspire/Kconfig create mode 100644 arch/arm/mach-nspire/Makefile create mode 100644 arch/arm/mach-nspire/Makefile.boot create mode 100644 arch/arm/mach-nspire/mmio.h create mode 100644 arch/arm/mach-nspire/nspire.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1cacda4..3f0cd8c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1081,6 +1081,8 @@ source "arch/arm/mach-netx/Kconfig" source "arch/arm/mach-nomadik/Kconfig" +source "arch/arm/mach-nspire/Kconfig" + source "arch/arm/plat-omap/Kconfig" source "arch/arm/mach-omap1/Kconfig" diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 9b31f43..5da3a50 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -298,6 +298,20 @@ choice Say Y here if you want kernel low-level debugging support on MVEBU based platforms. + config DEBUG_NSPIRE_CLASSIC_UART + bool "Kernel low-level debugging via TI-NSPIRE 8250 UART" + depends on ARCH_NSPIRE + help + Say Y here if you want kernel low-level debugging support + on TI-NSPIRE classic models. + + config DEBUG_NSPIRE_CX_UART + bool "Kernel low-level debugging via TI-NSPIRE PL011 UART" + depends on ARCH_NSPIRE + help + Say Y here if you want kernel low-level debugging support + on TI-NSPIRE CX models. + config DEBUG_OMAP2PLUS_UART bool "Kernel low-level debugging messages via OMAP2PLUS UART" depends on ARCH_OMAP2PLUS @@ -591,6 +605,8 @@ config DEBUG_LL_INCLUDE DEBUG_IMX6Q_UART default "debug/highbank.S" if DEBUG_HIGHBANK_UART default "debug/mvebu.S" if DEBUG_MVEBU_UART + default "debug/nspire.S" if DEBUG_NSPIRE_CX_UART || \ + DEBUG_NSPIRE_CLASSIC_UART default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART default "debug/socfpga.S" if DEBUG_SOCFPGA_UART diff --git a/arch/arm/Makefile b/arch/arm/Makefile index ee4605f..f47a8a7 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -165,6 +165,7 @@ machine-$(CONFIG_ARCH_MXS) += mxs machine-$(CONFIG_ARCH_MVEBU) += mvebu machine-$(CONFIG_ARCH_NETX) += netx machine-$(CONFIG_ARCH_NOMADIK) += nomadik +machine-$(CONFIG_ARCH_NSPIRE) += nspire machine-$(CONFIG_ARCH_OMAP1) += omap1 machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2 machine-$(CONFIG_ARCH_ORION5X) += orion5x @@ -313,7 +314,7 @@ define archhelp echo ' Image - Uncompressed kernel image (arch/$(ARCH)/boot/Image)' echo '* xipImage - XIP kernel image, if configured (arch/$(ARCH)/boot/xipImage)' echo ' uImage - U-Boot wrapped zImage' - echo ' bootpImage - Combined zImage and initial RAM disk' + echo ' bootpImage - Combined zImage and initial RAM disk' echo ' (supply initrd image via make variable INITRD=)' echo '* dtbs - Build device tree blobs for enabled boards' echo ' install - Install uncompressed kernel' diff --git a/arch/arm/boot/dts/nspire-cx.dts b/arch/arm/boot/dts/nspire-cx.dts new file mode 100644 index 0000000..0a80488 --- /dev/null +++ b/arch/arm/boot/dts/nspire-cx.dts @@ -0,0 +1,85 @@ +/* + * linux/arch/arm/boot/nspire-cx.dts + * + * Copyright (C) 2012 Daniel Tang + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, as + * published by the Free Software Foundation. + * + */ +/dts-v1/; + +/include/ "nspire.dtsi" + +/ { + model = "TI-NSPIRE CX"; + compatible = "arm,nspire-cx"; + + memory { + device_type = "memory"; + reg = <0x10000000 0x4000000>; /* 64 MB */ + }; + + aliases { + uart0 = &uart0; + timer0 = &timer0; + timer1 = &timer1; + fast_timer = &fast_timer; + }; + + uart_clk: uart_clk { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <12000000>; + }; + + /* Not really a fixed clock but we'll fix this later */ + apb_pclk: apb_pclk { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <33000000>; + }; + + ahb { + #address-cells = <1>; + #size-cells = <1>; + + intc: interrupt-controller@DC000000 { + compatible = "arm,pl190-vic"; + interrupt-controller; + reg = <0xDC000000 0x1000>; + #interrupt-cells = <1>; + }; + + apb@90000000 { + #address-cells = <1>; + #size-cells = <1>; + + i2c@90050000 { + compatible = "snps,designware-i2c"; + reg = <0x90050000 0x1000>; + interrupts = <20>; + }; + + fast_timer: timer@90010000 { + compatible = "arm,sp804", "arm,primecell"; + }; + + uart0: serial@90020000 { + compatible = "arm,pl011", "arm,primecell"; + }; + + timer0: timer@900C0000 { + compatible = "arm,sp804", "arm,primecell"; + }; + + timer1: timer@900D0000 { + compatible = "arm,sp804", "arm,primecell"; + }; + }; + }; + chosen { + bootargs = "debug earlyprintk console=ttyAMA0,115200n8"; + }; +}; diff --git a/arch/arm/boot/dts/nspire.dtsi b/arch/arm/boot/dts/nspire.dtsi new file mode 100644 index 0000000..7e9681f --- /dev/null +++ b/arch/arm/boot/dts/nspire.dtsi @@ -0,0 +1,154 @@ +/* + * linux/arch/arm/boot/nspire.dtsi + * + * Copyright (C) 2012 Daniel Tang + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, as + * published by the Free Software Foundation. + * + */ + +/include/ "skeleton.dtsi" + +/ { + cpus { + cpu@0 { + compatible = "arm,arm926"; + }; + }; + + bootrom: bootrom@00000000 { + reg = <0x00000000 0x80000>; + }; + + sram: sram@A4000000 { + device = "memory"; + reg = <0xA4000000 0x20000>; + }; + + timer_clk: timer_clk { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32768>; + }; + + ahb { + compatible = "arm,amba-bus", "simple-bus"; + interrupt-parent = <&intc>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + spi: spi@A9000000 { + reg = <0xA9000000 0x1000>; + }; + + usb0: usb@B0000000 { + reg = <0xB0000000 0x1000>; + interrupts = <8>; + }; + + usb1: usb@B4000000 { + reg = <0xB4000000 0x1000>; + interrupts = <9>; + status = "disabled"; + }; + + lcd: lcd@C0000000 { + compatible = "arm,amba-primecell"; + reg = <0xC0000000 0x1000>; + interrupts = <21>; + }; + + adc: adc@C4000000 { + reg = <0xC4000000 0x1000>; + interrupts = <11>; + }; + + tdes: crypto@C8010000 { + reg = <0xC8010000 0x1000>; + }; + + sha256: crypto@CC000000 { + reg = <0xCC000000 0x1000>; + }; + + apb@90000000 { + compatible = "arm,amba-bus", "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + clocks = <&apb_pclk>; + clock-names = "apb_pclk"; + clock-ranges; + ranges; + + gpio: gpio@90000000 { + reg = <0x90000000 0x1000>; + interrupts = <7>; + }; + + fast_timer: timer@90010000 { + reg = <0x90010000 0x1000>; + interrupts = <17>; + }; + + uart: serial@90020000 { + reg = <0x90020000 0x1000>; + interrupts = <1>; + + clocks = <&uart_clk>; + clock-names = "uart_clk"; + }; + + timer0: timer@900C0000 { + reg = <0x900C0000 0x1000>; + interrupts = <18>; + + clocks = <&timer_clk>; + clock-names = "timer_clk"; + }; + + timer1: timer@900D0000 { + reg = <0x900D0000 0x1000>; + interrupts = <19>; + + clocks = <&timer_clk>; + clock-names = "timer_clk"; + }; + + watchdog: watchdog@90060000 { + compatible = "arm,amba-primecell"; + reg = <0x90060000 0x1000>; + interrupts = <3>; + }; + + rtc: rtc@90090000 { + reg = <0x90090000 0x1000>; + interrupts = <4>; + }; + + misc: misc@900A0000 { + reg = <0x900A0000 0x1000>; + }; + + pwr: pwr@900B0000 { + reg = <0x900B0000 0x1000>; + interrupts = <15>; + }; + + keypad: input@900E0000 { + reg = <0x900E0000 0x1000>; + interrupts = <16>; + }; + + contrast: contrast@900F0000 { + reg = <0x900F0000 0x1000>; + }; + + led: led@90110000 { + reg = <0x90110000 0x1000>; + }; + }; + }; +}; diff --git a/arch/arm/include/debug/nspire.S b/arch/arm/include/debug/nspire.S new file mode 100644 index 0000000..3a9729c --- /dev/null +++ b/arch/arm/include/debug/nspire.S @@ -0,0 +1,28 @@ +/* + * linux/arch/arm/include/debug/nspire.S + * + * Copyright (C) 2012 Daniel Tang + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, as + * published by the Free Software Foundation. + * + */ + +#define NSPIRE_EARLY_UART_PHYS_BASE 0x90020000 +#define NSPIRE_EARLY_UART_VIRT_BASE 0xfee20000 + +.macro addruart, rp, rv, tmp + ldr \rp, =(NSPIRE_EARLY_UART_PHYS_BASE) @ physical base address + ldr \rv, =(NSPIRE_EARLY_UART_VIRT_BASE) @ virtual base address +.endm + + +#ifdef CONFIG_DEBUG_NSPIRE_CX_UART +#include +#endif + +#ifdef CONFIG_DEBUG_NSPIRE_CLASSIC_UART +#define UART_SHIFT 2 +#include +#endif diff --git a/arch/arm/mach-nspire/Kconfig b/arch/arm/mach-nspire/Kconfig new file mode 100644 index 0000000..b6bf06c --- /dev/null +++ b/arch/arm/mach-nspire/Kconfig @@ -0,0 +1,12 @@ +config ARCH_NSPIRE + bool "TI-NSPIRE based" + depends on MMU + select CPU_ARM926T + select COMMON_CLK + select GENERIC_CLOCKEVENTS + select SPARSE_IRQ + select ARM_AMBA + select ARM_VIC + select ARM_TIMER_SP804 + help + This enables support for systems using the TI-NSPIRE CPU diff --git a/arch/arm/mach-nspire/Makefile b/arch/arm/mach-nspire/Makefile new file mode 100644 index 0000000..c96c2c4 --- /dev/null +++ b/arch/arm/mach-nspire/Makefile @@ -0,0 +1 @@ +obj-y += nspire.o diff --git a/arch/arm/mach-nspire/Makefile.boot b/arch/arm/mach-nspire/Makefile.boot new file mode 100644 index 0000000..e69de29 diff --git a/arch/arm/mach-nspire/mmio.h b/arch/arm/mach-nspire/mmio.h new file mode 100644 index 0000000..6e2fe95 --- /dev/null +++ b/arch/arm/mach-nspire/mmio.h @@ -0,0 +1,13 @@ +/* + * linux/arch/arm/mach-nspire/mmio.h + * + * Copyright (C) 2012 Daniel Tang + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, as + * published by the Free Software Foundation. + * + */ + +#define NSPIRE_EARLY_UART_PHYS_BASE 0x90020000 +#define NSPIRE_EARLY_UART_VIRT_BASE 0xfee20000 diff --git a/arch/arm/mach-nspire/nspire.c b/arch/arm/mach-nspire/nspire.c new file mode 100644 index 0000000..ec7734a --- /dev/null +++ b/arch/arm/mach-nspire/nspire.c @@ -0,0 +1,107 @@ +/* + * linux/arch/arm/mach-nspire/nspire.c + * + * Copyright (C) 2012 Daniel Tang + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, as + * published by the Free Software Foundation. + * + */ +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +#include "mmio.h" + +static const char *nspire_dt_match[] __initconst = { + "arm,nspire", + "arm,nspire-cx", + "arm,nspire-tp", + "arm,nspire-clp", + NULL, +}; + +static struct map_desc nspire_io_desc[] __initdata = { + { + .virtual = NSPIRE_EARLY_UART_VIRT_BASE, + .pfn = __phys_to_pfn(NSPIRE_EARLY_UART_PHYS_BASE), + .length = SZ_4K, + .type = MT_DEVICE + } +}; + +static void __init nspire_init_timer(void) +{ + struct device_node *timer; + void __iomem *base; + const char *path; + struct clk *clk; + int irq, err; + + of_clk_init(NULL); + + err = of_property_read_string(of_aliases, "timer0", &path); + if (WARN_ON(err)) + return; + + timer = of_find_node_by_path(path); + base = of_iomap(timer, 0); + if (WARN_ON(!base)) + return; + + clk = of_clk_get_by_name(timer, NULL); + clk_register_clkdev(clk, timer->name, "sp804"); + + sp804_clocksource_init(base, timer->name); + + err = of_property_read_string(of_aliases, "timer1", &path); + if (WARN_ON(err)) + return; + + timer = of_find_node_by_path(path); + base = of_iomap(timer, 0); + if (WARN_ON(!base)) + return; + + clk = of_clk_get_by_name(timer, NULL); + clk_register_clkdev(clk, timer->name, "sp804"); + + irq = irq_of_parse_and_map(timer, 0); + sp804_clockevents_init(base, irq, timer->name); +} + +static void __init nspire_map_io(void) +{ + iotable_init(nspire_io_desc, ARRAY_SIZE(nspire_io_desc)); +} + +static void __init nspire_init(void) +{ + of_platform_populate(NULL, of_default_bus_match_table, + NULL, NULL); +} + +static void nspire_restart(char mode, const char *cmd) +{ +} + +DT_MACHINE_START(NSPIRE, "TI-NSPIRE") + .map_io = nspire_map_io, + .init_irq = irqchip_init, + .init_time = nspire_init_timer, + .init_machine = nspire_init, + .dt_compat = nspire_dt_match, + .restart = nspire_restart, +MACHINE_END -- 1.8.1.3 -- 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/