Messages in this thread | | | Date | Mon, 19 Sep 2022 12:41:25 +0100 | Subject | Re: [PATCH v2 2/2] platform/x86/intel: pmc/core: Add Raptor Lake support to pmc core driver | From | Hans de Goede <> |
| |
Hk,
On 9/13/22 00:33, Gayatri Kammela wrote: > Add Raptor Lake client parts (both RPL and RPL_S) support to pmc core > driver. Raptor Lake client parts reuse all the Alder Lake PCH IPs. > > Cc: Srinivas Pandruvada <srinivas.pandruvada@intel.com> > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: David Box <david.e.box@intel.com> > Acked-by: Rajneesh Bhardwaj <irenic.rajneesh@gmail.com> > Acked-by: Hans de Goede <hdegoede@redhat.com> > Signed-off-by: Gayatri Kammela <gayatri.kammela@linux.intel.com> > --- > Changes since v1: > 1) Added a dependency patch- ea902bcc1943f7539200ec464de3f54335588774 : > "x86/cpu: Add new Raptor Lake CPU model number". > 2) Rebased the above patch on v6.0-rc1 with "Acked-by" from Hans and > Rajneesh.
I still cannot take this, since patch 1/2 is *already merged* through another tree, so me cherry-picking it leads to potential conflicts.
As I have already explained twice you need to submit this upstream throuh the same tree which has the original merge of patch 1/2.
You can tell the maintainer of that tree that I'm ok with merging this through that maintainers tree and that that is what my Ack is for.
Regards,
Hans
> > drivers/platform/x86/intel/pmc/core.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c > index a1fe1e0dcf4a..17ec5825d13d 100644 > --- a/drivers/platform/x86/intel/pmc/core.c > +++ b/drivers/platform/x86/intel/pmc/core.c > @@ -1914,6 +1914,8 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = { > X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N, &tgl_reg_map), > X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &adl_reg_map), > X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &tgl_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &adl_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &adl_reg_map), > {} > }; >
| |