From 939c4b947458d80566547f861865dc8b76ad7b87 Mon Sep 17 00:00:00 2001 From: Dishendra Deshmukh Date: Thu, 28 Jul 2022 17:04:08 +0530 Subject: [PATCH] ARM: dts: msm: Add cpu related changes for Katmai FP2 targets Added DT changes for for Katmai targets 4xgold A78 (2.1GHz) +4x Silver A55 (1.8GHz). Change-Id: I47ec2d3fd2528d44998bb485ae4046de998acf6d --- qcom/Makefile | 32 +++++---- qcom/katmai-cpu-fp2.dtsi | 89 ++++++++++++++++++++++++ qcom/katmai-fp2-hsp-overlay.dts | 22 ++++++ qcom/katmai-fp2-hsp-pm7250b-overlay.dts | 21 ++++++ qcom/katmai-fp2.dts | 9 +++ qcom/katmai-fp2.dtsi | 41 +++++++++++ qcom/katmai-hsp-overlay.dts | 3 +- qcom/katmai-hsp-pm7250b-overlay.dts | 3 +- qcom/katmai.dtsi | 1 + qcom/katmaip-fp2-hsp-overlay.dts | 22 ++++++ qcom/katmaip-fp2-hsp-pm7250b-overlay.dts | 21 ++++++ qcom/katmaip-fp2.dts | 9 +++ qcom/katmaip-fp2.dtsi | 18 +++++ qcom/katmaip-hsp-overlay.dts | 3 +- qcom/katmaip-hsp-pm7250b-overlay.dts | 3 +- qcom/katmaip.dtsi | 1 + 16 files changed, 282 insertions(+), 16 deletions(-) create mode 100644 qcom/katmai-cpu-fp2.dtsi create mode 100644 qcom/katmai-fp2-hsp-overlay.dts create mode 100644 qcom/katmai-fp2-hsp-pm7250b-overlay.dts create mode 100644 qcom/katmai-fp2.dts create mode 100644 qcom/katmai-fp2.dtsi create mode 100644 qcom/katmaip-fp2-hsp-overlay.dts create mode 100644 qcom/katmaip-fp2-hsp-pm7250b-overlay.dts create mode 100644 qcom/katmaip-fp2.dts create mode 100644 qcom/katmaip-fp2.dtsi diff --git a/qcom/Makefile b/qcom/Makefile index ed4144c17d14..972c845c97a4 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -237,17 +237,21 @@ dtbo-$(CONFIG_ARCH_YUPIK) += \ yupik-iot-idp-pm7250b-overlay.dtbo \ yupik-iot-qrd-overlay.dtbo \ yupik-iot-hsp-overlay.dtbo \ - katmai-hsp-overlay.dtbo \ yupik-iot-hsp-pm7250b-overlay.dtbo \ + katmai-hsp-overlay.dtbo \ katmai-hsp-pm7250b-overlay.dtbo \ + katmai-fp2-hsp-overlay.dtbo \ + katmai-fp2-hsp-pm7250b-overlay.dtbo \ yupik-iot-idps-amoled-overlay.dtbo \ yupikp-iot-idp-overlay.dtbo \ yupikp-iot-idp-pm7250b-overlay.dtbo \ yupikp-iot-qrd-overlay.dtbo \ yupikp-iot-hsp-overlay.dtbo \ - katmaip-hsp-overlay.dtbo \ yupikp-iot-hsp-pm7250b-overlay.dtbo \ + katmaip-hsp-overlay.dtbo \ katmaip-hsp-pm7250b-overlay.dtbo \ + katmaip-fp2-hsp-overlay.dtbo \ + katmaip-fp2-hsp-pm7250b-overlay.dtbo \ yupikp-iot-idps-amoled-overlay.dtbo @@ -263,22 +267,26 @@ yupikp-atp-overlay.dtbo-base := yupikp.dtb yupikp-qrd-overlay.dtbo-base := yupikp.dtb yupikp-idps-amoled-overlay.dtbo-base := yupikp.dtb yupikp-idp-hsp-overlay.dtbo-base := yupikp-hsp.dtb -yupik-iot-idp-overlay.dtbo-base := yupik-iot.dtb katmai.dtb -yupik-iot-idp-pm7250b-overlay.dtbo-base := yupik-iot.dtb katmai.dtb -yupik-iot-qrd-overlay.dtbo-base := yupik-iot.dtb katmai.dtb +yupik-iot-idp-overlay.dtbo-base := yupik-iot.dtb katmai.dtb katmai-fp2.dtb +yupik-iot-idp-pm7250b-overlay.dtbo-base := yupik-iot.dtb katmai.dtb katmai-fp2.dtb +yupik-iot-qrd-overlay.dtbo-base := yupik-iot.dtb katmai.dtb katmai-fp2.dtb yupik-iot-hsp-overlay.dtbo-base := yupik-iot.dtb -katmai-hsp-overlay.dtbo-base := katmai.dtb yupik-iot-hsp-pm7250b-overlay.dtbo-base := yupik-iot.dtb +katmai-hsp-overlay.dtbo-base := katmai.dtb katmai-hsp-pm7250b-overlay.dtbo-base := katmai.dtb -yupik-iot-idps-amoled-overlay.dtbo-base := katmai.dtb -yupikp-iot-idp-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb -yupikp-iot-idp-pm7250b-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb -yupikp-iot-qrd-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb +katmai-fp2-hsp-overlay.dtbo-base := katmai-fp2.dtb +katmai-fp2-hsp-pm7250b-overlay.dtbo-base := katmai-fp2.dtb +yupik-iot-idps-amoled-overlay.dtbo-base := yupik-iot.dtb katmai.dtb katmai-fp2.dtb +yupikp-iot-idp-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb katmaip-fp2.dtb +yupikp-iot-idp-pm7250b-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb katmaip-fp2.dtb +yupikp-iot-qrd-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb katmaip-fp2.dtb yupikp-iot-hsp-overlay.dtbo-base := yupikp-iot.dtb -katmaip-hsp-overlay.dtbo-base := katmaip.dtb yupikp-iot-hsp-pm7250b-overlay.dtbo-base := yupikp-iot.dtb +katmaip-hsp-overlay.dtbo-base := katmaip.dtb katmaip-hsp-pm7250b-overlay.dtbo-base := katmaip.dtb -yupikp-iot-idps-amoled-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb +katmaip-fp2-hsp-overlay.dtbo-base := katmaip-fp2.dtb +katmaip-fp2-hsp-pm7250b-overlay.dtbo-base := katmaip-fp2.dtb +yupikp-iot-idps-amoled-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb katmaip-fp2.dtb else dtb-$(CONFIG_ARCH_YUPIK) += yupik-rumi.dtb \ yupik-idp.dtb \ diff --git a/qcom/katmai-cpu-fp2.dtsi b/qcom/katmai-cpu-fp2.dtsi new file mode 100644 index 000000000000..f7af471759e9 --- /dev/null +++ b/qcom/katmai-cpu-fp2.dtsi @@ -0,0 +1,89 @@ +&cpu4_cpu_llcc_latmon { + qcom,core-dev-table = + < 691200 MHZ_TO_MBPS( 300, 16) >, + < 940800 MHZ_TO_MBPS( 466, 16) >, + < 1228800 MHZ_TO_MBPS( 600, 16) >, + < 1651200 MHZ_TO_MBPS( 806, 16) >; +}; + +&cpu4_llcc_ddr_latmon { + ddr4-map { + qcom,core-dev-table = + < 691200 MHZ_TO_MBPS( 451, 4) >, + < 940800 MHZ_TO_MBPS( 547, 4) >, + < 1228800 MHZ_TO_MBPS(1017, 4) >, + < 1651200 MHZ_TO_MBPS(1555, 4) >; + }; + + ddr5-map { + qcom,core-dev-table = + < 691200 MHZ_TO_MBPS( 451, 4) >, + < 940800 MHZ_TO_MBPS( 547, 4) >, + < 1228800 MHZ_TO_MBPS( 768, 4) >, + < 1651200 MHZ_TO_MBPS(1555, 4) >, + < 1900800 MHZ_TO_MBPS(1708, 4) >; + }; +}; + +&cpu4_computemon { + ddr4-map { + qcom,core-dev-table = + < 691200 MHZ_TO_MBPS( 451, 4) >, + < 1228800 MHZ_TO_MBPS( 547, 4) >, + < 1516800 MHZ_TO_MBPS( 768, 4) >, + < 1651200 MHZ_TO_MBPS(1017, 4) >, + < 1900800 MHZ_TO_MBPS(1555, 4) >; + }; + + ddr5-map { + qcom,core-dev-table = + < 691200 MHZ_TO_MBPS( 451, 4) >, + < 1228800 MHZ_TO_MBPS( 547, 4) >, + < 1516800 MHZ_TO_MBPS( 768, 4) >, + < 1651200 MHZ_TO_MBPS(1555, 4) >, + < 1900800 MHZ_TO_MBPS(1708, 4) >; + }; +}; + +&cpu4_llcc_computemon { + qcom,core-dev-table = + < 1900800 MHZ_TO_MBPS( 150, 16) >; +}; + +&cpu7_computemon { + ddr4-map { + qcom,core-dev-table = + < 2380800 MHZ_TO_MBPS( 451, 4) >; + }; + + ddr5-map { + qcom,core-dev-table = + < 2380800 MHZ_TO_MBPS( 451, 4) >; + }; +}; + +&cpu7_l3_computemon { + qcom,core-dev-table = + < 2035200 300000000 >; +}; + +&cpu7_qoslatmon { + qcom,core-dev-table = + < 2035200 1 >; + +}; + +&cpu4_rimps_l3_latmon { + qcom,core-dev-table = + < 940800 556800000 >, + < 1228800 768000000 >, + < 1651200 1190400000 >, + < 1900800 1401600000 >; +}; + +&cpu7_rimps_l3_latmon { + qcom,core-dev-table = + < 1056000 556800000 >, + < 1324800 768000000 >, + < 1766400 1190400000 >; +}; diff --git a/qcom/katmai-fp2-hsp-overlay.dts b/qcom/katmai-fp2-hsp-overlay.dts new file mode 100644 index 000000000000..23e5434a5674 --- /dev/null +++ b/qcom/katmai-fp2-hsp-overlay.dts @@ -0,0 +1,22 @@ +/dts-v1/; +/plugin/; + +#include +#include "katmai-hsp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Katmai FP2 IoT HSP"; + compatible = "qcom,yupik-iot-idp", "qcom,yupik-iot", "qcom,idp"; + qcom,msm-id = <497 0x10000>, <575 0x10000>, <576 0x10000>; + qcom,board-id = <34 1>; + qcom,softsku-id = <2>; +}; + +&pcie1 { + status = "okay"; +}; + +&pcie1_msi { + status = "okay"; +}; + diff --git a/qcom/katmai-fp2-hsp-pm7250b-overlay.dts b/qcom/katmai-fp2-hsp-pm7250b-overlay.dts new file mode 100644 index 000000000000..3daf3088780a --- /dev/null +++ b/qcom/katmai-fp2-hsp-pm7250b-overlay.dts @@ -0,0 +1,21 @@ +/dts-v1/; +/plugin/; + +#include "katmai-hsp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Katmai FP2 IOT HSP + PM7250B"; + compatible = "qcom,yupik-iot-idp", "qcom,yupik-iot", "qcom,idp"; + qcom,msm-id = <497 0x10000>, <575 0x10000>, <576 0x10000>; + qcom,board-id = <34 1>; + qcom,softsku-id = <2>; +}; + +&pcie1 { + status = "okay"; +}; + +&pcie1_msi { + status = "okay"; +}; + diff --git a/qcom/katmai-fp2.dts b/qcom/katmai-fp2.dts new file mode 100644 index 000000000000..10a68aa48e59 --- /dev/null +++ b/qcom/katmai-fp2.dts @@ -0,0 +1,9 @@ +/dts-v1/; + +#include "katmai-fp2.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. KATMAI-FP2 SoC"; + compatible = "qcom,yupik-iot"; + qcom,board-id = <0 0>; +}; diff --git a/qcom/katmai-fp2.dtsi b/qcom/katmai-fp2.dtsi new file mode 100644 index 000000000000..74ac5fcd2324 --- /dev/null +++ b/qcom/katmai-fp2.dtsi @@ -0,0 +1,41 @@ +#include "yupik-iot.dtsi" +#include "katmai-cpu-fp2.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. KATMAI-FP2 SoC"; + compatible = "qcom,yupik-iot"; + qcom,msm-id = <576 0x10000>; + qcom,softsku-id = <2>; +}; + +&msm_gpu { + /delete-property/qcom,gpu-speed-bin; + /delete-property/qcom,initial-pwrlevel; + /delete-node/qcom,gpu-pwrlevels; + /delete-node/qcom,gpu-pwrlevel-bins; + + /* GPU power levels */ + qcom,gpu-pwrlevels { + #address-cells = <1>; + #size-cells = <0>; + + qcom,initial-pwrlevel = <0>; + compatible = "qcom,gpu-pwrlevels"; + + qcom,gpu-pwrlevel@0 { + reg = <0>; + qcom,gpu-freq = <315000000>; + qcom,level = ; + + qcom,bus-freq-ddr7 = <3>; + qcom,bus-min-ddr7 = <2>; + qcom,bus-max-ddr7 = <9>; + + qcom,bus-freq-ddr8 = <3>; + qcom,bus-min-ddr8 = <2>; + qcom,bus-max-ddr8 = <7>; + + qcom,acd-level = <0x882F5FFD>; + }; + }; +}; diff --git a/qcom/katmai-hsp-overlay.dts b/qcom/katmai-hsp-overlay.dts index 806c0f45d4dd..02720f56b1c6 100644 --- a/qcom/katmai-hsp-overlay.dts +++ b/qcom/katmai-hsp-overlay.dts @@ -5,8 +5,9 @@ #include "katmai-hsp.dtsi" / { - model = "Qualcomm Technologies, Inc. Yupik IoT HSP"; + model = "Qualcomm Technologies, Inc. Katmai IoT HSP"; compatible = "qcom,yupik-iot-idp", "qcom,yupik-iot", "qcom,idp"; qcom,msm-id = <497 0x10000>, <575 0x10000>, <576 0x10000>; qcom,board-id = <34 1>; + qcom,softsku-id = <1>; }; diff --git a/qcom/katmai-hsp-pm7250b-overlay.dts b/qcom/katmai-hsp-pm7250b-overlay.dts index fa1178cf9bc2..67050db9a43d 100644 --- a/qcom/katmai-hsp-pm7250b-overlay.dts +++ b/qcom/katmai-hsp-pm7250b-overlay.dts @@ -4,8 +4,9 @@ #include "katmai-hsp-pm7250b.dtsi" / { - model = "Qualcomm Technologies, Inc. Yupik IOT HSP + PM7250B"; + model = "Qualcomm Technologies, Inc. Katmai IOT HSP + PM7250B"; compatible = "qcom,yupik-iot-idp", "qcom,yupik-iot", "qcom,idp"; qcom,msm-id = <497 0x10000>, <575 0x10000>, <576 0x10000>; qcom,board-id = <34 1>; + qcom,softsku-id = <1>; }; diff --git a/qcom/katmai.dtsi b/qcom/katmai.dtsi index 4c20a8c70358..ec23e8231b72 100644 --- a/qcom/katmai.dtsi +++ b/qcom/katmai.dtsi @@ -5,6 +5,7 @@ model = "Qualcomm Technologies, Inc. KATMAI SoC"; compatible = "qcom,yupik-iot"; qcom,msm-id = <576 0x10000>; + qcom,softsku-id = <1>; }; &msm_gpu { diff --git a/qcom/katmaip-fp2-hsp-overlay.dts b/qcom/katmaip-fp2-hsp-overlay.dts new file mode 100644 index 000000000000..f6c78069c114 --- /dev/null +++ b/qcom/katmaip-fp2-hsp-overlay.dts @@ -0,0 +1,22 @@ +/dts-v1/; +/plugin/; + +#include +#include "katmaip-hsp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. KatmaiP FP2 IoT HSP"; + compatible = "qcom,yupikp-iot-idp", "qcom,yupikp-iot", "qcom,idp"; + qcom,msm-id = <498 0x10000>, <575 0x10000>, <576 0x10000>; + qcom,board-id = <34 1>; + qcom,softsku-id = <2>; +}; + +&pcie1 { + status = "okay"; +}; + +&pcie1_msi { + status = "okay"; +}; + diff --git a/qcom/katmaip-fp2-hsp-pm7250b-overlay.dts b/qcom/katmaip-fp2-hsp-pm7250b-overlay.dts new file mode 100644 index 000000000000..e802e8da8e6e --- /dev/null +++ b/qcom/katmaip-fp2-hsp-pm7250b-overlay.dts @@ -0,0 +1,21 @@ +/dts-v1/; +/plugin/; + +#include "katmaip-hsp-pm7250b.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. KatmaiP FP2 IOT HSP + PM7250B"; + compatible = "qcom,yupikp-iot-idp", "qcom,yupikp-iot", "qcom,idp"; + qcom,msm-id = <498 0x10000>, <575 0x10000>, <576 0x10000>; + qcom,board-id = <34 1>; + qcom,softsku-id = <2>; +}; + +&pcie1 { + status = "okay"; +}; + +&pcie1_msi { + status = "okay"; +}; + diff --git a/qcom/katmaip-fp2.dts b/qcom/katmaip-fp2.dts new file mode 100644 index 000000000000..6fe9dd37f37c --- /dev/null +++ b/qcom/katmaip-fp2.dts @@ -0,0 +1,9 @@ +/dts-v1/; + +#include "katmaip-fp2.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. KATMAIP-FP2 SoC"; + compatible = "qcom,yupikp-iot"; + qcom,board-id = <0 0>; +}; diff --git a/qcom/katmaip-fp2.dtsi b/qcom/katmaip-fp2.dtsi new file mode 100644 index 000000000000..9296d0e29903 --- /dev/null +++ b/qcom/katmaip-fp2.dtsi @@ -0,0 +1,18 @@ +#include "katmai-fp2.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. KATMAIP-FP2 SoC"; + compatible = "qcom,yupikp-iot"; + qcom,msm-id = <575 0x10000>; + qcom,softsku-id = <2>; +}; + +&soc { + qcom,rmnet-ipa { + status = "disabled"; + }; +}; + +&ipa_hw { + status = "disabled"; +}; diff --git a/qcom/katmaip-hsp-overlay.dts b/qcom/katmaip-hsp-overlay.dts index bb8b4be0978e..bf4f8af03708 100644 --- a/qcom/katmaip-hsp-overlay.dts +++ b/qcom/katmaip-hsp-overlay.dts @@ -5,8 +5,9 @@ #include "katmaip-hsp.dtsi" / { - model = "Qualcomm Technologies, Inc. YupikP IoT HSP"; + model = "Qualcomm Technologies, Inc. KatmaiP IoT HSP"; compatible = "qcom,yupikp-iot-idp", "qcom,yupikp-iot", "qcom,idp"; qcom,msm-id = <498 0x10000>, <575 0x10000>, <576 0x10000>; qcom,board-id = <34 1>; + qcom,softsku-id = <1>; }; diff --git a/qcom/katmaip-hsp-pm7250b-overlay.dts b/qcom/katmaip-hsp-pm7250b-overlay.dts index 69f48f511d31..1a4fa6d07817 100644 --- a/qcom/katmaip-hsp-pm7250b-overlay.dts +++ b/qcom/katmaip-hsp-pm7250b-overlay.dts @@ -4,8 +4,9 @@ #include "katmaip-hsp-pm7250b.dtsi" / { - model = "Qualcomm Technologies, Inc. YupikP IOT HSP + PM7250B"; + model = "Qualcomm Technologies, Inc. KatmaiP IOT HSP + PM7250B"; compatible = "qcom,yupikp-iot-idp", "qcom,yupikp-iot", "qcom,idp"; qcom,msm-id = <498 0x10000>, <575 0x10000>, <576 0x10000>; qcom,board-id = <34 1>; + qcom,softsku-id = <1>; }; diff --git a/qcom/katmaip.dtsi b/qcom/katmaip.dtsi index ebc82acfc62e..d9e2b81adefc 100644 --- a/qcom/katmaip.dtsi +++ b/qcom/katmaip.dtsi @@ -4,6 +4,7 @@ model = "Qualcomm Technologies, Inc. KATMAIP SoC"; compatible = "qcom,yupikp-iot"; qcom,msm-id = <575 0x10000>; + qcom,softsku-id = <1>; }; &cam_csid2 {