UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Qualcomm DTS fixes for v5.15 

This corrects the use of depricated chipid and clock names, for which
 support was finally dropped from the driver. It also ensures that the
 DSI PLL is fed by the correct clock, now that it's being migrated to not
 rely on global clock names.
 -----BEGIN PGP SIGNATURE-----
 
 iQJPBAABCAA5FiEEBd4DzF816k8JZtUlCx85Pw2ZrcUFAmFVI2QbHGJqb3JuLmFu
 ZGVyc3NvbkBsaW5hcm8ub3JnAAoJEAsfOT8Nma3FFUwP+wX+3kpgbggkS3i1WkX7
 A2TKXn35FSbn6co3GLcC8vdtsdAuXo+zdGGvRqScXa2hOIN255hpPCkuPwNr8jlP
 OO1VvxSthrLqnv20iKJGuWjw1UNiGHf8yy1ifPYNXhCWuuQfdpKXZJJNT36sskx5
 cVbMzayUwKyswmGYKvLPCmRZbcuvHq5FUPz9f9OZFxwRBsvL91tDMDPUlPXL3Xb7
 i0Y9sYy1U2sUC9O4NTCEOMO8KQWj5vGgHQ6J/26tIoPfs4dw6NdjLoXHDESi2tlT
 rabNHImvvFkT4/KxIr/Z4STyR5q34Q5miuvslQToCe6DvARE0wP+urlDTngXJe5+
 5UxTYGmZ3hQe+khy+gCJ6VFQU6v2R0YiU+/UvvXJquPkppP7JccX8SrV5FVd6oc7
 zHs6Oej6MSjgH738oqB4d4M8o3Bgo+2vTtNM0N0S6Ccn7GRtaLXsJtQ3cKwZlyAt
 lfrPEoMEAsGXRu6afNidRKv2MF4KCtMKp09ZjyztWJXH4mqN/0h5uAK4Bz8xhGuq
 B3MPjOsRl8pOvszW+mG9Efc5cJt2W+fWH4ZlYDBcEywdTCHD5gLakKFQW8iIxLZb
 QCTkfc+qfjBQMGiFmVJnjj0TxPf3IkCuh8Es397pJxG1Nrj5h8ghazTd51Xvg3/w
 VDilbU0R/0paKQEts4riKmZv
 =xHHw
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmFcVCwACgkQmmx57+YA
 GNkpEw/+OgfIFF/1v9TYSMEIuQLZGpyXu2Efp4bj9hroO9IPZ778ju5XPetp5s6s
 QVZUMWKyFRRKTCn5MHjx15fKrQiW5UhZXPZiXXee9UiAH7/v3o5ZpC0/YEy7rDf/
 qzMyxj623h7zqIYGGpn/DSh9xbdgoHnOU2WXv0xR0Vkkdq+cwLP9684gmtXpl3yY
 KBE5lopoKqortsA1WAxdqKNg1KC9QUvITDZ7J0cNVp4q3BwvxkVDT0/E+vsTbCuy
 OPgdP0BE45XqzQvPL2MqIyTAk8VgTWZ8mAtcIM5wdYGS1n0s7v2tspFCd8PWkfL0
 KBmdojBL//vp7xxzvVGqzwFAfnlnHybnnAeoosh18fKbyKRZ0DNasM8Fiq7PpNKY
 HFy01WYgZGNRFSdXP0Lgwn6iS7Ksf8+H+lUTT1C9hPRse54XCmbclqj46GsoP71w
 o1rC2OafSiUD2LKK4DJA9l/Ygk9a0uj0nl/zBwS/ROYvRu7v90cQtTVI6Up5NC/B
 09Viyntbn5Hh//Wh8QFi7gc38QGwrjqXOUvYXA9vv3A1xdoilodLrD8glz+gMm/W
 +BdhSnSMOIe8dkL5sZMED4Oj1WQggvOpH2jfNRLr0630xAc9A5TDyOmgreRnAC2G
 SyJ18zGfyWQVnwIdDkcFtoVrI2x0/51tpD+Ur5AYIp17oFaxsIY=
 =C1Zc
 -----END PGP SIGNATURE-----

Merge tag 'qcom-dts-fixes-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes

Qualcomm DTS fixes for v5.15

This corrects the use of depricated chipid and clock names, for which
support was finally dropped from the driver. It also ensures that the
DSI PLL is fed by the correct clock, now that it's being migrated to not
rely on global clock names.

* tag 'qcom-dts-fixes-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  ARM: dts: qcom: apq8064: update Adreno clock names
  ARM: dts: qcom: apq8064: Use 27MHz PXO clock as DSI PLL reference
  ARM: dts: qcom: apq8064: use compatible which contains chipid

Link: https://lore.kernel.org/r/20210930025526.1146-1-bjorn.andersson@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-10-05 15:33:31 +02:00
parent 325c81e3fd ecf5b34cd5
commit c147392b65
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/boot/dts/qcom-apq8064.dtsi
View File

@ -198,7 +198,7 @@
clock-frequency = <19200000>;
};
pxo_board {
pxo_board: pxo_board {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <27000000>;
@ -1148,22 +1148,21 @@
};
gpu: adreno-3xx@4300000 {
compatible = "qcom,adreno-3xx";
compatible = "qcom,adreno-320.2", "qcom,adreno";
reg = <0x04300000 0x20000>;
reg-names = "kgsl_3d0_reg_memory";
interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "kgsl_3d0_irq";
clock-names =
"core_clk",
"iface_clk",
"mem_clk",
"mem_iface_clk";
"core",
"iface",
"mem",
"mem_iface";
clocks =
<&mmcc GFX3D_CLK>,
<&mmcc GFX3D_AHB_CLK>,
<&mmcc GFX3D_AXI_CLK>,
<&mmcc MMSS_IMEM_AHB_CLK>;
qcom,chipid = <0x03020002>;
iommus = <&gfx3d 0
&gfx3d 1
@ -1306,7 +1305,7 @@
reg-names = "dsi_pll", "dsi_phy", "dsi_phy_regulator";
clock-names = "iface_clk", "ref";
clocks = <&mmcc DSI_M_AHB_CLK>,
<&cxo_board>;
<&pxo_board>;
};