From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB1BB424D48 for ; Mon, 7 Sep 2026 11:30:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.10 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788780615; cv=none; b=DoQpGDhu7JxxgiQwDhQz6qHnJ+iTtDG1C7lFhbySMhVaL5JxwneweSwngNAf+s5p88Neo24vdApLr5tTb8/XdOqNC41pX8ty2QJddosTi5RmWw7FBtVN6FYtdZ553Pr5qgF+1mP+HGGSY6i/yZwGfjBnsdey7wTqJvjWgOfqmKU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788780615; c=relaxed/simple; bh=Q7EstEdN1e216uP+TT4JKwykcz6Qf6V05TwBi9sWl5U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cVuBh9q8o6Ih4/HiKO9ssKIspgJzYaLxGRDvU/f6sBiJ1WTY2SMZSpr+9gxFSJhMFQmCrbE2w7Mq1jHFeuXaLPMF6kwByoLdm8dogU8z5qkwtYy2vQACzhPuEGTL0KjHbSpCM426CRq7T+0CBxxIsa4gWGfDvuHHsvbXdFxjHEE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=N57XPdzo; arc=none smtp.client-ip=192.198.163.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="N57XPdzo" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1788780614; x=1820316614; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Q7EstEdN1e216uP+TT4JKwykcz6Qf6V05TwBi9sWl5U=; b=N57XPdzoqbwHNxovlsbxUo6ojO6b6y5V8mbDD+2sNLbo4bURUm3fAeuC PSWzEddEiJagGiok97L9386Qn/pMWQ+fk4MjeIqDEzihhMAeN+NujUYLo RQ0K/nO3/GDXM+VAREzfQXLIH5AtjH5RGuLz1ojfrk5BjgeyDtjYsvwWB RRmcpUN0LX36f5y9y0NSjFeFPahsUs5ABJB+5eDIn+PssZr2TgiaejHv/ R9ssKA6pzYNWO6paFGagtHtnLHiOZYHvcSmkiNJISeu9h7mIkDho6vCmp wZugKLQL/bHU/ejaZ83apHI0GoZSBT42xWcpdpIll614lT7pO7qrusFn2 A==; X-CSE-ConnectionGUID: /8956MRiQyaQX6UKDwqXwA== X-CSE-MsgGUID: yOgV3vGmRjGh3BkOJDVbcg== X-IronPort-AV: E=McAfee;i="6800,10657,11898"; a="100538608" X-IronPort-AV: E=Sophos;i="6.25,267,1779174000"; d="scan'208";a="100538608" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Sep 2026 04:30:10 -0700 X-CSE-ConnectionGUID: nux69L61SUC5nLCwfrgYFw== X-CSE-MsgGUID: 4xa0zMpiR8mBCUFsQmDr6A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,267,1779174000"; d="scan'208";a="300569151" Received: from abityuts-desk1.ger.corp.intel.com (HELO kekkonen.fi.intel.com) ([10.245.245.230]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Sep 2026 04:30:08 -0700 Received: from punajuuri.localdomain (unknown [192.168.240.130]) by kekkonen.fi.intel.com (Postfix) with ESMTP id B19A9121DAC; Mon, 07 Sep 2026 14:30:05 +0300 (EEST) Received: from sailus by punajuuri.localdomain with local (Exim 4.98.2) (envelope-from ) id 1x3XY5-0000000ARnc-0rEd; Mon, 07 Sep 2026 14:30:05 +0300 Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs, Bertel Jungin Aukio 5, 02600 Espoo From: Sakari Ailus To: linux-media@vger.kernel.org Cc: Antti Laakso , sarang.sapre@intel.com, daxing.li@intel.com, ong.hock.yu@intel.com Subject: [PATCH v4 11/45] media: ipu6: Rename IPU subsys ID Date: Mon, 7 Sep 2026 14:29:30 +0300 Message-ID: <20260907113004.2489993-12-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260907113004.2489993-1-sakari.ailus@linux.intel.com> References: <20260907113004.2489993-1-sakari.ailus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Antti Laakso We will need subsys ID later elsewhere, so move it to common header too. Signed-off-by: Antti Laakso Signed-off-by: Sakari Ailus --- drivers/media/pci/intel/ipu6/ipu6-mmu.h | 3 --- drivers/media/pci/intel/ipu6/ipu6.c | 5 ++--- drivers/media/pci/intel/ipu6/ipu6.h | 3 +++ 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/media/pci/intel/ipu6/ipu6-mmu.h b/drivers/media/pci/intel/ipu6/ipu6-mmu.h index 8e40b4a66d7d..35cac80d2d4e 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-mmu.h +++ b/drivers/media/pci/intel/ipu6/ipu6-mmu.h @@ -4,9 +4,6 @@ #ifndef IPU6_MMU_H #define IPU6_MMU_H -#define ISYS_MMID 1 -#define PSYS_MMID 0 - #include #include #include diff --git a/drivers/media/pci/intel/ipu6/ipu6.c b/drivers/media/pci/intel/ipu6/ipu6.c index 7ac9c92744c0..c24e18520de6 100644 --- a/drivers/media/pci/intel/ipu6/ipu6.c +++ b/drivers/media/pci/intel/ipu6/ipu6.c @@ -424,8 +424,7 @@ ipu6_isys_init(struct pci_dev *pdev, struct device *parent, "ipu6_bus_initialize_device isys failed\n"); } - isys_adev->mmu = ipu6_mmu_init(dev, base, ISYS_MMID, - &ipdata->hw_variant); + isys_adev->mmu = ipu6_mmu_init(dev, base, IPU_ISYS, &ipdata->hw_variant); if (IS_ERR(isys_adev->mmu)) { put_device(&isys_adev->auxdev.dev); return dev_err_cast_probe(dev, isys_adev->mmu, @@ -465,7 +464,7 @@ ipu6_psys_init(struct pci_dev *pdev, struct device *parent, "ipu6_bus_initialize_device psys failed\n"); } - psys_adev->mmu = ipu6_mmu_init(&pdev->dev, base, PSYS_MMID, + psys_adev->mmu = ipu6_mmu_init(&pdev->dev, base, IPU_PSYS, &ipdata->hw_variant); if (IS_ERR(psys_adev->mmu)) { put_device(&psys_adev->auxdev.dev); diff --git a/drivers/media/pci/intel/ipu6/ipu6.h b/drivers/media/pci/intel/ipu6/ipu6.h index ebae876058ca..dc98a787612f 100644 --- a/drivers/media/pci/intel/ipu6/ipu6.h +++ b/drivers/media/pci/intel/ipu6/ipu6.h @@ -70,6 +70,9 @@ struct ipu6_device { bool bus_ready_to_probe; }; +#define IPU_PSYS 0 +#define IPU_ISYS 1 + #define IPU6_ISYS_NAME "isys" #define IPU6_PSYS_NAME "psys" -- 2.47.3