Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58308aba authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'meson-clk-headers-for-4.14' of git://github.com/BayLibre/clk-meson into v4.14/dt64 

Amlogic clock headers updates for 4.14

* meson8b: add the reset controller to the clkc
* meson: expose all clk ids
* gxbb-aoclk: Add CEC 32k clock
* gxbb: add mmc input 0 clocks
* meson: fix protection against undefined clks

* tag 'meson-clk-headers-for-4.14' of git://github.com/BayLibre/clk-meson:
  dt-bindings: clock: gxbb-aoclk: Add CEC 32k clock
  clk: meson: gxbb: Add sd_emmc clk0 clkids
  clk: meson-gxbb: expose almost every clock in the bindings
  clk: meson8b: expose every clock in the bindings
  clk: meson: gxbb: fix protection against undefined clks
  clk: meson: meson8b: fix protection against undefined clks
  dt-bindings: clock: meson8b: describe the embedded reset controller
parents f72d6f60 596f2b78

Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt

+8 −1
Original line number Diff line number Diff line
@@ -16,18 +16,25 @@ Required Properties: 
	   mapped region.



- #clock-cells: should be 1.

- #reset-cells: should be 1.



Each clock is assigned an identifier and client nodes can use this identifier

to specify the clock which they consume. All available clocks are defined as

preprocessor macros in the dt-bindings/clock/meson8b-clkc.h header and can be

used in device tree sources.



Similarly a preprocessor macro for each reset line is defined in

dt-bindings/reset/amlogic,meson8b-clkc-reset.h (which can be used from the

device tree sources).





Example: Clock controller node:



	clkc: clock-controller@c1104000 {

		#clock-cells = <1>;

		compatible = "amlogic,meson8b-clkc";

		reg = <0xc1108000 0x4>, <0xc1104000 0x460>;

		#clock-cells = <1>;

		#reset-cells = <1>;

	};

drivers/clk/meson/gxbb.c

+2 −0
Original line number Diff line number Diff line
@@ -1183,6 +1183,7 @@ static struct clk_hw_onecell_data gxbb_hw_onecell_data = { 
		[CLKID_32K_CLK]		    = &gxbb_32k_clk.hw,

		[CLKID_32K_CLK_SEL]	    = &gxbb_32k_clk_sel.hw,

		[CLKID_32K_CLK_DIV]	    = &gxbb_32k_clk_div.hw,

		[NR_CLKS]		    = NULL,

	},

	.num = NR_CLKS,

};
@@ -1305,6 +1306,7 @@ static struct clk_hw_onecell_data gxl_hw_onecell_data = { 
		[CLKID_32K_CLK]		    = &gxbb_32k_clk.hw,

		[CLKID_32K_CLK_SEL]	    = &gxbb_32k_clk_sel.hw,

		[CLKID_32K_CLK_DIV]	    = &gxbb_32k_clk_div.hw,

		[NR_CLKS]		    = NULL,

	},

	.num = NR_CLKS,

};

drivers/clk/meson/gxbb.h

+14 −111
Original line number Diff line number Diff line
@@ -167,130 +167,33 @@ 
 * CLKID index values

 *

 * These indices are entirely contrived and do not map onto the hardware.

 * Migrate them out of this header and into the DT header file when they need

 * to be exposed to client nodes in DT: include/dt-bindings/clock/gxbb-clkc.h

 * It has now been decided to expose everything by default in the DT header:

 * include/dt-bindings/clock/gxbb-clkc.h. Only the clocks ids we don't want

 * to expose, such as the internal muxes and dividers of composite clocks,

 * will remain defined here.

 */

#define CLKID_SYS_PLL		  0

/* ID 1 is unused (it was used by the non-existing CLKID_CPUCLK before) */

/* CLKID_HDMI_PLL */

#define CLKID_FIXED_PLL		  3

/* CLKID_FCLK_DIV2 */

/* CLKID_FCLK_DIV3 */

/* CLKID_FCLK_DIV4 */

#define CLKID_FCLK_DIV5		  7

#define CLKID_FCLK_DIV7		  8

/* CLKID_GP0_PLL */

#define CLKID_MPEG_SEL		  10

#define CLKID_MPEG_DIV		  11

/* CLKID_CLK81 */

#define CLKID_MPLL0		  13

#define CLKID_MPLL1		  14

/* CLKID_MPLL2 */

#define CLKID_DDR		  16

#define CLKID_DOS		  17

#define CLKID_ISA		  18

#define CLKID_PL301		  19

#define CLKID_PERIPHS		  20

/* CLKID_SPICC */

/* CLKID_I2C */

/* #define CLKID_SAR_ADC */

#define CLKID_SMART_CARD	  24

/* CLKID_RNG0 */

/* CLKID_UART0 */

#define CLKID_SDHC		  27

#define CLKID_STREAM		  28

#define CLKID_ASYNC_FIFO	  29

#define CLKID_SDIO		  30

#define CLKID_ABUF		  31

#define CLKID_HIU_IFACE		  32

