Merge "ARM: dts: qcom: Change cpu arch timer frequency"
This commit is contained in:
committed by
Gerrit - the friendly Code Review server
commit
20eb6dcc56
@@ -84,7 +84,11 @@ endif
|
|||||||
ifeq ($(CONFIG_ARCH_SUN), y)
|
ifeq ($(CONFIG_ARCH_SUN), y)
|
||||||
ifeq ($(CONFIG_ARCH_QTI_VM), y)
|
ifeq ($(CONFIG_ARCH_QTI_VM), y)
|
||||||
sun_tuivm-dtb-$(CONFIG_ARCH_QTI_VM) += sun-vm-rumi.dtb \
|
sun_tuivm-dtb-$(CONFIG_ARCH_QTI_VM) += sun-vm-rumi.dtb \
|
||||||
sun-oemvm-rumi.dtb
|
sun-vm-mtp.dtb \
|
||||||
|
sun-vm-cdp.dtb \
|
||||||
|
sun-oemvm-rumi.dtb \
|
||||||
|
sun-oemvm-mtp.dtb \
|
||||||
|
sun-oemvm-cdp.dtb
|
||||||
dtb-y += $(sun_tuivm-dtb-y)
|
dtb-y += $(sun_tuivm-dtb-y)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@@ -17,14 +17,22 @@ _platform_map = {
|
|||||||
"sun-tuivm": {
|
"sun-tuivm": {
|
||||||
"dtb_list": [
|
"dtb_list": [
|
||||||
# keep sorted
|
# keep sorted
|
||||||
|
{"name": "sun-oemvm-cdp.dtb"},
|
||||||
|
{"name": "sun-oemvm-mtp.dtb"},
|
||||||
{"name": "sun-oemvm-rumi.dtb"},
|
{"name": "sun-oemvm-rumi.dtb"},
|
||||||
|
{"name": "sun-vm-cdp.dtb"},
|
||||||
|
{"name": "sun-vm-mtp.dtb"},
|
||||||
{"name": "sun-vm-rumi.dtb"},
|
{"name": "sun-vm-rumi.dtb"},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
"sun-oemvm": {
|
"sun-oemvm": {
|
||||||
"dtb_list": [
|
"dtb_list": [
|
||||||
# keep sorted
|
# keep sorted
|
||||||
|
{"name": "sun-oemvm-cdp.dtb"},
|
||||||
|
{"name": "sun-oemvm-mtp.dtb"},
|
||||||
{"name": "sun-oemvm-rumi.dtb"},
|
{"name": "sun-oemvm-rumi.dtb"},
|
||||||
|
{"name": "sun-vm-cdp.dtb"},
|
||||||
|
{"name": "sun-vm-mtp.dtb"},
|
||||||
{"name": "sun-vm-rumi.dtb"},
|
{"name": "sun-vm-rumi.dtb"},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
15
qcom/sun-oemvm-cdp.dts
Normal file
15
qcom/sun-oemvm-cdp.dts
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
|
*/
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
#include "sun-oemvm.dtsi"
|
||||||
|
#include "sun-oemvm-cdp.dtsi"
|
||||||
|
|
||||||
|
/ {
|
||||||
|
model = "Qualcomm Technologies, Inc. Sun OEMVM CDP";
|
||||||
|
compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp",
|
||||||
|
"qcom,sunp", "qcom,cdp";
|
||||||
|
qcom,board-id = <0x10001 0>;
|
||||||
|
};
|
6
qcom/sun-oemvm-cdp.dtsi
Normal file
6
qcom/sun-oemvm-cdp.dtsi
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
|
*/
|
||||||
|
&soc {
|
||||||
|
};
|
15
qcom/sun-oemvm-mtp.dts
Normal file
15
qcom/sun-oemvm-mtp.dts
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
|
*/
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
#include "sun-oemvm.dtsi"
|
||||||
|
#include "sun-oemvm-mtp.dtsi"
|
||||||
|
|
||||||
|
/ {
|
||||||
|
model = "Qualcomm Technologies, Inc. Sun OEMVM MTP";
|
||||||
|
compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp",
|
||||||
|
"qcom,sunp", "qcom,mtp";
|
||||||
|
qcom,board-id = <0x10008 0>;
|
||||||
|
};
|
6
qcom/sun-oemvm-mtp.dtsi
Normal file
6
qcom/sun-oemvm-mtp.dtsi
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
|
*/
|
||||||
|
&soc {
|
||||||
|
};
|
@@ -8,7 +8,7 @@
|
|||||||
/ {
|
/ {
|
||||||
#address-cells = <0x2>;
|
#address-cells = <0x2>;
|
||||||
#size-cells = <0x2>;
|
#size-cells = <0x2>;
|
||||||
qcom,msm-id = <618 0x10000>;
|
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
|
||||||
interrupt-parent = <&vgic>;
|
interrupt-parent = <&vgic>;
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
@@ -218,7 +218,7 @@
|
|||||||
<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
|
<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
|
||||||
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
|
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
|
||||||
<GIC_PPI 12 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
|
<GIC_PPI 12 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
|
||||||
clock-frequency = <19200000>;
|
clock-frequency = <1000000000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
qcom,test-dbl-oemvm {
|
qcom,test-dbl-oemvm {
|
||||||
|
15
qcom/sun-vm-cdp.dts
Normal file
15
qcom/sun-vm-cdp.dts
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
|
*/
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
#include "sun-vm.dtsi"
|
||||||
|
#include "sun-vm-cdp.dtsi"
|
||||||
|
|
||||||
|
/ {
|
||||||
|
model = "Qualcomm Technologies, Inc. Sun SVM CDP";
|
||||||
|
compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp",
|
||||||
|
"qcom,sunp", "qcom,cdp";
|
||||||
|
qcom,board-id = <0x10001 0>;
|
||||||
|
};
|
6
qcom/sun-vm-cdp.dtsi
Normal file
6
qcom/sun-vm-cdp.dtsi
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
|
*/
|
||||||
|
&soc {
|
||||||
|
};
|
15
qcom/sun-vm-mtp.dts
Normal file
15
qcom/sun-vm-mtp.dts
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
|
*/
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
#include "sun-vm.dtsi"
|
||||||
|
#include "sun-vm-mtp.dtsi"
|
||||||
|
|
||||||
|
/ {
|
||||||
|
model = "Qualcomm Technologies, Inc. Sun SVM MTP";
|
||||||
|
compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp",
|
||||||
|
"qcom,sunp", "qcom,mtp";
|
||||||
|
qcom,board-id = <0x10008 0>;
|
||||||
|
};
|
6
qcom/sun-vm-mtp.dtsi
Normal file
6
qcom/sun-vm-mtp.dtsi
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
|
*/
|
||||||
|
&soc {
|
||||||
|
};
|
@@ -8,7 +8,7 @@
|
|||||||
/ {
|
/ {
|
||||||
#address-cells = <0x2>;
|
#address-cells = <0x2>;
|
||||||
#size-cells = <0x2>;
|
#size-cells = <0x2>;
|
||||||
qcom,msm-id = <618 0x10000>;
|
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
|
||||||
interrupt-parent = <&vgic>;
|
interrupt-parent = <&vgic>;
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
@@ -351,7 +351,7 @@
|
|||||||
<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
|
<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
|
||||||
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
|
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,
|
||||||
<GIC_PPI 12 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
|
<GIC_PPI 12 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
|
||||||
clock-frequency = <19200000>;
|
clock-frequency = <1000000000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
qcom_smcinvoke {
|
qcom_smcinvoke {
|
||||||
|
Reference in New Issue
Block a user