Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 279977
b: refs/heads/master
c: 271a74f
h: refs/heads/master
i:
  279975: 1ef61e6
v: v3
  • Loading branch information
Russell King committed Jan 5, 2012
1 parent 7767151 commit 6abd4f2
Show file tree
Hide file tree
Showing 53 changed files with 96 additions and 29 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 125c4033f0187d7264f08d7cf1474252df4f4c17
refs/heads/master: 271a74fc875210d3dfcc03d557fb5d86d3990a0f
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-pxa/balloon3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -829,4 +829,5 @@ MACHINE_START(BALLOON3, "Balloon3")
.timer = &pxa_timer,
.init_machine = balloon3_init,
.atag_offset = 0x100,
.restart = pxa_restart,
MACHINE_END
3 changes: 2 additions & 1 deletion trunk/arch/arm/mach-pxa/capc7117.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,5 +153,6 @@ MACHINE_START(CAPC7117,
.init_irq = pxa3xx_init_irq,
.handle_irq = pxa3xx_handle_irq,
.timer = &pxa_timer,
.init_machine = capc7117_init
.init_machine = capc7117_init,
.restart = pxa_restart,
MACHINE_END
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-pxa/cm-x2xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,4 +524,5 @@ MACHINE_START(ARMCORE, "Compulab CM-X2XX")
#ifdef CONFIG_PCI
.dma_zone_size = SZ_64M,
#endif
.restart = pxa_restart,
MACHINE_END
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-pxa/cm-x300.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -858,4 +858,5 @@ MACHINE_START(CM_X300, "CM-X300 module")
.timer = &pxa_timer,
.init_machine = cm_x300_init,
.fixup = cm_x300_fixup,
.restart = pxa_restart,
MACHINE_END
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-pxa/colibri-pxa270.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ MACHINE_START(COLIBRI, "Toradex Colibri PXA270")
.init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
.restart = pxa_restart,
MACHINE_END

MACHINE_START(INCOME, "Income s.r.o. SH-Dmaster PXA270 SBC")
Expand All @@ -322,5 +323,6 @@ MACHINE_START(INCOME, "Income s.r.o. SH-Dmaster PXA270 SBC")
.init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
.restart = pxa_restart,
MACHINE_END

1 change: 1 addition & 0 deletions trunk/arch/arm/mach-pxa/colibri-pxa300.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,5 +189,6 @@ MACHINE_START(COLIBRI300, "Toradex Colibri PXA300")
.init_irq = pxa3xx_init_irq,
.handle_irq = pxa3xx_handle_irq,
.timer = &pxa_timer,
.restart = pxa_restart,
MACHINE_END

1 change: 1 addition & 0 deletions trunk/arch/arm/mach-pxa/colibri-pxa320.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,5 +259,6 @@ MACHINE_START(COLIBRI320, "Toradex Colibri PXA320")
.init_irq = pxa3xx_init_irq,
.handle_irq = pxa3xx_handle_irq,
.timer = &pxa_timer,
.restart = pxa_restart,
MACHINE_END

8 changes: 5 additions & 3 deletions trunk/arch/arm/mach-pxa/corgi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ static void corgi_poweroff(void)
/* Green LED off tells the bootloader to halt */
gpio_set_value(CORGI_GPIO_LED_GREEN, 0);

arm_machine_restart('h', NULL);
pxa_restart('h', NULL);
}

static void corgi_restart(char mode, const char *cmd)
Expand All @@ -664,13 +664,12 @@ static void corgi_restart(char mode, const char *cmd)
/* Green LED on tells the bootloader to reboot */
gpio_set_value(CORGI_GPIO_LED_GREEN, 1);

arm_machine_restart('h', cmd);
pxa_restart('h', cmd);
}

