From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7486ECAAD8 for ; Fri, 16 Sep 2022 07:44:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230119AbiIPHoT (ORCPT ); Fri, 16 Sep 2022 03:44:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229894AbiIPHoQ (ORCPT ); Fri, 16 Sep 2022 03:44:16 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3DBBA2237 for ; Fri, 16 Sep 2022 00:44:14 -0700 (PDT) Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1oZ60x-0005N2-AZ; Fri, 16 Sep 2022 09:43:55 +0200 Message-ID: <58e7eada-ce18-0135-210a-3bc27e849fd7@pengutronix.de> Date: Fri, 16 Sep 2022 09:43:51 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: Re: [PATCH 1/2] dt-bindings: firmware: imx: sync with SCFW kit v1.13.0 Content-Language: en-US To: "Viorel Suman (OSS)" , Abel Vesa , Michael Turquette , Stephen Boyd , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Rob Herring , Krzysztof Kozlowski , Viorel Suman , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org References: <20220915181805.424670-1-viorel.suman@oss.nxp.com> <20220915181805.424670-2-viorel.suman@oss.nxp.com> From: Ahmad Fatoum In-Reply-To: <20220915181805.424670-2-viorel.suman@oss.nxp.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 2a0a:edc0:0:900:1d::77 X-SA-Exim-Mail-From: a.fatoum@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello, On 15.09.22 20:18, Viorel Suman (OSS) wrote: > From: Viorel Suman > > Sync defines with the latest available SCFW kit version 1.13.0, > may be found at the address below: > > https://www.nxp.com/webapp/Download?colCode=L5.15.32_2.0.0_SCFWKIT-1.13.0&appType=license > > Signed-off-by: Viorel Suman > --- > include/dt-bindings/firmware/imx/rsrc.h | 299 ++++++++++++++++-------- > 1 file changed, 203 insertions(+), 96 deletions(-) > > diff --git a/include/dt-bindings/firmware/imx/rsrc.h b/include/dt-bindings/firmware/imx/rsrc.h > index 43885056557c..a4c68f394986 100644 > --- a/include/dt-bindings/firmware/imx/rsrc.h > +++ b/include/dt-bindings/firmware/imx/rsrc.h > @@ -13,34 +13,38 @@ > * never be changed or removed (only added to at the end of the list). Above comment literally says that you should never remove defines below. Please provide a better justification why you deem breaking DT backward compatibility acceptable. Thanks, Ahmad > */ > > -#define IMX_SC_R_A53 0 > -#define IMX_SC_R_A53_0 1 > -#define IMX_SC_R_A53_1 2 > -#define IMX_SC_R_A53_2 3 > -#define IMX_SC_R_A53_3 4 > -#define IMX_SC_R_A72 5 > -#define IMX_SC_R_A72_0 6 > -#define IMX_SC_R_A72_1 7 > -#define IMX_SC_R_A72_2 8 > -#define IMX_SC_R_A72_3 9 > +#define IMX_SC_R_AP_0 0 > +#define IMX_SC_R_AP_0_0 1 > +#define IMX_SC_R_AP_0_1 2 > +#define IMX_SC_R_AP_0_2 3 > +#define IMX_SC_R_AP_0_3 4 > +#define IMX_SC_R_AP_1 5 > +#define IMX_SC_R_AP_1_0 6 > +#define IMX_SC_R_AP_1_1 7 > +#define IMX_SC_R_AP_1_2 8 > +#define IMX_SC_R_AP_1_3 9 > #define IMX_SC_R_CCI 10 > #define IMX_SC_R_DB 11 > #define IMX_SC_R_DRC_0 12 > #define IMX_SC_R_DRC_1 13 > #define IMX_SC_R_GIC_SMMU 14 > -#define IMX_SC_R_IRQSTR_M4_0 15 > -#define IMX_SC_R_IRQSTR_M4_1 16 > -#define IMX_SC_R_SMMU 17 > -#define IMX_SC_R_GIC 18 > +#define IMX_SC_R_IRQSTR_MCU_0 15 > +#define IMX_SC_R_IRQSTR_MCU_1 16 > +#define IMX_SC_R_SMMU_0 17 > +#define IMX_SC_R_GIC_0 18 > #define IMX_SC_R_DC_0_BLIT0 19 > #define IMX_SC_R_DC_0_BLIT1 20 > #define IMX_SC_R_DC_0_BLIT2 21 > #define IMX_SC_R_DC_0_BLIT_OUT 22 > -#define IMX_SC_R_PERF 23 > +#define IMX_SC_R_PERF_0 23 > +#define IMX_SC_R_USB_1_PHY 24 > #define IMX_SC_R_DC_0_WARP 25 > +#define IMX_SC_R_V2X_MU_0 26 > +#define IMX_SC_R_V2X_MU_1 27 > #define IMX_SC_R_DC_0_VIDEO0 28 > #define IMX_SC_R_DC_0_VIDEO1 29 > #define IMX_SC_R_DC_0_FRAC0 30 > +#define IMX_SC_R_V2X_MU_2 31 > #define IMX_SC_R_DC_0 32 > #define IMX_SC_R_GPU_2_PID0 33 > #define IMX_SC_R_DC_0_PLL_0 34 > @@ -49,11 +53,17 @@ > #define IMX_SC_R_DC_1_BLIT1 37 > #define IMX_SC_R_DC_1_BLIT2 38 > #define IMX_SC_R_DC_1_BLIT_OUT 39 > +#define IMX_SC_R_V2X_MU_3 40 > +#define IMX_SC_R_V2X_MU_4 41 > #define IMX_SC_R_DC_1_WARP 42 > +#define IMX_SC_R_STM 43 > +#define IMX_SC_R_SECVIO 44 > #define IMX_SC_R_DC_1_VIDEO0 45 > #define IMX_SC_R_DC_1_VIDEO1 46 > #define IMX_SC_R_DC_1_FRAC0 47 > +#define IMX_SC_R_V2X 48 > #define IMX_SC_R_DC_1 49 > +#define IMX_SC_R_UNUSED14 50 > #define IMX_SC_R_DC_1_PLL_0 51 > #define IMX_SC_R_DC_1_PLL_1 52 > #define IMX_SC_R_SPI_0 53 > @@ -144,10 +154,10 @@ > #define IMX_SC_R_DMA_1_CH29 137 > #define IMX_SC_R_DMA_1_CH30 138 > #define IMX_SC_R_DMA_1_CH31 139 > -#define IMX_SC_R_UNUSED1 140 > -#define IMX_SC_R_UNUSED2 141 > -#define IMX_SC_R_UNUSED3 142 > -#define IMX_SC_R_UNUSED4 143 > +#define IMX_SC_R_V2X_PID0 140 > +#define IMX_SC_R_V2X_PID1 141 > +#define IMX_SC_R_V2X_PID2 142 > +#define IMX_SC_R_V2X_PID3 143 > #define IMX_SC_R_GPU_0_PID0 144 > #define IMX_SC_R_GPU_0_PID1 145 > #define IMX_SC_R_GPU_0_PID2 146 > @@ -176,7 +186,7 @@ > #define IMX_SC_R_PCIE_B 169 > #define IMX_SC_R_SATA_0 170 > #define IMX_SC_R_SERDES_1 171 > -#define IMX_SC_R_HSIO_GPIO 172 > +#define IMX_SC_R_HSIO_GPIO_0 172 > #define IMX_SC_R_MATCH_15 173 > #define IMX_SC_R_MATCH_16 174 > #define IMX_SC_R_MATCH_17 175 > @@ -243,15 +253,15 @@ > #define IMX_SC_R_ROM_0 236 > #define IMX_SC_R_FSPI_0 237 > #define IMX_SC_R_FSPI_1 238 > -#define IMX_SC_R_IEE 239 > -#define IMX_SC_R_IEE_R0 240 > -#define IMX_SC_R_IEE_R1 241 > -#define IMX_SC_R_IEE_R2 242 > -#define IMX_SC_R_IEE_R3 243 > -#define IMX_SC_R_IEE_R4 244 > -#define IMX_SC_R_IEE_R5 245 > -#define IMX_SC_R_IEE_R6 246 > -#define IMX_SC_R_IEE_R7 247 > +#define IMX_SC_R_IEE_0 239 > +#define IMX_SC_R_IEE_0_R0 240 > +#define IMX_SC_R_IEE_0_R1 241 > +#define IMX_SC_R_IEE_0_R2 242 > +#define IMX_SC_R_IEE_0_R3 243 > +#define IMX_SC_R_IEE_0_R4 244 > +#define IMX_SC_R_IEE_0_R5 245 > +#define IMX_SC_R_IEE_0_R6 246 > +#define IMX_SC_R_IEE_0_R7 247 > #define IMX_SC_R_SDHC_0 248 > #define IMX_SC_R_SDHC_1 249 > #define IMX_SC_R_SDHC_2 250 > @@ -282,46 +292,50 @@ > #define IMX_SC_R_LVDS_2_PWM_0 275 > #define IMX_SC_R_LVDS_2_I2C_0 276 > #define IMX_SC_R_LVDS_2_I2C_1 277 > -#define IMX_SC_R_M4_0_PID0 278 > -#define IMX_SC_R_M4_0_PID1 279 > -#define IMX_SC_R_M4_0_PID2 280 > -#define IMX_SC_R_M4_0_PID3 281 > -#define IMX_SC_R_M4_0_PID4 282 > -#define IMX_SC_R_M4_0_RGPIO 283 > -#define IMX_SC_R_M4_0_SEMA42 284 > -#define IMX_SC_R_M4_0_TPM 285 > -#define IMX_SC_R_M4_0_PIT 286 > -#define IMX_SC_R_M4_0_UART 287 > -#define IMX_SC_R_M4_0_I2C 288 > -#define IMX_SC_R_M4_0_INTMUX 289 > -#define IMX_SC_R_M4_0_MU_0B 292 > -#define IMX_SC_R_M4_0_MU_0A0 293 > -#define IMX_SC_R_M4_0_MU_0A1 294 > -#define IMX_SC_R_M4_0_MU_0A2 295 > -#define IMX_SC_R_M4_0_MU_0A3 296 > -#define IMX_SC_R_M4_0_MU_1A 297 > -#define IMX_SC_R_M4_1_PID0 298 > -#define IMX_SC_R_M4_1_PID1 299 > -#define IMX_SC_R_M4_1_PID2 300 > -#define IMX_SC_R_M4_1_PID3 301 > -#define IMX_SC_R_M4_1_PID4 302 > -#define IMX_SC_R_M4_1_RGPIO 303 > -#define IMX_SC_R_M4_1_SEMA42 304 > -#define IMX_SC_R_M4_1_TPM 305 > -#define IMX_SC_R_M4_1_PIT 306 > -#define IMX_SC_R_M4_1_UART 307 > -#define IMX_SC_R_M4_1_I2C 308 > -#define IMX_SC_R_M4_1_INTMUX 309 > -#define IMX_SC_R_M4_1_MU_0B 312 > -#define IMX_SC_R_M4_1_MU_0A0 313 > -#define IMX_SC_R_M4_1_MU_0A1 314 > -#define IMX_SC_R_M4_1_MU_0A2 315 > -#define IMX_SC_R_M4_1_MU_0A3 316 > -#define IMX_SC_R_M4_1_MU_1A 317 > +#define IMX_SC_R_MCU_0_PID0 278 > +#define IMX_SC_R_MCU_0_PID1 279 > +#define IMX_SC_R_MCU_0_PID2 280 > +#define IMX_SC_R_MCU_0_PID3 281 > +#define IMX_SC_R_MCU_0_PID4 282 > +#define IMX_SC_R_MCU_0_RGPIO 283 > +#define IMX_SC_R_MCU_0_SEMA42 284 > +#define IMX_SC_R_MCU_0_TPM 285 > +#define IMX_SC_R_MCU_0_PIT 286 > +#define IMX_SC_R_MCU_0_UART 287 > +#define IMX_SC_R_MCU_0_I2C 288 > +#define IMX_SC_R_MCU_0_INTMUX 289 > +#define IMX_SC_R_ENET_0_A0 290 > +#define IMX_SC_R_ENET_0_A1 291 > +#define IMX_SC_R_MCU_0_MU_0B 292 > +#define IMX_SC_R_MCU_0_MU_0A0 293 > +#define IMX_SC_R_MCU_0_MU_0A1 294 > +#define IMX_SC_R_MCU_0_MU_0A2 295 > +#define IMX_SC_R_MCU_0_MU_0A3 296 > +#define IMX_SC_R_MCU_0_MU_1A 297 > +#define IMX_SC_R_MCU_1_PID0 298 > +#define IMX_SC_R_MCU_1_PID1 299 > +#define IMX_SC_R_MCU_1_PID2 300 > +#define IMX_SC_R_MCU_1_PID3 301 > +#define IMX_SC_R_MCU_1_PID4 302 > +#define IMX_SC_R_MCU_1_RGPIO 303 > +#define IMX_SC_R_MCU_1_SEMA42 304 > +#define IMX_SC_R_MCU_1_TPM 305 > +#define IMX_SC_R_MCU_1_PIT 306 > +#define IMX_SC_R_MCU_1_UART 307 > +#define IMX_SC_R_MCU_1_I2C 308 > +#define IMX_SC_R_MCU_1_INTMUX 309 > +#define IMX_SC_R_UNUSED17 310 > +#define IMX_SC_R_UNUSED18 311 > +#define IMX_SC_R_MCU_1_MU_0B 312 > +#define IMX_SC_R_MCU_1_MU_0A0 313 > +#define IMX_SC_R_MCU_1_MU_0A1 314 > +#define IMX_SC_R_MCU_1_MU_0A2 315 > +#define IMX_SC_R_MCU_1_MU_0A3 316 > +#define IMX_SC_R_MCU_1_MU_1A 317 > #define IMX_SC_R_SAI_0 318 > #define IMX_SC_R_SAI_1 319 > #define IMX_SC_R_SAI_2 320 > -#define IMX_SC_R_IRQSTR_SCU2 321 > +#define IMX_SC_R_IRQSTR_AP_0 321 > #define IMX_SC_R_IRQSTR_DSP 322 > #define IMX_SC_R_ELCDIF_PLL 323 > #define IMX_SC_R_OCRAM 324 > @@ -366,33 +380,33 @@ > #define IMX_SC_R_VPU_PID5 363 > #define IMX_SC_R_VPU_PID6 364 > #define IMX_SC_R_VPU_PID7 365 > -#define IMX_SC_R_VPU_UART 366 > -#define IMX_SC_R_VPUCORE 367 > -#define IMX_SC_R_VPUCORE_0 368 > -#define IMX_SC_R_VPUCORE_1 369 > -#define IMX_SC_R_VPUCORE_2 370 > -#define IMX_SC_R_VPUCORE_3 371 > +#define IMX_SC_R_ENET_0_A2 366 > +#define IMX_SC_R_ENET_1_A0 367 > +#define IMX_SC_R_ENET_1_A1 368 > +#define IMX_SC_R_ENET_1_A2 369 > +#define IMX_SC_R_ENET_1_A3 370 > +#define IMX_SC_R_ENET_1_A4 371 > #define IMX_SC_R_DMA_4_CH0 372 > #define IMX_SC_R_DMA_4_CH1 373 > #define IMX_SC_R_DMA_4_CH2 374 > #define IMX_SC_R_DMA_4_CH3 375 > #define IMX_SC_R_DMA_4_CH4 376 > -#define IMX_SC_R_ISI_CH0 377 > -#define IMX_SC_R_ISI_CH1 378 > -#define IMX_SC_R_ISI_CH2 379 > -#define IMX_SC_R_ISI_CH3 380 > -#define IMX_SC_R_ISI_CH4 381 > -#define IMX_SC_R_ISI_CH5 382 > -#define IMX_SC_R_ISI_CH6 383 > -#define IMX_SC_R_ISI_CH7 384 > -#define IMX_SC_R_MJPEG_DEC_S0 385 > -#define IMX_SC_R_MJPEG_DEC_S1 386 > -#define IMX_SC_R_MJPEG_DEC_S2 387 > -#define IMX_SC_R_MJPEG_DEC_S3 388 > -#define IMX_SC_R_MJPEG_ENC_S0 389 > -#define IMX_SC_R_MJPEG_ENC_S1 390 > -#define IMX_SC_R_MJPEG_ENC_S2 391 > -#define IMX_SC_R_MJPEG_ENC_S3 392 > +#define IMX_SC_R_ISI_0_CH0 377 > +#define IMX_SC_R_ISI_0_CH1 378 > +#define IMX_SC_R_ISI_0_CH2 379 > +#define IMX_SC_R_ISI_0_CH3 380 > +#define IMX_SC_R_ISI_0_CH4 381 > +#define IMX_SC_R_ISI_0_CH5 382 > +#define IMX_SC_R_ISI_0_CH6 383 > +#define IMX_SC_R_ISI_0_CH7 384 > +#define IMX_SC_R_MJPEG_0_DEC_S0 385 > +#define IMX_SC_R_MJPEG_0_DEC_S1 386 > +#define IMX_SC_R_MJPEG_0_DEC_S2 387 > +#define IMX_SC_R_MJPEG_0_DEC_S3 388 > +#define IMX_SC_R_MJPEG_0_ENC_S0 389 > +#define IMX_SC_R_MJPEG_0_ENC_S1 390 > +#define IMX_SC_R_MJPEG_0_ENC_S2 391 > +#define IMX_SC_R_MJPEG_0_ENC_S3 392 > #define IMX_SC_R_MIPI_0 393 > #define IMX_SC_R_MIPI_0_PWM_0 394 > #define IMX_SC_R_MIPI_0_I2C_0 395 > @@ -507,11 +521,11 @@ > #define IMX_SC_R_SECO_MU_3 504 > #define IMX_SC_R_SECO_MU_4 505 > #define IMX_SC_R_HDMI_RX_PWM_0 506 > -#define IMX_SC_R_A35 507 > -#define IMX_SC_R_A35_0 508 > -#define IMX_SC_R_A35_1 509 > -#define IMX_SC_R_A35_2 510 > -#define IMX_SC_R_A35_3 511 > +#define IMX_SC_R_AP_2 507 > +#define IMX_SC_R_AP_2_0 508 > +#define IMX_SC_R_AP_2_1 509 > +#define IMX_SC_R_AP_2_2 510 > +#define IMX_SC_R_AP_2_3 511 > #define IMX_SC_R_DSP 512 > #define IMX_SC_R_DSP_RAM 513 > #define IMX_SC_R_CAAM_JR1_OUT 514 > @@ -532,8 +546,8 @@ > #define IMX_SC_R_BOARD_R5 529 > #define IMX_SC_R_BOARD_R6 530 > #define IMX_SC_R_BOARD_R7 531 > -#define IMX_SC_R_MJPEG_DEC_MP 532 > -#define IMX_SC_R_MJPEG_ENC_MP 533 > +#define IMX_SC_R_MJPEG_0_DEC_MP 532 > +#define IMX_SC_R_MJPEG_0_ENC_MP 533 > #define IMX_SC_R_VPU_TS_0 534 > #define IMX_SC_R_VPU_MU_0 535 > #define IMX_SC_R_VPU_MU_1 536 > @@ -565,6 +579,95 @@ > #define IMX_SC_PM_CLK_PLL 4 /* PLL */ > #define IMX_SC_PM_CLK_BYPASS 4 /* Bypass clock */ > > +/* > + * Compatibility defines for sc_rsrc_t > + */ > +#define IMX_SC_R_A35 IMX_SC_R_AP_2 > +#define IMX_SC_R_A35_0 IMX_SC_R_AP_2_0 > +#define IMX_SC_R_A35_1 IMX_SC_R_AP_2_1 > +#define IMX_SC_R_A35_2 IMX_SC_R_AP_2_2 > +#define IMX_SC_R_A35_3 IMX_SC_R_AP_2_3 > +#define IMX_SC_R_A53 IMX_SC_R_AP_0 > +#define IMX_SC_R_A53_0 IMX_SC_R_AP_0_0 > +#define IMX_SC_R_A53_1 IMX_SC_R_AP_0_1 > +#define IMX_SC_R_A53_2 IMX_SC_R_AP_0_2 > +#define IMX_SC_R_A53_3 IMX_SC_R_AP_0_3 > +#define IMX_SC_R_A72 IMX_SC_R_AP_1 > +#define IMX_SC_R_A72_0 IMX_SC_R_AP_1_0 > +#define IMX_SC_R_A72_1 IMX_SC_R_AP_1_1 > +#define IMX_SC_R_A72_2 IMX_SC_R_AP_1_2 > +#define IMX_SC_R_A72_3 IMX_SC_R_AP_1_3 > +#define IMX_SC_R_GIC IMX_SC_R_GIC_0 > +#define IMX_SC_R_HSIO_GPIO IMX_SC_R_HSIO_GPIO_0 > +#define IMX_SC_R_IEE IMX_SC_R_IEE_0 > +#define IMX_SC_R_IEE_R0 IMX_SC_R_IEE_0_R0 > +#define IMX_SC_R_IEE_R1 IMX_SC_R_IEE_0_R1 > +#define IMX_SC_R_IEE_R2 IMX_SC_R_IEE_0_R2 > +#define IMX_SC_R_IEE_R3 IMX_SC_R_IEE_0_R3 > +#define IMX_SC_R_IEE_R4 IMX_SC_R_IEE_0_R4 > +#define IMX_SC_R_IEE_R5 IMX_SC_R_IEE_0_R5 > +#define IMX_SC_R_IEE_R6 IMX_SC_R_IEE_0_R6 > +#define IMX_SC_R_IEE_R7 IMX_SC_R_IEE_0_R7 > +#define IMX_SC_R_IRQSTR_M4_0 IMX_SC_R_IRQSTR_MCU_0 > +#define IMX_SC_R_IRQSTR_M4_1 IMX_SC_R_IRQSTR_MCU_1 > +#define IMX_SC_R_IRQSTR_SCU2 IMX_SC_R_IRQSTR_AP_0 > +#define IMX_SC_R_ISI_CH0 IMX_SC_R_ISI_0_CH0 > +#define IMX_SC_R_ISI_CH1 IMX_SC_R_ISI_0_CH1 > +#define IMX_SC_R_ISI_CH2 IMX_SC_R_ISI_0_CH2 > +#define IMX_SC_R_ISI_CH3 IMX_SC_R_ISI_0_CH3 > +#define IMX_SC_R_ISI_CH4 IMX_SC_R_ISI_0_CH4 > +#define IMX_SC_R_ISI_CH5 IMX_SC_R_ISI_0_CH5 > +#define IMX_SC_R_ISI_CH6 IMX_SC_R_ISI_0_CH6 > +#define IMX_SC_R_ISI_CH7 IMX_SC_R_ISI_0_CH7 > +#define IMX_SC_R_M4_0_I2C IMX_SC_R_MCU_0_I2C > +#define IMX_SC_R_M4_0_INTMUX IMX_SC_R_MCU_0_INTMUX > +#define IMX_SC_R_M4_0_MU_0A0 IMX_SC_R_MCU_0_MU_0A0 > +#define IMX_SC_R_M4_0_MU_0A1 IMX_SC_R_MCU_0_MU_0A1 > +#define IMX_SC_R_M4_0_MU_0A2 IMX_SC_R_MCU_0_MU_0A2 > +#define IMX_SC_R_M4_0_MU_0A3 IMX_SC_R_MCU_0_MU_0A3 > +#define IMX_SC_R_M4_0_MU_0B IMX_SC_R_MCU_0_MU_0B > +#define IMX_SC_R_M4_0_MU_1A IMX_SC_R_MCU_0_MU_1A > +#define IMX_SC_R_M4_0_PID0 IMX_SC_R_MCU_0_PID0 > +#define IMX_SC_R_M4_0_PID1 IMX_SC_R_MCU_0_PID1 > +#define IMX_SC_R_M4_0_PID2 IMX_SC_R_MCU_0_PID2 > +#define IMX_SC_R_M4_0_PID3 IMX_SC_R_MCU_0_PID3 > +#define IMX_SC_R_M4_0_PID4 IMX_SC_R_MCU_0_PID4 > +#define IMX_SC_R_M4_0_PIT IMX_SC_R_MCU_0_PIT > +#define IMX_SC_R_M4_0_RGPIO IMX_SC_R_MCU_0_RGPIO > +#define IMX_SC_R_M4_0_SEMA42 IMX_SC_R_MCU_0_SEMA42 > +#define IMX_SC_R_M4_0_TPM IMX_SC_R_MCU_0_TPM > +#define IMX_SC_R_M4_0_UART IMX_SC_R_MCU_0_UART > +#define IMX_SC_R_M4_1_I2C IMX_SC_R_MCU_1_I2C > +#define IMX_SC_R_M4_1_INTMUX IMX_SC_R_MCU_1_INTMUX > +#define IMX_SC_R_M4_1_MU_0A0 IMX_SC_R_MCU_1_MU_0A0 > +#define IMX_SC_R_M4_1_MU_0A1 IMX_SC_R_MCU_1_MU_0A1 > +#define IMX_SC_R_M4_1_MU_0A2 IMX_SC_R_MCU_1_MU_0A2 > +#define IMX_SC_R_M4_1_MU_0A3 IMX_SC_R_MCU_1_MU_0A3 > +#define IMX_SC_R_M4_1_MU_0B IMX_SC_R_MCU_1_MU_0B > +#define IMX_SC_R_M4_1_MU_1A IMX_SC_R_MCU_1_MU_1A > +#define IMX_SC_R_M4_1_PID0 IMX_SC_R_MCU_1_PID0 > +#define IMX_SC_R_M4_1_PID1 IMX_SC_R_MCU_1_PID1 > +#define IMX_SC_R_M4_1_PID2 IMX_SC_R_MCU_1_PID2 > +#define IMX_SC_R_M4_1_PID3 IMX_SC_R_MCU_1_PID3 > +#define IMX_SC_R_M4_1_PID4 IMX_SC_R_MCU_1_PID4 > +#define IMX_SC_R_M4_1_PIT IMX_SC_R_MCU_1_PIT > +#define IMX_SC_R_M4_1_RGPIO IMX_SC_R_MCU_1_RGPIO > +#define IMX_SC_R_M4_1_SEMA42 IMX_SC_R_MCU_1_SEMA42 > +#define IMX_SC_R_M4_1_TPM IMX_SC_R_MCU_1_TPM > +#define IMX_SC_R_M4_1_UART IMX_SC_R_MCU_1_UART > +#define IMX_SC_R_MJPEG_DEC_MP IMX_SC_R_MJPEG_0_DEC_MP > +#define IMX_SC_R_MJPEG_DEC_S0 IMX_SC_R_MJPEG_0_DEC_S0 > +#define IMX_SC_R_MJPEG_DEC_S1 IMX_SC_R_MJPEG_0_DEC_S1 > +#define IMX_SC_R_MJPEG_DEC_S2 IMX_SC_R_MJPEG_0_DEC_S2 > +#define IMX_SC_R_MJPEG_DEC_S3 IMX_SC_R_MJPEG_0_DEC_S3 > +#define IMX_SC_R_MJPEG_ENC_MP IMX_SC_R_MJPEG_0_ENC_MP > +#define IMX_SC_R_MJPEG_ENC_S0 IMX_SC_R_MJPEG_0_ENC_S0 > +#define IMX_SC_R_MJPEG_ENC_S1 IMX_SC_R_MJPEG_0_ENC_S1 > +#define IMX_SC_R_MJPEG_ENC_S2 IMX_SC_R_MJPEG_0_ENC_S2 > +#define IMX_SC_R_MJPEG_ENC_S3 IMX_SC_R_MJPEG_0_ENC_S3 > +#define IMX_SC_R_PERF IMX_SC_R_PERF_0 > +#define IMX_SC_R_SMMU IMX_SC_R_SMMU_0 > + > /* > * Defines for SC CONTROL > */ > @@ -630,6 +733,10 @@ > #define IMX_SC_C_INTF_SEL 59 > #define IMX_SC_C_RXC_DLY 60 > #define IMX_SC_C_TIMER_SEL 61 > -#define IMX_SC_C_LAST 62 > +#define IMX_SC_C_MISC0 62 > +#define IMX_SC_C_MISC1 63 > +#define IMX_SC_C_MISC2 64 > +#define IMX_SC_C_MISC3 65 > +#define IMX_SC_C_LAST 66 > > #endif /* __DT_BINDINGS_RSCRC_IMX_H */ -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | From mboxrd@z Thu Jan 1 00:00:00 1970 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 7BFF8ECAAD8 for ; Fri, 16 Sep 2022 07:45: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:In-Reply-To:From:References:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8BgOeqNjvlM9UeEhoHQ7/Yy+CMYAYV2l5e2eUnFyCDk=; b=zLgX3hpkQ48KMf iJntFVfOLVpiD0uUzcvZaNf534prZvhbN5tNZPzk8fwDQ1CyERnv6lqCY4kw06dbHWK4wC6nmLcpo Pc7gM2qGWb89IdCmrMXvzqjfYVecWr8sTGcSJcvt3Al4ZE1OlJ9FDSoFGo0tGy5fKtCIZoeJNdUcL ZddutjHi5TTC3cVROu9mcSWHFBLuhKL1XcZvKdvuaNOioIq62cPWknn7cAcHZ++fMN3QaeP1UtBZA CLNN+XzjM7XnE3xxqPwP1QUwOspJzYq3GPO9TpjWIekOiywug2TasILhKP7Zv/+D6FhPizahbNHgU +/dykVrD9UrNkb0aSH9g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oZ61N-00AD30-1V; Fri, 16 Sep 2022 07:44:21 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oZ61I-00ACn6-QQ for linux-arm-kernel@lists.infradead.org; Fri, 16 Sep 2022 07:44:19 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1oZ60x-0005N2-AZ; Fri, 16 Sep 2022 09:43:55 +0200 Message-ID: <58e7eada-ce18-0135-210a-3bc27e849fd7@pengutronix.de> Date: Fri, 16 Sep 2022 09:43:51 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: Re: [PATCH 1/2] dt-bindings: firmware: imx: sync with SCFW kit v1.13.0 Content-Language: en-US To: "Viorel Suman (OSS)" , Abel Vesa , Michael Turquette , Stephen Boyd , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Rob Herring , Krzysztof Kozlowski , Viorel Suman , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org References: <20220915181805.424670-1-viorel.suman@oss.nxp.com> <20220915181805.424670-2-viorel.suman@oss.nxp.com> From: Ahmad Fatoum In-Reply-To: <20220915181805.424670-2-viorel.suman@oss.nxp.com> X-SA-Exim-Connect-IP: 2a0a:edc0:0:900:1d::77 X-SA-Exim-Mail-From: a.fatoum@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220916_004417_217534_2CDFB784 X-CRM114-Status: GOOD ( 16.06 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hello, On 15.09.22 20:18, Viorel Suman (OSS) wrote: > From: Viorel Suman > > Sync defines with the latest available SCFW kit version 1.13.0, > may be found at the address below: > > https://www.nxp.com/webapp/Download?colCode=L5.15.32_2.0.0_SCFWKIT-1.13.0&appType=license > > Signed-off-by: Viorel Suman > --- > include/dt-bindings/firmware/imx/rsrc.h | 299 ++++++++++++++++-------- > 1 file changed, 203 insertions(+), 96 deletions(-) > > diff --git a/include/dt-bindings/firmware/imx/rsrc.h b/include/dt-bindings/firmware/imx/rsrc.h > index 43885056557c..a4c68f394986 100644 > --- a/include/dt-bindings/firmware/imx/rsrc.h > +++ b/include/dt-bindings/firmware/imx/rsrc.h > @@ -13,34 +13,38 @@ > * never be changed or removed (only added to at the end of the list). Above comment literally says that you should never remove defines below. Please provide a better justification why you deem breaking DT backward compatibility acceptable. Thanks, Ahmad > */ > > -#define IMX_SC_R_A53 0 > -#define IMX_SC_R_A53_0 1 > -#define IMX_SC_R_A53_1 2 > -#define IMX_SC_R_A53_2 3 > -#define IMX_SC_R_A53_3 4 > -#define IMX_SC_R_A72 5 > -#define IMX_SC_R_A72_0 6 > -#define IMX_SC_R_A72_1 7 > -#define IMX_SC_R_A72_2 8 > -#define IMX_SC_R_A72_3 9 > +#define IMX_SC_R_AP_0 0 > +#define IMX_SC_R_AP_0_0 1 > +#define IMX_SC_R_AP_0_1 2 > +#define IMX_SC_R_AP_0_2 3 > +#define IMX_SC_R_AP_0_3 4 > +#define IMX_SC_R_AP_1 5 > +#define IMX_SC_R_AP_1_0 6 > +#define IMX_SC_R_AP_1_1 7 > +#define IMX_SC_R_AP_1_2 8 > +#define IMX_SC_R_AP_1_3 9 > #define IMX_SC_R_CCI 10 > #define IMX_SC_R_DB 11 > #define IMX_SC_R_DRC_0 12 > #define IMX_SC_R_DRC_1 13 > #define IMX_SC_R_GIC_SMMU 14 > -#define IMX_SC_R_IRQSTR_M4_0 15 > -#define IMX_SC_R_IRQSTR_M4_1 16 > -#define IMX_SC_R_SMMU 17 > -#define IMX_SC_R_GIC 18 > +#define IMX_SC_R_IRQSTR_MCU_0 15 > +#define IMX_SC_R_IRQSTR_MCU_1 16 > +#define IMX_SC_R_SMMU_0 17 > +#define IMX_SC_R_GIC_0 18 > #define IMX_SC_R_DC_0_BLIT0 19 > #define IMX_SC_R_DC_0_BLIT1 20 > #define IMX_SC_R_DC_0_BLIT2 21 > #define IMX_SC_R_DC_0_BLIT_OUT 22 > -#define IMX_SC_R_PERF 23 > +#define IMX_SC_R_PERF_0 23 > +#define IMX_SC_R_USB_1_PHY 24 > #define IMX_SC_R_DC_0_WARP 25 > +#define IMX_SC_R_V2X_MU_0 26 > +#define IMX_SC_R_V2X_MU_1 27 > #define IMX_SC_R_DC_0_VIDEO0 28 > #define IMX_SC_R_DC_0_VIDEO1 29 > #define IMX_SC_R_DC_0_FRAC0 30 > +#define IMX_SC_R_V2X_MU_2 31 > #define IMX_SC_R_DC_0 32 > #define IMX_SC_R_GPU_2_PID0 33 > #define IMX_SC_R_DC_0_PLL_0 34 > @@ -49,11 +53,17 @@ > #define IMX_SC_R_DC_1_BLIT1 37 > #define IMX_SC_R_DC_1_BLIT2 38 > #define IMX_SC_R_DC_1_BLIT_OUT 39 > +#define IMX_SC_R_V2X_MU_3 40 > +#define IMX_SC_R_V2X_MU_4 41 > #define IMX_SC_R_DC_1_WARP 42 > +#define IMX_SC_R_STM 43 > +#define IMX_SC_R_SECVIO 44 > #define IMX_SC_R_DC_1_VIDEO0 45 > #define IMX_SC_R_DC_1_VIDEO1 46 > #define IMX_SC_R_DC_1_FRAC0 47 > +#define IMX_SC_R_V2X 48 > #define IMX_SC_R_DC_1 49 > +#define IMX_SC_R_UNUSED14 50 > #define IMX_SC_R_DC_1_PLL_0 51 > #define IMX_SC_R_DC_1_PLL_1 52 > #define IMX_SC_R_SPI_0 53 > @@ -144,10 +154,10 @@ > #define IMX_SC_R_DMA_1_CH29 137 > #define IMX_SC_R_DMA_1_CH30 138 > #define IMX_SC_R_DMA_1_CH31 139 > -#define IMX_SC_R_UNUSED1 140 > -#define IMX_SC_R_UNUSED2 141 > -#define IMX_SC_R_UNUSED3 142 > -#define IMX_SC_R_UNUSED4 143 > +#define IMX_SC_R_V2X_PID0 140 > +#define IMX_SC_R_V2X_PID1 141 > +#define IMX_SC_R_V2X_PID2 142 > +#define IMX_SC_R_V2X_PID3 143 > #define IMX_SC_R_GPU_0_PID0 144 > #define IMX_SC_R_GPU_0_PID1 145 > #define IMX_SC_R_GPU_0_PID2 146 > @@ -176,7 +186,7 @@ > #define IMX_SC_R_PCIE_B 169 > #define IMX_SC_R_SATA_0 170 > #define IMX_SC_R_SERDES_1 171 > -#define IMX_SC_R_HSIO_GPIO 172 > +#define IMX_SC_R_HSIO_GPIO_0 172 > #define IMX_SC_R_MATCH_15 173 > #define IMX_SC_R_MATCH_16 174 > #define IMX_SC_R_MATCH_17 175 > @@ -243,15 +253,15 @@ > #define IMX_SC_R_ROM_0 236 > #define IMX_SC_R_FSPI_0 237 > #define IMX_SC_R_FSPI_1 238 > -#define IMX_SC_R_IEE 239 > -#define IMX_SC_R_IEE_R0 240 > -#define IMX_SC_R_IEE_R1 241 > -#define IMX_SC_R_IEE_R2 242 > -#define IMX_SC_R_IEE_R3 243 > -#define IMX_SC_R_IEE_R4 244 > -#define IMX_SC_R_IEE_R5 245 > -#define IMX_SC_R_IEE_R6 246 > -#define IMX_SC_R_IEE_R7 247 > +#define IMX_SC_R_IEE_0 239 > +#define IMX_SC_R_IEE_0_R0 240 > +#define IMX_SC_R_IEE_0_R1 241 > +#define IMX_SC_R_IEE_0_R2 242 > +#define IMX_SC_R_IEE_0_R3 243 > +#define IMX_SC_R_IEE_0_R4 244 > +#define IMX_SC_R_IEE_0_R5 245 > +#define IMX_SC_R_IEE_0_R6 246 > +#define IMX_SC_R_IEE_0_R7 247 > #define IMX_SC_R_SDHC_0 248 > #define IMX_SC_R_SDHC_1 249 > #define IMX_SC_R_SDHC_2 250 > @@ -282,46 +292,50 @@ > #define IMX_SC_R_LVDS_2_PWM_0 275 > #define IMX_SC_R_LVDS_2_I2C_0 276 > #define IMX_SC_R_LVDS_2_I2C_1 277 > -#define IMX_SC_R_M4_0_PID0 278 > -#define IMX_SC_R_M4_0_PID1 279 > -#define IMX_SC_R_M4_0_PID2 280 > -#define IMX_SC_R_M4_0_PID3 281 > -#define IMX_SC_R_M4_0_PID4 282 > -#define IMX_SC_R_M4_0_RGPIO 283 > -#define IMX_SC_R_M4_0_SEMA42 284 > -#define IMX_SC_R_M4_0_TPM 285 > -#define IMX_SC_R_M4_0_PIT 286 > -#define IMX_SC_R_M4_0_UART 287 > -#define IMX_SC_R_M4_0_I2C 288 > -#define IMX_SC_R_M4_0_INTMUX 289 > -#define IMX_SC_R_M4_0_MU_0B 292 > -#define IMX_SC_R_M4_0_MU_0A0 293 > -#define IMX_SC_R_M4_0_MU_0A1 294 > -#define IMX_SC_R_M4_0_MU_0A2 295 > -#define IMX_SC_R_M4_0_MU_0A3 296 > -#define IMX_SC_R_M4_0_MU_1A 297 > -#define IMX_SC_R_M4_1_PID0 298 > -#define IMX_SC_R_M4_1_PID1 299 > -#define IMX_SC_R_M4_1_PID2 300 > -#define IMX_SC_R_M4_1_PID3 301 > -#define IMX_SC_R_M4_1_PID4 302 > -#define IMX_SC_R_M4_1_RGPIO 303 > -#define IMX_SC_R_M4_1_SEMA42 304 > -#define IMX_SC_R_M4_1_TPM 305 > -#define IMX_SC_R_M4_1_PIT 306 > -#define IMX_SC_R_M4_1_UART 307 > -#define IMX_SC_R_M4_1_I2C 308 > -#define IMX_SC_R_M4_1_INTMUX 309 > -#define IMX_SC_R_M4_1_MU_0B 312 > -#define IMX_SC_R_M4_1_MU_0A0 313 > -#define IMX_SC_R_M4_1_MU_0A1 314 > -#define IMX_SC_R_M4_1_MU_0A2 315 > -#define IMX_SC_R_M4_1_MU_0A3 316 > -#define IMX_SC_R_M4_1_MU_1A 317 > +#define IMX_SC_R_MCU_0_PID0 278 > +#define IMX_SC_R_MCU_0_PID1 279 > +#define IMX_SC_R_MCU_0_PID2 280 > +#define IMX_SC_R_MCU_0_PID3 281 > +#define IMX_SC_R_MCU_0_PID4 282 > +#define IMX_SC_R_MCU_0_RGPIO 283 > +#define IMX_SC_R_MCU_0_SEMA42 284 > +#define IMX_SC_R_MCU_0_TPM 285 > +#define IMX_SC_R_MCU_0_PIT 286 > +#define IMX_SC_R_MCU_0_UART 287 > +#define IMX_SC_R_MCU_0_I2C 288 > +#define IMX_SC_R_MCU_0_INTMUX 289 > +#define IMX_SC_R_ENET_0_A0 290 > +#define IMX_SC_R_ENET_0_A1 291 > +#define IMX_SC_R_MCU_0_MU_0B 292 > +#define IMX_SC_R_MCU_0_MU_0A0 293 > +#define IMX_SC_R_MCU_0_MU_0A1 294 > +#define IMX_SC_R_MCU_0_MU_0A2 295 > +#define IMX_SC_R_MCU_0_MU_0A3 296 > +#define IMX_SC_R_MCU_0_MU_1A 297 > +#define IMX_SC_R_MCU_1_PID0 298 > +#define IMX_SC_R_MCU_1_PID1 299 > +#define IMX_SC_R_MCU_1_PID2 300 > +#define IMX_SC_R_MCU_1_PID3 301 > +#define IMX_SC_R_MCU_1_PID4 302 > +#define IMX_SC_R_MCU_1_RGPIO 303 > +#define IMX_SC_R_MCU_1_SEMA42 304 > +#define IMX_SC_R_MCU_1_TPM 305 > +#define IMX_SC_R_MCU_1_PIT 306 > +#define IMX_SC_R_MCU_1_UART 307 > +#define IMX_SC_R_MCU_1_I2C 308 > +#define IMX_SC_R_MCU_1_INTMUX 309 > +#define IMX_SC_R_UNUSED17 310 > +#define IMX_SC_R_UNUSED18 311 > +#define IMX_SC_R_MCU_1_MU_0B 312 > +#define IMX_SC_R_MCU_1_MU_0A0 313 > +#define IMX_SC_R_MCU_1_MU_0A1 314 > +#define IMX_SC_R_MCU_1_MU_0A2 315 > +#define IMX_SC_R_MCU_1_MU_0A3 316 > +#define IMX_SC_R_MCU_1_MU_1A 317 > #define IMX_SC_R_SAI_0 318 > #define IMX_SC_R_SAI_1 319 > #define IMX_SC_R_SAI_2 320 > -#define IMX_SC_R_IRQSTR_SCU2 321 > +#define IMX_SC_R_IRQSTR_AP_0 321 > #define IMX_SC_R_IRQSTR_DSP 322 > #define IMX_SC_R_ELCDIF_PLL 323 > #define IMX_SC_R_OCRAM 324 > @@ -366,33 +380,33 @@ > #define IMX_SC_R_VPU_PID5 363 > #define IMX_SC_R_VPU_PID6 364 > #define IMX_SC_R_VPU_PID7 365 > -#define IMX_SC_R_VPU_UART 366 > -#define IMX_SC_R_VPUCORE 367 > -#define IMX_SC_R_VPUCORE_0 368 > -#define IMX_SC_R_VPUCORE_1 369 > -#define IMX_SC_R_VPUCORE_2 370 > -#define IMX_SC_R_VPUCORE_3 371 > +#define IMX_SC_R_ENET_0_A2 366 > +#define IMX_SC_R_ENET_1_A0 367 > +#define IMX_SC_R_ENET_1_A1 368 > +#define IMX_SC_R_ENET_1_A2 369 > +#define IMX_SC_R_ENET_1_A3 370 > +#define IMX_SC_R_ENET_1_A4 371 > #define IMX_SC_R_DMA_4_CH0 372 > #define IMX_SC_R_DMA_4_CH1 373 > #define IMX_SC_R_DMA_4_CH2 374 > #define IMX_SC_R_DMA_4_CH3 375 > #define IMX_SC_R_DMA_4_CH4 376 > -#define IMX_SC_R_ISI_CH0 377 > -#define IMX_SC_R_ISI_CH1 378 > -#define IMX_SC_R_ISI_CH2 379 > -#define IMX_SC_R_ISI_CH3 380 > -#define IMX_SC_R_ISI_CH4 381 > -#define IMX_SC_R_ISI_CH5 382 > -#define IMX_SC_R_ISI_CH6 383 > -#define IMX_SC_R_ISI_CH7 384 > -#define IMX_SC_R_MJPEG_DEC_S0 385 > -#define IMX_SC_R_MJPEG_DEC_S1 386 > -#define IMX_SC_R_MJPEG_DEC_S2 387 > -#define IMX_SC_R_MJPEG_DEC_S3 388 > -#define IMX_SC_R_MJPEG_ENC_S0 389 > -#define IMX_SC_R_MJPEG_ENC_S1 390 > -#define IMX_SC_R_MJPEG_ENC_S2 391 > -#define IMX_SC_R_MJPEG_ENC_S3 392 > +#define IMX_SC_R_ISI_0_CH0 377 > +#define IMX_SC_R_ISI_0_CH1 378 > +#define IMX_SC_R_ISI_0_CH2 379 > +#define IMX_SC_R_ISI_0_CH3 380 > +#define IMX_SC_R_ISI_0_CH4 381 > +#define IMX_SC_R_ISI_0_CH5 382 > +#define IMX_SC_R_ISI_0_CH6 383 > +#define IMX_SC_R_ISI_0_CH7 384 > +#define IMX_SC_R_MJPEG_0_DEC_S0 385 > +#define IMX_SC_R_MJPEG_0_DEC_S1 386 > +#define IMX_SC_R_MJPEG_0_DEC_S2 387 > +#define IMX_SC_R_MJPEG_0_DEC_S3 388 > +#define IMX_SC_R_MJPEG_0_ENC_S0 389 > +#define IMX_SC_R_MJPEG_0_ENC_S1 390 > +#define IMX_SC_R_MJPEG_0_ENC_S2 391 > +#define IMX_SC_R_MJPEG_0_ENC_S3 392 > #define IMX_SC_R_MIPI_0 393 > #define IMX_SC_R_MIPI_0_PWM_0 394 > #define IMX_SC_R_MIPI_0_I2C_0 395 > @@ -507,11 +521,11 @@ > #define IMX_SC_R_SECO_MU_3 504 > #define IMX_SC_R_SECO_MU_4 505 > #define IMX_SC_R_HDMI_RX_PWM_0 506 > -#define IMX_SC_R_A35 507 > -#define IMX_SC_R_A35_0 508 > -#define IMX_SC_R_A35_1 509 > -#define IMX_SC_R_A35_2 510 > -#define IMX_SC_R_A35_3 511 > +#define IMX_SC_R_AP_2 507 > +#define IMX_SC_R_AP_2_0 508 > +#define IMX_SC_R_AP_2_1 509 > +#define IMX_SC_R_AP_2_2 510 > +#define IMX_SC_R_AP_2_3 511 > #define IMX_SC_R_DSP 512 > #define IMX_SC_R_DSP_RAM 513 > #define IMX_SC_R_CAAM_JR1_OUT 514 > @@ -532,8 +546,8 @@ > #define IMX_SC_R_BOARD_R5 529 > #define IMX_SC_R_BOARD_R6 530 > #define IMX_SC_R_BOARD_R7 531 > -#define IMX_SC_R_MJPEG_DEC_MP 532 > -#define IMX_SC_R_MJPEG_ENC_MP 533 > +#define IMX_SC_R_MJPEG_0_DEC_MP 532 > +#define IMX_SC_R_MJPEG_0_ENC_MP 533 > #define IMX_SC_R_VPU_TS_0 534 > #define IMX_SC_R_VPU_MU_0 535 > #define IMX_SC_R_VPU_MU_1 536 > @@ -565,6 +579,95 @@ > #define IMX_SC_PM_CLK_PLL 4 /* PLL */ > #define IMX_SC_PM_CLK_BYPASS 4 /* Bypass clock */ > > +/* > + * Compatibility defines for sc_rsrc_t > + */ > +#define IMX_SC_R_A35 IMX_SC_R_AP_2 > +#define IMX_SC_R_A35_0 IMX_SC_R_AP_2_0 > +#define IMX_SC_R_A35_1 IMX_SC_R_AP_2_1 > +#define IMX_SC_R_A35_2 IMX_SC_R_AP_2_2 > +#define IMX_SC_R_A35_3 IMX_SC_R_AP_2_3 > +#define IMX_SC_R_A53 IMX_SC_R_AP_0 > +#define IMX_SC_R_A53_0 IMX_SC_R_AP_0_0 > +#define IMX_SC_R_A53_1 IMX_SC_R_AP_0_1 > +#define IMX_SC_R_A53_2 IMX_SC_R_AP_0_2 > +#define IMX_SC_R_A53_3 IMX_SC_R_AP_0_3 > +#define IMX_SC_R_A72 IMX_SC_R_AP_1 > +#define IMX_SC_R_A72_0 IMX_SC_R_AP_1_0 > +#define IMX_SC_R_A72_1 IMX_SC_R_AP_1_1 > +#define IMX_SC_R_A72_2 IMX_SC_R_AP_1_2 > +#define IMX_SC_R_A72_3 IMX_SC_R_AP_1_3 > +#define IMX_SC_R_GIC IMX_SC_R_GIC_0 > +#define IMX_SC_R_HSIO_GPIO IMX_SC_R_HSIO_GPIO_0 > +#define IMX_SC_R_IEE IMX_SC_R_IEE_0 > +#define IMX_SC_R_IEE_R0 IMX_SC_R_IEE_0_R0 > +#define IMX_SC_R_IEE_R1 IMX_SC_R_IEE_0_R1 > +#define IMX_SC_R_IEE_R2 IMX_SC_R_IEE_0_R2 > +#define IMX_SC_R_IEE_R3 IMX_SC_R_IEE_0_R3 > +#define IMX_SC_R_IEE_R4 IMX_SC_R_IEE_0_R4 > +#define IMX_SC_R_IEE_R5 IMX_SC_R_IEE_0_R5 > +#define IMX_SC_R_IEE_R6 IMX_SC_R_IEE_0_R6 > +#define IMX_SC_R_IEE_R7 IMX_SC_R_IEE_0_R7 > +#define IMX_SC_R_IRQSTR_M4_0 IMX_SC_R_IRQSTR_MCU_0 > +#define IMX_SC_R_IRQSTR_M4_1 IMX_SC_R_IRQSTR_MCU_1 > +#define IMX_SC_R_IRQSTR_SCU2 IMX_SC_R_IRQSTR_AP_0 > +#define IMX_SC_R_ISI_CH0 IMX_SC_R_ISI_0_CH0 > +#define IMX_SC_R_ISI_CH1 IMX_SC_R_ISI_0_CH1 > +#define IMX_SC_R_ISI_CH2 IMX_SC_R_ISI_0_CH2 > +#define IMX_SC_R_ISI_CH3 IMX_SC_R_ISI_0_CH3 > +#define IMX_SC_R_ISI_CH4 IMX_SC_R_ISI_0_CH4 > +#define IMX_SC_R_ISI_CH5 IMX_SC_R_ISI_0_CH5 > +#define IMX_SC_R_ISI_CH6 IMX_SC_R_ISI_0_CH6 > +#define IMX_SC_R_ISI_CH7 IMX_SC_R_ISI_0_CH7 > +#define IMX_SC_R_M4_0_I2C IMX_SC_R_MCU_0_I2C > +#define IMX_SC_R_M4_0_INTMUX IMX_SC_R_MCU_0_INTMUX > +#define IMX_SC_R_M4_0_MU_0A0 IMX_SC_R_MCU_0_MU_0A0 > +#define IMX_SC_R_M4_0_MU_0A1 IMX_SC_R_MCU_0_MU_0A1 > +#define IMX_SC_R_M4_0_MU_0A2 IMX_SC_R_MCU_0_MU_0A2 > +#define IMX_SC_R_M4_0_MU_0A3 IMX_SC_R_MCU_0_MU_0A3 > +#define IMX_SC_R_M4_0_MU_0B IMX_SC_R_MCU_0_MU_0B > +#define IMX_SC_R_M4_0_MU_1A IMX_SC_R_MCU_0_MU_1A > +#define IMX_SC_R_M4_0_PID0 IMX_SC_R_MCU_0_PID0 > +#define IMX_SC_R_M4_0_PID1 IMX_SC_R_MCU_0_PID1 > +#define IMX_SC_R_M4_0_PID2 IMX_SC_R_MCU_0_PID2 > +#define IMX_SC_R_M4_0_PID3 IMX_SC_R_MCU_0_PID3 > +#define IMX_SC_R_M4_0_PID4 IMX_SC_R_MCU_0_PID4 > +#define IMX_SC_R_M4_0_PIT IMX_SC_R_MCU_0_PIT > +#define IMX_SC_R_M4_0_RGPIO IMX_SC_R_MCU_0_RGPIO > +#define IMX_SC_R_M4_0_SEMA42 IMX_SC_R_MCU_0_SEMA42 > +#define IMX_SC_R_M4_0_TPM IMX_SC_R_MCU_0_TPM > +#define IMX_SC_R_M4_0_UART IMX_SC_R_MCU_0_UART > +#define IMX_SC_R_M4_1_I2C IMX_SC_R_MCU_1_I2C > +#define IMX_SC_R_M4_1_INTMUX IMX_SC_R_MCU_1_INTMUX > +#define IMX_SC_R_M4_1_MU_0A0 IMX_SC_R_MCU_1_MU_0A0 > +#define IMX_SC_R_M4_1_MU_0A1 IMX_SC_R_MCU_1_MU_0A1 > +#define IMX_SC_R_M4_1_MU_0A2 IMX_SC_R_MCU_1_MU_0A2 > +#define IMX_SC_R_M4_1_MU_0A3 IMX_SC_R_MCU_1_MU_0A3 > +#define IMX_SC_R_M4_1_MU_0B IMX_SC_R_MCU_1_MU_0B > +#define IMX_SC_R_M4_1_MU_1A IMX_SC_R_MCU_1_MU_1A > +#define IMX_SC_R_M4_1_PID0 IMX_SC_R_MCU_1_PID0 > +#define IMX_SC_R_M4_1_PID1 IMX_SC_R_MCU_1_PID1 > +#define IMX_SC_R_M4_1_PID2 IMX_SC_R_MCU_1_PID2 > +#define IMX_SC_R_M4_1_PID3 IMX_SC_R_MCU_1_PID3 > +#define IMX_SC_R_M4_1_PID4 IMX_SC_R_MCU_1_PID4 > +#define IMX_SC_R_M4_1_PIT IMX_SC_R_MCU_1_PIT > +#define IMX_SC_R_M4_1_RGPIO IMX_SC_R_MCU_1_RGPIO > +#define IMX_SC_R_M4_1_SEMA42 IMX_SC_R_MCU_1_SEMA42 > +#define IMX_SC_R_M4_1_TPM IMX_SC_R_MCU_1_TPM > +#define IMX_SC_R_M4_1_UART IMX_SC_R_MCU_1_UART > +#define IMX_SC_R_MJPEG_DEC_MP IMX_SC_R_MJPEG_0_DEC_MP > +#define IMX_SC_R_MJPEG_DEC_S0 IMX_SC_R_MJPEG_0_DEC_S0 > +#define IMX_SC_R_MJPEG_DEC_S1 IMX_SC_R_MJPEG_0_DEC_S1 > +#define IMX_SC_R_MJPEG_DEC_S2 IMX_SC_R_MJPEG_0_DEC_S2 > +#define IMX_SC_R_MJPEG_DEC_S3 IMX_SC_R_MJPEG_0_DEC_S3 > +#define IMX_SC_R_MJPEG_ENC_MP IMX_SC_R_MJPEG_0_ENC_MP > +#define IMX_SC_R_MJPEG_ENC_S0 IMX_SC_R_MJPEG_0_ENC_S0 > +#define IMX_SC_R_MJPEG_ENC_S1 IMX_SC_R_MJPEG_0_ENC_S1 > +#define IMX_SC_R_MJPEG_ENC_S2 IMX_SC_R_MJPEG_0_ENC_S2 > +#define IMX_SC_R_MJPEG_ENC_S3 IMX_SC_R_MJPEG_0_ENC_S3 > +#define IMX_SC_R_PERF IMX_SC_R_PERF_0 > +#define IMX_SC_R_SMMU IMX_SC_R_SMMU_0 > + > /* > * Defines for SC CONTROL > */ > @@ -630,6 +733,10 @@ > #define IMX_SC_C_INTF_SEL 59 > #define IMX_SC_C_RXC_DLY 60 > #define IMX_SC_C_TIMER_SEL 61 > -#define IMX_SC_C_LAST 62 > +#define IMX_SC_C_MISC0 62 > +#define IMX_SC_C_MISC1 63 > +#define IMX_SC_C_MISC2 64 > +#define IMX_SC_C_MISC3 65 > +#define IMX_SC_C_LAST 66 > > #endif /* __DT_BINDINGS_RSCRC_IMX_H */ -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel