Skip to content

L
linux
Commit 60c2f542 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'qcom-arm64-for-6.5' of... 

Merge tag 'qcom-arm64-for-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt

Qualcomm ARM64 DeviceTree updates for v6.5

This introduces the RDP442 and RDP433 reference devices on IPQ5332 and
IPQ9574, respectively. RDP418, RDP433, RDP449 and RDP453 on the IPQ9574
are added. On MSM8939 the Square T2 board and the Sony Xperia M4 Aqua is
added. Support for Acer Apire 1, built on the Snapdragon 7c platform is
introduced. Fxtec Pro1X on SM6115 is added.  Lastly long floating
support for SC8180X and the Lenovo Flex 5G, and the Primus reference
device, has been added.

On IPQ5332 and IPQ6018 QFPROM support is introduced, and as described
above the RDP442 board on the prior. Download mode support and various
reserved-memory regions are also introduced on IPQ6018.
IPQ8074 gains another SPI controller.

On IPQ9574 CPU frequency scaling, low speed busses, RNG, Watchdog,
qfprom, SMEM and RPM are introduced. As are support for four new board,
mentioned above.

MSM8916 gains a range of structural improvements, to better suite the
various boards supported. Regulator constraints are corrected and their
states are adjusted to match reality (e.g. always-on regulators marked
as always-on). BQ Aquaris X5 gains support for front flash LED.

As mentioned above, MSM8939 support is introduced with support for
boards from Sony and Square.

MSM8953 gains DMA support in I2C masters.

MSM8996-based Sony Xperia boards gains description of their RGB
notification LED.

On SA8775P support for UFS, USB, GPU clock and iommu controllers, PMU,
AOSS, watchdog and missing low-speed controllers are added. On the Ride
platform UFS, USB and an i2c bus are enabled.

iommu properties are added to QSPI on both SC7180 and SC7280. LPASS
clocks are adjusted and MDP node cleaned up slightly, on SC7180. As
mentioned above, support for Acer Aspire 1 is introduced.

Long lingering patches introducing SC8180X, the Lenovo Flex 5G and the
Primus reference device has been merged.

On SC8280XP ethernet is added and enabled on the automotive ride
platform. An SDC controller is introduced and enabled on the SC8280XP
CRD. On the Lenovo Thinkpad X13s and the CRD reference device the USB
SuperSpeed phy is added to the Type-C graph, to enable support for
orientation switching.

Fairphone 3 gains support for its notification LED.

On SDM845 the iommu stream for QSPI is defined, SHIFT SHIFT6mq gains
support for flash LED and the RB3 (DB845c) board gains support for
bonded/dual DSI-mode, to allow 4k output.

On SM6115 CPU idle-states, crypto engine support and SuperSpeed USB PHY
are introduced. As mentioned above Fxtec Pro1X is introduced. On the
QRB4210 Robotics Platform RB2 USB, Audio and Compute DSPs, display,
CAN-bus and GPIO LEDs are introduced, fixed regulators are described and
the SD-card description is corrected.

Support for crypto engine is added to SM8150, while Sony Xperia 1 and 5
gains SD-card support, camera regulators and GPIO line names sorted out.

SM8250 also gets support for crypto engine, and Sony Xperia 1 II and 5
II gains support for hardware video accelerator.

Crypto engine is introduced for SM8350 as well. The HDK gets the USB
Type-C graph described for Superspeed orientation switching and
DisplayPort output.

On SM8450 video clock controller and crypto engine are added, missing
opp levels are introduced and the USB Type-C graph is defined for
orientation switching and altmode.

SM8550 gains GPU and video clock controllers and missing opp levels are
added. The WCD9385 audio codec is added for the SM8550 MTP and on the
QRD PCIe, USB, audio display and flash LED are added.

* tag 'qcom-arm64-for-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (195 commits)
  arm64: dts: qcom: sc8180x: Introduce Lenovo Flex 5G
  arm64: dts: qcom: sc8180x: Introduce Primus
  arm64: dts: qcom: sc8180x: Add pmics
  arm64: dts: qcom: sc8180x: Add display and gpu nodes
  arm64: dts: qcom: sc8180x: Add remoteprocs, wifi and usb nodes
  arm64: dts: qcom: sc8180x: Add PCIe instances
  arm64: dts: qcom: sc8180x: Add QUPs
  arm64: dts: qcom: sc8180x: Add thermal zones
  arm64: dts: qcom: sc8180x: Add interconnects and lmh
  arm64: dts: qcom: Introduce the SC8180x platform
  arm64: dts: qcom: msm8916: Move aliases to boards
  arm64: dts: qcom: pm8916: Rename &wcd_codec -> &pm8916_codec
  arm64: dts: qcom: msm8916/39: Clean up MDSS labels
  arm64: dts: qcom: msm8916/39: Use consistent name for I2C/SPI pinctrl
  arm64: dts: qcom: msm8916/39: Rename &blsp1_uartN -> &blsp_uartN
  arm64: dts: qcom: msm8916: Rename &msmgpio -> &tlmm
  arm64: dts: qcom: qrb4210-rb2: Enable USB node
  arm64: dts: qcom: sm6115: Add USB SS qmp phy node
  arm64: dts: qcom: ipq5332: add support for the RDP442 variant
  dt-bindings: arm: qcom: document MI01.3 board based on IPQ5332 family
  ...

