Commit 38e2c63e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'leds-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds 

Pull LED updates from Pavel Machek:
 "One new driver, some driver changes, and some late minute cleanups --
  but those are just whitespace so should be okay.

  There are some major changes being prepared (multicolor, triggers) so
  the next release likely will be more interesting"

* tag 'leds-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds:
  leds: core: Fix warning message when init_data
  leds: make functions easier to understand
  leds: sort Makefile entries
  leds: old enums are not really applicable to new code
  leds: ip30: label power LED as such
  leds: lm3532: make bitfield 'enabled' unsigned
  leds: leds-pwm: Replace zero-length array with flexible-array member
  leds: leds-is31fl32xx: Replace zero-length array with flexible-array member
  leds: pwm: remove useless pwm_period_ns
  leds: pwm: remove header
  leds: pwm: convert to atomic PWM API
  leds: pwm: simplify if condition
  leds: add SGI IP30 led support
  leds: lm3697: fix spelling mistake "To" -> "Too"
  leds: leds-bd2802: remove set but not used variable 'pdata'
  leds: ns2: Convert to GPIO descriptors
  leds: ns2: Absorb platform data
parents c7b6a566 64ed6588

drivers/leds/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -846,6 +846,17 @@ config LEDS_TPS6105X 
	  It is a single boost converter primarily for white LEDs and

	  audio amplifiers.



config LEDS_IP30

	tristate "LED support for SGI Octane machines"

	depends on LEDS_CLASS

	depends on SGI_MFD_IOC3

	help

	  This option enables support for the Red and White LEDs of

	  SGI Octane machines.



	  To compile this driver as a module, choose M here: the module

	  will be called leds-ip30.



comment "LED Triggers"

source "drivers/leds/trigger/Kconfig"

drivers/leds/Makefile

+50 −49
Original line number Diff line number Diff line
@@ -6,91 +6,92 @@ obj-$(CONFIG_LEDS_CLASS) += led-class.o 
obj-$(CONFIG_LEDS_CLASS_FLASH)		+= led-class-flash.o

obj-$(CONFIG_LEDS_TRIGGERS)		+= led-triggers.o



# LED Platform Drivers

# LED Platform Drivers (keep this sorted, M-| sort)

obj-$(CONFIG_LEDS_88PM860X)		+= leds-88pm860x.o

obj-$(CONFIG_LEDS_AAT1290)		+= leds-aat1290.o

obj-$(CONFIG_LEDS_ADP5520)		+= leds-adp5520.o

obj-$(CONFIG_LEDS_AN30259A)		+= leds-an30259a.o

obj-$(CONFIG_LEDS_APU)			+= leds-apu.o

obj-$(CONFIG_LEDS_AS3645A)		+= leds-as3645a.o

obj-$(CONFIG_LEDS_AN30259A)		+= leds-an30259a.o

obj-$(CONFIG_LEDS_ASIC3)		+= leds-asic3.o

obj-$(CONFIG_LEDS_BCM6328)		+= leds-bcm6328.o

obj-$(CONFIG_LEDS_BCM6358)		+= leds-bcm6358.o

obj-$(CONFIG_LEDS_BD2802)		+= leds-bd2802.o

obj-$(CONFIG_LEDS_BLINKM)		+= leds-blinkm.o

obj-$(CONFIG_LEDS_CLEVO_MAIL)		+= leds-clevo-mail.o

obj-$(CONFIG_LEDS_COBALT_QUBE)		+= leds-cobalt-qube.o

obj-$(CONFIG_LEDS_COBALT_RAQ)		+= leds-cobalt-raq.o

obj-$(CONFIG_LEDS_CPCAP)		+= leds-cpcap.o

obj-$(CONFIG_LEDS_LOCOMO)		+= leds-locomo.o

obj-$(CONFIG_LEDS_DA903X)		+= leds-da903x.o

obj-$(CONFIG_LEDS_DA9052)		+= leds-da9052.o

obj-$(CONFIG_LEDS_FSG)			+= leds-fsg.o

obj-$(CONFIG_LEDS_GPIO)			+= leds-gpio.o

obj-$(CONFIG_LEDS_GPIO_REGISTER)	+= leds-gpio-register.o

obj-$(CONFIG_LEDS_HP6XX)		+= leds-hp6xx.o

obj-$(CONFIG_LEDS_INTEL_SS4200)		+= leds-ss4200.o