static void __init corgi_init(void)
{
pm_power_off = corgi_poweroff;
arm_pm_restart = corgi_restart;

/* Stop 3.6MHz and drive HIGH to PCMCIA and CS */
PCFR |= PCFR_OPDE;
Expand Down Expand Up @@ -726,6 +725,7 @@ MACHINE_START(CORGI, "SHARP Corgi")
.handle_irq = pxa25x_handle_irq,
.init_machine = corgi_init,
.timer = &pxa_timer,
.restart = corgi_restart,
MACHINE_END
#endif

Expand All @@ -737,6 +737,7 @@ MACHINE_START(SHEPHERD, "SHARP Shepherd")
.handle_irq = pxa25x_handle_irq,
.init_machine = corgi_init,
.timer = &pxa_timer,
.restart = corgi_restart,
MACHINE_END
#endif

Expand All @@ -748,6 +749,7 @@ MACHINE_START(HUSKY, "SHARP Husky")
.handle_irq = pxa25x_handle_irq,
.init_machine = corgi_init,
.timer = &pxa_timer,
.restart = corgi_restart,
MACHINE_END
#endif

1 change: 1 addition & 0 deletions trunk/arch/arm/mach-pxa/csb726.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,4 +278,5 @@ MACHINE_START(CSB726, "Cogent CSB726")
.handle_irq = pxa27x_handle_irq,
.init_machine = csb726_init,
.timer = &pxa_timer,
.restart = pxa_restart,
MACHINE_END
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-pxa/em-x270.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1305,6 +1305,7 @@ MACHINE_START(EM_X270, "Compulab EM-X270")
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
.init_machine = em_x270_init,
.restart = pxa_restart,
MACHINE_END

MACHINE_START(EXEDA, "Compulab eXeda")
Expand All @@ -1314,4 +1315,5 @@ MACHINE_START(EXEDA, "Compulab eXeda")
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
.init_machine = em_x270_init,
.restart = pxa_restart,
MACHINE_END
6 changes: 6 additions & 0 deletions trunk/arch/arm/mach-pxa/eseries.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ MACHINE_START(E330, "Toshiba e330")
.fixup = eseries_fixup,
.init_machine = e330_init,
.timer = &pxa_timer,
.restart = pxa_restart,
MACHINE_END
#endif

Expand Down Expand Up @@ -246,6 +247,7 @@ MACHINE_START(E350, "Toshiba e350")
.fixup = eseries_fixup,
.init_machine = e350_init,
.timer = &pxa_timer,
.restart = pxa_restart,
MACHINE_END
#endif

Expand Down Expand Up @@ -369,6 +371,7 @@ MACHINE_START(E400, "Toshiba e400")
.fixup = eseries_fixup,
.init_machine = e400_init,
.timer = &pxa_timer,
.restart = pxa_restart,
MACHINE_END
#endif

Expand Down Expand Up @@ -558,6 +561,7 @@ MACHINE_START(E740, "Toshiba e740")
.fixup = eseries_fixup,
.init_machine = e740_init,
.timer = &pxa_timer,
.restart = pxa_restart,
MACHINE_END
#endif

Expand Down Expand Up @@ -750,6 +754,7 @@ MACHINE_START(E750, "Toshiba e750")
.fixup = eseries_fixup,
.init_machine = e750_init,
.timer = &pxa_timer,
.restart = pxa_restart,
MACHINE_END
#endif

Expand Down Expand Up @@ -955,5 +960,6 @@ MACHINE_START(E800, "Toshiba e800")
.fixup = eseries_fixup,
.init_machine = e800_init,
.timer = &pxa_timer,
.restart = pxa_restart,
MACHINE_END
#endif
6 changes: 6 additions & 0 deletions trunk/arch/arm/mach-pxa/ezx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,7 @@ MACHINE_START(EZX_A780, "Motorola EZX A780")
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
.init_machine = a780_init,
.restart = pxa_restart,
MACHINE_END
#endif

Expand Down Expand Up @@ -870,6 +871,7 @@ MACHINE_START(EZX_E680, "Motorola EZX E680")
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
.init_machine = e680_init,
.restart = pxa_restart,
MACHINE_END
#endif

Expand Down Expand Up @@ -936,6 +938,7 @@ MACHINE_START(EZX_A1200, "Motorola EZX A1200")
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
.init_machine = a1200_init,
.restart = pxa_restart,
MACHINE_END
#endif

Expand Down Expand Up @@ -1127,6 +1130,7 @@ MACHINE_START(EZX_A910, "Motorola EZX A910")
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
.init_machine = a910_init,
.restart = pxa_restart,
MACHINE_END
#endif

Expand Down Expand Up @@ -1193,6 +1197,7 @@ MACHINE_START(EZX_E6, "Motorola EZX E6")
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
.init_machine = e6_init,
.restart = pxa_restart,
MACHINE_END
#endif

Expand Down Expand Up @@ -1233,5 +1238,6 @@ MACHINE_START(EZX_E2, "Motorola EZX E2")
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
.init_machine = e2_init,
.restart = pxa_restart,
MACHINE_END
#endif
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-pxa/generic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,5 @@ void __init pxa_set_ffuart_info(void *info);
void __init pxa_set_btuart_info(void *info);
void __init pxa_set_stuart_info(void *info);
void __init pxa_set_hwuart_info(void *info);

void pxa_restart(char, const char *);
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-pxa/gumstix.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,4 +239,5 @@ MACHINE_START(GUMSTIX, "Gumstix")
.handle_irq = pxa25x_handle_irq,
.timer = &pxa_timer,
.init_machine = gumstix_init,
.restart = pxa_restart,
MACHINE_END
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-pxa/h5000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,5 @@ MACHINE_START(H5400, "HP iPAQ H5000")
.handle_irq = pxa25x_handle_irq,
.timer = &pxa_timer,
.init_machine = h5000_init,
.restart = pxa_restart,
MACHINE_END
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-pxa/himalaya.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,4 +164,5 @@ MACHINE_START(HIMALAYA, "HTC Himalaya")
.handle_irq = pxa25x_handle_irq,
.init_machine = himalaya_init,
.timer = &pxa_timer,
.restart = pxa_restart,
MACHINE_END
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-pxa/hx4700.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -845,4 +845,5 @@ MACHINE_START(H4700, "HP iPAQ HX4700")
.handle_irq = pxa27x_handle_irq,
.init_machine = hx4700_init,
.timer = &pxa_timer,
.restart = pxa_restart,
MACHINE_END
3 changes: 2 additions & 1 deletion trunk/arch/arm/mach-pxa/icontrol.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,5 +196,6 @@ MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM")
.init_irq = pxa3xx_init_irq,
.handle_irq = pxa3xx_handle_irq,
.timer = &pxa_timer,
.init_machine = icontrol_init
.init_machine = icontrol_init,
.restart = pxa_restart,
MACHINE_END
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-pxa/idp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,5 @@ MACHINE_START(PXA_IDP, "Vibren PXA255 IDP")
.handle_irq = pxa25x_handle_irq,
.timer = &pxa_timer,
.init_machine = idp_init,
.restart = pxa_restart,
MACHINE_END
10 changes: 3 additions & 7 deletions trunk/arch/arm/mach-pxa/include/mach/system.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,11 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/

#include <asm/proc-fns.h>
#include "hardware.h"
#include "pxa2xx-regs.h"

static inline void arch_idle(void)
{
cpu_do_idle();
}


void arch_reset(char mode, const char *cmd);
static inline void arch_reset(char mode, const char *cmd)
{
}
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-pxa/littleton.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,4 +445,5 @@ MACHINE_START(LITTLETON, "Marvell Form Factor Development Platform (aka Littleto
.handle_irq = pxa3xx_handle_irq,
.timer = &pxa_timer,
.init_machine = littleton_init,
.restart = pxa_restart,
MACHINE_END
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-pxa/lpd270.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -505,4 +505,5 @@ MACHINE_START(LOGICPD_PXA270, "LogicPD PXA270 Card Engine")
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
.init_machine = lpd270_init,
.restart = pxa_restart,
MACHINE_END
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-pxa/lubbock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,4 +556,5 @@ MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)")
.handle_irq = pxa25x_handle_irq,
.timer = &pxa_timer,
.init_machine = lubbock_init,
.restart = pxa_restart,
MACHINE_END
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-pxa/magician.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -760,4 +760,5 @@ MACHINE_START(MAGICIAN, "HTC Magician")
.handle_irq = pxa27x_handle_irq,
.init_machine = magician_init,
.timer = &pxa_timer,
.restart = pxa_restart,
MACHINE_END
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-pxa/mainstone.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -622,4 +622,5 @@ MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)")
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
.init_machine = mainstone_init,
.restart = pxa_restart,
MACHINE_END
6 changes: 3 additions & 3 deletions trunk/arch/arm/mach-pxa/mioa701.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -696,13 +696,13 @@ static void mioa701_machine_exit(void);
static void mioa701_poweroff(void)
{
mioa701_machine_exit();
arm_machine_restart('s', NULL);
pxa_restart('s', NULL);
}

