Merge branch 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (a93f3e9f) · Commits · e / devices / android_kernel_teracube_2e

arch/x86/Kconfig

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2066,6 +2066,20 @@ config OLPC_XO15_SCI
	- AC adapter status updates		- AC adapter status updates
	- Battery status updates		- Battery status updates

			config ALIX
			bool "PCEngines ALIX System Support (LED setup)"
			select GPIOLIB
			---help---
			This option enables system support for the PCEngines ALIX.
			At present this just sets up LEDs for GPIO control on
			ALIX2/3/6 boards. However, other system specific setup should
			get added here.

			Note: You must still enable the drivers for GPIO and LED support
			(GPIO_CS5535 & LEDS_GPIO) to actually use the LEDs

			Note: You have to set alix.force=1 for boards with Award BIOS.

	endif # X86_32		endif # X86_32

	config AMD_NB		config AMD_NB

arch/x86/platform/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	# Platform specific code goes here		# Platform specific code goes here
	obj-y += ce4100/		obj-y += ce4100/
	obj-y += efi/		obj-y += efi/
			obj-y += geode/
	obj-y += iris/		obj-y += iris/
	obj-y += mrst/		obj-y += mrst/
	obj-y += olpc/		obj-y += olpc/

arch/x86/platform/geode/Makefile

0 → 100644

+1 −0

Original line number	Original line	Diff line number	Diff line
			obj-$(CONFIG_ALIX) += alix.o

drivers/leds/leds-alix2.c→arch/x86/platform/geode/alix.c

