|
159 | 159 | regulator-max-microvolt = <5000000>; |
160 | 160 | }; |
161 | 161 |
|
| 162 | + vcc_sd: vcc-sd { |
| 163 | + compatible = "regulator-fixed"; |
| 164 | + enable-active-high; |
| 165 | + gpio = <&gpio0 1 GPIO_ACTIVE_HIGH>; |
| 166 | + pinctrl-names = "default"; |
| 167 | + pinctrl-0 = <&vcc_sd_h>; |
| 168 | + regulator-name = "vcc_sd"; |
| 169 | + regulator-min-microvolt = <3300000>; |
| 170 | + regulator-max-microvolt = <3300000>; |
| 171 | + }; |
| 172 | + |
162 | 173 | vcc_phy: vcc-phy-regulator { |
163 | 174 | compatible = "regulator-fixed"; |
164 | 175 | regulator-name = "vcc_phy"; |
|
383 | 394 | }; |
384 | 395 | }; |
385 | 396 |
|
386 | | - vcc_sd: LDO_REG4 { |
| 397 | + vccio_sd: LDO_REG4 { |
387 | 398 | regulator-always-on; |
388 | 399 | regulator-boot-on; |
389 | 400 | regulator-min-microvolt = <1800000>; |
390 | 401 | regulator-max-microvolt = <3000000>; |
391 | | - regulator-name = "vcc_sd"; |
| 402 | + regulator-name = "vccio_sd"; |
392 | 403 | regulator-state-mem { |
393 | 404 | regulator-on-in-suspend; |
394 | 405 | regulator-suspend-microvolt = <3000000>; |
|
496 | 507 |
|
497 | 508 | bt656-supply = <&vcc_3v0>; /* bt656_gpio2ab_ms */ |
498 | 509 | audio-supply = <&vcca1v8_codec>; /* audio_gpio3d4a_ms */ |
499 | | - sdmmc-supply = <&vcc_sd>; /* sdmmc_gpio4b_ms */ |
| 510 | + sdmmc-supply = <&vccio_sd>; /* sdmmc_gpio4b_ms */ |
500 | 511 | gpio1830-supply = <&vcc_3v0>; /* gpio1833_gpio4cd_ms */ |
501 | 512 | }; |
502 | 513 |
|
|
563 | 574 | disable-wp; |
564 | 575 | num-slots = <1>; |
565 | 576 | //sd-uhs-sdr104; |
566 | | - vqmmc-supply = <&vcc_sd>; |
| 577 | + vmmc-supply = <&vcc_sd>; |
| 578 | + vqmmc-supply = <&vccio_sd>; |
567 | 579 | pinctrl-names = "default"; |
568 | 580 | pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; |
569 | 581 | status = "okay"; |
|
683 | 695 | }; |
684 | 696 | }; |
685 | 697 |
|
| 698 | + vcc_sd { |
| 699 | + vcc_sd_h: vcc-sd-h { |
| 700 | + rockchip,pins = |
| 701 | + <0 1 RK_FUNC_GPIO &pcfg_pull_up>; |
| 702 | + }; |
| 703 | + }; |
| 704 | + |
686 | 705 | fusb30x { |
687 | 706 | fusb0_int: fusb0-int { |
688 | 707 | rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>; |
|
0 commit comments