Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0786d9c5 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'qcom-dt-for-3.20' of... 

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

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: default avatarOlof Johansson <olof@lixom.net>
parents e42da8a1 bb901bd6

arch/arm/boot/dts/qcom-apq8064-ifc6410.dts

+12 −0
Original line number Diff line number Diff line 
#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 {

arch/arm/boot/dts/qcom-ipq8064.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupts = <0 32 0x4>;

			interrupts = <0 16 0x4>;

		};



		intc: interrupt-controller@2000000 {