From nobody Fri Dec 19 21:48:10 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CBD72180A73; Sun, 24 Mar 2024 23:47:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324052; cv=none; b=tJb3IGVKixPb9zN1Mz8OCHZvC0glNlRHptDHeHULO55F/nN0Qwtc4smY8Krsbkkc5vo1XnpWrqXZv5N6voOxLRIC3F7ypB6U6S4fdf7b7g0A1+UDZIe3l5h5DIvQTOKgp/2jxizioON9H/GqoDl+KM4Lq+63LAr9ZA7p72k7OcY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711324052; c=relaxed/simple; bh=wvf3sIIuiuGAOXj+OmT4D5WiGqoZZJa8njw+E8Nec1Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dMhAMmsAkAyyfvZfzX6e+CtQY4O5FEou8YhYZRhJmMoYCtKePvFdOsdb7eON2ifXbOG8uKWEgdNszS+CmzccaRHpcPOgbL8NBvE3dJ+ZBjPwkerrkk9IBLmuV0d1rS7vMFiHkoT2wQgAmb6XDmsIAfhPEGJbT87ZlFqrSoZEBsg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Vj+FLEY2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Vj+FLEY2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 114FDC433B2; Sun, 24 Mar 2024 23:47:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711324051; bh=wvf3sIIuiuGAOXj+OmT4D5WiGqoZZJa8njw+E8Nec1Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vj+FLEY2Uyms/+46TinJac8HJRBfKptai2E5enSpqzsJWnC0F3V0euXoN4Dza7t2B RvXGWqqEibgDn8wL+9Kce3SUjXEWnmGLOojHWxtLnvEAogN8tppynD+i5e029B8naZ DYVOBkZzeU4Z8V3iMpJJb0K4CBlu4I1Amo0ihTIBHLPFI+jrByc2WT93TsrsGKBGFK 2aL8AzJ4PpWS2r3mY/9huey7daA+VhcwIStahkZhFBFmnMoeYc4fYJ0safx3kV91z5 T3LfS2sNS9sfbjSfmprOBkihojppvU8haSq7TAn4aV+6/YUfYm/W4bZuWsjQKUg7I6 U0deVj/PdBpDA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bjorn Andersson , Vinod Koul , Sasha Levin Subject: [PATCH 5.4 052/183] arm64: dts: qcom: msm8996: Pad addresses Date: Sun, 24 Mar 2024 19:44:25 -0400 Message-ID: <20240324234638.1355609-53-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324234638.1355609-1-sashal@kernel.org> References: <20240324234638.1355609-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Bjorn Andersson [ Upstream commit 86f6d6225e5e546ffeaae6db597f4aabe50d26c1 ] Pad all addresses in msm8996.dtsi to 8 digits, in order to make it easier to ensure ordering when adding new nodes. Acked-by: Vinod Koul Signed-off-by: Bjorn Andersson Stable-dep-of: 68c4c20848d7 ("arm64: dts: qcom: msm8996: Define UFS UniPro = clock limits") Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 144 +++++++++++++------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qc= om/msm8996.dtsi index bcadbdf2690e3..8bfb897b0e81b 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -584,7 +584,7 @@ soc: soc { =20 rpm_msg_ram: memory@68000 { compatible =3D "qcom,rpm-msg-ram"; - reg =3D <0x68000 0x6000>; + reg =3D <0x00068000 0x6000>; }; =20 rng: rng@83000 { @@ -596,28 +596,28 @@ rng: rng@83000 { =20 tcsr_mutex_regs: syscon@740000 { compatible =3D "syscon"; - reg =3D <0x740000 0x20000>; + reg =3D <0x00740000 0x20000>; }; =20 tsens0: thermal-sensor@4a9000 { compatible =3D "qcom,msm8996-tsens"; - reg =3D <0x4a9000 0x1000>, /* TM */ - <0x4a8000 0x1000>; /* SROT */ + reg =3D <0x004a9000 0x1000>, /* TM */ + <0x004a8000 0x1000>; /* SROT */ #qcom,sensors =3D <13>; #thermal-sensor-cells =3D <1>; }; =20 tsens1: thermal-sensor@4ad000 { compatible =3D "qcom,msm8996-tsens"; - reg =3D <0x4ad000 0x1000>, /* TM */ - <0x4ac000 0x1000>; /* SROT */ + reg =3D <0x004ad000 0x1000>, /* TM */ + <0x004ac000 0x1000>; /* SROT */ #qcom,sensors =3D <8>; #thermal-sensor-cells =3D <1>; }; =20 tcsr: syscon@7a0000 { compatible =3D "qcom,tcsr-msm8996", "syscon"; - reg =3D <0x7a0000 0x18000>; + reg =3D <0x007a0000 0x18000>; }; =20 intc: interrupt-controller@9bc0000 { @@ -633,7 +633,7 @@ intc: interrupt-controller@9bc0000 { =20 apcs_glb: mailbox@9820000 { compatible =3D "qcom,msm8996-apcs-hmss-global"; - reg =3D <0x9820000 0x1000>; + reg =3D <0x09820000 0x1000>; =20 #mbox-cells =3D <1>; }; @@ -643,7 +643,7 @@ gcc: clock-controller@300000 { #clock-cells =3D <1>; #reset-cells =3D <1>; #power-domain-cells =3D <1>; - reg =3D <0x300000 0x90000>; + reg =3D <0x00300000 0x90000>; }; =20 stm@3002000 { @@ -1124,7 +1124,7 @@ apss_merge_funnel_out: endpoint { =20 kryocc: clock-controller@6400000 { compatible =3D "qcom,apcc-msm8996"; - reg =3D <0x6400000 0x90000>; + reg =3D <0x06400000 0x90000>; #clock-cells =3D <1>; }; =20 @@ -1170,7 +1170,7 @@ blsp2_i2c0: i2c@75b5000 { =20 blsp2_uart1: serial@75b0000 { compatible =3D "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; - reg =3D <0x75b0000 0x1000>; + reg =3D <0x075b0000 0x1000>; interrupts =3D ; clocks =3D <&gcc GCC_BLSP2_UART2_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>; @@ -1236,7 +1236,7 @@ blsp2_spi5: spi@75ba000{ sdhc2: sdhci@74a4900 { status =3D "disabled"; compatible =3D "qcom,sdhci-msm-v4"; - reg =3D <0x74a4900 0x314>, <0x74a4000 0x800>; + reg =3D <0x074a4900 0x314>, <0x074a4000 0x800>; reg-names =3D "hc_mem", "core_mem"; =20 interrupts =3D <0 125 IRQ_TYPE_LEVEL_HIGH>, @@ -1321,11 +1321,11 @@ frame@98c0000 { =20 spmi_bus: qcom,spmi@400f000 { compatible =3D "qcom,spmi-pmic-arb"; - reg =3D <0x400f000 0x1000>, - <0x4400000 0x800000>, - <0x4c00000 0x800000>, - <0x5800000 0x200000>, - <0x400a000 0x002100>; + reg =3D <0x0400f000 0x1000>, + <0x04400000 0x800000>, + <0x04c00000 0x800000>, + <0x05800000 0x200000>, + <0x0400a000 0x002100>; reg-names =3D "core", "chnls", "obsrvr", "intr", "cnfg"; interrupt-names =3D "periph_irq"; interrupts =3D ; @@ -1339,7 +1339,7 @@ spmi_bus: qcom,spmi@400f000 { =20 ufsphy: phy@627000 { compatible =3D "qcom,msm8996-ufs-phy-qmp-14nm"; - reg =3D <0x627000 0xda8>; + reg =3D <0x00627000 0xda8>; reg-names =3D "phy_mem"; #phy-cells =3D <0>; =20 @@ -1352,7 +1352,7 @@ ufsphy: phy@627000 { =20 ufshc: ufshc@624000 { compatible =3D "qcom,ufshc"; - reg =3D <0x624000 0x2500>; + reg =3D <0x00624000 0x2500>; interrupts =3D ; =20 phys =3D <&ufsphy>; @@ -1411,7 +1411,7 @@ mmcc: clock-controller@8c0000 { #clock-cells =3D <1>; #reset-cells =3D <1>; #power-domain-cells =3D <1>; - reg =3D <0x8c0000 0x40000>; + reg =3D <0x008c0000 0x40000>; assigned-clocks =3D <&mmcc MMPLL9_PLL>, <&mmcc MMPLL1_PLL>, <&mmcc MMPLL3_PLL>, @@ -1426,7 +1426,7 @@ mmcc: clock-controller@8c0000 { =20 qfprom@74000 { compatible =3D "qcom,qfprom"; - reg =3D <0x74000 0x8ff>; + reg =3D <0x00074000 0x8ff>; #address-cells =3D <1>; #size-cells =3D <1>; =20 @@ -1448,7 +1448,7 @@ gpu_speed_bin: gpu_speed_bin@133 { =20 pcie_phy: phy@34000 { compatible =3D "qcom,msm8996-qmp-pcie-phy"; - reg =3D <0x34000 0x488>; + reg =3D <0x00034000 0x488>; #clock-cells =3D <1>; #address-cells =3D <1>; #size-cells =3D <1>; @@ -1466,9 +1466,9 @@ pcie_phy: phy@34000 { status =3D "disabled"; =20 pciephy_0: lane@35000 { - reg =3D <0x035000 0x130>, - <0x035200 0x200>, - <0x035400 0x1dc>; + reg =3D <0x00035000 0x130>, + <0x00035200 0x200>, + <0x00035400 0x1dc>; #phy-cells =3D <0>; =20 clock-output-names =3D "pcie_0_pipe_clk_src"; @@ -1479,9 +1479,9 @@ pciephy_0: lane@35000 { }; =20 pciephy_1: lane@36000 { - reg =3D <0x036000 0x130>, - <0x036200 0x200>, - <0x036400 0x1dc>; + reg =3D <0x00036000 0x130>, + <0x00036200 0x200>, + <0x00036400 0x1dc>; #phy-cells =3D <0>; =20 clock-output-names =3D "pcie_1_pipe_clk_src"; @@ -1492,9 +1492,9 @@ pciephy_1: lane@36000 { }; =20 pciephy_2: lane@37000 { - reg =3D <0x037000 0x130>, - <0x037200 0x200>, - <0x037400 0x1dc>; + reg =3D <0x00037000 0x130>, + <0x00037200 0x200>, + <0x00037400 0x1dc>; #phy-cells =3D <0>; =20 clock-output-names =3D "pcie_2_pipe_clk_src"; @@ -1507,7 +1507,7 @@ pciephy_2: lane@37000 { =20 usb3phy: phy@7410000 { compatible =3D "qcom,msm8996-qmp-usb3-phy"; - reg =3D <0x7410000 0x1c4>; + reg =3D <0x07410000 0x1c4>; #clock-cells =3D <1>; #address-cells =3D <1>; #size-cells =3D <1>; @@ -1524,9 +1524,9 @@ usb3phy: phy@7410000 { status =3D "disabled"; =20 ssusb_phy_0: lane@7410200 { - reg =3D <0x7410200 0x200>, - <0x7410400 0x130>, - <0x7410600 0x1a8>; + reg =3D <0x07410200 0x200>, + <0x07410400 0x130>, + <0x07410600 0x1a8>; #phy-cells =3D <0>; =20 clock-output-names =3D "usb3_phy_pipe_clk_src"; @@ -1537,7 +1537,7 @@ ssusb_phy_0: lane@7410200 { =20 hsusb_phy1: phy@7411000 { compatible =3D "qcom,msm8996-qusb2-phy"; - reg =3D <0x7411000 0x180>; + reg =3D <0x07411000 0x180>; #phy-cells =3D <0>; =20 clocks =3D <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>, @@ -1551,7 +1551,7 @@ hsusb_phy1: phy@7411000 { =20 hsusb_phy2: phy@7412000 { compatible =3D "qcom,msm8996-qusb2-phy"; - reg =3D <0x7412000 0x180>; + reg =3D <0x07412000 0x180>; #phy-cells =3D <0>; =20 clocks =3D <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>, @@ -1565,7 +1565,7 @@ hsusb_phy2: phy@7412000 { =20 usb2: usb@76f8800 { compatible =3D "qcom,msm8996-dwc3", "qcom,dwc3"; - reg =3D <0x76f8800 0x400>; + reg =3D <0x076f8800 0x400>; #address-cells =3D <1>; #size-cells =3D <1>; ranges; @@ -1585,7 +1585,7 @@ usb2: usb@76f8800 { =20 dwc3@7600000 { compatible =3D "snps,dwc3"; - reg =3D <0x7600000 0xcc00>; + reg =3D <0x07600000 0xcc00>; interrupts =3D <0 138 IRQ_TYPE_LEVEL_HIGH>; phys =3D <&hsusb_phy2>; phy-names =3D "usb2-phy"; @@ -1596,7 +1596,7 @@ dwc3@7600000 { =20 usb3: usb@6af8800 { compatible =3D "qcom,msm8996-dwc3", "qcom,dwc3"; - reg =3D <0x6af8800 0x400>; + reg =3D <0x06af8800 0x400>; #address-cells =3D <1>; #size-cells =3D <1>; ranges; @@ -1617,7 +1617,7 @@ usb3: usb@6af8800 { =20 dwc3@6a00000 { compatible =3D "snps,dwc3"; - reg =3D <0x6a00000 0xcc00>; + reg =3D <0x06a00000 0xcc00>; interrupts =3D <0 131 IRQ_TYPE_LEVEL_HIGH>; phys =3D <&hsusb_phy1>, <&ssusb_phy_0>; phy-names =3D "usb2-phy", "usb3-phy"; @@ -1628,7 +1628,7 @@ dwc3@6a00000 { =20 vfe_smmu: iommu@da0000 { compatible =3D "qcom,msm8996-smmu-v2", "qcom,smmu-v2"; - reg =3D <0xda0000 0x10000>; + reg =3D <0x00da0000 0x10000>; =20 #global-interrupts =3D <1>; interrupts =3D , @@ -1644,20 +1644,20 @@ vfe_smmu: iommu@da0000 { =20 camss: camss@a00000 { compatible =3D "qcom,msm8996-camss"; - reg =3D <0xa34000 0x1000>, - <0xa00030 0x4>, - <0xa35000 0x1000>, - <0xa00038 0x4>, - <0xa36000 0x1000>, - <0xa00040 0x4>, - <0xa30000 0x100>, - <0xa30400 0x100>, - <0xa30800 0x100>, - <0xa30c00 0x100>, - <0xa31000 0x500>, - <0xa00020 0x10>, - <0xa10000 0x1000>, - <0xa14000 0x1000>; + reg =3D <0x00a34000 0x1000>, + <0x00a00030 0x4>, + <0x00a35000 0x1000>, + <0x00a00038 0x4>, + <0x00a36000 0x1000>, + <0x00a00040 0x4>, + <0x00a30000 0x100>, + <0x00a30400 0x100>, + <0x00a30800 0x100>, + <0x00a30c00 0x100>, + <0x00a31000 0x500>, + <0x00a00020 0x10>, + <0x00a10000 0x1000>, + <0x00a14000 0x1000>; reg-names =3D "csiphy0", "csiphy0_clk_mux", "csiphy1", @@ -1778,7 +1778,7 @@ ports { =20 adreno_smmu: iommu@b40000 { compatible =3D "qcom,msm8996-smmu-v2", "qcom,smmu-v2"; - reg =3D <0xb40000 0x10000>; + reg =3D <0x00b40000 0x10000>; =20 #global-interrupts =3D <1>; interrupts =3D , @@ -1795,7 +1795,7 @@ adreno_smmu: iommu@b40000 { =20 mdp_smmu: iommu@d00000 { compatible =3D "qcom,msm8996-smmu-v2", "qcom,smmu-v2"; - reg =3D <0xd00000 0x10000>; + reg =3D <0x00d00000 0x10000>; =20 #global-interrupts =3D <1>; interrupts =3D , @@ -1811,7 +1811,7 @@ mdp_smmu: iommu@d00000 { =20 lpass_q6_smmu: iommu@1600000 { compatible =3D "qcom,msm8996-smmu-v2", "qcom,smmu-v2"; - reg =3D <0x1600000 0x20000>; + reg =3D <0x01600000 0x20000>; #iommu-cells =3D <1>; power-domains =3D <&gcc HLOS1_VOTE_LPASS_CORE_GDSC>; =20 @@ -1998,7 +1998,7 @@ slimbam:dma@9184000 { compatible =3D "qcom,bam-v1.7.0"; qcom,controlled-remotely; - reg =3D <0x9184000 0x32000>; + reg =3D <0x09184000 0x32000>; num-channels =3D <31>; interrupts =3D <0 164 IRQ_TYPE_LEVEL_HIGH>; #dma-cells =3D <1>; @@ -2008,7 +2008,7 @@ slimbam:dma@9184000 =20 slim_msm: slim@91c0000 { compatible =3D "qcom,slim-ngd-v1.5.0"; - reg =3D <0x91c0000 0x2C000>; + reg =3D <0x091c0000 0x2C000>; reg-names =3D "ctrl"; interrupts =3D <0 163 IRQ_TYPE_LEVEL_HIGH>; dmas =3D <&slimbam 3>, <&slimbam 4>, @@ -2052,7 +2052,7 @@ gpu@b00000 { compatible =3D "qcom,adreno-530.2", "qcom,adreno"; #stream-id-cells =3D <16>; =20 - reg =3D <0xb00000 0x3f000>; + reg =3D <0x00b00000 0x3f000>; reg-names =3D "kgsl_3d0_reg_memory"; =20 interrupts =3D <0 300 IRQ_TYPE_LEVEL_HIGH>; @@ -2123,9 +2123,9 @@ zap-shader { mdss: mdss@900000 { compatible =3D "qcom,mdss"; =20 - reg =3D <0x900000 0x1000>, - <0x9b0000 0x1040>, - <0x9b8000 0x1040>; + reg =3D <0x00900000 0x1000>, + <0x009b0000 0x1040>, + <0x009b8000 0x1040>; reg-names =3D "mdss_phys", "vbif_phys", "vbif_nrt_phys"; @@ -2145,7 +2145,7 @@ mdss: mdss@900000 { =20 mdp: mdp@901000 { compatible =3D "qcom,mdp5"; - reg =3D <0x901000 0x90000>; + reg =3D <0x00901000 0x90000>; reg-names =3D "mdp_phys"; =20 interrupt-parent =3D <&mdss>; @@ -2221,12 +2221,12 @@ hdmi_in: endpoint { hdmi_phy: hdmi-phy@9a0600 { #phy-cells =3D <0>; compatible =3D "qcom,hdmi-phy-8996"; - reg =3D <0x9a0600 0x1c4>, - <0x9a0a00 0x124>, - <0x9a0c00 0x124>, - <0x9a0e00 0x124>, - <0x9a1000 0x124>, - <0x9a1200 0x0c8>; + reg =3D <0x009a0600 0x1c4>, + <0x009a0a00 0x124>, + <0x009a0c00 0x124>, + <0x009a0e00 0x124>, + <0x009a1000 0x124>, + <0x009a1200 0x0c8>; reg-names =3D "hdmi_pll", "hdmi_tx_l0", "hdmi_tx_l1", --=20 2.43.0