From nobody Fri Oct 24 20:26:40 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC7A3C3F6B0 for ; Mon, 15 Aug 2022 20:45:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345573AbiHOUpF (ORCPT ); Mon, 15 Aug 2022 16:45:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347065AbiHOUmT (ORCPT ); Mon, 15 Aug 2022 16:42:19 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A317B14EF; Mon, 15 Aug 2022 12:07:40 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 1E8D3CE10E7; Mon, 15 Aug 2022 19:07:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5EE3C433D6; Mon, 15 Aug 2022 19:07:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660590456; bh=IlBtRUe7fQ991zsBoGn2EV5UFBHqP9Ucl3aDHFynZMw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DFAyQ6dczbPixNRXsL1+s5cV0TwW4YFQj2nKB//+FmQrWGGoHxhwUnmwRCTxZqGMK YMVuiaLa2GrqW4XX6T0potui4bSLQvRndQagvgKcCUGNk06EbNlOgIAt9FgMwaDeyL rwfwvwKaP4YcYO8A/yNt81Lepc+iU4gG7fuGB268= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Konrad Dybcio , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.18 0235/1095] ARM: dts: qcom-msm8974-klte: Use &labels Date: Mon, 15 Aug 2022 19:53:54 +0200 Message-Id: <20220815180439.496470595@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180429.240518113@linuxfoundation.org> References: <20220815180429.240518113@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Konrad Dybcio [ Upstream commit 1d59524b9181e17110ae7b809c62a6a66f336fd6 ] Use &labels to align with the style used in new DTS and apply tiny style fixes. Signed-off-by: Konrad Dybcio [bjorn: Rebased on top of Krzysztof's fixes] Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20220415115633.575010-12-konrad.dybcio@soma= inline.org Signed-off-by: Sasha Levin --- .../boot/dts/qcom-msm8974-samsung-klte.dts | 1202 ++++++++--------- arch/arm/boot/dts/qcom-msm8974.dtsi | 4 +- 2 files changed, 585 insertions(+), 621 deletions(-) diff --git a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts b/arch/arm/boo= t/dts/qcom-msm8974-samsung-klte.dts index 60244e0c37ba..3b1ea8c24f57 100644 --- a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts @@ -13,7 +13,7 @@ / { aliases { serial0 =3D &blsp1_uart1; mmc0 =3D &sdhc_1; /* SDC1 eMMC slot */ - mmc1 =3D &sdhc_2; /* SDC2 SD card slot */ + mmc1 =3D &sdhc_3; /* SDC2 SD card slot */ }; =20 chosen { @@ -52,197 +52,6 @@ volume-up { }; }; =20 - smd { - rpm { - rpm-requests { - pma8084-regulators { - compatible =3D "qcom,rpm-pma8084-regulators"; - status =3D "okay"; - - pma8084_s1: s1 { - regulator-min-microvolt =3D <675000>; - regulator-max-microvolt =3D <1050000>; - regulator-always-on; - }; - - pma8084_s2: s2 { - regulator-min-microvolt =3D <500000>; - regulator-max-microvolt =3D <1050000>; - }; - - pma8084_s3: s3 { - regulator-min-microvolt =3D <1300000>; - regulator-max-microvolt =3D <1300000>; - }; - - pma8084_s4: s4 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - pma8084_s5: s5 { - regulator-min-microvolt =3D <2150000>; - regulator-max-microvolt =3D <2150000>; - }; - - pma8084_s6: s6 { - regulator-min-microvolt =3D <1050000>; - regulator-max-microvolt =3D <1050000>; - }; - - pma8084_l1: l1 { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - }; - - pma8084_l2: l2 { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - }; - - pma8084_l3: l3 { - regulator-min-microvolt =3D <1050000>; - regulator-max-microvolt =3D <1200000>; - }; - - pma8084_l4: l4 { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1225000>; - }; - - pma8084_l5: l5 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - pma8084_l6: l6 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - pma8084_l7: l7 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - pma8084_l8: l8 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - pma8084_l9: l9 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - }; - - pma8084_l10: l10 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - }; - - pma8084_l11: l11 { - regulator-min-microvolt =3D <1300000>; - regulator-max-microvolt =3D <1300000>; - }; - - pma8084_l12: l12 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - regulator-always-on; - }; - - pma8084_l13: l13 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2950000>; - }; - - pma8084_l14: l14 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - pma8084_l15: l15 { - regulator-min-microvolt =3D <2050000>; - regulator-max-microvolt =3D <2050000>; - }; - - pma8084_l16: l16 { - regulator-min-microvolt =3D <2700000>; - regulator-max-microvolt =3D <2700000>; - }; - - pma8084_l17: l17 { - regulator-min-microvolt =3D <2850000>; - regulator-max-microvolt =3D <2850000>; - }; - - pma8084_l18: l18 { - regulator-min-microvolt =3D <2850000>; - regulator-max-microvolt =3D <2850000>; - }; - - pma8084_l19: l19 { - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; - }; - - pma8084_l20: l20 { - regulator-min-microvolt =3D <2950000>; - regulator-max-microvolt =3D <2950000>; - - regulator-allow-set-load; - regulator-system-load =3D <200000>; - }; - - pma8084_l21: l21 { - regulator-min-microvolt =3D <2950000>; - regulator-max-microvolt =3D <2950000>; - - regulator-allow-set-load; - regulator-system-load =3D <200000>; - }; - - pma8084_l22: l22 { - regulator-min-microvolt =3D <3000000>; - regulator-max-microvolt =3D <3300000>; - }; - - pma8084_l23: l23 { - regulator-min-microvolt =3D <3000000>; - regulator-max-microvolt =3D <3000000>; - }; - - pma8084_l24: l24 { - regulator-min-microvolt =3D <3075000>; - regulator-max-microvolt =3D <3075000>; - }; - - pma8084_l25: l25 { - regulator-min-microvolt =3D <2100000>; - regulator-max-microvolt =3D <2100000>; - }; - - pma8084_l26: l26 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2050000>; - }; - - pma8084_l27: l27 { - regulator-min-microvolt =3D <1000000>; - regulator-max-microvolt =3D <1225000>; - }; - - pma8084_lvs1: lvs1 {}; - pma8084_lvs2: lvs2 {}; - pma8084_lvs3: lvs3 {}; - pma8084_lvs4: lvs4 {}; - - pma8084_5vs1: 5vs1 {}; - }; - }; - }; - }; - i2c-gpio-touchkey { compatible =3D "i2c-gpio"; #address-cells =3D <1>; @@ -347,562 +156,717 @@ vreg_panel: panel-regulator { }; =20 /delete-node/ vreg-boost; - - adsp-pil { - cx-supply =3D <&pma8084_s2>; - }; }; =20 -&soc { - serial@f991e000 { - status =3D "okay"; - }; +&blsp1_i2c2 { + status =3D "okay"; =20 - /* blsp2_uart2 */ - serial@f995e000 { - status =3D "okay"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c2_pins>; =20 - pinctrl-names =3D "default", "sleep"; - pinctrl-0 =3D <&blsp2_uart2_pins_active>; - pinctrl-1 =3D <&blsp2_uart2_pins_sleep>; + touchscreen@20 { + compatible =3D "syna,rmi4-i2c"; + reg =3D <0x20>; =20 - bluetooth { - compatible =3D "brcm,bcm43540-bt"; - max-speed =3D <3000000>; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&bt_pins>; - device-wakeup-gpios =3D <&tlmm 91 GPIO_ACTIVE_HIGH>; - shutdown-gpios =3D <&gpio_expander 9 GPIO_ACTIVE_HIGH>; - interrupt-parent =3D <&tlmm>; - interrupts =3D <75 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names =3D "host-wakeup"; - }; - }; + interrupt-parent =3D <&pma8084_gpios>; + interrupts =3D <8 IRQ_TYPE_EDGE_FALLING>; =20 - pinctrl@fd510000 { - blsp2_uart2_pins_active: blsp2-uart2-pins-active { - pins =3D "gpio45", "gpio46", "gpio47", "gpio48"; - function =3D "blsp_uart8"; - drive-strength =3D <8>; - bias-disable; + vdd-supply =3D <&max77826_ldo13>; + vio-supply =3D <&pma8084_lvs2>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&touch_pin>; + + syna,startup-delay-ms =3D <100>; + + #address-cells =3D <1>; + #size-cells =3D <0>; + + rmi4-f01@1 { + reg =3D <0x1>; + syna,nosleep-mode =3D <1>; }; =20 - blsp2_uart2_pins_sleep: blsp2-uart2-pins-sleep { - pins =3D "gpio45", "gpio46", "gpio47", "gpio48"; - function =3D "gpio"; - drive-strength =3D <2>; - bias-pull-down; + rmi4-f12@12 { + reg =3D <0x12>; + syna,sensor-type =3D <1>; }; + }; +}; + +&blsp1_i2c6 { + status =3D "okay"; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c6_pins>; =20 - bt_pins: bt-pins { - hostwake { - pins =3D "gpio75"; - function =3D "gpio"; - drive-strength =3D <16>; - input-enable; + pmic@60 { + reg =3D <0x60>; + compatible =3D "maxim,max77826"; + + regulators { + max77826_ldo1: LDO1 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1200000>; }; =20 - devwake { - pins =3D "gpio91"; - function =3D "gpio"; - drive-strength =3D <2>; + max77826_ldo2: LDO2 { + regulator-min-microvolt =3D <1000000>; + regulator-max-microvolt =3D <1000000>; }; - }; =20 - sdhc1_pin_a: sdhc1-pin-active { - clk { - pins =3D "sdc1_clk"; - drive-strength =3D <4>; - bias-disable; + max77826_ldo3: LDO3 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1200000>; }; =20 - cmd-data { - pins =3D "sdc1_cmd", "sdc1_data"; - drive-strength =3D <4>; - bias-pull-up; + max77826_ldo4: LDO4 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; }; - }; =20 - sdhc2_pin_a: sdhc2-pin-active { - clk-cmd-data { - pins =3D "gpio35", "gpio36", "gpio37", "gpio38", - "gpio39", "gpio40"; - function =3D "sdc3"; - drive-strength =3D <8>; - bias-disable; + max77826_ldo5: LDO5 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; }; - }; =20 - sdhc2_cd_pin: sdhc2-cd { - pins =3D "gpio62"; - function =3D "gpio"; + max77826_ldo6: LDO6 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <3300000>; + }; =20 - drive-strength =3D <2>; - bias-disable; - }; + max77826_ldo7: LDO7 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - sdhc3_pin_a: sdhc3-pin-active { - clk { - pins =3D "sdc2_clk"; - drive-strength =3D <6>; - bias-disable; + max77826_ldo8: LDO8 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <3300000>; }; =20 - cmd-data { - pins =3D "sdc2_cmd", "sdc2_data"; - drive-strength =3D <6>; - bias-pull-up; + max77826_ldo9: LDO9 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; }; - }; =20 - i2c2_pins: i2c2 { - mux { - pins =3D "gpio6", "gpio7"; - function =3D "blsp_i2c2"; + max77826_ldo10: LDO10 { + regulator-min-microvolt =3D <2800000>; + regulator-max-microvolt =3D <2950000>; + }; =20 - drive-strength =3D <2>; - bias-disable; + max77826_ldo11: LDO11 { + regulator-min-microvolt =3D <2700000>; + regulator-max-microvolt =3D <2950000>; }; - }; =20 - i2c6_pins: i2c6 { - mux { - pins =3D "gpio29", "gpio30"; - function =3D "blsp_i2c6"; + max77826_ldo12: LDO12 { + regulator-min-microvolt =3D <2500000>; + regulator-max-microvolt =3D <3300000>; + }; =20 - drive-strength =3D <2>; - bias-disable; + max77826_ldo13: LDO13 { + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; }; - }; =20 - i2c12_pins: i2c12 { - mux { - pins =3D "gpio87", "gpio88"; - function =3D "blsp_i2c12"; + max77826_ldo14: LDO14 { + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + }; =20 - drive-strength =3D <2>; - bias-disable; + max77826_ldo15: LDO15 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; }; - }; =20 - i2c_touchkey_pins: i2c-touchkey { - mux { - pins =3D "gpio95", "gpio96"; - function =3D "gpio"; - input-enable; - bias-pull-up; + max77826_buck: BUCK { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; }; - }; =20 - i2c_led_gpioex_pins: i2c-led-gpioex { - mux { - pins =3D "gpio120", "gpio121"; - function =3D "gpio"; - input-enable; - bias-pull-down; + max77826_buckboost: BUCKBOOST { + regulator-min-microvolt =3D <3400000>; + regulator-max-microvolt =3D <3400000>; }; }; + }; +}; =20 - gpioex_pin: gpioex { - res { - pins =3D "gpio145"; - function =3D "gpio"; +&blsp1_uart2 { + status =3D "okay"; +}; =20 - bias-pull-up; - drive-strength =3D <2>; - }; - }; +&blsp2_i2c6 { + status =3D "okay"; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&i2c12_pins>; + + fuelgauge@36 { + compatible =3D "maxim,max17048"; + reg =3D <0x36>; + + maxim,double-soc; + maxim,rcomp =3D /bits/ 8 <0x56>; + + interrupt-parent =3D <&pma8084_gpios>; + interrupts =3D <21 IRQ_TYPE_LEVEL_LOW>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&fuelgauge_pin>; + }; +}; =20 - wifi_pin: wifi { - int { - pins =3D "gpio92"; - function =3D "gpio"; +&blsp2_uart2 { + status =3D "okay"; =20 - input-enable; - bias-pull-down; + pinctrl-names =3D "default", "sleep"; + pinctrl-0 =3D <&blsp2_uart2_pins_active>; + pinctrl-1 =3D <&blsp2_uart2_pins_sleep>; + + bluetooth { + compatible =3D "brcm,bcm43540-bt"; + max-speed =3D <3000000>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&bt_pins>; + device-wakeup-gpios =3D <&tlmm 91 GPIO_ACTIVE_HIGH>; + shutdown-gpios =3D <&gpio_expander 9 GPIO_ACTIVE_HIGH>; + interrupt-parent =3D <&tlmm>; + interrupts =3D <75 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names =3D "host-wakeup"; + }; +}; + +&dsi0 { + status =3D "okay"; + + vdda-supply =3D <&pma8084_l2>; + vdd-supply =3D <&pma8084_l22>; + vddio-supply =3D <&pma8084_l12>; + + panel: panel@0 { + reg =3D <0>; + compatible =3D "samsung,s6e3fa2"; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&panel_te_pin &panel_rst_pin>; + + iovdd-supply =3D <&pma8084_lvs4>; + vddr-supply =3D <&vreg_panel>; + + reset-gpios =3D <&pma8084_gpios 17 GPIO_ACTIVE_LOW>; + te-gpios =3D <&tlmm 12 GPIO_ACTIVE_HIGH>; + + port { + panel_in: endpoint { + remote-endpoint =3D <&dsi0_out>; }; }; + }; +}; =20 - panel_te_pin: panel { - te { - pins =3D "gpio12"; - function =3D "mdp_vsync"; +&dsi0_out { + remote-endpoint =3D <&panel_in>; + data-lanes =3D <0 1 2 3>; +}; =20 - drive-strength =3D <2>; - bias-disable; - }; +&dsi0_phy { + status =3D "okay"; + + vddio-supply =3D <&pma8084_l12>; +}; + +&gpu { + status =3D "okay"; +}; + +&mdss { + status =3D "okay"; +}; + +&otg { + status =3D "okay"; + + phys =3D <&usb_hs1_phy>; + phy-select =3D <&tcsr 0xb000 0>; + + hnp-disable; + srp-disable; + adp-disable; + + ulpi { + phy@a { + status =3D "okay"; + + v1p8-supply =3D <&pma8084_l6>; + v3p3-supply =3D <&pma8084_l24>; + + qcom,init-seq =3D /bits/ 8 <0x1 0x64>; }; }; +}; =20 - sdhci@f9824900 { - status =3D "okay"; +&pma8084_gpios { + gpio_keys_pin_a: gpio-keys-active { + pins =3D "gpio2", "gpio3", "gpio5"; + function =3D "normal"; =20 - vmmc-supply =3D <&pma8084_l20>; - vqmmc-supply =3D <&pma8084_s4>; + bias-pull-up; + power-source =3D ; + }; =20 - bus-width =3D <8>; - non-removable; + touchkey_pin: touchkey-int-pin { + pins =3D "gpio6"; + function =3D "normal"; + bias-disable; + input-enable; + power-source =3D ; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc1_pin_a>; + touch_pin: touchscreen-int-pin { + pins =3D "gpio8"; + function =3D "normal"; + bias-disable; + input-enable; + power-source =3D ; }; =20 - sdhci@f9864900 { - status =3D "okay"; + panel_en_pin: panel-en-pin { + pins =3D "gpio14"; + function =3D "normal"; + bias-pull-up; + power-source =3D ; + qcom,drive-strength =3D ; + }; =20 - max-frequency =3D <100000000>; + wlan_sleep_clk_pin: wlan-sleep-clk-pin { + pins =3D "gpio16"; + function =3D "func2"; =20 - vmmc-supply =3D <&pma8084_l21>; - vqmmc-supply =3D <&pma8084_l13>; + output-high; + power-source =3D ; + qcom,drive-strength =3D ; + }; =20 - bus-width =3D <4>; + panel_rst_pin: panel-rst-pin { + pins =3D "gpio17"; + function =3D "normal"; + bias-disable; + power-source =3D ; + qcom,drive-strength =3D ; + }; =20 - /* cd-gpio is intentionally disabled. If enabled, an SD card - * present during boot is not initialized correctly. Without - * cd-gpios the driver resorts to polling, so hotplug works. - */ - pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc2_pin_a /* &sdhc2_cd_pin */>; - // cd-gpios =3D <&tlmm 62 GPIO_ACTIVE_LOW>; + fuelgauge_pin: fuelgauge-int-pin { + pins =3D "gpio21"; + function =3D "normal"; + bias-disable; + input-enable; + power-source =3D ; }; +}; =20 - sdhci@f98a4900 { - status =3D "okay"; +&remoteproc_adsp { + cx-supply =3D <&pma8084_s2>; +}; =20 - #address-cells =3D <1>; - #size-cells =3D <0>; +&remoteproc_mss { + cx-supply =3D <&pma8084_s2>; + mss-supply =3D <&pma8084_s6>; + mx-supply =3D <&pma8084_s1>; + pll-supply =3D <&pma8084_l12>; +}; =20 - max-frequency =3D <100000000>; +&rpm_requests { + pma8084-regulators { + compatible =3D "qcom,rpm-pma8084-regulators"; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&sdhc3_pin_a>; + pma8084_s1: s1 { + regulator-min-microvolt =3D <675000>; + regulator-max-microvolt =3D <1050000>; + regulator-always-on; + }; =20 - vmmc-supply =3D <&vreg_wlan>; - vqmmc-supply =3D <&pma8084_s4>; + pma8084_s2: s2 { + regulator-min-microvolt =3D <500000>; + regulator-max-microvolt =3D <1050000>; + }; =20 - bus-width =3D <4>; - non-removable; + pma8084_s3: s3 { + regulator-min-microvolt =3D <1300000>; + regulator-max-microvolt =3D <1300000>; + }; =20 - wifi@1 { - reg =3D <1>; - compatible =3D "brcm,bcm4329-fmac"; + pma8084_s4: s4 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - interrupt-parent =3D <&tlmm>; - interrupts =3D <92 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names =3D "host-wake"; + pma8084_s5: s5 { + regulator-min-microvolt =3D <2150000>; + regulator-max-microvolt =3D <2150000>; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&wlan_sleep_clk_pin &wifi_pin>; + pma8084_s6: s6 { + regulator-min-microvolt =3D <1050000>; + regulator-max-microvolt =3D <1050000>; }; - }; =20 - usb@f9a55000 { - status =3D "okay"; + pma8084_l1: l1 { + regulator-min-microvolt =3D <1225000>; + regulator-max-microvolt =3D <1225000>; + }; =20 - phys =3D <&usb_hs1_phy>; - phy-select =3D <&tcsr 0xb000 0>; - /*extcon =3D <&smbb>, <&usb_id>;*/ - /*vbus-supply =3D <&chg_otg>;*/ + pma8084_l2: l2 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1200000>; + }; =20 - hnp-disable; - srp-disable; - adp-disable; + pma8084_l3: l3 { + regulator-min-microvolt =3D <1050000>; + regulator-max-microvolt =3D <1200000>; + }; =20 - ulpi { - phy@a { - status =3D "okay"; + pma8084_l4: l4 { + regulator-min-microvolt =3D <1200000>; + regulator-max-microvolt =3D <1225000>; + }; =20 - v1p8-supply =3D <&pma8084_l6>; - v3p3-supply =3D <&pma8084_l24>; + pma8084_l5: l5 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - /*extcon =3D <&smbb>;*/ - qcom,init-seq =3D /bits/ 8 <0x1 0x64>; - }; + pma8084_l6: l6 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; }; - }; =20 - i2c@f9924000 { - status =3D "okay"; + pma8084_l7: l7 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&i2c2_pins>; + pma8084_l8: l8 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - touchscreen@20 { - compatible =3D "syna,rmi4-i2c"; - reg =3D <0x20>; + pma8084_l9: l9 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; + }; =20 - interrupt-parent =3D <&pma8084_gpios>; - interrupts =3D <8 IRQ_TYPE_EDGE_FALLING>; + pma8084_l10: l10 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; + }; =20 - vdd-supply =3D <&max77826_ldo13>; - vio-supply =3D <&pma8084_lvs2>; + pma8084_l11: l11 { + regulator-min-microvolt =3D <1300000>; + regulator-max-microvolt =3D <1300000>; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&touch_pin>; + pma8084_l12: l12 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + regulator-always-on; + }; =20 - syna,startup-delay-ms =3D <100>; + pma8084_l13: l13 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2950000>; + }; =20 - #address-cells =3D <1>; - #size-cells =3D <0>; + pma8084_l14: l14 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + }; =20 - rmi4-f01@1 { - reg =3D <0x1>; - syna,nosleep-mode =3D <1>; - }; + pma8084_l15: l15 { + regulator-min-microvolt =3D <2050000>; + regulator-max-microvolt =3D <2050000>; + }; =20 - rmi4-f12@12 { - reg =3D <0x12>; - syna,sensor-type =3D <1>; - }; + pma8084_l16: l16 { + regulator-min-microvolt =3D <2700000>; + regulator-max-microvolt =3D <2700000>; }; - }; =20 - i2c@f9928000 { - status =3D "okay"; + pma8084_l17: l17 { + regulator-min-microvolt =3D <2850000>; + regulator-max-microvolt =3D <2850000>; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&i2c6_pins>; - - pmic@60 { - reg =3D <0x60>; - compatible =3D "maxim,max77826"; - - regulators { - max77826_ldo1: LDO1 { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - }; - - max77826_ldo2: LDO2 { - regulator-min-microvolt =3D <1000000>; - regulator-max-microvolt =3D <1000000>; - }; - - max77826_ldo3: LDO3 { - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - }; - - max77826_ldo4: LDO4 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - max77826_ldo5: LDO5 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - max77826_ldo6: LDO6 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <3300000>; - }; - - max77826_ldo7: LDO7 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - max77826_ldo8: LDO8 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <3300000>; - }; - - max77826_ldo9: LDO9 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - max77826_ldo10: LDO10 { - regulator-min-microvolt =3D <2800000>; - regulator-max-microvolt =3D <2950000>; - }; - - max77826_ldo11: LDO11 { - regulator-min-microvolt =3D <2700000>; - regulator-max-microvolt =3D <2950000>; - }; - - max77826_ldo12: LDO12 { - regulator-min-microvolt =3D <2500000>; - regulator-max-microvolt =3D <3300000>; - }; - - max77826_ldo13: LDO13 { - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; - }; - - max77826_ldo14: LDO14 { - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; - }; - - max77826_ldo15: LDO15 { - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - }; - - max77826_buck: BUCK { - regulator-min-microvolt =3D <1225000>; - regulator-max-microvolt =3D <1225000>; - }; - - max77826_buckboost: BUCKBOOST { - regulator-min-microvolt =3D <3400000>; - regulator-max-microvolt =3D <3400000>; - }; - }; + pma8084_l18: l18 { + regulator-min-microvolt =3D <2850000>; + regulator-max-microvolt =3D <2850000>; }; - }; =20 - i2c@f9968000 { - status =3D "okay"; + pma8084_l19: l19 { + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&i2c12_pins>; + pma8084_l20: l20 { + regulator-min-microvolt =3D <2950000>; + regulator-max-microvolt =3D <2950000>; + regulator-system-load =3D <200000>; + regulator-allow-set-load; + }; =20 - fuelgauge@36 { - compatible =3D "maxim,max17048"; - reg =3D <0x36>; + pma8084_l21: l21 { + regulator-min-microvolt =3D <2950000>; + regulator-max-microvolt =3D <2950000>; + regulator-system-load =3D <200000>; + regulator-allow-set-load; + }; =20 - maxim,double-soc; - maxim,rcomp =3D /bits/ 8 <0x56>; + pma8084_l22: l22 { + regulator-min-microvolt =3D <3000000>; + regulator-max-microvolt =3D <3300000>; + }; =20 - interrupt-parent =3D <&pma8084_gpios>; - interrupts =3D <21 IRQ_TYPE_LEVEL_LOW>; + pma8084_l23: l23 { + regulator-min-microvolt =3D <3000000>; + regulator-max-microvolt =3D <3000000>; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&fuelgauge_pin>; + pma8084_l24: l24 { + regulator-min-microvolt =3D <3075000>; + regulator-max-microvolt =3D <3075000>; }; + + pma8084_l25: l25 { + regulator-min-microvolt =3D <2100000>; + regulator-max-microvolt =3D <2100000>; + }; + + pma8084_l26: l26 { + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <2050000>; + }; + + pma8084_l27: l27 { + regulator-min-microvolt =3D <1000000>; + regulator-max-microvolt =3D <1225000>; + }; + + pma8084_lvs1: lvs1 {}; + pma8084_lvs2: lvs2 {}; + pma8084_lvs3: lvs3 {}; + pma8084_lvs4: lvs4 {}; + + pma8084_5vs1: 5vs1 {}; }; +}; + +&sdhc_1 { + status =3D "okay"; + + vmmc-supply =3D <&pma8084_l20>; + vqmmc-supply =3D <&pma8084_s4>; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc1_pin_a>; +}; + +&sdhc_2 { + status =3D "okay"; + max-frequency =3D <100000000>; =20 - adreno@fdb00000 { - status =3D "ok"; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc3_pin_a>; + + vmmc-supply =3D <&vreg_wlan>; + vqmmc-supply =3D <&pma8084_s4>; + + non-removable; + + #address-cells =3D <1>; + #size-cells =3D <0>; + + wifi@1 { + reg =3D <1>; + compatible =3D "brcm,bcm4329-fmac"; + + interrupt-parent =3D <&tlmm>; + interrupts =3D <92 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names =3D "host-wake"; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&wlan_sleep_clk_pin &wifi_pin>; }; +}; =20 - mdss@fd900000 { - status =3D "ok"; +&sdhc_3 { + status =3D "okay"; + max-frequency =3D <100000000>; + + vmmc-supply =3D <&pma8084_l21>; + vqmmc-supply =3D <&pma8084_l13>; + + /* + * cd-gpio is intentionally disabled. If enabled, an SD card + * present during boot is not initialized correctly. Without + * cd-gpios the driver resorts to polling, so hotplug works. + */ + pinctrl-names =3D "default"; + pinctrl-0 =3D <&sdhc2_pin_a /* &sdhc2_cd_pin */>; + /* cd-gpios =3D <&tlmm 62 GPIO_ACTIVE_LOW>; */ +}; =20 - mdp@fd900000 { - status =3D "ok"; - }; +&tlmm { + blsp2_uart2_pins_active: blsp2-uart2-pins-active { + pins =3D "gpio45", "gpio46", "gpio47", "gpio48"; + function =3D "blsp_uart8"; + drive-strength =3D <8>; + bias-disable; + }; =20 - dsi@fd922800 { - status =3D "ok"; + blsp2_uart2_pins_sleep: blsp2-uart2-pins-sleep { + pins =3D "gpio45", "gpio46", "gpio47", "gpio48"; + function =3D "gpio"; + drive-strength =3D <2>; + bias-pull-down; + }; =20 - vdda-supply =3D <&pma8084_l2>; - vdd-supply =3D <&pma8084_l22>; - vddio-supply =3D <&pma8084_l12>; + bt_pins: bt-pins { + hostwake { + pins =3D "gpio75"; + function =3D "gpio"; + drive-strength =3D <16>; + input-enable; + }; =20 - #address-cells =3D <1>; - #size-cells =3D <0>; + devwake { + pins =3D "gpio91"; + function =3D "gpio"; + drive-strength =3D <2>; + }; + }; =20 - ports { - port@1 { - endpoint { - remote-endpoint =3D <&panel_in>; - data-lanes =3D <0 1 2 3>; - }; - }; - }; + sdhc1_pin_a: sdhc1-pin-active { + clk { + pins =3D "sdc1_clk"; + drive-strength =3D <4>; + bias-disable; + }; =20 - panel: panel@0 { - reg =3D <0>; - compatible =3D "samsung,s6e3fa2"; + cmd-data { + pins =3D "sdc1_cmd", "sdc1_data"; + drive-strength =3D <4>; + bias-pull-up; + }; + }; + + sdhc2_pin_a: sdhc2-pin-active { + clk-cmd-data { + pins =3D "gpio35", "gpio36", "gpio37", "gpio38", + "gpio39", "gpio40"; + function =3D "sdc3"; + drive-strength =3D <8>; + bias-disable; + }; + }; =20 - pinctrl-names =3D "default"; - pinctrl-0 =3D <&panel_te_pin &panel_rst_pin>; + sdhc2_cd_pin: sdhc2-cd { + pins =3D "gpio62"; + function =3D "gpio"; =20 - iovdd-supply =3D <&pma8084_lvs4>; - vddr-supply =3D <&vreg_panel>; + drive-strength =3D <2>; + bias-disable; + }; =20 - reset-gpios =3D <&pma8084_gpios 17 GPIO_ACTIVE_LOW>; - te-gpios =3D <&tlmm 12 GPIO_ACTIVE_HIGH>; + sdhc3_pin_a: sdhc3-pin-active { + clk { + pins =3D "sdc2_clk"; + drive-strength =3D <6>; + bias-disable; + }; =20 - port { - panel_in: endpoint { - remote-endpoint =3D <&dsi0_out>; - }; - }; - }; + cmd-data { + pins =3D "sdc2_cmd", "sdc2_data"; + drive-strength =3D <6>; + bias-pull-up; }; + }; =20 - dsi-phy@fd922a00 { - status =3D "ok"; + i2c2_pins: i2c2 { + mux { + pins =3D "gpio6", "gpio7"; + function =3D "blsp_i2c2"; =20 - vddio-supply =3D <&pma8084_l12>; + drive-strength =3D <2>; + bias-disable; }; }; =20 - remoteproc@fc880000 { - cx-supply =3D <&pma8084_s2>; - mss-supply =3D <&pma8084_s6>; - mx-supply =3D <&pma8084_s1>; - pll-supply =3D <&pma8084_l12>; + i2c6_pins: i2c6 { + mux { + pins =3D "gpio29", "gpio30"; + function =3D "blsp_i2c6"; + + drive-strength =3D <2>; + bias-disable; + }; }; -}; =20 -&spmi_bus { - pma8084@0 { - gpios@c000 { - gpio_keys_pin_a: gpio-keys-active { - pins =3D "gpio2", "gpio3", "gpio5"; - function =3D "normal"; + i2c12_pins: i2c12 { + mux { + pins =3D "gpio87", "gpio88"; + function =3D "blsp_i2c12"; =20 - bias-pull-up; - power-source =3D ; - }; + drive-strength =3D <2>; + bias-disable; + }; + }; =20 - touchkey_pin: touchkey-int-pin { - pins =3D "gpio6"; - function =3D "normal"; - bias-disable; - input-enable; - power-source =3D ; - }; + i2c_touchkey_pins: i2c-touchkey { + mux { + pins =3D "gpio95", "gpio96"; + function =3D "gpio"; + input-enable; + bias-pull-up; + }; + }; =20 - touch_pin: touchscreen-int-pin { - pins =3D "gpio8"; - function =3D "normal"; - bias-disable; - input-enable; - power-source =3D ; - }; + i2c_led_gpioex_pins: i2c-led-gpioex { + mux { + pins =3D "gpio120", "gpio121"; + function =3D "gpio"; + input-enable; + bias-pull-down; + }; + }; =20 - panel_en_pin: panel-en-pin { - pins =3D "gpio14"; - function =3D "normal"; - bias-pull-up; - power-source =3D ; - qcom,drive-strength =3D ; - }; + gpioex_pin: gpioex { + res { + pins =3D "gpio145"; + function =3D "gpio"; =20 - wlan_sleep_clk_pin: wlan-sleep-clk-pin { - pins =3D "gpio16"; - function =3D "func2"; + bias-pull-up; + drive-strength =3D <2>; + }; + }; =20 - output-high; - power-source =3D ; - qcom,drive-strength =3D ; - }; + wifi_pin: wifi { + int { + pins =3D "gpio92"; + function =3D "gpio"; =20 - panel_rst_pin: panel-rst-pin { - pins =3D "gpio17"; - function =3D "normal"; - bias-disable; - power-source =3D ; - qcom,drive-strength =3D ; - }; + input-enable; + bias-pull-down; + }; + }; =20 + panel_te_pin: panel { + te { + pins =3D "gpio12"; + function =3D "mdp_vsync"; =20 - fuelgauge_pin: fuelgauge-int-pin { - pins =3D "gpio21"; - function =3D "normal"; - bias-disable; - input-enable; - power-source =3D ; - }; + drive-strength =3D <2>; + bias-disable; }; }; }; diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-m= sm8974.dtsi index f1278d39ff6c..ea3491d47b9f 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -341,7 +341,7 @@ timer { clock-frequency =3D <19200000>; }; =20 - adsp-pil { + remoteproc_adsp: adsp-pil { compatible =3D "qcom,msm8974-adsp-pil"; =20 interrupts-extended =3D <&intc GIC_SPI 162 IRQ_TYPE_EDGE_RISING>, @@ -842,7 +842,7 @@ rng@f9bff000 { clock-names =3D "core"; }; =20 - remoteproc@fc880000 { + remoteproc_mss: remoteproc@fc880000 { compatible =3D "qcom,msm8974-mss-pil"; reg =3D <0xfc880000 0x100>, <0xfc820000 0x020>; reg-names =3D "qdsp6", "rmb"; --=20 2.35.1