diff options
| author | Darren Sun <darrens@nvidia.com> | 2018-07-08 22:52:26 -0400 |
|---|---|---|
| committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-07-09 09:55:06 -0400 |
| commit | 9884cdbf40fc22af3706230946ffcabc33b4cccd (patch) | |
| tree | 5274d0b56f9576657c875cbae1409d7c5f4711d6 | |
| parent | e6389bf0b4829e8f38e9c9985947ad561b0bfe6f (diff) | |
pwm_fan: port the pwm fan driver to linux-nvidia repo
Update the Kconfig and Makefile for pwm fan.
Bug 200428643
Change-Id: I099d42acab6afb5231a4239208631a9a430c3416
Signed-off-by: Darren Sun <darrens@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1774041
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
| -rw-r--r-- | drivers/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/Makefile | 1 | ||||
| -rw-r--r-- | drivers/thermal/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/thermal/Makefile | 1 |
4 files changed, 9 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index f9aeaba02..2c7a00326 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
| @@ -6,6 +6,7 @@ source "drivers/nvpmodel/Kconfig" | |||
| 6 | source "drivers/nvlink/Kconfig" | 6 | source "drivers/nvlink/Kconfig" |
| 7 | source "drivers/iommu/Kconfig" | 7 | source "drivers/iommu/Kconfig" |
| 8 | source "drivers/nvpps/Kconfig" | 8 | source "drivers/nvpps/Kconfig" |
| 9 | source "drivers/thermal/Kconfig" | ||
| 9 | endif | 10 | endif |
| 10 | 11 | ||
| 11 | endmenu | 12 | endmenu |
diff --git a/drivers/Makefile b/drivers/Makefile index 69927e062..2f0c47417 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -14,3 +14,4 @@ subdir-ccflags-y += -Werror | |||
| 14 | obj-$(CONFIG_NVPMODEL_EMC) += nvpmodel/ | 14 | obj-$(CONFIG_NVPMODEL_EMC) += nvpmodel/ |
| 15 | obj-$(CONFIG_TEGRA_NVLINK) += nvlink/ | 15 | obj-$(CONFIG_TEGRA_NVLINK) += nvlink/ |
| 16 | obj-$(CONFIG_NVPPS) += nvpps/ | 16 | obj-$(CONFIG_NVPPS) += nvpps/ |
| 17 | obj-$(CONFIG_THERMAL) += thermal/ | ||
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 7be09001a..d88c71370 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig | |||
| @@ -13,6 +13,12 @@ | |||
| 13 | # You should have received a copy of the GNU General Public License | 13 | # You should have received a copy of the GNU General Public License |
| 14 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | 15 | ||
| 16 | config PWM_FAN | ||
| 17 | tristate "Tegra PWM Fan driver" | ||
| 18 | depends on THERMAL | ||
| 19 | help | ||
| 20 | Enables the fan driver that is controlled by pwm. | ||
| 21 | |||
| 16 | config THERMAL_GOV_PID | 22 | config THERMAL_GOV_PID |
| 17 | bool "PID thermal governor" | 23 | bool "PID thermal governor" |
| 18 | help | 24 | help |
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 61e9b4d80..b13410254 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile | |||
| @@ -5,5 +5,6 @@ ccflags-y += -I$(srctree)/drivers/thermal | |||
| 5 | obj-$(CONFIG_NV_TEGRA_BPMP) += tegra_bpmp_thermal.o | 5 | obj-$(CONFIG_NV_TEGRA_BPMP) += tegra_bpmp_thermal.o |
| 6 | obj-$(CONFIG_TEGRA_THERMAL_THROTTLE) += tegra_throttle.o | 6 | obj-$(CONFIG_TEGRA_THERMAL_THROTTLE) += tegra_throttle.o |
| 7 | obj-$(CONFIG_TEGRA_THERMAL_THROTTLE) += tegra_thermal_throttle.o | 7 | obj-$(CONFIG_TEGRA_THERMAL_THROTTLE) += tegra_thermal_throttle.o |
| 8 | obj-$(CONFIG_PWM_FAN) += pwm_fan.o | ||
| 8 | 9 | ||
| 9 | thermal_sys-$(CONFIG_THERMAL_GOV_PID) += pid_thermal_gov.o | 10 | thermal_sys-$(CONFIG_THERMAL_GOV_PID) += pid_thermal_gov.o |
