diff mbox series

ACPI: DPTF: Support Meteor Lake

Message ID 20220523172724.30556-1-sumeet.r.pawnikar@intel.com (mailing list archive)
State Superseded, archived
Headers show
Series ACPI: DPTF: Support Meteor Lake | expand

Commit Message

Sumeet Pawnikar May 23, 2022, 5:27 p.m. UTC 
Add Meteor Lake ACPI IDs for DPTF devices.

Signed-off-by: Sumeet Pawnikar <sumeet.r.pawnikar@intel.com>
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
 drivers/acpi/dptf/dptf_pch_fivr.c                       | 1 +
 drivers/acpi/dptf/dptf_power.c                          | 2 ++
 drivers/acpi/dptf/int340x_thermal.c                     | 6 ++++++
 drivers/acpi/fan.h                                      | 1 +
 drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 1 +
 drivers/thermal/intel/int340x_thermal/int3403_thermal.c | 1 +
 6 files changed, 12 insertions(+)

Comments

Srinivas Pandruvada May 23, 2022, 5:35 p.m. UTC | #1 
On Mon, 2022-05-23 at 22:57 +0530, Sumeet Pawnikar wrote:
> Add Meteor Lake ACPI IDs for DPTF devices.
> 
> Signed-off-by: Sumeet Pawnikar <sumeet.r.pawnikar@intel.com>
> Signed-off-by: Srinivas Pandruvada
> <srinivas.pandruvada@linux.intel.com>
Replace Signed-off-by 
Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>


