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

Commit edad3b2a authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: imx/mxs: move freescale drivers to subdir 



This moves all the Freescale-related drivers (i.MX and MXS) to
its own subdirectory to clear the view.

Cc: Alexander Shiyan <shc_work@mail.ru>
Cc: Anson Huang <b20788@freescale.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Denis Carikli <denis@eukrea.com>
Cc: Markus Pargmann <mpa@pengutronix.de>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 03e9f0ca

drivers/pinctrl/Kconfig

+1 −109
Original line number Diff line number Diff line
@@ -97,102 +97,6 @@ config PINCTRL_BCM281XX 
	  BCM28145, and BCM28155 SoCs.  This driver requires the pinctrl

	  framework.  GPIO is provided by a separate GPIO driver.



config PINCTRL_IMX

	bool

	select PINMUX

	select PINCONF



config PINCTRL_IMX1_CORE

	bool

	select PINMUX

	select PINCONF



config PINCTRL_IMX1

	bool "IMX1 pinctrl driver"

	depends on SOC_IMX1

	select PINCTRL_IMX1_CORE

	help

	  Say Y here to enable the imx1 pinctrl driver



config PINCTRL_IMX21

	bool "i.MX21 pinctrl driver"

	depends on SOC_IMX21

	select PINCTRL_IMX1_CORE

	help

	  Say Y here to enable the i.MX21 pinctrl driver



config PINCTRL_IMX27

	bool "IMX27 pinctrl driver"

	depends on SOC_IMX27

	select PINCTRL_IMX1_CORE

	help

	  Say Y here to enable the imx27 pinctrl driver





config PINCTRL_IMX25

        bool "IMX25 pinctrl driver"

        depends on OF

        depends on SOC_IMX25

        select PINCTRL_IMX

        help

          Say Y here to enable the imx25 pinctrl driver



config PINCTRL_IMX35

	bool "IMX35 pinctrl driver"

	depends on SOC_IMX35

	select PINCTRL_IMX

	help

	  Say Y here to enable the imx35 pinctrl driver



config PINCTRL_IMX50

	bool "IMX50 pinctrl driver"

	depends on SOC_IMX50

	select PINCTRL_IMX

	help

	  Say Y here to enable the imx50 pinctrl driver



config PINCTRL_IMX51

	bool "IMX51 pinctrl driver"

	depends on SOC_IMX51

	select PINCTRL_IMX

	help

	  Say Y here to enable the imx51 pinctrl driver



config PINCTRL_IMX53

	bool "IMX53 pinctrl driver"

	depends on SOC_IMX53

	select PINCTRL_IMX

	help

	  Say Y here to enable the imx53 pinctrl driver



config PINCTRL_IMX6Q

	bool "IMX6Q/DL pinctrl driver"

	depends on SOC_IMX6Q

	select PINCTRL_IMX

	help

	  Say Y here to enable the imx6q/dl pinctrl driver



config PINCTRL_IMX6SL

	bool "IMX6SL pinctrl driver"

	depends on SOC_IMX6SL

	select PINCTRL_IMX

	help

	  Say Y here to enable the imx6sl pinctrl driver



config PINCTRL_IMX6SX

	bool "IMX6SX pinctrl driver"

	depends on SOC_IMX6SX

	select PINCTRL_IMX

	help

	  Say Y here to enable the imx6sx pinctrl driver



config PINCTRL_VF610

	bool "Freescale Vybrid VF610 pinctrl driver"

	depends on SOC_VF610

	select PINCTRL_IMX

	help

	  Say Y here to enable the Freescale Vybrid VF610 pinctrl driver



config PINCTRL_LANTIQ

	bool

	depends on LANTIQ
@@ -204,19 +108,6 @@ config PINCTRL_FALCON 
	depends on SOC_FALCON

	depends on PINCTRL_LANTIQ



config PINCTRL_MXS

	bool

	select PINMUX

	select PINCONF



config PINCTRL_IMX23

	bool

	select PINCTRL_MXS



config PINCTRL_IMX28

	bool

	select PINCTRL_MXS



config PINCTRL_ROCKCHIP

	bool

	select PINMUX
@@ -313,6 +204,7 @@ config PINCTRL_PALMAS 
	  TPS65913, TPS80036 etc.



source "drivers/pinctrl/berlin/Kconfig"

source "drivers/pinctrl/freescale/Kconfig"

source "drivers/pinctrl/mvebu/Kconfig"

