Merge 4358e7ec1c
on remote branch
Change-Id: I62c3454b27d6c00f1c9c47f87428425da51030d3
This commit is contained in:
@@ -166,6 +166,4 @@
|
|||||||
|
|
||||||
ssusb_redriver = <&redriver>;
|
ssusb_redriver = <&redriver>;
|
||||||
|
|
||||||
qcom,wcd_usbss = <&wcd_usbss>;
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@@ -54,7 +54,7 @@
|
|||||||
iommus = <&apps_smmu 0xe3 0x0>;
|
iommus = <&apps_smmu 0xe3 0x0>;
|
||||||
qcom,iommu-dma-addr-pool = <0x40000000 0xc0000000>;
|
qcom,iommu-dma-addr-pool = <0x40000000 0xc0000000>;
|
||||||
qcom,iommu-geometry = <0x40000000 0x10000000>;
|
qcom,iommu-geometry = <0x40000000 0x10000000>;
|
||||||
qcom,iommu-dma = "fastmap";
|
qcom,iommu-dma = "atomic";
|
||||||
ranges;
|
ranges;
|
||||||
status = "ok";
|
status = "ok";
|
||||||
|
|
||||||
|
@@ -73,6 +73,60 @@ _platform_map = {
|
|||||||
],
|
],
|
||||||
"binary_compatible_with": ["tuna", "kera"],
|
"binary_compatible_with": ["tuna", "kera"],
|
||||||
},
|
},
|
||||||
|
"sun-le": {
|
||||||
|
"dtb_list": [
|
||||||
|
# keep sorted
|
||||||
|
{"name": "sun.dtb"},
|
||||||
|
{
|
||||||
|
"name": "sunp.dtb",
|
||||||
|
"apq": True,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "sunp-v2.dtb",
|
||||||
|
"apq": True,
|
||||||
|
},
|
||||||
|
{"name": "sun-v2.dtb"},
|
||||||
|
{"name": "sun-tp.dtb"},
|
||||||
|
{"name": "sun-tp-v2.dtb"},
|
||||||
|
{
|
||||||
|
"name": "sunp-tp.dtb",
|
||||||
|
"apq": True,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "sunp-tp-v2.dtb",
|
||||||
|
"apq": True,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
"dtbo_list": [
|
||||||
|
# keep sorted
|
||||||
|
{"name": "sun-atp-overlay.dtbo"},
|
||||||
|
{"name": "sun-cdp-kiwi-overlay.dtbo"},
|
||||||
|
{"name": "sun-cdp-kiwi-v8-overlay.dtbo"},
|
||||||
|
{"name": "sun-cdp-nfc-overlay.dtbo"},
|
||||||
|
{"name": "sun-cdp-no-display-overlay.dtbo"},
|
||||||
|
{"name": "sun-cdp-overlay.dtbo"},
|
||||||
|
{"name": "sun-cdp-v8-overlay.dtbo"},
|
||||||
|
{"name": "sun-mtp-3.5mm-kiwi-v8-overlay.dtbo"},
|
||||||
|
{"name": "sun-mtp-3.5mm-overlay.dtbo"},
|
||||||
|
{"name": "sun-mtp-kiwi-overlay.dtbo"},
|
||||||
|
{"name": "sun-mtp-kiwi-v8-overlay.dtbo"},
|
||||||
|
{"name": "sun-mtp-nfc-overlay.dtbo"},
|
||||||
|
{"name": "sun-mtp-overlay.dtbo"},
|
||||||
|
{"name": "sun-mtp-qmp1000-overlay.dtbo"},
|
||||||
|
{"name": "sun-mtp-qmp1000-v8-overlay.dtbo"},
|
||||||
|
{"name": "sun-mtp-v8-overlay.dtbo"},
|
||||||
|
{"name": "sun-qrd-sku1-overlay.dtbo"},
|
||||||
|
{"name": "sun-qrd-sku1-v8-overlay.dtbo"},
|
||||||
|
{"name": "sun-qrd-sku2-v8-overlay.dtbo"},
|
||||||
|
{"name": "sun-rcm-kiwi-overlay.dtbo"},
|
||||||
|
{"name": "sun-rcm-kiwi-v8-overlay.dtbo"},
|
||||||
|
{"name": "sun-rcm-overlay.dtbo"},
|
||||||
|
{"name": "sun-rcm-v8-overlay.dtbo"},
|
||||||
|
{"name": "sunp-hdk-overlay.dtbo"},
|
||||||
|
{"name": "sun-rumi-overlay.dtbo"},
|
||||||
|
],
|
||||||
|
"binary_compatible_with": ["tuna", "kera"],
|
||||||
|
},
|
||||||
"tuna": {
|
"tuna": {
|
||||||
"dtb_list": [
|
"dtb_list": [
|
||||||
{"name": "tuna.dtb"},
|
{"name": "tuna.dtb"},
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
* Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <dt-bindings/clock/qcom,gcc-sun.h>
|
#include <dt-bindings/clock/qcom,gcc-sun.h>
|
||||||
@@ -44,6 +44,7 @@
|
|||||||
qcom,core-clk-rate = <200000000>;
|
qcom,core-clk-rate = <200000000>;
|
||||||
qcom,core-clk-rate-hs = <66666667>;
|
qcom,core-clk-rate-hs = <66666667>;
|
||||||
qcom,core-clk-rate-disconnected = <133333333>;
|
qcom,core-clk-rate-disconnected = <133333333>;
|
||||||
|
qcom,pm-qos-latency = <2>;
|
||||||
|
|
||||||
interconnect-names = "usb-ddr", "usb-ipa", "ddr-usb";
|
interconnect-names = "usb-ddr", "usb-ipa", "ddr-usb";
|
||||||
interconnects = <&aggre1_noc MASTER_USB3_0 &mc_virt SLAVE_EBI1>,
|
interconnects = <&aggre1_noc MASTER_USB3_0 &mc_virt SLAVE_EBI1>,
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
* Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <dt-bindings/clock/qcom,gcc-tuna.h>
|
#include <dt-bindings/clock/qcom,gcc-tuna.h>
|
||||||
@@ -47,6 +47,7 @@
|
|||||||
qcom,core-clk-rate = <200000000>;
|
qcom,core-clk-rate = <200000000>;
|
||||||
qcom,core-clk-rate-hs = <66666667>;
|
qcom,core-clk-rate-hs = <66666667>;
|
||||||
qcom,core-clk-rate-disconnected = <133333333>;
|
qcom,core-clk-rate-disconnected = <133333333>;
|
||||||
|
qcom,pm-qos-latency = <2>;
|
||||||
|
|
||||||
interconnect-names = "usb-ddr", "usb-ipa", "ddr-usb";
|
interconnect-names = "usb-ddr", "usb-ipa", "ddr-usb";
|
||||||
interconnects = <&aggre1_noc MASTER_USB3_0 &mc_virt SLAVE_EBI1>,
|
interconnects = <&aggre1_noc MASTER_USB3_0 &mc_virt SLAVE_EBI1>,
|
||||||
|
@@ -1863,7 +1863,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
dispcc: clock-controller@af00000 {
|
dispcc: clock-controller@af00000 {
|
||||||
compatible = "qcom,tuna-dispcc-v1", "syscon";
|
compatible = "qcom,tuna-dispcc", "syscon";
|
||||||
reg = <0xaf00000 0x20000>;
|
reg = <0xaf00000 0x20000>;
|
||||||
reg-name = "cc_base";
|
reg-name = "cc_base";
|
||||||
vdd_mm-supply = <&VDD_MM_LEVEL>;
|
vdd_mm-supply = <&VDD_MM_LEVEL>;
|
||||||
@@ -1901,7 +1901,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
gcc: clock-controller@100000 {
|
gcc: clock-controller@100000 {
|
||||||
compatible = "qcom,tuna-gcc-v1", "syscon";
|
compatible = "qcom,tuna-gcc", "syscon";
|
||||||
reg = <0x100000 0x1f4200>;
|
reg = <0x100000 0x1f4200>;
|
||||||
reg-name = "cc_base";
|
reg-name = "cc_base";
|
||||||
vdd_cx-supply = <&VDD_CX_LEVEL>;
|
vdd_cx-supply = <&VDD_CX_LEVEL>;
|
||||||
|
Reference in New Issue
Block a user