lkml.org 
[lkml]   [2022]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 1/7] thermal: mediatek: Relocate driver to mediatek folder
    Date
    From: Michael Kao <michael.kao@mediatek.com>

    Add Mediatek proprietary folder to upstream more thermal zone and cooler
    drivers. Relocate the original thermal controller driver to it and rename
    as soc_temp.c to show its purpose more clearly.

    Signed-off-by: Michael Kao <michael.kao@mediatek.comi>
    Signed-off-by: Ben Tseng <ben.tseng@mediatek.com>
    Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
    ---
    drivers/thermal/Kconfig | 14 ++++-------
    drivers/thermal/Makefile | 2 +-
    drivers/thermal/mediatek/Kconfig | 23 +++++++++++++++++++
    drivers/thermal/mediatek/Makefile | 1 +
    .../{mtk_thermal.c => mediatek/soc_temp.c} | 0
    5 files changed, 29 insertions(+), 11 deletions(-)
    create mode 100644 drivers/thermal/mediatek/Kconfig
    create mode 100644 drivers/thermal/mediatek/Makefile
    rename drivers/thermal/{mtk_thermal.c => mediatek/soc_temp.c} (100%)

    diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
    index e37691e0bf20..8669d7278055 100644
    --- a/drivers/thermal/Kconfig
    +++ b/drivers/thermal/Kconfig
    @@ -410,16 +410,10 @@ config DA9062_THERMAL
    zone.
    Compatible with the DA9062 and DA9061 PMICs.

    -config MTK_THERMAL
    - tristate "Temperature sensor driver for mediatek SoCs"
    - depends on ARCH_MEDIATEK || COMPILE_TEST
    - depends on HAS_IOMEM
    - depends on NVMEM || NVMEM=n
    - depends on RESET_CONTROLLER
    - default y
    - help
    - Enable this option if you want to have support for thermal management
    - controller present in Mediatek SoCs
    +menu "Mediatek thermal drivers"
    +depends on ARCH_MEDIATEK || COMPILE_TEST
    +source "drivers/thermal/mediatek/Kconfig"
    +endmenu

    config AMLOGIC_THERMAL
    tristate "Amlogic Thermal Support"
    diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
    index f0c36a1530d5..9ade39bdb525 100644
    --- a/drivers/thermal/Makefile
    +++ b/drivers/thermal/Makefile
    @@ -55,7 +55,7 @@ obj-y += st/
    obj-$(CONFIG_QCOM_TSENS) += qcom/
    obj-y += tegra/
    obj-$(CONFIG_HISI_THERMAL) += hisi_thermal.o
    -obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o
    +obj-$(CONFIG_MTK_THERMAL) += mediatek/
    obj-$(CONFIG_GENERIC_ADC_THERMAL) += thermal-generic-adc.o
    obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o
    obj-$(CONFIG_AMLOGIC_THERMAL) += amlogic_thermal.o
    diff --git a/drivers/thermal/mediatek/Kconfig b/drivers/thermal/mediatek/Kconfig
    new file mode 100644
    index 000000000000..0351e73170b7
    --- /dev/null
    +++ b/drivers/thermal/mediatek/Kconfig
    @@ -0,0 +1,23 @@
    +config MTK_THERMAL
    + tristate "Mediatek thermal drivers"
    + depends on THERMAL_OF
    + help
    + This is the option for Mediatek thermal software
    + solutions. Please enable corresponding options to
    + get temperature information from thermal sensors or
    + turn on throttle mechaisms for thermal mitigation.
    +
    +if MTK_THERMAL
    +
    +config MTK_SOC_THERMAL
    + tristate "Temperature sensor driver for mediatek SoCs"
    + depends on HAS_IOMEM
    + depends on NVMEM
    + depends on RESET_CONTROLLER
    + help
    + Enable this option if you want to get SoC temperature
    + information for Mediatek platforms. This driver
    + configures thermal controllers to collect temperature
    + via AUXADC interface.
    +
    +endif
    diff --git a/drivers/thermal/mediatek/Makefile b/drivers/thermal/mediatek/Makefile
    new file mode 100644
    index 000000000000..f75313ddce5e
    --- /dev/null
    +++ b/drivers/thermal/mediatek/Makefile
    @@ -0,0 +1 @@
    +obj-$(CONFIG_MTK_SOC_THERMAL) += soc_temp.o
    diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mediatek/soc_temp.c
    similarity index 100%
    rename from drivers/thermal/mtk_thermal.c
    rename to drivers/thermal/mediatek/soc_temp.c
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-05-12 14:25    [W:3.112 / U:0.572 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site