From: Hans de Goede Date: Mon, 22 Dec 2014 10:39:57 +0000 (+0100) Subject: sunxi: gpio: Properly sort mux defines by port number X-Git-Tag: v2015.04-rc1~145 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d27f7d14eaa1299b93c1e5efb691ddf0884885fa;p=oweals%2Fu-boot.git 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 Acked-by: Ian Campbell --- 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