[ARM] 4809/2: ixp4xx: Merge dsmg600-power.c into dsmg600-setup.c (43816bcb) · Commits · e / devices / android_kernel_teracube_mt6765

arch/arm/mach-ixp4xx/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,7 @@ obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o
	obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o		obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o
	obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o		obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o
	obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o		obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o
	obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o dsmg600-power.o		obj-$(CONFIG_MACH_DSMG600) += dsmg600-setup.o
	obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o		obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o
	obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o		obj-$(CONFIG_MACH_WG302V2) += wg302v2-setup.o

arch/arm/mach-ixp4xx/dsmg600-power.c

deleted100644 → 0

+0 −129

Original line number	Original line	Diff line number	Diff line
	/*
	* arch/arm/mach-ixp4xx/dsmg600-power.c
	*
	* DSM-G600 Power/Reset driver
	* Author: Michael Westerhof <mwester@dls.net>
	*
	* Based on nslu2-power.c
	* Copyright (C) 2005 Tower Technologies
	* Author: Alessandro Zummo <a.zummo@towertech.it>
	*
	* which was based on nslu2-io.c
	* Copyright (C) 2004 Karen Spearel
	*
	* Maintainers: http://www.nslu2-linux.org/
	*
	* 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.
	*
	*/

	#include <linux/module.h>
	#include <linux/reboot.h>
	#include <linux/interrupt.h>
	#include <linux/irq.h>
	#include <linux/jiffies.h>
	#include <linux/timer.h>

	#include <asm/gpio.h>
	#include <asm/mach-types.h>

	/* This is used to make sure the power-button pusher is serious. The button
	* must be held until the value of this counter reaches zero.
	*/
	static int power_button_countdown;

	/* Must hold the button down for at least this many counts to be processed */
	#define PBUTTON_HOLDDOWN_COUNT 4 /* 2 secs */

	static void dsmg600_power_handler(unsigned long data);
	static DEFINE_TIMER(dsmg600_power_timer, dsmg600_power_handler, 0, 0);

	static void dsmg600_power_handler(unsigned long data)
	{
	/* This routine is called twice per second to check the
	* state of the power button.
	*/

	if (gpio_get_value(DSMG600_PB_GPIO)) {

	/* IO Pin is 1 (button pushed) */
	if (power_button_countdown > 0)
	power_button_countdown--;

	} else {

	/* Done on button release, to allow for auto-power-on mods. */
	if (power_button_countdown == 0) {
	/* Signal init to do the ctrlaltdel action,
	* this will bypass init if it hasn't started
	* and do a kernel_restart.
	*/
	ctrl_alt_del();

	/* Change the state of the power LED to "blink" */
	gpio_line_set(DSMG600_LED_PWR_GPIO, IXP4XX_GPIO_LOW);
	} else {
	power_button_countdown = PBUTTON_HOLDDOWN_COUNT;
	}
	}

	mod_timer(&dsmg600_power_timer, jiffies + msecs_to_jiffies(500));
	}

	static irqreturn_t dsmg600_reset_handler(int irq, void *dev_id)
	{
	/* This is the paper-clip reset, it shuts the machine down directly. */
	machine_power_off();

	return IRQ_HANDLED;
	}

	static int __init dsmg600_power_init(void)
	{
	if (!(machine_is_dsmg600()))
	return 0;

	if (request_irq(gpio_to_irq(DSMG600_RB_GPIO), &dsmg600_reset_handler,
	IRQF_DISABLED \| IRQF_TRIGGER_LOW, "DSM-G600 reset button",
	NULL) < 0) {

	printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
	gpio_to_irq(DSMG600_RB_GPIO));

	return -EIO;
	}

	/* The power button on the D-Link DSM-G600 is on GPIO 15, but
	* it cannot handle interrupts on that GPIO line. So we'll
	* have to poll it with a kernel timer.
	*/

	/* Make sure that the power button GPIO is set up as an input */
	gpio_line_config(DSMG600_PB_GPIO, IXP4XX_GPIO_IN);

	/* Set the initial value for the power button IRQ handler */
	power_button_countdown = PBUTTON_HOLDDOWN_COUNT;

	mod_timer(&dsmg600_power_timer, jiffies + msecs_to_jiffies(500));

	return 0;
	}

	static void __exit dsmg600_power_exit(void)
	{
	if (!(machine_is_dsmg600()))
	return;

	del_timer_sync(&dsmg600_power_timer);

	free_irq(gpio_to_irq(DSMG600_RB_GPIO), NULL);
	}

	module_init(dsmg600_power_init);
	module_exit(dsmg600_power_exit);

	MODULE_AUTHOR("Michael Westerhof <mwester@dls.net>");
	MODULE_DESCRIPTION("DSM-G600 Power/Reset driver");
	MODULE_LICENSE("GPL");

arch/arm/mach-ixp4xx/dsmg600-setup.c

