iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mfd: vexpress: Make the driver optional for arm and arm64

Browse Source 
The driver can be used on either arm or arm64 platforms, but
the latter doesn't have any platform-specific configuration
options, so it must be possible to manually enable the driver.

As the gpiolib is optional for arm64 arch, the gpio/led code
must be compiled conditionally.

Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Pawel Moll 2013-06-11 11:56:02 +01:00 committed by Samuel Ortiz
parent cb3cabd678
commit 8eb12b9816
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mfd/Kconfig
View File

@ -1151,7 +1151,8 @@ config MCP_UCB1200_TS
endmenu endmenu
config VEXPRESS_CONFIG config VEXPRESS_CONFIG
bool bool "ARM Versatile Express platform infrastructure"
depends on ARM || ARM64
help help
Platform configuration infrastructure for the ARM Ltd. Platform configuration infrastructure for the ARM Ltd.
Versatile Express. Versatile Express.

10
drivers/mfd/vexpress-sysreg.c
View File

@ -351,6 +351,8 @@ void __init vexpress_sysreg_of_early_init(void)
} }
#ifdef CONFIG_GPIOLIB
#define VEXPRESS_SYSREG_GPIO(_name, _reg, _value) \ #define VEXPRESS_SYSREG_GPIO(_name, _reg, _value) \
[VEXPRESS_GPIO_##_name] = { \ [VEXPRESS_GPIO_##_name] = { \
.reg = _reg, \ .reg = _reg, \
@ -445,6 +447,8 @@ struct gpio_led_platform_data vexpress_sysreg_leds_pdata = {
.leds = vexpress_sysreg_leds, .leds = vexpress_sysreg_leds,
}; };
#endif
static ssize_t vexpress_sysreg_sys_id_show(struct device *dev, static ssize_t vexpress_sysreg_sys_id_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
@ -480,6 +484,9 @@ static int vexpress_sysreg_probe(struct platform_device *pdev)
setup_timer(&vexpress_sysreg_config_timer, setup_timer(&vexpress_sysreg_config_timer,
vexpress_sysreg_config_complete, 0); vexpress_sysreg_config_complete, 0);
vexpress_sysreg_dev = &pdev->dev;
#ifdef CONFIG_GPIOLIB
vexpress_sysreg_gpio_chip.dev = &pdev->dev; vexpress_sysreg_gpio_chip.dev = &pdev->dev;
err = gpiochip_add(&vexpress_sysreg_gpio_chip); err = gpiochip_add(&vexpress_sysreg_gpio_chip);
if (err) { if (err) {
@ -490,11 +497,10 @@ static int vexpress_sysreg_probe(struct platform_device *pdev)
return err; return err;
} }
vexpress_sysreg_dev = &pdev->dev;
platform_device_register_data(vexpress_sysreg_dev, "leds-gpio", platform_device_register_data(vexpress_sysreg_dev, "leds-gpio",
PLATFORM_DEVID_AUTO, &vexpress_sysreg_leds_pdata, PLATFORM_DEVID_AUTO, &vexpress_sysreg_leds_pdata,
sizeof(vexpress_sysreg_leds_pdata)); sizeof(vexpress_sysreg_leds_pdata));
#endif
device_create_file(vexpress_sysreg_dev, &dev_attr_sys_id); device_create_file(vexpress_sysreg_dev, &dev_attr_sys_id);