Skip to content

Fix thermal driver #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codesnake merged 2 commits into from
Jul 20, 2016
Merged

Fix thermal driver #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75e80cf
Fix thermal driver
arco Jul 25, 2015
3a531de
Comment adapted to corresponding #ifdef
drieschel Jul 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/amlogic/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ obj-$(CONFIG_TVIN) += tvin/

obj-$(CONFIG_AML_EXT_HDMIIN) += ext_hdmiin/

#obj-y += thermal/
obj-y += thermal/


#####Sound system is later init in kernel default..######################
Expand Down
3 changes: 2 additions & 1 deletion drivers/amlogic/thermal/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#
#Makefile for the thermal dirver
#
obj-$(CONFIG_AMLOGIC_THERMAL)+= amlogic_thermal.o
obj-$(CONFIG_AML_PLATFORM_THERMAL)+= amlogic_thermal.o

2 changes: 2 additions & 0 deletions drivers/thermal/gpu_cooling.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ void gpufreq_cooling_unregister(struct thermal_cooling_device *cdev)
}
EXPORT_SYMBOL_GPL(gpufreq_cooling_unregister);

#if defined(CONFIG_AML_VIRTUAL_THERMAL) && !defined(CONFIG_AML_PLATFORM_THERMAL)
unsigned int (*gpu_freq_callback)(void) = NULL;
int register_gpu_freq_info(unsigned int (*fun)(void))
{
Expand All @@ -245,3 +246,4 @@ int register_gpu_freq_info(unsigned int (*fun)(void))
}
EXPORT_SYMBOL(register_gpu_freq_info);
EXPORT_SYMBOL(gpu_freq_callback);
#endif
4 changes: 2 additions & 2 deletions include/linux/thermal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ static inline int thermal_generate_netlink_event(struct thermal_zone_device *tz,
}
#endif

#ifdef CONFIG_AMLOGIC_THERMAL
#ifdef CONFIG_AML_PLATFORM_THERMAL
#include <mach/thermal.h>
#endif /* CONFIG_AMLOGIC_THERMAL */
#endif /* CONFIG_AML_PLATFORM_THERMAL */

#endif /* __THERMAL_H__ */