Skip to content
Closed
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
1 change: 1 addition & 0 deletions arch/arm/configs/rockchip_linux_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ CONFIG_ECRYPT_FS=y
CONFIG_HFSPLUS_FS=y
CONFIG_SQUASHFS=y
CONFIG_SQUASHFS_LZO=y
CONFIG_SQUASHFS_XZ=y
CONFIG_PSTORE=y
CONFIG_PSTORE_CONSOLE=y
CONFIG_PSTORE_RAM=y
Expand Down
33 changes: 27 additions & 6 deletions arch/arm64/boot/dts/rockchip/rockpi-4b-linux.dts
Original file line number Diff line number Diff line change
Expand Up @@ -281,15 +281,13 @@
};

&sdmmc {
clock-frequency = <100000000>;
clock-freq-min-max = <100000 100000000>;
supports-sd;
bus-width = <4>;
cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
num-slots = <1>;
//sd-uhs-sdr104;
sd-uhs-sdr104;
vqmmc-supply = <&vcc_sd>;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
Expand All @@ -298,8 +296,7 @@
};

&sdio0 {
clock-frequency = <100000000>;
clock-freq-min-max = <200000 100000000>;
max-frequency = <200000000>;
supports-sdio;
bus-width = <4>;
disable-wp;
Expand All @@ -311,7 +308,7 @@
num-slots = <1>;
pinctrl-names = "default";
pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
sd-uhs-sdr104;
sd-uhs-sdr104;
status = "okay";
};

Expand Down Expand Up @@ -1036,6 +1033,30 @@
rockchip,pins =
<2 25 RK_FUNC_1 &pcfg_pull_none_20ma>;
};
sdio0_cd: sdio0-cd {
rockchip,pins =
<2 26 RK_FUNC_1 &pcfg_pull_up_20ma>;
};

sdio0_pwr: sdio0-pwr {
rockchip,pins =
<2 27 RK_FUNC_1 &pcfg_pull_up_20ma>;
};

sdio0_bkpwr: sdio0-bkpwr {
rockchip,pins =
<2 28 RK_FUNC_1 &pcfg_pull_up_20ma>;
};

sdio0_wp: sdio0-wp {
rockchip,pins =
<0 3 RK_FUNC_1 &pcfg_pull_up_20ma>;
};

sdio0_int: sdio0-int {
rockchip,pins =
<0 4 RK_FUNC_1 &pcfg_pull_up_20ma>;
};
};

sdmmc {
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/configs/rockchip_linux_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1222,6 +1222,7 @@ CONFIG_ECRYPT_FS=m
CONFIG_HFSPLUS_FS=y
CONFIG_SQUASHFS=y
CONFIG_SQUASHFS_LZO=y
CONFIG_SQUASHFS_XZ=y
CONFIG_PSTORE=y
CONFIG_PSTORE_CONSOLE=y
CONFIG_PSTORE_RAM=y
Expand Down