Skip to content

L
linux
Commit 9271fccb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'qcom-dts-for-5.16-2' of... 

Merge tag 'qcom-dts-for-5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/dt

Qualcomm DTS more changes for v5.16

The multi-purpose-pin (MPP) driver is finally migrated to use
hierarchical IRQ domains, so this bring the associated changes.

The remainder of the changes are correcting binding issues, primarily
found through DT validation.

* tag 'qcom-dts-for-5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (26 commits)
  ARM: dts: qcom: fix typo in IPQ8064 thermal-sensor node
  ARM: dts: qcom: fix thermal zones naming
  ARM: dts: qcom: fix flash node naming for RB3011
  ARM: dts: qcom: correct mmc node naming
  ARM: dts: qcom: fix memory and mdio nodes naming for RB3011
  dt-bindings: arm: qcom: Fix Nexus 4 vendor prefix
  ARM: dts: ipq4019-ap.dk01.1-c1: add device compatible in the dts
  dt-bindings: arm: qcom-ipq4019: add missing device compatible
  ARM: dts: qcom: apq8026-lg-lenok: rename board vendor
  dt-bindings: arm: qcom: rename vendor of apq8026-lenok
  ARM: dts: qcom: sdx55: Drop '#clock-cells' from QMP PHY node
  ARM: dts: qcom: mdm9615: fix memory node for Sierra Wireless WP8548
  ARM: dts: qcom-pma8084: add interrupt controller properties
  ARM: dts: qcom-pm8941: add interrupt controller properties
  ARM: dts: qcom-pm8841: add interrupt controller properties
  ARM: dts: qcom-msm8660: add interrupt controller properties
  ARM: dts: qcom-mdm9615: add interrupt controller properties
  ARM: dts: qcom-apq8064: add interrupt controller properties
  ARM: dts: qcom-apq8060-dragonboard: fix mpps state names
  ARM: dts: qcom-mdm9615: add gpio-ranges to mpps node, fix its name
  ...

