On Fri, Mar 11, 2016 at 11:09:12AM +0800, Wei Ni wrote:
> Move Tegra soctherm driver to tegra directory, it's easy to maintain
> and add more new function support for Tegra platforms.
> This will also help to split soctherm driver into common parts and
> chip specific data related parts.
>
> Signed-off-by: Wei Ni <wni@xxxxxxxxxx>
> ---
> drivers/thermal/Kconfig | 12 ++----------
> drivers/thermal/Makefile | 2 +-
> drivers/thermal/tegra/Kconfig | 13 +++++++++++++
> drivers/thermal/tegra/Makefile | 1 +
> .../thermal/{tegra_soctherm.c => tegra/tegra-soctherm.c} | 0
> 5 files changed, 17 insertions(+), 11 deletions(-)
> create mode 100644 drivers/thermal/tegra/Kconfig
> create mode 100644 drivers/thermal/tegra/Makefile
> rename drivers/thermal/{tegra_soctherm.c => tegra/tegra-soctherm.c} (100%)
>
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index 8cc4ac64a91c..1802629f5051 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -254,16 +254,6 @@ config ARMADA_THERMAL
> Enable this option if you want to have support for thermal management
> controller present in Armada 370 and Armada XP SoC.
>
> -config TEGRA_SOCTHERM
> - tristate "Tegra SOCTHERM thermal management"
> - depends on ARCH_TEGRA
> - help
> - Enable this option for integrated thermal management support on NVIDIA
> - Tegra124 systems-on-chip. The driver supports four thermal zones
> - (CPU, GPU, MEM, PLLX). Cooling devices can be bound to the thermal
> - zones to manage temperatures. This option is also required for the
> - emergency thermal reset (thermtrip) feature to function.
> -
> config DB8500_CPUFREQ_COOLING
> tristate "DB8500 cpufreq cooling"
> depends on ARCH_U8500
> @@ -380,6 +370,8 @@ depends on ARCH_STI && OF
> source "drivers/thermal/st/Kconfig"
> endmenu
>
> +source "drivers/thermal/tegra/Kconfig"
> +
> config QCOM_SPMI_TEMP_ALARM
> tristate "Qualcomm SPMI PMIC Temperature Alarm"
> depends on OF && SPMI && IIO
> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> index cfae6a654793..119e25cdcc66 100644
> --- a/drivers/thermal/Makefile
> +++ b/drivers/thermal/Makefile
> @@ -46,5 +46,5 @@ obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/
> obj-$(CONFIG_INT340X_THERMAL) += int340x_thermal/
> obj-$(CONFIG_INTEL_PCH_THERMAL) += intel_pch_thermal.o
> obj-$(CONFIG_ST_THERMAL) += st/
> -obj-$(CONFIG_TEGRA_SOCTHERM) += tegra_soctherm.o
> +obj-$(CONFIG_TEGRA_SOCTHERM) += tegra/
> obj-$(CONFIG_HISI_THERMAL) += hisi_thermal.o
> diff --git a/drivers/thermal/tegra/Kconfig b/drivers/thermal/tegra/Kconfig
> new file mode 100644
> index 000000000000..0b719d8b629b
> --- /dev/null
> +++ b/drivers/thermal/tegra/Kconfig
> @@ -0,0 +1,13 @@
> +menu "NVIDIA Tegra thermal drivers"
> +
> +config TEGRA_SOCTHERM
> + tristate "Tegra SOCTHERM thermal management"
> + depends on ARCH_TEGRA
You probably want to move the depends part to the menu section, so the
menu wont appear where it shouldnt.
> + help
> + Enable this option for integrated thermal management support on NVIDIA
> + Tegra124 systems-on-chip. The driver supports four thermal zones
> + (CPU, GPU, MEM, PLLX). Cooling devices can be bound to the thermal
> + zones to manage temperatures. This option is also required for the
> + emergency thermal reset (thermtrip) feature to function.
> +
> +endmenu
> diff --git a/drivers/thermal/tegra/Makefile b/drivers/thermal/tegra/Makefile
> new file mode 100644
> index 000000000000..d4dc4e7f279e
> --- /dev/null
> +++ b/drivers/thermal/tegra/Makefile
> @@ -0,0 +1 @@
> +obj-$(CONFIG_TEGRA_SOCTHERM) += tegra-soctherm.o
> diff --git a/drivers/thermal/tegra_soctherm.c b/drivers/thermal/tegra/tegra-soctherm.c
> similarity index 100%
> rename from drivers/thermal/tegra_soctherm.c
> rename to drivers/thermal/tegra/tegra-soctherm.c
> --
> 1.9.1
>
Attachment:
signature.asc
Description: Digital signature
