Merge tag '64bit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / pinctrl-zynq.c

diff --git a/drivers/pinctrl/pinctrl-zynq.c b/drivers/pinctrl/pinctrl-zynq.c
index 8aa05e2eb7052f01e89d82d428977e8ee6b62980..22280bddb9e262124478be6b499d543a7b188238 100644 (file)
--- a/drivers/pinctrl/pinctrl-zynq.c
+++ b/drivers/pinctrl/pinctrl-zynq.c
@@ -357,7 +357,7 @@ static const unsigned int gpio0_50_pins[] = {50};
 static const unsigned int gpio0_51_pins[] = {51};
 static const unsigned int gpio0_52_pins[] = {52};
 static const unsigned int gpio0_53_pins[] = {53};
-static const unsigned int usb0_0_pins[] = {28, 19, 30, 31, 32, 33, 34, 35, 36,
+static const unsigned int usb0_0_pins[] = {28, 29, 30, 31, 32, 33, 34, 35, 36,
                                           37, 38, 39};
 static const unsigned int usb1_0_pins[] = {40, 41, 42, 43, 44, 45, 46, 47, 48,
                                           49, 50, 51};
@@ -924,9 +924,11 @@ static const struct pinconf_generic_params zynq_dt_params[] = {
        {"io-standard", PIN_CONFIG_IOSTANDARD, zynq_iostd_lvcmos18},
 };
 
+#ifdef CONFIG_DEBUG_FS
 static const struct pin_config_item zynq_conf_items[ARRAY_SIZE(zynq_dt_params)] = {
        PCONFDUMP(PIN_CONFIG_IOSTANDARD, "IO-standard", NULL, true),
 };
+#endif
 
 static unsigned int zynq_pinconf_iostd_get(u32 reg)
 {
@@ -1101,7 +1103,9 @@ static struct pinctrl_desc zynq_desc = {
        .confops = &zynq_pinconf_ops,
        .num_custom_params = ARRAY_SIZE(zynq_dt_params),
        .custom_params = zynq_dt_params,
+#ifdef CONFIG_DEBUG_FS
        .custom_conf_items = zynq_conf_items,
+#endif
        .owner = THIS_MODULE,
 };