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

Commit 62f838c9 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Qualcomm ARM64 Updates for v4.11

* Add Vol+ support for DB820C and APQ8016
* Add HDMI audio support for APQ8016
* Fix DB820C GPIO pinctrl name
* Enable WCNSS on MSM8916
* Add SCM node for MSM8996
* Use fixed XO clock on MSM8916

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

:
  arm64: dts: db820c: add support to volume up key
  arm64: dts: apq8016-sbc: Limit MPP4 high state to 1.8V
  arm64: dts: apq8016-sbc: Add Volume Up key device node
  arm64: dts: apq8016-sbc: add support to hdmi audio via adv7533
  arm64: dts: db820c: fix gpio pinctrl name correctly
  ARM: dts: msm8916: Add and enable wcnss node
  arm64: dts: msm8996: Add SCM DT node
  arm64: dts: qcom: msm8916: Use fixed factor xo clock

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f41afa53 3a521539

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

+13 −0
Original line number Diff line number Diff line 
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>

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



&pm8916_gpios {
@@ -30,6 +31,18 @@ 


&pm8916_mpps {



	pinctrl-names = "default";

	pinctrl-0 = <&ls_exp_gpio_f>;



	ls_exp_gpio_f: pm8916_mpp4 {

		pinconf {

			pins = "mpp4";

			function = "digital";

			output-low;

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

		};

	};



	pm8916_mpps_leds: pm8916_mpps_leds {

		pinconf {

			pins = "mpp2", "mpp3";

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

+13 −0
Original line number Diff line number Diff line
@@ -72,4 +72,17 @@ 
			bias-disable;

		};

	};



	msm_key_volp_n_default: msm_key_volp_n_default {

		pinmux {

			function = "gpio";

			pins = "gpio107";

		};

		pinconf {

			pins = "gpio107";

			drive-strength = <8>;

			input-enable;

			bias-pull-up;

		};

	};

};

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

+32 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
#include "pm8916.dtsi"

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

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

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

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



/ {
@@ -85,6 +87,7 @@ 
				pinctrl-names = "default","sleep";

				pinctrl-0 = <&adv7533_int_active &adv7533_switch_active>;

				pinctrl-1 = <&adv7533_int_suspend &adv7533_switch_suspend>;

				#sound-dai-cells = <1>;



				ports {

					#address-cells = <1>;
@@ -285,6 +288,15 @@ 
                        qcom,audio-routing =

                                "AMIC2", "MIC BIAS Internal2",

                                "AMIC3", "MIC BIAS External1";

			external-dai-link@0 {

				link-name = "ADV7533";

				cpu { /* QUAT */

					sound-dai = <&lpass MI2S_QUATERNARY>;

				};

				codec {

					sound-dai = <&adv_bridge 0>;

				};

			};



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

                                link-name = "WCD";
@@ -306,6 +318,10 @@ 
                                };

                        };

                };



		wcnss@a21b000 {

			status = "okay";

		};

	};



	usb2513 {
@@ -331,6 +347,22 @@ 
			};

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		autorepeat;



		pinctrl-names = "default";

		pinctrl-0 = <&msm_key_volp_n_default>;



		button@0 {

			label = "Volume Up";

			linux,code = <KEY_VOLUMEUP>;

			gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;

		};

	};

};



&wcd_codec {

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

+13 −1
Original line number Diff line number Diff line
@@ -5,11 +5,23 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&ls_exp_gpio_f>;



	ls_exp_gpio_f: pm8916_mpp4 {

	ls_exp_gpio_f: pm8994_gpio5 {

		pinconf {

			pins = "gpio5";

			output-low;

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

		};

	};



	volume_up_gpio: pm8996_gpio2 {

		pinconf {

			pins = "gpio2";

			function = "normal";

			input-enable;

			drive-push-pull;

			bias-pull-up;

			qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;

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

		};

	};

};

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

+19 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
#include "pm8994.dtsi"

#include "apq8096-db820c-pins.dtsi"

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

#include <dt-bindings/input/input.h>

#include <dt-bindings/gpio/gpio.h>



/ {

	aliases {
@@ -87,4 +89,21 @@ 
			status = "okay";

		};

	};





	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		autorepeat;



		pinctrl-names = "default";

		pinctrl-0 = <&volume_up_gpio>;



		button@0 {

			label = "Volume Up";

			linux,code = <KEY_VOLUMEUP>;

			gpios = <&pm8994_gpios 2 GPIO_ACTIVE_LOW>;

		};

	};

};