#define CLKID_ASSIST_MISC	  33

/* CLKID_SPI */

#define CLKID_I2S_SPDIF		  35

/* CLKID_ETH */

#define CLKID_DEMUX		  37

/* CLKID_AIU_GLUE */

/* CLKID_IEC958 */

/* CLKID_I2S_OUT */

#define CLKID_AMCLK		  41

#define CLKID_AIFIFO2		  42

#define CLKID_MIXER		  43

/* CLKID_MIXER_IFACE */

#define CLKID_ADC		  45

#define CLKID_BLKMV		  46

/* CLKID_AIU */

/* CLKID_UART1 */

#define CLKID_G2D		  49

/* CLKID_USB0 */

/* CLKID_USB1 */

#define CLKID_RESET		  52

#define CLKID_NAND		  53

#define CLKID_DOS_PARSER	  54

/* CLKID_USB */

#define CLKID_VDIN1		  56

#define CLKID_AHB_ARB0		  57

#define CLKID_EFUSE		  58

#define CLKID_BOOT_ROM		  59

#define CLKID_AHB_DATA_BUS	  60

#define CLKID_AHB_CTRL_BUS	  61

#define CLKID_HDMI_INTR_SYNC	  62

/* CLKID_HDMI_PCLK */

/* CLKID_USB1_DDR_BRIDGE */

/* CLKID_USB0_DDR_BRIDGE */

#define CLKID_MMC_PCLK		  66

#define CLKID_DVIN		  67

/* CLKID_UART2 */

/* #define CLKID_SANA */

#define CLKID_VPU_INTR		  70

#define CLKID_SEC_AHB_AHB3_BRIDGE 71

#define CLKID_CLK81_A53		  72

#define CLKID_VCLK2_VENCI0	  73

#define CLKID_VCLK2_VENCI1	  74

#define CLKID_VCLK2_VENCP0	  75

#define CLKID_VCLK2_VENCP1	  76

/* CLKID_GCLK_VENCI_INT0 */

#define CLKID_GCLK_VENCI_INT	  78

#define CLKID_DAC_CLK		  79

/* CLKID_AOCLK_GATE */

/* CLKID_IEC958_GATE */

#define CLKID_ENC480P		  82

#define CLKID_RNG1		  83

#define CLKID_GCLK_VENCI_INT1	  84

#define CLKID_VCLK2_VENCLMCC	  85

#define CLKID_VCLK2_VENCL	  86

#define CLKID_VCLK_OTHER	  87

#define CLKID_EDP		  88

#define CLKID_AO_MEDIA_CPU	  89

#define CLKID_AO_AHB_SRAM	  90

#define CLKID_AO_AHB_BUS	  91

#define CLKID_AO_IFACE		  92

/* CLKID_AO_I2C */

/* CLKID_SD_EMMC_A */

/* CLKID_SD_EMMC_B */

/* CLKID_SD_EMMC_C */

/* CLKID_SAR_ADC_CLK */

/* CLKID_SAR_ADC_SEL */

#define CLKID_SAR_ADC_DIV	  99

/* CLKID_MALI_0_SEL */

#define CLKID_MALI_0_DIV	  101

/* CLKID_MALI_0	*/

/* CLKID_MALI_1_SEL */

#define CLKID_MALI_1_DIV	  104

/* CLKID_MALI_1	*/

/* CLKID_MALI	*/

/* CLKID_CTS_AMCLK */

#define CLKID_CTS_AMCLK_SEL	  108

#define CLKID_CTS_AMCLK_DIV	  109

/* CLKID_CTS_MCLK_I958 */

#define CLKID_CTS_MCLK_I958_SEL	  111

#define CLKID_CTS_MCLK_I958_DIV	  112

/* CLKID_CTS_I958 */

#define CLKID_32K_CLK		  114

#define CLKID_32K_CLK_SEL	  115

#define CLKID_32K_CLK_DIV	  116

#define CLKID_SD_EMMC_A_CLK0_SEL  117

#define CLKID_SD_EMMC_A_CLK0_DIV  118

#define CLKID_SD_EMMC_B_CLK0_SEL  120

#define CLKID_SD_EMMC_B_CLK0_DIV  121

#define CLKID_SD_EMMC_C_CLK0_SEL  123

#define CLKID_SD_EMMC_C_CLK0_DIV  124



#define NR_CLKS			  117

#define NR_CLKS			  126



/* include the CLKIDs that have been made part of the stable DT binding */

/* include the CLKIDs that have been made part of the DT binding */

#include <dt-bindings/clock/gxbb-clkc.h>



#endif /* __GXBB_H */

drivers/clk/meson/meson8b.c

+1 −0
Original line number Diff line number Diff line
@@ -585,6 +585,7 @@ static struct clk_hw_onecell_data meson8b_hw_onecell_data = { 
		[CLKID_MPLL0]		    = &meson8b_mpll0.hw,

		[CLKID_MPLL1]		    = &meson8b_mpll1.hw,

		[CLKID_MPLL2]		    = &meson8b_mpll2.hw,

		[CLK_NR_CLKS]		    = NULL,

	},

	.num = CLK_NR_CLKS,

};

