Merge branches 'clk-qcom-rpm8974', 'clk-stm32f4', 'clk-ipq4019' and 'clk-fixes' into clk-next
* clk-qcom-rpm8974: clk: qcom: smd-rpmcc: Add msm8974 clocks * clk-stm32f4: clk: stm32f4: SDIO & 48Mhz clock management for STM32F469 board clk: stm32f4: Add SAI clocks clk: stm32f4: Add I2S clock clk: stm32f4: Add lcd-tft clock clk: stm32f4: Add post divisor for I2S & SAI PLLs clk: stm32f4: Add PLL_I2S & PLL_SAI for STM32F429/469 boards clk: stm32f4: Update DT bindings documentation * clk-ipq4019: clk: qcom: ipq4019: Add the cpu clock frequency change notifier clk: qcom: ipq4019: Add all the frequencies for apss cpu clk: qcom: ipq4019: correct sdcc frequency and parent name clk: qcom: ipq4019: Add the nodes for pcnoc clk: qcom: ipq4019: Add the apss cpu pll divider clock node clk: qcom: ipq4019: remove fixed clocks and add pll clocks * clk-fixes: clk: stm32f4: Use CLK_OF_DECLARE_DRIVER initialization method clk: renesas: mstp: Support 8-bit registers for r7s72100
This commit is contained in:
@@ -81,6 +81,17 @@
|
||||
#define GCC_WCSS5G_CLK 62
|
||||
#define GCC_WCSS5G_REF_CLK 63
|
||||
#define GCC_WCSS5G_RTC_CLK 64
|
||||
#define GCC_APSS_DDRPLL_VCO 65
|
||||
#define GCC_SDCC_PLLDIV_CLK 66
|
||||
#define GCC_FEPLL_VCO 67
|
||||
#define GCC_FEPLL125_CLK 68
|
||||
#define GCC_FEPLL125DLY_CLK 69
|
||||
#define GCC_FEPLL200_CLK 70
|
||||
#define GCC_FEPLL500_CLK 71
|
||||
#define GCC_FEPLL_WCSS2G_CLK 72
|
||||
#define GCC_FEPLL_WCSS5G_CLK 73
|
||||
#define GCC_APSS_CPU_PLLDIV_CLK 74
|
||||
#define GCC_PCNOC_AHB_CLK_SRC 75
|
||||
|
||||
#define WIFI0_CPU_INIT_RESET 0
|
||||
#define WIFI0_RADIO_SRIF_RESET 1
|
||||
|
@@ -14,7 +14,7 @@
|
||||
#ifndef _DT_BINDINGS_CLK_MSM_RPMCC_H
|
||||
#define _DT_BINDINGS_CLK_MSM_RPMCC_H
|
||||
|
||||
/* apq8064 */
|
||||
/* RPM clocks */
|
||||
#define RPM_PXO_CLK 0
|
||||
#define RPM_PXO_A_CLK 1
|
||||
#define RPM_CXO_CLK 2
|
||||
@@ -38,7 +38,7 @@
|
||||
#define RPM_SFPB_CLK 20
|
||||
#define RPM_SFPB_A_CLK 21
|
||||
|
||||
/* msm8916 */
|
||||
/* SMD RPM clocks */
|
||||
#define RPM_SMD_XO_CLK_SRC 0
|
||||
#define RPM_SMD_XO_A_CLK_SRC 1
|
||||
#define RPM_SMD_PCNOC_CLK 2
|
||||
@@ -65,5 +65,41 @@
|
||||
#define RPM_SMD_RF_CLK1_A_PIN 23
|
||||
#define RPM_SMD_RF_CLK2_PIN 24
|
||||
#define RPM_SMD_RF_CLK2_A_PIN 25
|
||||
#define RPM_SMD_PNOC_CLK 26
|
||||
#define RPM_SMD_PNOC_A_CLK 27
|
||||
#define RPM_SMD_CNOC_CLK 28
|
||||
#define RPM_SMD_CNOC_A_CLK 29
|
||||
#define RPM_SMD_MMSSNOC_AHB_CLK 30
|
||||
#define RPM_SMD_MMSSNOC_AHB_A_CLK 31
|
||||
#define RPM_SMD_GFX3D_CLK_SRC 32
|
||||
#define RPM_SMD_GFX3D_A_CLK_SRC 33
|
||||
#define RPM_SMD_OCMEMGX_CLK 34
|
||||
#define RPM_SMD_OCMEMGX_A_CLK 35
|
||||
#define RPM_SMD_CXO_D0 36
|
||||
#define RPM_SMD_CXO_D0_A 37
|
||||
#define RPM_SMD_CXO_D1 38
|
||||
#define RPM_SMD_CXO_D1_A 39
|
||||
#define RPM_SMD_CXO_A0 40
|
||||
#define RPM_SMD_CXO_A0_A 41
|
||||
#define RPM_SMD_CXO_A1 42
|
||||
#define RPM_SMD_CXO_A1_A 43
|
||||
#define RPM_SMD_CXO_A2 44
|
||||
#define RPM_SMD_CXO_A2_A 45
|
||||
#define RPM_SMD_DIV_CLK1 46
|
||||
#define RPM_SMD_DIV_A_CLK1 47
|
||||
#define RPM_SMD_DIV_CLK2 48
|
||||
#define RPM_SMD_DIV_A_CLK2 49
|
||||
#define RPM_SMD_DIFF_CLK 50
|
||||
#define RPM_SMD_DIFF_A_CLK 51
|
||||
#define RPM_SMD_CXO_D0_PIN 52
|
||||
#define RPM_SMD_CXO_D0_A_PIN 53
|
||||
#define RPM_SMD_CXO_D1_PIN 54
|
||||
#define RPM_SMD_CXO_D1_A_PIN 55
|
||||
#define RPM_SMD_CXO_A0_PIN 56
|
||||
#define RPM_SMD_CXO_A0_A_PIN 57
|
||||
#define RPM_SMD_CXO_A1_PIN 58
|
||||
#define RPM_SMD_CXO_A1_A_PIN 59
|
||||
#define RPM_SMD_CXO_A2_PIN 60
|
||||
#define RPM_SMD_CXO_A2_A_PIN 61
|
||||
|
||||
#endif
|
||||
|
39
include/dt-bindings/clock/stm32fx-clock.h
Normal file
39
include/dt-bindings/clock/stm32fx-clock.h
Normal file
@@ -0,0 +1,39 @@
|
||||
/*
|
||||
* stm32fx-clock.h
|
||||
*
|
||||
* Copyright (C) 2016 STMicroelectronics
|
||||
* Author: Gabriel Fernandez for STMicroelectronics.
|
||||
* License terms: GNU General Public License (GPL), version 2
|
||||
*/
|
||||
|
||||
/*
|
||||
* List of clocks wich are not derived from system clock (SYSCLOCK)
|
||||
*
|
||||
* The index of these clocks is the secondary index of DT bindings
|
||||
* (see Documentatoin/devicetree/bindings/clock/st,stm32-rcc.txt)
|
||||
*
|
||||
* e.g:
|
||||
<assigned-clocks = <&rcc 1 CLK_LSE>;
|
||||
*/
|
||||
|
||||
#ifndef _DT_BINDINGS_CLK_STMFX_H
|
||||
#define _DT_BINDINGS_CLK_STMFX_H
|
||||
|
||||
#define SYSTICK 0
|
||||
#define FCLK 1
|
||||
#define CLK_LSI 2
|
||||
#define CLK_LSE 3
|
||||
#define CLK_HSE_RTC 4
|
||||
#define CLK_RTC 5
|
||||
#define PLL_VCO_I2S 6
|
||||
#define PLL_VCO_SAI 7
|
||||
#define CLK_LCD 8
|
||||
#define CLK_I2S 9
|
||||
#define CLK_SAI1 10
|
||||
#define CLK_SAI2 11
|
||||
#define CLK_I2SQ_PDIV 12
|
||||
#define CLK_SAIQ_PDIV 13
|
||||
|
||||
#define END_PRIMARY_CLK 14
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user