Link: https://lore.kernel.org/r/20230611004944.2481596-1-andersson@kernel.orgSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 70cdf5e2 20dea72a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 16128 additions and 2107 deletions
Documentation/devicetree/bindings/arm/qcom.yaml
View file @ 60c2f542
......@@ -40,6 +40,7 @@ description: |
msm8939
msm8953
msm8956
msm8960
msm8974
msm8976
msm8992
......@@ -85,8 +86,12 @@ description: |
The 'board' element must be one of the following strings:
adp
ap-al02-c2
ap-al02-c6
ap-al02-c7
ap-al02-c8
ap-mi01.2
ap-mi01.3
ap-mi01.6
cdp
cp01-c1
......@@ -333,6 +338,7 @@ properties:
- items:
- enum:
- qcom,ipq5332-ap-mi01.2
- qcom,ipq5332-ap-mi01.3
- qcom,ipq5332-ap-mi01.6
- const: qcom,ipq5332
......@@ -351,7 +357,10 @@ properties:
- items:
- enum:
- qcom,ipq9574-ap-al02-c2
- qcom,ipq9574-ap-al02-c6
- qcom,ipq9574-ap-al02-c7
- qcom,ipq9574-ap-al02-c8
- const: qcom,ipq9574
- description: Sierra Wireless MangOH Green with WP8548 Module
......@@ -380,9 +389,9 @@ properties:
- qcom,qru1000-idp
- const: qcom,qru1000
- description: Qualcomm Technologies, Inc. SC7180 IDP
items:
- items:
- enum:
- acer,aspire1
- qcom,sc7180-idp
- const: qcom,sc7180
......@@ -882,6 +891,11 @@ properties:
- const: qcom,qrb4210
- const: qcom,sm4250
- items:
- enum:
- fxtec,pro1x
- const: qcom,sm6115
- items:
- enum:
- lenovo,j606f
......
Documentation/devicetree/bindings/clock/qcom,sm8450-gpucc.yaml 0 → 100644
View file @ 60c2f542
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/clock/qcom,sm8450-gpucc.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Graphics Clock & Reset Controller on SM8450
maintainers:
- Konrad Dybcio <konrad.dybcio@linaro.org>
description: |
Qualcomm graphics clock control module provides the clocks, resets and power
domains on Qualcomm SoCs.
See also::
include/dt-bindings/clock/qcom,sm8450-gpucc.h
include/dt-bindings/clock/qcom,sm8550-gpucc.h
include/dt-bindings/reset/qcom,sm8450-gpucc.h
properties:
compatible:
enum:
- qcom,sm8450-gpucc
- qcom,sm8550-gpucc
clocks:
items:
- description: Board XO source
- description: GPLL0 main branch source
- description: GPLL0 div branch source
'#clock-cells':
const: 1
'#reset-cells':
const: 1
'#power-domain-cells':
const: 1
reg:
maxItems: 1
required:
- compatible
- reg
- clocks
- '#clock-cells'
- '#reset-cells'
- '#power-domain-cells'
additionalProperties: false
examples:
- |
#include <dt-bindings/clock/qcom,gcc-sm8450.h>
#include <dt-bindings/clock/qcom,rpmh.h>
soc {
#address-cells = <2>;
#size-cells = <2>;
clock-controller@3d90000 {
compatible = "qcom,sm8450-gpucc";
reg = <0 0x03d90000 0 0xa000>;
clocks = <&rpmhcc RPMH_CXO_CLK>,
<&gcc GCC_GPU_GPLL0_CLK_SRC>,
<&gcc GCC_GPU_GPLL0_DIV_CLK_SRC>;
#clock-cells = <1>;
#reset-cells = <1>;
#power-domain-cells = <1>;
};
};
...
Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml 0 → 100644
View file @ 60c2f542
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/clock/qcom,sm8450-videocc.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Video Clock & Reset Controller on SM8450
maintainers:
- Taniya Das <quic_tdas@quicinc.com>
description: |
Qualcomm video clock control module provides the clocks, resets and power
domains on SM8450.
See also:: include/dt-bindings/clock/qcom,videocc-sm8450.h
properties:
compatible:
const: qcom,sm8450-videocc
reg:
maxItems: 1
clocks:
items:
- description: Board XO source
- description: Video AHB clock from GCC
power-domains:
maxItems: 1
description:
MMCX power domain.
required-opps:
maxItems: 1
description:
A phandle to an OPP node describing required MMCX performance point.
'#clock-cells':
const: 1
'#reset-cells':
const: 1
'#power-domain-cells':
const: 1
required:
- compatible
- reg
- clocks
- power-domains
- required-opps
- '#clock-cells'
- '#reset-cells'
- '#power-domain-cells'
additionalProperties: false
examples:
- |
#include <dt-bindings/clock/qcom,gcc-sm8450.h>
#include <dt-bindings/clock/qcom,rpmh.h>
#include <dt-bindings/power/qcom-rpmpd.h>
videocc: clock-controller@aaf0000 {
compatible = "qcom,sm8450-videocc";
reg = <0x0aaf0000 0x10000>;
clocks = <&rpmhcc RPMH_CXO_CLK>,
<&gcc GCC_VIDEO_AHB_CLK>;
power-domains = <&rpmhpd SM8450_MMCX>;
required-opps = <&rpmhpd_opp_low_svs>;
#clock-cells = <1>;
#reset-cells = <1>;
#power-domain-cells = <1>;
};
...
Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
View file @ 60c2f542
......@@ -18,8 +18,11 @@ properties:
- enum:
- qcom,apq8064-qfprom
- qcom,apq8084-qfprom
- qcom,ipq5332-qfprom
- qcom,ipq6018-qfprom
- qcom,ipq8064-qfprom
- qcom,ipq8074-qfprom
- qcom,ipq9574-qfprom
- qcom,msm8916-qfprom
- qcom,msm8974-qfprom
- qcom,msm8976-qfprom
......
Documentation/devicetree/bindings/vendor-prefixes.yaml
View file @ 60c2f542
......@@ -1269,6 +1269,8 @@ patternProperties:
description: SpinalHDL
"^sprd,.*":
description: Spreadtrum Communications Inc.
"^square,.*":
description: Square
"^ssi,.*":
description: SSI Computer Corp
"^sst,.*":
......
arch/arm64/boot/dts/qcom/Makefile
View file @ 60c2f542
# SPDX-License-Identifier: GPL-2.0
dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.dtb
dtb-$(CONFIG_ARCH_QCOM) += apq8039-t2.dtb
dtb-$(CONFIG_ARCH_QCOM) += apq8094-sony-xperia-kitakami-karin_windy.dtb
dtb-$(CONFIG_ARCH_QCOM) += apq8096-db820c.dtb
dtb-$(CONFIG_ARCH_QCOM) += apq8096-ifc6640.dtb
dtb-$(CONFIG_ARCH_QCOM) += ipq5332-mi01.2.dtb
dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp442.dtb
dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp468.dtb
dtb-$(CONFIG_ARCH_QCOM) += ipq6018-cp01-c1.dtb
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk01.dtb
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c1.dtb
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c2.dtb
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-al02-c7.dtb
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp418.dtb
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp433.dtb
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp449.dtb
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp453.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-acer-a1-724.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb
......@@ -32,6 +37,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-uf896.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-ufi001c.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt88047.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-yiming-uz801v3.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8939-sony-xperia-kanuti-tulip.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8953-motorola-potter.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-daisy.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-mido.dtb
......@@ -82,6 +88,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sa8155p-adp.dtb
dtb-$(CONFIG_ARCH_QCOM) += sa8295p-adp.dtb
dtb-$(CONFIG_ARCH_QCOM) += sa8540p-ride.dtb
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-acer-aspire1.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-idp.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1-lte.dtb
......@@ -140,6 +147,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie-nvme-lte.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp2.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7280-crd-r3.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc8180x-lenovo-flex-5g.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc8180x-primus.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc8280xp-crd.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc8280xp-lenovo-thinkpad-x13s.dtb
dtb-$(CONFIG_ARCH_QCOM) += sda660-inforce-ifc6560.dtb
......@@ -174,6 +183,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sdm845-shift-axolotl.dtb
dtb-$(CONFIG_ARCH_QCOM) += sdm850-lenovo-yoga-c630.dtb
dtb-$(CONFIG_ARCH_QCOM) += sdm850-samsung-w737.dtb
dtb-$(CONFIG_ARCH_QCOM) += sm4250-oneplus-billie2.dtb
dtb-$(CONFIG_ARCH_QCOM) += sm6115-fxtec-pro1x.dtb
dtb-$(CONFIG_ARCH_QCOM) += sm6115p-lenovo-j606f.dtb
dtb-$(CONFIG_ARCH_QCOM) += sm6125-sony-xperia-seine-pdx201.dtb
dtb-$(CONFIG_ARCH_QCOM) += sm6125-xiaomi-laurel-sprout.dtb
......
arch/arm64/boot/dts/qcom/apq8016-sbc.dts
View file @ 60c2f542
......@@ -18,8 +18,10 @@ / {
compatible = "qcom,apq8016-sbc", "qcom,apq8016";
aliases {
serial0 = &blsp1_uart2;
serial1 = &blsp1_uart1;
mmc0 = &sdhc_1; /* eMMC */
mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
serial1 = &blsp_uart1;
usid0 = &pm8916_0;
i2c0 = &blsp_i2c2;
i2c1 = &blsp_i2c6;
......@@ -75,7 +77,7 @@ usb2513 {
usb_id: usb-id {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&msmgpio 121 GPIO_ACTIVE_HIGH>;
id-gpio = <&tlmm 121 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>;
};
......@@ -101,13 +103,13 @@ gpio-keys {
button {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
};
};
leds {
pinctrl-names = "default";
pinctrl-0 = <&msmgpio_leds>,
pinctrl-0 = <&tlmm_leds>,
<&pm8916_gpios_leds>,
<&pm8916_mpps_leds>;
......@@ -117,7 +119,7 @@ led@1 {
label = "apq8016-sbc:green:user1";
function = LED_FUNCTION_HEARTBEAT;
color = <LED_COLOR_ID_GREEN>;
gpios = <&msmgpio 21 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
default-state = "off";
};
......@@ -126,7 +128,7 @@ led@2 {
label = "apq8016-sbc:green:user2";
function = LED_FUNCTION_DISK_ACTIVITY;
color = <LED_COLOR_ID_GREEN>;
gpios = <&msmgpio 120 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 120 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "mmc0";
default-state = "off";
};
......@@ -186,14 +188,14 @@ adv_bridge: bridge@39 {
compatible = "adi,adv7533";
reg = <0x39>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <31 IRQ_TYPE_EDGE_FALLING>;
adi,dsi-lanes = <4>;
clocks = <&rpmcc RPM_SMD_BB_CLK2>;
clock-names = "cec";
pd-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
pd-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
avdd-supply = <&pm8916_l6>;
v1p2-supply = <&pm8916_l6>;
......@@ -211,7 +213,7 @@ ports {
port@0 {
reg = <0>;
adv7533_in: endpoint {
remote-endpoint = <&dsi0_out>;
remote-endpoint = <&mdss_dsi0_out>;
};
};
......@@ -243,12 +245,12 @@ &blsp_spi5 {
label = "LS-SPI0";
};
&blsp1_uart1 {
&blsp_uart1 {
status = "okay";
label = "LS-UART0";
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
label = "LS-UART1";
};
......@@ -276,8 +278,8 @@ camera_rear@3b {
compatible = "ovti,ov5640";
reg = <0x3b>;
enable-gpios = <&msmgpio 34 GPIO_ACTIVE_HIGH>;
reset-gpios = <&msmgpio 35 GPIO_ACTIVE_LOW>;
enable-gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>;
reset-gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&camera_rear_default>;
......@@ -301,12 +303,11 @@ ov5640_ep: endpoint {
};
};
&dsi0_out {
data-lanes = <0 1 2 3>;
remote-endpoint = <&adv7533_in>;
&lpass {
status = "okay";
};
&lpass {
&lpass_codec {
status = "okay";
};
......@@ -314,17 +315,59 @@ &mdss {
status = "okay";
};
&mdss_dsi0_out {
data-lanes = <0 1 2 3>;
remote-endpoint = <&adv7533_in>;
};
&mpss {
status = "okay";
firmware-name = "qcom/apq8016/mba.mbn", "qcom/apq8016/modem.mbn";
};
&pm8916_codec {
status = "okay";
clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;
clock-names = "mclk";
qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
};
&pm8916_resin {
status = "okay";
linux,code = <KEY_VOLUMEDOWN>;
};
&pm8916_rpm_regulators {
/*
* The 96Boards specification expects a 1.8V power rail on the low-speed
* expansion connector that is able to provide at least 0.18W / 100 mA.
* L15/L16 are connected in parallel to provide 55 mA each. A minimum load
* must be specified to ensure the regulators are not put in LPM where they
* would only provide 5 mA.
*/
pm8916_l15: l15 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-system-load = <50000>;
regulator-allow-set-load;
regulator-always-on;
};
pm8916_l16: l16 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-system-load = <50000>;
regulator-allow-set-load;
regulator-always-on;
};
pm8916_l17: l17 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
};
&sdhc_1 {
status = "okay";
......@@ -340,7 +383,7 @@ &sdhc_2 {
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
};
&sound {
......@@ -370,7 +413,7 @@ cpu {
sound-dai = <&lpass MI2S_PRIMARY>;
};
codec {
sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;
sound-dai = <&lpass_codec 0>, <&pm8916_codec 0>;
};
};
......@@ -380,7 +423,7 @@ cpu {
sound-dai = <&lpass MI2S_TERTIARY>;
};
codec {
sound-dai = <&lpass_codec 1>, <&wcd_codec 1>;
sound-dai = <&lpass_codec 1>, <&pm8916_codec 1>;
};
};
};
......@@ -398,13 +441,6 @@ &usb_hs_phy {
extcon = <&usb_id>;
};
&wcd_codec {
clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;
clock-names = "mclk";
qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
};
&wcnss {
status = "okay";
firmware-name = "qcom/apq8016/wcnss.mbn";
......@@ -441,130 +477,19 @@ &wcnss_iris {
&stm { status = "okay"; };
&tpiu { status = "okay"; };
&smd_rpm_regulators {
vdd_l1_l2_l3-supply = <&pm8916_s3>;
vdd_l4_l5_l6-supply = <&pm8916_s4>;
vdd_l7-supply = <&pm8916_s4>;
s3 {
regulator-min-microvolt = <375000>;
regulator-max-microvolt = <1562000>;
};
s4 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
regulator-boot-on;
};
l1 {
regulator-min-microvolt = <375000>;
regulator-max-microvolt = <1525000>;
};
l2 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
l4 {
regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <3337000>;
};
l5 {
regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <3337000>;
};
l6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l7 {
regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <3337000>;
};
l8 {
regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <3337000>;
};
l9 {
regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <3337000>;
};
l10 {
regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <3337000>;
};
l11 {
regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <3337000>;
regulator-allow-set-load;
regulator-system-load = <200000>;
};
l12 {
regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <3337000>;
};
l13 {
regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <3337000>;
};
l14 {
regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <3337000>;
};
/**
* 1.8v required on LS expansion
* for mezzanine boards
*/
l15 {
regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <3337000>;
regulator-always-on;
};
l16 {
regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <3337000>;
};
l17 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
l18 {
regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <3337000>;
};
};
/*
* 2mA drive strength is not enough when connecting multiple
* I2C devices with different pull up resistors.
*/
&i2c2_default {
&blsp_i2c2_default {
drive-strength = <16>;
};
&i2c4_default {
&blsp_i2c4_default {
drive-strength = <16>;
};
&i2c6_default {
&blsp_i2c6_default {
drive-strength = <16>;
};
......@@ -592,7 +517,7 @@ &i2c6_default {
* ones actually used for GPIO.
*/
&msmgpio {
&tlmm {
gpio-line-names =
"[UART0_TX]", /* GPIO_0, LSEC pin 5 */
"[UART0_RX]", /* GPIO_1, LSEC pin 7 */
......@@ -717,7 +642,7 @@ &msmgpio {
"USR_LED_2_CTRL", /* GPIO 120 */
"SB_HS_ID";
msmgpio_leds: msmgpio-leds-state {
tlmm_leds: tlmm-leds-state {
pins = "gpio21", "gpio120";
function = "gpio";
......
arch/arm64/boot/dts/qcom/apq8039-t2.dts 0 → 100644
View file @ 60c2f542
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (c) 2015, The Linux Foundation. All rights reserved.
* Copyright (c) 2020-2023, Linaro Ltd.
*
*/
/dts-v1/;
#include "msm8939.dtsi"
#include "msm8939-pm8916.dtsi"
#include <dt-bindings/arm/qcom,ids.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
#include <dt-bindings/sound/apq8016-lpass.h>
/ {
model = "Square, Inc. T2 Devkit";
compatible = "square,apq8039-t2", "qcom,msm8939";
qcom,board-id = <0x53 0x54>;
qcom,msm-id = <QCOM_ID_APQ8039 0x30000>;
aliases {
mmc0 = &sdhc_1;
mmc1 = &sdhc_2;
serial0 = &blsp_uart1;
serial1 = &blsp_uart2;
};
bl: backlight {
compatible = "gpio-backlight";
pinctrl-0 = <&pinctrl_backlight>;
pinctrl-names = "default";
gpios = <&tlmm 98 GPIO_ACTIVE_HIGH>;
};
chosen {
stdout-path = "serial1:115200n8";
};
vreg_lcd_avdd_reg: lcd-avdd-regulator {
compatible = "regulator-fixed";
regulator-name = "lcd_avdd";
regulator-min-microvolt = <5600000>;
regulator-max-microvolt = <5600000>;
pinctrl-0 = <&pinctrl_lcd_avdd_reg>;
pinctrl-names = "default";
gpio = <&tlmm 86 GPIO_ACTIVE_HIGH>;
startup-delay-us = <300>;
enable-active-high;
};
vreg_lcd_avee_reg: lcd-avee-regulator {
compatible = "regulator-fixed";
regulator-name = "lcd_avee";
regulator-min-microvolt = <5600000>;
regulator-max-microvolt = <5600000>;
pinctrl-0 = <&pinctrl_lcd_avee_reg>;
pinctrl-names = "default";
gpio = <&tlmm 87 GPIO_ACTIVE_HIGH>;
startup-delay-us = <300>;
enable-active-high;
};
vreg_lcd_iovcc_reg: lcd-iovcc-regulator {
compatible = "regulator-fixed";
regulator-name = "lcd_iovcc";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
pinctrl-0 = <&pinctrl_lcd_iovcc_reg>;
pinctrl-names = "default";
gpio = <&tlmm 9 GPIO_ACTIVE_HIGH>;
startup-delay-us = <300>;
enable-active-high;
};
};
&blsp_i2c1 {
status = "okay";
};
&blsp_i2c2 {
status = "okay";
};
&blsp_i2c3 {
status = "okay";
typec_pd: usb-pd@38 {
compatible = "ti,tps6598x";
reg = <0x38>;
interrupt-parent = <&tlmm>;
interrupts = <107 IRQ_TYPE_LEVEL_LOW>;
interrupt-names = "irq";
pinctrl-names = "default";
pinctrl-0 = <&typec_irq>;
typec_con: connector {
compatible = "usb-c-connector";
label = "USB-C";
port {
typec_ep: endpoint {
remote-endpoint = <&otg_ep>;
};
};
};
};
};
&blsp_i2c5 {
status = "okay";
};
&blsp_uart1 {
status = "okay";
};
&blsp_uart1_default {
pins = "gpio0", "gpio1";
};
&blsp_uart1_sleep {
pins = "gpio0", "gpio1";
};
&blsp_uart2 {
status = "okay";
};
&lpass {
status = "okay";
};
&mdss {
status = "okay";
};
&pm8916_codec {
qcom,hphl-jack-type-normally-open;
qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
status = "okay";
};
&pm8916_gpios {
gpio-line-names =
"PM_GPIO1", /* WIFI_GPIO1_PRE */
"PM_GPIO2", /* WIFI_GPIO2_PRE */
"PM_GPIO3",
"PM_GPIO4";
};
&smd_rpm_regulators {
vdd_l1_l2_l3-supply = <&pm8916_s3>;
vdd_l4_l5_l6-supply = <&pm8916_s4>;
vdd_l7-supply = <&pm8916_s4>;
pm8916_s3: s3 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1300000>;
};
pm8916_s4: s4 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2100000>;
};
/* l1 is fixed to 1225000, but not connected in schematic */
pm8916_l2: l2 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
pm8916_l4: l4 {
regulator-min-microvolt = <2050000>;
regulator-max-microvolt = <2050000>;
};
pm8916_l5: l5 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
pm8916_l6: l6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
pm8916_l7: l7 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
pm8916_l8: l8 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2900000>;
};
pm8916_l9: l9 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
pm8916_l10: l10 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
pm8916_l11: l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
};
pm8916_l12: l12 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
};
pm8916_l13: l13 {
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
};
pm8916_l14: l14 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
pm8916_l15: l15 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
pm8916_l16: l16 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
pm8916_l17: l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
pm8916_l18: l18 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2700000>;
};
};
&sdhc_1 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_default_state>;
pinctrl-1 = <&sdc1_sleep_state>;
status = "okay";
};
&sound {
model = "apq8039-square-sndcard";
audio-routing = "AMIC2", "MIC BIAS Internal2";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cdc_pdm_lines_default>;
pinctrl-1 = <&cdc_pdm_lines_sleep>;
internal-codec-playback-dai-link {
link-name = "WCD";
cpu {
sound-dai = <&lpass MI2S_PRIMARY>;
};
codec {
sound-dai = <&lpass_codec 0>, <&pm8916_codec 0>;
};
};
internal-codec-capture-dai-link {
link-name = "WCD-Capture";
cpu {
sound-dai = <&lpass MI2S_TERTIARY>;
};
codec {
sound-dai = <&lpass_codec 1>, <&pm8916_codec 1>;
};
};
};
/*
* Line names are taken from the schematic of T2, Ver X03.
* July 14, 2018. Page 4 in particular.
*/
&tlmm {
gpio-line-names =
"APQ_UART1_TX", /* GPIO_0 */
"APQ_UART1_RX",
"APQ_I2C1_SDA",
"APQ_I2C1_SCL",
"APQ_UART2_TX_1V8",
"APQ_UART2_RX_1V8",
"APQ_I2C2_SDA",
"APQ_I2C2_SCL",
"NC",
"APQ_LCD_IOVCC_EN",
"APQ_I2C3_SDA", /* GPIO_10 */
"APQ_I2C3_SCL",
"TOUCH_RST_1V8_L",
"NC",
"APQ_I2C4_SDA",
"APQ_I2C4_SCL",
"APQ_ID5",
"USB_DISCONNECT",
"APQ_I2C5_SDA",
"APQ_I2C5_SCL",
"APQ_USBC_SPI_MOSI", /* GPIO_20 */
"APQ_USBC_SPI_MISO",
"APQ_USBC_SPI_SS_L",
"APQ_USBC_SPI_CLK",
"APQ_LCD_TE0",
"APQ_LCD_RST_L",
"NC",
"NC",
"ACCELEROMETER_INT1",
"APQ_CAM_I2C0_SDA",
"APQ_CAM_I2C0_SCL", /* GPIO_30 */
"ACCELEROMETER_INT2",
"NC",
"NC",
"NC",
"APQ_K21_RST_1V8_L",
"NC",
"APQ_EDL_1V8",
"TP145",
"BT_SSBI",
"NC", /* GPIO_40 */
"NC",
"NC",
"NC",
"NC",
"NC",
"NC",
"BT_CTRL",
"BT_DAT",
"PWR_GPIO_IN",
"PWR_GPIO_OUT", /* GPIO_50 */
"CARD_DET_MLB_L",
"HALL_SENSOR",
"TP63",
"TP64",
"TP65",
"NC",
"NC",
"NC",
"NC",
"NC", /* GPIO_60 */
"NC",
"APQ_K21_GPIO0_1V8",
"CDC_PDM_CLK",
"CDC_PDM_SYNC",
"CDC_PDM_TX",
"CDC_PDM_RX0",
"CDC_PDM_RX1",
"CDC_PDM_RX2",
"APQ_K21_GPIO1_1V8",
"NC", /* GPIO_70 */
"APQ_HUB_SEL_1V8",
"APQ_K21_GPIO2_1V8",
"APQ_K21_GPIO3_1V8",
"APQ_ID0",
"APQ_ID1",
"APQ_ID2",
"APQ_ID3",
"APQ_ID4",
"APQ_HUB_SUSP_IND",
"BOOT_CONFIG_0", /* GPIO_80 */
"BOOT_CONFIG_1",
"BOOT_CONFIG_2",
"BOOT_CONFIG_3",
"NC",
"NC",
"APQ_LCD_AVDD_EN",
"APQ_LCD_AVEE_EN",
"TP70",
"NC",
"APQ_DEBUG0", /* GPIO_90 */
"APQ_DEBUG1",
"APQ_DEBUG2",
"APQ_DEBUG3",
"TP165",
"NC",
"APQ_LNA_PWR_EN",
"NC",
"APQ_LCD_BL_EN",
"NC",
"APQ_LCD_ID0", /* GPIO_100 */
"APQ_LCD_ID1",
"USBC_GPIO5_1V8",
"NC",
"NC",
"NC",
"APQ_HUB_RST_1V8_L",
"USBC_I2C_IRQ_1V8_L",
"SPE_PWR_EN",
"NC",
"APQ_USB_ID", /* GPIO_110 */
"APQ_EXT_BUCK_VSEL",
"APQ_USB_ID_OUT",
"NC",
"PRNT_RST_L",
"APQ_CRQ_I2C_RDY_1V8",
"TYPEC_RST_1V8_H",
"CHG_BACKPWR_EN",
"CHG_PROCHOT_L",
"NC",
"USBC_GPIO7_1V8", /* GPIO_120 */
"NC";
pinctrl_backlight: backlight-state {
pins = "gpio98";
function = "gpio";
};
pinctrl_lcd_avdd_reg: lcd-avdd-reg-state {
pins = "gpio86";
function = "gpio";
};
pinctrl_lcd_avee_reg: lcd-avee-reg-state {
pins = "gpio87";
function = "gpio";
};
pinctrl_lcd_iovcc_reg: lcd-iovcc-reg-state {
pins = "gpio9";
function = "gpio";
};
pinctrl_lcd_rst: lcd-rst-state {
pins = "gpio25";
function = "gpio";
};
pinctrl_otg_default: otg-default-state {
function = "gpio";
pins = "gpio17";
output-high;
};
pinctrl_otg_device: otg-device-state {
function = "gpio";
pins = "gpio17";
output-low;
};
pinctrl_otg_host: otg-host-state {
function = "gpio";
pins = "gpio17";
output-low;
};
typec_irq: typec-irq-state {
function = "gpio";
pins = "gpio107";
bias-pull-up;
input-enable;
};
};
&usb {
pinctrl-names = "default", "host", "device";
pinctrl-0 = <&pinctrl_otg_default>;
pinctrl-1 = <&pinctrl_otg_host>;
pinctrl-2 = <&pinctrl_otg_device>;
pin-switch-delay-us = <100000>;
usb-role-switch;
status = "okay";
port {
otg_ep: endpoint {
remote-endpoint = <&typec_ep>;
};
};
};
&wcnss {
status = "okay";
};
&wcnss_iris {
compatible = "qcom,wcn3680";
};
arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
View file @ 60c2f542
......@@ -26,7 +26,7 @@ chosen {
v1p05: v1p05-regulator {
compatible = "regulator-fixed";
reglator-name = "v1p05";
regulator-name = "v1p05";
regulator-always-on;
regulator-boot-on;
......@@ -38,7 +38,7 @@ v1p05: v1p05-regulator {
v12_poe: v12-poe-regulator {
compatible = "regulator-fixed";
reglator-name = "v12_poe";
regulator-name = "v12_poe";
regulator-always-on;
regulator-boot-on;
......
arch/arm64/boot/dts/qcom/ipq5332-rdp442.dts 0 → 100644
View file @ 60c2f542
// SPDX-License-Identifier: BSD-3-Clause
/*
* IPQ5332 RDP442 board device tree source
*
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
*/
/dts-v1/;
#include "ipq5332.dtsi"
/ {
model = "Qualcomm Technologies, Inc. IPQ5332 MI01.3";
compatible = "qcom,ipq5332-ap-mi01.3", "qcom,ipq5332";
aliases {
serial0 = &blsp1_uart0;
};
chosen {
stdout-path = "serial0";
};
};
&blsp1_uart0 {
pinctrl-0 = <&serial_0_pins>;
pinctrl-names = "default";
status = "okay";
};
&blsp1_i2c1 {
clock-frequency = <400000>;
pinctrl-0 = <&i2c_1_pins>;
pinctrl-names = "default";
status = "okay";
};
&blsp1_spi0 {
pinctrl-0 = <&spi_0_data_clk_pins &spi_0_cs_pins>;
pinctrl-names = "default";
status = "okay";
flash@0 {
compatible = "micron,n25q128a11", "jedec,spi-nor";
reg = <0>;
#address-cells = <1>;
#size-cells = <1>;
spi-max-frequency = <50000000>;
};
};
&sdhc {
bus-width = <4>;
max-frequency = <192000000>;
mmc-ddr-1_8v;
mmc-hs200-1_8v;
non-removable;
pinctrl-0 = <&sdc_default_state>;
pinctrl-names = "default";
status = "okay";
};
&sleep_clk {
clock-frequency = <32000>;
};
&xo_board {
clock-frequency = <24000000>;
};
/* PINCTRL */
&tlmm {
i2c_1_pins: i2c-1-state {
pins = "gpio29", "gpio30";
function = "blsp1_i2c0";
drive-strength = <8>;
bias-pull-up;
};
sdc_default_state: sdc-default-state {
clk-pins {
pins = "gpio13";
function = "sdc_clk";
drive-strength = <8>;
bias-disable;
};
cmd-pins {
pins = "gpio12";
function = "sdc_cmd";
drive-strength = <8>;
bias-pull-up;
};
data-pins {
pins = "gpio8", "gpio9", "gpio10", "gpio11";
function = "sdc_data";
drive-strength = <8>;
bias-pull-up;
};
};
spi_0_data_clk_pins: spi-0-data-clk-state {
pins = "gpio14", "gpio15", "gpio16";
function = "blsp0_spi";
drive-strength = <2>;
bias-pull-down;
};
spi_0_cs_pins: spi-0-cs-state {
pins = "gpio17";
function = "blsp0_spi";
drive-strength = <2>;
bias-pull-up;
};
};
arch/arm64/boot/dts/qcom/ipq5332.dtsi
View file @ 60c2f542
......@@ -134,6 +134,13 @@ soc@0 {
#size-cells = <1>;
ranges = <0 0 0 0xffffffff>;
qfprom: efuse@a4000 {
compatible = "qcom,ipq5332-qfprom", "qcom,qfprom";
reg = <0x000a4000 0x721>;
#address-cells = <1>;
#size-cells = <1>;
};
rng: rng@e3000 {
compatible = "qcom,prng-ee";
reg = <0x000e3000 0x1000>;
......
arch/arm64/boot/dts/qcom/ipq6018.dtsi
View file @ 60c2f542
......@@ -90,6 +90,7 @@ L2_0: l2-cache {
firmware {
scm {
compatible = "qcom,scm-ipq6018", "qcom,scm";
qcom,dload-mode = <&tcsr 0x6100>;
};
};
......@@ -154,18 +155,28 @@ rpm_msg_ram: memory@60000 {
no-map;
};
bootloader@4a100000 {
reg = <0x0 0x4a100000 0x0 0x400000>;
no-map;
};
sbl@4a500000 {
reg = <0x0 0x4a500000 0x0 0x100000>;
no-map;
};
tz: memory@4a600000 {
reg = <0x0 0x4a600000 0x0 0x00400000>;
reg = <0x0 0x4a600000 0x0 0x400000>;
no-map;
};
smem_region: memory@4aa00000 {
reg = <0x0 0x4aa00000 0x0 0x00100000>;
reg = <0x0 0x4aa00000 0x0 0x100000>;
no-map;
};
q6_region: memory@4ab00000 {
reg = <0x0 0x4ab00000 0x0 0x05500000>;
reg = <0x0 0x4ab00000 0x0 0x5500000>;
no-map;
};
};
......@@ -198,7 +209,7 @@ smem {
hwlocks = <&tcsr_mutex 0>;
};
soc: soc {
soc: soc@0 {
#address-cells = <2>;
#size-cells = <2>;
ranges = <0 0 0 0 0x0 0xffffffff>;
......@@ -301,7 +312,14 @@ mdio: mdio@90000 {
status = "disabled";
};
prng: qrng@e1000 {
qfprom: efuse@a4000 {
compatible = "qcom,ipq6018-qfprom", "qcom,qfprom";
reg = <0x0 0x000a4000 0x0 0x2000>;
#address-cells = <1>;
#size-cells = <1>;
};
prng: qrng@e3000 {
compatible = "qcom,prng-ee";
reg = <0x0 0x000e3000 0x0 0x1000>;
clocks = <&gcc GCC_PRNG_AHB_CLK>;
......@@ -440,7 +458,6 @@ blsp1_spi1: spi@78b5000 {
#size-cells = <0>;
reg = <0x0 0x078b5000 0x0 0x600>;
interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
spi-max-frequency = <50000000>;
clocks = <&gcc GCC_BLSP1_QUP1_SPI_APPS_CLK>,
<&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface";
......@@ -455,7 +472,6 @@ blsp1_spi2: spi@78b6000 {
#size-cells = <0>;
reg = <0x0 0x078b6000 0x0 0x600>;
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
spi-max-frequency = <50000000>;
clocks = <&gcc GCC_BLSP1_QUP2_SPI_APPS_CLK>,
<&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface";
......@@ -571,7 +587,7 @@ intc: interrupt-controller@b000000 {
#address-cells = <2>;
#size-cells = <2>;
interrupt-controller;
#interrupt-cells = <0x3>;
#interrupt-cells = <3>;
reg = <0x0 0x0b000000 0x0 0x1000>, /*GICD*/
<0x0 0x0b002000 0x0 0x1000>, /*GICC*/
<0x0 0x0b001000 0x0 0x1000>, /*GICH*/
......
arch/arm64/boot/dts/qcom/ipq8074.dtsi
View file @ 60c2f542
......@@ -29,8 +29,8 @@ xo: xo {
};
cpus {
#address-cells = <0x1>;
#size-cells = <0x0>;
#address-cells = <1>;
#size-cells = <0>;
CPU0: cpu@0 {
device_type = "cpu";
......@@ -85,29 +85,40 @@ reserved-memory {
#size-cells = <2>;
ranges;
bootloader@4a600000 {
reg = <0x0 0x4a600000 0x0 0x400000>;
no-map;
};
sbl@4aa00000 {
reg = <0x0 0x4aa00000 0x0 0x100000>;
no-map;
};
smem@4ab00000 {
compatible = "qcom,smem";
reg = <0x0 0x4ab00000 0x0 0x00100000>;
reg = <0x0 0x4ab00000 0x0 0x100000>;
no-map;
hwlocks = <&tcsr_mutex 0>;
};
memory@4ac00000 {
reg = <0x0 0x4ac00000 0x0 0x400000>;
no-map;
reg = <0x0 0x4ac00000 0x0 0x00400000>;
};
};
firmware {
scm {
compatible = "qcom,scm-ipq8074", "qcom,scm";
qcom,dload-mode = <&tcsr 0x6100>;
};
};
soc: soc {
#address-cells = <0x1>;
#size-cells = <0x1>;
soc: soc@0 {
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0 0 0xffffffff>;
compatible = "simple-bus";
......@@ -321,9 +332,9 @@ tlmm: pinctrl@1000000 {
interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
gpio-controller;
gpio-ranges = <&tlmm 0 0 70>;
#gpio-cells = <0x2>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <0x2>;
#interrupt-cells = <2>;
serial_4_pins: serial4-state {
pins = "gpio23", "gpio24";
......@@ -381,6 +392,11 @@ tcsr_mutex: hwlock@1905000 {
#hwlock-cells = <1>;
};
tcsr: syscon@1937000 {
compatible = "qcom,tcsr-ipq8074", "syscon";
reg = <0x01937000 0x21000>;
};
spmi_bus: spmi@200f000 {
compatible = "qcom,spmi-pmic-arb";
reg = <0x0200f000 0x001000>,
......@@ -475,7 +491,6 @@ blsp1_spi1: spi@78b5000 {
#size-cells = <0>;
reg = <0x078b5000 0x600>;
interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
spi-max-frequency = <50000000>;
clocks = <&gcc GCC_BLSP1_QUP1_SPI_APPS_CLK>,
<&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface";
......@@ -533,6 +548,20 @@ blsp1_i2c5: i2c@78b9000 {
status = "disabled";
};
blsp1_spi5: spi@78b9000 {
compatible = "qcom,spi-qup-v2.2.1";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x78b9000 0x600>;
interrupts = <GIC_SPI 299 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_BLSP1_QUP5_SPI_APPS_CLK>,
<&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface";
dmas = <&blsp_dma 20>, <&blsp_dma 21>;
dma-names = "tx", "rx";
status = "disabled";
};
blsp1_i2c6: i2c@78ba000 {
compatible = "qcom,i2c-qup-v2.2.1";
#address-cells = <1>;
......@@ -666,7 +695,7 @@ intc: interrupt-controller@b000000 {
#address-cells = <1>;
#size-cells = <1>;
interrupt-controller;
#interrupt-cells = <0x3>;
#interrupt-cells = <3>;
reg = <0x0b000000 0x1000>, <0x0b002000 0x1000>;
ranges = <0 0xb00a000 0xffd>;
......
arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts 0 → 100644
View file @ 60c2f542
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/*
* IPQ9574 RDP418 board device tree source
*
* Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
*/
/dts-v1/;
#include "ipq9574.dtsi"
/ {
model = "Qualcomm Technologies, Inc. IPQ9574/AP-AL02-C2";
compatible = "qcom,ipq9574-ap-al02-c2", "qcom,ipq9574";
aliases {
serial0 = &blsp1_uart2;
};
chosen {
stdout-path = "serial0:115200n8";
};
};
&blsp1_spi0 {
pinctrl-0 = <&spi_0_pins>;
pinctrl-names = "default";
status = "okay";
flash@0 {
compatible = "micron,n25q128a11", "jedec,spi-nor";
reg = <0>;
#address-cells = <1>;
#size-cells = <1>;
spi-max-frequency = <50000000>;
};
};
&blsp1_uart2 {
pinctrl-0 = <&uart2_pins>;
pinctrl-names = "default";
status = "okay";
};
&rpm_requests {
regulators {
compatible = "qcom,rpm-mp5496-regulators";
ipq9574_s1: s1 {
/*
* During kernel bootup, the SoC runs at 800MHz with 875mV set by the bootloaders.
* During regulator registration, kernel not knowing the initial voltage,
* considers it as zero and brings up the regulators with minimum supported voltage.
* Update the regulator-min-microvolt with SVS voltage of 725mV so that
* the regulators are brought up with 725mV which is sufficient for all the
* corner parts to operate at 800MHz
*/
regulator-min-microvolt = <725000>;
regulator-max-microvolt = <1075000>;
};
};
};
&sdhc_1 {
pinctrl-0 = <&sdc_default_state>;
pinctrl-names = "default";
mmc-ddr-1_8v;
mmc-hs200-1_8v;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
max-frequency = <384000000>;
bus-width = <8>;
status = "okay";
};
&sleep_clk {
clock-frequency = <32000>;
};
&tlmm {
sdc_default_state: sdc-default-state {
clk-pins {
pins = "gpio5";
function = "sdc_clk";
drive-strength = <8>;
bias-disable;
};
cmd-pins {
pins = "gpio4";
function = "sdc_cmd";
drive-strength = <8>;
bias-pull-up;
};
data-pins {
pins = "gpio0", "gpio1", "gpio2",
"gpio3", "gpio6", "gpio7",
"gpio8", "gpio9";
function = "sdc_data";
drive-strength = <8>;
bias-pull-up;
};
rclk-pins {
pins = "gpio10";
function = "sdc_rclk";
drive-strength = <8>;
bias-pull-down;
};
};
spi_0_pins: spi-0-state {
pins = "gpio11", "gpio12", "gpio13", "gpio14";
function = "blsp0_spi";
drive-strength = <8>;
bias-disable;
};
};
&xo_board_clk {
clock-frequency = <24000000>;
};
arch/arm64/boot/dts/qcom/ipq9574-al02-c7.dts → arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts
View file @ 60c2f542
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/*
* IPQ9574 AL02-C7 board device tree source
* IPQ9574 RDP433 board device tree source
*
* Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
......@@ -29,6 +29,25 @@ &blsp1_uart2 {
status = "okay";
};
&rpm_requests {
regulators {
compatible = "qcom,rpm-mp5496-regulators";
ipq9574_s1: s1 {
/*
* During kernel bootup, the SoC runs at 800MHz with 875mV set by the bootloaders.
* During regulator registration, kernel not knowing the initial voltage,
* considers it as zero and brings up the regulators with minimum supported voltage.
* Update the regulator-min-microvolt with SVS voltage of 725mV so that
* the regulators are brought up with 725mV which is sufficient for all the
* corner parts to operate at 800MHz
*/
regulator-min-microvolt = <725000>;
regulator-max-microvolt = <1075000>;
};
};
};
&sdhc_1 {
pinctrl-0 = <&sdc_default_state>;
pinctrl-names = "default";
......
arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts 0 → 100644
View file @ 60c2f542
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/*
* IPQ9574 RDP449 board device tree source
*
* Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
*/
/dts-v1/;
#include "ipq9574.dtsi"
/ {
model = "Qualcomm Technologies, Inc. IPQ9574/AP-AL02-C6";
compatible = "qcom,ipq9574-ap-al02-c6", "qcom,ipq9574";
aliases {
serial0 = &blsp1_uart2;
};
chosen {
stdout-path = "serial0:115200n8";
};
};
&blsp1_spi0 {
pinctrl-0 = <&spi_0_pins>;
pinctrl-names = "default";
status = "okay";
flash@0 {
compatible = "micron,n25q128a11", "jedec,spi-nor";
reg = <0>;
#address-cells = <1>;
#size-cells = <1>;
spi-max-frequency = <50000000>;
};
};
&blsp1_uart2 {
pinctrl-0 = <&uart2_pins>;
pinctrl-names = "default";
status = "okay";
};
&rpm_requests {
regulators {
compatible = "qcom,rpm-mp5496-regulators";
ipq9574_s1: s1 {
/*
* During kernel bootup, the SoC runs at 800MHz with 875mV set by the bootloaders.
* During regulator registration, kernel not knowing the initial voltage,
* considers it as zero and brings up the regulators with minimum supported voltage.
* Update the regulator-min-microvolt with SVS voltage of 725mV so that
* the regulators are brought up with 725mV which is sufficient for all the
* corner parts to operate at 800MHz
*/
regulator-min-microvolt = <725000>;
regulator-max-microvolt = <1075000>;
};
};
};
&sleep_clk {
clock-frequency = <32000>;
};
&tlmm {
spi_0_pins: spi-0-state {
pins = "gpio11", "gpio12", "gpio13", "gpio14";
function = "blsp0_spi";
drive-strength = <8>;
bias-disable;
};
};
&xo_board_clk {
clock-frequency = <24000000>;
};
arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts 0 → 100644
View file @ 60c2f542
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/*
* IPQ9574 RDP453 board device tree source
*
* Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
*/
/dts-v1/;
#include "ipq9574.dtsi"
/ {
model = "Qualcomm Technologies, Inc. IPQ9574/AP-AL02-C8";
compatible = "qcom,ipq9574-ap-al02-c8", "qcom,ipq9574";
aliases {
serial0 = &blsp1_uart2;
};
chosen {
stdout-path = "serial0:115200n8";
};
};
&blsp1_spi0 {
pinctrl-0 = <&spi_0_pins>;
pinctrl-names = "default";
status = "okay";
flash@0 {
compatible = "micron,n25q128a11", "jedec,spi-nor";
reg = <0>;
#address-cells = <1>;
#size-cells = <1>;
spi-max-frequency = <50000000>;
};
};
&blsp1_uart2 {
pinctrl-0 = <&uart2_pins>;
pinctrl-names = "default";
status = "okay";
};
&rpm_requests {
regulators {
compatible = "qcom,rpm-mp5496-regulators";
ipq9574_s1: s1 {
/*
* During kernel bootup, the SoC runs at 800MHz with 875mV set by the bootloaders.
* During regulator registration, kernel not knowing the initial voltage,
* considers it as zero and brings up the regulators with minimum supported voltage.
* Update the regulator-min-microvolt with SVS voltage of 725mV so that
* the regulators are brought up with 725mV which is sufficient for all the
* corner parts to operate at 800MHz
*/
regulator-min-microvolt = <725000>;
regulator-max-microvolt = <1075000>;
};
};
};
&sleep_clk {
clock-frequency = <32000>;
};
&tlmm {
spi_0_pins: spi-0-state {
pins = "gpio11", "gpio12", "gpio13", "gpio14";
function = "blsp0_spi";
drive-strength = <8>;
bias-disable;
};
};
&xo_board_clk {
clock-frequency = <24000000>;
};
arch/arm64/boot/dts/qcom/ipq9574.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
View file @ 60c2f542
......@@ -22,7 +22,9 @@ / {
chassis-type = "tablet";
aliases {
serial0 = &blsp1_uart2;
mmc0 = &sdhc_1; /* eMMC */
mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
chosen {
......@@ -39,14 +41,14 @@ gpio-keys {
button-volume-up {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
};
usb_id: usb-id {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&msmgpio 110 GPIO_ACTIVE_HIGH>;
id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>;
};
......@@ -58,7 +60,7 @@ &blsp_i2c2 {
accelerometer@10 {
compatible = "bosch,bmc150_accel";
reg = <0x10>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <115 IRQ_TYPE_EDGE_RISING>;
vdd-supply = <&pm8916_l17>;
......@@ -89,10 +91,10 @@ touchscreen@38 {
compatible = "edt,edt-ft5406";
reg = <0x38>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <13 IRQ_TYPE_LEVEL_LOW>;
reset-gpios = <&msmgpio 12 GPIO_ACTIVE_LOW>;
reset-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
vcc-supply = <&pm8916_l16>;
iovcc-supply = <&pm8916_l6>;
......@@ -105,7 +107,7 @@ touchscreen@38 {
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};
......@@ -114,6 +116,18 @@ &pm8916_resin {
status = "okay";
};
&pm8916_rpm_regulators {
pm8916_l16: l16 {
regulator-min-microvolt = <2900000>;
regulator-max-microvolt = <2900000>;
};
pm8916_l17: l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
};
&pm8916_vib {
status = "okay";
};
......@@ -131,7 +145,7 @@ &sdhc_2 {
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_HIGH>;
cd-gpios = <&tlmm 38 GPIO_ACTIVE_HIGH>;
status = "okay";
};
......@@ -153,110 +167,7 @@ &wcnss_iris {
compatible = "qcom,wcn3620";
};
&smd_rpm_regulators {
vdd_l1_l2_l3-supply = <&pm8916_s3>;
vdd_l4_l5_l6-supply = <&pm8916_s4>;
vdd_l7-supply = <&pm8916_s4>;
s3 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1300000>;
};
s4 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2100000>;
};
l1 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
};
l2 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
l4 {
regulator-min-microvolt = <2050000>;
regulator-max-microvolt = <2050000>;
};
l5 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l7 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l8 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2900000>;
};
l9 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
l10 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2800000>;
};
l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
regulator-system-load = <200000>;
regulator-allow-set-load;
};
l12 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
};
l13 {
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
};
l14 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l15 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l16 {
regulator-min-microvolt = <2900000>;
regulator-max-microvolt = <2900000>;
};
l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
l18 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2700000>;
};
};
&msmgpio {
&tlmm {
accel_int_default: accel-int-default-state {
pins = "gpio115";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
View file @ 60c2f542
......@@ -13,7 +13,9 @@ / {
chassis-type = "handset";
aliases {
serial0 = &blsp1_uart2;
mmc0 = &sdhc_1; /* eMMC */
mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
chosen {
......@@ -30,7 +32,7 @@ gpio-keys {
button-volume-up {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
};
......@@ -42,7 +44,7 @@ gpio-leds {
pinctrl-0 = <&gpio_leds_default>;
led-0 {
gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "torch";
function = LED_FUNCTION_TORCH;
};
......@@ -50,13 +52,13 @@ led-0 {
usb_id: usb-id {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&msmgpio 69 GPIO_ACTIVE_HIGH>;
id-gpio = <&tlmm 69 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>;
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};
......@@ -66,9 +68,9 @@ &blsp_i2c4 {
touchscreen@26 {
compatible = "mstar,msg2638";
reg = <0x26>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
reset-gpios = <&msmgpio 100 GPIO_ACTIVE_LOW>;
reset-gpios = <&tlmm 100 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&ts_int_reset_default>;
vdd-supply = <&pm8916_l17>;
......@@ -86,7 +88,7 @@ magnetometer@c {
reg = <0x0c>;
vdd-supply = <&pm8916_l17>;
vid-supply = <&pm8916_l6>;
reset-gpios = <&msmgpio 8 GPIO_ACTIVE_LOW>;
reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&mag_reset_default>;
mount-matrix = "0", "1", "0",
......@@ -99,7 +101,7 @@ accelerometer@f {
reg = <0x0f>;
vdd-supply = <&pm8916_l17>;
vddio-supply = <&pm8916_l6>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <31 IRQ_TYPE_EDGE_RISING>;
pinctrl-names = "default";
pinctrl-0 = <&accel_int_default>;
......@@ -111,7 +113,7 @@ accelerometer@f {
proximity@48 {
compatible = "sensortek,stk3310";
reg = <0x48>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <12 IRQ_TYPE_EDGE_FALLING>;
pinctrl-names = "default";
pinctrl-0 = <&proximity_int_default>;
......@@ -122,7 +124,7 @@ gyroscope@68 {
reg = <0x68>;
vdd-supply = <&pm8916_l17>;
vddio-supply = <&pm8916_l6>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <97 IRQ_TYPE_EDGE_RISING>,
<98 IRQ_TYPE_EDGE_RISING>;
pinctrl-names = "default";
......@@ -136,7 +138,7 @@ &blsp_i2c6 {
led-controller@68 {
compatible = "si-en,sn3190";
reg = <0x68>;
shutdown-gpios = <&msmgpio 89 GPIO_ACTIVE_HIGH>;
shutdown-gpios = <&tlmm 89 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&led_enable_default &led_shutdown_default>;
#address-cells = <1>;
......@@ -156,6 +158,13 @@ &pm8916_resin {
linux,code = <KEY_VOLUMEDOWN>;
};
&pm8916_rpm_regulators {
pm8916_l17: l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
};
&pm8916_vib {
status = "okay";
};
......@@ -175,7 +184,7 @@ &sdhc_2 {
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
};
&usb {
......@@ -195,110 +204,7 @@ &wcnss_iris {
compatible = "qcom,wcn3620";
};
&smd_rpm_regulators {
vdd_l1_l2_l3-supply = <&pm8916_s3>;
vdd_l4_l5_l6-supply = <&pm8916_s4>;
vdd_l7-supply = <&pm8916_s4>;
s3 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1300000>;
};
s4 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2100000>;
};
l1 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
};
l2 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
l4 {
regulator-min-microvolt = <2050000>;
regulator-max-microvolt = <2050000>;
};
l5 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l7 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l8 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2900000>;
};
l9 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
l10 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2800000>;
};
l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
regulator-allow-set-load;
regulator-system-load = <200000>;
};
l12 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
};
l13 {
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
};
l14 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l15 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l16 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
l18 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2700000>;
};
};
&msmgpio {
&tlmm {
accel_int_default: accel-int-default-state {
pins = "gpio31";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
View file @ 60c2f542
......@@ -13,7 +13,9 @@ / {
chassis-type = "handset";
aliases {
serial0 = &blsp1_uart2;
mmc0 = &sdhc_1; /* eMMC */
mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
chosen {
......@@ -30,14 +32,14 @@ gpio-keys {
button-volume-up {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
debounce-interval = <15>;
};
button-volume-down {
label = "Volume Down";
gpios = <&msmgpio 117 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 117 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;
debounce-interval = <15>;
};
......@@ -49,7 +51,7 @@ reg_sd_vmmc: regulator-sdcard-vmmc {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
gpio = <&msmgpio 87 GPIO_ACTIVE_HIGH>;
gpio = <&tlmm 87 GPIO_ACTIVE_HIGH>;
enable-active-high;
startup-delay-us = <200>;
......@@ -60,7 +62,7 @@ reg_sd_vmmc: regulator-sdcard-vmmc {
usb_id: usb-id {
compatible = "linux,extcon-usb-gpio";
id-gpios = <&msmgpio 110 GPIO_ACTIVE_HIGH>;
id-gpios = <&tlmm 110 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>;
};
......@@ -76,7 +78,7 @@ magnetometer@c {
vdd-supply = <&pm8916_l8>;
vid-supply = <&pm8916_l6>;
reset-gpios = <&msmgpio 112 GPIO_ACTIVE_LOW>;
reset-gpios = <&tlmm 112 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&mag_reset_default>;
......@@ -86,7 +88,7 @@ imu@68 {
compatible = "invensense,mpu6515";
reg = <0x68>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <36 IRQ_TYPE_EDGE_RISING>;
vdd-supply = <&pm8916_l17>;
......@@ -108,10 +110,10 @@ touchscreen@38 {
compatible = "edt,edt-ft5306";
reg = <0x38>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
reset-gpios = <&msmgpio 12 GPIO_ACTIVE_LOW>;
reset-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
vcc-supply = <&pm8916_l11>;
iovcc-supply = <&pm8916_l6>;
......@@ -124,10 +126,17 @@ touchscreen@38 {
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};
&pm8916_rpm_regulators {
pm8916_l17: l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
};
&sdhc_1 {
status = "okay";
......@@ -143,7 +152,7 @@ &sdhc_2 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
};
&usb {
......@@ -163,110 +172,7 @@ &wcnss_iris {
compatible = "qcom,wcn3620";
};
&smd_rpm_regulators {
vdd_l1_l2_l3-supply = <&pm8916_s3>;
vdd_l4_l5_l6-supply = <&pm8916_s4>;
vdd_l7-supply = <&pm8916_s4>;
s3 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1300000>;
};
s4 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2100000>;
};
l1 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
};
l2 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
l4 {
regulator-min-microvolt = <2050000>;
regulator-max-microvolt = <2050000>;
};
l5 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l7 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l8 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2900000>;
};
l9 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
l10 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2800000>;
};
l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
regulator-allow-set-load;
regulator-system-load = <200000>;
};
l12 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
};
l13 {
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
};
l14 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l15 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l16 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
l18 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2700000>;
};
};
&msmgpio {
&tlmm {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107", "gpio117";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
View file @ 60c2f542
......@@ -14,7 +14,9 @@ / {
chassis-type = "tablet";
aliases {
serial0 = &blsp1_uart2;
mmc0 = &sdhc_1; /* eMMC */
mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
chosen {
......@@ -24,8 +26,8 @@ chosen {
flash-led-controller {
/* Actually qcom,leds-gpio-flash */
compatible = "sgmicro,sgm3140";
enable-gpios = <&msmgpio 31 GPIO_ACTIVE_HIGH>;
flash-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
enable-gpios = <&tlmm 31 GPIO_ACTIVE_HIGH>;
flash-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&camera_flash_default>;
pinctrl-names = "default";
......@@ -45,7 +47,7 @@ gpio-keys {
button-volume-up {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
};
......@@ -59,21 +61,21 @@ gpio-leds {
led-red {
function = LED_FUNCTION_CHARGING;
color = <LED_COLOR_ID_RED>;
gpios = <&msmgpio 117 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 117 GPIO_ACTIVE_HIGH>;
retain-state-suspended;
};
led-green {
function = LED_FUNCTION_CHARGING;
color = <LED_COLOR_ID_GREEN>;
gpios = <&msmgpio 118 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 118 GPIO_ACTIVE_HIGH>;
retain-state-suspended;
};
};
usb_id: usb-id {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&msmgpio 110 GPIO_ACTIVE_HIGH>;
id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&usb_id_default>;
pinctrl-names = "default";
};
......@@ -87,10 +89,10 @@ touchscreen@38 {
compatible = "edt,edt-ft5406";
reg = <0x38>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
reset-gpios = <&msmgpio 12 GPIO_ACTIVE_LOW>;
reset-gpios = <&tlmm 12 GPIO_ACTIVE_LOW>;
vcc-supply = <&pm8916_l17>;
iovcc-supply = <&pm8916_l6>;
......@@ -105,7 +107,7 @@ touchscreen@38 {
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};
......@@ -114,6 +116,13 @@ &pm8916_resin {
status = "okay";
};
&pm8916_rpm_regulators {
pm8916_l17: l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
};
&pm8916_vib {
status = "okay";
};
......@@ -131,7 +140,7 @@ &sdhc_2 {
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
pinctrl-names = "default", "sleep";
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
status = "okay";
};
......@@ -153,110 +162,7 @@ &wcnss_iris {
compatible = "qcom,wcn3620";
};
&smd_rpm_regulators {
vdd_l1_l2_l3-supply = <&pm8916_s3>;
vdd_l4_l5_l6-supply = <&pm8916_s4>;
vdd_l7-supply = <&pm8916_s4>;
s3 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1300000>;
};
s4 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2100000>;
};
l1 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
};
l2 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
l4 {
regulator-min-microvolt = <2050000>;
regulator-max-microvolt = <2050000>;
};
l5 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l7 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l8 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2900000>;
};
l9 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
l10 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2800000>;
};
l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
regulator-system-load = <200000>;
regulator-allow-set-load;
};
l12 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
};
l13 {
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
};
l14 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l15 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l16 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
l18 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2700000>;
};
};
&msmgpio {
&tlmm {
camera_flash_default: camera-flash-default-state {
pins = "gpio31", "gpio32";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
View file @ 60c2f542
......@@ -26,7 +26,9 @@ / {
chassis-type = "handset";
aliases {
serial0 = &blsp1_uart2;
mmc0 = &sdhc_1; /* eMMC */
mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
chosen {
......@@ -43,7 +45,7 @@ gpio-keys {
button-volume-up {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
};
......@@ -55,21 +57,21 @@ leds {
pinctrl-0 = <&gpio_leds_default>;
led-0 {
gpios = <&msmgpio 8 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 8 GPIO_ACTIVE_HIGH>;
color = <LED_COLOR_ID_RED>;
default-state = "off";
function = LED_FUNCTION_INDICATOR;
};
led-1 {
gpios = <&msmgpio 9 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 9 GPIO_ACTIVE_HIGH>;
color = <LED_COLOR_ID_GREEN>;
default-state = "off";
function = LED_FUNCTION_INDICATOR;
};
led-2 {
gpios = <&msmgpio 10 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 10 GPIO_ACTIVE_HIGH>;
color = <LED_COLOR_ID_BLUE>;
default-state = "off";
function = LED_FUNCTION_INDICATOR;
......@@ -78,7 +80,7 @@ led-2 {
usb_id: usb-id {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&msmgpio 117 GPIO_ACTIVE_HIGH>;
id-gpio = <&tlmm 117 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>;
};
......@@ -94,7 +96,7 @@ magnetometer@c {
vdd-supply = <&pm8916_l17>;
vid-supply = <&pm8916_l6>;
reset-gpios = <&msmgpio 36 GPIO_ACTIVE_LOW>;
reset-gpios = <&tlmm 36 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&mag_reset_default>;
......@@ -104,7 +106,7 @@ accelerometer@1e {
compatible = "kionix,kx023-1025";
reg = <0x1e>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <115 IRQ_TYPE_EDGE_RISING>;
vdd-supply = <&pm8916_l17>;
......@@ -122,7 +124,7 @@ proximity@39 {
compatible = "avago,apds9930";
reg = <0x39>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <113 IRQ_TYPE_EDGE_FALLING>;
vdd-supply = <&pm8916_l17>;
......@@ -146,7 +148,7 @@ reg_lcd_pos: outp {
regulator-name = "outp";
regulator-min-microvolt = <5400000>;
regulator-max-microvolt = <5400000>;
enable-gpios = <&msmgpio 97 GPIO_ACTIVE_HIGH>;
enable-gpios = <&tlmm 97 GPIO_ACTIVE_HIGH>;
regulator-active-discharge = <1>;
};
......@@ -154,7 +156,7 @@ reg_lcd_neg: outn {
regulator-name = "outn";
regulator-min-microvolt = <5400000>;
regulator-max-microvolt = <5400000>;
enable-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
enable-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
regulator-active-discharge = <1>;
};
};
......@@ -169,7 +171,7 @@ rmi4@70 {
#address-cells = <1>;
#size-cells = <0>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
vdd-supply = <&pm8916_l17>;
......@@ -199,18 +201,18 @@ nfc@28 {
compatible = "nxp,pn547", "nxp,nxp-nci-i2c";
reg = <0x28>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <21 IRQ_TYPE_EDGE_RISING>;
enable-gpios = <&msmgpio 20 GPIO_ACTIVE_HIGH>;
firmware-gpios = <&msmgpio 2 GPIO_ACTIVE_HIGH>;
enable-gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>;
firmware-gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&nfc_default>;
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};
......@@ -218,11 +220,40 @@ &lpass {
status = "okay";
};
&lpass_codec {
status = "okay";
};
&pm8916_codec {
status = "okay";
qcom,micbias-lvl = <2800>;
qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
qcom,hphl-jack-type-normally-open;
};
&pm8916_l8 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
};
&pm8916_resin {
status = "okay";
linux,code = <KEY_VOLUMEDOWN>;
};
&pm8916_rpm_regulators {
pm8916_l16: l16 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
pm8916_l17: l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
};
&pm8916_vib {
status = "okay";
};
......@@ -243,7 +274,7 @@ &sdhc_2 {
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdhc2_cd_default>;
/*
* The Huawei device tree sets cd-gpios = <&msmgpio 38 GPIO_ACTIVE_HIGH>.
* The Huawei device tree sets cd-gpios = <&tlmm 38 GPIO_ACTIVE_HIGH>.
* However, gpio38 does not change its state when inserting/removing the
* SD card, it's just low all the time. The Huawei kernel seems to use
* polling for SD card detection instead.
......@@ -255,7 +286,7 @@ &sdhc_2 {
* Maybe Huawei decided to replace the second SIM card slot with the
* SD card slot and forgot to re-route to gpio38.
*/
cd-gpios = <&msmgpio 56 GPIO_ACTIVE_LOW>;
cd-gpios = <&tlmm 56 GPIO_ACTIVE_LOW>;
};
&sound {
......@@ -277,7 +308,7 @@ cpu {
sound-dai = <&lpass MI2S_PRIMARY>;
};
codec {
sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;
sound-dai = <&lpass_codec 0>, <&pm8916_codec 0>;
};
};
......@@ -287,7 +318,7 @@ cpu {
sound-dai = <&lpass MI2S_TERTIARY>;
};
codec {
sound-dai = <&lpass_codec 1>, <&wcd_codec 1>;
sound-dai = <&lpass_codec 1>, <&pm8916_codec 1>;
};
};
};
......@@ -301,13 +332,6 @@ &usb_hs_phy {
extcon = <&usb_id>;
};
&wcd_codec {
qcom,micbias-lvl = <2800>;
qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
qcom,hphl-jack-type-normally-open;
};
&wcnss {
status = "okay";
};
......@@ -316,110 +340,7 @@ &wcnss_iris {
compatible = "qcom,wcn3620";
};
&smd_rpm_regulators {
vdd_l1_l2_l3-supply = <&pm8916_s3>;
vdd_l4_l5_l6-supply = <&pm8916_s4>;
vdd_l7-supply = <&pm8916_s4>;
s3 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1300000>;
};
s4 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2100000>;
};
l1 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
};
l2 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
l4 {
regulator-min-microvolt = <2050000>;
regulator-max-microvolt = <2050000>;
};
l5 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l7 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l8 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
};
l9 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
l10 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2800000>;
};
l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
regulator-allow-set-load;
regulator-system-load = <200000>;
};
l12 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
};
l13 {
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
};
l14 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l15 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l16 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
l18 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2700000>;
};
};
&msmgpio {
&tlmm {
accel_irq_default: accel-irq-default-state {
pins = "gpio115";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
View file @ 60c2f542
......@@ -14,7 +14,9 @@ / {
chassis-type = "handset";
aliases {
serial0 = &blsp1_uart2;
mmc0 = &sdhc_1; /* eMMC */
mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
chosen {
......@@ -41,7 +43,7 @@ gpio-keys {
button-volume-up {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
};
......@@ -53,7 +55,7 @@ reg_ctp: regulator-ctp {
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
gpio = <&msmgpio 17 GPIO_ACTIVE_HIGH>;
gpio = <&tlmm 17 GPIO_ACTIVE_HIGH>;
enable-active-high;
pinctrl-names = "default";
......@@ -62,8 +64,8 @@ reg_ctp: regulator-ctp {
flash-led-controller {
compatible = "sgmicro,sgm3140";
flash-gpios = <&msmgpio 31 GPIO_ACTIVE_HIGH>;
enable-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
flash-gpios = <&tlmm 31 GPIO_ACTIVE_HIGH>;
enable-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&camera_flash_default>;
......@@ -122,7 +124,7 @@ accelerometer@10 {
* to the BMC156. However, there are two pads next to the chip
* that can be shorted to make it work if needed.
*
* interrupt-parent = <&msmgpio>;
* interrupt-parent = <&tlmm>;
* interrupts = <116 IRQ_TYPE_EDGE_RISING>;
*/
......@@ -141,7 +143,7 @@ magnetometer@12 {
compatible = "bosch,bmc156_magn";
reg = <0x12>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <113 IRQ_TYPE_EDGE_RISING>;
pinctrl-names = "default";
......@@ -156,7 +158,7 @@ light-sensor@23 {
reg = <0x23>;
proximity-near-level = <75>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <115 IRQ_TYPE_EDGE_FALLING>;
pinctrl-names = "default";
......@@ -170,7 +172,7 @@ gyroscope@68 {
compatible = "bosch,bmg160";
reg = <0x68>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <23 IRQ_TYPE_EDGE_RISING>,
<22 IRQ_TYPE_EDGE_RISING>;
......@@ -191,7 +193,7 @@ rmi4@20 {
#address-cells = <1>;
#size-cells = <0>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
vdd-supply = <&reg_ctp>;
......@@ -214,7 +216,7 @@ rmi4-f12@12 {
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};
......@@ -223,6 +225,13 @@ &pm8916_resin {
linux,code = <KEY_VOLUMEDOWN>;
};
&pm8916_rpm_regulators {
pm8916_l17: l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
};
&pm8916_usbin {
status = "okay";
};
......@@ -267,110 +276,7 @@ &wcnss_iris {
compatible = "qcom,wcn3620";
};
&smd_rpm_regulators {
vdd_l1_l2_l3-supply = <&pm8916_s3>;
vdd_l4_l5_l6-supply = <&pm8916_s4>;
vdd_l7-supply = <&pm8916_s4>;
s3 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1300000>;
};
s4 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2100000>;
};
l1 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
};
l2 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
l4 {
regulator-min-microvolt = <2050000>;
regulator-max-microvolt = <2050000>;
};
l5 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l7 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l8 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2900000>;
};
l9 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
l10 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2800000>;
};
l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
regulator-allow-set-load;
regulator-system-load = <200000>;
};
l12 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
};
l13 {
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
};
l14 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l15 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l16 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
l18 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2700000>;
};
};
&msmgpio {
&tlmm {
accel_int_default: accel-int-default-state {
pins = "gpio116";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
View file @ 60c2f542
......@@ -13,13 +13,30 @@ / {
chassis-type = "handset";
aliases {
serial0 = &blsp1_uart2;
mmc0 = &sdhc_1; /* eMMC */
mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
chosen {
stdout-path = "serial0";
};
flash-led-controller {
compatible = "ocs,ocp8110";
enable-gpios = <&tlmm 49 GPIO_ACTIVE_HIGH>;
flash-gpios = <&tlmm 119 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&camera_front_flash_default>;
pinctrl-names = "default";
flash_led: led {
function = LED_FUNCTION_FLASH;
color = <LED_COLOR_ID_WHITE>;
flash-max-timeout-us = <250000>;
};
};
gpio-keys {
compatible = "gpio-keys";
......@@ -30,7 +47,7 @@ gpio-keys {
button-volume-up {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
};
......@@ -39,7 +56,7 @@ leds {
compatible = "gpio-leds";
led-0 {
gpios = <&msmgpio 17 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 17 GPIO_ACTIVE_HIGH>;
color = <LED_COLOR_ID_WHITE>;
default-state = "off";
function = LED_FUNCTION_KBD_BACKLIGHT;
......@@ -51,7 +68,7 @@ led-0 {
usb_id: usb-id {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&msmgpio 110 GPIO_ACTIVE_HIGH>;
id-gpio = <&tlmm 110 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>;
};
......@@ -67,7 +84,7 @@ magnetometer@d {
vdd-supply = <&pm8916_l17>;
vid-supply = <&pm8916_l6>;
reset-gpios = <&msmgpio 111 GPIO_ACTIVE_LOW>;
reset-gpios = <&tlmm 111 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&mag_reset_default>;
......@@ -86,7 +103,7 @@ imu@68 {
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};
......@@ -95,6 +112,13 @@ &pm8916_resin {
linux,code = <KEY_VOLUMEDOWN>;
};
&pm8916_rpm_regulators {
pm8916_l17: l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
};
&pm8916_vib {
status = "okay";
};
......@@ -114,7 +138,7 @@ &sdhc_2 {
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
};
&usb {
......@@ -134,110 +158,7 @@ &wcnss_iris {
compatible = "qcom,wcn3620";
};
&smd_rpm_regulators {
vdd_l1_l2_l3-supply = <&pm8916_s3>;
vdd_l4_l5_l6-supply = <&pm8916_s4>;
vdd_l7-supply = <&pm8916_s4>;
s3 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1300000>;
};
s4 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2100000>;
};
l1 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
};
l2 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
l4 {
regulator-min-microvolt = <2050000>;
regulator-max-microvolt = <2050000>;
};
l5 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l7 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l8 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2900000>;
};
l9 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
l10 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2800000>;
};
l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
regulator-allow-set-load;
regulator-system-load = <200000>;
};
l12 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
};
l13 {
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
};
l14 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l15 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l16 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
l18 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2700000>;
};
};
&msmgpio {
&tlmm {
button_backlight_default: button-backlight-default-state {
pins = "gpio17";
function = "gpio";
......@@ -246,6 +167,13 @@ button_backlight_default: button-backlight-default-state {
bias-disable;
};
camera_front_flash_default: camera-front-flash-default-state {
pins = "gpio49", "gpio119";
function = "gpio";
drive-strength = <2>;
bias-disable;
};
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-mtp.dts
View file @ 60c2f542
......@@ -12,7 +12,7 @@ / {
compatible = "qcom,msm8916-mtp", "qcom,msm8916-mtp/1", "qcom,msm8916";
aliases {
serial0 = &blsp1_uart2;
serial0 = &blsp_uart2;
usid0 = &pm8916_0;
};
......@@ -21,6 +21,6 @@ chosen {
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};
arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
View file @ 60c2f542
......@@ -3,9 +3,9 @@
* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
*/
&msmgpio {
&tlmm {
blsp1_uart1_default: blsp1-uart1-default-state {
blsp_uart1_default: blsp-uart1-default-state {
/* TX, RX, CTS_N, RTS_N */
pins = "gpio0", "gpio1", "gpio2", "gpio3";
function = "blsp_uart1";
......@@ -14,7 +14,7 @@ blsp1_uart1_default: blsp1-uart1-default-state {
bias-disable;
};
blsp1_uart1_sleep: blsp1-uart1-sleep-state {
blsp_uart1_sleep: blsp-uart1-sleep-state {
pins = "gpio0", "gpio1", "gpio2", "gpio3";
function = "gpio";
......@@ -22,7 +22,7 @@ blsp1_uart1_sleep: blsp1-uart1-sleep-state {
bias-pull-down;
};
blsp1_uart2_default: blsp1-uart2-default-state {
blsp_uart2_default: blsp-uart2-default-state {
pins = "gpio4", "gpio5";
function = "blsp_uart2";
......@@ -30,7 +30,7 @@ blsp1_uart2_default: blsp1-uart2-default-state {
bias-disable;
};
blsp1_uart2_sleep: blsp1-uart2-sleep-state {
blsp_uart2_sleep: blsp-uart2-sleep-state {
pins = "gpio4", "gpio5";
function = "gpio";
......@@ -38,7 +38,7 @@ blsp1_uart2_sleep: blsp1-uart2-sleep-state {
bias-pull-down;
};
spi1_default: spi1-default-state {
blsp_spi1_default: blsp-spi1-default-state {
spi-pins {
pins = "gpio0", "gpio1", "gpio3";
function = "blsp_spi1";
......@@ -56,7 +56,7 @@ cs-pins {
};
};
spi1_sleep: spi1-sleep-state {
blsp_spi1_sleep: blsp-spi1-sleep-state {
pins = "gpio0", "gpio1", "gpio2", "gpio3";
function = "gpio";
......@@ -64,7 +64,7 @@ spi1_sleep: spi1-sleep-state {
bias-pull-down;
};
spi2_default: spi2-default-state {
blsp_spi2_default: blsp-spi2-default-state {
spi-pins {
pins = "gpio4", "gpio5", "gpio7";
function = "blsp_spi2";
......@@ -82,7 +82,7 @@ cs-pins {
};
};
spi2_sleep: spi2-sleep-state {
blsp_spi2_sleep: blsp-spi2-sleep-state {
pins = "gpio4", "gpio5", "gpio6", "gpio7";
function = "gpio";
......@@ -90,7 +90,7 @@ spi2_sleep: spi2-sleep-state {
bias-pull-down;
};
spi3_default: spi3-default-state {
blsp_spi3_default: blsp-spi3-default-state {
spi-pins {
pins = "gpio8", "gpio9", "gpio11";
function = "blsp_spi3";
......@@ -108,7 +108,7 @@ cs-pins {
};
};
spi3_sleep: spi3-sleep-state {
blsp_spi3_sleep: blsp-spi3-sleep-state {
pins = "gpio8", "gpio9", "gpio10", "gpio11";
function = "gpio";
......@@ -116,7 +116,7 @@ spi3_sleep: spi3-sleep-state {
bias-pull-down;
};
spi4_default: spi4-default-state {
blsp_spi4_default: blsp-spi4-default-state {
spi-pins {
pins = "gpio12", "gpio13", "gpio15";
function = "blsp_spi4";
......@@ -134,7 +134,7 @@ cs-pins {
};
};
spi4_sleep: spi4-sleep-state {
blsp_spi4_sleep: blsp-spi4-sleep-state {
pins = "gpio12", "gpio13", "gpio14", "gpio15";
function = "gpio";
......@@ -142,7 +142,7 @@ spi4_sleep: spi4-sleep-state {
bias-pull-down;
};
spi5_default: spi5-default-state {
blsp_spi5_default: blsp-spi5-default-state {
spi-pins {
pins = "gpio16", "gpio17", "gpio19";
function = "blsp_spi5";
......@@ -160,7 +160,7 @@ cs-pins {
};
};
spi5_sleep: spi5-sleep-state {
blsp_spi5_sleep: blsp-spi5-sleep-state {
pins = "gpio16", "gpio17", "gpio18", "gpio19";
function = "gpio";
......@@ -168,7 +168,7 @@ spi5_sleep: spi5-sleep-state {
bias-pull-down;
};
spi6_default: spi6-default-state {
blsp_spi6_default: blsp-spi6-default-state {
spi-pins {
pins = "gpio20", "gpio21", "gpio23";
function = "blsp_spi6";
......@@ -186,7 +186,7 @@ cs-pins {
};
};
spi6_sleep: spi6-sleep-state {
blsp_spi6_sleep: blsp-spi6-sleep-state {
pins = "gpio20", "gpio21", "gpio22", "gpio23";
function = "gpio";
......@@ -194,7 +194,7 @@ spi6_sleep: spi6-sleep-state {
bias-pull-down;
};
i2c1_default: i2c1-default-state {
blsp_i2c1_default: blsp-i2c1-default-state {
pins = "gpio2", "gpio3";
function = "blsp_i2c1";
......@@ -202,7 +202,7 @@ i2c1_default: i2c1-default-state {
bias-disable;
};
i2c1_sleep: i2c1-sleep-state {
blsp_i2c1_sleep: blsp-i2c1-sleep-state {
pins = "gpio2", "gpio3";
function = "gpio";
......@@ -210,7 +210,7 @@ i2c1_sleep: i2c1-sleep-state {
bias-disable;
};
i2c2_default: i2c2-default-state {
blsp_i2c2_default: blsp-i2c2-default-state {
pins = "gpio6", "gpio7";
function = "blsp_i2c2";
......@@ -218,7 +218,7 @@ i2c2_default: i2c2-default-state {
bias-disable;
};
i2c2_sleep: i2c2-sleep-state {
blsp_i2c2_sleep: blsp-i2c2-sleep-state {
pins = "gpio6", "gpio7";
function = "gpio";
......@@ -226,7 +226,7 @@ i2c2_sleep: i2c2-sleep-state {
bias-disable;
};
i2c3_default: i2c3-default-state {
blsp_i2c3_default: blsp-i2c3-default-state {
pins = "gpio10", "gpio11";
function = "blsp_i2c3";
......@@ -234,7 +234,7 @@ i2c3_default: i2c3-default-state {
bias-disable;
};
i2c3_sleep: i2c3-sleep-state {
blsp_i2c3_sleep: blsp-i2c3-sleep-state {
pins = "gpio10", "gpio11";
function = "gpio";
......@@ -242,7 +242,7 @@ i2c3_sleep: i2c3-sleep-state {
bias-disable;
};
i2c4_default: i2c4-default-state {
blsp_i2c4_default: blsp-i2c4-default-state {
pins = "gpio14", "gpio15";
function = "blsp_i2c4";
......@@ -250,7 +250,7 @@ i2c4_default: i2c4-default-state {
bias-disable;
};
i2c4_sleep: i2c4-sleep-state {
blsp_i2c4_sleep: blsp-i2c4-sleep-state {
pins = "gpio14", "gpio15";
function = "gpio";
......@@ -258,7 +258,7 @@ i2c4_sleep: i2c4-sleep-state {
bias-disable;
};
i2c5_default: i2c5-default-state {
blsp_i2c5_default: blsp-i2c5-default-state {
pins = "gpio18", "gpio19";
function = "blsp_i2c5";
......@@ -266,7 +266,7 @@ i2c5_default: i2c5-default-state {
bias-disable;
};
i2c5_sleep: i2c5-sleep-state {
blsp_i2c5_sleep: blsp-i2c5-sleep-state {
pins = "gpio18", "gpio19";
function = "gpio";
......@@ -274,7 +274,7 @@ i2c5_sleep: i2c5-sleep-state {
bias-disable;
};
i2c6_default: i2c6-default-state {
blsp_i2c6_default: blsp-i2c6-default-state {
pins = "gpio22", "gpio23";
function = "blsp_i2c6";
......@@ -282,7 +282,7 @@ i2c6_default: i2c6-default-state {
bias-disable;
};
i2c6_sleep: i2c6-sleep-state {
blsp_i2c6_sleep: blsp-i2c6-sleep-state {
pins = "gpio22", "gpio23";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
View file @ 60c2f542
// SPDX-License-Identifier: GPL-2.0-only
/*
* msm8916-pm8916.dtsi describes common properties (e.g. regulator connections)
* that apply to most devices that make use of the MSM8916 SoC and PM8916 PMIC.
* Many regulators have a fixed purpose in the original reference design and
* were rarely re-used for different purposes. Devices that deviate from the
* typical reference design should not make use of this include and instead add
* the necessary properties in the board-specific device tree.
*/
#include "msm8916.dtsi"
#include "pm8916.dtsi"
......@@ -7,12 +15,12 @@ &camss {
vdda-supply = <&pm8916_l2>;
};
&dsi0 {
&mdss_dsi0 {
vdda-supply = <&pm8916_l2>;
vddio-supply = <&pm8916_l6>;
};
&dsi_phy0 {
&mdss_dsi0_phy {
vddio-supply = <&pm8916_l6>;
};
......@@ -20,6 +28,12 @@ &mpss {
pll-supply = <&pm8916_l7>;
};
&pm8916_codec {
vdd-cdc-io-supply = <&pm8916_l5>;
vdd-cdc-tx-rx-cx-supply = <&pm8916_l5>;
vdd-micbias-supply = <&pm8916_l13>;
};
&sdhc_1 {
vmmc-supply = <&pm8916_l8>;
vqmmc-supply = <&pm8916_l5>;
......@@ -47,30 +61,97 @@ &wcnss_iris {
};
&rpm_requests {
smd_rpm_regulators: regulators {
pm8916_rpm_regulators: regulators {
compatible = "qcom,rpm-pm8916-regulators";
vdd_l1_l2_l3-supply = <&pm8916_s3>;
vdd_l4_l5_l6-supply = <&pm8916_s4>;
vdd_l7-supply = <&pm8916_s4>;
/* pm8916_s1 is managed by rpmpd (MSM8916_VDDCX) */
pm8916_s3: s3 {};
pm8916_s4: s4 {};
pm8916_l1: l1 {};
pm8916_l2: l2 {};
pm8916_s3: s3 {
regulator-min-microvolt = <1250000>;
regulator-max-microvolt = <1350000>;
regulator-always-on; /* Needed for L2 */
};
pm8916_s4: s4 {
regulator-min-microvolt = <1850000>;
regulator-max-microvolt = <2150000>;
regulator-always-on; /* Needed for L5/L7 */
};
/*
* Some of the regulators are unused or managed by another
* processor (e.g. the modem). We should still define nodes for
* them to ensure the vote from the application processor can be
* dropped in case the regulators are already on during boot.
*
* The labels for these nodes are omitted on purpose because
* boards should configure a proper voltage before using them.
*/
l1 {};
pm8916_l2: l2 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-always-on; /* Needed for LPDDR RAM */
};
/* pm8916_l3 is managed by rpmpd (MSM8916_VDDMX) */
pm8916_l4: l4 {};
pm8916_l5: l5 {};
pm8916_l6: l6 {};
pm8916_l7: l7 {};
pm8916_l8: l8 {};
pm8916_l9: l9 {};
pm8916_l10: l10 {};
pm8916_l11: l11 {};
pm8916_l12: l12 {};
pm8916_l13: l13 {};
pm8916_l14: l14 {};
pm8916_l15: l15 {};
pm8916_l16: l16 {};
pm8916_l17: l17 {};
pm8916_l18: l18 {};
l4 {};
pm8916_l5: l5 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on; /* Needed for most digital I/O */
};
pm8916_l6: l6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
pm8916_l7: l7 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on; /* Needed for CPU PLL */
};
pm8916_l8: l8 {
regulator-min-microvolt = <2900000>;
regulator-max-microvolt = <2900000>;
};
pm8916_l9: l9 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
l10 {};
pm8916_l11: l11 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
regulator-allow-set-load;
regulator-system-load = <200000>;
};
pm8916_l12: l12 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
};
pm8916_l13: l13 {
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
};
l14 {};
l15 {};
l16 {};
l17 {};
l18 {};
};
};
arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
View file @ 60c2f542
......@@ -8,7 +8,9 @@
/ {
aliases {
serial0 = &blsp1_uart2;
mmc0 = &sdhc_1; /* eMMC */
mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
chosen {
......@@ -44,13 +46,13 @@ gpio-keys {
button-volume-up {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
button-home {
label = "Home";
gpios = <&msmgpio 109 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 109 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOMEPAGE>;
};
};
......@@ -65,7 +67,7 @@ gpio-hall-sensor {
event-hall-sensor {
label = "Hall Effect Sensor";
gpios = <&msmgpio 52 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 52 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_SW>;
linux,code = <SW_LID>;
linux,can-disable;
......@@ -83,7 +85,7 @@ reg_motor_vdd: regulator-motor-vdd {
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
gpio = <&msmgpio 76 GPIO_ACTIVE_HIGH>;
gpio = <&tlmm 76 GPIO_ACTIVE_HIGH>;
enable-active-high;
pinctrl-names = "default";
......@@ -96,7 +98,7 @@ reg_vdd_tsp_a: regulator-vdd-tsp-a {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&msmgpio 73 GPIO_ACTIVE_HIGH>;
gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>;
enable-active-high;
pinctrl-names = "default";
......@@ -105,8 +107,8 @@ reg_vdd_tsp_a: regulator-vdd-tsp-a {
i2c-muic {
compatible = "i2c-gpio";
sda-gpios = <&msmgpio 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&msmgpio 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
sda-gpios = <&tlmm 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&tlmm 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
pinctrl-names = "default";
pinctrl-0 = <&muic_i2c_default>;
......@@ -118,7 +120,7 @@ muic: extcon@25 {
compatible = "siliconmitus,sm5502-muic";
reg = <0x25>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <12 IRQ_TYPE_EDGE_FALLING>;
pinctrl-names = "default";
......@@ -128,8 +130,8 @@ muic: extcon@25 {
i2c-tkey {
compatible = "i2c-gpio";
sda-gpios = <&msmgpio 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&msmgpio 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
sda-gpios = <&tlmm 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&tlmm 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
pinctrl-names = "default";
pinctrl-0 = <&tkey_i2c_default>;
......@@ -142,7 +144,7 @@ touchkey: touchkey@20 {
compatible = "coreriver,tc360-touchkey";
reg = <0x20>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <98 IRQ_TYPE_EDGE_FALLING>;
/* vcc/vdd-supply are board-specific */
......@@ -157,8 +159,8 @@ touchkey: touchkey@20 {
i2c-nfc {
compatible = "i2c-gpio";
sda-gpios = <&msmgpio 0 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&msmgpio 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
sda-gpios = <&tlmm 0 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&tlmm 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
pinctrl-names = "default";
pinctrl-0 = <&nfc_i2c_default>;
......@@ -170,11 +172,11 @@ nfc@27 {
compatible = "samsung,s3fwrn5-i2c";
reg = <0x27>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <21 IRQ_TYPE_EDGE_RISING>;
en-gpios = <&msmgpio 20 GPIO_ACTIVE_LOW>;
wake-gpios = <&msmgpio 49 GPIO_ACTIVE_HIGH>;
en-gpios = <&tlmm 20 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 49 GPIO_ACTIVE_HIGH>;
clocks = <&rpmcc RPM_SMD_BB_CLK2_PIN>;
......@@ -200,7 +202,7 @@ &blsp_i2c2 {
accelerometer: accelerometer@10 {
compatible = "bosch,bmc150_accel";
reg = <0x10>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <115 IRQ_TYPE_EDGE_RISING>;
vdd-supply = <&pm8916_l17>;
......@@ -225,7 +227,7 @@ &blsp_i2c4 {
battery@35 {
compatible = "richtek,rt5033-battery";
reg = <0x35>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <121 IRQ_TYPE_EDGE_BOTH>;
pinctrl-names = "default";
......@@ -233,25 +235,32 @@ battery@35 {
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};
&dsi0 {
&mdss {
status = "okay";
};
&mdss_dsi0 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&mdss_default>;
pinctrl-1 = <&mdss_sleep>;
};
&mdss {
status = "okay";
};
&pm8916_resin {
status = "okay";
linux,code = <KEY_VOLUMEDOWN>;
};
&pm8916_rpm_regulators {
pm8916_l17: l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
};
&sdhc_1 {
status = "okay";
......@@ -267,7 +276,7 @@ &sdhc_2 {
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
};
&usb {
......@@ -279,110 +288,7 @@ &usb_hs_phy {
extcon = <&muic>;
};
&smd_rpm_regulators {
vdd_l1_l2_l3-supply = <&pm8916_s3>;
vdd_l4_l5_l6-supply = <&pm8916_s4>;
vdd_l7-supply = <&pm8916_s4>;
s3 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1300000>;
};
s4 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2100000>;
};
l1 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
};
l2 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
l4 {
regulator-min-microvolt = <2050000>;
regulator-max-microvolt = <2050000>;
};
l5 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l7 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l8 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2900000>;
};
l9 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
l10 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2800000>;
};
l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
regulator-allow-set-load;
regulator-system-load = <200000>;
};
l12 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
};
l13 {
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
};
l14 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l15 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l16 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
l18 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2700000>;
};
};
&msmgpio {
&tlmm {
accel_int_default: accel-int-default-state {
pins = "gpio115";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
View file @ 60c2f542
......@@ -15,7 +15,7 @@ reg_panel_vdd3: regulator-panel-vdd3 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
gpio = <&msmgpio 9 GPIO_ACTIVE_HIGH>;
gpio = <&tlmm 9 GPIO_ACTIVE_HIGH>;
enable-active-high;
pinctrl-names = "default";
......@@ -28,7 +28,7 @@ reg_touch_key: regulator-touch-key {
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
gpio = <&msmgpio 86 GPIO_ACTIVE_HIGH>;
gpio = <&tlmm 86 GPIO_ACTIVE_HIGH>;
enable-active-high;
pinctrl-names = "default";
......@@ -41,7 +41,7 @@ reg_key_led: regulator-key-led {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&msmgpio 60 GPIO_ACTIVE_HIGH>;
gpio = <&tlmm 60 GPIO_ACTIVE_HIGH>;
enable-active-high;
pinctrl-names = "default";
......@@ -67,7 +67,7 @@ touchscreen@20 {
compatible = "zinitix,bt541";
reg = <0x20>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
touchscreen-size-x = <540>;
......@@ -85,7 +85,7 @@ &clk_pwm {
status = "okay";
};
&dsi0 {
&mdss_dsi0 {
panel@0 {
reg = <0>;
......@@ -93,17 +93,17 @@ panel@0 {
vdd3-supply = <&reg_panel_vdd3>;
vci-supply = <&pm8916_l17>;
reset-gpios = <&msmgpio 25 GPIO_ACTIVE_HIGH>;
reset-gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>;
port {
panel_in: endpoint {
remote-endpoint = <&dsi0_out>;
remote-endpoint = <&mdss_dsi0_out>;
};
};
};
};
&dsi0_out {
&mdss_dsi0_out {
data-lanes = <0 1>;
remote-endpoint = <&panel_in>;
};
......@@ -120,7 +120,7 @@ &wcnss_iris {
compatible = "qcom,wcn3620";
};
&msmgpio {
&tlmm {
panel_vdd3_default: panel-vdd3-default-state {
pins = "gpio9";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
View file @ 60c2f542
......@@ -15,7 +15,7 @@ reg_touch_key: regulator-touch-key {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&msmgpio 97 GPIO_ACTIVE_HIGH>;
gpio = <&tlmm 97 GPIO_ACTIVE_HIGH>;
enable-active-high;
pinctrl-names = "default";
......@@ -36,7 +36,7 @@ touchscreen@48 {
compatible = "melfas,mms345l";
reg = <0x48>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
touchscreen-size-x = <720>;
......@@ -71,7 +71,7 @@ &wcnss_iris {
compatible = "qcom,wcn3660b";
};
&msmgpio {
&tlmm {
tkey_en_default: tkey-en-default-state {
pins = "gpio97";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
View file @ 60c2f542
......@@ -18,7 +18,7 @@ muic: extcon@14 {
compatible = "siliconmitus,sm5504-muic";
reg = <0x14>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <12 IRQ_TYPE_EDGE_FALLING>;
pinctrl-names = "default";
......@@ -32,7 +32,7 @@ reg_touch_key: regulator-touch-key {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&msmgpio 97 GPIO_ACTIVE_HIGH>;
gpio = <&tlmm 97 GPIO_ACTIVE_HIGH>;
enable-active-high;
pinctrl-names = "default";
......@@ -66,7 +66,7 @@ &wcnss_iris {
compatible = "qcom,wcn3620";
};
&msmgpio {
&tlmm {
tkey_en_default: tkey-en-default-state {
pins = "gpio97";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
View file @ 60c2f542
......@@ -33,7 +33,7 @@ led-keyled {
function = LED_FUNCTION_KBD_BACKLIGHT;
color = <LED_COLOR_ID_WHITE>;
gpios = <&msmgpio 60 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 60 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&gpio_leds_default>;
......@@ -42,14 +42,14 @@ led-keyled {
};
&reg_motor_vdd {
gpio = <&msmgpio 72 GPIO_ACTIVE_HIGH>;
gpio = <&tlmm 72 GPIO_ACTIVE_HIGH>;
};
&reg_touch_key {
status = "disabled";
};
&msmgpio {
&tlmm {
gpio_leds_default: gpio-led-default-state {
pins = "gpio60";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
View file @ 60c2f542
......@@ -9,7 +9,9 @@
/ {
aliases {
serial0 = &blsp1_uart2;
mmc0 = &sdhc_1; /* eMMC */
mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
chosen {
......@@ -34,13 +36,13 @@ gpio-keys {
volume-up-button {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
home-button {
label = "Home";
gpios = <&msmgpio 109 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 109 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOMEPAGE>;
};
};
......@@ -55,7 +57,7 @@ gpio-hall-sensor {
hall-sensor-switch {
label = "Hall Effect Sensor";
gpios = <&msmgpio 52 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 52 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_SW>;
linux,code = <SW_LID>;
linux,can-disable;
......@@ -74,7 +76,7 @@ fuelgauge@36 {
maxim,over-heat-temp = <600>;
maxim,over-volt = <4400>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <121 IRQ_TYPE_EDGE_FALLING>;
pinctrl-0 = <&fuelgauge_int_default>;
......@@ -97,7 +99,7 @@ accelerometer@1d {
vdd-supply = <&pm8916_l17>;
vddio-supply = <&pm8916_l5>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <115 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "INT1";
......@@ -111,7 +113,7 @@ accelerometer@1d {
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};
......@@ -120,6 +122,13 @@ &pm8916_resin {
status = "okay";
};
&pm8916_rpm_regulators {
pm8916_l17: l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
};
/* FIXME: Replace with MAX77849 MUIC when driver is available */
&pm8916_usbin {
status = "okay";
......@@ -138,7 +147,7 @@ &sdhc_2 {
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
pinctrl-names = "default", "sleep";
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
status = "okay";
};
......@@ -162,110 +171,7 @@ &wcnss_iris {
compatible = "qcom,wcn3660b";
};
&smd_rpm_regulators {
vdd_l1_l2_l3-supply = <&pm8916_s3>;
vdd_l4_l5_l6-supply = <&pm8916_s4>;
vdd_l7-supply = <&pm8916_s4>;
s3 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1300000>;
};
s4 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2100000>;
};
l1 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
};
l2 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
l4 {
regulator-min-microvolt = <2050000>;
regulator-max-microvolt = <2050000>;
};
l5 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l7 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l8 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2900000>;
};
l9 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
l10 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2800000>;
};
l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
regulator-system-load = <200000>;
regulator-allow-set-load;
};
l12 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
};
l13 {
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
};
l14 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l15 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l16 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
};
l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
l18 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2700000>;
};
};
&msmgpio {
&tlmm {
accel_int_default: accel-int-default-state {
pins = "gpio115";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts
View file @ 60c2f542
......@@ -25,7 +25,7 @@ reg_motor_vdd: regulator-motor-vdd {
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
gpio = <&msmgpio 76 GPIO_ACTIVE_HIGH>;
gpio = <&tlmm 76 GPIO_ACTIVE_HIGH>;
enable-active-high;
pinctrl-0 = <&motor_en_default>;
......@@ -38,7 +38,7 @@ reg_tsp_1p8v: regulator-tsp-1p8v {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
gpio = <&msmgpio 73 GPIO_ACTIVE_HIGH>;
gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>;
enable-active-high;
pinctrl-0 = <&tsp_en_default>;
......@@ -51,7 +51,7 @@ reg_tsp_3p3v: regulator-tsp-3p3v {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&msmgpio 73 GPIO_ACTIVE_HIGH>;
gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
......@@ -71,20 +71,20 @@ &blsp_i2c5 {
touchscreen@4a {
compatible = "atmel,maxtouch";
reg = <0x4a>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <13 IRQ_TYPE_LEVEL_LOW>;
vdd-supply = <&reg_tsp_1p8v>;
vdda-supply = <&reg_tsp_3p3v>;
reset-gpios = <&msmgpio 114 GPIO_ACTIVE_LOW>;
reset-gpios = <&tlmm 114 GPIO_ACTIVE_LOW>;
pinctrl-0 = <&tsp_int_rst_default>;
pinctrl-names = "default";
};
};
&msmgpio {
&tlmm {
motor_en_default: motor-en-default-state {
pins = "gpio76";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts
View file @ 60c2f542
......@@ -15,7 +15,7 @@ reg_vdd_tsp: regulator-vdd-tsp {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&msmgpio 73 GPIO_ACTIVE_HIGH>;
gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>;
enable-active-high;
pinctrl-0 = <&reg_tsp_en_default>;
......@@ -24,7 +24,7 @@ reg_vdd_tsp: regulator-vdd-tsp {
vibrator {
compatible = "gpio-vibrator";
enable-gpios = <&msmgpio 76 GPIO_ACTIVE_HIGH>;
enable-gpios = <&tlmm 76 GPIO_ACTIVE_HIGH>;
pinctrl-0 = <&vibrator_en_default>;
pinctrl-names = "default";
......@@ -37,7 +37,7 @@ &blsp_i2c5 {
touchscreen@20 {
compatible = "zinitix,bt532";
reg = <0x20>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
touchscreen-size-x = <768>;
......@@ -51,7 +51,7 @@ touchscreen@20 {
};
};
&msmgpio {
&tlmm {
reg_tsp_en_default: reg-tsp-en-default-state {
pins = "gpio73";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts
View file @ 60c2f542
......@@ -10,19 +10,19 @@ / {
};
&button_restart {
gpios = <&msmgpio 35 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
};
&led_r {
gpios = <&msmgpio 82 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 82 GPIO_ACTIVE_HIGH>;
};
&led_g {
gpios = <&msmgpio 83 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 83 GPIO_ACTIVE_HIGH>;
};
&led_b {
gpios = <&msmgpio 81 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 81 GPIO_ACTIVE_HIGH>;
};
&button_default {
......
arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts
View file @ 60c2f542
......@@ -10,19 +10,19 @@ / {
};
&button_restart {
gpios = <&msmgpio 37 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>;
};
&led_r {
gpios = <&msmgpio 22 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 22 GPIO_ACTIVE_HIGH>;
};
&led_g {
gpios = <&msmgpio 21 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>;
};
&led_b {
gpios = <&msmgpio 20 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>;
};
&mpss {
......@@ -40,7 +40,7 @@ &gpio_leds_default {
};
/* This selects the external SIM card slot by default */
&msmgpio {
&tlmm {
sim_ctrl_default: sim-ctrl-default-state {
esim-sel-pins {
pins = "gpio0", "gpio3";
......
arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts
View file @ 60c2f542
......@@ -10,19 +10,19 @@ / {
};
&button_restart {
gpios = <&msmgpio 23 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 23 GPIO_ACTIVE_LOW>;
};
&led_r {
gpios = <&msmgpio 7 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 7 GPIO_ACTIVE_HIGH>;
};
&led_g {
gpios = <&msmgpio 8 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 8 GPIO_ACTIVE_HIGH>;
};
&led_b {
gpios = <&msmgpio 6 GPIO_ACTIVE_HIGH>;
gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
};
&button_default {
......
arch/arm64/boot/dts/qcom/msm8916.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi 0 → 100644
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts 0 → 100644
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/msm8939.dtsi 0 → 100644
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/msm8953.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/msm8976.dtsi
View file @ 60c2f542
......@@ -820,7 +820,7 @@ spmi_bus: spmi@200f000 {
#interrupt-cells = <4>;
};
sdhc_1: mmc@7824000 {
sdhc_1: mmc@7824900 {
compatible = "qcom,msm8976-sdhci", "qcom,sdhci-msm-v4";
reg = <0x07824900 0x500>, <0x07824000 0x800>;
reg-names = "hc", "core";
......@@ -836,7 +836,7 @@ sdhc_1: mmc@7824000 {
status = "disabled";
};
sdhc_2: mmc@7864000 {
sdhc_2: mmc@7864900 {
compatible = "qcom,msm8976-sdhci", "qcom,sdhci-msm-v4";
reg = <0x07864900 0x11c>, <0x07864000 0x800>;
reg-names = "hc", "core";
......@@ -955,7 +955,7 @@ otg: usb@78db000 {
#reset-cells = <1>;
};
sdhc_3: mmc@7a24000 {
sdhc_3: mmc@7a24900 {
compatible = "qcom,msm8976-sdhci", "qcom,sdhci-msm-v4";
reg = <0x07a24900 0x11c>, <0x07a24000 0x800>;
reg-names = "hc", "core";
......
arch/arm64/boot/dts/qcom/msm8994.dtsi
View file @ 60c2f542
......@@ -340,8 +340,7 @@ modem_smp2p_in: slave-kernel {
};
};
soc: soc {
soc: soc@0 {
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0 0 0xffffffff>;
......@@ -745,7 +744,7 @@ restart@fc4ab000 {
reg = <0xfc4ab000 0x4>;
};
spmi_bus: spmi@fc4c0000 {
spmi_bus: spmi@fc4cf000 {
compatible = "qcom,spmi-pmic-arb";
reg = <0xfc4cf000 0x1000>,
<0xfc4cb000 0x1000>,
......
arch/arm64/boot/dts/qcom/msm8996.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/msm8998.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/pm7250b.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/pm8550.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/pm8916.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/pm8953.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/pm8998.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/pmi632.dtsi 0 → 100644
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/pmi8998.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/pmk8350.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/pmk8550.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/qdu1000.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sa8155p-adp.dts
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sa8540p-ride.dts
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sa8775p-pmics.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sa8775p-ride.dts
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sa8775p.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts 0 → 100644
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sc7180-idp.dts
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sc7180.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sc7280.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts 0 → 100644
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi 0 → 100644
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sc8180x-primus.dts 0 → 100644
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sc8180x.dtsi 0 → 100644
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sc8280xp.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sdm630.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sdm845-db845c.dts
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sdm845.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts 0 → 100644
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sm6115.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sm6125.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sm6350.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sm8150.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sm8250.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sm8350-hdk.dts
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sm8350.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sm8450-hdk.dts
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sm8450.dtsi
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sm8550-mtp.dts
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sm8550-qrd.dts
View file @ 60c2f542
This diff is collapsed.
arch/arm64/boot/dts/qcom/sm8550.dtsi
View file @ 60c2f542
This diff is collapsed.
include/dt-bindings/clock/qcom,sm8450-gpucc.h 0 → 100644
View file @ 60c2f542
This diff is collapsed.
include/dt-bindings/clock/qcom,sm8450-videocc.h 0 → 100644
View file @ 60c2f542
This diff is collapsed.
include/dt-bindings/clock/qcom,sm8550-gpucc.h 0 → 100644
View file @ 60c2f542
This diff is collapsed.
include/dt-bindings/power/qcom-rpmpd.h
View file @ 60c2f542
This diff is collapsed.
include/dt-bindings/reset/qcom,sm8450-gpucc.h 0 → 100644
View file @ 60c2f542
This diff is collapsed.
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