+142 −0

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* LEDs driver for PCEngines ALIX.2 and ALIX.3		* System Specific setup for PCEngines ALIX.
			* At the moment this means setup of GPIO control of LEDs
			* on Alix.2/3/6 boards.
			*
	*		*
	* Copyright (C) 2008 Constantin Baranov <const@mimas.ru>		* Copyright (C) 2008 Constantin Baranov <const@mimas.ru>
			* Copyright (C) 2011 Ed Wildgoose <kernel@wildgooses.com>
			*
			* TODO: There are large similarities with leds-net5501.c
			* by Alessandro Zummo <a.zummo@towertech.it>
			* In the future leds-net5501.c should be migrated over to platform
			*
			* 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/err.h>
	#include <linux/io.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/leds.h>		#include <linux/init.h>
			#include <linux/io.h>
			#include <linux/string.h>
	#include <linux/module.h>		#include <linux/module.h>
			#include <linux/leds.h>
	#include <linux/platform_device.h>		#include <linux/platform_device.h>
	#include <linux/string.h>		#include <linux/gpio.h>
	#include <linux/pci.h>
			#include <asm/geode.h>

	static int force = 0;		static int force = 0;
	module_param(force, bool, 0444);		module_param(force, bool, 0444);
	MODULE_PARM_DESC(force, "Assume system has ALIX.2/ALIX.3 style LEDs");		/* FIXME: Award bios is not automatically detected as Alix platform */
			MODULE_PARM_DESC(force, "Force detection as ALIX.2/ALIX.3 platform");
	#define MSR_LBAR_GPIO 0x5140000C
	#define CS5535_GPIO_SIZE 256

	static u32 gpio_base;

	static struct pci_device_id divil_pci[] = {		static struct gpio_led alix_leds[] = {
	{ PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_ISA) },
	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },
	{ } /* NULL entry */
	};
	MODULE_DEVICE_TABLE(pci, divil_pci);

	struct alix_led {
	struct led_classdev cdev;
	unsigned short port;
	unsigned int on_value;
	unsigned int off_value;
	};

	static void alix_led_set(struct led_classdev *led_cdev,
	enum led_brightness brightness)
	{		{
	struct alix_led *led_dev =
	container_of(led_cdev, struct alix_led, cdev);

	if (brightness)
	outl(led_dev->on_value, gpio_base + led_dev->port);
	else
	outl(led_dev->off_value, gpio_base + led_dev->port);
	}

	static struct alix_led alix_leds[] = {
	{
	.cdev = {
	.name = "alix:1",		.name = "alix:1",
	.brightness_set = alix_led_set,		.gpio = 6,
	},		.default_trigger = "default-on",
	.port = 0x00,		.active_low = 1,
	.on_value = 1 << 22,
	.off_value = 1 << 6,
	},		},
	{		{
	.cdev = {
	.name = "alix:2",		.name = "alix:2",
	.brightness_set = alix_led_set,		.gpio = 25,
	},		.default_trigger = "default-off",
	.port = 0x80,		.active_low = 1,
	.on_value = 1 << 25,
	.off_value = 1 << 9,
	},		},
	{		{
	.cdev = {
	.name = "alix:3",		.name = "alix:3",
	.brightness_set = alix_led_set,		.gpio = 27,
	},		.default_trigger = "default-off",
	.port = 0x80,		.active_low = 1,
	.on_value = 1 << 27,
	.off_value = 1 << 11,
	},		},
	};		};

	static int __init alix_led_probe(struct platform_device *pdev)		static struct gpio_led_platform_data alix_leds_data = {
	{		.num_leds = ARRAY_SIZE(alix_leds),
	int i;		.leds = alix_leds,
	int ret;		};

	for (i = 0; i < ARRAY_SIZE(alix_leds); i++) {
	alix_leds[i].cdev.flags \|= LED_CORE_SUSPENDRESUME;
	ret = led_classdev_register(&pdev->dev, &alix_leds[i].cdev);
	if (ret < 0)
	goto fail;
	}
	return 0;

	fail:		static struct platform_device alix_leds_dev = {
	while (--i >= 0)		.name = "leds-gpio",
	led_classdev_unregister(&alix_leds[i].cdev);		.id = -1,
	return ret;		.dev.platform_data = &alix_leds_data,
	}		};

	static int alix_led_remove(struct platform_device *pdev)		static void __init register_alix(void)
	{		{
	int i;		/* Setup LED control through leds-gpio driver */
			platform_device_register(&alix_leds_dev);
	for (i = 0; i < ARRAY_SIZE(alix_leds); i++)
	led_classdev_unregister(&alix_leds[i].cdev);
	return 0;
	}		}

	static struct platform_driver alix_led_driver = {
	.remove = alix_led_remove,
	.driver = {
	.name = KBUILD_MODNAME,
	.owner = THIS_MODULE,
	},
	};

	static int __init alix_present(unsigned long bios_phys,		static int __init alix_present(unsigned long bios_phys,
	const char *alix_sig,		const char *alix_sig,
	size_t alix_sig_len)		size_t alix_sig_len)
	@@ -126,7 +82,7 @@ static int __init alix_present(unsigned long bios_phys,

	if (force) {		if (force) {
	printk(KERN_NOTICE "%s: forced to skip BIOS test, "		printk(KERN_NOTICE "%s: forced to skip BIOS test, "
	"assume system has ALIX.2 style LEDs\n",		"assume system is ALIX.2/ALIX.3\n",
	KBUILD_MODNAME);		KBUILD_MODNAME);
	return 1;		return 1;
	}		}
	@@ -164,76 +120,23 @@ static int __init alix_present(unsigned long bios_phys,
	return 0;		return 0;
	}		}

	static struct platform_device *pdev;		static int __init alix_init(void)

	static int __init alix_pci_led_init(void)
	{
	u32 low, hi;

	if (pci_dev_present(divil_pci) == 0) {
	printk(KERN_WARNING KBUILD_MODNAME": DIVIL not found\n");
	return -ENODEV;
	}

	/* Grab the GPIO I/O range */
	rdmsr(MSR_LBAR_GPIO, low, hi);

	/* Check the mask and whether GPIO is enabled (sanity check) */
	if (hi != 0x0000f001) {
	printk(KERN_WARNING KBUILD_MODNAME": GPIO not enabled\n");
	return -ENODEV;
	}

	/* Mask off the IO base address */
	gpio_base = low & 0x0000ff00;

	if (!request_region(gpio_base, CS5535_GPIO_SIZE, KBUILD_MODNAME)) {
	printk(KERN_ERR KBUILD_MODNAME": can't allocate I/O for GPIO\n");
	return -ENODEV;
	}

	/* Set GPIO function to output */
	outl(1 << 6, gpio_base + 0x04);
	outl(1 << 9, gpio_base + 0x84);
	outl(1 << 11, gpio_base + 0x84);

	return 0;
	}

	static int __init alix_led_init(void)
	{		{
	int ret = -ENODEV;
	const char tinybios_sig[] = "PC Engines ALIX.";		const char tinybios_sig[] = "PC Engines ALIX.";
	const char coreboot_sig[] = "PC Engines\0ALIX.";		const char coreboot_sig[] = "PC Engines\0ALIX.";

			if (!is_geode())
			return 0;

	if (alix_present(0xf0000, tinybios_sig, sizeof(tinybios_sig) - 1) \|\|		if (alix_present(0xf0000, tinybios_sig, sizeof(tinybios_sig) - 1) \|\|
	alix_present(0x500, coreboot_sig, sizeof(coreboot_sig) - 1))		alix_present(0x500, coreboot_sig, sizeof(coreboot_sig) - 1))
	ret = alix_pci_led_init();		register_alix();

	if (ret < 0)
	return ret;

	pdev = platform_device_register_simple(KBUILD_MODNAME, -1, NULL, 0);		return 0;
	if (!IS_ERR(pdev)) {
	ret = platform_driver_probe(&alix_led_driver, alix_led_probe);
	if (ret)
	platform_device_unregister(pdev);
	} else
	ret = PTR_ERR(pdev);

	return ret;
	}

	static void __exit alix_led_exit(void)
	{
	platform_device_unregister(pdev);
	platform_driver_unregister(&alix_led_driver);
	release_region(gpio_base, CS5535_GPIO_SIZE);
	}		}

	module_init(alix_led_init);		module_init(alix_init);
	module_exit(alix_led_exit);

	MODULE_AUTHOR("Constantin Baranov <const@mimas.ru>");		MODULE_AUTHOR("Ed Wildgoose <kernel@wildgooses.com>");
	MODULE_DESCRIPTION("PCEngines ALIX.2 and ALIX.3 LED driver");		MODULE_DESCRIPTION("PCEngines ALIX System Setup");
	MODULE_LICENSE("GPL");		MODULE_LICENSE("GPL");

drivers/leds/Kconfig

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -113,14 +113,6 @@ config LEDS_WRAP
	help		help
	This option enables support for the PCEngines WRAP programmable LEDs.		This option enables support for the PCEngines WRAP programmable LEDs.

	config LEDS_ALIX2
	tristate "LED Support for ALIX.2 and ALIX.3 series"
	depends on LEDS_CLASS
	depends on X86 && !GPIO_CS5535 && !CS5535_GPIO
	help
	This option enables support for the PCEngines ALIX.2 and ALIX.3 LEDs.
	You have to set leds-alix2.force=1 for boards with Award BIOS.

	config LEDS_COBALT_QUBE		config LEDS_COBALT_QUBE
	tristate "LED Support for the Cobalt Qube series front LED"		tristate "LED Support for the Cobalt Qube series front LED"
	depends on LEDS_CLASS		depends on LEDS_CLASS