sugar/linux
1
0
Fork 0
Code Activity

Merge tag 'qcom-dt-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/dt

Browse Source 
Merge "qcom DT changes for v3.20" from Kumar Gala:

Qualcomm ARM Based Device Tree Updates for v3.20

* Correct IPQ8064 tlmm interrupt
* Add Support for SD Card Detect for ifc6410 board

* tag 'qcom-dt-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: dts: qcom: Correct IPQ8064 tlmm interrupt
  ARM: dts: qcom: Add Support for SD Card Detect for ifc6410 board

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2015-01-21 17:03:01 -08:00
parent e42da8a146 bb901bd659
commit 0786d9c5b3
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
View File

@@ -1,4 +1,5 @@
#include "qcom-apq8064-v2.0.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ {
model = "Qualcomm APQ8064/IFC6410";
@@ -12,6 +13,14 @@
function = "gsbi1";
};
};
card_detect: card_detect {
mux {
pins = "gpio26";
function = "gpio";
bias-disable;
};
};
};
gsbi@12440000 {
@@ -49,6 +58,9 @@
/* External micro SD card */
sdcc3: sdcc@12180000 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&card_detect>;
cd-gpios = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>;
};
/* WLAN */
sdcc4: sdcc@121c0000 {

2
arch/arm/boot/dts/qcom-ipq8064.dtsi
View File

@@ -74,7 +74,7 @@
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <0 32 0x4>;
interrupts = <0 16 0x4>;
};
intc: interrupt-controller@2000000 {