From patchwork Thu Jan 6 16:41:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 12705540 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 91989C433EF for ; Thu, 6 Jan 2022 16:43:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=+HENIUWtwS/gH+wqxsjtqBYzzS0Uyw26J4NskFxkNtQ=; b=1Wm4s0yKaIEsQt iOybuWimM4txQikVxouvhq2bWnO2LHEvp/HVfWOI2p7ossoOVcYa16APhpoGsM5aDd/hW5VvBs8Ok lx8UZuonxaCUQWQHcuHB0pVuahjbNJKqX75SV51oxdWU+zbbUAcjd6f72g1DbVWNyHyzBJ72pSvir m+MizEcd0+tUjR8YMnDMITampKzebcxMVFAk65QLTFma8fABfRTXC5Vo9TZhTmWYWBVeTk6HM4W1s swzlcmg7J8tYlKjn0iikmr7ydlUyR/fVmqM5i3VtFXoAF04jNttGhXiAJ9s8RFHZ9J4yus8rZV2EE HuUDrYnHY2sw1+IfJKBQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5Vq6-000h3n-PU; Thu, 06 Jan 2022 16:42:11 +0000 Received: from mail-am6eur05on2047.outbound.protection.outlook.com ([40.107.22.47] helo=EUR05-AM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5Vq2-000h18-EN for linux-arm-kernel@lists.infradead.org; Thu, 06 Jan 2022 16:42:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M5bl5FevYy/vKTnPQ661LzLD9KkcbusWIAL1r74TKY7DwGNTFOpj7gHgpqI8V2YGftvuYx32s2YT03ZmThpVNZ72GXIVXnI9yyrBWp9DH9Hb5238asZFLfBULILRgd5ochvbF+Inzb1giCzwfgOyfDoSCrxb4rp7c+gMkLzX11D7cCE839QPl2WGziSRhclGT/4ux3dCe2iUhGt8NP4yNVgmtxfjRP0LcuUd5dHYKExInoiEaEZShFcUiI3qkuMf5yMW9Z6a91h5OFtHSlnOGqXTzxKw1/qvDG/bObQrKkzBPr4tECGvFjBz7HGL6OFwpRsfsm7mgrvazvkAigmhMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Vz3co8YVP1JpiPU2N+9NzojUDhvP35L65QFVm0uRmuk=; b=HK5RskwW622lddJx8YoNzfIG4PRjff8IM0ekJseejHv6UWGk/pKdLEXEfL6tdPVV1on6vfgDto6si6gEqS1fEVAf5qAxiPv8gG+ONWe1D3PTBdVWQDIqy0xEPlEUcw3bxvSJu8kh3+Gc1bhB7dt0lE8MQU3xuUBxO0QSybolfX4w7W1JLqN+94OMiZhxi2N2MCCTpK9+5u5AHKxXqkK9Ms/8YYvy3HH6o8iccM4TYL6G8MxCom4aYHNJIP1rFh49MW7h89niuODz47CuLknkMo4dZqyiCkpK1EGkWxJypuA7PyCoQnPv0cdmW/hN6rmIs2ixNkEBAM8q7la61tWiPg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Vz3co8YVP1JpiPU2N+9NzojUDhvP35L65QFVm0uRmuk=; b=BWYOen5UK1WS/6RNnvxtPa9MbhPcsIwMUVnRCbk8M0cuATHoGyhnwRY1LoqZjrCjstsfdGeI3UUdhJOHJsG7pkPMmbD56XJfKmHzGDJYYZ98jM6vDAxLmq8VANkKMrIUiaw3i9B/JqEurj7OeCMqr0NUodudmdJ80RWGUTuoZYs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4688.eurprd04.prod.outlook.com (2603:10a6:803:6a::30) by VI1PR0402MB3837.eurprd04.prod.outlook.com (2603:10a6:803:25::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Thu, 6 Jan 2022 16:42:00 +0000 Received: from VI1PR04MB4688.eurprd04.prod.outlook.com ([fe80::4c4c:f2b2:addb:841]) by VI1PR04MB4688.eurprd04.prod.outlook.com ([fe80::4c4c:f2b2:addb:841%6]) with mapi id 15.20.4844.016; Thu, 6 Jan 2022 16:42:00 +0000 From: Abel Vesa To: Georgi Djakov , Shawn Guo , Sascha Hauer , Fabio Estevam Cc: Pengutronix Kernel Team , NXP Linux Team , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Linux Kernel Mailing List , devicetree@vger.kernel.org Subject: [PATCH v4 1/3] dt-bindings: interconnect: imx8m-noc: Add fsl, icc-id property Date: Thu, 6 Jan 2022 18:41:48 +0200 Message-Id: <20220106164150.3474048-1-abel.vesa@nxp.com> X-Mailer: git-send-email 2.31.1 X-ClientProxiedBy: VI1PR04CA0046.eurprd04.prod.outlook.com (2603:10a6:802:2::17) To VI1PR04MB4688.eurprd04.prod.outlook.com (2603:10a6:803:6a::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cc3ff8c1-2f0c-4d3e-2051-08d9d1337600 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3837:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:923; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n98QhfGwUH3bKpXYoRrTvr28+v47qx/sGDHO7llGTvQiEyHbuJk0lDrPGkxjoqFSne+mid3YUBgFWUDDAWTzJOAY60w4emOZYNlZbWqNSChIY85CrmcTpl3ybPdM2tDv4T+c2ToxT4qwJUh3ThBazw0gl4pBRVLEp2g0mY0gHfp0ZZE4VrRXmWCrbb/IR5QXlKYUNNzeTfNQGPBe/8Fb7pnZPDMDpyzh5rptGk0uRqTfraaH/zqnzyYe+Bzxfxq7TwqZ6YqIq4U6hYfiU6+rH7cb7uLa4NKluJChB+s2LcFuIgxejy1/N8CzxD+YBZuFHuFiXfXGsseoTePZ1fRJ1Ez1cQWNhebINPbRmGQ4ssRNmembaTHypGD5dD/vWvSNNMN5AAeXVqiUzvq4dTwoQ7tPHTSZoEDx3E3qFrBxEOiLBmwb1QJ6ZDbgb+iIidMwqBG4RB/ZIc7X0b3EYjBye5FV8e6ya+1gbLBfB/2ZwY7qPDLo0pRrhk9q4ElVE/qNALV3FY1NTZQ1++uWAHhrU4ZsPlcjAAUAoRuyv8XIpi1NdSAwbAs0IuBuKQajLmhSrS3GbUpgWOIlhP2GZvlmQA2PSbS3rpwXeu+NOsvBAtwW3+UR4WsgKjJYsrDQQBbW+xJtaw7k/isogcHGm0z5kJ4zLULRUPvPHyFkpCqhzRwSrnvO7oEXFet02daxvoBaNlptz9W8UHJJzwa+V3au+m+hp/aDpZrrTaSAZXfoJvw= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB4688.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8676002)(6506007)(8936002)(52116002)(110136005)(54906003)(26005)(6512007)(508600001)(2906002)(2616005)(6486002)(4326008)(6666004)(1076003)(186003)(66946007)(86362001)(66556008)(4744005)(44832011)(66476007)(5660300002)(316002)(36756003)(38100700002)(38350700002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ieqcXdXEF8iFI+pU/W0jRM41ab9INE82VVIbEnQaPVh3ZqRSj81XmGusMXn7IqFOF2cw/HRXrYGSlPrtr9xjKrmSrGalYoRvisrVrPpbjXdEWLt6DZ82yRHpO+7kX8zgxw26+74ByrPz1MYsEl/Vz2zv98NPtBm1QGLkA0f5SM3adkizHBS1fOV2Ogvu0JFO3fhn+NYJtwnc+AIh/yWStibV/evlJM0vOIvrpoNHDkUo8JgKKJbY4NzeMFcV+lRGDTE9125iGvZXY0xXat/BWxo6odUkBJH3MBWMqxZ62h2zmLtMUImqtaCfsO89xmuj3+hDfpU65iKtR8dQ4r9aqxNoull7ZPkQ2YEKFiqnVGxCpYgU21n3licEu7X9wmhsComnK0DQ2S3O0NgoOnQoPtaa1WhaHbnKUoCPz8fsOuw0DlT/Aecm4VQYe9jQHRGD5ReZWFne2ytv7g054BldJwh3VxKdANVtB4QyRiYGYVAyOp5oxtS9CQu1FsTXGrgIvmF3qx10ohnqUYDzdEj3rGNv10fyDkf0bKCBgdcEjgRpuZhMT8SakhkSw/qjOCHjulK2Lq0+K7dUgbfKD0I9ppkn5sInk7nJwsggxaVkyH967wYfWHVHmXx3gP7WBnkHlpOfj7DKQGwJyG98i7hK9mY+oCvn09HmSfTcpnKOc+JqITxq1NAjodyM09UZrVFgRhJe+BwkBf5J/Lw4g4FqIIh8EsnJ7/SHwPyfJSuZwKJCM0i1AjuqutlBQ1JWtBU2NRWUovVByAjVITnjimoi5erism+5ACtXUdvSHqF2KZGOWcDu0kNKG0UpOZB6qhXr9jf99z4y63d8YTPytdydobLKRANItfiJj0MnIRKIAg36Szve50dqnBsVRQJAlNTJB1XMeg4Tx1MaEZRPNkE3sErIUz7D86z4x2v9d8JaPWpXNPjo9hVa6xkl1b2m4Tj8caEA3tT39eCqH/S421B+TO1mTDG0xg1406moYamebykrOotL1fe8O1wV+fVFNSqXlJsLc/50fwMPhSsJEPIlD9V2BNrjMs7IY9eoPsOGg04T6FzCCvNBd9cDCAAvP6uQEXZfIpbMdFKPJEKBa45VY+QiDm9vBfFiUkye9ue5XxKFyP/e2OfaN53Is9bbmNruDZiUY4V28P3FRHOCjEIQ5CGaXo2tifJdbY5L5Spxq1sB4yCiJfrfJftk+FOha8en61GkgVgNJFDAHWEQVAKEjGUlVyUGAGO3KSoyXjv1wfl5PmJnyCZ6EKZsl9F54LCpuNmHBdEY4mpSvFwAeOfW0UtWxxVLJfvThBR8zLHmLGihCdE8hVWAatlhC5xdOYg2kHXGfWVFcp6rxi9JunZsKcWSzsehkTfJXS1bEs++GqdHZSyjDTrcRB7tYi1LGHrVIuXb9nHZpkM9qQGo/qz3t4LpvfIRkQgpecC2RHLcsQTgk2sB2NHJ6rzs7XUBRPMuPzj5zvHTSwNtQVRrrvY/2RlEFyZ7lcRQaysCzmsu3vLkknraPd572Kma6BgIT8l4m8E+iY1Pe7M95NfA/W1pcIyEl28j0P8OTY5JxzwbAU6cf627zpsMO6s2FsSsIfxZYZwQOufWgjUsgL85zrPGi+WeaTIWPcygo64kHvP9SwM= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc3ff8c1-2f0c-4d3e-2051-08d9d1337600 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4688.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 16:42:00.5261 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3f1SWR7w33ypRCGNQU4l9X5lvVqLIHyMq8Q2Qzwt5vnxOgnecv+AYlVyech/GxZQyWWhAkgKNDqnlvJsDVkn8A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3837 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220106_084206_529573_A84E83B3 X-CRM114-Status: UNSURE ( 9.02 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add documentation for fsl,icc-id property. Signed-off-by: Abel Vesa --- Changes since v3: * fixed typo in property description .../devicetree/bindings/interconnect/fsl,imx8m-noc.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml b/Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml index b8204ed22dd5..dc7f6b6f508a 100644 --- a/Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml +++ b/Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml @@ -47,6 +47,11 @@ properties: operating-points-v2: true opp-table: true + fsl,icc-id: + $ref: "/schemas/types.yaml#/definitions/uint32" + description: + unique ID used for linking i.MX bus or ddrc node to interconnect + fsl,ddrc: $ref: "/schemas/types.yaml#/definitions/phandle" description: From patchwork Thu Jan 6 16:41:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 12705541 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 961B2C433FE for ; Thu, 6 Jan 2022 16:43:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GIl5hHcwgMXW5k0KvB8SEQFUfNkj+J4dwkuMNXwRV0Q=; b=tQ42tEqEDHgtEa cS/WVexpM5Rle0XPKondn7vDxoshuD5yY7ftWvmUZWfACtirmpLM5Vv7K76tT+U4SMz0j+Ti6AS1Y MxhUswgjiTpTHhEqySayA+2HaVZk68lY9DqfG7sizCNAcobvuYDqlo53CTBJfXhSwJjlUwP/ypgCi cYd16PYu2erMy5BlEQRVyu7LWAd1TQzHvZx5tftm9od1aawMv5b9sfEFdSQq2+uMccRt4iPsdyzMl DZApMm+ZhrdfxMrLnk6EMEHWGTxIi5l0hYlsY+GQcHLm4lUStCDPve8sSjqN/28x28oTeTfV+LRya rNndEYeMxkRsAyyfEaGA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5VqJ-000h5x-6P; Thu, 06 Jan 2022 16:42:23 +0000 Received: from mail-am6eur05on2047.outbound.protection.outlook.com ([40.107.22.47] helo=EUR05-AM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5Vq4-000h18-7U for linux-arm-kernel@lists.infradead.org; Thu, 06 Jan 2022 16:42:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JX5duIqwDft/1biSJyq4P6cve4t8lD0dNsmLda02krIeXuYwcdedSPfNG3exq3xcSf5Nv8ZW5s2RtQPoPN18M/1w6jz9wCiEbwJUAsSHX0Dg07RHVTGEYqaXVYgBjwKo5tv6Pw0WCSmikhcTeb4B31TJa/YdwHrz/D3LF2x+RYjjbzQfj/n/KF0tTaRuyn95dM8r6FHtj+gVwS01dR4HSEYTu2I8KRgkBk/bB4Yf/7zH12CqvXZlb+iffWu0MDdpBgUfgZcJ7GwInUUNZpGbx1HoypPzmzHl7ZA9LOR6gJmRbAtRJlfP6798237ofZepNoQinZPImEXm6S2GKR/v+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=nQD79r1qU3WTMkVCcPdvmg1gt+M77HKjCRcpsFfrFqM=; b=XIfxGJuOwGtTGUExjt8Zc++3YaRzlOxwGuFwNEA2g3RHhHRse+Ll28QHYgErXGy35pcXn3qCY3g6ntssXvxJEwfU8//OfKARsNdA3uF/cEABsBGSU/48xFNFtyqTGFsuiHFRFqfT1Nsv0WWXLbjxtdhizLXtpl+92kp8E4u5S3oHj1nzgXX0hae6PKq3/j3aIbrws31j0mwpTf78g2gU2HSycyo296kpqC9YQpy3CyUpgeR+zbIhG4/QYoh/c62ztTfUqxQztj+Fd/QFVKhWUeiIGJSdbPva9NonXjotLHUNcGOSX7oREh0ufVtgW1PBJOvC+z7eCNuK3PxZV6UC3g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nQD79r1qU3WTMkVCcPdvmg1gt+M77HKjCRcpsFfrFqM=; b=nnd8QEEAUt+oyw7AHP8CSWgFcYssdPwa7jb1gdU3Sn0duQTXDhzn0xtMxQsZWJ6wB3VdNKSoxqt2l2zR742StzZUUHdUwKoy8yazlvWvQ/r+0yVgPwHhLwxRJJ1L0GnHD7k9irifkqHKPdIFt1hYrTZ+f1kbCmpri91SctZn1AM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4688.eurprd04.prod.outlook.com (2603:10a6:803:6a::30) by VI1PR0402MB3837.eurprd04.prod.outlook.com (2603:10a6:803:25::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Thu, 6 Jan 2022 16:42:01 +0000 Received: from VI1PR04MB4688.eurprd04.prod.outlook.com ([fe80::4c4c:f2b2:addb:841]) by VI1PR04MB4688.eurprd04.prod.outlook.com ([fe80::4c4c:f2b2:addb:841%6]) with mapi id 15.20.4844.016; Thu, 6 Jan 2022 16:42:01 +0000 From: Abel Vesa To: Georgi Djakov , Shawn Guo , Sascha Hauer , Fabio Estevam Cc: Pengutronix Kernel Team , NXP Linux Team , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Linux Kernel Mailing List , devicetree@vger.kernel.org Subject: [PATCH v4 2/3] interconnect: imx: Switch from imx_icc_node_adj_desc to fsl, icc-id node assignment Date: Thu, 6 Jan 2022 18:41:49 +0200 Message-Id: <20220106164150.3474048-2-abel.vesa@nxp.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220106164150.3474048-1-abel.vesa@nxp.com> References: <20220106164150.3474048-1-abel.vesa@nxp.com> X-ClientProxiedBy: VI1PR04CA0046.eurprd04.prod.outlook.com (2603:10a6:802:2::17) To VI1PR04MB4688.eurprd04.prod.outlook.com (2603:10a6:803:6a::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: de1872ff-9bc3-4ca8-c6c8-08d9d1337664 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3837:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:541; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KY5MPElWpqDHPZguOhthu+iGeiQ3c9Vwj4Ebj4B7gWOMrqmwaWgRIu5iNo3VNBWKdmkbOqnH1tEB142ngo/yYxS8IlRMxwTswnkGM3SuIfRBrvcMm8Jti58Dql6ZvGosZx0C+fAz9iv/CIGKlR8MDPQUyisHFPfLcA6dKGxl9iv8Y/nIWDoQcV1cOSbREx/m97/Gk8BsmBDoB2Hi6MxoP7exfDYkehXVhjGl31t/yjeKYyiWBMeGwj1UAEs2nVa6O3hGOCbMJmDGI7nqOLDru+rhcmje3QOPm1tRL4Ipt9E3804vYmzkEGm4PiWdUQgYllAlWeRrs2F5fDIbcaHlAAEETJf99RK/BzXypeGvjzp4LHpcS0eKH/cnDAjHsC+otSS14fAMVy9JcdWsCGMT46MMyqXwzU8AVur+UpEW4x81hNG3gWXnvVNs8zDU78Ou49qdIHhUT+vjA6tfNvIg2mV/7cgwsRppDuVkaojztENlA8HEiP6lpKRQgeDit3XTlVEi7zqigw3lqOZj4QUJTLIrEY209eeUHuAnY8AeqfspnKEs6S1UTdKe4RQipc44cbRm4AaCsG5ZMnDjjy7CY+6uWfyuVLelLUNFk/fDxv/H9Umg31AwzIcs1OiOf+opCBUHvDrHW6ymQ/PaFqAZEn6s3cK3b76KypFZTfOZonefhojB66T/Iv94XGUMslKMLLjaH9XY6+mJlgy8iwMlPw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB4688.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8676002)(6506007)(8936002)(52116002)(110136005)(54906003)(26005)(6512007)(508600001)(2906002)(2616005)(6486002)(4326008)(6666004)(1076003)(186003)(66946007)(86362001)(66556008)(44832011)(66476007)(5660300002)(316002)(36756003)(38100700002)(83380400001)(38350700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vdVIey4MdNobZtf42UHk7/gwGFehhrYkCytJpClx9vZowNHPhAJUaB5B0BK1Hw2w+o0eyR7GvFJd93TzSi6EJSP9xt0YMru4EPV4+RWUd/yRGtQ7A8lt/C66V8UN/JIja32EmyK5hBjXMrp8t0uorKDcZ46+xHJVwlnxUsf2rzFoXZdpKIGTJ1nSkK8p/y+uSAG0+BnH/Hkicj2dtpRFpOhawc0TU94MRuilsjp9WsZcPtwXSZq3W+ncVs7Wz0KGTb7n/qWkf0px7CdatGIp5OqXAlGqyK7MXp7dDMBFS28Y+1588NCOhT+yrqbWFgM87uvS1n8a3ucAkRY0jzIjEbfOary9yRGtm+KD9YLF43vXLkhq86lPRCz5eZAv9y2r1vwlgA7Q0VKIoy1W4SIcKhfu2K6q7tV7y/vVBh3BOMrDmFpNGKr2RdKgZea6gItsHtTVJ28Ii9uuHunyMXF94aK5DXc7KBdTB+fScpqIzbmASl+xEHpENeoLBZ3sjqV2GRS3CGpJ5HghjCvg79lJhHu7koqBFHZQ/f5CV1CAnYQQDD01psavbtJVl7FVsetrj32RQh4zKar1HGSePwEnydGpimlsr3cknhctC5XuoJD2CYJqoJ9EGAaMg/fOSmxygcZ/Yqu45uwEz/0ButvyAeAamKsMoUFG1eCdw6+FHDqkAhtY1GEPxwTfcWLsLEdLLkRG/UZeRF14Y6upvtnEXn+dzwvgJ1xjE1ybcS7O+TlbDrSCShlq+NCzoIKe2gJlZGsnFHfhrid9IRjbYYwG5rdF9rGq9CDB3WAbsdHPWtE8ETnew0IiDJ7L7AgrIRJ6CPnjgbtnG1BHIxyiP6ZefYur0BsQvtVrB9GQRVAWjn0O/HnMJyWiWr7NwmXOX5KbeRFpBYEc0Jd+ftLDK7Z1Mz9Lo1D7+WnWkkepdT4LsYUEgao7006MiYzsSaGfc00uVu9+uIma77ABtXRgP/m+xHSB4q0XggfGvT/51azN8YoNwrr1rNY4ihceoaqGBEqiHHS3GqSOfhcTbobWzVZgmewEuz1tHkaMsp4dQoPkRZDNt6s/EgSXClU6GxcvmNK8C59QQs1o3SAAcovt9m/J2K/2HPhc1JxVQ9C2hS76ifa84wHhuidkHRkYPflN6lfyW2DtAVl8e+JXgwAxaMbk2Ve1G3M9f5jnUhyNaVAW/kKEBTouDUlgdyx0KpI3DSzbERMHkE1UvHD4F5P7txBHYCjAvTdePsH8mKNdTaTVS5rqVrxmP8KjryG+KiTdMGK3iy9Ba+wEsmxPJHRLA+IrtvQAih4ueA4bDvZH/vrHoV8mpin43TGwFOPOJal+YNVNqxY4GBa3LwMmuLL4ed9uGK2O7GFVRJBEMyjt1Ydjc3apqIab/0X4JuZj/VAXprnAXVIY2/Yql8rtx8KuZgL4WEIbvh7YHYvYonUsMdGP/QnFJTUszhROg6ZPNWlnDFjy8UP8RtnrAlpRTJPCVj6zKEI33KkSvsBNspGzVhjmuLINrrJxAGLbomDinL4LpNtqglfLdobnRxxPVIaAxheedlTE2w0mCb0e2+tM07kaJfe+brXRXWaLhgrVKUc9BGKlivweiuWzCEqM345mQi4pZs+jo8H++LLkt3hD+cYZEK0= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: de1872ff-9bc3-4ca8-c6c8-08d9d1337664 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4688.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 16:42:01.1487 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: j9bbHRKDsxUZ+8APkSa5AWad0NXRBbacbMALIsyRiwlRPKsJYDFVkokhARIuJkuj7YYlKmRwqIPvMlF7Kv187g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3837 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220106_084208_300769_48E9776E X-CRM114-Status: GOOD ( 19.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to be able to have more than one NoCs in the interconnect net we need to decouple the NoC from the dram. So instead of using the imx_icc_node_adj_desc, we use the fsl,icc-id property that is in each NoC (or pl301) to the icc node (based on the id) to it. Along with all the NoC and pl301 nodes in the dts we will have a interconnect dedicated node. This node will be the actual device of the icc provider. Signed-off-by: Abel Vesa --- Changes since v3: * none drivers/interconnect/imx/imx.c | 70 +++++++++++++++------------------- 1 file changed, 31 insertions(+), 39 deletions(-) diff --git a/drivers/interconnect/imx/imx.c b/drivers/interconnect/imx/imx.c index c770951a909c..d5b36c478911 100644 --- a/drivers/interconnect/imx/imx.c +++ b/drivers/interconnect/imx/imx.c @@ -34,8 +34,8 @@ static int imx_icc_node_set(struct icc_node *node) if (!node_data->qos_dev) return 0; - freq = (node->avg_bw + node->peak_bw) * node_data->desc->adj->bw_mul; - do_div(freq, node_data->desc->adj->bw_div); + freq = node->peak_bw; + dev_dbg(dev, "node %s device %s avg_bw %ukBps peak_bw %ukBps min_freq %llukHz\n", node->name, dev_name(node_data->qos_dev), node->avg_bw, node->peak_bw, freq); @@ -79,41 +79,35 @@ static int imx_icc_node_init_qos(struct icc_provider *provider, struct icc_node *node) { struct imx_icc_node *node_data = node->data; - const struct imx_icc_node_adj_desc *adj = node_data->desc->adj; struct device *dev = provider->dev; - struct device_node *dn = NULL; struct platform_device *pdev; + struct device_node *np = NULL, *dn = NULL; + int idx; - if (adj->main_noc) { - node_data->qos_dev = dev; - dev_dbg(dev, "icc node %s[%d] is main noc itself\n", - node->name, node->id); - } else { - dn = of_parse_phandle(dev->of_node, adj->phandle_name, 0); - if (!dn) { - dev_warn(dev, "Failed to parse %s\n", - adj->phandle_name); - return -ENODEV; - } - /* Allow scaling to be disabled on a per-node basis */ - if (!of_device_is_available(dn)) { - dev_warn(dev, "Missing property %s, skip scaling %s\n", - adj->phandle_name, node->name); - of_node_put(dn); - return 0; - } + for_each_node_with_property(np, "fsl,icc-id") { + of_property_read_u32(np, "fsl,icc-id", &idx); + if (idx == node_data->desc->id) + dn = np; + } - pdev = of_find_device_by_node(dn); - of_node_put(dn); - if (!pdev) { - dev_warn(dev, "node %s[%d] missing device for %pOF\n", - node->name, node->id, dn); - return -EPROBE_DEFER; - } - node_data->qos_dev = &pdev->dev; - dev_dbg(dev, "node %s[%d] has device node %pOF\n", - node->name, node->id, dn); + if (!dn) + return 0; + + if (!of_device_is_available(dn)) { + dev_warn(dev, "%pOF is disabled\n", dn); + return 0; + } + + pdev = of_find_device_by_node(dn); + of_node_put(dn); + if (!pdev) { + dev_warn(dev, "node %s[%d] missing device for %pOF\n", + node->name, node->id, dn); + return -EPROBE_DEFER; } + node_data->qos_dev = &pdev->dev; + dev_dbg(dev, "node %s[%d] has device node %pOF\n", node->name, + node->id, dn); return dev_pm_qos_add_request(node_data->qos_dev, &node_data->qos_req, @@ -151,12 +145,10 @@ static struct icc_node *imx_icc_node_add(struct icc_provider *provider, node_data->desc = node_desc; icc_node_add(node, provider); - if (node_desc->adj) { - ret = imx_icc_node_init_qos(provider, node); - if (ret < 0) { - imx_icc_node_destroy(node); - return ERR_PTR(ret); - } + ret = imx_icc_node_init_qos(provider, node); + if (ret < 0) { + imx_icc_node_destroy(node); + return ERR_PTR(ret); } return node; @@ -244,7 +236,7 @@ int imx_icc_register(struct platform_device *pdev, provider->aggregate = icc_std_aggregate; provider->xlate = of_icc_xlate_onecell; provider->data = data; - provider->dev = dev->parent; + provider->dev = dev; platform_set_drvdata(pdev, provider); ret = icc_provider_add(provider); From patchwork Thu Jan 6 16:41:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 12705542 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8D620C433F5 for ; Thu, 6 Jan 2022 16:43:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=9jwZl6xAmN5dY0SyOhPseZRUQeZqPTLkQkjGn8ND6Bo=; b=3DruUgPxPivpme k+ljE56oG4YmP4FzmnFn7nkGEeikO7s1VsYsdTx2q9RIgVOy5xiDoYb+32HKiTuvKFz9Rzha/KaOn RpNb6QKjDcCqpPbF23WpT0W35d9mQHFufdr5oVjaHxfAtlED1N++NORO2Wda3FVXwLlePl8ambQ34 iKLIAdFS7/GMEjMnF3P1zSKSAgg+h+VMTU5TrP/IBGUExIKsnkn5azU/32spFXu+/7p+w7h/J+SLC eAyybx/oSrx4SIqCv0NoV2oMduq26HZq8KVgCFcvQKa8sVaoZZFPLF3PgNf7ZWpSAJeNGWbQu0GFp fcYPz1CsyN8rDBENSMOQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5VqT-000h7q-4e; Thu, 06 Jan 2022 16:42:33 +0000 Received: from mail-am6eur05on2047.outbound.protection.outlook.com ([40.107.22.47] helo=EUR05-AM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5Vq6-000h18-2Q for linux-arm-kernel@lists.infradead.org; Thu, 06 Jan 2022 16:42:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E78x16zrDulaJ0av3WVc3pHzQU6eN7XowiLuUKILe3rBSC4Q+QkTP3Dr5GGEUjrphstaEBUtJ9kUUbLGbY7ekMf7OTPO0f8JgdpzW/npWFEhKcGR7qqIsQ7hyw7jKfS2I05LkyMEB+qa0l79CEU3CxqxKrBW4nzrQSq5LjDT+8PehRdVhit11YrcCMrW32YyWxerh9RMoTuto5ubARerxDqgdgRVvQYCITZ/8K1PzkMvtXc1Z/p+RtZIbXwiSQZ1RwmC1QAjIF9h9wli5J+34meBI+Jl/FOBqBGEXm3VetHZiSdpgUKDoh1bqIscqYyXkh6tpRf3DMd7H472Vuv/2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZsfVulp2W03e6NGLFHQToVhMlO76NSvLIOSe8hAqpyY=; b=kp1tMJfl62OBANkWE8jj+9OB+GEBVlIKmqTvCDFM26EPgDwrQyikDJyQFLS9T45uQaFxaJvE2CbuimjKARuXcPhxTpGUGakQZFtt3hneD5uEATS8cju+ZYpBoZKX7YMbCnIdlK/WyrQP64XLZnIheIfoBjitjOt+0U0ERHpWsbUFZAlV3bnSf0dYUShOz89cl9+zyTFMwT1zhGzMJ8WjcWcBVspFW3IWaRKUiS2l6rTaR9NIm4Wp6sXk9Fv6Sa2F6O/ZPEmz6aLwt+cI9L/6P/9cZVaFljiJFDguUlcYJPhiFlz0QrlgZB7i20uN0jbSXfcAZMSmqjEYr23FetBk1w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZsfVulp2W03e6NGLFHQToVhMlO76NSvLIOSe8hAqpyY=; b=paZFDp8C5WhMHU8RHRsqED/kp9mOr1MWd94sP2xuCj8mqOGwC9RW01epUfJTdU3E0kDTeWYK+LOL3Y3qiJB5YbI0f7ZlDFYf/VYkG6PxG170L5l4Z2UrKQAVIiTHos122pTwYJw1ernGK37Pm71b+ExaJYqb5n5R5UK8S3S5hhs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4688.eurprd04.prod.outlook.com (2603:10a6:803:6a::30) by VI1PR0402MB3837.eurprd04.prod.outlook.com (2603:10a6:803:25::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.9; Thu, 6 Jan 2022 16:42:01 +0000 Received: from VI1PR04MB4688.eurprd04.prod.outlook.com ([fe80::4c4c:f2b2:addb:841]) by VI1PR04MB4688.eurprd04.prod.outlook.com ([fe80::4c4c:f2b2:addb:841%6]) with mapi id 15.20.4844.016; Thu, 6 Jan 2022 16:42:01 +0000 From: Abel Vesa To: Georgi Djakov , Shawn Guo , Sascha Hauer , Fabio Estevam Cc: Pengutronix Kernel Team , NXP Linux Team , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Linux Kernel Mailing List , devicetree@vger.kernel.org Subject: [PATCH v4 3/3] interconnect: imx: Remove the imx_icc_node_adj_desc Date: Thu, 6 Jan 2022 18:41:50 +0200 Message-Id: <20220106164150.3474048-3-abel.vesa@nxp.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220106164150.3474048-1-abel.vesa@nxp.com> References: <20220106164150.3474048-1-abel.vesa@nxp.com> X-ClientProxiedBy: VI1PR04CA0046.eurprd04.prod.outlook.com (2603:10a6:802:2::17) To VI1PR04MB4688.eurprd04.prod.outlook.com (2603:10a6:803:6a::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 01be0678-a8b8-4ecd-1305-08d9d13376bd X-MS-TrafficTypeDiagnostic: VI1PR0402MB3837:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RgzLTToCATdiQVGeXcSjqSvtBElzYq4T6enfoHNOWmbV5yXLOk+VNqtHNhczbgLTdHi2jSRQJ3AZOqqYAnD5+CGojX3x8SjOWnSopW9mlWFoWiXcuX4jxp4To21BCoIcR7q+Chd79QPoPG1kt7gMJN3kvQvx8fWS7cDwOFh0gxUh6wbD7ll7Y9WBeIBxZt3j133FeP4u0nC2IKGBXLS/CiIkZTsmpCrzepcw1VR4xN32aHr8SaaUqtR3fdRJ9QWDto5t59r/787Scy7/CpL2ZJtWrXfHIlwO6Y3mPs42Dn6HNBpbQML3V5NU+ehnXAS116+6qULdgz5zN/gtNIFpEanEV6SfwvVZzcYCwJdt1Z/uZw3L7r5aVGVQ0KDi6r0WCgpxw0ffZakX6xBFagEnWP3TX3Jt08mG+3BOsBLiyZ7b0FZbLoyYHuJLTlMDvqvjlO3nKswiH0sphFGRecs0wcOhoTuCKEbrtkEB+YE6S2SAuXkN/4Q9IdS5juAAje+/MYcCgDdw5uUXubi7OepQtf8JiMVG2eLgj6Hr/Ac6rdV8EMVV0EHDA4fhEbW8vdxGbtGh+04JwgNcX6IysftjbZdApfYkPF1J6rvAXx4uhDoSbWub13xGogHhOmbl7Tc3rY6LkAhhZBpiwxkHnEzd6sZeXk/chXm2sRQork2YnVrZyRQ2vrZFoYqO+Ukws2Tv70PJZh4EjC9mE+0zt5JGjQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB4688.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8676002)(6506007)(8936002)(52116002)(110136005)(54906003)(26005)(6512007)(508600001)(2906002)(2616005)(6486002)(4326008)(30864003)(6666004)(1076003)(186003)(66946007)(86362001)(66556008)(44832011)(66476007)(5660300002)(316002)(36756003)(38100700002)(83380400001)(38350700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KH5vZYnKmZrdyklhrNtgBgFHZSRNJ2pYwO0t+M/ZfFycHRzNbLswaBhVTvAz4jipCiS5S7hz4mQtPyaFXIx0heSilr1gUFsfXJyTqntkqJsH/Qioiyqq8Ej7/PGk1rvWdyepMIXxrt2w36fOhDY+TQEAitm81+bQmHBzxvJTDHZJWL4IN6NsN5H1/0TyNT1UV30VCRI4PHV7zr6ldRt2yw4KFZe1wmdgjiyLXbzMvNfoLu4q6L2tg63YyzedyJu+tO2ZGCtkdiDOc1OjL4S6HP0793afivCtvL5gxWn60sZukh9UQhMYIs691XTRMRISOC1gk8wHLa4SmKtilDxwYSDnJ1vLvaLumFcMxecgJ7lGvP6wK3lQ3cYHc2L4fNoxa29vYBo6k0c14wEFgjneRl3gAZmzHjDaTsygJMfrQoqdEmhxdhCaFRfhzUBw2v7VVjqb/Yn03vbn67LWLWElwIjA5+UMKChzfFTEGUCx3q+Wip+h96uN6EZfsgpesPw1GTT1wfBnyKJC2SLsqVIlnnkfQhWq3Rie/CjUfD1y0YA/xlUyoq6Ti8LplLdL+JHu8UjudQ5270QuQWcB1jOgUdkgOIzd+tNV5JU3KpnQ4H3V16ggknjeq6mjTYKY00JjcPC+XtVhRshDSGfa3z1Lt4ZFcJm01+PnpPpixShOe0DTiO43SYx7jghnFxYLYr0l1SYGqetuzvEWEsBnkMx/VrQYRXA5sCjt2fYiQLr15bPIPyGQEX/KN8FrPt6FqdFKp363o6vLkHmEqXTMjftwhkYQEEadyOsiUg38XdBgGB7oxQWQ9lDFP35E/oQcEc4D0thP2TMzuHp33C3YfQiGT9sYlSbJNKU9LV3kYHXbFsiE1oxSZ7lMjjkGxD1fEujQmnWxCev02B/0A3BwG3vJmxfext27XriI978FalalCD1KzjrG6sqXYU/vRLzjnlI3JkNOGlqOKOHUga7cv8BmMBGjFcwXj6NvQTcldWtMrUut9esBGxPuhTiSM4vFmSalM13tIdlZsDyV0Kfra2XSLtTnXrFX+D+bEviGB17i3YW+W0+OTD9U5TVwtdv/bNJvkaKE4J8A9F9yK90aA5ByDTnNyx/HB5gW2HtVNAUbjgy8RYSc9WB5cZjfvocqPHdgAnriGsQewa8NW4C8mzP5e2MlW6buap8gdpekpthbjNQaK4yxHRtOCLaS1qsgmpA31VsSwJrf4FWABgtNe457PdQIHPiyvVSlXdTmZE2kTPAXPrs1sg7cBw4mCjPWsVWURXhUrgWOKjFJOjOOgdZa7gxGFZz+G5C0ARg/P/0JkrYqARSLWRXIg02YVFeFnFzQyDp+4/6XukOAEUEAYmvEkfaI8ucVUL+eHJh4XBCRUOpDZpwusAubHcI0WpKm3ve9NWYq73bQf5rnr67Ax6ftcBDGBvWXp4Ou3A3VoDNZuLay7XVIuxhzr4mkQkx9VNj1rYi6k1q2zNf8NgTt8jwMq8hT6rWdMGXais0obVmc/aAVTtALYbSCMtL93TT7DKAgjdHDjQWmxOkQoXpI2kHX22NWKycF3RTg6X46PZzT0RvBA50OziWU1m7kZ6Z89j+S83BbEocsnD2e83MC7Z6tnqJ/LnNd67LcLG0Gq8AEtiw= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01be0678-a8b8-4ecd-1305-08d9d13376bd X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4688.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jan 2022 16:42:01.6635 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6wFWrCHQGmjlGOgrWxkm0aaQ08qrJYjKTeyhsn1f2dqvDKBgKG0boRBmQr2XMS4F4Cib6vC3BbXiVZUABbaBKg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3837 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220106_084210_187769_F3221370 X-CRM114-Status: GOOD ( 14.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Now that the imx generic interconnect doesn't use the imx_icc_node_adj_desc, we remove it from all the i.MX8M platform drivers. Signed-off-by: Abel Vesa --- Changes since v3: * none drivers/interconnect/imx/imx.h | 19 ++++------------- drivers/interconnect/imx/imx8mm.c | 32 +++++++++------------------- drivers/interconnect/imx/imx8mn.c | 28 +++++++------------------ drivers/interconnect/imx/imx8mq.c | 35 ++++++++++--------------------- 4 files changed, 33 insertions(+), 81 deletions(-) diff --git a/drivers/interconnect/imx/imx.h b/drivers/interconnect/imx/imx.h index 75da51076c68..5c9f5138f6aa 100644 --- a/drivers/interconnect/imx/imx.h +++ b/drivers/interconnect/imx/imx.h @@ -14,15 +14,6 @@ #define IMX_ICC_MAX_LINKS 4 -/* - * struct imx_icc_node_adj - Describe a dynamic adjustable node - */ -struct imx_icc_node_adj_desc { - unsigned int bw_mul, bw_div; - const char *phandle_name; - bool main_noc; -}; - /* * struct imx_icc_node - Describe an interconnect node * @name: name of the node @@ -35,23 +26,21 @@ struct imx_icc_node_desc { u16 id; u16 links[IMX_ICC_MAX_LINKS]; u16 num_links; - const struct imx_icc_node_adj_desc *adj; }; -#define DEFINE_BUS_INTERCONNECT(_name, _id, _adj, ...) \ +#define DEFINE_BUS_INTERCONNECT(_name, _id, ...) \ { \ .id = _id, \ .name = _name, \ - .adj = _adj, \ .num_links = ARRAY_SIZE(((int[]){ __VA_ARGS__ })), \ .links = { __VA_ARGS__ }, \ } #define DEFINE_BUS_MASTER(_name, _id, _dest_id) \ - DEFINE_BUS_INTERCONNECT(_name, _id, NULL, _dest_id) + DEFINE_BUS_INTERCONNECT(_name, _id, _dest_id) -#define DEFINE_BUS_SLAVE(_name, _id, _adj) \ - DEFINE_BUS_INTERCONNECT(_name, _id, _adj) +#define DEFINE_BUS_SLAVE(_name, _id) \ + DEFINE_BUS_INTERCONNECT(_name, _id) int imx_icc_register(struct platform_device *pdev, struct imx_icc_node_desc *nodes, diff --git a/drivers/interconnect/imx/imx8mm.c b/drivers/interconnect/imx/imx8mm.c index 1083490bb391..0c16110bef9d 100644 --- a/drivers/interconnect/imx/imx8mm.c +++ b/drivers/interconnect/imx/imx8mm.c @@ -14,18 +14,6 @@ #include "imx.h" -static const struct imx_icc_node_adj_desc imx8mm_dram_adj = { - .bw_mul = 1, - .bw_div = 16, - .phandle_name = "fsl,ddrc", -}; - -static const struct imx_icc_node_adj_desc imx8mm_noc_adj = { - .bw_mul = 1, - .bw_div = 16, - .main_noc = true, -}; - /* * Describe bus masters, slaves and connections between them * @@ -33,43 +21,43 @@ static const struct imx_icc_node_adj_desc imx8mm_noc_adj = { * PL301 nics which are skipped/merged into PL301_MAIN */ static struct imx_icc_node_desc nodes[] = { - DEFINE_BUS_INTERCONNECT("NOC", IMX8MM_ICN_NOC, &imx8mm_noc_adj, + DEFINE_BUS_INTERCONNECT("NOC", IMX8MM_ICN_NOC, IMX8MM_ICS_DRAM, IMX8MM_ICN_MAIN), - DEFINE_BUS_SLAVE("DRAM", IMX8MM_ICS_DRAM, &imx8mm_dram_adj), - DEFINE_BUS_SLAVE("OCRAM", IMX8MM_ICS_OCRAM, NULL), + DEFINE_BUS_SLAVE("DRAM", IMX8MM_ICS_DRAM), + DEFINE_BUS_SLAVE("OCRAM", IMX8MM_ICS_OCRAM), DEFINE_BUS_MASTER("A53", IMX8MM_ICM_A53, IMX8MM_ICN_NOC), /* VPUMIX */ DEFINE_BUS_MASTER("VPU H1", IMX8MM_ICM_VPU_H1, IMX8MM_ICN_VIDEO), DEFINE_BUS_MASTER("VPU G1", IMX8MM_ICM_VPU_G1, IMX8MM_ICN_VIDEO), DEFINE_BUS_MASTER("VPU G2", IMX8MM_ICM_VPU_G2, IMX8MM_ICN_VIDEO), - DEFINE_BUS_INTERCONNECT("PL301_VIDEO", IMX8MM_ICN_VIDEO, NULL, IMX8MM_ICN_NOC), + DEFINE_BUS_INTERCONNECT("PL301_VIDEO", IMX8MM_ICN_VIDEO, IMX8MM_ICN_NOC), /* GPUMIX */ DEFINE_BUS_MASTER("GPU 2D", IMX8MM_ICM_GPU2D, IMX8MM_ICN_GPU), DEFINE_BUS_MASTER("GPU 3D", IMX8MM_ICM_GPU3D, IMX8MM_ICN_GPU), - DEFINE_BUS_INTERCONNECT("PL301_GPU", IMX8MM_ICN_GPU, NULL, IMX8MM_ICN_NOC), + DEFINE_BUS_INTERCONNECT("PL301_GPU", IMX8MM_ICN_GPU, IMX8MM_ICN_NOC), /* DISPLAYMIX */ DEFINE_BUS_MASTER("CSI", IMX8MM_ICM_CSI, IMX8MM_ICN_MIPI), DEFINE_BUS_MASTER("LCDIF", IMX8MM_ICM_LCDIF, IMX8MM_ICN_MIPI), - DEFINE_BUS_INTERCONNECT("PL301_MIPI", IMX8MM_ICN_MIPI, NULL, IMX8MM_ICN_NOC), + DEFINE_BUS_INTERCONNECT("PL301_MIPI", IMX8MM_ICN_MIPI, IMX8MM_ICN_NOC), /* HSIO */ DEFINE_BUS_MASTER("USB1", IMX8MM_ICM_USB1, IMX8MM_ICN_HSIO), DEFINE_BUS_MASTER("USB2", IMX8MM_ICM_USB2, IMX8MM_ICN_HSIO), DEFINE_BUS_MASTER("PCIE", IMX8MM_ICM_PCIE, IMX8MM_ICN_HSIO), - DEFINE_BUS_INTERCONNECT("PL301_HSIO", IMX8MM_ICN_HSIO, NULL, IMX8MM_ICN_NOC), + DEFINE_BUS_INTERCONNECT("PL301_HSIO", IMX8MM_ICN_HSIO, IMX8MM_ICN_NOC), /* Audio */ DEFINE_BUS_MASTER("SDMA2", IMX8MM_ICM_SDMA2, IMX8MM_ICN_AUDIO), DEFINE_BUS_MASTER("SDMA3", IMX8MM_ICM_SDMA3, IMX8MM_ICN_AUDIO), - DEFINE_BUS_INTERCONNECT("PL301_AUDIO", IMX8MM_ICN_AUDIO, NULL, IMX8MM_ICN_MAIN), + DEFINE_BUS_INTERCONNECT("PL301_AUDIO", IMX8MM_ICN_AUDIO, IMX8MM_ICN_MAIN), /* Ethernet */ DEFINE_BUS_MASTER("ENET", IMX8MM_ICM_ENET, IMX8MM_ICN_ENET), - DEFINE_BUS_INTERCONNECT("PL301_ENET", IMX8MM_ICN_ENET, NULL, IMX8MM_ICN_MAIN), + DEFINE_BUS_INTERCONNECT("PL301_ENET", IMX8MM_ICN_ENET, IMX8MM_ICN_MAIN), /* Other */ DEFINE_BUS_MASTER("SDMA1", IMX8MM_ICM_SDMA1, IMX8MM_ICN_MAIN), @@ -77,7 +65,7 @@ static struct imx_icc_node_desc nodes[] = { DEFINE_BUS_MASTER("USDHC1", IMX8MM_ICM_USDHC1, IMX8MM_ICN_MAIN), DEFINE_BUS_MASTER("USDHC2", IMX8MM_ICM_USDHC2, IMX8MM_ICN_MAIN), DEFINE_BUS_MASTER("USDHC3", IMX8MM_ICM_USDHC3, IMX8MM_ICN_MAIN), - DEFINE_BUS_INTERCONNECT("PL301_MAIN", IMX8MM_ICN_MAIN, NULL, + DEFINE_BUS_INTERCONNECT("PL301_MAIN", IMX8MM_ICN_MAIN, IMX8MM_ICN_NOC, IMX8MM_ICS_OCRAM), }; diff --git a/drivers/interconnect/imx/imx8mn.c b/drivers/interconnect/imx/imx8mn.c index ad97e55fd4e5..f03f8db00917 100644 --- a/drivers/interconnect/imx/imx8mn.c +++ b/drivers/interconnect/imx/imx8mn.c @@ -11,18 +11,6 @@ #include "imx.h" -static const struct imx_icc_node_adj_desc imx8mn_dram_adj = { - .bw_mul = 1, - .bw_div = 4, - .phandle_name = "fsl,ddrc", -}; - -static const struct imx_icc_node_adj_desc imx8mn_noc_adj = { - .bw_mul = 1, - .bw_div = 4, - .main_noc = true, -}; - /* * Describe bus masters, slaves and connections between them * @@ -30,23 +18,23 @@ static const struct imx_icc_node_adj_desc imx8mn_noc_adj = { * PL301 nics which are skipped/merged into PL301_MAIN */ static struct imx_icc_node_desc nodes[] = { - DEFINE_BUS_INTERCONNECT("NOC", IMX8MN_ICN_NOC, &imx8mn_noc_adj, + DEFINE_BUS_INTERCONNECT("NOC", IMX8MN_ICN_NOC, IMX8MN_ICS_DRAM, IMX8MN_ICN_MAIN), - DEFINE_BUS_SLAVE("DRAM", IMX8MN_ICS_DRAM, &imx8mn_dram_adj), - DEFINE_BUS_SLAVE("OCRAM", IMX8MN_ICS_OCRAM, NULL), + DEFINE_BUS_SLAVE("DRAM", IMX8MN_ICS_DRAM), + DEFINE_BUS_SLAVE("OCRAM", IMX8MN_ICS_OCRAM), DEFINE_BUS_MASTER("A53", IMX8MN_ICM_A53, IMX8MN_ICN_NOC), /* GPUMIX */ DEFINE_BUS_MASTER("GPU", IMX8MN_ICM_GPU, IMX8MN_ICN_GPU), - DEFINE_BUS_INTERCONNECT("PL301_GPU", IMX8MN_ICN_GPU, NULL, IMX8MN_ICN_NOC), + DEFINE_BUS_INTERCONNECT("PL301_GPU", IMX8MN_ICN_GPU, IMX8MN_ICN_NOC), /* DISPLAYMIX */ DEFINE_BUS_MASTER("CSI1", IMX8MN_ICM_CSI1, IMX8MN_ICN_MIPI), DEFINE_BUS_MASTER("CSI2", IMX8MN_ICM_CSI2, IMX8MN_ICN_MIPI), DEFINE_BUS_MASTER("ISI", IMX8MN_ICM_ISI, IMX8MN_ICN_MIPI), DEFINE_BUS_MASTER("LCDIF", IMX8MN_ICM_LCDIF, IMX8MN_ICN_MIPI), - DEFINE_BUS_INTERCONNECT("PL301_MIPI", IMX8MN_ICN_MIPI, NULL, IMX8MN_ICN_NOC), + DEFINE_BUS_INTERCONNECT("PL301_MIPI", IMX8MN_ICN_MIPI, IMX8MN_ICN_NOC), /* USB goes straight to NOC */ DEFINE_BUS_MASTER("USB", IMX8MN_ICM_USB, IMX8MN_ICN_NOC), @@ -54,11 +42,11 @@ static struct imx_icc_node_desc nodes[] = { /* Audio */ DEFINE_BUS_MASTER("SDMA2", IMX8MN_ICM_SDMA2, IMX8MN_ICN_AUDIO), DEFINE_BUS_MASTER("SDMA3", IMX8MN_ICM_SDMA3, IMX8MN_ICN_AUDIO), - DEFINE_BUS_INTERCONNECT("PL301_AUDIO", IMX8MN_ICN_AUDIO, NULL, IMX8MN_ICN_MAIN), + DEFINE_BUS_INTERCONNECT("PL301_AUDIO", IMX8MN_ICN_AUDIO, IMX8MN_ICN_MAIN), /* Ethernet */ DEFINE_BUS_MASTER("ENET", IMX8MN_ICM_ENET, IMX8MN_ICN_ENET), - DEFINE_BUS_INTERCONNECT("PL301_ENET", IMX8MN_ICN_ENET, NULL, IMX8MN_ICN_MAIN), + DEFINE_BUS_INTERCONNECT("PL301_ENET", IMX8MN_ICN_ENET, IMX8MN_ICN_MAIN), /* Other */ DEFINE_BUS_MASTER("SDMA1", IMX8MN_ICM_SDMA1, IMX8MN_ICN_MAIN), @@ -66,7 +54,7 @@ static struct imx_icc_node_desc nodes[] = { DEFINE_BUS_MASTER("USDHC1", IMX8MN_ICM_USDHC1, IMX8MN_ICN_MAIN), DEFINE_BUS_MASTER("USDHC2", IMX8MN_ICM_USDHC2, IMX8MN_ICN_MAIN), DEFINE_BUS_MASTER("USDHC3", IMX8MN_ICM_USDHC3, IMX8MN_ICN_MAIN), - DEFINE_BUS_INTERCONNECT("PL301_MAIN", IMX8MN_ICN_MAIN, NULL, + DEFINE_BUS_INTERCONNECT("PL301_MAIN", IMX8MN_ICN_MAIN, IMX8MN_ICN_NOC, IMX8MN_ICS_OCRAM), }; diff --git a/drivers/interconnect/imx/imx8mq.c b/drivers/interconnect/imx/imx8mq.c index d7768d3c6d8a..b8c36d668946 100644 --- a/drivers/interconnect/imx/imx8mq.c +++ b/drivers/interconnect/imx/imx8mq.c @@ -12,18 +12,6 @@ #include "imx.h" -static const struct imx_icc_node_adj_desc imx8mq_dram_adj = { - .bw_mul = 1, - .bw_div = 4, - .phandle_name = "fsl,ddrc", -}; - -static const struct imx_icc_node_adj_desc imx8mq_noc_adj = { - .bw_mul = 1, - .bw_div = 4, - .main_noc = true, -}; - /* * Describe bus masters, slaves and connections between them * @@ -31,43 +19,42 @@ static const struct imx_icc_node_adj_desc imx8mq_noc_adj = { * PL301 nics which are skipped/merged into PL301_MAIN */ static struct imx_icc_node_desc nodes[] = { - DEFINE_BUS_INTERCONNECT("NOC", IMX8MQ_ICN_NOC, &imx8mq_noc_adj, - IMX8MQ_ICS_DRAM, IMX8MQ_ICN_MAIN), + DEFINE_BUS_INTERCONNECT("NOC", IMX8MQ_ICN_NOC, IMX8MQ_ICS_DRAM, IMX8MQ_ICN_MAIN), - DEFINE_BUS_SLAVE("DRAM", IMX8MQ_ICS_DRAM, &imx8mq_dram_adj), - DEFINE_BUS_SLAVE("OCRAM", IMX8MQ_ICS_OCRAM, NULL), + DEFINE_BUS_SLAVE("DRAM", IMX8MQ_ICS_DRAM), + DEFINE_BUS_SLAVE("OCRAM", IMX8MQ_ICS_OCRAM), DEFINE_BUS_MASTER("A53", IMX8MQ_ICM_A53, IMX8MQ_ICN_NOC), /* VPUMIX */ DEFINE_BUS_MASTER("VPU", IMX8MQ_ICM_VPU, IMX8MQ_ICN_VIDEO), - DEFINE_BUS_INTERCONNECT("PL301_VIDEO", IMX8MQ_ICN_VIDEO, NULL, IMX8MQ_ICN_NOC), + DEFINE_BUS_INTERCONNECT("PL301_VIDEO", IMX8MQ_ICN_VIDEO, IMX8MQ_ICN_NOC), /* GPUMIX */ DEFINE_BUS_MASTER("GPU", IMX8MQ_ICM_GPU, IMX8MQ_ICN_GPU), - DEFINE_BUS_INTERCONNECT("PL301_GPU", IMX8MQ_ICN_GPU, NULL, IMX8MQ_ICN_NOC), + DEFINE_BUS_INTERCONNECT("PL301_GPU", IMX8MQ_ICN_GPU, IMX8MQ_ICN_NOC), /* DISPMIX (only for DCSS) */ DEFINE_BUS_MASTER("DC", IMX8MQ_ICM_DCSS, IMX8MQ_ICN_DCSS), - DEFINE_BUS_INTERCONNECT("PL301_DC", IMX8MQ_ICN_DCSS, NULL, IMX8MQ_ICN_NOC), + DEFINE_BUS_INTERCONNECT("PL301_DC", IMX8MQ_ICN_DCSS, IMX8MQ_ICN_NOC), /* USBMIX */ DEFINE_BUS_MASTER("USB1", IMX8MQ_ICM_USB1, IMX8MQ_ICN_USB), DEFINE_BUS_MASTER("USB2", IMX8MQ_ICM_USB2, IMX8MQ_ICN_USB), - DEFINE_BUS_INTERCONNECT("PL301_USB", IMX8MQ_ICN_USB, NULL, IMX8MQ_ICN_NOC), + DEFINE_BUS_INTERCONNECT("PL301_USB", IMX8MQ_ICN_USB, IMX8MQ_ICN_NOC), /* PL301_DISPLAY (IPs other than DCSS, inside SUPERMIX) */ DEFINE_BUS_MASTER("CSI1", IMX8MQ_ICM_CSI1, IMX8MQ_ICN_DISPLAY), DEFINE_BUS_MASTER("CSI2", IMX8MQ_ICM_CSI2, IMX8MQ_ICN_DISPLAY), DEFINE_BUS_MASTER("LCDIF", IMX8MQ_ICM_LCDIF, IMX8MQ_ICN_DISPLAY), - DEFINE_BUS_INTERCONNECT("PL301_DISPLAY", IMX8MQ_ICN_DISPLAY, NULL, IMX8MQ_ICN_MAIN), + DEFINE_BUS_INTERCONNECT("PL301_DISPLAY", IMX8MQ_ICN_DISPLAY, IMX8MQ_ICN_MAIN), /* AUDIO */ DEFINE_BUS_MASTER("SDMA2", IMX8MQ_ICM_SDMA2, IMX8MQ_ICN_AUDIO), - DEFINE_BUS_INTERCONNECT("PL301_AUDIO", IMX8MQ_ICN_AUDIO, NULL, IMX8MQ_ICN_DISPLAY), + DEFINE_BUS_INTERCONNECT("PL301_AUDIO", IMX8MQ_ICN_AUDIO, IMX8MQ_ICN_DISPLAY), /* ENET */ DEFINE_BUS_MASTER("ENET", IMX8MQ_ICM_ENET, IMX8MQ_ICN_ENET), - DEFINE_BUS_INTERCONNECT("PL301_ENET", IMX8MQ_ICN_ENET, NULL, IMX8MQ_ICN_MAIN), + DEFINE_BUS_INTERCONNECT("PL301_ENET", IMX8MQ_ICN_ENET, IMX8MQ_ICN_MAIN), /* OTHER */ DEFINE_BUS_MASTER("SDMA1", IMX8MQ_ICM_SDMA1, IMX8MQ_ICN_MAIN), @@ -76,7 +63,7 @@ static struct imx_icc_node_desc nodes[] = { DEFINE_BUS_MASTER("USDHC2", IMX8MQ_ICM_USDHC2, IMX8MQ_ICN_MAIN), DEFINE_BUS_MASTER("PCIE1", IMX8MQ_ICM_PCIE1, IMX8MQ_ICN_MAIN), DEFINE_BUS_MASTER("PCIE2", IMX8MQ_ICM_PCIE2, IMX8MQ_ICN_MAIN), - DEFINE_BUS_INTERCONNECT("PL301_MAIN", IMX8MQ_ICN_MAIN, NULL, + DEFINE_BUS_INTERCONNECT("PL301_MAIN", IMX8MQ_ICN_MAIN, IMX8MQ_ICN_NOC, IMX8MQ_ICS_OCRAM), };