aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Hogan <james.hogan@imgtec.com>2012-10-05 07:33:07 -0400
committerJames Hogan <james.hogan@imgtec.com>2013-06-27 08:49:49 -0400
commit9630fa9fe6fec46b498d0784f00f8ef2bbd5b6ec (patch)
tree13572e96a803ff70d874808f5ec299f1b751792e
parentf43b059d8dfb90f7c87b88eff0a57f5a79dd87ff (diff)
metag: tz1090: select and instantiate pinctrl-tz1090
Select PINCTRL and PINCTRL_TZ1090 from SOC_TZ1090 to enable the main pin controller driver once it is merged, and instantiate it from tz1090.dtsi. Signed-off-by: James Hogan <james.hogan@imgtec.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Grant Likely <grant.likely@linaro.org>
-rw-r--r--arch/metag/Kconfig.soc2
-rw-r--r--arch/metag/boot/dts/tz1090.dtsi6
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/metag/Kconfig.soc b/arch/metag/Kconfig.soc
index 653b47917caf..6b11ca363ceb 100644
--- a/arch/metag/Kconfig.soc
+++ b/arch/metag/Kconfig.soc
@@ -19,6 +19,8 @@ config SOC_TZ1090
19 select METAG_LNKGET_AROUND_CACHE 19 select METAG_LNKGET_AROUND_CACHE
20 select METAG_META21 20 select METAG_META21
21 select METAG_SMP_WRITE_REORDERING 21 select METAG_SMP_WRITE_REORDERING
22 select PINCTRL
23 select PINCTRL_TZ1090
22 help 24 help
23 This is a Toumaz Technology Xenif TZ1090 (A.K.A. Comet) SoC containing 25 This is a Toumaz Technology Xenif TZ1090 (A.K.A. Comet) SoC containing
24 a 2-threaded HTP. 26 a 2-threaded HTP.
diff --git a/arch/metag/boot/dts/tz1090.dtsi b/arch/metag/boot/dts/tz1090.dtsi
index ff7bb74abc4b..697f3840e4d8 100644
--- a/arch/metag/boot/dts/tz1090.dtsi
+++ b/arch/metag/boot/dts/tz1090.dtsi
@@ -25,5 +25,11 @@
25 #address-cells = <1>; 25 #address-cells = <1>;
26 #size-cells = <1>; 26 #size-cells = <1>;
27 ranges; 27 ranges;
28
29 pinctrl: pinctrl@02005800 {
30 #gpio-range-cells = <3>;
31 compatible = "img,tz1090-pinctrl";
32 reg = <0x02005800 0xe4>;
33 };
28 }; 34 };
29}; 35};