Link: https://lore.kernel.org/r/20211026135855.1205262-1-bjorn.andersson@linaro.orgSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f253fb36 036e6c9f
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 132 deletions
Documentation/devicetree/bindings/arm/qcom.yaml
View file @ 9271fccb
......@@ -96,13 +96,13 @@ properties:
- items:
- enum:
- lge,lenok
- lg,lenok
- const: qcom,apq8026
- items:
- enum:
- asus,nexus4-mako
- asus,nexus7-flo
- lg,nexus4-mako
- sony,xperia-yuga
- qcom,apq8064-cm-qs600
- qcom,apq8064-ifc6410
......@@ -174,6 +174,7 @@ properties:
- items:
- enum:
- qcom,ipq4019-ap-dk01.1-c1
- qcom,ipq4019-ap-dk04.1-c3
- qcom,ipq4019-ap-dk07.1-c1
- qcom,ipq4019-ap-dk07.1-c2
......
arch/arm/boot/dts/Makefile
View file @ 9271fccb
......@@ -954,7 +954,7 @@ dtb-$(CONFIG_ARCH_OXNAS) += \
ox810se-wd-mbwe.dtb \
ox820-cloudengines-pogoplug-series-3.dtb
dtb-$(CONFIG_ARCH_QCOM) += \
qcom-apq8026-lge-lenok.dtb \
qcom-apq8026-lg-lenok.dtb \
qcom-apq8060-dragonboard.dtb \
qcom-apq8064-cm-qs600.dtb \
qcom-apq8064-ifc6410.dtb \
......
arch/arm/boot/dts/qcom-apq8026-lge-lenok.dts → arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts
View file @ 9271fccb
......@@ -10,7 +10,7 @@
/ {
model = "LG G Watch R";
compatible = "lge,lenok", "qcom,apq8026";
compatible = "lg,lenok", "qcom,apq8026";
qcom,board-id = <132 0x0a>;
qcom,msm-id = <199 0x20000>;
......
arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
View file @ 9271fccb
......@@ -357,8 +357,8 @@ pinconf {
};
mpps@50 {
dragon_cm3605_mpps: cm3605-mpps {
pinconf {
dragon_cm3605_mpps: cm3605-mpps-state {
mpp5 {
pins = "mpp5";
function = "analog";
input-enable;
......@@ -899,7 +899,7 @@ ncp {
};
amba {
/* Internal 3.69 GiB eMMC */
sdcc@12400000 {
mmc@12400000 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&dragon_sdcc1_pins>;
......@@ -908,7 +908,7 @@ sdcc@12400000 {
};
/* External micro SD card, directly connected, pulled up to 2.85 V */
sdcc@12180000 {
mmc@12180000 {
status = "okay";
/* Enable SSBI GPIO 22 as input, use for card detect */
pinctrl-names = "default";
......@@ -922,7 +922,7 @@ sdcc@12180000 {
* Second external micro SD card, using two TXB104RGYR levelshifters
* to lift from 1.8 V to 2.85 V
*/
sdcc@12200000 {
mmc@12200000 {
status = "okay";
/* Enable SSBI GPIO 26 as input, use for card detect */
pinctrl-names = "default";
......
arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
View file @ 9271fccb
......@@ -335,7 +335,7 @@ phy {
amba {
/* eMMC */
sdcc@12400000 {
mmc@12400000 {
status = "okay";
vmmc-supply = <&pm8921_l5>;
vqmmc-supply = <&pm8921_s4>;
......
arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
View file @ 9271fccb
......@@ -220,14 +220,14 @@ pci@1b500000 {
amba {
/* eMMC */
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "okay";
vmmc-supply = <&pm8921_l5>;
vqmmc-supply = <&pm8921_s4>;
};
/* External micro SD card */
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
status = "okay";
vmmc-supply = <&v3p3_fixed>;
pinctrl-names = "default";
......@@ -235,7 +235,7 @@ sdcc3: sdcc@12180000 {
cd-gpios = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>;
};
/* WLAN */
sdcc4: sdcc@121c0000 {
sdcc4: mmc@121c0000 {
status = "okay";
vmmc-supply = <&v3p3_fixed>;
vqmmc-supply = <&v3p3_fixed>;
......
arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
View file @ 9271fccb
......@@ -314,14 +314,14 @@ pios {
amba {
/* eMMC */
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "okay";
vmmc-supply = <&pm8921_l5>;
vqmmc-supply = <&pm8921_s4>;
};
/* External micro SD card */
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
status = "okay";
vmmc-supply = <&pm8921_l6>;
pinctrl-names = "default";
......@@ -329,7 +329,7 @@ sdcc3: sdcc@12180000 {
cd-gpios = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>;
};
/* WLAN */
sdcc4: sdcc@121c0000 {
sdcc4: mmc@121c0000 {
status = "okay";
vmmc-supply = <&ext_3p3v>;
vqmmc-supply = <&pm8921_lvs1>;
......
arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts
View file @ 9271fccb
......@@ -374,14 +374,14 @@ serial@1a240000 {
};
amba {
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "okay";
vmmc-supply = <&pm8921_l5>;
vqmmc-supply = <&pm8921_s4>;
};
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
status = "okay";
vmmc-supply = <&pm8921_l6>;
......
arch/arm/boot/dts/qcom-apq8064.dtsi
View file @ 9271fccb
......@@ -101,7 +101,7 @@ memory@0 {
};
thermal-zones {
cpu-thermal0 {
cpu0-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
......@@ -122,7 +122,7 @@ cpu_crit0: trip1 {
};
};
cpu-thermal1 {
cpu1-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
......@@ -143,7 +143,7 @@ cpu_crit1: trip1 {
};
};
cpu-thermal2 {
cpu2-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
......@@ -164,7 +164,7 @@ cpu_crit2: trip1 {
};
};
cpu-thermal3 {
cpu3-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
......@@ -683,12 +683,11 @@ pm8821: pmic@1 {
pm8821_mpps: mpps@50 {
compatible = "qcom,pm8821-mpp", "qcom,ssbi-mpp";
reg = <0x50>;
interrupts = <24 IRQ_TYPE_NONE>,
<25 IRQ_TYPE_NONE>,
<26 IRQ_TYPE_NONE>,
<27 IRQ_TYPE_NONE>;
interrupt-controller;
#interrupt-cells = <2>;
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&pm8821_mpps 0 0 4>;
};
};
};
......@@ -726,19 +725,9 @@ pm8921_mpps: mpps@50 {
reg = <0x50>;
gpio-controller;
#gpio-cells = <2>;
interrupts =
<128 IRQ_TYPE_NONE>,
<129 IRQ_TYPE_NONE>,
<130 IRQ_TYPE_NONE>,
<131 IRQ_TYPE_NONE>,
<132 IRQ_TYPE_NONE>,
<133 IRQ_TYPE_NONE>,
<134 IRQ_TYPE_NONE>,
<135 IRQ_TYPE_NONE>,
<136 IRQ_TYPE_NONE>,
<137 IRQ_TYPE_NONE>,
<138 IRQ_TYPE_NONE>,
<139 IRQ_TYPE_NONE>;
gpio-ranges = <&pm8921_mpps 0 0 12>;
interrupt-controller;
#interrupt-cells = <2>;
};
rtc@11d {
......@@ -1084,7 +1073,7 @@ amba {
#address-cells = <1>;
#size-cells = <1>;
ranges;
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "disabled";
compatible = "arm,pl18x", "arm,primecell";
pinctrl-names = "default";
......@@ -1104,7 +1093,7 @@ sdcc1: sdcc@12400000 {
dma-names = "tx", "rx";
};
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
status = "disabled";
......@@ -1122,7 +1111,7 @@ sdcc3: sdcc@12180000 {
dma-names = "tx", "rx";
};
sdcc4: sdcc@121c0000 {
sdcc4: mmc@121c0000 {
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
status = "disabled";
......@@ -1424,9 +1413,9 @@ hdmi: hdmi-tx@4a00000 {
clocks = <&mmcc HDMI_APP_CLK>,
<&mmcc HDMI_M_AHB_CLK>,
<&mmcc HDMI_S_AHB_CLK>;
clock-names = "core_clk",
"master_iface_clk",
"slave_iface_clk";
clock-names = "core",
"master_iface",
"slave_iface";
phys = <&hdmi_phy>;
phy-names = "hdmi-phy";
......@@ -1457,7 +1446,7 @@ hdmi_phy: hdmi-phy@4a00400 {
"hdmi_pll";
clocks = <&mmcc HDMI_S_AHB_CLK>;
clock-names = "slave_iface_clk";
clock-names = "slave_iface";
#phy-cells = <0>;
};
......
arch/arm/boot/dts/qcom-apq8084.dtsi
View file @ 9271fccb
......@@ -102,7 +102,7 @@ scm {
};
thermal-zones {
cpu-thermal0 {
cpu0-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
......@@ -122,7 +122,7 @@ cpu_crit0: trip1 {
};
};
cpu-thermal1 {
cpu1-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
......@@ -142,7 +142,7 @@ cpu_crit1: trip1 {
};
};
cpu-thermal2 {
cpu2-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
......@@ -162,7 +162,7 @@ cpu_crit2: trip1 {
};
};
cpu-thermal3 {
cpu3-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
......
arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dts
View file @ 9271fccb
......@@ -18,5 +18,5 @@
/ {
model = "Qualcomm Technologies, Inc. IPQ40xx/AP-DK01.1-C1";
compatible = "qcom,ipq4019-ap-dk01.1-c1", "qcom,ipq4019";
};
arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
View file @ 9271fccb
......@@ -18,7 +18,6 @@
/ {
model = "Qualcomm Technologies, Inc. IPQ4019/AP-DK01.1";
compatible = "qcom,ipq4019";
aliases {
serial0 = &blsp1_uart1;
......
arch/arm/boot/dts/qcom-ipq8064-rb3011.dts
View file @ 9271fccb
......@@ -19,12 +19,12 @@ chosen {
stdout-path = "serial0:115200n8";
};
memory@0 {
memory@42000000 {
reg = <0x42000000 0x3e000000>;
device_type = "memory";
};
mdio0: mdio@0 {
mdio0: mdio-0 {
status = "okay";
compatible = "virtual,mdio-gpio";
gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
......@@ -91,7 +91,7 @@ port@5 {
};
};
mdio1: mdio@1 {
mdio1: mdio-1 {
status = "okay";
compatible = "virtual,mdio-gpio";
gpios = <&qcom_pinmux 11 GPIO_ACTIVE_HIGH>,
......@@ -172,7 +172,7 @@ spi4: spi@1a280000 {
cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
norflash: s25fl016k@0 {
norflash: flash@0 {
compatible = "jedec,spi-nor";
#address-cells = <1>;
#size-cells = <1>;
......
arch/arm/boot/dts/qcom-ipq8064.dtsi
View file @ 9271fccb
......@@ -49,7 +49,7 @@ L2: l2-cache {
};
thermal-zones {
tsens_tz_sensor0 {
sensor0-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&tsens 0>;
......@@ -69,7 +69,7 @@ cpu-hot {
};
};
tsens_tz_sensor1 {
sensor1-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&tsens 1>;
......@@ -89,7 +89,7 @@ cpu-hot {
};
};
tsens_tz_sensor2 {
sensor2-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&tsens 2>;
......@@ -109,7 +109,7 @@ cpu-hot {
};
};
tsens_tz_sensor3 {
sensor3-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&tsens 3>;
......@@ -129,7 +129,7 @@ cpu-hot {
};
};
tsens_tz_sensor4 {
sensor4-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&tsens 4>;
......@@ -149,7 +149,7 @@ cpu-hot {
};
};
tsens_tz_sensor5 {
sensor5-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&tsens 5>;
......@@ -169,7 +169,7 @@ cpu-hot {
};
};
tsens_tz_sensor6 {
sensor6-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&tsens 6>;
......@@ -189,7 +189,7 @@ cpu-hot {
};
};
tsens_tz_sensor7 {
sensor7-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&tsens 7>;
......@@ -209,7 +209,7 @@ cpu-hot {
};
};
tsens_tz_sensor8 {
sensor8-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&tsens 8>;
......@@ -229,7 +229,7 @@ cpu-hot {
};
};
tsens_tz_sensor9 {
sensor9-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&tsens 9>;
......@@ -249,7 +249,7 @@ cpu-hot {
};
};
tsens_tz_sensor10 {
sensor10-thermal {
polling-delay-passive = <0>;
polling-delay = <0>;
thermal-sensors = <&tsens 10>;
......@@ -1181,7 +1181,7 @@ amba: amba {
#size-cells = <1>;
ranges;
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "disabled";
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
......@@ -1201,7 +1201,7 @@ sdcc1: sdcc@12400000 {
dma-names = "tx", "rx";
};
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
status = "disabled";
......
arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi
View file @ 9271fccb
......@@ -49,7 +49,7 @@ / {
model = "Sierra Wireless WP8548 Module";
compatible = "swir,wp8548", "qcom,mdm9615";
memory {
memory@48000000 {
device_type = "memory";
reg = <0x48000000 0x7F00000>;
};
......
arch/arm/boot/dts/qcom-mdm9615.dtsi
View file @ 9271fccb
......@@ -300,18 +300,14 @@ pwrkey@1c {
pull-up;
};
pmicmpp: mpp@50 {
pmicmpp: mpps@50 {
compatible = "qcom,pm8018-mpp", "qcom,ssbi-mpp";
interrupt-parent = <&pmicintc>;
interrupts = <24 IRQ_TYPE_NONE>,
<25 IRQ_TYPE_NONE>,
<26 IRQ_TYPE_NONE>,
<27 IRQ_TYPE_NONE>,
<28 IRQ_TYPE_NONE>,
<29 IRQ_TYPE_NONE>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x50>;
gpio-controller;
#gpio-cells = <2>;
gpio-ranges = <&pmicmpp 0 0 6>;
};
rtc@11d {
......@@ -358,7 +354,7 @@ amba {
#address-cells = <1>;
#size-cells = <1>;
ranges;
sdcc1: sdcc@12180000 {
sdcc1: mmc@12180000 {
status = "disabled";
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
......@@ -378,7 +374,7 @@ sdcc1: sdcc@12180000 {
assigned-clock-rates = <400000>;
};
sdcc2: sdcc@12140000 {
sdcc2: mmc@12140000 {
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
status = "disabled";
......
arch/arm/boot/dts/qcom-msm8660-surf.dts
View file @ 9271fccb
......@@ -35,13 +35,13 @@ vsdcc_fixed: vsdcc-regulator {
amba {
/* eMMC */
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "okay";
vmmc-supply = <&vsdcc_fixed>;
};
/* External micro SD card */
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
status = "okay";
vmmc-supply = <&vsdcc_fixed>;
};
......
arch/arm/boot/dts/qcom-msm8660.dtsi
View file @ 9271fccb
......@@ -307,20 +307,9 @@ pm8058_mpps: mpps@50 {
reg = <0x50>;
gpio-controller;
#gpio-cells = <2>;
interrupt-parent = <&pm8058>;
interrupts =
<128 IRQ_TYPE_NONE>,
<129 IRQ_TYPE_NONE>,
<130 IRQ_TYPE_NONE>,
<131 IRQ_TYPE_NONE>,
<132 IRQ_TYPE_NONE>,
<133 IRQ_TYPE_NONE>,
<134 IRQ_TYPE_NONE>,
<135 IRQ_TYPE_NONE>,
<136 IRQ_TYPE_NONE>,
<137 IRQ_TYPE_NONE>,
<138 IRQ_TYPE_NONE>,
<139 IRQ_TYPE_NONE>;
gpio-ranges = <&pm8058_mpps 0 0 12>;
interrupt-controller;
#interrupt-cells = <2>;
};
pwrkey@1c {
......@@ -494,7 +483,7 @@ amba {
#address-cells = <1>;
#size-cells = <1>;
ranges;
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "disabled";
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
......@@ -510,7 +499,7 @@ sdcc1: sdcc@12400000 {
cap-mmc-highspeed;
};
sdcc2: sdcc@12140000 {
sdcc2: mmc@12140000 {
status = "disabled";
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
......@@ -525,7 +514,7 @@ sdcc2: sdcc@12140000 {
cap-mmc-highspeed;
};
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
status = "disabled";
......@@ -541,7 +530,7 @@ sdcc3: sdcc@12180000 {
no-1-8-v;
};
sdcc4: sdcc@121c0000 {
sdcc4: mmc@121c0000 {
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
status = "disabled";
......@@ -556,7 +545,7 @@ sdcc4: sdcc@121c0000 {
cap-mmc-highspeed;
};
sdcc5: sdcc@12200000 {
sdcc5: mmc@12200000 {
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
status = "disabled";
......
arch/arm/boot/dts/qcom-msm8960-cdp.dts
View file @ 9271fccb
......@@ -26,12 +26,12 @@ serial@16440000 {
amba {
/* eMMC */
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "okay";
};
/* External micro SD card */
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
status = "okay";
};
};
......
arch/arm/boot/dts/qcom-msm8960.dtsi
View file @ 9271fccb
......@@ -263,7 +263,7 @@ amba {
#address-cells = <1>;
#size-cells = <1>;
ranges;
sdcc1: sdcc@12400000 {
sdcc1: mmc@12400000 {
status = "disabled";
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
......@@ -280,7 +280,7 @@ sdcc1: sdcc@12400000 {
vmmc-supply = <&vsdcc_fixed>;
};
sdcc3: sdcc@12180000 {
sdcc3: mmc@12180000 {
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
status = "disabled";
......
arch/arm/boot/dts/qcom-msm8974.dtsi
View file @ 9271fccb
......@@ -142,7 +142,7 @@ memory {
};
thermal-zones {
cpu-thermal0 {
cpu0-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
......@@ -162,7 +162,7 @@ cpu_crit0: trip1 {
};
};
cpu-thermal1 {
cpu1-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
......@@ -182,7 +182,7 @@ cpu_crit1: trip1 {
};
};
cpu-thermal2 {
cpu2-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
......@@ -202,7 +202,7 @@ cpu_crit2: trip1 {
};
};
cpu-thermal3 {
cpu3-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
......@@ -282,7 +282,7 @@ wlan_alert0: trip-point0 {
};
};
gpu-thermal-top {
gpu-top-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
......@@ -297,7 +297,7 @@ gpu1_alert0: trip-point0 {
};
};
gpu-thermal-bottom {
gpu-bottom-thermal {
polling-delay-passive = <250>;
polling-delay = <1000>;
......
arch/arm/boot/dts/qcom-pm8841.dtsi
View file @ 9271fccb
......@@ -15,10 +15,9 @@ pm8841_mpps: mpps@a000 {
reg = <0xa000>;
gpio-controller;
#gpio-cells = <2>;
interrupts = <4 0xa0 0 IRQ_TYPE_NONE>,
<4 0xa1 0 IRQ_TYPE_NONE>,
<4 0xa2 0 IRQ_TYPE_NONE>,
<4 0xa3 0 IRQ_TYPE_NONE>;
gpio-ranges = <&pm8841_mpps 0 0 4>;
interrupt-controller;
#interrupt-cells = <2>;
};
temp-alarm@2400 {
......
arch/arm/boot/dts/qcom-pm8941.dtsi
View file @ 9271fccb
......@@ -79,14 +79,9 @@ pm8941_mpps: mpps@a000 {
reg = <0xa000>;
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>,
<0 0xa4 0 IRQ_TYPE_NONE>,
<0 0xa5 0 IRQ_TYPE_NONE>,
<0 0xa6 0 IRQ_TYPE_NONE>,
<0 0xa7 0 IRQ_TYPE_NONE>;
gpio-ranges = <&pm8941_mpps 0 0 8>;
interrupt-controller;
#interrupt-cells = <2>;
};
pm8941_temp: temp-alarm@2400 {
......
arch/arm/boot/dts/qcom-pma8084.dtsi
View file @ 9271fccb
......@@ -42,14 +42,9 @@ pma8084_mpps: mpps@a000 {
reg = <0xa000>;
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>,
<0 0xa4 0 IRQ_TYPE_NONE>,
<0 0xa5 0 IRQ_TYPE_NONE>,
<0 0xa6 0 IRQ_TYPE_NONE>,
<0 0xa7 0 IRQ_TYPE_NONE>;
gpio-ranges = <&pma8084_mpps 0 0 8>;
interrupt-controller;
#interrupt-cells = <2>;
};
pma8084_temp: temp-alarm@2400 {
......
arch/arm/boot/dts/qcom-sdx55.dtsi
View file @ 9271fccb
......@@ -228,7 +228,6 @@ usb_qmpphy: phy@ff6000 {
compatible = "qcom,sdx55-qmp-usb3-uni-phy";
reg = <0x00ff6000 0x1c0>;
status = "disabled";
#clock-cells = <1>;
#address-cells = <1>;
#size-cells = <1>;
ranges;
......
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