> ---
>  drivers/acpi/dptf/dptf_pch_fivr.c                       | 1 +
>  drivers/acpi/dptf/dptf_power.c                          | 2 ++
>  drivers/acpi/dptf/int340x_thermal.c                     | 6 ++++++
>  drivers/acpi/fan.h                                      | 1 +
>  drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 1 +
>  drivers/thermal/intel/int340x_thermal/int3403_thermal.c | 1 +
>  6 files changed, 12 insertions(+)
> 
> diff --git a/drivers/acpi/dptf/dptf_pch_fivr.c
> b/drivers/acpi/dptf/dptf_pch_fivr.c
> index c0da24c9f8c3..4919e7abe93f 100644
> --- a/drivers/acpi/dptf/dptf_pch_fivr.c
> +++ b/drivers/acpi/dptf/dptf_pch_fivr.c
> @@ -151,6 +151,7 @@ static int pch_fivr_remove(struct platform_device
> *pdev)
>  static const struct acpi_device_id pch_fivr_device_ids[] = {
>         {"INTC1045", 0},
>         {"INTC1049", 0},
> +       {"INTC1064", 0},
>         {"INTC10A3", 0},
>         {"", 0},
>  };
> diff --git a/drivers/acpi/dptf/dptf_power.c
> b/drivers/acpi/dptf/dptf_power.c
> index dc1f52a5b3f4..a5f29d061b37 100644
> --- a/drivers/acpi/dptf/dptf_power.c
> +++ b/drivers/acpi/dptf/dptf_power.c
> @@ -231,6 +231,8 @@ static const struct acpi_device_id
> int3407_device_ids[] = {
>         {"INTC1050", 0},
>         {"INTC1060", 0},
>         {"INTC1061", 0},
> +       {"INTC1065", 0},
> +       {"INTC1066", 0},
>         {"INTC10A4", 0},
>         {"INTC10A5", 0},
>         {"", 0},
> diff --git a/drivers/acpi/dptf/int340x_thermal.c
> b/drivers/acpi/dptf/int340x_thermal.c
> index 42a556346548..b7113fa92fa6 100644
> --- a/drivers/acpi/dptf/int340x_thermal.c
> +++ b/drivers/acpi/dptf/int340x_thermal.c
> @@ -27,6 +27,7 @@ static const struct acpi_device_id
> int340x_thermal_device_ids[] = {
>         {"INT3532"},
>         {"INTC1040"},
>         {"INTC1041"},
> +       {"INTC1042"},
>         {"INTC1043"},
>         {"INTC1044"},
>         {"INTC1045"},
> @@ -37,6 +38,11 @@ static const struct acpi_device_id
> int340x_thermal_device_ids[] = {
>         {"INTC1050"},
>         {"INTC1060"},
>         {"INTC1061"},
> +       {"INTC1062"},
> +       {"INTC1063"},
> +       {"INTC1064"},
> +       {"INTC1065"},
> +       {"INTC1066"},
>         {"INTC10A0"},
>         {"INTC10A1"},
>         {"INTC10A2"},
> diff --git a/drivers/acpi/fan.h b/drivers/acpi/fan.h
> index 44728529a5b6..e7b4b4e4a55e 100644
> --- a/drivers/acpi/fan.h
> +++ b/drivers/acpi/fan.h
> @@ -14,6 +14,7 @@
>         {"INT3404", }, /* Fan */ \
>         {"INTC1044", }, /* Fan for Tiger Lake generation */ \
>         {"INTC1048", }, /* Fan for Alder Lake generation */ \
> +       {"INTC1063", }, /* Fan for Meteor Lake generation */ \
>         {"INTC10A2", }, /* Fan for Raptor Lake generation */ \
>         {"PNP0C0B", } /* Generic ACPI fan */
>  
> diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> index 79931ddc582a..1ea861473cba 100644
> --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> @@ -669,6 +669,7 @@ static const struct acpi_device_id
> int3400_thermal_match[] = {
>         {"INT3400", 0},
>         {"INTC1040", 0},
>         {"INTC1041", 0},
> +       {"INTC1042", 0},
>         {"INTC10A0", 0},
>         {}
>  };
> diff --git a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
> b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
> index 07e25321dfe3..71d084c4c456 100644
> --- a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
> +++ b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
> @@ -285,6 +285,7 @@ static const struct acpi_device_id
> int3403_device_ids[] = {
>         {"INT3403", 0},
>         {"INTC1043", 0},
>         {"INTC1046", 0},
> +       {"INTC1062", 0},
>         {"INTC10A1", 0},
>         {"", 0},
>  };
Rafael J. Wysocki May 25, 2022, 1:38 p.m. UTC | #2 
On Mon, May 23, 2022 at 7:35 PM srinivas pandruvada
<srinivas.pandruvada@linux.intel.com> wrote:
>
> On Mon, 2022-05-23 at 22:57 +0530, Sumeet Pawnikar wrote:
> > Add Meteor Lake ACPI IDs for DPTF devices.
> >
> > Signed-off-by: Sumeet Pawnikar <sumeet.r.pawnikar@intel.com>
> > Signed-off-by: Srinivas Pandruvada
> > <srinivas.pandruvada@linux.intel.com>
> Replace Signed-off-by
> Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>

Applied as 5.19-rc material, thanks!

> > ---
> >  drivers/acpi/dptf/dptf_pch_fivr.c                       | 1 +
> >  drivers/acpi/dptf/dptf_power.c                          | 2 ++
> >  drivers/acpi/dptf/int340x_thermal.c                     | 6 ++++++
> >  drivers/acpi/fan.h                                      | 1 +
> >  drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 1 +
> >  drivers/thermal/intel/int340x_thermal/int3403_thermal.c | 1 +
> >  6 files changed, 12 insertions(+)
> >
> > diff --git a/drivers/acpi/dptf/dptf_pch_fivr.c
> > b/drivers/acpi/dptf/dptf_pch_fivr.c
> > index c0da24c9f8c3..4919e7abe93f 100644
> > --- a/drivers/acpi/dptf/dptf_pch_fivr.c
> > +++ b/drivers/acpi/dptf/dptf_pch_fivr.c
> > @@ -151,6 +151,7 @@ static int pch_fivr_remove(struct platform_device
> > *pdev)
> >  static const struct acpi_device_id pch_fivr_device_ids[] = {
> >         {"INTC1045", 0},
> >         {"INTC1049", 0},
> > +       {"INTC1064", 0},
> >         {"INTC10A3", 0},
> >         {"", 0},
> >  };
> > diff --git a/drivers/acpi/dptf/dptf_power.c
> > b/drivers/acpi/dptf/dptf_power.c
> > index dc1f52a5b3f4..a5f29d061b37 100644
> > --- a/drivers/acpi/dptf/dptf_power.c
> > +++ b/drivers/acpi/dptf/dptf_power.c
> > @@ -231,6 +231,8 @@ static const struct acpi_device_id
> > int3407_device_ids[] = {
> >         {"INTC1050", 0},
> >         {"INTC1060", 0},
> >         {"INTC1061", 0},
> > +       {"INTC1065", 0},
> > +       {"INTC1066", 0},
> >         {"INTC10A4", 0},
> >         {"INTC10A5", 0},
> >         {"", 0},
> > diff --git a/drivers/acpi/dptf/int340x_thermal.c
> > b/drivers/acpi/dptf/int340x_thermal.c
> > index 42a556346548..b7113fa92fa6 100644
> > --- a/drivers/acpi/dptf/int340x_thermal.c
> > +++ b/drivers/acpi/dptf/int340x_thermal.c
> > @@ -27,6 +27,7 @@ static const struct acpi_device_id
> > int340x_thermal_device_ids[] = {
> >         {"INT3532"},
> >         {"INTC1040"},
> >         {"INTC1041"},
> > +       {"INTC1042"},
> >         {"INTC1043"},
> >         {"INTC1044"},
> >         {"INTC1045"},
> > @@ -37,6 +38,11 @@ static const struct acpi_device_id
> > int340x_thermal_device_ids[] = {
> >         {"INTC1050"},
> >         {"INTC1060"},
> >         {"INTC1061"},
> > +       {"INTC1062"},
> > +       {"INTC1063"},
> > +       {"INTC1064"},
> > +       {"INTC1065"},
> > +       {"INTC1066"},
> >         {"INTC10A0"},
> >         {"INTC10A1"},
> >         {"INTC10A2"},
> > diff --git a/drivers/acpi/fan.h b/drivers/acpi/fan.h
> > index 44728529a5b6..e7b4b4e4a55e 100644
> > --- a/drivers/acpi/fan.h
> > +++ b/drivers/acpi/fan.h
> > @@ -14,6 +14,7 @@
> >         {"INT3404", }, /* Fan */ \
> >         {"INTC1044", }, /* Fan for Tiger Lake generation */ \
> >         {"INTC1048", }, /* Fan for Alder Lake generation */ \
> > +       {"INTC1063", }, /* Fan for Meteor Lake generation */ \
> >         {"INTC10A2", }, /* Fan for Raptor Lake generation */ \
> >         {"PNP0C0B", } /* Generic ACPI fan */
> >
> > diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> > b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> > index 79931ddc582a..1ea861473cba 100644
> > --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> > +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
> > @@ -669,6 +669,7 @@ static const struct acpi_device_id
> > int3400_thermal_match[] = {
> >         {"INT3400", 0},
> >         {"INTC1040", 0},
> >         {"INTC1041", 0},
> > +       {"INTC1042", 0},
> >         {"INTC10A0", 0},
> >         {}
> >  };
> > diff --git a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
> > b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
> > index 07e25321dfe3..71d084c4c456 100644
> > --- a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
> > +++ b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
> > @@ -285,6 +285,7 @@ static const struct acpi_device_id
> > int3403_device_ids[] = {
> >         {"INT3403", 0},
> >         {"INTC1043", 0},
> >         {"INTC1046", 0},
> > +       {"INTC1062", 0},
> >         {"INTC10A1", 0},
> >         {"", 0},
> >  };
>
diff mbox series

Patch

diff --git a/drivers/acpi/dptf/dptf_pch_fivr.c b/drivers/acpi/dptf/dptf_pch_fivr.c
index c0da24c9f8c3..4919e7abe93f 100644
--- a/drivers/acpi/dptf/dptf_pch_fivr.c
+++ b/drivers/acpi/dptf/dptf_pch_fivr.c
@@ -151,6 +151,7 @@  static int pch_fivr_remove(struct platform_device *pdev)
 static const struct acpi_device_id pch_fivr_device_ids[] = {
 	{"INTC1045", 0},
 	{"INTC1049", 0},
+	{"INTC1064", 0},
 	{"INTC10A3", 0},
 	{"", 0},
 };
diff --git a/drivers/acpi/dptf/dptf_power.c b/drivers/acpi/dptf/dptf_power.c
index dc1f52a5b3f4..a5f29d061b37 100644
--- a/drivers/acpi/dptf/dptf_power.c
+++ b/drivers/acpi/dptf/dptf_power.c
@@ -231,6 +231,8 @@  static const struct acpi_device_id int3407_device_ids[] = {
 	{"INTC1050", 0},
 	{"INTC1060", 0},
 	{"INTC1061", 0},
+	{"INTC1065", 0},
+	{"INTC1066", 0},
 	{"INTC10A4", 0},
 	{"INTC10A5", 0},
 	{"", 0},
diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340x_thermal.c
index 42a556346548..b7113fa92fa6 100644
--- a/drivers/acpi/dptf/int340x_thermal.c
+++ b/drivers/acpi/dptf/int340x_thermal.c
@@ -27,6 +27,7 @@  static const struct acpi_device_id int340x_thermal_device_ids[] = {
 	{"INT3532"},
 	{"INTC1040"},
 	{"INTC1041"},
+	{"INTC1042"},
 	{"INTC1043"},
 	{"INTC1044"},
 	{"INTC1045"},
@@ -37,6 +38,11 @@  static const struct acpi_device_id int340x_thermal_device_ids[] = {
 	{"INTC1050"},
 	{"INTC1060"},
 	{"INTC1061"},
+	{"INTC1062"},
+	{"INTC1063"},
+	{"INTC1064"},
+	{"INTC1065"},
+	{"INTC1066"},
 	{"INTC10A0"},
 	{"INTC10A1"},
 	{"INTC10A2"},
diff --git a/drivers/acpi/fan.h b/drivers/acpi/fan.h
index 44728529a5b6..e7b4b4e4a55e 100644
--- a/drivers/acpi/fan.h
+++ b/drivers/acpi/fan.h
@@ -14,6 +14,7 @@ 
 	{"INT3404", }, /* Fan */ \
 	{"INTC1044", }, /* Fan for Tiger Lake generation */ \
 	{"INTC1048", }, /* Fan for Alder Lake generation */ \
+	{"INTC1063", }, /* Fan for Meteor Lake generation */ \
 	{"INTC10A2", }, /* Fan for Raptor Lake generation */ \
 	{"PNP0C0B", } /* Generic ACPI fan */
 
diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
index 79931ddc582a..1ea861473cba 100644
--- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
@@ -669,6 +669,7 @@  static const struct acpi_device_id int3400_thermal_match[] = {
 	{"INT3400", 0},
 	{"INTC1040", 0},
 	{"INTC1041", 0},
+	{"INTC1042", 0},
 	{"INTC10A0", 0},
 	{}
 };
diff --git a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
index 07e25321dfe3..71d084c4c456 100644
--- a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
@@ -285,6 +285,7 @@  static const struct acpi_device_id int3403_device_ids[] = {
 	{"INT3403", 0},
 	{"INTC1043", 0},
 	{"INTC1046", 0},
+	{"INTC1062", 0},
 	{"INTC10A1", 0},
 	{"", 0},
 };