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

Commit 16511ee2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-soc-4.15' of... 

Merge tag 'imx-soc-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc

Pull "i.MX SoC changes for 4.15" from Shawn Guo:

 - A series from Marco Franchi from to clean up build warnings see with
   W=1 in arch/arm/mach-imx/.
 - Move i.MX6 speed grading check from i.MX platform code to cpufreq
   driver.  The patch is suggested by cpufreq folks to go through
   arm-soc tree.
 - Enable cpuidle support on i.MX6DL starting from IMX_CHIP_REVISION_1_1.
 - Constify platform_suspend_ops for MXS platform.

* tag 'imx-soc-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  cpufreq: imx6q: Move speed grading check to cpufreq driver
  ARM: imx: Enable cpuidle for i.MX6DL starting at 1.1
  ARM: imx: mach-mx31lite: Make mx31lite_map_io static
  ARM: imx: cpuidle-imx5: Include "cpuidle.h" header file
  ARM: imx: 3ds-debugboard: Include "3ds_debugboard.h" header file
  ARM: imx: imx31moboard: Include "board-mx31moboard.h" header file
  ARM: mxs: constify platform_suspend_ops
parents 457e3b10 8e2b04b0

arch/arm/mach-imx/3ds_debugboard.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/smsc911x.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/fixed.h>



#include "3ds_debugboard.h"

#include "hardware.h"



/* LAN9217 ethernet base address */

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

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/cpuidle.h>

#include <linux/module.h>

#include <asm/system_misc.h>

#include "cpuidle.h"



static int imx5_cpuidle_enter(struct cpuidle_device *dev,

			      struct cpuidle_driver *drv, int index)

arch/arm/mach-imx/mach-imx6q.c

+8 −89
Original line number Diff line number Diff line
@@ -286,101 +286,20 @@ static void __init imx6q_init_machine(void) 
	imx6q_axi_init();

}



#define OCOTP_CFG3			0x440

#define OCOTP_CFG3_SPEED_SHIFT		16

#define OCOTP_CFG3_SPEED_1P2GHZ		0x3

#define OCOTP_CFG3_SPEED_996MHZ		0x2

#define OCOTP_CFG3_SPEED_852MHZ		0x1



static void __init imx6q_opp_check_speed_grading(struct device *cpu_dev)

{

	struct device_node *np;

	void __iomem *base;

	u32 val;



	np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-ocotp");

	if (!np) {

		pr_warn("failed to find ocotp node\n");

		return;

	}



	base = of_iomap(np, 0);

	if (!base) {

		pr_warn("failed to map ocotp\n");

		goto put_node;

	}



	/*

	 * SPEED_GRADING[1:0] defines the max speed of ARM:

	 * 2b'11: 1200000000Hz;

	 * 2b'10: 996000000Hz;

	 * 2b'01: 852000000Hz; -- i.MX6Q Only, exclusive with 996MHz.

	 * 2b'00: 792000000Hz;

	 * We need to set the max speed of ARM according to fuse map.

	 */

	val = readl_relaxed(base + OCOTP_CFG3);

	val >>= OCOTP_CFG3_SPEED_SHIFT;

	val &= 0x3;



	if ((val != OCOTP_CFG3_SPEED_1P2GHZ) && cpu_is_imx6q())

		if (dev_pm_opp_disable(cpu_dev, 1200000000))

			pr_warn("failed to disable 1.2 GHz OPP\n");

	if (val < OCOTP_CFG3_SPEED_996MHZ)

		if (dev_pm_opp_disable(cpu_dev, 996000000))

			pr_warn("failed to disable 996 MHz OPP\n");

	if (cpu_is_imx6q()) {

		if (val != OCOTP_CFG3_SPEED_852MHZ)

			if (dev_pm_opp_disable(cpu_dev, 852000000))

				pr_warn("failed to disable 852 MHz OPP\n");

	}

	iounmap(base);

put_node:

	of_node_put(np);

}



static void __init imx6q_opp_init(void)

{

	struct device_node *np;

	struct device *cpu_dev = get_cpu_device(0);



	if (!cpu_dev) {

		pr_warn("failed to get cpu0 device\n");

		return;

	}

	np = of_node_get(cpu_dev->of_node);

	if (!np) {

		pr_warn("failed to find cpu0 node\n");

		return;

	}



	if (dev_pm_opp_of_add_table(cpu_dev)) {

		pr_warn("failed to init OPP table\n");

		goto put_node;

	}



	imx6q_opp_check_speed_grading(cpu_dev);



put_node:

	of_node_put(np);

}



static struct platform_device imx6q_cpufreq_pdev = {

	.name = "imx6q-cpufreq",

};



static void __init imx6q_init_late(void)

{

	/*

	 * WAIT mode is broken on TO 1.0 and 1.1, so there is no point

	 * to run cpuidle on them.

	 * WAIT mode is broken on imx6 Dual/Quad revision 1.0 and 1.1 so

	 * there is no point to run cpuidle on them.

	 *

	 * It does work on imx6 Solo/DualLite starting from 1.1

	 */

	if (imx_get_soc_revision() > IMX_CHIP_REVISION_1_1)

	if ((cpu_is_imx6q() && imx_get_soc_revision() > IMX_CHIP_REVISION_1_1) ||

	    (cpu_is_imx6dl() && imx_get_soc_revision() > IMX_CHIP_REVISION_1_0))

		imx6q_cpuidle_init();



	if (IS_ENABLED(CONFIG_ARM_IMX6Q_CPUFREQ)) {

		imx6q_opp_init();

		platform_device_register(&imx6q_cpufreq_pdev);

	}

	if (IS_ENABLED(CONFIG_ARM_IMX6Q_CPUFREQ))

		platform_device_register_simple("imx6q-cpufreq", -1, NULL, 0);

}



static void __init imx6q_map_io(void)

arch/arm/mach-imx/mach-mx31lite.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static struct map_desc mx31lite_io_desc[] __initdata = { 
/*

 * Set up static virtual mappings.

 */

void __init mx31lite_map_io(void)

static void __init mx31lite_map_io(void)

{

	mx31_map_io();

	iotable_init(mx31lite_io_desc, ARRAY_SIZE(mx31lite_io_desc));

arch/arm/mach-imx/mx31moboard-devboard.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


#include <linux/usb/otg.h>



#include "board-mx31moboard.h"

#include "common.h"

#include "devices-imx31.h"

#include "ehci.h"