source "drivers/pinctrl/nomadik/Kconfig"

source "drivers/pinctrl/qcom/Kconfig"

drivers/pinctrl/Makefile

+1 −18
Original line number Diff line number Diff line
@@ -17,24 +17,7 @@ obj-$(CONFIG_PINCTRL_AT91) += pinctrl-at91.o 
obj-$(CONFIG_PINCTRL_BCM2835)	+= pinctrl-bcm2835.o

obj-$(CONFIG_PINCTRL_BAYTRAIL)	+= pinctrl-baytrail.o

obj-$(CONFIG_PINCTRL_BCM281XX)	+= pinctrl-bcm281xx.o

obj-$(CONFIG_PINCTRL_IMX)	+= pinctrl-imx.o

obj-$(CONFIG_PINCTRL_IMX1_CORE)	+= pinctrl-imx1-core.o

obj-$(CONFIG_PINCTRL_IMX1)	+= pinctrl-imx1.o

obj-$(CONFIG_PINCTRL_IMX21)	+= pinctrl-imx21.o

obj-$(CONFIG_PINCTRL_IMX27)	+= pinctrl-imx27.o

obj-$(CONFIG_PINCTRL_IMX35)	+= pinctrl-imx35.o

obj-$(CONFIG_PINCTRL_IMX50)	+= pinctrl-imx50.o

obj-$(CONFIG_PINCTRL_IMX51)	+= pinctrl-imx51.o

obj-$(CONFIG_PINCTRL_IMX53)	+= pinctrl-imx53.o

obj-$(CONFIG_PINCTRL_IMX6Q)	+= pinctrl-imx6q.o

obj-$(CONFIG_PINCTRL_IMX6Q)	+= pinctrl-imx6dl.o

obj-$(CONFIG_PINCTRL_IMX6SL)	+= pinctrl-imx6sl.o

obj-$(CONFIG_PINCTRL_IMX6SX)	+= pinctrl-imx6sx.o

obj-$(CONFIG_PINCTRL_FALCON)	+= pinctrl-falcon.o

obj-$(CONFIG_PINCTRL_MXS)	+= pinctrl-mxs.o

obj-$(CONFIG_PINCTRL_IMX23)	+= pinctrl-imx23.o

obj-$(CONFIG_PINCTRL_IMX25)	+= pinctrl-imx25.o

obj-$(CONFIG_PINCTRL_IMX28)	+= pinctrl-imx28.o

obj-$(CONFIG_PINCTRL_PALMAS)	+= pinctrl-palmas.o

obj-$(CONFIG_PINCTRL_ROCKCHIP)	+= pinctrl-rockchip.o

obj-$(CONFIG_PINCTRL_SINGLE)	+= pinctrl-single.o
@@ -53,9 +36,9 @@ obj-$(CONFIG_PINCTRL_XWAY) += pinctrl-xway.o 
obj-$(CONFIG_PINCTRL_LANTIQ)	+= pinctrl-lantiq.o

obj-$(CONFIG_PINCTRL_TB10X)	+= pinctrl-tb10x.o

obj-$(CONFIG_PINCTRL_ST) 	+= pinctrl-st.o

obj-$(CONFIG_PINCTRL_VF610)	+= pinctrl-vf610.o



obj-$(CONFIG_ARCH_BERLIN)	+= berlin/

obj-y				+= freescale/

obj-$(CONFIG_PLAT_ORION)        += mvebu/

obj-y				+= nomadik/

obj-$(CONFIG_ARCH_QCOM)		+= qcom/

drivers/pinctrl/freescale/Kconfig

0 → 100644
+108 −0
Original line number Diff line number Diff line 
config PINCTRL_IMX

	bool

	select PINMUX

	select PINCONF



config PINCTRL_IMX1_CORE

	bool

	select PINMUX

	select PINCONF



config PINCTRL_IMX1

	bool "IMX1 pinctrl driver"

	depends on SOC_IMX1

	select PINCTRL_IMX1_CORE

	help

	  Say Y here to enable the imx1 pinctrl driver



config PINCTRL_IMX21

	bool "i.MX21 pinctrl driver"

	depends on SOC_IMX21

	select PINCTRL_IMX1_CORE

	help

	  Say Y here to enable the i.MX21 pinctrl driver



config PINCTRL_IMX27

	bool "IMX27 pinctrl driver"

	depends on SOC_IMX27

	select PINCTRL_IMX1_CORE

	help

	  Say Y here to enable the imx27 pinctrl driver