obj-$(CONFIG_LEDS_IP30)			+= leds-ip30.o

obj-$(CONFIG_LEDS_IPAQ_MICRO)		+= leds-ipaq-micro.o

obj-$(CONFIG_LEDS_IS31FL319X)		+= leds-is31fl319x.o

obj-$(CONFIG_LEDS_IS31FL32XX)		+= leds-is31fl32xx.o

obj-$(CONFIG_LEDS_KTD2692)		+= leds-ktd2692.o

obj-$(CONFIG_LEDS_LM3530)		+= leds-lm3530.o

obj-$(CONFIG_LEDS_LM3532)		+= leds-lm3532.o

obj-$(CONFIG_LEDS_LM3533)		+= leds-lm3533.o

obj-$(CONFIG_LEDS_LM355x)		+= leds-lm355x.o

obj-$(CONFIG_LEDS_LM3601X)		+= leds-lm3601x.o

obj-$(CONFIG_LEDS_LM36274)		+= leds-lm36274.o

obj-$(CONFIG_LEDS_LM3642)		+= leds-lm3642.o

obj-$(CONFIG_LEDS_MIKROTIK_RB532)	+= leds-rb532.o

obj-$(CONFIG_LEDS_S3C24XX)		+= leds-s3c24xx.o

obj-$(CONFIG_LEDS_NET48XX)		+= leds-net48xx.o

obj-$(CONFIG_LEDS_WRAP)			+= leds-wrap.o

obj-$(CONFIG_LEDS_COBALT_QUBE)		+= leds-cobalt-qube.o

obj-$(CONFIG_LEDS_COBALT_RAQ)		+= leds-cobalt-raq.o

obj-$(CONFIG_LEDS_SUNFIRE)		+= leds-sunfire.o

obj-$(CONFIG_LEDS_PCA9532)		+= leds-pca9532.o

obj-$(CONFIG_LEDS_GPIO_REGISTER)	+= leds-gpio-register.o

obj-$(CONFIG_LEDS_GPIO)			+= leds-gpio.o

obj-$(CONFIG_LEDS_LM3692X)		+= leds-lm3692x.o

obj-$(CONFIG_LEDS_LM3697)		+= leds-lm3697.o

obj-$(CONFIG_LEDS_LOCOMO)		+= leds-locomo.o

obj-$(CONFIG_LEDS_LP3944)		+= leds-lp3944.o

obj-$(CONFIG_LEDS_LP3952)		+= leds-lp3952.o

obj-$(CONFIG_LEDS_LP55XX_COMMON)	+= leds-lp55xx-common.o

obj-$(CONFIG_LEDS_LP5521)		+= leds-lp5521.o

obj-$(CONFIG_LEDS_LP5523)		+= leds-lp5523.o

obj-$(CONFIG_LEDS_LP5562)		+= leds-lp5562.o

obj-$(CONFIG_LEDS_LP55XX_COMMON)	+= leds-lp55xx-common.o

obj-$(CONFIG_LEDS_LP8501)		+= leds-lp8501.o

obj-$(CONFIG_LEDS_LP8788)		+= leds-lp8788.o

obj-$(CONFIG_LEDS_LP8860)		+= leds-lp8860.o

obj-$(CONFIG_LEDS_TCA6507)		+= leds-tca6507.o

obj-$(CONFIG_LEDS_TLC591XX)		+= leds-tlc591xx.o

obj-$(CONFIG_LEDS_CLEVO_MAIL)		+= leds-clevo-mail.o

obj-$(CONFIG_LEDS_IPAQ_MICRO)		+= leds-ipaq-micro.o

obj-$(CONFIG_LEDS_HP6XX)		+= leds-hp6xx.o

obj-$(CONFIG_LEDS_OT200)		+= leds-ot200.o

obj-$(CONFIG_LEDS_FSG)			+= leds-fsg.o

obj-$(CONFIG_LEDS_PCA955X)		+= leds-pca955x.o

obj-$(CONFIG_LEDS_PCA963X)		+= leds-pca963x.o

obj-$(CONFIG_LEDS_DA903X)		+= leds-da903x.o

obj-$(CONFIG_LEDS_DA9052)		+= leds-da9052.o

obj-$(CONFIG_LEDS_WM831X_STATUS)	+= leds-wm831x-status.o

