diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-14 01:50:31 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-14 01:50:31 +0300 |
commit | 69f658e399f3d9cb9c9680afb714ba23860d7ccb (patch) | |
tree | 13fbc42f466cb10d319514e4ddec53def8c554f6 /arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | |
parent | 9867999f3a85b52f96ef05fca00cc8128eed01ce (diff) | |
parent | 42f6284ae602469762ee721ec31ddfc6170e00bc (diff) | |
download | linux-69f658e399f3d9cb9c9680afb714ba23860d7ccb.tar.xz |
Merge branch 'pm-domains' into pm-opp
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi index 81ffc689a5bf..23c08c3afd0a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi @@ -194,7 +194,8 @@ &sd_emmc_a { status = "okay"; pinctrl-0 = <&sdio_pins>; - pinctrl-names = "default"; + pinctrl-1 = <&sdio_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; #address-cells = <1>; #size-cells = <0>; @@ -220,10 +221,14 @@ &sd_emmc_b { status = "okay"; pinctrl-0 = <&sdcard_pins>; - pinctrl-names = "default"; + pinctrl-1 = <&sdcard_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; bus-width = <4>; cap-sd-highspeed; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr50; max-frequency = <100000000>; disable-wp; @@ -238,10 +243,10 @@ &sd_emmc_c { status = "okay"; pinctrl-0 = <&emmc_pins>; - pinctrl-names = "default"; + pinctrl-1 = <&emmc_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; bus-width = <8>; - cap-sd-highspeed; cap-mmc-highspeed; max-frequency = <200000000>; non-removable; |