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.

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

aml-c400-plus: Remove duplicated code present in meson-gx-p23x-q20x.dtsi #7760

Merged
merged 1 commit into from
Jan 30, 2025
Merged
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
26 changes: 1 addition & 25 deletions patch/kernel/archive/meson64-6.12/dt/meson-gxm-c400-plus.dts
Original file line number Diff line number Diff line change
Expand Up @@ -38,29 +38,5 @@

/* Wireless SDIO Module */
&sd_emmc_a {
status = "okay";
pinctrl-0 = <&sdio_pins>;
pinctrl-1 = <&sdio_clk_gate_pins>;
pinctrl-names = "default", "clk-gate";
#address-cells = <1>;
#size-cells = <0>;

bus-width = <4>;
cap-sd-highspeed;
sd-uhs-sdr12;
sd-uhs-sdr25;
sd-uhs-sdr50;
sd-uhs-sdr104;
max-frequency = <50000000>;

non-removable;
disable-wp;

/* WiFi firmware requires power to be kept while in suspend */
keep-power-in-suspend;

mmc-pwrseq = <&sdio_pwrseq>;

vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&vddio_boot>;
};
};
26 changes: 1 addition & 25 deletions patch/kernel/archive/meson64-6.13/dt/meson-gxm-c400-plus.dts
Original file line number Diff line number Diff line change
Expand Up @@ -38,29 +38,5 @@

/* Wireless SDIO Module */
&sd_emmc_a {
status = "okay";
pinctrl-0 = <&sdio_pins>;
pinctrl-1 = <&sdio_clk_gate_pins>;
pinctrl-names = "default", "clk-gate";
#address-cells = <1>;
#size-cells = <0>;

bus-width = <4>;
cap-sd-highspeed;
sd-uhs-sdr12;
sd-uhs-sdr25;
sd-uhs-sdr50;
sd-uhs-sdr104;
max-frequency = <50000000>;

non-removable;
disable-wp;

/* WiFi firmware requires power to be kept while in suspend */
keep-power-in-suspend;

mmc-pwrseq = <&sdio_pwrseq>;

vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&vddio_boot>;
};
};
Loading