drivers/clk/meson/meson8b.h

+4 −99
Original line number Diff line number Diff line
@@ -60,107 +60,12 @@ 
 * CLKID index values

 *

 * These indices are entirely contrived and do not map onto the hardware.

 * Migrate them out of this header and into the DT header file when they need

 * to be exposed to client nodes in DT: include/dt-bindings/clock/meson8b-clkc.h

 * It has now been decided to expose everything by default in the DT header:

 * include/dt-bindings/clock/gxbb-clkc.h. Only the clocks ids we don't want

 * to expose, such as the internal muxes and dividers of composite clocks,

 * will remain defined here.

 */



/* CLKID_UNUSED */

/* CLKID_XTAL */

/* CLKID_PLL_FIXED */

/* CLKID_PLL_VID */

/* CLKID_PLL_SYS */

/* CLKID_FCLK_DIV2 */

/* CLKID_FCLK_DIV3 */

/* CLKID_FCLK_DIV4 */

/* CLKID_FCLK_DIV5 */

/* CLKID_FCLK_DIV7 */

/* CLKID_CLK81 */

/* CLKID_MALI */

/* CLKID_CPUCLK */

/* CLKID_ZERO */

/* CLKID_MPEG_SEL */

/* CLKID_MPEG_DIV */

#define CLKID_DDR		16

#define CLKID_DOS		17

#define CLKID_ISA		18

#define CLKID_PL301		19

#define CLKID_PERIPHS		20

#define CLKID_SPICC		21

#define CLKID_I2C		22

/* #define CLKID_SAR_ADC */

#define CLKID_SMART_CARD	24

/* #define CLKID_RNG0 */

#define CLKID_UART0		26

#define CLKID_SDHC		27

#define CLKID_STREAM		28

#define CLKID_ASYNC_FIFO	29

/* #define CLKID_SDIO */

#define CLKID_ABUF		31

#define CLKID_HIU_IFACE		32

#define CLKID_ASSIST_MISC	33

#define CLKID_SPI		34

#define CLKID_I2S_SPDIF		35

/* #define CLKID_ETH */

#define CLKID_DEMUX		37

#define CLKID_AIU_GLUE		38

#define CLKID_IEC958		39

#define CLKID_I2S_OUT		40

#define CLKID_AMCLK		41

#define CLKID_AIFIFO2		42

#define CLKID_MIXER		43

#define CLKID_MIXER_IFACE	44

#define CLKID_ADC		45

#define CLKID_BLKMV		46

#define CLKID_AIU		47

#define CLKID_UART1		48

#define CLKID_G2D		49

/* #define CLKID_USB0 */

/* #define CLKID_USB1 */

#define CLKID_RESET		52

#define CLKID_NAND		53

#define CLKID_DOS_PARSER	54

/* #define CLKID_USB */

#define CLKID_VDIN1		56

#define CLKID_AHB_ARB0		57

#define CLKID_EFUSE		58

#define CLKID_BOOT_ROM		59

#define CLKID_AHB_DATA_BUS	60

#define CLKID_AHB_CTRL_BUS	61

#define CLKID_HDMI_INTR_SYNC	62

#define CLKID_HDMI_PCLK		63

/* CLKID_USB1_DDR_BRIDGE */

/* CLKID_USB0_DDR_BRIDGE */

#define CLKID_MMC_PCLK		66

#define CLKID_DVIN		67

#define CLKID_UART2		68

/* #define CLKID_SANA */

#define CLKID_VPU_INTR		70

#define CLKID_SEC_AHB_AHB3_BRIDGE	71

#define CLKID_CLK81_A9		72

#define CLKID_VCLK2_VENCI0	73

#define CLKID_VCLK2_VENCI1	74

#define CLKID_VCLK2_VENCP0	75

#define CLKID_VCLK2_VENCP1	76

#define CLKID_GCLK_VENCI_INT	77

#define CLKID_GCLK_VENCP_INT	78

#define CLKID_DAC_CLK		79

#define CLKID_AOCLK_GATE	80

#define CLKID_IEC958_GATE	81

#define CLKID_ENC480P		82

#define CLKID_RNG1		83

#define CLKID_GCLK_VENCL_INT	84

#define CLKID_VCLK2_VENCLMCC	85

#define CLKID_VCLK2_VENCL	86

#define CLKID_VCLK2_OTHER	87

#define CLKID_EDP		88

#define CLKID_AO_MEDIA_CPU	89

#define CLKID_AO_AHB_SRAM	90

#define CLKID_AO_AHB_BUS	91

#define CLKID_AO_IFACE		92

#define CLKID_MPLL0		93

#define CLKID_MPLL1		94

#define CLKID_MPLL2		95



#define CLK_NR_CLKS		96



/* include the CLKIDs that have been made part of the stable DT binding */