mirror of
https://github.com/torvalds/linux.git
synced 2026-06-03 20:14:06 +02:00
Merge branch 'arm32-for-6.15' into arm32-for-6.16
The v6.15 PR contained the transition to "qcom,calibration-variant" and was not accepted due to the risk of breaking bisection support. Merge the arm32-for-6.15 tag in order to bring these patches into v6.16.
This commit is contained in:
Bjorn Andersson
commit
267e15588f
|
|
@ -12,6 +12,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \
|
|||
qcom-apq8064-ifc6410.dtb \
|
||||
qcom-apq8064-sony-xperia-lagan-yuga.dtb \
|
||||
qcom-apq8064-asus-nexus7-flo.dtb \
|
||||
qcom-apq8064-lg-nexus4-mako.dtb \
|
||||
qcom-apq8074-dragonboard.dtb \
|
||||
qcom-apq8084-ifc6540.dtb \
|
||||
qcom-apq8084-mtp.dtb \
|
||||
|
|
|
|||
11
arch/arm/boot/dts/qcom/msm8926.dtsi
Normal file
11
arch/arm/boot/dts/qcom/msm8926.dtsi
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
// SPDX-License-Identifier: BSD-3-Clause
|
||||
/*
|
||||
* Copyright (c) 2025, Luca Weiss <luca@lucaweiss.eu>
|
||||
*/
|
||||
|
||||
#include "qcom-msm8226.dtsi"
|
||||
|
||||
&modem {
|
||||
compatible = "qcom,msm8926-mss-pil";
|
||||
/delete-property/ qcom,ext-bhs-reg;
|
||||
};
|
||||
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
/dts-v1/;
|
||||
|
||||
#include "qcom-msm8226.dtsi"
|
||||
#include "qcom-msm8226-samsung-matisse-common.dtsi"
|
||||
|
||||
/ {
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@
|
|||
#include "pm8226.dtsi"
|
||||
|
||||
/delete-node/ &adsp_region;
|
||||
/delete-node/ &mba_region;
|
||||
/delete-node/ &mpss_region;
|
||||
/delete-node/ &smem_region;
|
||||
|
||||
/ {
|
||||
|
|
|
|||
341
arch/arm/boot/dts/qcom/qcom-apq8064-lg-nexus4-mako.dts
Normal file
341
arch/arm/boot/dts/qcom/qcom-apq8064-lg-nexus4-mako.dts
Normal file
|
|
@ -0,0 +1,341 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
#include <dt-bindings/input/input.h>
|
||||
#include <dt-bindings/mfd/qcom-rpm.h>
|
||||
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
|
||||
|
||||
#include "qcom-apq8064-v2.0.dtsi"
|
||||
#include "pm8821.dtsi"
|
||||
#include "pm8921.dtsi"
|
||||
|
||||
/ {
|
||||
model = "LG Nexus 4 (mako)";
|
||||
compatible = "lg,nexus4-mako", "qcom,apq8064";
|
||||
chassis-type = "handset";
|
||||
|
||||
aliases {
|
||||
serial0 = &gsbi7_serial;
|
||||
serial1 = &gsbi6_serial;
|
||||
serial2 = &gsbi4_serial;
|
||||
};
|
||||
|
||||
chosen {
|
||||
stdout-path = "serial2:115200n8";
|
||||
};
|
||||
|
||||
battery_cell: battery-cell {
|
||||
compatible = "simple-battery";
|
||||
constant-charge-current-max-microamp = <900000>;
|
||||
operating-range-celsius = <0 45>;
|
||||
};
|
||||
|
||||
reserved-memory {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
ranges;
|
||||
|
||||
ramoops@88d00000{
|
||||
compatible = "ramoops";
|
||||
reg = <0x88d00000 0x100000>;
|
||||
record-size = <0x20000>;
|
||||
console-size = <0x20000>;
|
||||
ftrace-size = <0x20000>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&gsbi1 {
|
||||
qcom,mode = <GSBI_PROT_I2C>;
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&gsbi1_i2c {
|
||||
clock-frequency = <200000>;
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&gsbi4 {
|
||||
qcom,mode = <GSBI_PROT_I2C_UART>;
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&gsbi4_serial {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pm8821 {
|
||||
interrupts-extended = <&tlmm_pinmux 76 IRQ_TYPE_LEVEL_LOW>;
|
||||
};
|
||||
|
||||
&pm8921 {
|
||||
interrupts-extended = <&tlmm_pinmux 74 IRQ_TYPE_LEVEL_LOW>;
|
||||
};
|
||||
|
||||
&pm8921_keypad {
|
||||
linux,keymap = <
|
||||
MATRIX_KEY(0, 0, KEY_VOLUMEDOWN)
|
||||
MATRIX_KEY(0, 1, KEY_VOLUMEUP)
|
||||
>;
|
||||
|
||||
keypad,num-rows = <1>;
|
||||
keypad,num-columns = <5>;
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&rpm {
|
||||
regulators {
|
||||
compatible = "qcom,rpm-pm8921-regulators";
|
||||
|
||||
vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;
|
||||
vdd_l24-supply = <&pm8921_s1>;
|
||||
vdd_l25-supply = <&pm8921_s1>;
|
||||
vdd_l26-supply = <&pm8921_s7>;
|
||||
vdd_l27-supply = <&pm8921_s7>;
|
||||
vdd_l28-supply = <&pm8921_s7>;
|
||||
vin_lvs1_3_6-supply = <&pm8921_s4>;
|
||||
vin_lvs2-supply = <&pm8921_s1>;
|
||||
vin_lvs4_5_7-supply = <&pm8921_s4>;
|
||||
|
||||
pm8921_l1: l1 {
|
||||
regulator-min-microvolt = <1100000>;
|
||||
regulator-max-microvolt = <1100000>;
|
||||
regulator-always-on;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/* mipi_dsi.1-dsi1_pll_vdda */
|
||||
pm8921_l2: l2 {
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <1200000>;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/* msm_otg-HSUSB_3p3 */
|
||||
pm8921_l3: l3 {
|
||||
regulator-min-microvolt = <3075000>;
|
||||
regulator-max-microvolt = <3500000>;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/* msm_otg-HSUSB_1p8 */
|
||||
pm8921_l4: l4 {
|
||||
regulator-always-on;
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
};
|
||||
|
||||
/* msm_sdcc.1-sdc_vdd */
|
||||
pm8921_l5: l5 {
|
||||
regulator-min-microvolt = <2950000>;
|
||||
regulator-max-microvolt = <2950000>;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/* earjack_debug */
|
||||
pm8921_l6: l6 {
|
||||
regulator-min-microvolt = <3000000>;
|
||||
regulator-max-microvolt = <3000000>;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/* mipi_dsi.1-dsi_vci */
|
||||
pm8921_l8: l8 {
|
||||
regulator-min-microvolt = <2800000>;
|
||||
regulator-max-microvolt = <3000000>;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/* wcnss_wlan.0-iris_vddpa */
|
||||
pm8921_l10: l10 {
|
||||
regulator-min-microvolt = <2900000>;
|
||||
regulator-max-microvolt = <2900000>;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/* mipi_dsi.1-dsi1_avdd */
|
||||
pm8921_l11: l11 {
|
||||
regulator-min-microvolt = <2850000>;
|
||||
regulator-max-microvolt = <2850000>;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/* touch_vdd */
|
||||
pm8921_l15: l15 {
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <2950000>;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/* slimport_dvdd */
|
||||
pm8921_l18: l18 {
|
||||
regulator-min-microvolt = <1100000>;
|
||||
regulator-max-microvolt = <1100000>;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/* touch_io */
|
||||
pm8921_l22: l22 {
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/*
|
||||
* mipi_dsi.1-dsi_vddio
|
||||
* pil_qdsp6v4.1-pll_vdd
|
||||
* pil_qdsp6v4.2-pll_vdd
|
||||
* msm_ehci_host.0-HSUSB_1p8
|
||||
* msm_ehci_host.1-HSUSB_1p8
|
||||
*/
|
||||
pm8921_l23: l23 {
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/*
|
||||
* tabla2x-slim-CDC_VDDA_A_1P2V
|
||||
* tabla2x-slim-VDDD_CDC_D
|
||||
*/
|
||||
pm8921_l24: l24 {
|
||||
regulator-min-microvolt = <750000>;
|
||||
regulator-max-microvolt = <1150000>;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
pm8921_l25: l25 {
|
||||
regulator-min-microvolt = <1250000>;
|
||||
regulator-max-microvolt = <1250000>;
|
||||
regulator-always-on;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
pm8921_l26: l26 {
|
||||
regulator-min-microvolt = <375000>;
|
||||
regulator-max-microvolt = <1050000>;
|
||||
regulator-always-on;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
pm8921_l27: l27 {
|
||||
regulator-min-microvolt = <1100000>;
|
||||
regulator-max-microvolt = <1100000>;
|
||||
};
|
||||
|
||||
pm8921_l28: l28 {
|
||||
regulator-min-microvolt = <1050000>;
|
||||
regulator-max-microvolt = <1050000>;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/* wcnss_wlan.0-iris_vddio */
|
||||
pm8921_lvs1: lvs1 {
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/* wcnss_wlan.0-iris_vdddig */
|
||||
pm8921_lvs2: lvs2 {
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
pm8921_lvs3: lvs3 {
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
pm8921_lvs4: lvs4 {
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
pm8921_lvs5: lvs5 {
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/* mipi_dsi.1-dsi_iovcc */
|
||||
pm8921_lvs6: lvs6 {
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/*
|
||||
* pil_riva-pll_vdd
|
||||
* lvds.0-lvds_vdda
|
||||
* mipi_dsi.1-dsi1_vddio
|
||||
* hdmi_msm.0-hdmi_vdda
|
||||
*/
|
||||
pm8921_lvs7: lvs7 {
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
pm8921_ncp: ncp {
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
qcom,switch-mode-frequency = <1600000>;
|
||||
};
|
||||
|
||||
/* Buck SMPS */
|
||||
pm8921_s1: s1 {
|
||||
regulator-always-on;
|
||||
regulator-min-microvolt = <1225000>;
|
||||
regulator-max-microvolt = <1225000>;
|
||||
qcom,switch-mode-frequency = <3200000>;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
pm8921_s2: s2 {
|
||||
regulator-min-microvolt = <1300000>;
|
||||
regulator-max-microvolt = <1300000>;
|
||||
qcom,switch-mode-frequency = <1600000>;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/* msm otg HSUSB_VDDCX */
|
||||
pm8921_s3: s3 {
|
||||
regulator-min-microvolt = <500000>;
|
||||
regulator-max-microvolt = <1150000>;
|
||||
qcom,switch-mode-frequency = <4800000>;
|
||||
bias-pull-down;
|
||||
};
|
||||
|
||||
/*
|
||||
* msm_sdcc.1-sdc-vdd_io
|
||||
* tabla2x-slim-CDC_VDDA_RX
|
||||
* tabla2x-slim-CDC_VDDA_TX
|
||||
* tabla2x-slim-CDC_VDD_CP
|
||||
* tabla2x-slim-VDDIO_CDC
|
||||
*/
|
||||
pm8921_s4: s4 {
|
||||
regulator-always-on;
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
qcom,switch-mode-frequency = <1600000>;
|
||||
bias-pull-down;
|
||||
qcom,force-mode = <QCOM_RPM_FORCE_MODE_AUTO>;
|
||||
};
|
||||
|
||||
/*
|
||||
* supply vdd_l26, vdd_l27, vdd_l28
|
||||
*/
|
||||
pm8921_s7: s7 {
|
||||
regulator-min-microvolt = <1300000>;
|
||||
regulator-max-microvolt = <1300000>;
|
||||
qcom,switch-mode-frequency = <3200000>;
|
||||
};
|
||||
|
||||
pm8921_s8: s8 {
|
||||
regulator-min-microvolt = <2200000>;
|
||||
regulator-max-microvolt = <2200000>;
|
||||
qcom,switch-mode-frequency = <1600000>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
/* eMMC */
|
||||
&sdcc1 {
|
||||
vmmc-supply = <&pm8921_l5>;
|
||||
vqmmc-supply = <&pm8921_s4>;
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
|
|
@ -149,7 +149,7 @@ &mdss {
|
|||
};
|
||||
|
||||
&pm8941_gpios {
|
||||
msm_keys_default: pm8941-gpio-keys-state {
|
||||
msm_keys_default: pm8941-gpio-keys-state {
|
||||
pins = "gpio5", "gpio23";
|
||||
function = "normal";
|
||||
input-enable;
|
||||
|
|
@ -157,7 +157,7 @@ msm_keys_default: pm8941-gpio-keys-state {
|
|||
bias-pull-up;
|
||||
qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
|
||||
power-source = <PM8941_GPIO_S3>; /* 1.8V */
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&pm8941_lpg {
|
||||
|
|
|
|||
|
|
@ -251,7 +251,7 @@ &wifi1 {
|
|||
status = "okay";
|
||||
nvmem-cell-names = "pre-calibration";
|
||||
nvmem-cells = <&precal_art_5000>;
|
||||
qcom,ath10k-calibration-variant = "ALFA-Network-AP120C-AC";
|
||||
qcom,calibration-variant = "ALFA-Network-AP120C-AC";
|
||||
};
|
||||
|
||||
&usb3_hs_phy {
|
||||
|
|
|
|||
|
|
@ -179,13 +179,13 @@ &mdio {
|
|||
&wifi0 {
|
||||
status = "okay";
|
||||
|
||||
qcom,ath10k-calibration-variant = "8devices-Jalapeno";
|
||||
qcom,calibration-variant = "8devices-Jalapeno";
|
||||
};
|
||||
|
||||
&wifi1 {
|
||||
status = "okay";
|
||||
|
||||
qcom,ath10k-calibration-variant = "8devices-Jalapeno";
|
||||
qcom,calibration-variant = "8devices-Jalapeno";
|
||||
};
|
||||
|
||||
&usb3_ss_phy {
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ nand_pins: nand-state {
|
|||
"gpio64", "gpio65", "gpio66",
|
||||
"gpio67", "gpio68", "gpio69";
|
||||
function = "qpic";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
serial@78af000 {
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ opp-500000000 {
|
|||
opp-716000000 {
|
||||
opp-hz = /bits/ 64 <716000000>;
|
||||
clock-latency-ns = <256000>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
memory {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,11 @@
|
|||
* Copyright (c) 2023, Rayyan Ansari <rayyan@ansari.sh>
|
||||
*/
|
||||
|
||||
#include "qcom-msm8226.dtsi"
|
||||
/*
|
||||
* The .dts should first include qcom-msm8226.dtsi or msm8926.dtsi depending on
|
||||
* the SoC on the given device.
|
||||
*/
|
||||
|
||||
#include "pm8226.dtsi"
|
||||
#include <dt-bindings/input/input.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
/dts-v1/;
|
||||
|
||||
#include "qcom-msm8226.dtsi"
|
||||
#include "qcom-msm8226-microsoft-common.dtsi"
|
||||
|
||||
/ {
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
/dts-v1/;
|
||||
|
||||
#include "qcom-msm8226.dtsi"
|
||||
#include "qcom-msm8226-microsoft-common.dtsi"
|
||||
|
||||
/ {
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
/dts-v1/;
|
||||
|
||||
#include "qcom-msm8226.dtsi"
|
||||
#include "qcom-msm8226-microsoft-common.dtsi"
|
||||
|
||||
/* This device has no magnetometer */
|
||||
|
|
|
|||
|
|
@ -3,11 +3,17 @@
|
|||
* Copyright (c) 2022, Matti Lehtimäki <matti.lehtimaki@gmail.com>
|
||||
*/
|
||||
|
||||
/*
|
||||
* The .dts should first include qcom-msm8226.dtsi or msm8926.dtsi depending on
|
||||
* the SoC on the given device.
|
||||
*/
|
||||
|
||||
#include <dt-bindings/input/input.h>
|
||||
#include "qcom-msm8226.dtsi"
|
||||
#include "pm8226.dtsi"
|
||||
|
||||
/delete-node/ &adsp_region;
|
||||
/delete-node/ &mba_region;
|
||||
/delete-node/ &mpss_region;
|
||||
/delete-node/ &smem_region;
|
||||
|
||||
/ {
|
||||
|
|
@ -145,12 +151,12 @@ framebuffer@3200000 {
|
|||
no-map;
|
||||
};
|
||||
|
||||
mpss@8400000 {
|
||||
mpss_region: mpss@8400000 {
|
||||
reg = <0x08400000 0x1f00000>;
|
||||
no-map;
|
||||
};
|
||||
|
||||
mba@a300000 {
|
||||
mba_region: mba@a300000 {
|
||||
reg = <0x0a300000 0x100000>;
|
||||
no-map;
|
||||
};
|
||||
|
|
@ -223,6 +229,13 @@ &blsp1_uart3 {
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&modem {
|
||||
mx-supply = <&pm8226_l3>;
|
||||
pll-supply = <&pm8226_l8>;
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&rpm_requests {
|
||||
regulators {
|
||||
compatible = "qcom,rpm-pm8226-regulators";
|
||||
|
|
|
|||
|
|
@ -214,6 +214,18 @@ smem_region: smem@3000000 {
|
|||
no-map;
|
||||
};
|
||||
|
||||
mpss_region: mpss@8000000 {
|
||||
reg = <0x08000000 0x5100000>;
|
||||
no-map;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
mba_region: mba@d100000 {
|
||||
reg = <0x0d100000 0x100000>;
|
||||
no-map;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
adsp_region: adsp@dc00000 {
|
||||
reg = <0x0dc00000 0x1900000>;
|
||||
no-map;
|
||||
|
|
@ -254,6 +266,65 @@ adsp_smp2p_in: slave-kernel {
|
|||
};
|
||||
};
|
||||
|
||||
smp2p-modem {
|
||||
compatible = "qcom,smp2p";
|
||||
qcom,smem = <435>, <428>;
|
||||
|
||||
interrupt-parent = <&intc>;
|
||||
interrupts = <GIC_SPI 27 IRQ_TYPE_EDGE_RISING>;
|
||||
|
||||
mboxes = <&apcs 14>;
|
||||
|
||||
qcom,local-pid = <0>;
|
||||
qcom,remote-pid = <1>;
|
||||
|
||||
modem_smp2p_out: master-kernel {
|
||||
qcom,entry-name = "master-kernel";
|
||||
#qcom,smem-state-cells = <1>;
|
||||
};
|
||||
|
||||
modem_smp2p_in: slave-kernel {
|
||||
qcom,entry-name = "slave-kernel";
|
||||
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
};
|
||||
};
|
||||
|
||||
smsm {
|
||||
compatible = "qcom,smsm";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
mboxes = <0>, <&apcs 13>, <&apcs 9>, <&apcs 19>;
|
||||
|
||||
apps_smsm: apps@0 {
|
||||
reg = <0>;
|
||||
#qcom,smem-state-cells = <1>;
|
||||
};
|
||||
|
||||
modem_smsm: modem@1 {
|
||||
reg = <1>;
|
||||
interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
};
|
||||
|
||||
adsp_smsm: adsp@2 {
|
||||
reg = <2>;
|
||||
interrupts = <GIC_SPI 157 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
};
|
||||
|
||||
wcnss_smsm: wcnss@7 {
|
||||
reg = <7>;
|
||||
interrupts = <GIC_SPI 144 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
};
|
||||
};
|
||||
|
||||
soc: soc {
|
||||
compatible = "simple-bus";
|
||||
#address-cells = <1>;
|
||||
|
|
@ -846,12 +917,96 @@ spmi_bus: spmi@fc4cf000 {
|
|||
#interrupt-cells = <4>;
|
||||
};
|
||||
|
||||
bam_dmux_dma: dma-controller@fc834000 {
|
||||
compatible = "qcom,bam-v1.4.0";
|
||||
reg = <0xfc834000 0x7000>;
|
||||
interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
|
||||
#dma-cells = <1>;
|
||||
qcom,ee = <0>;
|
||||
|
||||
num-channels = <6>;
|
||||
qcom,num-ees = <1>;
|
||||
qcom,powered-remotely;
|
||||
};
|
||||
|
||||
modem: remoteproc@fc880000 {
|
||||
compatible = "qcom,msm8226-mss-pil";
|
||||
reg = <0xfc880000 0x4040>,
|
||||
<0xfc820000 0x10000>;
|
||||
reg-names = "qdsp6",
|
||||
"rmb";
|
||||
|
||||
interrupts-extended = <&intc GIC_SPI 24 IRQ_TYPE_EDGE_RISING>,
|
||||
<&modem_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
|
||||
<&modem_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
|
||||
<&modem_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
|
||||
<&modem_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupt-names = "wdog",
|
||||
"fatal",
|
||||
"ready",
|
||||
"handover",
|
||||
"stop-ack";
|
||||
|
||||
clocks = <&gcc GCC_MSS_Q6_BIMC_AXI_CLK>,
|
||||
<&gcc GCC_MSS_CFG_AHB_CLK>,
|
||||
<&gcc GCC_BOOT_ROM_AHB_CLK>,
|
||||
<&rpmcc RPM_SMD_XO_CLK_SRC>;
|
||||
clock-names = "iface",
|
||||
"bus",
|
||||
"mem",
|
||||
"xo";
|
||||
|
||||
resets = <&gcc GCC_MSS_RESTART>;
|
||||
reset-names = "mss_restart";
|
||||
|
||||
power-domains = <&rpmpd MSM8226_VDDCX>;
|
||||
power-domain-names = "cx";
|
||||
|
||||
qcom,ext-bhs-reg = <&tcsr_regs_1 0x194>;
|
||||
qcom,halt-regs = <&tcsr_regs_1 0x180 0x200 0x280>;
|
||||
|
||||
qcom,smem-states = <&modem_smp2p_out 0>;
|
||||
qcom,smem-state-names = "stop";
|
||||
|
||||
memory-region = <&mba_region>, <&mpss_region>;
|
||||
|
||||
status = "disabled";
|
||||
|
||||
bam_dmux: bam-dmux {
|
||||
compatible = "qcom,bam-dmux";
|
||||
|
||||
interrupt-parent = <&modem_smsm>;
|
||||
interrupts = <1 IRQ_TYPE_EDGE_BOTH>, <11 IRQ_TYPE_EDGE_BOTH>;
|
||||
interrupt-names = "pc", "pc-ack";
|
||||
|
||||
qcom,smem-states = <&apps_smsm 1>, <&apps_smsm 11>;
|
||||
qcom,smem-state-names = "pc", "pc-ack";
|
||||
|
||||
dmas = <&bam_dmux_dma 4>, <&bam_dmux_dma 5>;
|
||||
dma-names = "tx", "rx";
|
||||
};
|
||||
|
||||
smd-edge {
|
||||
interrupts = <GIC_SPI 25 IRQ_TYPE_EDGE_RISING>;
|
||||
|
||||
mboxes = <&apcs 12>;
|
||||
qcom,smd-edge = <0>;
|
||||
|
||||
label = "modem";
|
||||
};
|
||||
};
|
||||
|
||||
tcsr_mutex: hwlock@fd484000 {
|
||||
compatible = "qcom,msm8226-tcsr-mutex", "qcom,tcsr-mutex";
|
||||
reg = <0xfd484000 0x1000>;
|
||||
#hwlock-cells = <1>;
|
||||
};
|
||||
|
||||
tcsr_regs_1: syscon@fd485000 {
|
||||
compatible = "qcom,tcsr-msm8226", "syscon";
|
||||
reg = <0xfd485000 0x1000>;
|
||||
};
|
||||
|
||||
tlmm: pinctrl@fd510000 {
|
||||
compatible = "qcom,msm8226-pinctrl";
|
||||
reg = <0xfd510000 0x4000>;
|
||||
|
|
|
|||
|
|
@ -5,10 +5,12 @@
|
|||
|
||||
/dts-v1/;
|
||||
|
||||
#include "qcom-msm8226.dtsi"
|
||||
#include "msm8926.dtsi"
|
||||
#include "pm8226.dtsi"
|
||||
|
||||
/delete-node/ &adsp_region;
|
||||
/delete-node/ &mba_region;
|
||||
/delete-node/ &mpss_region;
|
||||
/delete-node/ &smem_region;
|
||||
|
||||
/ {
|
||||
|
|
@ -193,6 +195,16 @@ &blsp1_i2c6 {
|
|||
/* TPS61310 Flash/Torch @ 33 */
|
||||
};
|
||||
|
||||
&modem {
|
||||
mx-supply = <&pm8226_l3>;
|
||||
pll-supply = <&pm8226_l8>;
|
||||
mss-supply = <&pm8226_s5>;
|
||||
|
||||
firmware-name = "qcom/msm8926/memul/mba.b00", "qcom/msm8926/memul/modem.mdt";
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pm8226_vib {
|
||||
status = "okay";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
/dts-v1/;
|
||||
|
||||
#include "msm8926.dtsi"
|
||||
#include "qcom-msm8226-microsoft-common.dtsi"
|
||||
|
||||
/* This device has touchscreen on i2c3 instead */
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
/dts-v1/;
|
||||
|
||||
#include "msm8926.dtsi"
|
||||
#include "qcom-msm8226-microsoft-common.dtsi"
|
||||
|
||||
/* This device has touchscreen on i2c1 instead */
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
/dts-v1/;
|
||||
|
||||
#include "qcom-msm8226.dtsi"
|
||||
#include "msm8926.dtsi"
|
||||
#include "pm8226.dtsi"
|
||||
|
||||
/delete-node/ &smem_region;
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
/dts-v1/;
|
||||
|
||||
#include "msm8926.dtsi"
|
||||
#include "qcom-msm8226-samsung-matisse-common.dtsi"
|
||||
|
||||
/ {
|
||||
|
|
@ -27,6 +28,10 @@ reg_tsp_3p3v: regulator-tsp-3p3v {
|
|||
};
|
||||
};
|
||||
|
||||
&modem {
|
||||
mss-supply = <&pm8226_s5>;
|
||||
};
|
||||
|
||||
&tlmm {
|
||||
tsp_en1_default_state: tsp-en1-default-state {
|
||||
pins = "gpio32";
|
||||
|
|
|
|||
|
|
@ -52,6 +52,48 @@ memory@80000000 {
|
|||
reg = <0x80000000 0>;
|
||||
};
|
||||
|
||||
thermal-zones {
|
||||
cpu0-thermal {
|
||||
polling-delay-passive = <250>;
|
||||
polling-delay = <1000>;
|
||||
thermal-sensors = <&tsens 0>;
|
||||
|
||||
trips {
|
||||
cpu_alert0: trip0 {
|
||||
temperature = <60000>;
|
||||
hysteresis = <10000>;
|
||||
type = "passive";
|
||||
};
|
||||
|
||||
cpu_crit0: trip1 {
|
||||
temperature = <95000>;
|
||||
hysteresis = <10000>;
|
||||
type = "critical";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
cpu1-thermal {
|
||||
polling-delay-passive = <250>;
|
||||
polling-delay = <1000>;
|
||||
thermal-sensors = <&tsens 1>;
|
||||
|
||||
trips {
|
||||
cpu_alert1: trip0 {
|
||||
temperature = <60000>;
|
||||
hysteresis = <10000>;
|
||||
type = "passive";
|
||||
};
|
||||
|
||||
cpu_crit1: trip1 {
|
||||
temperature = <95000>;
|
||||
hysteresis = <10000>;
|
||||
type = "critical";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
cpu-pmu {
|
||||
compatible = "qcom,krait-pmu";
|
||||
interrupts = <GIC_PPI 10 0x304>;
|
||||
|
|
@ -115,6 +157,21 @@ timer@200a000 {
|
|||
cpu-offset = <0x80000>;
|
||||
};
|
||||
|
||||
qfprom: efuse@700000 {
|
||||
compatible = "qcom,msm8960-qfprom", "qcom,qfprom";
|
||||
reg = <0x00700000 0x1000>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
tsens_calib: calib@404 {
|
||||
reg = <0x404 0x10>;
|
||||
};
|
||||
|
||||
tsens_backup: backup-calib@414 {
|
||||
reg = <0x414 0x10>;
|
||||
};
|
||||
};
|
||||
|
||||
msmgpio: pinctrl@800000 {
|
||||
compatible = "qcom,msm8960-pinctrl";
|
||||
gpio-controller;
|
||||
|
|
@ -127,7 +184,7 @@ msmgpio: pinctrl@800000 {
|
|||
};
|
||||
|
||||
gcc: clock-controller@900000 {
|
||||
compatible = "qcom,gcc-msm8960";
|
||||
compatible = "qcom,gcc-msm8960", "syscon";
|
||||
#clock-cells = <1>;
|
||||
#reset-cells = <1>;
|
||||
reg = <0x900000 0x4000>;
|
||||
|
|
@ -135,6 +192,18 @@ gcc: clock-controller@900000 {
|
|||
<&pxo_board>,
|
||||
<&lcc PLL4>;
|
||||
clock-names = "cxo", "pxo", "pll4";
|
||||
|
||||
tsens: thermal-sensor {
|
||||
compatible = "qcom,msm8960-tsens";
|
||||
|
||||
nvmem-cells = <&tsens_calib>, <&tsens_backup>;
|
||||
nvmem-cell-names = "calib", "calib_backup";
|
||||
interrupts = <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "uplow";
|
||||
|
||||
#qcom,sensors = <5>;
|
||||
#thermal-sensor-cells = <1>;
|
||||
};
|
||||
};
|
||||
|
||||
lcc: clock-controller@28000000 {
|
||||
|
|
@ -279,7 +348,7 @@ sdcc3: mmc@12180000 {
|
|||
compatible = "arm,pl18x", "arm,primecell";
|
||||
arm,primecell-periphid = <0x00051180>;
|
||||
status = "disabled";
|
||||
reg = <0x12180000 0x8000>;
|
||||
reg = <0x12180000 0x2000>;
|
||||
interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&gcc SDC3_CLK>, <&gcc SDC3_H_CLK>;
|
||||
clock-names = "mclk", "apb_pclk";
|
||||
|
|
@ -289,13 +358,25 @@ sdcc3: mmc@12180000 {
|
|||
max-frequency = <192000000>;
|
||||
no-1-8-v;
|
||||
vmmc-supply = <&vsdcc_fixed>;
|
||||
dmas = <&sdcc3bam 2>, <&sdcc3bam 1>;
|
||||
dma-names = "tx", "rx";
|
||||
};
|
||||
|
||||
sdcc3bam: dma-controller@12182000 {
|
||||
compatible = "qcom,bam-v1.3.0";
|
||||
reg = <0x12182000 0x4000>;
|
||||
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&gcc SDC3_H_CLK>;
|
||||
clock-names = "bam_clk";
|
||||
#dma-cells = <1>;
|
||||
qcom,ee = <0>;
|
||||
};
|
||||
|
||||
sdcc1: mmc@12400000 {
|
||||
status = "disabled";
|
||||
compatible = "arm,pl18x", "arm,primecell";
|
||||
arm,primecell-periphid = <0x00051180>;
|
||||
reg = <0x12400000 0x8000>;
|
||||
reg = <0x12400000 0x2000>;
|
||||
interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&gcc SDC1_CLK>, <&gcc SDC1_H_CLK>;
|
||||
clock-names = "mclk", "apb_pclk";
|
||||
|
|
@ -305,6 +386,18 @@ sdcc1: mmc@12400000 {
|
|||
cap-sd-highspeed;
|
||||
cap-mmc-highspeed;
|
||||
vmmc-supply = <&vsdcc_fixed>;
|
||||
dmas = <&sdcc1bam 2>, <&sdcc1bam 1>;
|
||||
dma-names = "tx", "rx";
|
||||
};
|
||||
|
||||
sdcc1bam: dma-controller@12402000 {
|
||||
compatible = "qcom,bam-v1.3.0";
|
||||
reg = <0x12402000 0x4000>;
|
||||
interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&gcc SDC1_H_CLK>;
|
||||
clock-names = "bam_clk";
|
||||
#dma-cells = <1>;
|
||||
qcom,ee = <0>;
|
||||
};
|
||||
|
||||
tcsr: syscon@1a400000 {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user