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

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'pm+acpi-4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management and ACPI fixes from Rafael Wysocki:
"Just two fixes, one for an ACPI LPSS driver issue introduced during
the 3.17 cycle and one revert of a recent commit that sort of broke
the cpupower tool.

Specifics:

- Fix an ACPI LPSS (Low-Power Subsystem) driver issue causing the
8250_dw driver to confuse an LPSS clock with another one it is
supposed to handle due to the lack of identification allowing it to
tell those clocks apart (Heikki Krogerus).

- Revert a recent commit that was supposed to improve the usability
of the cpupower tool, but clearly did the opposite (Josh Boyer)"

* tag 'pm+acpi-4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "cpupower Makefile change to help run the tool without 'make install'"
ACPI / LPSS: provide con_id for the clkdev

Linus Torvalds 5fb0f7fa f47e3310

+5 -2
+4 -1
drivers/acpi/acpi_lpss.c
··· 65 65 66 66 struct lpss_device_desc { 67 67 unsigned int flags; 68 + const char *clk_con_id; 68 69 unsigned int prv_offset; 69 70 size_t prv_size_override; 70 71 void (*setup)(struct lpss_private_data *pdata); ··· 141 140 142 141 static struct lpss_device_desc lpt_uart_dev_desc = { 143 142 .flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_LTR, 143 + .clk_con_id = "baudclk", 144 144 .prv_offset = 0x800, 145 145 .setup = lpss_uart_setup, 146 146 }; ··· 158 156 159 157 static struct lpss_device_desc byt_uart_dev_desc = { 160 158 .flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX, 159 + .clk_con_id = "baudclk", 161 160 .prv_offset = 0x800, 162 161 .setup = lpss_uart_setup, 163 162 }; ··· 316 313 return PTR_ERR(clk); 317 314 318 315 pdata->clk = clk; 319 - clk_register_clkdev(clk, NULL, devname); 316 + clk_register_clkdev(clk, dev_desc->clk_con_id, devname); 320 317 return 0; 321 318 } 322 319
+1 -1
tools/power/cpupower/Makefile
··· 209 209 210 210 $(OUTPUT)cpupower: $(UTIL_OBJS) $(OUTPUT)libcpupower.so.$(LIB_MAJ) 211 211 $(ECHO) " CC " $@ 212 - $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(UTIL_OBJS) -lcpupower -Wl,-rpath=./ -lrt -lpci -L$(OUTPUT) -o $@ 212 + $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(UTIL_OBJS) -lcpupower -lrt -lpci -L$(OUTPUT) -o $@ 213 213 $(QUIET) $(STRIPCMD) $@ 214 214 215 215 $(OUTPUT)po/$(PACKAGE).pot: $(UTIL_SRC)