summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2015-04-10 23:44:40 +0300
committerKumar Gala <galak@codeaurora.org>2015-04-28 00:11:21 +0300
commitbc0d3076635cc6c7b4c715f676ed1526eed0399d (patch)
tree39573c405a18e050cb08239f4db1c6313cd96653 /arch/arm
parentd5d4654e9eee81aafae7a4c0aa393d5f1a0882d1 (diff)
downloadlinux-bc0d3076635cc6c7b4c715f676ed1526eed0399d.tar.xz
ARM: dts: qcom: apq8064 - Move i2c1 pinctrl to apq8064.dtsi
I2C1 pinctrl is not really specific to a board, moving to SOC dtsi would avoid redefining this in every board. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Kumar Gala <galak@codeaurora.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/qcom-apq8064-ifc6410.dts7
-rw-r--r--arch/arm/boot/dts/qcom-apq8064.dtsi7
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
index 528cb314236e..f97339abbfaa 100644
--- a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
@@ -11,13 +11,6 @@
soc {
pinctrl@800000 {
- i2c1_pins: i2c1 {
- mux {
- pins = "gpio20", "gpio21";
- function = "gsbi1";
- };
- };
-
card_detect: card_detect {
mux {
pins = "gpio26";
diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 93de48ac0aa5..345ea081c765 100644
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -113,6 +113,13 @@
function = "ps_hold";
};
};
+
+ i2c1_pins: i2c1 {
+ mux {
+ pins = "gpio20", "gpio21";
+ function = "gsbi1";
+ };
+ };
};
intc: interrupt-controller@2000000 {