arm-soc: vt8500: Cleanup patches for 3.7

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

 arch/arm/boot/compressed/Makefile            |    4 ---
 arch/arm/boot/compressed/head-vt8500.S       |   46 --------------------------
 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/timer.c                 |    2 +-
 arch/arm/mach-vt8500/vt8500.c                |    7 ++--
 7 files changed, 5 insertions(+), 101 deletions(-)
 delete mode 100644 arch/arm/boot/compressed/head-vt8500.S
 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

1.7.9.5

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.

---
 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

deleted file mode 100644
index db4163f..0000000
@@ -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.
- *
- */

deleted file mode 100644
index cd7143c..0000000
@@ -1,18 +0,0 @@
-/* arch/arm/mach-vt8500/include/mach/i8042.h
- *
- * Copyright (C) 2010 Alexey Charkov <[email protected]>
- *
- * 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;

deleted file mode 100644
index 7389795..0000000
@@ -1,17 +0,0 @@
-/* linux/arch/arm/mach-vt8500/restart.h
- *
- * Copyright (C) 2012 Tony Prisk <[email protected]>
- *
- * 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);

index 587ea95..7449886 100644
@@ -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

Converting arch-vt8500 to devicetree-only makes this file redundant.

---
 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

index bb26756..0bc7a16 100644
@@ -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

1.7.9.5

Correct filename reference in file header.

---
 arch/arm/mach-vt8500/timer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 050e183..3dd21a4 100644
@@ -1,5 +1,5 @@
 /*
- *  arch/arm/mach-vt8500/timer_dt.c
+ *  arch/arm/mach-vt8500/timer.c
  *
  *  Copyright (C) 2012 Tony Prisk <[email protected]>
  *  Copyright (C) 2010 Alexey Charkov <[email protected]>

1.7.9.5

Check for framebuffer defines before declaring variables in vt8500.c Removes a compile-time warning about unused variables.

---
 arch/arm/mach-vt8500/vt8500.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

index 7449886..a5bd286 100644
@@ -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

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

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

Just to clarify,

Is it only bug-fixes, not cleanup that are being accepted during the merge-window?

Regards
Tony P

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