Commit c148c1bb authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'clk-imx-5.12' of... 

Merge tag 'clk-imx-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into clk-imx

Pull i.MX clk driver updates from Shawn Guo:

 - Use pr_notice() instead of pr_warn() on i.MX6Q pre-boot ldb_di_clk
   reparenting
 - A couple of W=1 build warning fixes from Lee Jones
 - A series from Liu Ying that adds some SCU clocks support for i.MX8qxp
   DC0/MIPI-LVDS subsystems
 - A series from Lucas Stach that adds PLL monitor clocks for i.MX8MQ,
   and clkout1/2 support for i.MX8MM/MN

* tag 'clk-imx-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  clk: imx: Move 'imx6sl_set_wait_clk()'s prototype out to accessible header
  clk: imx8mn: add clkout1/2 support
  clk: imx8mm: add clkout1/2 support
  clk: imx8mq: add PLL monitor output
  clk: imx: clk-imx31: Remove unused static const table 'uart_clks'
  clk: imx6q: demote warning about pre-boot ldb_di_clk reparenting
  clk: imx: clk-imx8qxp: Add some SCU clocks support for MIPI-LVDS subsystems
  clk: imx: clk-imx8qxp: Register DC0 display clocks with imx_clk_scu2()
  clk: imx: clk-imx8qxp: Add SCU clocks support for DC0 bypass clocks
  clk: imx: clk-imx8qxp: Add SCU clocks support for DC0 PLL clocks
parents 5c8fe583 de5774d1

arch/arm/mach-imx/common.h

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ void imx_anatop_pre_suspend(void); 
void imx_anatop_post_resume(void);

int imx6_set_lpm(enum mxc_cpu_pwr_mode mode);

void imx6_set_int_mem_clk_lpm(bool enable);

void imx6sl_set_wait_clk(bool enter);

int imx_mmdc_get_ddr_type(void);

int imx7ulp_set_lpm(enum ulp_cpu_pwr_mode mode);

arch/arm/mach-imx/cpuidle-imx6sl.c

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Copyright (C) 2014 Freescale Semiconductor, Inc.

 */



#include <linux/clk/imx.h>

#include <linux/cpuidle.h>

#include <linux/module.h>

#include <asm/cpuidle.h>

arch/arm/mach-imx/pm-imx6.c

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 * Copyright 2011 Linaro Ltd.

 */



#include <linux/clk/imx.h>

#include <linux/delay.h>

#include <linux/init.h>

#include <linux/io.h>

drivers/clk/imx/clk-imx31.c

+0 −10
Original line number Diff line number Diff line
@@ -51,16 +51,6 @@ enum mx31_clks { 
static struct clk *clk[clk_max];

static struct clk_onecell_data clk_data;



static struct clk ** const uart_clks[] __initconst = {

	&clk[ipg],

	&clk[uart1_gate],

	&clk[uart2_gate],

	&clk[uart3_gate],

	&clk[uart4_gate],

	&clk[uart5_gate],

	NULL

};



static void __init _mx31_clocks_init(void __iomem *base, unsigned long fref)

{

	clk[dummy] = imx_clk_fixed("dummy", 0);

drivers/clk/imx/clk-imx6q.c

+3 −3
Original line number Diff line number Diff line
@@ -338,9 +338,9 @@ static void init_ldb_clks(struct device_node *np, void __iomem *ccm_base) 
	of_assigned_ldb_sels(np, &sel[0][3], &sel[1][3]);



	for (i = 0; i < 2; i++) {

		/* Warn if a glitch might have been introduced already */

		/* Print a notice if a glitch might have been introduced already */

		if (sel[i][0] != 3) {

			pr_warn("ccm: ldb_di%d_sel already changed from reset value: %d\n",

			pr_notice("ccm: possible glitch: ldb_di%d_sel already changed from reset value: %d\n",

				  i, sel[i][0]);

		}