Commit 332fd900 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-devfreq' and 'pm-tools' 

* pm-devfreq:
  PM / devfreq: rk3399_dmc: Remove unneeded semicolon
  PM / devfreq: Replace devfreq->dev.parent as dev in devfreq_add_device
  PM / devfreq: Correct spelling in a comment

* pm-tools:
  cpupower: Add cpuid cap flag for MSR_AMD_HWCR support
  cpupower: Remove family arg to decode_pstates()
  cpupower: Condense pstate enabled bit checks in decode_pstates()
  cpupower: Update family checks when decoding HW pstates
  cpupower: Remove unused pscur variable.
  cpupower: Add CPUPOWER_CAP_AMD_HW_PSTATE cpuid caps flag
  cpupower: Correct macro name for CPB caps flag
  cpupower: Update msr_pstate union struct naming
  cpupower: add Makefile dependencies for install targets
parents f5c233c8 91a4b9e6 a51d1856

drivers/devfreq/devfreq.c

+2 −2
Original line number Diff line number Diff line
@@ -900,13 +900,13 @@ struct devfreq *devfreq_add_device(struct device *dev, 
		goto err_devfreq;



	devfreq->nb_min.notifier_call = qos_min_notifier_call;

	err = dev_pm_qos_add_notifier(devfreq->dev.parent, &devfreq->nb_min,

	err = dev_pm_qos_add_notifier(dev, &devfreq->nb_min,

				      DEV_PM_QOS_MIN_FREQUENCY);

	if (err)

		goto err_devfreq;



	devfreq->nb_max.notifier_call = qos_max_notifier_call;

	err = dev_pm_qos_add_notifier(devfreq->dev.parent, &devfreq->nb_max,

	err = dev_pm_qos_add_notifier(dev, &devfreq->nb_max,

				      DEV_PM_QOS_MAX_FREQUENCY);

	if (err)

		goto err_devfreq;

drivers/devfreq/governor.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
/*

 * Definition of governor attribute flags except for common sysfs attributes

 * - DEVFREQ_GOV_ATTR_POLLING_INTERVAL

 *   : Indicate polling_interal sysfs attribute

 *   : Indicate polling_interval sysfs attribute

 * - DEVFREQ_GOV_ATTR_TIMER

 *   : Indicate timer sysfs attribute

 */

drivers/devfreq/rk3399_dmc.c

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) 
	default:

		ret = -EINVAL;

		goto err_edev;

	};

	}



no_pmu:

	arm_smccc_smc(ROCKCHIP_SIP_DRAM_FREQ, 0, 0,

tools/power/cpupower/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -270,14 +270,14 @@ clean: 
	$(MAKE) -C bench O=$(OUTPUT) clean





install-lib:

install-lib: libcpupower

	$(INSTALL) -d $(DESTDIR)${libdir}

	$(CP) $(OUTPUT)libcpupower.so* $(DESTDIR)${libdir}/

	$(INSTALL) -d $(DESTDIR)${includedir}

	$(INSTALL_DATA) lib/cpufreq.h $(DESTDIR)${includedir}/cpufreq.h

	$(INSTALL_DATA) lib/cpuidle.h $(DESTDIR)${includedir}/cpuidle.h



install-tools:

install-tools: $(OUTPUT)cpupower

	$(INSTALL) -d $(DESTDIR)${bindir}

	$(INSTALL_PROGRAM) $(OUTPUT)cpupower $(DESTDIR)${bindir}

	$(INSTALL) -d $(DESTDIR)${bash_completion_dir}
@@ -293,14 +293,14 @@ install-man: 
	$(INSTALL_DATA) -D man/cpupower-info.1 $(DESTDIR)${mandir}/man1/cpupower-info.1

	$(INSTALL_DATA) -D man/cpupower-monitor.1 $(DESTDIR)${mandir}/man1/cpupower-monitor.1



install-gmo:

install-gmo: create-gmo

	$(INSTALL) -d $(DESTDIR)${localedir}

	for HLANG in $(LANGUAGES); do \

		echo '$(INSTALL_DATA) -D $(OUTPUT)po/$$HLANG.gmo $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpupower.mo'; \

		$(INSTALL_DATA) -D $(OUTPUT)po/$$HLANG.gmo $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpupower.mo; \

	done;



install-bench:

install-bench: compile-bench

	@#DESTDIR must be set from outside to survive

	@sbindir=$(sbindir) bindir=$(bindir) docdir=$(docdir) confdir=$(confdir) $(MAKE) -C bench O=$(OUTPUT) install

tools/power/cpupower/bench/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ $(OUTPUT)cpufreq-bench: $(OBJS) 


all: $(OUTPUT)cpufreq-bench



install:

install: $(OUTPUT)cpufreq-bench

	mkdir -p $(DESTDIR)/$(sbindir)

	mkdir -p $(DESTDIR)/$(bindir)

	mkdir -p $(DESTDIR)/$(docdir)