Qualcomm ARM64 Updates for v4.2

* 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 Comment: GPGTools - https://gpgtools.org
 
 iQIcBAABCgAGBQJVZMeXAAoJEF9hYXeAcXzBPywQAJdlS8HzyPgKwpWDym8rfbT+
 A5rp35wZ7KEsd0RswLpN/l7tV++BuHNKP5s4cHFxsGSy37KMlNwyQhCXayb4O3+c
 vMFerklkdk1+e1PjKytVFy6SR0yw0nKY5HSablo9qFweV2ie9gc1Gb2PNtdCrDe0
 cOSrhz3JTmfAJjlUk5xtHi7P7ivhh7nLMI6ciJPQO2l5g2yKXl12gBG1MCs0nYrp
 FxAXGehBi1jBuJQgTDGUDbpJW7mkiglhn9AdypIJqWyedwiYmVwNwJ9iHX4lGxgq
 ZSTwAwLAmNC3K210K7CJV8zDe5cJ8RutJZ2S+a3iMBBz5GUsfdxJPoZNCor2gB5q
 ++t5Ofy4Cjcq6jYsIAWHggUP3znR1D9308idAuHzyojY2WquHoHDFndyFiuJDk1a
 wg1Dmn5nNRHpoDfKJLaUW2IZnwJj6dxW2rFAr7c4u69hiMEog3rRGkZj9WlmeKcp
 uO8h/FK/RWpwDDiYVEpcnwrDSp7VEm3mN55nay5jwn81yL8nVK57j/1gTfK0ZHRn
 3OvBkaSKQgJ9MnExSgxInSRNfS0mV60iMUUHivgkwx4W31ea/ad953SAEi5ey1D/
 TEyIr5yP/wI/cz7wbwLQKfCiLzZ/ZA3KNG4zwVSJvWm+di0INi3wOYx+/SBVz83j
 D/arTF/EAf9qD6JJfVYR
 =qv0c
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2015-05-29 14:01:52 +02:00
commit 48150514ae
6 changed files with 178 additions and 1 deletions

View File

@ -0,0 +1,30 @@
#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;
};
};
};

View File

@ -0,0 +1,21 @@
#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;
};
};
};

View File

@ -12,6 +12,9 @@
*/
#include "msm8916.dtsi"
#include "pm8916.dtsi"
#include "apq8016-sbc-soc-pins.dtsi"
#include "apq8016-sbc-pmic-pins.dtsi"
/ {
aliases {

View File

@ -12,6 +12,7 @@
*/
#include "msm8916.dtsi"
#include "pm8916.dtsi"
/ {
aliases {

View File

@ -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>;
};
};
};

View File

@ -0,0 +1,99 @@
#include <dt-bindings/iio/qcom,spmi-vadc.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/spmi/spmi.h>
&spmi_bus {
usid0: pm8916@0 {
compatible = "qcom,spmi-pmic";
reg = <0x0 SPMI_USID>;
#address-cells = <1>;
#size-cells = <0>;
rtc@6000 {
compatible = "qcom,pm8941-rtc";
reg = <0x6000 0x6100>;
reg-names = "rtc", "alarm";
interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
};
pwrkey@800 {
compatible = "qcom,pm8941-pwrkey";
reg = <0x800>;
interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;
debounce = <15625>;
bias-pull-up;
};
pm8916_gpios: gpios@c000 {
compatible = "qcom,pm8916-gpio";
reg = <0xc000 0x400>;
gpio-controller;
#gpio-cells = <2>;
interrupts = <0 0xc0 0 IRQ_TYPE_NONE>,
<0 0xc1 0 IRQ_TYPE_NONE>,
<0 0xc2 0 IRQ_TYPE_NONE>,
<0 0xc3 0 IRQ_TYPE_NONE>;
};
pm8916_mpps: mpps@a000 {
compatible = "qcom,pm8916-mpp";
reg = <0xa000 0x400>;
gpio-controller;
#gpio-cells = <2>;
interrupts = <0 0xa0 0 IRQ_TYPE_NONE>,
<0 0xa1 0 IRQ_TYPE_NONE>,
<0 0xa2 0 IRQ_TYPE_NONE>,
<0 0xa3 0 IRQ_TYPE_NONE>;
};
pm8916_temp: temp-alarm@2400 {
compatible = "qcom,spmi-temp-alarm";
reg = <0x2400 0x100>;
interrupts = <0 0x24 0 IRQ_TYPE_EDGE_RISING>;
io-channels = <&pm8916_vadc VADC_DIE_TEMP>;
io-channel-names = "thermal";
#thermal-sensor-cells = <0>;
};
pm8916_vadc: vadc@3100 {
compatible = "qcom,spmi-vadc";
reg = <0x3100 0x100>;
interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
#io-channel-cells = <1>;
usb_in {
reg = <VADC_USBIN>;
qcom,pre-scaling = <1 10>;
};
vph_pwr {
reg = <VADC_VSYS>;
qcom,pre-scaling = <1 3>;
};
die_temp {
reg = <VADC_DIE_TEMP>;
};
ref_625mv {
reg = <VADC_REF_625MV>;
};
ref_1250v {
reg = <VADC_REF_1250MV>;
};
ref_gnd {
reg = <VADC_GND_REF>;
};
ref_vdd {
reg = <VADC_VDD_VADC>;
};
};
};
usid1: pm8916@1 {
compatible = "qcom,spmi-pmic";
reg = <0x1 SPMI_USID>;
#address-cells = <1>;
#size-cells = <0>;
};
};