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

Commit 844d0b5a authored by Shawn Guo's avatar Shawn Guo
Browse files

Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5

parents 50260924 a0f5e363

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -470,6 +470,7 @@ config ARCH_MXS 
	select CLKSRC_MMIO

	select COMMON_CLK

	select HAVE_CLK_PREPARE

	select PINCTRL

	help

	  Support for Freescale MXS-based family of processors

arch/arm/mach-imx/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -842,6 +842,8 @@ config SOC_IMX6Q 
	select HAVE_IMX_MMDC

	select HAVE_IMX_SRC

	select HAVE_SMP

	select PINCTRL

	select PINCTRL_IMX6Q

	select USE_OF



	help

arch/arm/mach-imx/imx51-dt.c

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/irqdomain.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/pinctrl/machine.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <mach/common.h>
@@ -81,6 +82,8 @@ static void __init imx51_dt_init(void) 


	of_irq_init(imx51_irq_match);



	pinctrl_provide_dummies();



	node = of_find_matching_node(NULL, imx51_iomuxc_of_match);

	if (node) {

		of_id = of_match_node(imx51_iomuxc_of_match, node);

arch/arm/mach-imx/imx53-dt.c

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/irqdomain.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/pinctrl/machine.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <mach/common.h>
@@ -88,6 +89,8 @@ static void __init imx53_dt_init(void) 


	of_irq_init(imx53_irq_match);



	pinctrl_provide_dummies();



	node = of_find_matching_node(NULL, imx53_iomuxc_of_match);

	if (node) {

		of_id = of_match_node(imx53_iomuxc_of_match, node);

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

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

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/pinctrl/machine.h>

#include <linux/phy.h>

#include <linux/micrel_phy.h>

#include <asm/smp_twd.h>
@@ -77,6 +78,12 @@ static int ksz9021rn_phy_fixup(struct phy_device *phydev) 


static void __init imx6q_init_machine(void)

{

	/*

	 * This should be removed when all imx6q boards have pinctrl

	 * states for devices defined in device tree.

	 */

	pinctrl_provide_dummies();



	if (of_machine_is_compatible("fsl,imx6q-sabrelite"))

		phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,

					   ksz9021rn_phy_fixup);