Merge branches 'clk-actions-reset', 'clk-imx7-init-critical', 'clk-mmp2-ids' and 'clk-at91-pmc-rework' into clk-next
- Reset Controller (RMU) support for Actions Semi Owl S900 and S700 SoCs - Rework at91 PMC clock driver for new DT bindings * clk-actions-reset: clk: actions: Add Actions Semi S900 SoC Reset Management Unit support clk: actions: Add Actions Semi S700 SoC Reset Management Unit support clk: actions: Add Actions Semi Owl SoCs Reset Management Unit support dt-bindings: reset: Add binding constants for Actions Semi S900 RMU dt-bindings: reset: Add binding constants for Actions Semi S700 RMU dt-bindings: clock: Add reset controller bindings for Actions Semi Owl SoCs clk: actions: Cache regmap info in private clock descriptor * clk-imx7-init-critical: clk: imx7d: remove CLK_IS_CRITICAL flag for arm_a7_root_clk clk: imx: cpu clock should be always critical clk: imx: imx7d: remove clks_init_on array clk: imx: imx7d: remove unnecessary clocks from clks_init_on array * clk-mmp2-ids: clk: mmp2: fix the clock id for sdh2_clk and sdh3_clk * clk-at91-pmc-rework: clk: at91: move DT compatibility code to its own file clk: at91: add at91sam9rl PMC driver clk: at91: add at91sam9x5 PMCs driver clk: at91: add at91sam9260 PMC driver clk: at91: add sama5d2 PMC driver clk: at91: add sama5d4 pmc driver clk: at91: add new DT lookup function dt-bindings: clk: at91: Document new PMC binding clk: at91: add pmc_data struct and helpers clk: at91: allow clock registration from C code clk: at91: generated: set audio_pll_allowed in at91_clk_register_generated() clk: at91: audio-pll: separate registration from DT parsing clk: at91: h32mx: separate registration from DT parsing clk: at91: generated: SSCs don't have a gclk clk: at91: audio-pll: fix audio pmc type
This commit is contained in:
@@ -9,6 +9,20 @@
|
||||
#ifndef _DT_BINDINGS_CLK_AT91_H
|
||||
#define _DT_BINDINGS_CLK_AT91_H
|
||||
|
||||
#define PMC_TYPE_CORE 0
|
||||
#define PMC_TYPE_SYSTEM 1
|
||||
#define PMC_TYPE_PERIPHERAL 2
|
||||
#define PMC_TYPE_GCK 3
|
||||
|
||||
#define PMC_SLOW 0
|
||||
#define PMC_MCK 1
|
||||
#define PMC_UTMI 2
|
||||
#define PMC_MAIN 3
|
||||
#define PMC_MCK2 4
|
||||
#define PMC_I2S0_MUX 5
|
||||
#define PMC_I2S1_MUX 6
|
||||
|
||||
#ifndef AT91_PMC_MOSCS
|
||||
#define AT91_PMC_MOSCS 0 /* MOSCS Flag */
|
||||
#define AT91_PMC_LOCKA 1 /* PLLA Lock */
|
||||
#define AT91_PMC_LOCKB 2 /* PLLB Lock */
|
||||
@@ -19,5 +33,6 @@
|
||||
#define AT91_PMC_MOSCRCS 17 /* Main On-Chip RC */
|
||||
#define AT91_PMC_CFDEV 18 /* Clock Failure Detector Event */
|
||||
#define AT91_PMC_GCKRDY 24 /* Generated Clocks */
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
34
include/dt-bindings/reset/actions,s700-reset.h
Normal file
34
include/dt-bindings/reset/actions,s700-reset.h
Normal file
@@ -0,0 +1,34 @@
|
||||
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
|
||||
//
|
||||
// Device Tree binding constants for Actions Semi S700 Reset Management Unit
|
||||
//
|
||||
// Copyright (c) 2018 Linaro Ltd.
|
||||
|
||||
#ifndef __DT_BINDINGS_ACTIONS_S700_RESET_H
|
||||
#define __DT_BINDINGS_ACTIONS_S700_RESET_H
|
||||
|
||||
#define RESET_AUDIO 0
|
||||
#define RESET_CSI 1
|
||||
#define RESET_DE 2
|
||||
#define RESET_DSI 3
|
||||
#define RESET_GPIO 4
|
||||
#define RESET_I2C0 5
|
||||
#define RESET_I2C1 6
|
||||
#define RESET_I2C2 7
|
||||
#define RESET_I2C3 8
|
||||
#define RESET_KEY 9
|
||||
#define RESET_LCD0 10
|
||||
#define RESET_SI 11
|
||||
#define RESET_SPI0 12
|
||||
#define RESET_SPI1 13
|
||||
#define RESET_SPI2 14
|
||||
#define RESET_SPI3 15
|
||||
#define RESET_UART0 16
|
||||
#define RESET_UART1 17
|
||||
#define RESET_UART2 18
|
||||
#define RESET_UART3 19
|
||||
#define RESET_UART4 20
|
||||
#define RESET_UART5 21
|
||||
#define RESET_UART6 22
|
||||
|
||||
#endif /* __DT_BINDINGS_ACTIONS_S700_RESET_H */
|
65
include/dt-bindings/reset/actions,s900-reset.h
Normal file
65
include/dt-bindings/reset/actions,s900-reset.h
Normal file
@@ -0,0 +1,65 @@
|
||||
// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
|
||||
//
|
||||
// Device Tree binding constants for Actions Semi S900 Reset Management Unit
|
||||
//
|
||||
// Copyright (c) 2018 Linaro Ltd.
|
||||
|
||||
#ifndef __DT_BINDINGS_ACTIONS_S900_RESET_H
|
||||
#define __DT_BINDINGS_ACTIONS_S900_RESET_H
|
||||
|
||||
#define RESET_CHIPID 0
|
||||
#define RESET_CPU_SCNT 1
|
||||
#define RESET_SRAMI 2
|
||||
#define RESET_DDR_CTL_PHY 3
|
||||
#define RESET_DMAC 4
|
||||
#define RESET_GPIO 5
|
||||
#define RESET_BISP_AXI 6
|
||||
#define RESET_CSI0 7
|
||||
#define RESET_CSI1 8
|
||||
#define RESET_DE 9
|
||||
#define RESET_DSI 10
|
||||
#define RESET_GPU3D_PA 11
|
||||
#define RESET_GPU3D_PB 12
|
||||
#define RESET_HDE 13
|
||||
#define RESET_I2C0 14
|
||||
#define RESET_I2C1 15
|
||||
#define RESET_I2C2 16
|
||||
#define RESET_I2C3 17
|
||||
#define RESET_I2C4 18
|
||||
#define RESET_I2C5 19
|
||||
#define RESET_IMX 20
|
||||
#define RESET_NANDC0 21
|
||||
#define RESET_NANDC1 22
|
||||
#define RESET_SD0 23
|
||||
#define RESET_SD1 24
|
||||
#define RESET_SD2 25
|
||||
#define RESET_SD3 26
|
||||
#define RESET_SPI0 27
|
||||
#define RESET_SPI1 28
|
||||
#define RESET_SPI2 29
|
||||
#define RESET_SPI3 30
|
||||
#define RESET_UART0 31
|
||||
#define RESET_UART1 32
|
||||
#define RESET_UART2 33
|
||||
#define RESET_UART3 34
|
||||
#define RESET_UART4 35
|
||||
#define RESET_UART5 36
|
||||
#define RESET_UART6 37
|
||||
#define RESET_HDMI 38
|
||||
#define RESET_LVDS 39
|
||||
#define RESET_EDP 40
|
||||
#define RESET_USB2HUB 41
|
||||
#define RESET_USB2HSIC 42
|
||||
#define RESET_USB3 43
|
||||
#define RESET_PCM1 44
|
||||
#define RESET_AUDIO 45
|
||||
#define RESET_PCM0 46
|
||||
#define RESET_SE 47
|
||||
#define RESET_GIC 48
|
||||
#define RESET_DDR_CTL_PHY_AXI 49
|
||||
#define RESET_CMU_DDR 50
|
||||
#define RESET_DMM 51
|
||||
#define RESET_HDCP2TX 52
|
||||
#define RESET_ETHERNET 53
|
||||
|
||||
#endif /* __DT_BINDINGS_ACTIONS_S900_RESET_H */
|
Reference in New Issue
Block a user