obj-$(CONFIG_LEDS_WM8350)		+= leds-wm8350.o

obj-$(CONFIG_LEDS_PWM)			+= leds-pwm.o

obj-$(CONFIG_LEDS_REGULATOR)		+= leds-regulator.o

obj-$(CONFIG_LEDS_INTEL_SS4200)		+= leds-ss4200.o

obj-$(CONFIG_LEDS_LT3593)		+= leds-lt3593.o

obj-$(CONFIG_LEDS_ADP5520)		+= leds-adp5520.o

obj-$(CONFIG_LEDS_MC13783)		+= leds-mc13783.o

obj-$(CONFIG_LEDS_NS2)			+= leds-ns2.o

obj-$(CONFIG_LEDS_NETXBIG)		+= leds-netxbig.o

obj-$(CONFIG_LEDS_ASIC3)		+= leds-asic3.o

obj-$(CONFIG_LEDS_MAX77650)		+= leds-max77650.o

obj-$(CONFIG_LEDS_MAX77693)		+= leds-max77693.o

obj-$(CONFIG_LEDS_MAX8997)		+= leds-max8997.o

obj-$(CONFIG_LEDS_LM355x)		+= leds-lm355x.o

obj-$(CONFIG_LEDS_BLINKM)		+= leds-blinkm.o

obj-$(CONFIG_LEDS_SYSCON)		+= leds-syscon.o

obj-$(CONFIG_LEDS_MC13783)		+= leds-mc13783.o

obj-$(CONFIG_LEDS_MENF21BMC)		+= leds-menf21bmc.o

obj-$(CONFIG_LEDS_KTD2692)		+= leds-ktd2692.o

obj-$(CONFIG_LEDS_POWERNV)		+= leds-powernv.o

obj-$(CONFIG_LEDS_IS31FL319X)		+= leds-is31fl319x.o

obj-$(CONFIG_LEDS_IS31FL32XX)		+= leds-is31fl32xx.o

obj-$(CONFIG_LEDS_PM8058)		+= leds-pm8058.o

obj-$(CONFIG_LEDS_MIKROTIK_RB532)	+= leds-rb532.o

obj-$(CONFIG_LEDS_MLXCPLD)		+= leds-mlxcpld.o

obj-$(CONFIG_LEDS_MLXREG)		+= leds-mlxreg.o

obj-$(CONFIG_LEDS_NIC78BX)		+= leds-nic78bx.o

obj-$(CONFIG_LEDS_SPI_BYTE)		+= leds-spi-byte.o

obj-$(CONFIG_LEDS_MT6323)		+= leds-mt6323.o

obj-$(CONFIG_LEDS_LM3692X)		+= leds-lm3692x.o

obj-$(CONFIG_LEDS_NET48XX)		+= leds-net48xx.o

obj-$(CONFIG_LEDS_NETXBIG)		+= leds-netxbig.o

obj-$(CONFIG_LEDS_NIC78BX)		+= leds-nic78bx.o

obj-$(CONFIG_LEDS_NS2)			+= leds-ns2.o

obj-$(CONFIG_LEDS_OT200)		+= leds-ot200.o

obj-$(CONFIG_LEDS_PCA9532)		+= leds-pca9532.o

obj-$(CONFIG_LEDS_PCA955X)		+= leds-pca955x.o

obj-$(CONFIG_LEDS_PCA963X)		+= leds-pca963x.o

obj-$(CONFIG_LEDS_PM8058)		+= leds-pm8058.o

obj-$(CONFIG_LEDS_POWERNV)		+= leds-powernv.o

obj-$(CONFIG_LEDS_PWM)			+= leds-pwm.o

obj-$(CONFIG_LEDS_REGULATOR)		+= leds-regulator.o

obj-$(CONFIG_LEDS_S3C24XX)		+= leds-s3c24xx.o

obj-$(CONFIG_LEDS_SC27XX_BLTC)		+= leds-sc27xx-bltc.o

obj-$(CONFIG_LEDS_LM3601X)		+= leds-lm3601x.o

obj-$(CONFIG_LEDS_SUNFIRE)		+= leds-sunfire.o

obj-$(CONFIG_LEDS_SYSCON)		+= leds-syscon.o

obj-$(CONFIG_LEDS_TCA6507)		+= leds-tca6507.o

obj-$(CONFIG_LEDS_TI_LMU_COMMON)	+= leds-ti-lmu-common.o

