Commit 5fb0f7fa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f47e3310 b1760233

drivers/acpi/acpi_lpss.c

+4 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ struct lpss_private_data; 


struct lpss_device_desc {

	unsigned int flags;

	const char *clk_con_id;

	unsigned int prv_offset;

	size_t prv_size_override;

	void (*setup)(struct lpss_private_data *pdata);
@@ -140,6 +141,7 @@ static struct lpss_device_desc lpt_i2c_dev_desc = { 


static struct lpss_device_desc lpt_uart_dev_desc = {

	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_LTR,

	.clk_con_id = "baudclk",

	.prv_offset = 0x800,

	.setup = lpss_uart_setup,

};
@@ -156,6 +158,7 @@ static struct lpss_device_desc byt_pwm_dev_desc = { 


static struct lpss_device_desc byt_uart_dev_desc = {

	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX,

	.clk_con_id = "baudclk",

	.prv_offset = 0x800,

	.setup = lpss_uart_setup,

};
@@ -313,7 +316,7 @@ out: 
		return PTR_ERR(clk);



	pdata->clk = clk;

	clk_register_clkdev(clk, NULL, devname);

	clk_register_clkdev(clk, dev_desc->clk_con_id, devname);

	return 0;

}

tools/power/cpupower/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ $(OUTPUT)%.o: %.c 


$(OUTPUT)cpupower: $(UTIL_OBJS) $(OUTPUT)libcpupower.so.$(LIB_MAJ)

	$(ECHO) "  CC      " $@

	$(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(UTIL_OBJS) -lcpupower -Wl,-rpath=./ -lrt -lpci -L$(OUTPUT) -o $@

	$(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(UTIL_OBJS) -lcpupower -lrt -lpci -L$(OUTPUT) -o $@

	$(QUIET) $(STRIPCMD) $@



$(OUTPUT)po/$(PACKAGE).pot: $(UTIL_SRC)

CRA Git | Maintained and supported by SUSTech CRA and CCSE