From 42caa2aa34dcb6c73f14e68d83f07d9449a2e5ea Mon Sep 17 00:00:00 2001 From: Barry Song Date: Thu, 27 Sep 2012 17:54:03 +0800 Subject: [PATCH] --- yaml --- r: 328493 b: refs/heads/master c: 8dd9766f68f647692fa38f339fb70f9c8560e729 h: refs/heads/master i: 328491: a14b0ef1c02456566fba418e7b32a2867c9d3e40 v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/pinctrl-sirf.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a29c275dcf0f..f721ed7849ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea5363663f33e4b1ec7fda1034f387b5edaf3d04 +refs/heads/master: 8dd9766f68f647692fa38f339fb70f9c8560e729 diff --git a/trunk/drivers/pinctrl/pinctrl-sirf.c b/trunk/drivers/pinctrl/pinctrl-sirf.c index 53aa6e25c7a2..f309af2ced25 100644 --- a/trunk/drivers/pinctrl/pinctrl-sirf.c +++ b/trunk/drivers/pinctrl/pinctrl-sirf.c @@ -68,6 +68,10 @@ static DEFINE_SPINLOCK(sgpio_lock); * refer to CS-131858-DC-6A.xls */ static const struct pinctrl_pin_desc sirfsoc_pads[] = { + PINCTRL_PIN(0, "gpio0-0"), + PINCTRL_PIN(1, "gpio0-1"), + PINCTRL_PIN(2, "gpio0-2"), + PINCTRL_PIN(3, "gpio0-3"), PINCTRL_PIN(4, "pwm0"), PINCTRL_PIN(5, "pwm1"), PINCTRL_PIN(6, "pwm2"), @@ -76,7 +80,9 @@ static const struct pinctrl_pin_desc sirfsoc_pads[] = { PINCTRL_PIN(9, "odo_0"), PINCTRL_PIN(10, "odo_1"), PINCTRL_PIN(11, "dr_dir"), + PINCTRL_PIN(12, "viprom_fa"), PINCTRL_PIN(13, "scl_1"), + PINCTRL_PIN(14, "ntrst"), PINCTRL_PIN(15, "sda_1"), PINCTRL_PIN(16, "x_ldd[16]"), PINCTRL_PIN(17, "x_ldd[17]"),