obj-$(CONFIG_LEDS_LM3697)		+= leds-lm3697.o

obj-$(CONFIG_LEDS_LM36274)		+= leds-lm36274.o

obj-$(CONFIG_LEDS_TLC591XX)		+= leds-tlc591xx.o

obj-$(CONFIG_LEDS_TPS6105X)		+= leds-tps6105x.o

obj-$(CONFIG_LEDS_WM831X_STATUS)	+= leds-wm831x-status.o

obj-$(CONFIG_LEDS_WM8350)		+= leds-wm8350.o

obj-$(CONFIG_LEDS_WRAP)			+= leds-wrap.o



# LED SPI Drivers

obj-$(CONFIG_LEDS_CR0014114)		+= leds-cr0014114.o

obj-$(CONFIG_LEDS_DAC124S085)		+= leds-dac124s085.o

obj-$(CONFIG_LEDS_EL15203000)		+= leds-el15203000.o

obj-$(CONFIG_LEDS_SPI_BYTE)		+= leds-spi-byte.o



# LED Userspace Drivers

obj-$(CONFIG_LEDS_USER)			+= uleds.o

drivers/leds/led-class.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ int led_classdev_register_ext(struct device *parent, 


	if (ret)

		dev_warn(parent, "Led %s renamed to %s due to name collision",

				led_cdev->name, dev_name(led_cdev->dev));

				proposed_name, dev_name(led_cdev->dev));



	if (led_cdev->flags & LED_BRIGHT_HW_CHANGED) {

		ret = led_add_brightness_hw_changed(led_cdev);

drivers/leds/leds-bd2802.c

+0 −2
Original line number Diff line number Diff line
@@ -660,7 +660,6 @@ static int bd2802_probe(struct i2c_client *client, 
			const struct i2c_device_id *id)

{

	struct bd2802_led *led;

	struct bd2802_led_platform_data *pdata;

	int ret, i;



	led = devm_kzalloc(&client->dev, sizeof(struct bd2802_led), GFP_KERNEL);
@@ -668,7 +667,6 @@ static int bd2802_probe(struct i2c_client *client, 
		return -ENOMEM;



	led->client = client;

	pdata = led->pdata = dev_get_platdata(&client->dev);

	i2c_set_clientdata(client, led);



	/*

drivers/leds/leds-ip30.c

0 → 100644
+86 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * LED Driver for SGI Octane machines

 */



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/leds.h>



#define IP30_LED_SYSTEM	0

#define IP30_LED_FAULT	1



struct ip30_led {

	struct led_classdev cdev;

	u32 __iomem *reg;

};



static void ip30led_set(struct led_classdev *led_cdev,

			enum led_brightness value)

{

	struct ip30_led *led = container_of(led_cdev, struct ip30_led, cdev);



	writel(value, led->reg);

}



static int ip30led_create(struct platform_device *pdev, int num)

{

	struct resource *res;

	struct ip30_led *data;



	res = platform_get_resource(pdev, IORESOURCE_MEM, num);

	if (!res)

		return -EBUSY;



	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);

	if (!data)

		return -ENOMEM;



	data->reg = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(data->reg))

		return PTR_ERR(data->reg);





	switch (num) {

	case IP30_LED_SYSTEM:

		data->cdev.name = "white:power";

		break;

	case IP30_LED_FAULT:

		data->cdev.name = "red:fault";

		break;

	default:

		return -EINVAL;

	}



	data->cdev.brightness = readl(data->reg);

	data->cdev.max_brightness = 1;

	data->cdev.brightness_set = ip30led_set;



	return devm_led_classdev_register(&pdev->dev, &data->cdev);

}



static int ip30led_probe(struct platform_device *pdev)

{

	int ret;



	ret = ip30led_create(pdev, IP30_LED_SYSTEM);

	if (ret < 0)

		return ret;



	return ip30led_create(pdev, IP30_LED_FAULT);

}



static struct platform_driver ip30led_driver = {

	.probe		= ip30led_probe,

	.driver		= {

		.name		= "ip30-leds",

	},

};



module_platform_driver(ip30led_driver);



MODULE_AUTHOR("Thomas Bogendoerfer <tbogendoerfer@suse.de>");

MODULE_DESCRIPTION("SGI Octane LED driver");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:ip30-leds");

CRA Git | Maintained and supported by SUSTech CRA and CCSE