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

regulator: wm831x-dcdc: Specify supply names

Allows hookup via normal consumer mechanisms.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Mark Brown 82caa978 f1aba13f

+12 -1
+12 -1
drivers/regulator/wm831x-dcdc.c
··· 35 35 #define WM831X_DCDC_MODE_IDLE 2 36 36 #define WM831X_DCDC_MODE_STANDBY 3 37 37 38 - #define WM831X_DCDC_MAX_NAME 6 38 + #define WM831X_DCDC_MAX_NAME 9 39 39 40 40 /* Register offsets in control block */ 41 41 #define WM831X_DCDC_CONTROL_1 0 ··· 50 50 51 51 struct wm831x_dcdc { 52 52 char name[WM831X_DCDC_MAX_NAME]; 53 + char supply_name[WM831X_DCDC_MAX_NAME]; 53 54 struct regulator_desc desc; 54 55 int base; 55 56 struct wm831x *wm831x; ··· 535 534 536 535 snprintf(dcdc->name, sizeof(dcdc->name), "DCDC%d", id + 1); 537 536 dcdc->desc.name = dcdc->name; 537 + 538 + snprintf(dcdc->supply_name, sizeof(dcdc->supply_name), 539 + "DC%dVDD", id + 1); 540 + dcdc->desc.supply_name = dcdc->supply_name; 541 + 538 542 dcdc->desc.id = id; 539 543 dcdc->desc.type = REGULATOR_VOLTAGE; 540 544 dcdc->desc.n_voltages = WM831X_BUCKV_MAX_SELECTOR + 1; ··· 754 748 755 749 snprintf(dcdc->name, sizeof(dcdc->name), "DCDC%d", id + 1); 756 750 dcdc->desc.name = dcdc->name; 751 + 752 + snprintf(dcdc->supply_name, sizeof(dcdc->supply_name), 753 + "DC%dVDD", id + 1); 754 + dcdc->desc.supply_name = dcdc->supply_name; 755 + 757 756 dcdc->desc.id = id; 758 757 dcdc->desc.type = REGULATOR_VOLTAGE; 759 758 dcdc->desc.n_voltages = WM831X_BUCKP_MAX_SELECTOR + 1;