diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-05-09 11:41:59 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-07-21 21:12:38 -0400 |
commit | 14d0a2b79623e4773e5fc78950dadac213a30400 (patch) | |
tree | 830a4a8fefd2cf46eba1d0603c8df6c369eb10ed /arch/arm | |
parent | f46a6b0f6a54e80ebf1003134f2e6f4258e53688 (diff) |
ARM: shmobile: armadillo-reference: Move st1232 reset GPIO to DT
Reference the st1232 reset GPIO from the device tree and remove it from
board code.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts index a6c6606dd69b..8ec4cd174a58 100644 --- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | |||
@@ -10,6 +10,7 @@ | |||
10 | 10 | ||
11 | /dts-v1/; | 11 | /dts-v1/; |
12 | /include/ "r8a7740.dtsi" | 12 | /include/ "r8a7740.dtsi" |
13 | #include <dt-bindings/gpio/gpio.h> | ||
13 | 14 | ||
14 | / { | 15 | / { |
15 | model = "armadillo 800 eva reference"; | 16 | model = "armadillo 800 eva reference"; |
@@ -43,6 +44,7 @@ | |||
43 | interrupts = <2 0>; /* IRQ10: hwirq 2 on irqpin1 */ | 44 | interrupts = <2 0>; /* IRQ10: hwirq 2 on irqpin1 */ |
44 | pinctrl-0 = <&st1232_pins>; | 45 | pinctrl-0 = <&st1232_pins>; |
45 | pinctrl-names = "default"; | 46 | pinctrl-names = "default"; |
47 | gpios = <&pfc 166 GPIO_ACTIVE_LOW>; | ||
46 | }; | 48 | }; |
47 | }; | 49 | }; |
48 | 50 | ||
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c index 4ddd29995f1d..002d8d3d0fc5 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c | |||
@@ -158,7 +158,6 @@ clock_error: | |||
158 | */ | 158 | */ |
159 | static void __init eva_init(void) | 159 | static void __init eva_init(void) |
160 | { | 160 | { |
161 | |||
162 | r8a7740_clock_init(MD_CK0 | MD_CK2); | 161 | r8a7740_clock_init(MD_CK0 | MD_CK2); |
163 | eva_clock_init(); | 162 | eva_clock_init(); |
164 | 163 | ||
@@ -171,12 +170,6 @@ static void __init eva_init(void) | |||
171 | 170 | ||
172 | r8a7740_add_standard_devices_dt(); | 171 | r8a7740_add_standard_devices_dt(); |
173 | 172 | ||
174 | /* | ||
175 | * Touchscreen | ||
176 | * TODO: Move reset GPIO over to .dts when we can reference it | ||
177 | */ | ||
178 | gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */ | ||
179 | |||
180 | r8a7740_pm_init(); | 173 | r8a7740_pm_init(); |
181 | } | 174 | } |
182 | 175 | ||