Commit eed67c99 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'qcom-arm64-for-4.10' of... 

Merge tag 'qcom-arm64-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt64

Qualcomm ARM64 Updates for v4.10

* Add Hexagon SMD/PIL nodes
* Add DB820c PMIC pins
* Fixup APQ8016 voltage ranges
* Add various MSM8996 nodes to support SMD/SMEM/SMP2P
* Add support for Huawei Nexus 6P (Angler)
* Add support for LG Nexus 5x (Bullhead)

* tag 'qcom-arm64-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux

:
  arm64: dts: msm8994 SoC and Huawei Angler (Nexus 6P) support
  dt-bindings: qcom: Add msm899(2/4) bindings
  arm64: dts: msm8992 SoC and LG Bullhead (Nexus 5X) support
  arm64: dts: msm8996: Add SMP2P and APCS nodes
  arm64: dts: msm8996: Add SMEM DT nodes
  arm64: dts: msm8996: Add reserve-memory nodes
  arm64: dts: msm8996: Add SMEM reserve-memory node
  arm64: dts: apq8016-sbc: add analog audio support with multicodec
  arm64: dts: qcom: Add missing interrupt entry for pm8994 gpios
  arm64: dts: apq8016-sbc: Set up LDO2, LDO6 and LDO17 regulator voltage ranges
  dts: arm64: db820c: add pmic pins specific dts file
  arm64: dts: qcom: msm8916: Add Hexagon PIL node
  arm64: dts: qcom: msm8916: Add Hexagon SMD edge

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d02262af feeaf56a

Documentation/devicetree/bindings/arm/qcom.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,8 @@ The 'SoC' element must be one of the following strings: 
	apq8096

	apq8096

	msm8916

	msm8916

	msm8974

	msm8974

	msm8992

	msm8994

	msm8996

	msm8996





The 'board' element must be one of the following strings:

The 'board' element must be one of the following strings:

arch/arm64/boot/dts/qcom/Makefile

+5 −2
Original line number Original line Diff line number Diff line 
dtb-$(CONFIG_ARCH_QCOM)	+= apq8016-sbc.dtb msm8916-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= apq8016-sbc.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-db820c.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-db820c.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-mtp.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-bullhead-rev-101.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8994-angler-rev-101.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-mtp.dtb





always		:= $(dtb-y)

always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

subdir-y	:= $(dts-dirs)

arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi

+67 −6
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "pm8916.dtsi"

#include "pm8916.dtsi"

#include "apq8016-sbc-soc-pins.dtsi"

#include "apq8016-sbc-soc-pins.dtsi"

#include "apq8016-sbc-pmic-pins.dtsi"

#include "apq8016-sbc-pmic-pins.dtsi"

#include <dt-bindings/sound/apq8016-lpass.h>





/ {

/ {

	aliases {

	aliases {
@@ -251,6 +252,60 @@ 
				vddio-supply = <&pm8916_l6>;

				vddio-supply = <&pm8916_l6>;

			};

			};

		};

		};



		lpass_codec: codec{

			status = "okay";

		};



		/*

		Internal Codec

			playback - Primary MI2S

			capture - Ter MI2S



		External Primary:

			playback - secondary MI2S

			capture - Quat MI2S



		External Secondary:

			playback - Quat MI2S

			capture - Quat MI2S



		*/



                sound: sound {

                        compatible = "qcom,apq8016-sbc-sndcard";

                        reg = <0x07702000 0x4>, <0x07702004 0x4>;

                        reg-names = "mic-iomux", "spkr-iomux";



                        status = "okay";

                        pinctrl-0 = <&cdc_pdm_lines_act &ext_sec_tlmm_lines_act &ext_mclk_tlmm_lines_act>;

                        pinctrl-1 = <&cdc_pdm_lines_sus &ext_sec_tlmm_lines_sus &ext_mclk_tlmm_lines_sus>;

                        pinctrl-names = "default", "sleep";

                        qcom,model = "DB410c";

                        qcom,audio-routing =

                                "AMIC2", "MIC BIAS Internal2",

                                "AMIC3", "MIC BIAS External1";



                        internal-codec-playback-dai-link@0 {            /* I2S - Internal codec */

                                link-name = "WCD";

                                cpu { /* PRIMARY */

                                        sound-dai = <&lpass MI2S_PRIMARY>;

                                };

                                codec {

                                        sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;

                                };

                        };



                        internal-codec-capture-dai-link@0 {             /* I2S - Internal codec */

                                link-name = "WCD-Capture";

                                cpu { /* PRIMARY */

                                        sound-dai = <&lpass MI2S_TERTIARY>;

                                };

                                codec {

                                        sound-dai = <&lpass_codec 1>, <&wcd_codec 1>;

                                };

                        };

                };

	};

	};





	usb2513 {

	usb2513 {
@@ -278,6 +333,12 @@ 
	};

	};

};

};





&wcd_codec {

        status = "okay";

        clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;

        clock-names = "mclk";

};



&smd_rpm_regulators {

&smd_rpm_regulators {

	vdd_l1_l2_l3-supply = <&pm8916_s3>;

	vdd_l1_l2_l3-supply = <&pm8916_s3>;

	vdd_l5-supply = <&pm8916_s3>;

	vdd_l5-supply = <&pm8916_s3>;
@@ -308,8 +369,8 @@ 
	};

	};





	l2 {

	l2 {

		regulator-min-microvolt = <375000>;

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <1525000>;

		regulator-max-microvolt = <1200000>;

	};

	};





	l3 {

	l3 {
@@ -328,8 +389,8 @@ 
	};

	};





	l6 {

	l6 {

		regulator-min-microvolt = <1750000>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3337000>;

		regulator-max-microvolt = <1800000>;

	};

	};





	l7 {

	l7 {
@@ -388,8 +449,8 @@ 
	};

	};





	l17 {

	l17 {

		regulator-min-microvolt = <1750000>;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3337000>;

		regulator-max-microvolt = <3300000>;

	};

	};





	l18 {

	l18 {

arch/arm64/boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi

0 → 100644
+15 −0
Original line number Original line Diff line number Diff line 


#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>

&pm8994_gpios {



	pinctrl-names = "default";

	pinctrl-0 = <&ls_exp_gpio_f>;



	ls_exp_gpio_f: pm8916_mpp4 {

		pinconf {

			pins = "gpio5";

			output-low;

			power-source = <PM8994_GPIO_S4>; // 1.8V

		};

	};

};

arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi

+2 −0
Original line number Original line Diff line number Diff line
@@ -12,7 +12,9 @@ 
 */

 */





#include "msm8996.dtsi"

#include "msm8996.dtsi"

#include "pm8994.dtsi"

#include "apq8096-db820c-pins.dtsi"

#include "apq8096-db820c-pins.dtsi"

#include "apq8096-db820c-pmic-pins.dtsi"





/ {

/ {

	aliases {

	aliases {

CRA Git | Maintained and supported by SUSTech CRA and CCSE