diff options
author | Christian Ruppert <christian.ruppert@abilis.com> | 2013-05-10 10:05:50 -0400 |
---|---|---|
committer | Vineet Gupta <vgupta@synopsys.com> | 2013-05-15 00:42:03 -0400 |
commit | 7d19273cd0408f8520539d5d6b1f695cd311b109 (patch) | |
tree | 5a263820970b404ab55da76059ed4b84240dbd06 /arch/arc | |
parent | f722406faae2d073cc1d01063d1123c35425939e (diff) |
ARC: [TB10x] Remove redundant abilis,simple-pinctrl mechanism
The TB10x platform port includes a custom mechanism using to set up
default pin controller configurations using abilis,simple-default
pin configurations of nodes compatible with abilis,simple-pinctrl. This
mechanism is redundant with the Linux standard "default" pin
configuration, see commit ab78029ecc347debbd737f06688d788bd9d60c1d
"drivers/pinctrl: grab default handles from device core".
This patch removes the TB10x custom mechanism in favour of the Linux
standard.
Signed-off-by: Christian Ruppert <christian.ruppert@abilis.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Diffstat (limited to 'arch/arc')
-rw-r--r-- | arch/arc/boot/dts/abilis_tb100_dvk.dts | 2 | ||||
-rw-r--r-- | arch/arc/boot/dts/abilis_tb101_dvk.dts | 2 | ||||
-rw-r--r-- | arch/arc/boot/dts/abilis_tb10x.dtsi | 6 | ||||
-rw-r--r-- | arch/arc/plat-tb10x/tb10x.c | 26 |
4 files changed, 4 insertions, 32 deletions
diff --git a/arch/arc/boot/dts/abilis_tb100_dvk.dts b/arch/arc/boot/dts/abilis_tb100_dvk.dts index c0fd3623c393..0fa0d4abe795 100644 --- a/arch/arc/boot/dts/abilis_tb100_dvk.dts +++ b/arch/arc/boot/dts/abilis_tb100_dvk.dts | |||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | soc100 { | 38 | soc100 { |
39 | uart@FF100000 { | 39 | uart@FF100000 { |
40 | pinctrl-names = "abilis,simple-default"; | 40 | pinctrl-names = "default"; |
41 | pinctrl-0 = <&pctl_uart0>; | 41 | pinctrl-0 = <&pctl_uart0>; |
42 | }; | 42 | }; |
43 | ethernet@FE100000 { | 43 | ethernet@FE100000 { |
diff --git a/arch/arc/boot/dts/abilis_tb101_dvk.dts b/arch/arc/boot/dts/abilis_tb101_dvk.dts index 6f8c381f6268..a4d80ce283ae 100644 --- a/arch/arc/boot/dts/abilis_tb101_dvk.dts +++ b/arch/arc/boot/dts/abilis_tb101_dvk.dts | |||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | soc100 { | 38 | soc100 { |
39 | uart@FF100000 { | 39 | uart@FF100000 { |
40 | pinctrl-names = "abilis,simple-default"; | 40 | pinctrl-names = "default"; |
41 | pinctrl-0 = <&pctl_uart0>; | 41 | pinctrl-0 = <&pctl_uart0>; |
42 | }; | 42 | }; |
43 | ethernet@FE100000 { | 43 | ethernet@FE100000 { |
diff --git a/arch/arc/boot/dts/abilis_tb10x.dtsi b/arch/arc/boot/dts/abilis_tb10x.dtsi index a6139fc5aaa3..b97e3051ba4b 100644 --- a/arch/arc/boot/dts/abilis_tb10x.dtsi +++ b/arch/arc/boot/dts/abilis_tb10x.dtsi | |||
@@ -88,8 +88,7 @@ | |||
88 | }; | 88 | }; |
89 | 89 | ||
90 | uart@FF100000 { | 90 | uart@FF100000 { |
91 | compatible = "snps,dw-apb-uart", | 91 | compatible = "snps,dw-apb-uart"; |
92 | "abilis,simple-pinctrl"; | ||
93 | reg = <0xFF100000 0x100>; | 92 | reg = <0xFF100000 0x100>; |
94 | clock-frequency = <166666666>; | 93 | clock-frequency = <166666666>; |
95 | interrupts = <25 1>; | 94 | interrupts = <25 1>; |
@@ -184,8 +183,7 @@ | |||
184 | #address-cells = <1>; | 183 | #address-cells = <1>; |
185 | #size-cells = <0>; | 184 | #size-cells = <0>; |
186 | cell-index = <1>; | 185 | cell-index = <1>; |
187 | compatible = "abilis,tb100-spi", | 186 | compatible = "abilis,tb100-spi"; |
188 | "abilis,simple-pinctrl"; | ||
189 | num-cs = <2>; | 187 | num-cs = <2>; |
190 | reg = <0xFE011000 0x20>; | 188 | reg = <0xFE011000 0x20>; |
191 | interrupt-parent = <&tb10x_ictl>; | 189 | interrupt-parent = <&tb10x_ictl>; |
diff --git a/arch/arc/plat-tb10x/tb10x.c b/arch/arc/plat-tb10x/tb10x.c index d3567691c7e1..06cb30929460 100644 --- a/arch/arc/plat-tb10x/tb10x.c +++ b/arch/arc/plat-tb10x/tb10x.c | |||
@@ -34,31 +34,6 @@ static void __init tb10x_platform_init(void) | |||
34 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | 34 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
35 | } | 35 | } |
36 | 36 | ||
37 | static void __init tb10x_platform_late_init(void) | ||
38 | { | ||
39 | struct device_node *dn; | ||
40 | |||
41 | /* | ||
42 | * Pinctrl documentation recommends setting up the iomux here for | ||
43 | * all modules which don't require control over the pins themselves. | ||
44 | * Modules which need this kind of assistance are compatible with | ||
45 | * "abilis,simple-pinctrl", i.e. we can easily iterate over them. | ||
46 | * TODO: Does this recommended method work cleanly with pins required | ||
47 | * by modules? | ||
48 | */ | ||
49 | for_each_compatible_node(dn, NULL, "abilis,simple-pinctrl") { | ||
50 | struct platform_device *pd = of_find_device_by_node(dn); | ||
51 | struct pinctrl *pctl; | ||
52 | |||
53 | pctl = pinctrl_get_select(&pd->dev, "abilis,simple-default"); | ||
54 | if (IS_ERR(pctl)) { | ||
55 | int ret = PTR_ERR(pctl); | ||
56 | dev_err(&pd->dev, "Could not set up pinctrl: %d\n", | ||
57 | ret); | ||
58 | } | ||
59 | } | ||
60 | } | ||
61 | |||
62 | static const char *tb10x_compat[] __initdata = { | 37 | static const char *tb10x_compat[] __initdata = { |
63 | "abilis,arc-tb10x", | 38 | "abilis,arc-tb10x", |
64 | NULL, | 39 | NULL, |
@@ -67,5 +42,4 @@ static const char *tb10x_compat[] __initdata = { | |||
67 | MACHINE_START(TB10x, "tb10x") | 42 | MACHINE_START(TB10x, "tb10x") |
68 | .dt_compat = tb10x_compat, | 43 | .dt_compat = tb10x_compat, |
69 | .init_machine = tb10x_platform_init, | 44 | .init_machine = tb10x_platform_init, |
70 | .init_late = tb10x_platform_late_init, | ||
71 | MACHINE_END | 45 | MACHINE_END |