combine zoom board-files
Subsystems (3)
cover combine zoom board-files
Those boards are so similar they don't deserve
separate board files.
Felipe Balbi (2):
arm: omap: combine zoom2 and zoom3 board-files
arm: omap: zoom: substitute gpio number with symbolic name
arch/arm/mach-omap2/Makefile | 4 +-
.../arm/mach-omap2/{board-zoom3.c => board-zoom.c} | 104 ++++++++++-------
arch/arm/mach-omap2/board-zoom2.c | 117 --------------------
3 files changed, 64 insertions(+), 161 deletions(-)
rename arch/arm/mach-omap2/{board-zoom3.c => board-zoom.c} (75%)
delete mode 100644 arch/arm/mach-omap2/board-zoom2.cSignature · 1 line
1.7.3.2.146.gca209
PATCH 1/2 arm: omap: combine zoom2 and zoom3 board-files
They are extremely similar anyway, let's get rid
of one file.
While at that, also remove the empty zoom_config
variable.
---
arch/arm/mach-omap2/Makefile | 4 +-
.../arm/mach-omap2/{board-zoom3.c => board-zoom.c} | 100 ++++++++++-------
arch/arm/mach-omap2/board-zoom2.c | 117 --------------------
3 files changed, 61 insertions(+), 160 deletions(-)
rename arch/arm/mach-omap2/{board-zoom3.c => board-zoom.c} (77%)
delete mode 100644 arch/arm/mach-omap2/board-zoom2.carch/arm/mach-omap2/Makefile +2 -2
@@ -144,12 +144,12 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ board-rx51-peripherals.o \ board-rx51-video.o \ hsmmc.o -obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \ +obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom.o \ board-zoom-peripherals.o \ board-flash.o \ hsmmc.o \ board-zoom-debugboard.o -obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom3.o \ +obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom.o \ board-zoom-peripherals.o \ board-flash.o \ hsmmc.o \
arch/arm/mach-omap2/board-zoom.c renamed from arch/arm/mach-omap2/board-zoom3.c +59 -41
140 lines not on this page · raw message
arch/arm/mach-omap2/board-zoom2.c deleted +0 -117
117 lines not on this page · raw message
Signature · 1 line
1.7.3.2.146.gca209
PATCH 2/2 arm: omap: zoom: substitute gpio number with symbolic name
In reply to Felipe BalbiIt's easier to understand what that number means and also avoids problems if we ever have to change it.
--- arch/arm/mach-omap2/board-zoom.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/board-zoom.c +4 -2
@@ -31,6 +31,8 @@#include "sdram-micron-mt46h32m32lf-6.h" #include "sdram-hynix-h8mbx00u0mer-0em.h" +#define ZOOM3_EHCI_RESET_GPIO 64 +static void __init omap_zoom_init_irq (void ) {if (machine_is_omap_zoom2 ())
@@ -112,7 +114,7 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN, .phy_reset = true, .reset_gpio_port[0] = -EINVAL, - .reset_gpio_port[1] = 64, + .reset_gpio_port[1] = ZOOM3_EHCI_RESET_GPIO, .reset_gpio_port[2] = -EINVAL, };
@@ -122,7 +124,7 @@ static void __init omap_zoom_init(void)omap3_mux_init (board_mux,OMAP_PACKAGE_CBB ); }else if (machine_is_omap_zoom3 ()) {omap3_mux_init (board_mux,OMAP_PACKAGE_CBP ); -omap_mux_init_gpio (64 ,OMAP_PIN_OUTPUT ); +omap_mux_init_gpio (ZOOM3_EHCI_RESET_GPIO ,OMAP_PIN_OUTPUT );usb_ehci_init (&ehci_pdata); }
Signature · 1 line
1.7.3.2.146.gca209
Tony Lindgren
maintainercover combine zoom board-files
In reply to Felipe BalbiQuoted 7 lines · Felipe Balbi
Those boards are so similar they don't deserve
separate board files.Felipe Balbi (2):
arm: omap: combine zoom2 and zoom3 board-files
arm: omap: zoom: substitute gpio number with symbolic name
Quoted 6 lines
arch/arm/mach-omap2/Makefile | 4 +-
.../arm/mach-omap2/{board-zoom3.c => board-zoom.c} | 104 ++++++++++-------
arch/arm/mach-omap2/board-zoom2.c | 117 --------------------
3 files changed, 64 insertions(+), 161 deletions(-)
rename arch/arm/mach-omap2/{board-zoom3.c => board-zoom.c} (75%)
delete mode 100644 arch/arm/mach-omap2/board-zoom2.cThanks, queuing both for 2.6.38 merge window.
Tony