[kernel] r11823 - dists/trunk/linux-2.6/debian/patches/features/arm

[Martin Michlmayr]

Author: tbm
Date: Sun Jul 13 14:31:19 2008
New Revision: 11823

Log:
remove obsolete PCI stuff, add LEDs support


Modified:
   dists/trunk/linux-2.6/debian/patches/features/arm/ts409-mv2120-support.patch

Modified: dists/trunk/linux-2.6/debian/patches/features/arm/ts409-mv2120-support.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/arm/ts409-mv2120-support.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/features/arm/ts409-mv2120-support.patch	Sun Jul 13 14:31:19 2008
@@ -32,8 +32,8 @@
 +obj-$(CONFIG_MACH_TS409)	+= ts409-setup.o tsx09-common.o
 +obj-$(CONFIG_MACH_MV2120)	+= mv2120-setup.o
 --- /dev/null	2008-06-15 07:07:41.000000000 +0000
-+++ b/arch/arm/mach-orion5x/mv2120-setup.c	2008-06-16 21:07:21.000000000 +0000
-@@ -0,0 +1,227 @@
++++ arch/arm/mach-orion5x/mv2120-setup.c	2008-07-13 14:29:46.000000000 +0000
+@@ -0,0 +1,244 @@
 +/*
 + * Copyright (C) 2007 Herbert Valerio Riedel <hvr at gnu.org>
 + * Copyright (C) 2008 Martin Michlmayr <tbm at cyrius.com>
@@ -72,34 +72,6 @@
 +#define MV2120_GPIO_POWER_OFF	19
 +
 +
-+/****************************************************************************
-+ * PCI setup
-+ ****************************************************************************/
-+static int __init mv2120_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-+{
-+	int irq;
-+
-+	/*
-+	 * Check for devices with hard-wired IRQs.
-+	 */
-+	irq = orion5x_pci_map_irq(dev, slot, pin);
-+	if (irq != -1)
-+		return irq;
-+
-+	pr_err("%s: requested mapping for unknown bus\n", __func__);
-+
-+	return -1;
-+}
-+
-+static struct hw_pci mv2120_pci __initdata = {
-+	.nr_controllers = 2,
-+	.swizzle	= pci_std_swizzle,
-+	.setup		= orion5x_pci_sys_setup,
-+	.scan		= orion5x_pci_sys_scan_bus,
-+	.map_irq	= mv2120_pci_map_irq,
-+};
-+
-+
 +/*****************************************************************************
 + * Ethernet
 + ****************************************************************************/
@@ -178,6 +150,50 @@
 +	.irq	= 0,
 +};
 +
++static struct gpio_led mv2120_led_pins[] = {
++	{
++		.name			= "mv2120:blue:health",
++		.gpio			= 0,
++	},
++	{
++		.name			= "mv2120:red:health",
++		.gpio			= 1,
++	},
++	{
++		.name			= "mv2120:led:bright",
++		.gpio			= 4,
++		.default_trigger	= "default-on",
++	},
++	{
++		.name			= "mv2120:led:dimmed",
++		.gpio			= 5,
++	},
++	{
++		.name			= "mv2120:red:sata0",
++		.gpio			= 8,
++		.active_low		= 1,
++	},
++	{
++		.name			= "mv2120:red:sata1",
++		.gpio			= 9,
++		.active_low		= 1,
++	},
++
++};
++
++static struct gpio_led_platform_data mv2120_led_data = {
++	.leds		= mv2120_led_pins,
++	.num_leds	= ARRAY_SIZE(mv2120_led_pins),
++};
++
++static struct platform_device mv2120_leds = {
++	.name	= "leds-gpio",
++	.id	= -1,
++	.dev	= {
++		.platform_data	= &mv2120_led_data,
++	}
++};
++
 +static void mv2120_power_off(void)
 +{
 +	pr_info("%s: triggering power-off...\n", __func__);
@@ -244,6 +260,7 @@
 +			gpio_free(MV2120_GPIO_RTC_IRQ);
 +	}
 +	i2c_register_board_info(0, &mv2120_i2c_rtc, 1);
++	platform_device_register(&mv2120_leds);
 +
 +	orion5x_eth_init(&mv2120_eth_data);
 +	orion5x_sata_init(&mv2120_sata_data);