1 files changed, 5 insertions, 19 deletions

diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index c4b5d405b8f5..e90817c1f584 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -9,11 +9,6 @@ ifeq ($(CONFIG_OF),y)
 obj-$(CONFIG_PINCTRL)           += devicetree.o
 endif
 obj-$(CONFIG_GENERIC_PINCONF)   += pinconf-generic.o
-obj-$(CONFIG_PINCTRL_ABX500)    += pinctrl-abx500.o
-obj-$(CONFIG_PINCTRL_AB8500)    += pinctrl-ab8500.o
-obj-$(CONFIG_PINCTRL_AB8540)    += pinctrl-ab8540.o
-obj-$(CONFIG_PINCTRL_AB9540)    += pinctrl-ab9540.o
-obj-$(CONFIG_PINCTRL_AB8505)    += pinctrl-ab8505.o
 obj-$(CONFIG_PINCTRL_ADI2)      += pinctrl-adi2.o
 obj-$(CONFIG_PINCTRL_AS3722)    += pinctrl-as3722.o
 obj-$(CONFIG_PINCTRL_BF54x)     += pinctrl-adi2-bf54x.o
@@ -24,6 +19,7 @@ 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_IMX27)     += pinctrl-imx27.o
 obj-$(CONFIG_PINCTRL_IMX35)     += pinctrl-imx35.o
 obj-$(CONFIG_PINCTRL_IMX50)     += pinctrl-imx50.o
@@ -38,14 +34,6 @@ 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_MSM)       += pinctrl-msm.o
-obj-$(CONFIG_PINCTRL_APQ8064)   += pinctrl-apq8064.o
-obj-$(CONFIG_PINCTRL_IPQ8064)   += pinctrl-ipq8064.o
-obj-$(CONFIG_PINCTRL_MSM8X74)   += pinctrl-msm8x74.o
-obj-$(CONFIG_PINCTRL_NOMADIK)   += pinctrl-nomadik.o
-obj-$(CONFIG_PINCTRL_STN8815)   += pinctrl-nomadik-stn8815.o
-obj-$(CONFIG_PINCTRL_DB8500)    += pinctrl-nomadik-db8500.o
-obj-$(CONFIG_PINCTRL_DB8540)    += pinctrl-nomadik-db8540.o
 obj-$(CONFIG_PINCTRL_PALMAS)    += pinctrl-palmas.o
 obj-$(CONFIG_PINCTRL_ROCKCHIP)  += pinctrl-rockchip.o
 obj-$(CONFIG_PINCTRL_SINGLE)    += pinctrl-single.o
@@ -59,11 +47,6 @@ obj-$(CONFIG_PINCTRL_TZ1090)	+= pinctrl-tz1090.o
 obj-$(CONFIG_PINCTRL_TZ1090_PDC)        += pinctrl-tz1090-pdc.o
 obj-$(CONFIG_PINCTRL_U300)      += pinctrl-u300.o
 obj-$(CONFIG_PINCTRL_COH901)    += pinctrl-coh901.o
-obj-$(CONFIG_PINCTRL_SAMSUNG)   += pinctrl-samsung.o
-obj-$(CONFIG_PINCTRL_EXYNOS)    += pinctrl-exynos.o
-obj-$(CONFIG_PINCTRL_EXYNOS5440)        += pinctrl-exynos5440.o
-obj-$(CONFIG_PINCTRL_S3C24XX)   += pinctrl-s3c24xx.o
-obj-$(CONFIG_PINCTRL_S3C64XX)   += pinctrl-s3c64xx.o
 obj-$(CONFIG_PINCTRL_XWAY)      += pinctrl-xway.o
 obj-$(CONFIG_PINCTRL_LANTIQ)    += pinctrl-lantiq.o
 obj-$(CONFIG_PINCTRL_TB10X)     += pinctrl-tb10x.o
@@ -72,8 +55,11 @@ obj-$(CONFIG_PINCTRL_VF610)	+= pinctrl-vf610.o
 
 obj-$(CONFIG_ARCH_BERLIN)       += berlin/
 obj-$(CONFIG_PLAT_ORION)        += mvebu/
+obj-y                           += nomadik/
+obj-$(CONFIG_ARCH_QCOM)         += qcom/
+obj-$(CONFIG_PLAT_SAMSUNG)      += samsung/
 obj-$(CONFIG_ARCH_SHMOBILE)     += sh-pfc/
 obj-$(CONFIG_SUPERH)            += sh-pfc/
 obj-$(CONFIG_PLAT_SPEAR)        += spear/
-obj-$(CONFIG_ARCH_VT8500)       += vt8500/
 obj-$(CONFIG_ARCH_SUNXI)        += sunxi/
+obj-$(CONFIG_ARCH_VT8500)       += vt8500/