* [PATCH 0/4] arm: vt8500: Add new models and remove single-platform.
@ 2012-12-27 23:20 Tony Prisk
2012-12-27 23:20 ` [PATCH 1/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850 Tony Prisk
` (3 more replies)
0 siblings, 4 replies; 15+ messages in thread
From: Tony Prisk @ 2012-12-27 23:20 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd/Olaf,
These patches should be pretty self explanatory.
#1 - Adds support for WM8750 and WM8850.
#2 - Remove the single-platform Kconfig options.
#3 - Move the early debug code so it can be used for multiplatform.
#4 - Cleanup the unused headers in arch/arm/mach-vt8500/include.
Tony Prisk (4):
arm: vt8500: Add support for Wondermedia WM8750/WM8850
arm: vt8500: Remove single platform Kconfig options
arm: vt8500: Convert debug-macro.S to be multiplatform friendly
arm: vt8500: Remove remaining mach includes
Documentation/devicetree/bindings/arm/vt8500.txt | 8 +++++
arch/arm/Kconfig | 16 ----------
arch/arm/Kconfig.debug | 8 +++++
arch/arm/mach-vt8500/Kconfig | 26 +++++++++++++--
arch/arm/mach-vt8500/include/mach/debug-macro.S | 31 ------------------
arch/arm/mach-vt8500/include/mach/timex.h | 26 ---------------
arch/arm/mach-vt8500/include/mach/uncompress.h | 37 ----------------------
arch/arm/mach-vt8500/vt8500.c | 2 ++
8 files changed, 41 insertions(+), 113 deletions(-)
delete mode 100644 arch/arm/mach-vt8500/include/mach/debug-macro.S
delete mode 100644 arch/arm/mach-vt8500/include/mach/timex.h
delete mode 100644 arch/arm/mach-vt8500/include/mach/uncompress.h
--
1.7.9.5
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 1/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850 2012-12-27 23:20 [PATCH 0/4] arm: vt8500: Add new models and remove single-platform Tony Prisk @ 2012-12-27 23:20 ` Tony Prisk 2013-01-09 6:13 ` Tony Prisk 2012-12-27 23:20 ` [PATCH 2/4] arm: vt8500: Remove single platform Kconfig options Tony Prisk ` (2 subsequent siblings) 3 siblings, 1 reply; 15+ messages in thread From: Tony Prisk @ 2012-12-27 23:20 UTC (permalink / raw) To: linux-arm-kernel This patch adds support for the WM8750 (ARMv6) and WM8850 (ARMv7). Common features across all SoCs are split into ARCH_VT8500 and unique features are specified by each SoC option. Signed-off-by: Tony Prisk <linux@prisktech.co.nz> --- Documentation/devicetree/bindings/arm/vt8500.txt | 8 ++++++ arch/arm/Kconfig | 17 +++++++---- arch/arm/mach-vt8500/Kconfig | 33 ++++++++++++++++++++-- arch/arm/mach-vt8500/vt8500.c | 2 ++ 4 files changed, 51 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/vt8500.txt b/Documentation/devicetree/bindings/arm/vt8500.txt index d657832..87dc1dd 100644 --- a/Documentation/devicetree/bindings/arm/vt8500.txt +++ b/Documentation/devicetree/bindings/arm/vt8500.txt @@ -12,3 +12,11 @@ compatible = "wm,wm8505"; Boards with the Wondermedia WM8650 SoC shall have the following properties: Required root node property: compatible = "wm,wm8650"; + +Boards with the Wondermedia WM8750 SoC shall have the following properties: +Required root node property: +compatible = "wm,wm8750"; + +Boards with the Wondermedia WM8850 SoC shall have the following properties: +Required root node property: +compatible = "wm,wm8850"; diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f95ba14..fbb9492 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -952,20 +952,25 @@ config ARCH_OMAP config ARCH_VT8500_SINGLE bool "VIA/WonderMedia 85xx" - select ARCH_HAS_CPUFREQ - select ARCH_REQUIRE_GPIOLIB - select CLKDEV_LOOKUP + select ARCH_VT8500 select COMMON_CLK select CPU_ARM926T - select GENERIC_CLOCKEVENTS - select GENERIC_GPIO - select HAVE_CLK select MULTI_IRQ_HANDLER select SPARSE_IRQ select USE_OF help Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. +config ARCH_WM8750_SINGLE + bool "WonderMedia WM8750/WM8850" + select ARCH_VT8500 + select COMMON_CLK + select MULTI_IRQ_HANDLER + select SPARSE_IRQ + select USE_OF + help + Support for WonderMedia WM8750/WM8850 System-on-Chip. + endchoice menu "Multiple platform selection" diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig index 2ed0b7d..d67c7fa 100644 --- a/arch/arm/mach-vt8500/Kconfig +++ b/arch/arm/mach-vt8500/Kconfig @@ -1,12 +1,39 @@ config ARCH_VT8500 - bool "VIA/WonderMedia 85xx" if ARCH_MULTI_V5 - default ARCH_VT8500_SINGLE + bool select ARCH_HAS_CPUFREQ select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP - select CPU_ARM926T select GENERIC_CLOCKEVENTS select GENERIC_GPIO select HAVE_CLK + +config ARCH_WM8505 + bool "VIA/WonderMedia 85xx" if !ARCH_VT8500_SINGLE + depends on ARCH_MULTI_V5 + default ARCH_VT8500_SINGLE + select ARCH_VT8500 + select CPU_ARM926T help Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. + +config ARCH_WM8750 + bool "WonderMedia WM8750" + depends on ARCH_MULTI_V6 || ARCH_WM8750_SINGLE + select ARCH_VT8500 + select CPU_V6 + help + Support for WonderMedia WM8750 System-on-Chip. + +config ARCH_WM8850 + bool "WonderMedia WM8850" + depends on ARCH_MULTI_V7 || ARCH_WM8750_SINGLE + select ARCH_VT8500 + select CPU_V7 + help + Support for WonderMedia WM8850 System-on-Chip. + +# ensure that ARCH_WM8850 is on if ARCH_WM8750 is off +config ARCH_WM8850_AUTO + def_bool y + depends on ARCH_WM8750_SINGLE && !ARCH_WM8750 + select ARCH_WM8850 diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c index 3c66d48..55162ab 100644 --- a/arch/arm/mach-vt8500/vt8500.c +++ b/arch/arm/mach-vt8500/vt8500.c @@ -183,6 +183,8 @@ static const char * const vt8500_dt_compat[] = { "via,vt8500", "wm,wm8650", "wm,wm8505", + "wm,wm8750", + "wm,wm8850", }; DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)") -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 1/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850 2012-12-27 23:20 ` [PATCH 1/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850 Tony Prisk @ 2013-01-09 6:13 ` Tony Prisk 2013-01-09 6:30 ` Olof Johansson 0 siblings, 1 reply; 15+ messages in thread From: Tony Prisk @ 2013-01-09 6:13 UTC (permalink / raw) To: linux-arm-kernel On Fri, 2012-12-28 at 12:20 +1300, Tony Prisk wrote: > This patch adds support for the WM8750 (ARMv6) and WM8850 (ARMv7). > > Common features across all SoCs are split into ARCH_VT8500 and > unique features are specified by each SoC option. > > Signed-off-by: Tony Prisk <linux@prisktech.co.nz> Hi Arnd, Olof, Haven't heard anything re: this patch series. Problem? Regards Tony P ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850 2013-01-09 6:13 ` Tony Prisk @ 2013-01-09 6:30 ` Olof Johansson 2013-01-09 19:09 ` Tony Prisk 0 siblings, 1 reply; 15+ messages in thread From: Olof Johansson @ 2013-01-09 6:30 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jan 8, 2013 at 10:13 PM, Tony Prisk <linux@prisktech.co.nz> wrote: > On Fri, 2012-12-28 at 12:20 +1300, Tony Prisk wrote: >> This patch adds support for the WM8750 (ARMv6) and WM8850 (ARMv7). >> >> Common features across all SoCs are split into ARCH_VT8500 and >> unique features are specified by each SoC option. >> >> Signed-off-by: Tony Prisk <linux@prisktech.co.nz> > > > Hi Arnd, Olof, > > Haven't heard anything re: this patch series. Problem? Nope, just wasn't sure if you would send a git pull request or if you wanted them applied. I'm out of time for tonight, but I'll look closer at them (and apply them if all OK) tomorrow. -Olof ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850 2013-01-09 6:30 ` Olof Johansson @ 2013-01-09 19:09 ` Tony Prisk 2013-01-09 21:27 ` Arnd Bergmann 0 siblings, 1 reply; 15+ messages in thread From: Tony Prisk @ 2013-01-09 19:09 UTC (permalink / raw) To: linux-arm-kernel On Tue, 2013-01-08 at 22:30 -0800, Olof Johansson wrote: > On Tue, Jan 8, 2013 at 10:13 PM, Tony Prisk <linux@prisktech.co.nz> wrote: > > On Fri, 2012-12-28 at 12:20 +1300, Tony Prisk wrote: > >> This patch adds support for the WM8750 (ARMv6) and WM8850 (ARMv7). > >> > >> Common features across all SoCs are split into ARCH_VT8500 and > >> unique features are specified by each SoC option. > >> > >> Signed-off-by: Tony Prisk <linux@prisktech.co.nz> > > > > > > Hi Arnd, Olof, > > > > Haven't heard anything re: this patch series. Problem? > > Nope, just wasn't sure if you would send a git pull request or if you > wanted them applied. > > I'm out of time for tonight, but I'll look closer at them (and apply > them if all OK) tomorrow. > > > -Olof I'm quite happy to send a pull request if that's what you prefer. Generally people have just taken the patches straight from email, so everytime I've done a pull-request I get a reply back saying the patches have already been applied. Is there some 'rule' around pull-requests vs emailed patches? Should patches in pull-requests have Ack'd lines already? Regards Tony P ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850 2013-01-09 19:09 ` Tony Prisk @ 2013-01-09 21:27 ` Arnd Bergmann 2013-01-10 2:03 ` Tony Prisk 0 siblings, 1 reply; 15+ messages in thread From: Arnd Bergmann @ 2013-01-09 21:27 UTC (permalink / raw) To: linux-arm-kernel On Wednesday 09 January 2013, Tony Prisk wrote: > I'm quite happy to send a pull request if that's what you prefer. > > Generally people have just taken the patches straight from email, so > everytime I've done a pull-request I get a reply back saying the patches > have already been applied. > > Is there some 'rule' around pull-requests vs emailed patches? Generally, pull requests tend to be less work for us, so I prefer them. In particular, when you add a tag description or a signed tag, that gives automatically puts nice text into the merge changeset. > Should patches in pull-requests have Ack'd lines already? Yes. Arnd ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850 2013-01-09 21:27 ` Arnd Bergmann @ 2013-01-10 2:03 ` Tony Prisk 2013-01-10 10:21 ` Arnd Bergmann 0 siblings, 1 reply; 15+ messages in thread From: Tony Prisk @ 2013-01-10 2:03 UTC (permalink / raw) To: linux-arm-kernel On Wed, 2013-01-09 at 21:27 +0000, Arnd Bergmann wrote: > On Wednesday 09 January 2013, Tony Prisk wrote: > > I'm quite happy to send a pull request if that's what you prefer. > > > > Generally people have just taken the patches straight from email, so > > everytime I've done a pull-request I get a reply back saying the patches > > have already been applied. > > > > Is there some 'rule' around pull-requests vs emailed patches? > > Generally, pull requests tend to be less work for us, so I prefer > them. In particular, when you add a tag description or a signed > tag, that gives automatically puts nice text into the merge > changeset. > > > Should patches in pull-requests have Ack'd lines already? > > Yes. > > Arnd This is what I thought - and the reason I haven't sent a pull-request for the patch's - I haven't had any Ack's :) Regards Tony P ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850 2013-01-10 2:03 ` Tony Prisk @ 2013-01-10 10:21 ` Arnd Bergmann 2013-01-10 18:32 ` Tony Prisk 0 siblings, 1 reply; 15+ messages in thread From: Arnd Bergmann @ 2013-01-10 10:21 UTC (permalink / raw) To: linux-arm-kernel On Thursday 10 January 2013, Tony Prisk wrote: > On Wed, 2013-01-09 at 21:27 +0000, Arnd Bergmann wrote: > > > > > Should patches in pull-requests have Ack'd lines already? > > This is what I thought - and the reason I haven't sent a pull-request > for the patch's - I haven't had any Ack's :) > Sorry, I think I misunderstood the question then. I meant that if you received an Acked-by statement, it should be part of the changeset comment by the time you send a pull request. There is also the rule that patches need to be reviewed on the mailing list before you submit them for inclusion. Like all rules, this can be bent a little for patches that are obvious correct bug fixes, especially when you are the platform maintainer. What you can do here is send the patches out to the mailing list without any additional Acks and send the pull request as the [PATCH 0/X] mail. We can then look at the patches if necessary or just pull in the branch straight away. Arnd ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850 2013-01-10 10:21 ` Arnd Bergmann @ 2013-01-10 18:32 ` Tony Prisk 0 siblings, 0 replies; 15+ messages in thread From: Tony Prisk @ 2013-01-10 18:32 UTC (permalink / raw) To: linux-arm-kernel On Thu, 2013-01-10 at 10:21 +0000, Arnd Bergmann wrote: > On Thursday 10 January 2013, Tony Prisk wrote: > > On Wed, 2013-01-09 at 21:27 +0000, Arnd Bergmann wrote: > > > > > > > Should patches in pull-requests have Ack'd lines already? > > > > This is what I thought - and the reason I haven't sent a pull-request > > for the patch's - I haven't had any Ack's :) > > > > Sorry, I think I misunderstood the question then. I meant that if > you received an Acked-by statement, it should be part of the > changeset comment by the time you send a pull request. > > There is also the rule that patches need to be reviewed on the > mailing list before you submit them for inclusion. Like all > rules, this can be bent a little for patches that are obvious > correct bug fixes, especially when you are the platform > maintainer. What you can do here is send the patches out to the > mailing list without any additional Acks and send the pull > request as the [PATCH 0/X] mail. We can then look at the > patches if necessary or just pull in the branch straight away. > > Arnd > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel All makes sense now - thanks. Regards Tony P ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 2/4] arm: vt8500: Remove single platform Kconfig options 2012-12-27 23:20 [PATCH 0/4] arm: vt8500: Add new models and remove single-platform Tony Prisk 2012-12-27 23:20 ` [PATCH 1/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850 Tony Prisk @ 2012-12-27 23:20 ` Tony Prisk 2012-12-27 23:20 ` [PATCH 3/4] arm: vt8500: Convert debug-macro.S to be multiplatform friendly Tony Prisk 2012-12-27 23:20 ` [PATCH 4/4] arm: vt8500: Remove remaining mach includes Tony Prisk 3 siblings, 0 replies; 15+ messages in thread From: Tony Prisk @ 2012-12-27 23:20 UTC (permalink / raw) To: linux-arm-kernel This patch completes the move of arch-vt8500 to multiplatform only. The remaining single-image Kconfig options are removed from arch/arm/Kconfig and the options in arch/arm/mach-vt8500/Kconfig are updated. Signed-off-by: Tony Prisk <linux@prisktech.co.nz> --- arch/arm/Kconfig | 21 --------------------- arch/arm/mach-vt8500/Kconfig | 13 +++---------- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index fbb9492..76efd43 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -950,27 +950,6 @@ config ARCH_OMAP help Support for TI's OMAP platform (OMAP1/2/3/4). -config ARCH_VT8500_SINGLE - bool "VIA/WonderMedia 85xx" - select ARCH_VT8500 - select COMMON_CLK - select CPU_ARM926T - select MULTI_IRQ_HANDLER - select SPARSE_IRQ - select USE_OF - help - Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. - -config ARCH_WM8750_SINGLE - bool "WonderMedia WM8750/WM8850" - select ARCH_VT8500 - select COMMON_CLK - select MULTI_IRQ_HANDLER - select SPARSE_IRQ - select USE_OF - help - Support for WonderMedia WM8750/WM8850 System-on-Chip. - endchoice menu "Multiple platform selection" diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig index d67c7fa..f466b58 100644 --- a/arch/arm/mach-vt8500/Kconfig +++ b/arch/arm/mach-vt8500/Kconfig @@ -8,9 +8,8 @@ config ARCH_VT8500 select HAVE_CLK config ARCH_WM8505 - bool "VIA/WonderMedia 85xx" if !ARCH_VT8500_SINGLE + bool "VIA/WonderMedia 85xx" depends on ARCH_MULTI_V5 - default ARCH_VT8500_SINGLE select ARCH_VT8500 select CPU_ARM926T help @@ -18,7 +17,7 @@ config ARCH_WM8505 config ARCH_WM8750 bool "WonderMedia WM8750" - depends on ARCH_MULTI_V6 || ARCH_WM8750_SINGLE + depends on ARCH_MULTI_V6 select ARCH_VT8500 select CPU_V6 help @@ -26,14 +25,8 @@ config ARCH_WM8750 config ARCH_WM8850 bool "WonderMedia WM8850" - depends on ARCH_MULTI_V7 || ARCH_WM8750_SINGLE + depends on ARCH_MULTI_V7 select ARCH_VT8500 select CPU_V7 help Support for WonderMedia WM8850 System-on-Chip. - -# ensure that ARCH_WM8850 is on if ARCH_WM8750 is off -config ARCH_WM8850_AUTO - def_bool y - depends on ARCH_WM8750_SINGLE && !ARCH_WM8750 - select ARCH_WM8850 -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 3/4] arm: vt8500: Convert debug-macro.S to be multiplatform friendly 2012-12-27 23:20 [PATCH 0/4] arm: vt8500: Add new models and remove single-platform Tony Prisk 2012-12-27 23:20 ` [PATCH 1/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850 Tony Prisk 2012-12-27 23:20 ` [PATCH 2/4] arm: vt8500: Remove single platform Kconfig options Tony Prisk @ 2012-12-27 23:20 ` Tony Prisk 2012-12-28 4:21 ` Alexey Charkov 2012-12-27 23:20 ` [PATCH 4/4] arm: vt8500: Remove remaining mach includes Tony Prisk 3 siblings, 1 reply; 15+ messages in thread From: Tony Prisk @ 2012-12-27 23:20 UTC (permalink / raw) To: linux-arm-kernel This patch moves debug-macro.S from arm/mach-vt8500/include/mach to arm/include/debug/vt8500.S to provide multiplatform support. Minor style changes in code for readability. Signed-off-by: Tony Prisk <linux@prisktech.co.nz> --- arch/arm/Kconfig.debug | 8 ++++++ arch/arm/mach-vt8500/include/mach/debug-macro.S | 31 ----------------------- 2 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 arch/arm/mach-vt8500/include/mach/debug-macro.S diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 661030d..bbb0a67 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -412,6 +412,13 @@ choice of the tiles using the RS1 memory map, including all new A-class core tiles, FPGA-based SMMs and software models. + config DEBUG_VT8500_UART0 + bool "Use UART0 on VIA/Wondermedia SoCs" + depends on ARCH_VT8500 + help + This option selects UART0 on VIA/Wondermedia System-on-a-chip + devices, including VT8500, WM8505, WM8650 and WM8850. + config DEBUG_LL_UART_NONE bool "No low-level debugging UART" depends on !ARCH_MULTIPLATFORM @@ -506,6 +513,7 @@ config DEBUG_LL_INCLUDE default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1 default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \ DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 + default "debug/vt8500.S" if DEBUG_VT8500_UART0 default "debug/tegra.S" if DEBUG_TEGRA_UART default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1 default "mach/debug-macro.S" diff --git a/arch/arm/mach-vt8500/include/mach/debug-macro.S b/arch/arm/mach-vt8500/include/mach/debug-macro.S deleted file mode 100644 index ca292f2..0000000 --- a/arch/arm/mach-vt8500/include/mach/debug-macro.S +++ /dev/null @@ -1,31 +0,0 @@ -/* - * arch/arm/mach-vt8500/include/mach/debug-macro.S - * - * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> - * - * Debugging macro include header - * - * 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. - * -*/ - - .macro addruart, rp, rv, tmp - mov \rp, #0x00200000 - orr \rv, \rp, #0xf8000000 - orr \rp, \rp, #0xd8000000 - .endm - - .macro senduart,rd,rx - strb \rd, [\rx, #0] - .endm - - .macro busyuart,rd,rx -1001: ldr \rd, [\rx, #0x1c] - ands \rd, \rd, #0x2 - bne 1001b - .endm - - .macro waituart,rd,rx - .endm -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 3/4] arm: vt8500: Convert debug-macro.S to be multiplatform friendly 2012-12-27 23:20 ` [PATCH 3/4] arm: vt8500: Convert debug-macro.S to be multiplatform friendly Tony Prisk @ 2012-12-28 4:21 ` Alexey Charkov 2012-12-28 8:09 ` Tony Prisk 0 siblings, 1 reply; 15+ messages in thread From: Alexey Charkov @ 2012-12-28 4:21 UTC (permalink / raw) To: linux-arm-kernel On Dec 28, 2012 3:21 AM, "Tony Prisk" <linux@prisktech.co.nz> wrote: > > This patch moves debug-macro.S from arm/mach-vt8500/include/mach to > arm/include/debug/vt8500.S to provide multiplatform support. Hi Tony! Looks like you haven't included the new file. Best, Alexey -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121228/5390c721/attachment-0001.html> ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 3/4] arm: vt8500: Convert debug-macro.S to be multiplatform friendly 2012-12-28 4:21 ` Alexey Charkov @ 2012-12-28 8:09 ` Tony Prisk 0 siblings, 0 replies; 15+ messages in thread From: Tony Prisk @ 2012-12-28 8:09 UTC (permalink / raw) To: linux-arm-kernel On Fri, 2012-12-28 at 10:21 +0600, Alexey Charkov wrote: > > On Dec 28, 2012 3:21 AM, "Tony Prisk" <linux@prisktech.co.nz> wrote: > > > > This patch moves debug-macro.S from arm/mach-vt8500/include/mach to > > arm/include/debug/vt8500.S to provide multiplatform support. > > Hi Tony! > > Looks like you haven't included the new file. > > Best, > Alexey > Thanks Alexey, Resent as 3/4 v2. Regards Tony P ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 4/4] arm: vt8500: Remove remaining mach includes 2012-12-27 23:20 [PATCH 0/4] arm: vt8500: Add new models and remove single-platform Tony Prisk ` (2 preceding siblings ...) 2012-12-27 23:20 ` [PATCH 3/4] arm: vt8500: Convert debug-macro.S to be multiplatform friendly Tony Prisk @ 2012-12-27 23:20 ` Tony Prisk 3 siblings, 0 replies; 15+ messages in thread From: Tony Prisk @ 2012-12-27 23:20 UTC (permalink / raw) To: linux-arm-kernel Remove the last two mach-vt8500/include/mach headers as they are no longer required with multiplatform-only configuration. Signed-off-by: Tony Prisk <linux@prisktech.co.nz> --- arch/arm/mach-vt8500/include/mach/timex.h | 26 ----------------- arch/arm/mach-vt8500/include/mach/uncompress.h | 37 ------------------------ 2 files changed, 63 deletions(-) delete mode 100644 arch/arm/mach-vt8500/include/mach/timex.h delete mode 100644 arch/arm/mach-vt8500/include/mach/uncompress.h diff --git a/arch/arm/mach-vt8500/include/mach/timex.h b/arch/arm/mach-vt8500/include/mach/timex.h deleted file mode 100644 index 8487e4c..0000000 --- a/arch/arm/mach-vt8500/include/mach/timex.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * arch/arm/mach-vt8500/include/mach/timex.h - * - * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef MACH_TIMEX_H -#define MACH_TIMEX_H - -#define CLOCK_TICK_RATE (3000000) - -#endif /* MACH_TIMEX_H */ diff --git a/arch/arm/mach-vt8500/include/mach/uncompress.h b/arch/arm/mach-vt8500/include/mach/uncompress.h deleted file mode 100644 index e6e81fd..0000000 --- a/arch/arm/mach-vt8500/include/mach/uncompress.h +++ /dev/null @@ -1,37 +0,0 @@ -/* arch/arm/mach-vt8500/include/mach/uncompress.h - * - * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> - * - * Based on arch/arm/mach-dove/include/mach/uncompress.h - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ - -#define UART0_PHYS 0xd8200000 -#define UART0_ADDR(x) *(volatile unsigned char *)(UART0_PHYS + x) - -static void putc(const char c) -{ - while (UART0_ADDR(0x1c) & 0x2) - /* Tx busy, wait and poll */; - - UART0_ADDR(0) = c; -} - -static void flush(void) -{ -} - -/* - * nothing to do - */ -#define arch_decomp_setup() -#define arch_decomp_wdog() -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 0/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850
@ 2013-01-11 20:12 Tony Prisk
2013-01-11 20:12 ` [PATCH 3/4] arm: vt8500: Convert debug-macro.S to be multiplatform friendly Tony Prisk
0 siblings, 1 reply; 15+ messages in thread
From: Tony Prisk @ 2013-01-11 20:12 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565:
Linux 3.8-rc1 (2012-12-21 17:19:00 -0800)
are available in the git repository at:
git://server.prisktech.co.nz/git/linuxwmt.git tags/armsoc-3.9
for you to fetch changes up to 82c8f175662873f7f7f4c78698888ee963d7d967:
arm: vt8500: Remove remaining mach includes (2012-12-28 21:05:19 +1300)
----------------------------------------------------------------
arm: vt8500: Add support for WM8750/WM8850. Cleanup multiplatform changes
This patchset adds support for the WM8750 (ARMv6) and WM8850 (ARMv7), and
cleans up changes for multiplatform configuration.
Single platform Kconfig options are removed, along with the remaining
mach/includes.
The debug-macro.s is moved to arm/include/debug/ to allow DEBUG_LL on
multi-platform.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
----------------------------------------------------------------
Tony Prisk (4):
arm: vt8500: Add support for Wondermedia WM8750/WM8850
arm: vt8500: Remove single platform Kconfig options
arm: vt8500: Convert debug-macro.S to be multiplatform friendly
arm: vt8500: Remove remaining mach includes
Documentation/devicetree/bindings/arm/vt8500.txt | 8 +++++
arch/arm/Kconfig | 16 ---------
arch/arm/Kconfig.debug | 8 +++++
.../mach/debug-macro.S => include/debug/vt8500.S} | 24 ++++++++-----
arch/arm/mach-vt8500/Kconfig | 26 ++++++++++++--
arch/arm/mach-vt8500/include/mach/timex.h | 26 --------------
arch/arm/mach-vt8500/include/mach/uncompress.h | 37 --------------------
arch/arm/mach-vt8500/vt8500.c | 2 ++
8 files changed, 56 insertions(+), 91 deletions(-)
rename arch/arm/{mach-vt8500/include/mach/debug-macro.S => include/debug/vt8500.S} (56%)
delete mode 100644 arch/arm/mach-vt8500/include/mach/timex.h
delete mode 100644 arch/arm/mach-vt8500/include/mach/uncompress.h
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 3/4] arm: vt8500: Convert debug-macro.S to be multiplatform friendly 2013-01-11 20:12 [PATCH 0/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850 Tony Prisk @ 2013-01-11 20:12 ` Tony Prisk 0 siblings, 0 replies; 15+ messages in thread From: Tony Prisk @ 2013-01-11 20:12 UTC (permalink / raw) To: linux-arm-kernel This patch moves debug-macro.S from arm/mach-vt8500/include/mach to arm/include/debug/vt8500.S to provide multiplatform support. Minor style changes in code for readability. Signed-off-by: Tony Prisk <linux@prisktech.co.nz> --- arch/arm/Kconfig.debug | 8 +++++ arch/arm/include/debug/vt8500.S | 37 +++++++++++++++++++++++ arch/arm/mach-vt8500/include/mach/debug-macro.S | 31 ------------------- 3 files changed, 45 insertions(+), 31 deletions(-) create mode 100644 arch/arm/include/debug/vt8500.S delete mode 100644 arch/arm/mach-vt8500/include/mach/debug-macro.S diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 661030d..bbb0a67 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -412,6 +412,13 @@ choice of the tiles using the RS1 memory map, including all new A-class core tiles, FPGA-based SMMs and software models. + config DEBUG_VT8500_UART0 + bool "Use UART0 on VIA/Wondermedia SoCs" + depends on ARCH_VT8500 + help + This option selects UART0 on VIA/Wondermedia System-on-a-chip + devices, including VT8500, WM8505, WM8650 and WM8850. + config DEBUG_LL_UART_NONE bool "No low-level debugging UART" depends on !ARCH_MULTIPLATFORM @@ -506,6 +513,7 @@ config DEBUG_LL_INCLUDE default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1 default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \ DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 + default "debug/vt8500.S" if DEBUG_VT8500_UART0 default "debug/tegra.S" if DEBUG_TEGRA_UART default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1 default "mach/debug-macro.S" diff --git a/arch/arm/include/debug/vt8500.S b/arch/arm/include/debug/vt8500.S new file mode 100644 index 0000000..0e0ca08 --- /dev/null +++ b/arch/arm/include/debug/vt8500.S @@ -0,0 +1,37 @@ +/* + * Debugging macro include header + * + * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> + * Moved from arch/arm/mach-vt8500/include/mach/debug-macro.S + * Minor changes for readability. + * + * 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 DEBUG_LL_PHYS_BASE 0xD8000000 +#define DEBUG_LL_VIRT_BASE 0xF8000000 +#define DEBUG_LL_UART_OFFSET 0x00200000 + +#if defined(CONFIG_DEBUG_VT8500_UART0) + .macro addruart, rp, rv, tmp + mov \rp, #DEBUG_LL_UART_OFFSET + orr \rv, \rp, #DEBUG_LL_VIRT_BASE + orr \rp, \rp, #DEBUG_LL_PHYS_BASE + .endm + + .macro senduart,rd,rx + strb \rd, [\rx, #0] + .endm + + .macro busyuart,rd,rx +1001: ldr \rd, [\rx, #0x1c] + ands \rd, \rd, #0x2 + bne 1001b + .endm + + .macro waituart,rd,rx + .endm + +#endif diff --git a/arch/arm/mach-vt8500/include/mach/debug-macro.S b/arch/arm/mach-vt8500/include/mach/debug-macro.S deleted file mode 100644 index ca292f2..0000000 --- a/arch/arm/mach-vt8500/include/mach/debug-macro.S +++ /dev/null @@ -1,31 +0,0 @@ -/* - * arch/arm/mach-vt8500/include/mach/debug-macro.S - * - * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> - * - * Debugging macro include header - * - * 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. - * -*/ - - .macro addruart, rp, rv, tmp - mov \rp, #0x00200000 - orr \rv, \rp, #0xf8000000 - orr \rp, \rp, #0xd8000000 - .endm - - .macro senduart,rd,rx - strb \rd, [\rx, #0] - .endm - - .macro busyuart,rd,rx -1001: ldr \rd, [\rx, #0x1c] - ands \rd, \rd, #0x2 - bne 1001b - .endm - - .macro waituart,rd,rx - .endm -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2013-01-11 20:12 UTC | newest] Thread overview: 15+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-12-27 23:20 [PATCH 0/4] arm: vt8500: Add new models and remove single-platform Tony Prisk 2012-12-27 23:20 ` [PATCH 1/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850 Tony Prisk 2013-01-09 6:13 ` Tony Prisk 2013-01-09 6:30 ` Olof Johansson 2013-01-09 19:09 ` Tony Prisk 2013-01-09 21:27 ` Arnd Bergmann 2013-01-10 2:03 ` Tony Prisk 2013-01-10 10:21 ` Arnd Bergmann 2013-01-10 18:32 ` Tony Prisk 2012-12-27 23:20 ` [PATCH 2/4] arm: vt8500: Remove single platform Kconfig options Tony Prisk 2012-12-27 23:20 ` [PATCH 3/4] arm: vt8500: Convert debug-macro.S to be multiplatform friendly Tony Prisk 2012-12-28 4:21 ` Alexey Charkov 2012-12-28 8:09 ` Tony Prisk 2012-12-27 23:20 ` [PATCH 4/4] arm: vt8500: Remove remaining mach includes Tony Prisk -- strict thread matches above, loose matches on Subject: below -- 2013-01-11 20:12 [PATCH 0/4] arm: vt8500: Add support for Wondermedia WM8750/WM8850 Tony Prisk 2013-01-11 20:12 ` [PATCH 3/4] arm: vt8500: Convert debug-macro.S to be multiplatform friendly Tony Prisk
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).