From 233c0672c0d5a1a69f4e359348dd245ba45bab25 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Sat, 26 Jan 2013 15:36:52 +0100 Subject: [PATCH] --- yaml --- r: 350527 b: refs/heads/master c: ae1575f71152627f0d443853c42319b2f1404eb9 h: refs/heads/master i: 350525: 2cba70268c3a1b58bad63a8bb0905ff507b89a53 350523: bb7ed628d2e751e5ab0ea8504aff2350a5642f6c 350519: dd667c6b8c4bdc58185c2c7329e18991fda253ec 350511: f55b699b88b7dbdaf0347c8a5a9c748fb49fc34c 350495: 9025b049248ba4d54debf9854eb9626a97747659 350463: 4986de250fc6d54be9a8c3efb37fd9bb5c5e4b52 v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/pinctrl-sunxi.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5a2c6c6fc4c3..42adad3e5239 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e590b91e8a6225a96f3f6438c4cea3682f16b515 +refs/heads/master: ae1575f71152627f0d443853c42319b2f1404eb9 diff --git a/trunk/drivers/pinctrl/pinctrl-sunxi.c b/trunk/drivers/pinctrl/pinctrl-sunxi.c index fb000b00c6d3..cb3d2300082c 100644 --- a/trunk/drivers/pinctrl/pinctrl-sunxi.c +++ b/trunk/drivers/pinctrl/pinctrl-sunxi.c @@ -217,11 +217,11 @@ static const struct sunxi_desc_pin sun5i_a13_pins[] = { SUNXI_PIN(SUNXI_PINCTRL_PIN_PE10, SUNXI_FUNCTION(0x0, "gpio_in"), SUNXI_FUNCTION(0x1, "gpio_out"), - SUNXI_FUNCTION(0x4, "uart1")), + SUNXI_FUNCTION(0x4, "uart1")), /* TX */ SUNXI_PIN(SUNXI_PINCTRL_PIN_PE11, SUNXI_FUNCTION(0x0, "gpio_in"), SUNXI_FUNCTION(0x1, "gpio_out"), - SUNXI_FUNCTION(0x4, "uart1")), + SUNXI_FUNCTION(0x4, "uart1")), /* RX */ /* Hole */ SUNXI_PIN(SUNXI_PINCTRL_PIN_PF0, SUNXI_FUNCTION(0x0, "gpio_in"), @@ -254,11 +254,11 @@ static const struct sunxi_desc_pin sun5i_a13_pins[] = { SUNXI_PIN(SUNXI_PINCTRL_PIN_PG3, SUNXI_FUNCTION(0x0, "gpio_in"), SUNXI_FUNCTION(0x1, "gpio_out"), - SUNXI_FUNCTION(0x4, "uart1")), + SUNXI_FUNCTION(0x4, "uart1")), /* TX */ SUNXI_PIN(SUNXI_PINCTRL_PIN_PG4, SUNXI_FUNCTION(0x0, "gpio_in"), SUNXI_FUNCTION(0x1, "gpio_out"), - SUNXI_FUNCTION(0x4, "uart1")), + SUNXI_FUNCTION(0x4, "uart1")), /* RX */ /* Hole */ SUNXI_PIN(SUNXI_PINCTRL_PIN_PG9, SUNXI_FUNCTION(0x0, "gpio_in"),