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

Commit a2aa65a3 authored by Dong Aisheng's avatar Dong Aisheng Committed by Shawn Guo
Browse files

ARM: imx: enable pinctrl dummy states 



Enable pinctrl dummy states for imx platforms without pinctrl
support.

Acked-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Signed-off-by: default avatarDong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 69964ea4

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

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

#include <linux/irqdomain.h>

#include <linux/of_irq.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/pinctrl/machine.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/mach/time.h>

#include <mach/common.h>

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




	of_irq_init(imx51_irq_match);

	of_irq_init(imx51_irq_match);





	pinctrl_provide_dummies();



	node = of_find_matching_node(NULL, imx51_iomuxc_of_match);

	node = of_find_matching_node(NULL, imx51_iomuxc_of_match);

	if (node) {

	if (node) {

		of_id = of_match_node(imx51_iomuxc_of_match, node);

		of_id = of_match_node(imx51_iomuxc_of_match, node);

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

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

#include <linux/irqdomain.h>

#include <linux/of_irq.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/pinctrl/machine.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/mach/time.h>

#include <mach/common.h>

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




	of_irq_init(imx53_irq_match);

	of_irq_init(imx53_irq_match);





	pinctrl_provide_dummies();



	node = of_find_matching_node(NULL, imx53_iomuxc_of_match);

	node = of_find_matching_node(NULL, imx53_iomuxc_of_match);

	if (node) {

	if (node) {

		of_id = of_match_node(imx53_iomuxc_of_match, node);

		of_id = of_match_node(imx53_iomuxc_of_match, node);

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

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

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/pinctrl/machine.h>

#include <linux/phy.h>

#include <linux/phy.h>

#include <linux/micrel_phy.h>

#include <linux/micrel_phy.h>

#include <asm/smp_twd.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)

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"))

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

		phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,

		phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,

					   ksz9021rn_phy_fixup);

					   ksz9021rn_phy_fixup);

arch/arm/mach-imx/mm-imx1.c

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

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/pinctrl/machine.h>





#include <asm/mach/map.h>

#include <asm/mach/map.h>
@@ -58,4 +59,5 @@ void __init imx1_soc_init(void) 
						MX1_GPIO_INT_PORTC, 0);

						MX1_GPIO_INT_PORTC, 0);

	mxc_register_gpio("imx1-gpio", 3, MX1_GPIO4_BASE_ADDR, SZ_256,

	mxc_register_gpio("imx1-gpio", 3, MX1_GPIO4_BASE_ADDR, SZ_256,

						MX1_GPIO_INT_PORTD, 0);

						MX1_GPIO_INT_PORTD, 0);

	pinctrl_provide_dummies();

}
 
}

arch/arm/mach-imx/mm-imx21.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 




#include <linux/mm.h>

#include <linux/mm.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/pinctrl/machine.h>

#include <mach/hardware.h>

#include <mach/hardware.h>

#include <mach/common.h>

#include <mach/common.h>

#include <mach/devices-common.h>

#include <mach/devices-common.h>
@@ -88,6 +89,7 @@ void __init imx21_soc_init(void) 
	mxc_register_gpio("imx21-gpio", 4, MX21_GPIO5_BASE_ADDR, SZ_256, MX21_INT_GPIO, 0);

	mxc_register_gpio("imx21-gpio", 4, MX21_GPIO5_BASE_ADDR, SZ_256, MX21_INT_GPIO, 0);

	mxc_register_gpio("imx21-gpio", 5, MX21_GPIO6_BASE_ADDR, SZ_256, MX21_INT_GPIO, 0);

	mxc_register_gpio("imx21-gpio", 5, MX21_GPIO6_BASE_ADDR, SZ_256, MX21_INT_GPIO, 0);





	pinctrl_provide_dummies();

	imx_add_imx_dma();

	imx_add_imx_dma();

	platform_device_register_simple("imx21-audmux", 0, imx21_audmux_res,

	platform_device_register_simple("imx21-audmux", 0, imx21_audmux_res,

					ARRAY_SIZE(imx21_audmux_res));

					ARRAY_SIZE(imx21_audmux_res));