shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

arm64: dts: rockchip: Enable SD/SDIO 3.0 for PX30/RK3326 boards

Browse Source 
This patch enables SD(IO) 3.0 for all boards by adding correct
vccq and vcc power supplies, as well as properities required by
UHS-I mode.

Change-Id: Iec11e1d1abe7ef9fc17ba08eece3440d7dcaea0b
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
This commit is contained in:
Shawn Lin
2018-02-26 14:49:21 +08:00
committed by Tao Huang
parent c57523a0d6
commit 7d65765bf3
4 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts
View File

@@ -445,7 +445,7 @@
vccio_sd: LDO_REG5 {
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
regulator-name = "vccio_sd";
@@ -649,25 +649,31 @@
};
&sdmmc {
bus-width = <4>;
cap-mmc-highspeed;
cap-sd-highspeed;
supports-sd;
broken-cd;
card-detect-delay = <800>;
ignore-pm-notify;
keep-power-in-suspend;
/*cd-gpios = <&gpio2 4 GPIO_ACTIVE_HIGH>; [> CD GPIO <]*/
status = "disabled";
sd-uhs-sdr12;
sd-uhs-sdr25;
sd-uhs-sdr50;
sd-uhs-sdr104;
vqmmc-supply = <&vccio_sd>;
vmmc-supply = <&vcc_sd>;
status = "okay";
};
&sdio {
max-frequency = <50000000>;
bus-width = <4>;
cap-sd-highspeed;
supports-sdio;
ignore-pm-notify;
keep-power-in-suspend;
non-removable;
mmc-pwrseq = <&sdio_pwrseq>;
sd-uhs-sdr104;
status = "okay";
};

14
arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts
View File

@@ -446,7 +446,7 @@
vccio_sd: LDO_REG5 {
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
regulator-name = "vccio_sd";
@@ -649,25 +649,31 @@
};
&sdmmc {
bus-width = <4>;
cap-mmc-highspeed;
cap-sd-highspeed;
supports-sd;
broken-cd;
card-detect-delay = <800>;
ignore-pm-notify;
keep-power-in-suspend;
/*cd-gpios = <&gpio2 4 GPIO_ACTIVE_HIGH>; [> CD GPIO <]*/
sd-uhs-sdr12;
sd-uhs-sdr25;
sd-uhs-sdr50;
sd-uhs-sdr104;
vqmmc-supply = <&vccio_sd>;
vmmc-supply = <&vcc_sd>;
status = "disabled";
};
&sdio {
max-frequency = <50000000>;
bus-width = <4>;
cap-sd-highspeed;
supports-sdio;
ignore-pm-notify;
keep-power-in-suspend;
non-removable;
mmc-pwrseq = <&sdio_pwrseq>;
sd-uhs-sdr104;
status = "okay";
};

21
arch/arm64/boot/dts/rockchip/px30.dtsi
View File

@@ -977,8 +977,9 @@
compatible = "rockchip,px30-dw-mshc", "rockchip,rk3288-dw-mshc";
reg = <0x0 0xff370000 0x0 0x4000>;
max-frequency = <150000000>;
clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>;
clock-names = "biu", "ciu";
clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
<&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
clock-names = "biu", "ciu", "ciu-drv", "ciu-sample";
power-domains = <&power PX30_PD_SDCARD>;
fifo-depth = <0x100>;
interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
@@ -2078,30 +2079,30 @@
sdmmc {
sdmmc_clk: sdmmc-clk {
rockchip,pins =
<1 RK_PD6 RK_FUNC_1 &pcfg_pull_none_4ma>;
<1 RK_PD6 RK_FUNC_1 &pcfg_pull_none_8ma>;
};
sdmmc_cmd: sdmmc-cmd {
rockchip,pins =
<1 RK_PD7 RK_FUNC_1 &pcfg_pull_up_4ma>;
<1 RK_PD7 RK_FUNC_1 &pcfg_pull_up_8ma>;
};
sdmmc_det: sdmmc-det {
rockchip,pins =
<0 RK_PA3 RK_FUNC_1 &pcfg_pull_up_4ma>;
<0 RK_PA3 RK_FUNC_1 &pcfg_pull_up_8ma>;
};
sdmmc_bus1: sdmmc-bus1 {
rockchip,pins =
<1 RK_PD2 RK_FUNC_1 &pcfg_pull_up_4ma>;
<1 RK_PD2 RK_FUNC_1 &pcfg_pull_up_8ma>;
};
sdmmc_bus4: sdmmc-bus4 {
rockchip,pins =
<1 RK_PD2 RK_FUNC_1 &pcfg_pull_up_4ma>,
<1 RK_PD3 RK_FUNC_1 &pcfg_pull_up_4ma>,
<1 RK_PD4 RK_FUNC_1 &pcfg_pull_up_4ma>,
<1 RK_PD5 RK_FUNC_1 &pcfg_pull_up_4ma>;
<1 RK_PD2 RK_FUNC_1 &pcfg_pull_up_8ma>,
<1 RK_PD3 RK_FUNC_1 &pcfg_pull_up_8ma>,
<1 RK_PD4 RK_FUNC_1 &pcfg_pull_up_8ma>,
<1 RK_PD5 RK_FUNC_1 &pcfg_pull_up_8ma>;
};
sdmmc_gpio: sdmmc-gpio {

14
arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts
View File

@@ -473,7 +473,7 @@
vccio_sd: LDO_REG5 {
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
regulator-name = "vccio_sd";
@@ -736,25 +736,31 @@
};
&sdmmc {
bus-width = <4>;
cap-mmc-highspeed;
cap-sd-highspeed;
supports-sd;
broken-cd;
card-detect-delay = <800>;
ignore-pm-notify;
keep-power-in-suspend;
/*cd-gpios = <&gpio2 4 GPIO_ACTIVE_HIGH>; [> CD GPIO <]*/
sd-uhs-sdr12;
sd-uhs-sdr25;
sd-uhs-sdr50;
sd-uhs-sdr104;
vqmmc-supply = <&vccio_sd>;
vmmc-supply = <&vcc_sd>;
status = "disabled";
};
&sdio {
max-frequency = <50000000>;
bus-width = <4>;
cap-sd-highspeed;
supports-sdio;
ignore-pm-notify;
keep-power-in-suspend;
non-removable;
mmc-pwrseq = <&sdio_pwrseq>;
sd-uhs-sdr104;
status = "okay";
};