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

Commit 1115b8cf authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "pinctrl: qcom: Add support for sdxhedeghog"

parents 09a40f87 913a53fd

Documentation/devicetree/bindings/arm/msm/msm.txt

+5 −0
Original line number Diff line number Diff line
@@ -110,6 +110,9 @@ SoCs: 
- MDMCALIFORNIUM

  compatible = "qcom,mdmcalifornium"



- SDXHEDGEHOG

  compatible = "qcom,sdxhedgehog"



- VPIPA

  compatible = "qcom,msmvpipa"
@@ -301,5 +304,7 @@ compatible = "qcom,mdmcalifornium-rumi" 
compatible = "qcom,mdmcalifornium-sim"

compatible = "qcom,mdmcalifornium-cdp"

compatible = "qcom,mdmcalifornium-mtp"

compatible = "qcom,sdxhedgehog-mtp"

compatible = "qcom,sdxhedgehog-cdp"

compatible = "qcom,apq8009-cdp"

compatible = "qcom,apq8009-mtp"

Documentation/devicetree/bindings/pinctrl/msm.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
	      "qcom,mdm9640-pinctrl"

	      "qcom,mdm9607-pinctrl"

	      "qcom,msm8917-pinctrl"

	      "qcom,sdxhedgehog-pinctrl"

	       "qcom,mdmcalifornium-pinctrl"

	      "qcom,msm8952-pinctrl"

	      "qcom,msm8953-pinctrl"

arch/arm/boot/dts/qcom/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -160,6 +160,12 @@ dtb-$(CONFIG_ARCH_MDMCALIFORNIUM) += mdmcalifornium-sim.dtb \ 
	mdmcalifornium-v1.1-nand-mtp.dtb \

	mdmcalifornium-v1.1-nand-dualwifi-mtp.dtb



dtb-$(CONFIG_ARCH_SDXHEDGEHOG) += sdxhedgehog-emmc-cdp.dtb \

	sdxhedgehog-emmc-mtp.dtb \

	sdxhedgehog-nand-cdp.dtb \

	sdxhedgehog-nand-mtp.dtb \

	sdxhedgehog-nand-dualwifi-mtp.dtb



dtb-$(CONFIG_ARCH_MSM8937) += msm8937-rumi.dtb \

	msm8937-pmi8950-cdp.dtb \

	msm8937-pmi8937-cdp.dtb \

arch/arm/boot/dts/qcom/sdxhedgehog-cdp.dtsi

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <dt-bindings/interrupt-controller/irq.h>

#include "sdxhedgehog.dtsi"

#include "sdxhedgehog-pinctrl.dtsi"



&blsp1_uart3 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart3_console_active>;

};



&blsp1_uart2_hs {

	status = "ok";

};

arch/arm/boot/dts/qcom/sdxhedgehog-emmc-cdp.dts

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/dts-v1/;



#include "sdxhedgehog-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDX HEDGEHOG CDP (eMMC)";

	compatible = "qcom,sdxhedgehog-cdp", "qcom,sdxhedgehog",

		     "qcom,cdp";

	qcom,board-id = <1 0x00030000>;



	qcom,rmtfs_sharedmem@0 {

		compatible = "qcom,sharedmem-uio";

		reg = <0x0 0x00100000>;

		reg-names = "rmtfs";

		qcom,client-id = <0x00000001>;

	};

};