Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CM5 I/O board fixes #112

Merged
merged 4 commits into from
Oct 26, 2023
Merged

CM5 I/O board fixes #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1543e32
arm64: dts: move status led configuration to radxa cm5
Ken-Vamrs Sep 20, 2023
81ca4be
arm64: dts: cm5 io: add dp sound
Ken-Vamrs Jul 31, 2023
540b309
arm64: dts: cm5 io: modify vcc5v0_host gpio
Ken-Vamrs Sep 4, 2023
ace9b97
arm64: dts: delete duplicate gpio-leds nodes
Ken-Vamrs Sep 20, 2023
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
31 changes: 16 additions & 15 deletions arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@
rockchip,jack-det;
};

dp0_sound: dp0-sound {
status = "okay";
compatible = "rockchip,hdmi";
rockchip,card-name= "rockchip-hdmi1";
rockchip,mclk-fs = <512>;
rockchip,cpu = <&spdif_tx2>;
rockchip,codec = <&dp0 1>;
rockchip,jack-det;
};

es8316_sound: es8316-sound {
status = "okay";
compatible = "rockchip,multicodecs-card";
Expand Down Expand Up @@ -107,7 +117,7 @@
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&vcc5v0_host_en>;
vin-supply = <&vcc5v0_sys>;
Expand Down Expand Up @@ -144,17 +154,6 @@
regulator-always-on;
};

gpio-leds {
compatible = "gpio-leds";
pinctrl-names = "default";

user-led1 {
gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
default-state = "on";
};
};

fan0: pwm-fan {
compatible = "pwm-fan";
#cooling-cells = <2>;
Expand Down Expand Up @@ -341,6 +340,10 @@
status = "okay";
};

&spdif_tx2 {
status = "okay";
};

&hdptxphy_hdmi0 {
status = "okay";
};
Expand Down Expand Up @@ -394,7 +397,7 @@

usb {
vcc5v0_host_en: vcc5v0-host-en {
rockchip,pins = <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

Expand Down Expand Up @@ -532,5 +535,3 @@
pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_det>;
status = "okay";
};


11 changes: 11 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,17 @@
mmc1 = &sdmmc;
mmc2 = &sdio;
};

gpio_leds: gpio-leds {
compatible = "gpio-leds";
pinctrl-names = "default";

status-led-blue {
gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
default-state = "on";
};
};
};

&i2c0 {
Expand Down
Loading