Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/arm/qcom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,9 @@ properties:
- particle,tachyon
- qcom,qcm6490-idp
- qcom,qcs6490-rb3gen2
- radxa,cm-q64
- radxa,dragon-q6a
- radxa,dragon-q6b
- shift,otter
- thundercomm,rubikpi3
- const: qcom,qcm6490
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/pwm/clk-pwm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ properties:
maxItems: 1

"#pwm-cells":
const: 2
enum: [2, 3]

gpios:
description:
Expand Down
3 changes: 3 additions & 0 deletions arch/arm64/boot/dts/qcom/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ dtb-$(CONFIG_ARCH_QCOM) += qcs6490-radxa-cm-q64-rpi-cm5-io-kvm.dtb
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-radxa-dragon-q6a.dtb
qcs6490-radxa-dragon-q6a-kvm-dtbs := qcs6490-radxa-dragon-q6a.dtb qcs6490-radxa-dragon-q6a-kvm.dtbo
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-radxa-dragon-q6a-kvm.dtb
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-radxa-dragon-q6b.dtb
qcs6490-radxa-dragon-q6b-kvm-dtbs := qcs6490-radxa-dragon-q6b.dtb qcs6490-radxa-dragon-q6b-kvm.dtbo
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-radxa-dragon-q6b-kvm.dtb
dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2.dtb

qcs6490-rb3gen2-vision-mezzanine-dtbs := qcs6490-rb3gen2.dtb qcs6490-rb3gen2-vision-mezzanine.dtbo
Expand Down
29 changes: 26 additions & 3 deletions arch/arm64/boot/dts/qcom/qcs6490-radxa-cm-q64.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,22 @@
regulator-always-on;
};

wifi_pwr_en_3v3: wifi-pwr-en-3v3 {
compatible = "regulator-fixed";
regulator-name = "wifi_pwr_en_3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
vin-supply = <&vcc_3v3>;
gpio = <&tlmm 33 GPIO_ACTIVE_HIGH>;
enable-active-high;

pinctrl-0 = <&wifi_pwr_en>;
pinctrl-names = "default";

regulator-boot-on;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

一般不需要这个属性

regulator-always-on;
};

vcc_3v3s: regulator-vcc-3v3s {
compatible = "regulator-fixed";
regulator-name = "vcc_3v3s";
Expand Down Expand Up @@ -489,9 +505,9 @@
};

vreg_l5c_1p62: ldo5 {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

跟regulator-name不匹配哦

@CodeChenL CodeChenL Sep 10, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我在想是的对齐原理图网络名还是真实电压

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

真实电压吧,网络名就放过它

regulator-name = "vreg_l5c_1p62";
regulator-min-microvolt = <1620000>;
regulator-max-microvolt = <3300000>;
regulator-name = "vreg_l5c_3p296";
regulator-min-microvolt = <3296000>;
regulator-max-microvolt = <3296000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-allow-set-load;
regulator-allowed-modes = <RPMH_REGULATOR_MODE_LPM
Expand Down Expand Up @@ -1272,6 +1288,13 @@
bias-disable;
output-low;
};

wifi_pwr_en: wifi-pwr-en-state {
pins = "gpio33";
function = "gpio";
drive-strength = <8>;
bias-pull-up;
};
};

&uart5 {
Expand Down
58 changes: 58 additions & 0 deletions arch/arm64/boot/dts/qcom/qcs6490-radxa-dragon-q6b-kvm.dtso

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个是不是跟其他的kvm overlay一样的?在makefile里面可以怎么复用一下么

Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
// SPDX-License-Identifier: BSD-3-Clause
/*
* Copyright (c) 2025 Radxa Computer (Shenzhen) Co., Ltd.
*
* This device tree overlay is supposed to be applied by UEFI firmware
* when Hypervisor Override is set to enabled.
*/

#include <dt-bindings/firmware/qcom,scm.h>

/dts-v1/;
/plugin/;

/* Required when Hypervisor Override is set to auto */
&{/chosen} {
radxa,enable-kvm = <1>;
};

/* We can't and don't need to use zap shader in EL2 as linux can zap the gpu on it's own. */
&gpu_zap_shader {
status = "disabled";
};

&soc {
#address-cells = <2>;
#size-cells = <2>;

pcie@1c08000 {
#address-cells = <3>;
#size-cells = <2>;

/* Allow using upper PCIe space */
ranges = <0x01000000 0x0 0x00000000 0x0 0x40200000 0x0 0x100000>,
<0x02000000 0x0 0x40300000 0x0 0x40300000 0x0 0x1fd00000>,
<0x03000000 0x4 0x00000000 0x4 0x00000000 0x3 0x00000000>;
};
};

&remoteproc_adsp {
qcom,broken-reset;
};

&remoteproc_cdsp {
qcom,broken-reset;
};

&scm {
qcom,shm-bridge-vmid = <QCOM_SCM_VMID_SELF_OWNER>;
};

&venus {
iommus = <&apps_smmu 0x2180 0x20>,
<&apps_smmu 0x2184 0x20>;

video-firmware {
iommus = <&apps_smmu 0x21a2 0x0>;
};
};
Loading