Skip to content

L
linux
Commit 9f1b26b4 authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files
Options

Merge tag 'qcom-dts-for-6.7-2' into arm32-for-6.8 

Below pull request for ARM32 DeviceTree updates for v6.7 was posted to
late to make it into v6.7, merge it into the branch for v6.8.

More Qualcomm Arm32 DeviceTree updates for v6.7

This introduces new DeviceTree source for Microsoft Lumia 640, Microsoft
Lumia 640 XL, Nokia Lumia 735, and Nokia Lumia 830, built on MSM8226 and
MSM8926.

A few stylistic issues are corrected on MSM8974.
parents 97817a82 8677233e
Hide whitespace changes
Inline Side-by-side
Showing with 551 additions and 42 deletions
arch/arm/boot/dts/qcom/Makefile
View file @ 9f1b26b4
......@@ -23,6 +23,9 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-ipq4019-ap.dk07.1-c2.dtb \
qcom-ipq8064-ap148.dtb \
qcom-ipq8064-rb3011.dtb \
qcom-msm8226-microsoft-dempsey.dtb \
qcom-msm8226-microsoft-makepeace.dtb \
qcom-msm8226-microsoft-moneypenny.dtb \
qcom-msm8226-samsung-s3ve3g.dtb \
qcom-msm8660-surf.dtb \
qcom-msm8916-samsung-e5.dtb \
......@@ -30,6 +33,8 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-msm8916-samsung-grandmax.dtb \
qcom-msm8916-samsung-serranove.dtb \
qcom-msm8926-htc-memul.dtb \
qcom-msm8926-microsoft-superman-lte.dtb \
qcom-msm8926-microsoft-tesla.dtb \
qcom-msm8960-cdp.dtb \
qcom-msm8960-samsung-expressatt.dtb \
qcom-msm8974-lge-nexus5-hammerhead.dtb \
......
arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-common.dtsi 0 → 100644
View file @ 9f1b26b4
// SPDX-License-Identifier: BSD-3-Clause
/*
* Common Board Device Tree for Microsoft MSM8x26-based Lumias
*
* Copyright (c) 2023, Jack Matthews <jm5112356@gmail.com>
* Copyright (c) 2023, Ivaylo Ivanov <ivo.ivanov.ivanov1@gmail.com>
* Copyright (c) 2023, Dominik Kobinski <dominikkobinski314@gmail.com>
* Copyright (c) 2023, Rayyan Ansari <rayyan@ansari.sh>
*/
#include "qcom-msm8226.dtsi"
#include "pm8226.dtsi"
#include <dt-bindings/input/input.h>
/*
* Delete all generic (msm8226.dtsi) reserved
* memory mappings which are different on these devices.
*/
/delete-node/ &smem_region;
/ {
aliases {
mmc0 = &sdhc_1; /* eMMC */
mmc1 = &sdhc_2; /* microSD */
display0 = &framebuffer;
};
chosen {
#address-cells = <1>;
#size-cells = <1>;
ranges;
stdout-path = "display0";
framebuffer: framebuffer@3200000 {
compatible = "simple-framebuffer";
reg = <0x3200000 0x800000>;
format = "a8r8g8b8";
width = <720>;
height = <1280>;
stride = <(720 * 4)>;
clocks = <&mmcc MDSS_AHB_CLK>,
<&mmcc MDSS_AXI_CLK>,
<&mmcc MDSS_BYTE0_CLK>,
<&mmcc MDSS_MDP_CLK>,
<&mmcc MDSS_PCLK0_CLK>,
<&mmcc MDSS_VSYNC_CLK>;
power-domains = <&mmcc MDSS_GDSC>;
};
};
gpio_keys: gpio-keys {
compatible = "gpio-keys";
pinctrl-0 = <&gpio_keys_default>;
pinctrl-names = "default";
label = "GPIO Buttons";
key-volume-up {
label = "Volume Up";
gpios = <&tlmm 106 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
};
/*
* This device being a WP platform has a different
* memory layout than other Android based devices.
* This smem memory region is directly copied from
* the original UEFI firmware.
*/
reserved-memory {
display_reserved: framebuffer@3200000 {
reg = <0x03200000 0x800000>;
no-map;
};
smem_region: smem@fa00000 {
reg = <0x0fa00000 0x100000>;
no-map;
};
};
};
&blsp1_i2c5 {
status = "okay";
touchscreen: touchscreen@4b {
compatible = "syna,rmi4-i2c";
reg = <0x4b>;
interrupts-extended = <&tlmm 17 IRQ_TYPE_EDGE_FALLING>;
vdd-supply = <&pm8226_l15>;
vio-supply = <&pm8226_l6>;
pinctrl-0 = <&touchscreen_default>;
pinctrl-names = "default";
#address-cells = <1>;
#size-cells = <0>;
rmi4-f01@1 {
reg = <0x01>;
syna,nosleep-mode = <1>;
};
rmi4-f11@11 {
reg = <0x11>;
syna,sensor-type = <1>;
};
};
};
&blsp1_uart3 {
status = "okay";
};
&pm8226_resin {
linux,code = <KEY_VOLUMEDOWN>;
status = "okay";
};
&pm8226_vib {
status = "okay";
};
&rpm_requests {
regulators {
compatible = "qcom,rpm-pm8226-regulators";
/* These values were taken from the original firmware DSDT */
pm8226_s1: s1 {
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
};
pm8226_s3: s3 {
regulator-min-microvolt = <1300000>;
regulator-max-microvolt = <1300000>;
};
pm8226_s4: s4 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2100000>;
};
pm8226_s5: s5 {
regulator-min-microvolt = <1150000>;
regulator-max-microvolt = <1150000>;
};
pm8226_l3: l3 {
regulator-min-microvolt = <750000>;
regulator-max-microvolt = <1150000>;
};
pm8226_l4: l4 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
pm8226_l5: l5 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
pm8226_l6: l6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
pm8226_l7: l7 {
regulator-min-microvolt = <1850000>;
regulator-max-microvolt = <1850000>;
};
pm8226_l8: l8 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};
pm8226_l9: l9 {
regulator-min-microvolt = <2050000>;
regulator-max-microvolt = <2050000>;
};
pm8226_l10: l10 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
pm8226_l12: l12 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
pm8226_l14: l14 {
regulator-min-microvolt = <2750000>;
regulator-max-microvolt = <2750000>;
};
pm8226_l15: l15 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
pm8226_l16: l16 {
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
};
pm8226_l17: l17 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
regulator-system-load = <200000>;
regulator-allow-set-load;
};
pm8226_l18: l18 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
regulator-system-load = <200000>;
regulator-allow-set-load;
};
pm8226_l19: l19 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
pm8226_l20: l20 {
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
};
pm8226_l21: l21 {
regulator-min-microvolt = <1850000>;
regulator-max-microvolt = <2950000>;
};
pm8226_l22: l22 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
pm8226_l23: l23 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
pm8226_l24: l24 {
regulator-min-microvolt = <1300000>;
regulator-max-microvolt = <1300000>;
};
pm8226_l25: l25 {
regulator-min-microvolt = <1775000>;
regulator-max-microvolt = <2075000>;
};
pm8226_l27: l27 {
regulator-min-microvolt = <2050000>;
regulator-max-microvolt = <2050000>;
};
pm8226_l28: l28 {
regulator-min-microvolt = <2000000>;
regulator-max-microvolt = <3000000>;
};
};
};
&sdhc_1 {
vmmc-supply = <&pm8226_l17>;
vqmmc-supply = <&pm8226_l6>;
status = "okay";
};
&sdhc_2 {
vmmc-supply = <&pm8226_l18>;
vqmmc-supply = <&pm8226_l21>;
status = "okay";
};
&usb {
extcon = <&smbb>;
dr_mode = "peripheral";
status = "okay";
};
&usb_hs_phy {
extcon = <&smbb>;
v1p8-supply = <&pm8226_l10>;
v3p3-supply = <&pm8226_l20>;
};
&tlmm {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio106", "gpio107", "gpio108";
function = "gpio";
drive-strength = <2>;
bias-pull-up;
};
touchscreen_default: touchscreen-default-state {
irq-pins {
pins = "gpio17";
function = "gpio";
drive-strength = <8>;
bias-pull-up;
};
reset-pins {
pins = "gpio16";
function = "gpio";
drive-strength = <8>;
bias-disable;
output-high;
};
};
};
arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-dempsey.dts 0 → 100644
View file @ 9f1b26b4
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2023, Jack Matthews <jm5112356@gmail.com>
* Copyright (c) 2023, Ivaylo Ivanov <ivo.ivanov.ivanov1@gmail.com>
* Copyright (c) 2023, Dominik Kobinski <dominikkobinski314@gmail.com>
* Copyright (c) 2023, Rayyan Ansari <rayyan@ansari.sh>
*/
/dts-v1/;
#include "qcom-msm8226-microsoft-common.dtsi"
/ {
model = "Microsoft Lumia 640";
compatible = "microsoft,dempsey", "qcom,msm8226";
chassis-type = "handset";
};
arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-makepeace.dts 0 → 100644
View file @ 9f1b26b4
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2023, Jack Matthews <jm5112356@gmail.com>
* Copyright (c) 2023, Ivaylo Ivanov <ivo.ivanov.ivanov1@gmail.com>
* Copyright (c) 2023, Dominik Kobinski <dominikkobinski314@gmail.com>
* Copyright (c) 2023, Rayyan Ansari <rayyan@ansari.sh>
*/
/dts-v1/;
#include "qcom-msm8226-microsoft-common.dtsi"
/ {
model = "Microsoft Lumia 640 XL";
compatible = "microsoft,makepeace", "qcom,msm8226";
chassis-type = "handset";
};
arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-moneypenny.dts 0 → 100644
View file @ 9f1b26b4
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2023, Jack Matthews <jm5112356@gmail.com>
* Copyright (c) 2023, Ivaylo Ivanov <ivo.ivanov.ivanov1@gmail.com>
* Copyright (c) 2023, Dominik Kobinski <dominikkobinski314@gmail.com>
* Copyright (c) 2023, Rayyan Ansari <rayyan@ansari.sh>
*/
/dts-v1/;
#include "qcom-msm8226-microsoft-common.dtsi"
/ {
model = "Nokia Lumia 630";
compatible = "microsoft,moneypenny", "qcom,msm8226";
chassis-type = "handset";
};
&framebuffer {
width = <480>;
height = <854>;
stride = <(480 * 4)>;
};
arch/arm/boot/dts/qcom/qcom-msm8226.dtsi
View file @ 9f1b26b4
......@@ -442,8 +442,8 @@ mmcc: clock-controller@fd8c0000 {
<&gcc GPLL0_VOTE>,
<&gcc GPLL1_VOTE>,
<&rpmcc RPM_SMD_GFX3D_CLK_SRC>,
<0>,
<0>;
<&mdss_dsi0_phy 1>,
<&mdss_dsi0_phy 0>;
clock-names = "xo",
"mmss_gpll0_vote",
"gpll0_vote",
......
arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-superman-lte.dts 0 → 100644
View file @ 9f1b26b4
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2023, Jack Matthews <jm5112356@gmail.com>
* Copyright (c) 2023, Ivaylo Ivanov <ivo.ivanov.ivanov1@gmail.com>
* Copyright (c) 2023, Dominik Kobinski <dominikkobinski314@gmail.com>
* Copyright (c) 2023, Rayyan Ansari <rayyan@ansari.sh>
*/
/dts-v1/;
#include "qcom-msm8226-microsoft-common.dtsi"
/* This device has touchscreen on i2c3 instead */
/delete-node/ &touchscreen;
/ {
model = "Nokia Lumia 735";
compatible = "microsoft,superman-lte", "qcom,msm8926", "qcom,msm8226";
chassis-type = "handset";
};
&blsp1_i2c3 {
status = "okay";
touchscreen: touchscreen@4b {
compatible = "syna,rmi4-i2c";
reg = <0x4b>;
interrupts-extended = <&tlmm 17 IRQ_TYPE_EDGE_FALLING>;
vdd-supply = <&pm8226_l15>;
vio-supply = <&pm8226_l6>;
pinctrl-0 = <&touchscreen_default>;
pinctrl-names = "default";
#address-cells = <1>;
#size-cells = <0>;
rmi4-f01@1 {
reg = <0x01>;
syna,nosleep-mode = <1>;
};
rmi4-f11@11 {
reg = <0x11>;
syna,sensor-type = <1>;
};
};
};
&blsp1_i2c5 {
status = "disabled";
};
arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-tesla.dts 0 → 100644
View file @ 9f1b26b4
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2023, Jack Matthews <jm5112356@gmail.com>
* Copyright (c) 2023, Ivaylo Ivanov <ivo.ivanov.ivanov1@gmail.com>
* Copyright (c) 2023, Dominik Kobinski <dominikkobinski314@gmail.com>
* Copyright (c) 2023, Rayyan Ansari <rayyan@ansari.sh>
*/
/dts-v1/;
#include "qcom-msm8226-microsoft-common.dtsi"
/* This device has touchscreen on i2c1 instead */
/delete-node/ &touchscreen;
/ {
model = "Nokia Lumia 830";
compatible = "microsoft,tesla", "qcom,msm8926", "qcom,msm8226";
chassis-type = "handset";
};
&blsp1_i2c1 {
status = "okay";
touchscreen: touchscreen@4b {
compatible = "syna,rmi4-i2c";
reg = <0x4b>;
interrupts-extended = <&tlmm 17 IRQ_TYPE_EDGE_FALLING>;
vdd-supply = <&pm8226_l15>;
vio-supply = <&pm8226_l6>;
pinctrl-0 = <&touchscreen_default>;
pinctrl-names = "default";
#address-cells = <1>;
#size-cells = <0>;
rmi4-f01@1 {
reg = <0x01>;
syna,nosleep-mode = <1>;
};
rmi4-f12@12 {
reg = <0x12>;
syna,sensor-type = <1>;
};
};
};
&blsp1_i2c5 {
status = "disabled";
};
&gpio_keys {
key-camera-snapshot {
label = "Camera Snapshot";
gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_CAMERA>;
};
key-camera-focus {
label = "Camera Focus";
gpios = <&tlmm 108 GPIO_ACTIVE_LOW>;
linux,code = <KEY_CAMERA_FOCUS>;
};
};
arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
View file @ 9f1b26b4
......@@ -346,6 +346,12 @@ apcs: syscon@f9011000 {
reg = <0xf9011000 0x1000>;
};
saw_l2: power-controller@f9012000 {
compatible = "qcom,saw2";
reg = <0xf9012000 0x1000>;
regulator;
};
watchdog@f9017000 {
compatible = "qcom,apss-wdt-msm8974", "qcom,kpss-wdt";
reg = <0xf9017000 0x1000>;
......@@ -413,52 +419,46 @@ frame@f9028000 {
};
};
saw0: power-controller@f9089000 {
compatible = "qcom,msm8974-saw2-v2.1-cpu", "qcom,saw2";
reg = <0xf9089000 0x1000>, <0xf9009000 0x1000>;
};
saw1: power-controller@f9099000 {
compatible = "qcom,msm8974-saw2-v2.1-cpu", "qcom,saw2";
reg = <0xf9099000 0x1000>, <0xf9009000 0x1000>;
};
saw2: power-controller@f90a9000 {
compatible = "qcom,msm8974-saw2-v2.1-cpu", "qcom,saw2";
reg = <0xf90a9000 0x1000>, <0xf9009000 0x1000>;
};
saw3: power-controller@f90b9000 {
compatible = "qcom,msm8974-saw2-v2.1-cpu", "qcom,saw2";
reg = <0xf90b9000 0x1000>, <0xf9009000 0x1000>;
};
saw_l2: power-controller@f9012000 {
compatible = "qcom,saw2";
reg = <0xf9012000 0x1000>;
regulator;
};
acc0: power-manager@f9088000 {
compatible = "qcom,kpss-acc-v2";
reg = <0xf9088000 0x1000>, <0xf9008000 0x1000>;
};
saw0: power-controller@f9089000 {
compatible = "qcom,msm8974-saw2-v2.1-cpu", "qcom,saw2";
reg = <0xf9089000 0x1000>, <0xf9009000 0x1000>;
};
acc1: power-manager@f9098000 {
compatible = "qcom,kpss-acc-v2";
reg = <0xf9098000 0x1000>, <0xf9008000 0x1000>;
};
saw1: power-controller@f9099000 {
compatible = "qcom,msm8974-saw2-v2.1-cpu", "qcom,saw2";
reg = <0xf9099000 0x1000>, <0xf9009000 0x1000>;
};
acc2: power-manager@f90a8000 {
compatible = "qcom,kpss-acc-v2";
reg = <0xf90a8000 0x1000>, <0xf9008000 0x1000>;
};
saw2: power-controller@f90a9000 {
compatible = "qcom,msm8974-saw2-v2.1-cpu", "qcom,saw2";
reg = <0xf90a9000 0x1000>, <0xf9009000 0x1000>;
};
acc3: power-manager@f90b8000 {
compatible = "qcom,kpss-acc-v2";
reg = <0xf90b8000 0x1000>, <0xf9008000 0x1000>;
};
saw3: power-controller@f90b9000 {
compatible = "qcom,msm8974-saw2-v2.1-cpu", "qcom,saw2";
reg = <0xf90b9000 0x1000>, <0xf9009000 0x1000>;
};
sdhc_1: mmc@f9824900 {
compatible = "qcom,msm8974-sdhci", "qcom,sdhci-msm-v4";
reg = <0xf9824900 0x11c>, <0xf9824000 0x800>;
......@@ -1071,6 +1071,15 @@ kpss_out: endpoint {
};
};
bimc: interconnect@fc380000 {
reg = <0xfc380000 0x6a000>;
compatible = "qcom,msm8974-bimc";
#interconnect-cells = <1>;
clock-names = "bus", "bus_a";
clocks = <&rpmcc RPM_SMD_BIMC_CLK>,
<&rpmcc RPM_SMD_BIMC_A_CLK>;
};
gcc: clock-controller@fc400000 {
compatible = "qcom,gcc-msm8974";
#clock-cells = <1>;
......@@ -1109,22 +1118,13 @@ pronto_master_stats: sram@1f50 {
};
};
bimc: interconnect@fc380000 {
reg = <0xfc380000 0x6a000>;
compatible = "qcom,msm8974-bimc";
#interconnect-cells = <1>;
clock-names = "bus", "bus_a";
clocks = <&rpmcc RPM_SMD_BIMC_CLK>,
<&rpmcc RPM_SMD_BIMC_A_CLK>;
};
snoc: interconnect@fc460000 {
reg = <0xfc460000 0x4000>;
compatible = "qcom,msm8974-snoc";
#interconnect-cells = <1>;
clock-names = "bus", "bus_a";
clocks = <&rpmcc RPM_SMD_SNOC_CLK>,
<&rpmcc RPM_SMD_SNOC_A_CLK>;
<&rpmcc RPM_SMD_SNOC_A_CLK>;
};
pnoc: interconnect@fc468000 {
......@@ -1133,7 +1133,7 @@ pnoc: interconnect@fc468000 {
#interconnect-cells = <1>;
clock-names = "bus", "bus_a";
clocks = <&rpmcc RPM_SMD_PNOC_CLK>,
<&rpmcc RPM_SMD_PNOC_A_CLK>;
<&rpmcc RPM_SMD_PNOC_A_CLK>;
};
ocmemnoc: interconnect@fc470000 {
......@@ -1142,7 +1142,7 @@ ocmemnoc: interconnect@fc470000 {
#interconnect-cells = <1>;
clock-names = "bus", "bus_a";
clocks = <&rpmcc RPM_SMD_OCMEMGX_CLK>,
<&rpmcc RPM_SMD_OCMEMGX_A_CLK>;
<&rpmcc RPM_SMD_OCMEMGX_A_CLK>;
};
mmssnoc: interconnect@fc478000 {
......@@ -1151,7 +1151,7 @@ mmssnoc: interconnect@fc478000 {
#interconnect-cells = <1>;
clock-names = "bus", "bus_a";
clocks = <&mmcc MMSS_S0_AXI_CLK>,
<&mmcc MMSS_S0_AXI_CLK>;
<&mmcc MMSS_S0_AXI_CLK>;
};
cnoc: interconnect@fc480000 {
......@@ -1160,7 +1160,7 @@ cnoc: interconnect@fc480000 {
#interconnect-cells = <1>;
clock-names = "bus", "bus_a";
clocks = <&rpmcc RPM_SMD_CNOC_CLK>,
<&rpmcc RPM_SMD_CNOC_A_CLK>;
<&rpmcc RPM_SMD_CNOC_A_CLK>;
};
tsens: thermal-sensor@fc4a9000 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7