Skip to content

Commit 755a739

Browse files
Dong AishengShawn Guo
authored andcommitted
dt-bindings: firmware: imx: Move system control into dt-binding headfile
i.MX8 SoCs DTS file needs system control macro definitions, so move them into dt-binding headfile, then include/linux/firmware/imx/types.h can be removed and those drivers using it should be changed accordingly. Signed-off-by: Dong Aisheng <[email protected]> Signed-off-by: Jacky Bai <[email protected]> Signed-off-by: Anson Huang <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
1 parent f5f27b7 commit 755a739

File tree

5 files changed

+52
-68
lines changed

5 files changed

+52
-68
lines changed

drivers/firmware/imx/imx-scu.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*/
99

1010
#include <linux/err.h>
11-
#include <linux/firmware/imx/types.h>
1211
#include <linux/firmware/imx/ipc.h>
1312
#include <linux/firmware/imx/sci.h>
1413
#include <linux/interrupt.h>

drivers/thermal/imx_sc_thermal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* Copyright 2018-2020 NXP.
44
*/
55

6+
#include <dt-bindings/firmware/imx/rsrc.h>
67
#include <linux/err.h>
78
#include <linux/firmware/imx/sci.h>
8-
#include <linux/firmware/imx/types.h>
99
#include <linux/module.h>
1010
#include <linux/of.h>
1111
#include <linux/of_device.h>

include/dt-bindings/firmware/imx/rsrc.h

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,4 +547,55 @@
547547
#define IMX_SC_R_ATTESTATION 545
548548
#define IMX_SC_R_LAST 546
549549

550+
/*
551+
* Defines for SC CONTROL
552+
*/
553+
#define IMX_SC_C_TEMP 0
554+
#define IMX_SC_C_TEMP_HI 1
555+
#define IMX_SC_C_TEMP_LOW 2
556+
#define IMX_SC_C_PXL_LINK_MST1_ADDR 3
557+
#define IMX_SC_C_PXL_LINK_MST2_ADDR 4
558+
#define IMX_SC_C_PXL_LINK_MST_ENB 5
559+
#define IMX_SC_C_PXL_LINK_MST1_ENB 6
560+
#define IMX_SC_C_PXL_LINK_MST2_ENB 7
561+
#define IMX_SC_C_PXL_LINK_SLV1_ADDR 8
562+
#define IMX_SC_C_PXL_LINK_SLV2_ADDR 9
563+
#define IMX_SC_C_PXL_LINK_MST_VLD 10
564+
#define IMX_SC_C_PXL_LINK_MST1_VLD 11
565+
#define IMX_SC_C_PXL_LINK_MST2_VLD 12
566+
#define IMX_SC_C_SINGLE_MODE 13
567+
#define IMX_SC_C_ID 14
568+
#define IMX_SC_C_PXL_CLK_POLARITY 15
569+
#define IMX_SC_C_LINESTATE 16
570+
#define IMX_SC_C_PCIE_G_RST 17
571+
#define IMX_SC_C_PCIE_BUTTON_RST 18
572+
#define IMX_SC_C_PCIE_PERST 19
573+
#define IMX_SC_C_PHY_RESET 20
574+
#define IMX_SC_C_PXL_LINK_RATE_CORRECTION 21
575+
#define IMX_SC_C_PANIC 22
576+
#define IMX_SC_C_PRIORITY_GROUP 23
577+
#define IMX_SC_C_TXCLK 24
578+
#define IMX_SC_C_CLKDIV 25
579+
#define IMX_SC_C_DISABLE_50 26
580+
#define IMX_SC_C_DISABLE_125 27
581+
#define IMX_SC_C_SEL_125 28
582+
#define IMX_SC_C_MODE 29
583+
#define IMX_SC_C_SYNC_CTRL0 30
584+
#define IMX_SC_C_KACHUNK_CNT 31
585+
#define IMX_SC_C_KACHUNK_SEL 32
586+
#define IMX_SC_C_SYNC_CTRL1 33
587+
#define IMX_SC_C_DPI_RESET 34
588+
#define IMX_SC_C_MIPI_RESET 35
589+
#define IMX_SC_C_DUAL_MODE 36
590+
#define IMX_SC_C_VOLTAGE 37
591+
#define IMX_SC_C_PXL_LINK_SEL 38
592+
#define IMX_SC_C_OFS_SEL 39
593+
#define IMX_SC_C_OFS_AUDIO 40
594+
#define IMX_SC_C_OFS_PERIPH 41
595+
#define IMX_SC_C_OFS_IRQ 42
596+
#define IMX_SC_C_RST0 43
597+
#define IMX_SC_C_RST1 44
598+
#define IMX_SC_C_SEL0 45
599+
#define IMX_SC_C_LAST 46
600+
550601
#endif /* __DT_BINDINGS_RSCRC_IMX_H */

include/linux/firmware/imx/sci.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#define _SC_SCI_H
1212

1313
#include <linux/firmware/imx/ipc.h>
14-
#include <linux/firmware/imx/types.h>
1514

1615
#include <linux/firmware/imx/svc/misc.h>
1716
#include <linux/firmware/imx/svc/pm.h>

include/linux/firmware/imx/types.h

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)