diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-19 20:13:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-19 20:13:56 -0400 |
commit | 8362fd64f07eaef7155c94fca8dee91c4f99a666 (patch) | |
tree | 2d16af7d7b8cbb5765727493f796d453580fc107 /include/dt-bindings | |
parent | 24e44913aa746098349370a0f279733c0cadcba7 (diff) | |
parent | 8c0993621c3e5fa52e5425ef2a0f67a0cde07092 (diff) |
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC-related driver updates from Olof Johansson:
"Various driver updates for platforms and a couple of the small driver
subsystems we merge through our tree:
- A driver for SCU (system control) on NXP i.MX8QXP
- Qualcomm Always-on Subsystem messaging driver (AOSS QMP)
- Qualcomm PM support for MSM8998
- Support for a newer version of DRAM PHY driver for Broadcom (DPFE)
- Reset controller support for Bitmain BM1880
- TI SCI (System Control Interface) support for CPU control on AM654
processors
- More TI sysc refactoring and rework"
* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (84 commits)
reset: remove redundant null check on pointer dev
soc: rockchip: work around clang warning
dt-bindings: reset: imx7: Fix the spelling of 'indices'
soc: imx: Add i.MX8MN SoC driver support
soc: aspeed: lpc-ctrl: Fix probe error handling
soc: qcom: geni: Add support for ACPI
firmware: ti_sci: Fix gcc unused-but-set-variable warning
firmware: ti_sci: Use the correct style for SPDX License Identifier
soc: imx8: Use existing of_root directly
soc: imx8: Fix potential kernel dump in error path
firmware/psci: psci_checker: Park kthreads before stopping them
memory: move jedec_ddr.h from include/memory to drivers/memory/
memory: move jedec_ddr_data.c from lib/ to drivers/memory/
MAINTAINERS: Remove myself as qcom maintainer
soc: aspeed: lpc-ctrl: make parameter optional
soc: qcom: apr: Don't use reg for domain id
soc: qcom: fix QCOM_AOSS_QMP dependency and build errors
memory: tegra: Fix -Wunused-const-variable
firmware: tegra: Early resume BPMP
soc/tegra: Select pinctrl for Tegra194
...
Diffstat (limited to 'include/dt-bindings')
-rw-r--r-- | include/dt-bindings/power/qcom-aoss-qmp.h | 14 | ||||
-rw-r--r-- | include/dt-bindings/power/qcom-rpmpd.h | 34 | ||||
-rw-r--r-- | include/dt-bindings/reset/bitmain,bm1880-reset.h | 51 |
3 files changed, 99 insertions, 0 deletions
diff --git a/include/dt-bindings/power/qcom-aoss-qmp.h b/include/dt-bindings/power/qcom-aoss-qmp.h new file mode 100644 index 000000000000..ec336d31dee4 --- /dev/null +++ b/include/dt-bindings/power/qcom-aoss-qmp.h | |||
@@ -0,0 +1,14 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
2 | /* Copyright (c) 2018, Linaro Ltd. */ | ||
3 | |||
4 | #ifndef __DT_BINDINGS_POWER_QCOM_AOSS_QMP_H | ||
5 | #define __DT_BINDINGS_POWER_QCOM_AOSS_QMP_H | ||
6 | |||
7 | #define AOSS_QMP_LS_CDSP 0 | ||
8 | #define AOSS_QMP_LS_LPASS 1 | ||
9 | #define AOSS_QMP_LS_MODEM 2 | ||
10 | #define AOSS_QMP_LS_SLPI 3 | ||
11 | #define AOSS_QMP_LS_SPSS 4 | ||
12 | #define AOSS_QMP_LS_VENUS 5 | ||
13 | |||
14 | #endif | ||
diff --git a/include/dt-bindings/power/qcom-rpmpd.h b/include/dt-bindings/power/qcom-rpmpd.h index 87d9c6611682..93e36d011527 100644 --- a/include/dt-bindings/power/qcom-rpmpd.h +++ b/include/dt-bindings/power/qcom-rpmpd.h | |||
@@ -36,4 +36,38 @@ | |||
36 | #define MSM8996_VDDSSCX 5 | 36 | #define MSM8996_VDDSSCX 5 |
37 | #define MSM8996_VDDSSCX_VFC 6 | 37 | #define MSM8996_VDDSSCX_VFC 6 |
38 | 38 | ||
39 | /* MSM8998 Power Domain Indexes */ | ||
40 | #define MSM8998_VDDCX 0 | ||
41 | #define MSM8998_VDDCX_AO 1 | ||
42 | #define MSM8998_VDDCX_VFL 2 | ||
43 | #define MSM8998_VDDMX 3 | ||
44 | #define MSM8998_VDDMX_AO 4 | ||
45 | #define MSM8998_VDDMX_VFL 5 | ||
46 | #define MSM8998_SSCCX 6 | ||
47 | #define MSM8998_SSCCX_VFL 7 | ||
48 | #define MSM8998_SSCMX 8 | ||
49 | #define MSM8998_SSCMX_VFL 9 | ||
50 | |||
51 | /* QCS404 Power Domains */ | ||
52 | #define QCS404_VDDMX 0 | ||
53 | #define QCS404_VDDMX_AO 1 | ||
54 | #define QCS404_VDDMX_VFL 2 | ||
55 | #define QCS404_LPICX 3 | ||
56 | #define QCS404_LPICX_VFL 4 | ||
57 | #define QCS404_LPIMX 5 | ||
58 | #define QCS404_LPIMX_VFL 6 | ||
59 | |||
60 | /* RPM SMD Power Domain performance levels */ | ||
61 | #define RPM_SMD_LEVEL_RETENTION 16 | ||
62 | #define RPM_SMD_LEVEL_RETENTION_PLUS 32 | ||
63 | #define RPM_SMD_LEVEL_MIN_SVS 48 | ||
64 | #define RPM_SMD_LEVEL_LOW_SVS 64 | ||
65 | #define RPM_SMD_LEVEL_SVS 128 | ||
66 | #define RPM_SMD_LEVEL_SVS_PLUS 192 | ||
67 | #define RPM_SMD_LEVEL_NOM 256 | ||
68 | #define RPM_SMD_LEVEL_NOM_PLUS 320 | ||
69 | #define RPM_SMD_LEVEL_TURBO 384 | ||
70 | #define RPM_SMD_LEVEL_TURBO_NO_CPR 416 | ||
71 | #define RPM_SMD_LEVEL_BINNING 512 | ||
72 | |||
39 | #endif | 73 | #endif |
diff --git a/include/dt-bindings/reset/bitmain,bm1880-reset.h b/include/dt-bindings/reset/bitmain,bm1880-reset.h new file mode 100644 index 000000000000..4c0de5223773 --- /dev/null +++ b/include/dt-bindings/reset/bitmain,bm1880-reset.h | |||
@@ -0,0 +1,51 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0+ */ | ||
2 | /* | ||
3 | * Copyright (c) 2018 Bitmain Ltd. | ||
4 | * Copyright (c) 2019 Linaro Ltd. | ||
5 | */ | ||
6 | |||
7 | #ifndef _DT_BINDINGS_BM1880_RESET_H | ||
8 | #define _DT_BINDINGS_BM1880_RESET_H | ||
9 | |||
10 | #define BM1880_RST_MAIN_AP 0 | ||
11 | #define BM1880_RST_SECOND_AP 1 | ||
12 | #define BM1880_RST_DDR 2 | ||
13 | #define BM1880_RST_VIDEO 3 | ||
14 | #define BM1880_RST_JPEG 4 | ||
15 | #define BM1880_RST_VPP 5 | ||
16 | #define BM1880_RST_GDMA 6 | ||
17 | #define BM1880_RST_AXI_SRAM 7 | ||
18 | #define BM1880_RST_TPU 8 | ||
19 | #define BM1880_RST_USB 9 | ||
20 | #define BM1880_RST_ETH0 10 | ||
21 | #define BM1880_RST_ETH1 11 | ||
22 | #define BM1880_RST_NAND 12 | ||
23 | #define BM1880_RST_EMMC 13 | ||
24 | #define BM1880_RST_SD 14 | ||
25 | #define BM1880_RST_SDMA 15 | ||
26 | #define BM1880_RST_I2S0 16 | ||
27 | #define BM1880_RST_I2S1 17 | ||
28 | #define BM1880_RST_UART0_1_CLK 18 | ||
29 | #define BM1880_RST_UART0_1_ACLK 19 | ||
30 | #define BM1880_RST_UART2_3_CLK 20 | ||
31 | #define BM1880_RST_UART2_3_ACLK 21 | ||
32 | #define BM1880_RST_MINER 22 | ||
33 | #define BM1880_RST_I2C0 23 | ||
34 | #define BM1880_RST_I2C1 24 | ||
35 | #define BM1880_RST_I2C2 25 | ||
36 | #define BM1880_RST_I2C3 26 | ||
37 | #define BM1880_RST_I2C4 27 | ||
38 | #define BM1880_RST_PWM0 28 | ||
39 | #define BM1880_RST_PWM1 29 | ||
40 | #define BM1880_RST_PWM2 30 | ||
41 | #define BM1880_RST_PWM3 31 | ||
42 | #define BM1880_RST_SPI 32 | ||
43 | #define BM1880_RST_GPIO0 33 | ||
44 | #define BM1880_RST_GPIO1 34 | ||
45 | #define BM1880_RST_GPIO2 35 | ||
46 | #define BM1880_RST_EFUSE 36 | ||
47 | #define BM1880_RST_WDT 37 | ||
48 | #define BM1880_RST_AHB_ROM 38 | ||
49 | #define BM1880_RST_SPIC 39 | ||
50 | |||
51 | #endif /* _DT_BINDINGS_BM1880_RESET_H */ | ||