static void mioa701_restart(char c, const char *cmd)
{
mioa701_machine_exit();
arm_machine_restart('s', cmd);
pxa_restart('s', cmd);
}

static struct gpio global_gpios[] = {
Expand Down Expand Up @@ -734,7 +734,6 @@ static void __init mioa701_machine_init(void)
pxa_set_udc_info(&mioa701_udc_info);
pxa_set_ac97_info(&mioa701_ac97_info);
pm_power_off = mioa701_poweroff;
arm_pm_restart = mioa701_restart;
platform_add_devices(devices, ARRAY_SIZE(devices));
gsm_init();

Expand All @@ -758,4 +757,5 @@ MACHINE_START(MIOA701, "MIO A701")
.handle_irq = &pxa27x_handle_irq,
.init_machine = mioa701_machine_init,
.timer = &pxa_timer,
.restart = mioa701_restart,
MACHINE_END
1 change: 1 addition & 0 deletions trunk/arch/arm/mach-pxa/mp900.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,6 @@ MACHINE_START(NEC_MP900, "MobilePro900/C")
.init_irq = pxa25x_init_irq,
.handle_irq = pxa25x_handle_irq,
.init_machine = mp900c_init,
.restart = pxa_restart,
MACHINE_END

3 changes: 2 additions & 1 deletion trunk/arch/arm/mach-pxa/palmld.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,5 +347,6 @@ MACHINE_START(PALMLD, "Palm LifeDrive")
.init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
.init_machine = palmld_init
.init_machine = palmld_init,
.restart = pxa_restart,
MACHINE_END
3 changes: 2 additions & 1 deletion trunk/arch/arm/mach-pxa/palmt5.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,5 +208,6 @@ MACHINE_START(PALMT5, "Palm Tungsten|T5")
.init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
.init_machine = palmt5_init
.init_machine = palmt5_init,
.restart = pxa_restart,
MACHINE_END
3 changes: 2 additions & 1 deletion trunk/arch/arm/mach-pxa/palmtc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,5 +542,6 @@ MACHINE_START(PALMTC, "Palm Tungsten|C")
.init_irq = pxa25x_init_irq,
.handle_irq = pxa25x_handle_irq,
.timer = &pxa_timer,
.init_machine = palmtc_init
.init_machine = palmtc_init,
.restart = pxa_restart,
MACHINE_END
3 changes: 2 additions & 1 deletion trunk/arch/arm/mach-pxa/palmte2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,5 +361,6 @@ MACHINE_START(PALMTE2, "Palm Tungsten|E2")
.init_irq = pxa25x_init_irq,
.handle_irq = pxa25x_handle_irq,
.timer = &pxa_timer,
.init_machine = palmte2_init
.init_machine = palmte2_init,
.restart = pxa_restart,
MACHINE_END
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-pxa/palmtreo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,7 @@ MACHINE_START(TREO680, "Palm Treo 680")
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
.init_machine = treo680_init,
.restart = pxa_restart,
MACHINE_END
#endif

Expand All @@ -464,5 +465,6 @@ MACHINE_START(CENTRO, "Palm Centro 685")
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
.init_machine = centro_init,
.restart = pxa_restart,
MACHINE_END
#endif
Loading

0 comments on commit 6abd4f2

Please sign in to comment.