+87 −5

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* DSM-G600 board-setup		* DSM-G600 board-setup
	*		*
			* Copyright (C) 2008 Rod Whitby <rod@whitby.id.au>
	* Copyright (C) 2006 Tower Technologies		* Copyright (C) 2006 Tower Technologies
	* Author: Alessandro Zummo <a.zummo@towertech.it>
	*		*
	* based ixdp425-setup.c:		* based on ixdp425-setup.c:
	* Copyright (C) 2003-2004 MontaVista Software, Inc.		* Copyright (C) 2003-2004 MontaVista Software, Inc.
			* based on nslu2-power.c:
			* Copyright (C) 2005 Tower Technologies
			* based on nslu2-io.c:
			* Copyright (C) 2004 Karen Spearel
	*		*
	* Author: Alessandro Zummo <a.zummo@towertech.it>		* Author: Alessandro Zummo <a.zummo@towertech.it>
			* Author: Michael Westerhof <mwester@dls.net>
			* Author: Rod Whitby <rod@whitby.id.au>
	* Maintainers: http://www.nslu2-linux.org/		* Maintainers: http://www.nslu2-linux.org/
	*/		*/

	#include <linux/kernel.h>		#include <linux/irq.h>
			#include <linux/jiffies.h>
			#include <linux/timer.h>
	#include <linux/serial.h>		#include <linux/serial.h>
	#include <linux/serial_8250.h>		#include <linux/serial_8250.h>
	#include <linux/leds.h>		#include <linux/leds.h>
			#include <linux/reboot.h>
	#include <linux/i2c.h>		#include <linux/i2c.h>
	#include <linux/i2c-gpio.h>		#include <linux/i2c-gpio.h>

	@@ -22,6 +31,7 @@
	#include <asm/mach/arch.h>		#include <asm/mach/arch.h>
	#include <asm/mach/flash.h>		#include <asm/mach/flash.h>
	#include <asm/mach/time.h>		#include <asm/mach/time.h>
			#include <asm/gpio.h>

	static struct flash_platform_data dsmg600_flash_data = {		static struct flash_platform_data dsmg600_flash_data = {
	.map_name = "cfi_probe",		.map_name = "cfi_probe",
	@@ -140,6 +150,57 @@ static void dsmg600_power_off(void)
	gpio_line_set(DSMG600_PO_GPIO, IXP4XX_GPIO_HIGH);		gpio_line_set(DSMG600_PO_GPIO, IXP4XX_GPIO_HIGH);
	}		}

			/* This is used to make sure the power-button pusher is serious. The button
			* must be held until the value of this counter reaches zero.
			*/
			static int power_button_countdown;

			/* Must hold the button down for at least this many counts to be processed */
			#define PBUTTON_HOLDDOWN_COUNT 4 /* 2 secs */

			static void dsmg600_power_handler(unsigned long data);
			static DEFINE_TIMER(dsmg600_power_timer, dsmg600_power_handler, 0, 0);

			static void dsmg600_power_handler(unsigned long data)
			{
			/* This routine is called twice per second to check the
			* state of the power button.
			*/

			if (gpio_get_value(DSMG600_PB_GPIO)) {

			/* IO Pin is 1 (button pushed) */
			if (power_button_countdown > 0)
			power_button_countdown--;

			} else {

			/* Done on button release, to allow for auto-power-on mods. */
			if (power_button_countdown == 0) {
			/* Signal init to do the ctrlaltdel action,
			* this will bypass init if it hasn't started
			* and do a kernel_restart.
			*/
			ctrl_alt_del();

			/* Change the state of the power LED to "blink" */
			gpio_line_set(DSMG600_LED_PWR_GPIO, IXP4XX_GPIO_LOW);
			} else {
			power_button_countdown = PBUTTON_HOLDDOWN_COUNT;
			}
			}

			mod_timer(&dsmg600_power_timer, jiffies + msecs_to_jiffies(500));
			}

			static irqreturn_t dsmg600_reset_handler(int irq, void *dev_id)
			{
			/* This is the paper-clip reset, it shuts the machine down directly. */
			machine_power_off();

			return IRQ_HANDLED;
			}

	static void __init dsmg600_timer_init(void)		static void __init dsmg600_timer_init(void)
	{		{
	/* The xtal on this machine is non-standard. */		/* The xtal on this machine is non-standard. */
	@@ -164,8 +225,6 @@ static void __init dsmg600_init(void)
	dsmg600_flash_resource.end =		dsmg600_flash_resource.end =
	IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;		IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;

	pm_power_off = dsmg600_power_off;

	i2c_register_board_info(0, dsmg600_i2c_board_info,		i2c_register_board_info(0, dsmg600_i2c_board_info,
	ARRAY_SIZE(dsmg600_i2c_board_info));		ARRAY_SIZE(dsmg600_i2c_board_info));

	@@ -176,6 +235,29 @@ static void __init dsmg600_init(void)
	(void)platform_device_register(&dsmg600_uart);		(void)platform_device_register(&dsmg600_uart);

	platform_add_devices(dsmg600_devices, ARRAY_SIZE(dsmg600_devices));		platform_add_devices(dsmg600_devices, ARRAY_SIZE(dsmg600_devices));

			pm_power_off = dsmg600_power_off;

			if (request_irq(gpio_to_irq(DSMG600_RB_GPIO), &dsmg600_reset_handler,
			IRQF_DISABLED \| IRQF_TRIGGER_LOW,
			"DSM-G600 reset button", NULL) < 0) {

			printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
			gpio_to_irq(DSMG600_RB_GPIO));
			}

			/* The power button on the D-Link DSM-G600 is on GPIO 15, but
			* it cannot handle interrupts on that GPIO line. So we'll
			* have to poll it with a kernel timer.
			*/

			/* Make sure that the power button GPIO is set up as an input */
			gpio_line_config(DSMG600_PB_GPIO, IXP4XX_GPIO_IN);

			/* Set the initial value for the power button IRQ handler */
			power_button_countdown = PBUTTON_HOLDDOWN_COUNT;

			mod_timer(&dsmg600_power_timer, jiffies + msecs_to_jiffies(500));
	}		}

	MACHINE_START(DSMG600, "D-Link DSM-G600 RevA")		MACHINE_START(DSMG600, "D-Link DSM-G600 RevA")