Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

leds: lp5523: add master_fader support

This patch introduces 4 new attributes:
master_fader_leds
master_fader1
master_fader2
master_fader3

Fo example, to map channel 0,6 to master_fader1,
map channel 1,7 to master_fader2,
map channel 2,8 to master_fader3, and
map channel 3,4,5 to none

echo "123000123" > master_fader_leds

A different factor can be set to each master_fader:

echo 255 > master_fader1
echo 100 > master_fader2
echo 0 > master_fader3

Signed-off-by: Toshi Kikuchi <toshik@chromium.org>
Acked-by: Milo Kim <milo.kim@ti.com>
Tested-by: Milo Kim <milo.kim@ti.com>
Acked-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>

authored by

Toshi Kikuchi and committed by
Bryan Wu
52da81ea 9ab1963d

+148
+148
drivers/leds/leds-lp5523.c
··· 50 50 #define LP5523_REG_OP_MODE 0x01 51 51 #define LP5523_REG_ENABLE_LEDS_MSB 0x04 52 52 #define LP5523_REG_ENABLE_LEDS_LSB 0x05 53 + #define LP5523_REG_LED_CTRL_BASE 0x06 53 54 #define LP5523_REG_LED_PWM_BASE 0x16 54 55 #define LP5523_REG_LED_CURRENT_BASE 0x26 55 56 #define LP5523_REG_CONFIG 0x36 ··· 58 57 #define LP5523_REG_RESET 0x3D 59 58 #define LP5523_REG_LED_TEST_CTRL 0x41 60 59 #define LP5523_REG_LED_TEST_ADC 0x42 60 + #define LP5523_REG_MASTER_FADER_BASE 0x48 61 61 #define LP5523_REG_CH1_PROG_START 0x4C 62 62 #define LP5523_REG_CH2_PROG_START 0x4D 63 63 #define LP5523_REG_CH3_PROG_START 0x4E ··· 79 77 #define LP5523_ADC_SHORTCIRC_LIM 80 80 78 #define LP5523_EXT_CLK_USED 0x08 81 79 #define LP5523_ENG_STATUS_MASK 0x07 80 + 81 + #define LP5523_FADER_MAPPING_MASK 0xC0 82 + #define LP5523_FADER_MAPPING_SHIFT 6 82 83 83 84 /* Memory Page Selection */ 84 85 #define LP5523_PAGE_ENG1 0 ··· 671 666 return pos; 672 667 } 673 668 669 + #define show_fader(nr) \ 670 + static ssize_t show_master_fader##nr(struct device *dev, \ 671 + struct device_attribute *attr, \ 672 + char *buf) \ 673 + { \ 674 + return show_master_fader(dev, attr, buf, nr); \ 675 + } 676 + 677 + #define store_fader(nr) \ 678 + static ssize_t store_master_fader##nr(struct device *dev, \ 679 + struct device_attribute *attr, \ 680 + const char *buf, size_t len) \ 681 + { \ 682 + return store_master_fader(dev, attr, buf, len, nr); \ 683 + } 684 + 685 + static ssize_t show_master_fader(struct device *dev, 686 + struct device_attribute *attr, 687 + char *buf, int nr) 688 + { 689 + struct lp55xx_led *led = i2c_get_clientdata(to_i2c_client(dev)); 690 + struct lp55xx_chip *chip = led->chip; 691 + int ret; 692 + u8 val; 693 + 694 + mutex_lock(&chip->lock); 695 + ret = lp55xx_read(chip, LP5523_REG_MASTER_FADER_BASE + nr - 1, &val); 696 + mutex_unlock(&chip->lock); 697 + 698 + if (ret == 0) 699 + ret = sprintf(buf, "%u\n", val); 700 + 701 + return ret; 702 + } 703 + show_fader(1) 704 + show_fader(2) 705 + show_fader(3) 706 + 707 + static ssize_t store_master_fader(struct device *dev, 708 + struct device_attribute *attr, 709 + const char *buf, size_t len, int nr) 710 + { 711 + struct lp55xx_led *led = i2c_get_clientdata(to_i2c_client(dev)); 712 + struct lp55xx_chip *chip = led->chip; 713 + int ret; 714 + unsigned long val; 715 + 716 + if (kstrtoul(buf, 0, &val)) 717 + return -EINVAL; 718 + 719 + if (val > 0xff) 720 + return -EINVAL; 721 + 722 + mutex_lock(&chip->lock); 723 + ret = lp55xx_write(chip, LP5523_REG_MASTER_FADER_BASE + nr - 1, 724 + (u8)val); 725 + mutex_unlock(&chip->lock); 726 + 727 + if (ret == 0) 728 + ret = len; 729 + 730 + return ret; 731 + } 732 + store_fader(1) 733 + store_fader(2) 734 + store_fader(3) 735 + 736 + static ssize_t show_master_fader_leds(struct device *dev, 737 + struct device_attribute *attr, 738 + char *buf) 739 + { 740 + struct lp55xx_led *led = i2c_get_clientdata(to_i2c_client(dev)); 741 + struct lp55xx_chip *chip = led->chip; 742 + int i, ret, pos = 0; 743 + u8 val; 744 + 745 + mutex_lock(&chip->lock); 746 + 747 + for (i = 0; i < LP5523_MAX_LEDS; i++) { 748 + ret = lp55xx_read(chip, LP5523_REG_LED_CTRL_BASE + i, &val); 749 + if (ret) 750 + goto leave; 751 + 752 + val = (val & LP5523_FADER_MAPPING_MASK) 753 + >> LP5523_FADER_MAPPING_SHIFT; 754 + if (val > 3) { 755 + ret = -EINVAL; 756 + goto leave; 757 + } 758 + buf[pos++] = val + '0'; 759 + } 760 + buf[pos++] = '\n'; 761 + ret = pos; 762 + leave: 763 + mutex_unlock(&chip->lock); 764 + return ret; 765 + } 766 + 767 + static ssize_t store_master_fader_leds(struct device *dev, 768 + struct device_attribute *attr, 769 + const char *buf, size_t len) 770 + { 771 + struct lp55xx_led *led = i2c_get_clientdata(to_i2c_client(dev)); 772 + struct lp55xx_chip *chip = led->chip; 773 + int i, n, ret; 774 + u8 val; 775 + 776 + n = min_t(int, len, LP5523_MAX_LEDS); 777 + 778 + mutex_lock(&chip->lock); 779 + 780 + for (i = 0; i < n; i++) { 781 + if (buf[i] >= '0' && buf[i] <= '3') { 782 + val = (buf[i] - '0') << LP5523_FADER_MAPPING_SHIFT; 783 + ret = lp55xx_update_bits(chip, 784 + LP5523_REG_LED_CTRL_BASE + i, 785 + LP5523_FADER_MAPPING_MASK, 786 + val); 787 + if (ret) 788 + goto leave; 789 + } else { 790 + ret = -EINVAL; 791 + goto leave; 792 + } 793 + } 794 + ret = len; 795 + leave: 796 + mutex_unlock(&chip->lock); 797 + return ret; 798 + } 799 + 674 800 static void lp5523_led_brightness_work(struct work_struct *work) 675 801 { 676 802 struct lp55xx_led *led = container_of(work, struct lp55xx_led, ··· 824 688 static LP55XX_DEV_ATTR_WO(engine2_load, store_engine2_load); 825 689 static LP55XX_DEV_ATTR_WO(engine3_load, store_engine3_load); 826 690 static LP55XX_DEV_ATTR_RO(selftest, lp5523_selftest); 691 + static LP55XX_DEV_ATTR_RW(master_fader1, show_master_fader1, 692 + store_master_fader1); 693 + static LP55XX_DEV_ATTR_RW(master_fader2, show_master_fader2, 694 + store_master_fader2); 695 + static LP55XX_DEV_ATTR_RW(master_fader3, show_master_fader3, 696 + store_master_fader3); 697 + static LP55XX_DEV_ATTR_RW(master_fader_leds, show_master_fader_leds, 698 + store_master_fader_leds); 827 699 828 700 static struct attribute *lp5523_attributes[] = { 829 701 &dev_attr_engine1_mode.attr, ··· 844 700 &dev_attr_engine2_leds.attr, 845 701 &dev_attr_engine3_leds.attr, 846 702 &dev_attr_selftest.attr, 703 + &dev_attr_master_fader1.attr, 704 + &dev_attr_master_fader2.attr, 705 + &dev_attr_master_fader3.attr, 706 + &dev_attr_master_fader_leds.attr, 847 707 NULL, 848 708 }; 849 709