summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2014-12-22 11:39:57 +0100
committerHans de Goede <hdegoede@redhat.com>2015-01-14 14:56:38 +0100
commitd27f7d14eaa1299b93c1e5efb691ddf0884885fa (patch)
treeb734014bba77651af1640be293dd25e87b2b033c
parent876aaafdbd5eb2764b6e921306c7d37f9c9f3f09 (diff)
downloadblackbird-obmc-uboot-d27f7d14eaa1299b93c1e5efb691ddf0884885fa.tar.gz
blackbird-obmc-uboot-d27f7d14eaa1299b93c1e5efb691ddf0884885fa.zip
sunxi: gpio: Properly sort mux defines by port number
Move a few mux defines around so that all the mux defines are properly sorted by port number. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
-rw-r--r--arch/arm/include/asm/arch-sunxi/gpio.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h
index 6623f15220..67308792ad 100644
--- a/arch/arm/include/asm/arch-sunxi/gpio.h
+++ b/arch/arm/include/asm/arch-sunxi/gpio.h
@@ -145,11 +145,6 @@ enum sunxi_gpio_number {
#define SUN5I_GPB19_UART0_TX 2
#define SUN5I_GPB20_UART0_RX 2
-#define SUN5I_GPG3_SDC1 2
-
-#define SUN5I_GPG3_UART1_TX 4
-#define SUN5I_GPG4_UART1_RX 4
-
#define SUNXI_GPC6_SDC2 3
#define SUNXI_GPF0_SDC0 2
@@ -166,6 +161,11 @@ enum sunxi_gpio_number {
#define SUN4I_GPG0_SDC1 4
+#define SUN5I_GPG3_SDC1 2
+
+#define SUN5I_GPG3_UART1_TX 4
+#define SUN5I_GPG4_UART1_RX 4
+
#define SUN4I_GPH22_SDC1 5
#define SUN6I_GPH20_UART0_TX 2
OpenPOWER on IntegriCloud