config PINCTRL_IMX25

        bool "IMX25 pinctrl driver"

        depends on OF

        depends on SOC_IMX25

        select PINCTRL_IMX

        help

          Say Y here to enable the imx25 pinctrl driver



config PINCTRL_IMX35

	bool "IMX35 pinctrl driver"

	depends on SOC_IMX35

	select PINCTRL_IMX

	help

	  Say Y here to enable the imx35 pinctrl driver



config PINCTRL_IMX50

	bool "IMX50 pinctrl driver"

	depends on SOC_IMX50

	select PINCTRL_IMX

	help

	  Say Y here to enable the imx50 pinctrl driver



config PINCTRL_IMX51

	bool "IMX51 pinctrl driver"

	depends on SOC_IMX51

	select PINCTRL_IMX

	help

	  Say Y here to enable the imx51 pinctrl driver



config PINCTRL_IMX53

	bool "IMX53 pinctrl driver"

	depends on SOC_IMX53

	select PINCTRL_IMX

	help

	  Say Y here to enable the imx53 pinctrl driver



config PINCTRL_IMX6Q

	bool "IMX6Q/DL pinctrl driver"

	depends on SOC_IMX6Q

	select PINCTRL_IMX

	help

	  Say Y here to enable the imx6q/dl pinctrl driver



config PINCTRL_IMX6SL

	bool "IMX6SL pinctrl driver"

	depends on SOC_IMX6SL

	select PINCTRL_IMX

	help

	  Say Y here to enable the imx6sl pinctrl driver



config PINCTRL_IMX6SX

	bool "IMX6SX pinctrl driver"

	depends on SOC_IMX6SX

	select PINCTRL_IMX

	help

	  Say Y here to enable the imx6sx pinctrl driver



config PINCTRL_VF610

	bool "Freescale Vybrid VF610 pinctrl driver"

	depends on SOC_VF610

	select PINCTRL_IMX

	help

	  Say Y here to enable the Freescale Vybrid VF610 pinctrl driver



config PINCTRL_MXS

	bool

	select PINMUX

	select PINCONF



config PINCTRL_IMX23

	bool

	select PINCTRL_MXS



config PINCTRL_IMX28

	bool

	select PINCTRL_MXS

drivers/pinctrl/freescale/Makefile

0 → 100644
+19 −0
Original line number Diff line number Diff line 
# Freescale pin control drivers

obj-$(CONFIG_PINCTRL_IMX)	+= pinctrl-imx.o

obj-$(CONFIG_PINCTRL_IMX1_CORE)	+= pinctrl-imx1-core.o

obj-$(CONFIG_PINCTRL_IMX1)	+= pinctrl-imx1.o

obj-$(CONFIG_PINCTRL_IMX21)	+= pinctrl-imx21.o

obj-$(CONFIG_PINCTRL_IMX27)	+= pinctrl-imx27.o

obj-$(CONFIG_PINCTRL_IMX35)	+= pinctrl-imx35.o

obj-$(CONFIG_PINCTRL_IMX50)	+= pinctrl-imx50.o

obj-$(CONFIG_PINCTRL_IMX51)	+= pinctrl-imx51.o

obj-$(CONFIG_PINCTRL_IMX53)	+= pinctrl-imx53.o

obj-$(CONFIG_PINCTRL_IMX6Q)	+= pinctrl-imx6q.o

obj-$(CONFIG_PINCTRL_IMX6Q)	+= pinctrl-imx6dl.o

obj-$(CONFIG_PINCTRL_IMX6SL)	+= pinctrl-imx6sl.o

obj-$(CONFIG_PINCTRL_IMX6SX)	+= pinctrl-imx6sx.o

obj-$(CONFIG_PINCTRL_VF610)	+= pinctrl-vf610.o

obj-$(CONFIG_PINCTRL_MXS)	+= pinctrl-mxs.o

obj-$(CONFIG_PINCTRL_IMX23)	+= pinctrl-imx23.o

obj-$(CONFIG_PINCTRL_IMX25)	+= pinctrl-imx25.o

obj-$(CONFIG_PINCTRL_IMX28)	+= pinctrl-imx28.o

drivers/pinctrl/pinctrl-imx.c→drivers/pinctrl/freescale/pinctrl-imx.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/pinctrl/pinmux.h>

#include <linux/slab.h>



#include "core.h"

#include "../core.h"

#include "pinctrl-imx.h"



/* The bits in CONFIG cell defined in binding doc*/