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

Commit bd3af15a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "Qualcomm ARM64 Updates for v4.9" from Andy Gross:

* Updates for MSM8916 including TSCR, SMSM/SMP2P, and MBA reserve
* Update SCM node to denote being a reset-controller
* Fix broken interrupt settings
* Add TSENS nodes for MSM8916/MSM8996
* Add DB820c support
* Add MSM8916/APQ8016 display support

* tag 'qcom-arm64-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  arm64: dts: apq8016-sbc: Add HDMI display support
  arm64: dts: msm8916: Add display support
  arm64: dts: db820c: add support to external sd card.
  arm64: dts: db820c: add support to SPI on HS
  arm64: dts: db820c: add support to LS-SPI0
  arm64: dts: db820c: add support to I2C on HS
  arm64: dts: db820c: add support to LS-I2C1
  arm64: dts: db820c: add support to LS-I2C0
  arm64: dts: db820c: add support to LS-UART0
  arm64: dts: db820c: add basic board support
  arm64: dts: msm8996: Add thermal zones, tsens and qfprom nodes
  arm64: dts: msm8916: Add thermal zones, tsens and qfprom nodes
  arm64: dts: qcom: Fix broken interrupt trigger settings
  arm64: dts: qcom: msm8916: Add tcsr syscon
  arm64: dts: qcom: msm8916: Make scm a reset-controller
  arm64: dts: qcom: msm8916: Add mba memory reserve
  arm64: dts: qcom: msm8916: Add smsm and smp2p nodes
parents 5661beb3 28546b09

arch/arm64/boot/dts/qcom/Makefile

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

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

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



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

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

+48 −0
Original line number Diff line number Diff line
@@ -24,4 +24,52 @@ 
			bias-pull-up;

		};

	};



	adv7533_int_active: adv533_int_active {

		pinmux {

			function = "gpio";

			pins = "gpio31";

		};

		pinconf {

			pins = "gpio31";

			drive-strength = <16>;

			bias-disable;

		};

	};



	adv7533_int_suspend: adv7533_int_suspend {

		pinmux {

			function = "gpio";

			pins = "gpio31";

		};

		pinconf {

			pins = "gpio31";

			drive-strength = <2>;

			bias-disable;

		};

	};



	adv7533_switch_active: adv7533_switch_active {

		pinmux {

			function = "gpio";

			pins = "gpio32";

		};

		pinconf {

			pins = "gpio32";

			drive-strength = <16>;

			bias-disable;

		};

	};



	adv7533_switch_suspend: adv7533_switch_suspend {

		pinmux {

			function = "gpio";

			pins = "gpio32";

		};

		pinconf {

			pins = "gpio32";

			drive-strength = <2>;

			bias-disable;

		};

	};

};

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

+82 −0
Original line number Diff line number Diff line
@@ -63,6 +63,47 @@ 
		/* On High speed expansion */

			label = "HS-I2C2";

			status = "okay";



			adv_bridge: bridge@39 {

				status = "okay";



				compatible = "adi,adv7533";

				reg = <0x39>;



				interrupt-parent = <&msmgpio>;

				interrupts = <31 2>;



				adi,dsi-lanes = <4>;



				pd-gpios = <&msmgpio 32 0>;



				avdd-supply = <&pm8916_l6>;

				v1p2-supply = <&pm8916_l6>;

				v3p3-supply = <&pm8916_l17>;



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

				pinctrl-0 = <&adv7533_int_active &adv7533_switch_active>;

				pinctrl-1 = <&adv7533_int_suspend &adv7533_switch_suspend>;



				ports {

					#address-cells = <1>;

					#size-cells = <0>;



					port@0 {

						reg = <0>;

						adv7533_in: endpoint {

							remote-endpoint = <&dsi0_out>;

						};

					};



					port@1 {

						reg = <1>;

						adv7533_out: endpoint {

							remote-endpoint = <&hdmi_con>;

						};

					};

				};

			};

		};



		i2c@78ba000 {
@@ -180,6 +221,36 @@ 
		lpass@07708000 {

			status = "okay";

		};



		mdss@1a00000 {

			status = "okay";



			mdp@1a01000 {

				status = "okay";

			};



			dsi@1a98000 {

				status = "okay";



				vdda-supply = <&pm8916_l2>;

				vddio-supply = <&pm8916_l6>;



				ports {

					port@1 {

						endpoint {

							remote-endpoint = <&adv7533_in>;

							data-lanes = <0 1 2 3>;

						};

					};

				};

			};



			dsi-phy@1a98300 {

				status = "okay";



				vddio-supply = <&pm8916_l6>;

			};

		};

	};



	usb2513 {
@@ -194,6 +265,17 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&usb_id_default>;

	};



	hdmi-out {

		compatible = "hdmi-connector";

		type = "a";



		port {

			hdmi_con: endpoint {

				remote-endpoint = <&adv7533_out>;

			};

		};

	};

};



&smd_rpm_regulators {

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

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-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.

 */

&msmgpio {

	sdc2_cd_on: sdc2_cd_on {

		mux {

			pins = "gpio38";

			function = "gpio";

		};



		config {

			pins = "gpio38";

			bias-pull-up;		/* pull up */

			drive-strength = <16>;	/* 16 MA */

		};

	};



	sdc2_cd_off: sdc2_cd_off {

		mux {

			pins = "gpio38";

			function = "gpio";

		};



		config {

			pins = "gpio38";

			bias-pull-up;		/* pull up */

			drive-strength = <2>;	/* 2 MA */

		};

	};

};

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

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014-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 "apq8096-db820c.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. DB820c";

	compatible = "arrow,apq8096-db820c", "qcom,apq8096-sbc";

};