diff options
| author | Ranjani Vaidyanathan <Ranjani.Vaidyanathan@nxp.com> | 2018-11-02 15:58:52 -0500 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:35:00 +0800 |
| commit | 4083a4560a3a3d7a0bbfb5788b76860a1b167d37 (patch) | |
| tree | 6e251018c689e3b9a5eb07affcac89fe7dfa92b2 /include/dt-bindings | |
| parent | 01d5af1e411193058a7341999855bf515ed8241c (diff) | |
MLK-20222-2 ARM64:dts: Update SCFW API
Update SCFW API to the following commit:
"
("430d1e3646fbe75e339e18abf2330565eac906e0")
Author: Chuck Cannon <chuck.cannon@nxp.com>
Date: Fri Nov 2 15:25:45 2018 -0500
SCF-105: RN updates.
"
Signed-off-by: Ranjani Vaidyanathan <Ranjani.Vaidyanathan@nxp.com>
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/pinctrl/pads-imx8qm.h | 11 | ||||
| -rw-r--r-- | include/dt-bindings/pinctrl/pads-imx8qxp.h | 10 | ||||
| -rw-r--r-- | include/dt-bindings/soc/imx_rsrc.h | 18 |
3 files changed, 21 insertions, 18 deletions
diff --git a/include/dt-bindings/pinctrl/pads-imx8qm.h b/include/dt-bindings/pinctrl/pads-imx8qm.h index f992e88e9ed3..e8ed40d405f2 100644 --- a/include/dt-bindings/pinctrl/pads-imx8qm.h +++ b/include/dt-bindings/pinctrl/pads-imx8qm.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. - * Copyright 2017 NXP + * Copyright 2017-2018 NXP * * SPDX-License-Identifier: GPL-2.0+ */ @@ -9,15 +9,13 @@ * Header file used to configure SoC pad list. */ -#ifndef _SC_PADS_H -#define _SC_PADS_H +#ifndef SC_PADS_H +#define SC_PADS_H /* Includes */ /* Defines */ -#define SC_P_ALL UINT16_MAX /* All pads */ - /*! * @name Pad Definitions */ @@ -973,6 +971,7 @@ #define SC_P_ENET1_RGMII_RXD3_LSIO_GPIO6_IO21 SC_P_ENET1_RGMII_RXD3 3 #define SC_P_COMP_CTL_GPIO_1V8_3V3_ENET_ENETB_PAD SC_P_COMP_CTL_GPIO_1V8_3V3_ENET_ENETB 0 #define SC_P_COMP_CTL_GPIO_1V8_3V3_ENET_ENETA_PAD SC_P_COMP_CTL_GPIO_1V8_3V3_ENET_ENETA 0 + /*@}*/ -#endif /* _SC_PADS_H */ +#endif /* SC_PADS_H */ diff --git a/include/dt-bindings/pinctrl/pads-imx8qxp.h b/include/dt-bindings/pinctrl/pads-imx8qxp.h index 6bfd40e44c32..ac4458d9f78e 100644 --- a/include/dt-bindings/pinctrl/pads-imx8qxp.h +++ b/include/dt-bindings/pinctrl/pads-imx8qxp.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. - * Copyright 2017 NXP + * Copyright 2017-2018 NXP * * SPDX-License-Identifier: GPL-2.0+ */ @@ -9,15 +9,13 @@ * Header file used to configure SoC pad list. */ -#ifndef _SC_PADS_H -#define _SC_PADS_H +#ifndef SC_PADS_H +#define SC_PADS_H /* Includes */ /* Defines */ -#define SC_P_ALL UINT16_MAX /* All pads */ - /*! * @name Pad Definitions */ @@ -771,4 +769,4 @@ #define SC_P_QSPI0B_SS1_B_LSIO_GPIO3_IO24 SC_P_QSPI0B_SS1_B 4 /*@}*/ -#endif /* _SC_PADS_H */ +#endif /* SC_PADS_H */ diff --git a/include/dt-bindings/soc/imx_rsrc.h b/include/dt-bindings/soc/imx_rsrc.h index 6a18bcebdd8c..d551be0057ea 100644 --- a/include/dt-bindings/soc/imx_rsrc.h +++ b/include/dt-bindings/soc/imx_rsrc.h @@ -1,12 +1,12 @@ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. - * Copyright 2017 NXP + * Copyright 2017-2018 NXP * * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef __DT_BINDINGS_RSCRC_IMX_H -#define __DT_BINDINGS_RSCRC_IMX_H +#ifndef DT_BINDINGS_RSCRC_IMX_H +#define DT_BINDINGS_RSCRC_IMX_H /*! * These defines are used to indicate a resource. Resources include peripherals @@ -337,7 +337,7 @@ #define SC_R_IRQSTR_SCU2 321 #define SC_R_IRQSTR_DSP 322 #define SC_R_ELCDIF_PLL 323 -#define SC_R_UNUSED6 324 +#define SC_R_OCRAM 324 #define SC_R_AUDIO_PLL_0 325 #define SC_R_PI_0 326 #define SC_R_PI_0_PWM_0 327 @@ -554,6 +554,12 @@ #define SC_R_VPU_MU_3 538 #define SC_R_VPU_ENC_1 539 #define SC_R_VPU 540 -#define SC_R_LAST 541 +#define SC_R_DMA_5_CH0 541 +#define SC_R_DMA_5_CH1 542 +#define SC_R_DMA_5_CH2 543 +#define SC_R_DMA_5_CH3 544 +#define SC_R_ATTESTATION 545 +#define SC_R_PERF 546 +#define SC_R_LAST 547 -#endif /* __DT_BINDINGS_RSCRC_IMX_H */ +#endif /* DT_BINDINGS_RSCRC_IMX_H */ |