* [PATCH 1/4] vt8500: Remove unused headers from include/mach/
2012-10-07 1:02 [PATCH 0/4] arm-soc: vt8500: Cleanup patches for 3.7 Tony Prisk
@ 2012-10-07 1:02 ` Tony Prisk
2012-10-07 1:02 ` [PATCH 2/4] vt8500: Remove arm/boot/compressed/head-vt8500.S Tony Prisk
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Tony Prisk @ 2012-10-07 1:02 UTC (permalink / raw)
To: linux-arm-kernel
Remove restart.h and reference in vt8500.c - unused.
Remove hardware.h - empty and now optional.
Remove i8042.h - not supported now that devicetree-only.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
arch/arm/mach-vt8500/include/mach/hardware.h | 12 ------------
arch/arm/mach-vt8500/include/mach/i8042.h | 18 ------------------
arch/arm/mach-vt8500/include/mach/restart.h | 17 -----------------
arch/arm/mach-vt8500/vt8500.c | 2 --
4 files changed, 49 deletions(-)
delete mode 100644 arch/arm/mach-vt8500/include/mach/hardware.h
delete mode 100644 arch/arm/mach-vt8500/include/mach/i8042.h
delete mode 100644 arch/arm/mach-vt8500/include/mach/restart.h
diff --git a/arch/arm/mach-vt8500/include/mach/hardware.h b/arch/arm/mach-vt8500/include/mach/hardware.h
deleted file mode 100644
index db4163f..0000000
--- a/arch/arm/mach-vt8500/include/mach/hardware.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* arch/arm/mach-vt8500/include/mach/hardware.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.
- *
- */
diff --git a/arch/arm/mach-vt8500/include/mach/i8042.h b/arch/arm/mach-vt8500/include/mach/i8042.h
deleted file mode 100644
index cd7143c..0000000
--- a/arch/arm/mach-vt8500/include/mach/i8042.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* arch/arm/mach-vt8500/include/mach/i8042.h
- *
- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
- *
- * 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.
- *
- */
-
-extern unsigned long wmt_i8042_base __initdata;
-extern int wmt_i8042_kbd_irq;
-extern int wmt_i8042_aux_irq;
diff --git a/arch/arm/mach-vt8500/include/mach/restart.h b/arch/arm/mach-vt8500/include/mach/restart.h
deleted file mode 100644
index 7389795..0000000
--- a/arch/arm/mach-vt8500/include/mach/restart.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* linux/arch/arm/mach-vt8500/restart.h
- *
- * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>
- *
- * 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.
- *
- */
-
-void vt8500_setup_restart(void);
-void vt8500_restart(char mode, const char *cmd);
diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c
index 587ea95..7449886 100644
--- a/arch/arm/mach-vt8500/vt8500.c
+++ b/arch/arm/mach-vt8500/vt8500.c
@@ -31,8 +31,6 @@
#include <linux/of_irq.h>
#include <linux/of_platform.h>
-#include <mach/restart.h>
-
#include "common.h"
#define LEGACY_GPIO_BASE 0xD8110000
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/4] vt8500: Remove arm/boot/compressed/head-vt8500.S
2012-10-07 1:02 [PATCH 0/4] arm-soc: vt8500: Cleanup patches for 3.7 Tony Prisk
2012-10-07 1:02 ` [PATCH 1/4] vt8500: Remove unused headers from include/mach/ Tony Prisk
@ 2012-10-07 1:02 ` Tony Prisk
2012-10-07 1:02 ` [PATCH 3/4] vt8500: Fix header in mach-vt8500/timer.c Tony Prisk
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Tony Prisk @ 2012-10-07 1:02 UTC (permalink / raw)
To: linux-arm-kernel
Converting arch-vt8500 to devicetree-only makes this file redundant.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
arch/arm/boot/compressed/Makefile | 4 ---
arch/arm/boot/compressed/head-vt8500.S | 46 --------------------------------
2 files changed, 50 deletions(-)
delete mode 100644 arch/arm/boot/compressed/head-vt8500.S
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index bb26756..0bc7a16 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -50,10 +50,6 @@ ifeq ($(CONFIG_ARCH_SA1100),y)
OBJS += head-sa1100.o
endif
-ifeq ($(CONFIG_ARCH_VT8500),y)
-OBJS += head-vt8500.o
-endif
-
ifeq ($(CONFIG_CPU_XSCALE),y)
OBJS += head-xscale.o
endif
diff --git a/arch/arm/boot/compressed/head-vt8500.S b/arch/arm/boot/compressed/head-vt8500.S
deleted file mode 100644
index 1dc1e21..0000000
--- a/arch/arm/boot/compressed/head-vt8500.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * linux/arch/arm/boot/compressed/head-vt8500.S
- *
- * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
- *
- * VIA VT8500 specific tweaks. This is merged into head.S by the linker.
- *
- */
-
-#include <linux/linkage.h>
-#include <asm/mach-types.h>
-
- .section ".start", "ax"
-
-__VT8500_start:
- @ Compare the SCC ID register against a list of known values
- ldr r1, .SCCID
- ldr r3, [r1]
-
- @ VT8500 override
- ldr r4, .VT8500SCC
- cmp r3, r4
- ldreq r7, .ID_BV07
- beq .Lendvt8500
-
- @ WM8505 override
- ldr r4, .WM8505SCC
- cmp r3, r4
- ldreq r7, .ID_8505
- beq .Lendvt8500
-
- @ Otherwise, leave the bootloader's machine id untouched
-
-.SCCID:
- .word 0xd8120000
-.VT8500SCC:
- .word 0x34000102
-.WM8505SCC:
- .word 0x34260103
-
-.ID_BV07:
- .word MACH_TYPE_BV07
-.ID_8505:
- .word MACH_TYPE_WM8505_7IN_NETBOOK
-
-.Lendvt8500:
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/4] vt8500: Fix header in mach-vt8500/timer.c
2012-10-07 1:02 [PATCH 0/4] arm-soc: vt8500: Cleanup patches for 3.7 Tony Prisk
2012-10-07 1:02 ` [PATCH 1/4] vt8500: Remove unused headers from include/mach/ Tony Prisk
2012-10-07 1:02 ` [PATCH 2/4] vt8500: Remove arm/boot/compressed/head-vt8500.S Tony Prisk
@ 2012-10-07 1:02 ` Tony Prisk
2012-10-07 1:02 ` [PATCH 4/4] vt8500: Fix build warning when no framebuffer selected Tony Prisk
2012-10-07 11:23 ` [PATCH 0/4] arm-soc: vt8500: Cleanup patches for 3.7 Arnd Bergmann
4 siblings, 0 replies; 9+ messages in thread
From: Tony Prisk @ 2012-10-07 1:02 UTC (permalink / raw)
To: linux-arm-kernel
Correct filename reference in file header.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
arch/arm/mach-vt8500/timer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-vt8500/timer.c b/arch/arm/mach-vt8500/timer.c
index 050e183..3dd21a4 100644
--- a/arch/arm/mach-vt8500/timer.c
+++ b/arch/arm/mach-vt8500/timer.c
@@ -1,5 +1,5 @@
/*
- * arch/arm/mach-vt8500/timer_dt.c
+ * arch/arm/mach-vt8500/timer.c
*
* Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>
* Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/4] vt8500: Fix build warning when no framebuffer selected
2012-10-07 1:02 [PATCH 0/4] arm-soc: vt8500: Cleanup patches for 3.7 Tony Prisk
` (2 preceding siblings ...)
2012-10-07 1:02 ` [PATCH 3/4] vt8500: Fix header in mach-vt8500/timer.c Tony Prisk
@ 2012-10-07 1:02 ` Tony Prisk
2012-10-07 11:23 ` [PATCH 0/4] arm-soc: vt8500: Cleanup patches for 3.7 Arnd Bergmann
4 siblings, 0 replies; 9+ messages in thread
From: Tony Prisk @ 2012-10-07 1:02 UTC (permalink / raw)
To: linux-arm-kernel
Check for framebuffer defines before declaring variables in vt8500.c
Removes a compile-time warning about unused variables.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
arch/arm/mach-vt8500/vt8500.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c
index 7449886..a5bd286 100644
--- a/arch/arm/mach-vt8500/vt8500.c
+++ b/arch/arm/mach-vt8500/vt8500.c
@@ -75,8 +75,11 @@ static void vt8500_power_off(void)
void __init vt8500_init(void)
{
- struct device_node *np, *fb;
+ struct device_node *np;
+#if defined(CONFIG_FB_VT8500) || defined(CONFIG_FB_WM8505)
+ struct device_node *fb;
void __iomem *gpio_base;
+#endif
#ifdef CONFIG_FB_VT8500
fb = of_find_compatible_node(NULL, NULL, "via,vt8500-fb");
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 0/4] arm-soc: vt8500: Cleanup patches for 3.7
2012-10-07 1:02 [PATCH 0/4] arm-soc: vt8500: Cleanup patches for 3.7 Tony Prisk
` (3 preceding siblings ...)
2012-10-07 1:02 ` [PATCH 4/4] vt8500: Fix build warning when no framebuffer selected Tony Prisk
@ 2012-10-07 11:23 ` Arnd Bergmann
2012-10-07 14:19 ` Olof Johansson
2012-10-07 18:14 ` Tony Prisk
4 siblings, 2 replies; 9+ messages in thread
From: Arnd Bergmann @ 2012-10-07 11:23 UTC (permalink / raw)
To: linux-arm-kernel
On Sunday 07 October 2012, Tony Prisk wrote:
> Minor cleanup patches for 3.7.
>
> Tony Prisk (4):
> vt8500: Remove unused headers from include/mach/
> vt8500: Remove arm/boot/compressed/head-vt8500.S
> vt8500: Fix header in mach-vt8500/timer.c
> vt8500: Fix build warning when no framebuffer selected
Hi Tony,
The patches all look good, but they are late for 3.7 now. I would
still take the last one since that fixes a build warning, and the
separate patch that adds the .dtb files to the Makefile, but leave
the other ones for 3.8, unless there is a strong reason to
still include them.
Arnd
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 0/4] arm-soc: vt8500: Cleanup patches for 3.7
2012-10-07 11:23 ` [PATCH 0/4] arm-soc: vt8500: Cleanup patches for 3.7 Arnd Bergmann
@ 2012-10-07 14:19 ` Olof Johansson
2012-10-07 18:14 ` Tony Prisk
1 sibling, 0 replies; 9+ messages in thread
From: Olof Johansson @ 2012-10-07 14:19 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Oct 07, 2012 at 11:23:39AM +0000, Arnd Bergmann wrote:
> On Sunday 07 October 2012, Tony Prisk wrote:
> > Minor cleanup patches for 3.7.
> >
> > Tony Prisk (4):
> > vt8500: Remove unused headers from include/mach/
> > vt8500: Remove arm/boot/compressed/head-vt8500.S
> > vt8500: Fix header in mach-vt8500/timer.c
> > vt8500: Fix build warning when no framebuffer selected
>
> Hi Tony,
>
> The patches all look good, but they are late for 3.7 now. I would
> still take the last one since that fixes a build warning, and the
> separate patch that adds the .dtb files to the Makefile, but leave
> the other ones for 3.8, unless there is a strong reason to
> still include them.
Yep, agreed. I applied the last one to fixes and will include it in the next
pull. The rest we can bring in once -rc1 is out and we start staging branches
for 3.8.
Thanks Tony!
-Olof
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 0/4] arm-soc: vt8500: Cleanup patches for 3.7
2012-10-07 11:23 ` [PATCH 0/4] arm-soc: vt8500: Cleanup patches for 3.7 Arnd Bergmann
2012-10-07 14:19 ` Olof Johansson
@ 2012-10-07 18:14 ` Tony Prisk
2012-10-07 18:21 ` Olof Johansson
1 sibling, 1 reply; 9+ messages in thread
From: Tony Prisk @ 2012-10-07 18:14 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, 2012-10-07 at 11:23 +0000, Arnd Bergmann wrote:
> On Sunday 07 October 2012, Tony Prisk wrote:
> > Minor cleanup patches for 3.7.
> >
> > Tony Prisk (4):
> > vt8500: Remove unused headers from include/mach/
> > vt8500: Remove arm/boot/compressed/head-vt8500.S
> > vt8500: Fix header in mach-vt8500/timer.c
> > vt8500: Fix build warning when no framebuffer selected
>
> Hi Tony,
>
> The patches all look good, but they are late for 3.7 now. I would
> still take the last one since that fixes a build warning, and the
> separate patch that adds the .dtb files to the Makefile, but leave
> the other ones for 3.8, unless there is a strong reason to
> still include them.
>
> Arnd
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Just to clarify,
Is it only bug-fixes, not cleanup that are being accepted during the
merge-window?
Regards
Tony P
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 0/4] arm-soc: vt8500: Cleanup patches for 3.7
2012-10-07 18:14 ` Tony Prisk
@ 2012-10-07 18:21 ` Olof Johansson
0 siblings, 0 replies; 9+ messages in thread
From: Olof Johansson @ 2012-10-07 18:21 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Oct 7, 2012 at 11:14 AM, Tony Prisk <linux@prisktech.co.nz> wrote:
> On Sun, 2012-10-07 at 11:23 +0000, Arnd Bergmann wrote:
>> On Sunday 07 October 2012, Tony Prisk wrote:
>> > Minor cleanup patches for 3.7.
>> >
>> > Tony Prisk (4):
>> > vt8500: Remove unused headers from include/mach/
>> > vt8500: Remove arm/boot/compressed/head-vt8500.S
>> > vt8500: Fix header in mach-vt8500/timer.c
>> > vt8500: Fix build warning when no framebuffer selected
>>
>> Hi Tony,
>>
>> The patches all look good, but they are late for 3.7 now. I would
>> still take the last one since that fixes a build warning, and the
>> separate patch that adds the .dtb files to the Makefile, but leave
>> the other ones for 3.8, unless there is a strong reason to
>> still include them.
>>
>> Arnd
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel at lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
> Just to clarify,
>
> Is it only bug-fixes, not cleanup that are being accepted during the
> merge-window?
During the merge window, code goes in from the maintainer trees into
Linus' tree. So code you want included in the next merge window should
be in arm-soc before the window starts. So per definition, if you send
_us_ code during the merge window then yes, it should be bugfixes.
Bugfixes can go in through the rest of the release cycle. As we go
further down the -rcs, we will get pickier on what bugfixes we let in,
but during the first rc or so, we're a bit more flexible. After that,
mostly regression fixes, etc -- if something has been broken for two
years, there's no urgent need to get it into the very last -rc in many
cases, for example.
-Olof
^ permalink raw reply [flat|nested] 9+ messages in thread