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

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

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

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

Merge "Qualcomm ARM64 Updates for v4.2" Kumar Gala:

* Added SPMI PMIC Arbiter device tree node for MSM8916
* Added 8x16 chipset SPMI PMIC's nodes
* Added MSM8916 restart device node
* Added initial set of PMIC and SoC pins for APQ8016 SBC board

* tag 'qcom-arm64-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  arm64: dts: qcom: Add initial set of PMIC and SoC pins for APQ8016 SBC board
  arm64: dts: qcom: Add MSM8916 restart device node
  arm64: dts: qcom: Add 8x16 chipset SPMI PMIC's nodes
  arm64: dts: qcom: Add SPMI PMIC Arbiter node for MSM8916
parents ff28ea63 a190a1ce

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

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



&pm8916_gpios {



	pinctrl-names = "default";

	pinctrl-0 = <&pm8916_gpios_default>;



	pm8916_gpios_default: default {

		usb_hub_reset_pm {

			pins = "gpio1";

			function = PMIC_GPIO_FUNC_NORMAL;

			output-low;

		};

		usb_sw_sel_pm {

			pins = "gpio2";

			function = PMIC_GPIO_FUNC_NORMAL;

			input-disable;

		};

		usr_led_3_ctrl {

			pins = "gpio3";

			function = PMIC_GPIO_FUNC_NORMAL;

			output-low;

		};

		usr_led_4_ctrl {

			pins = "gpio4";

			function = PMIC_GPIO_FUNC_NORMAL;

			output-low;

		};

	};

};

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

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


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



&msmgpio {



	pinctrl-names = "default";

	pinctrl-0 = <&soc_gpios_default>;



	soc_gpios_default: default {

		usr_led_1_ctrl_default: usr_led_1_ctrl_default {

			pins = "gpio21";

			function = "gpio";

			output-low;

		};

		usr_led_2_ctrl_default: usr_led_2_ctrl_default {

			pins = "gpio120";

			function = "gpio";

			output-low;

		};

	};

};

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

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
 */



#include "msm8916.dtsi"

#include "pm8916.dtsi"

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

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



/ {

	aliases {

arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */



#include "msm8916.dtsi"

#include "pm8916.dtsi"



/ {

	aliases {

arch/arm64/boot/dts/qcom/msm8916.dtsi

+24 −1
Original line number Diff line number Diff line
@@ -77,7 +77,12 @@ 
		ranges = <0 0 0 0xffffffff>;

		compatible = "simple-bus";



		pinctrl@1000000 {

		restart@4ab000 {

			compatible = "qcom,pshold";

			reg = <0x4ab000 0x4>;

		};



		msmgpio: pinctrl@1000000 {

			compatible = "qcom,msm8916-pinctrl";

			reg = <0x1000000 0x300000>;

			interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
@@ -192,5 +197,23 @@ 
				status = "disabled";

			};

		};



		spmi_bus: spmi@200f000 {

			compatible = "qcom,spmi-pmic-arb";

			reg = <0x200f000 0x001000>,

			      <0x2400000 0x400000>,

			      <0x2c00000 0x400000>,

			      <0x3800000 0x200000>,

			      <0x200a000 0x002100>;

			reg-names = "core", "chnls", "obsrvr", "intr", "cnfg";

			interrupt-names = "periph_irq";

			interrupts = <GIC_SPI 190 IRQ_TYPE_NONE>;

			qcom,ee = <0>;

			qcom,channel = <0>;

			#address-cells = <2>;

			#size-cells = <0>;

			interrupt-controller;

			#interrupt-cells = <4>;

		};

	};

};