diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-03-09 13:43:18 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-03-09 13:43:18 +0100 |
| commit | 9a14a1f6284c0a5d3bbbb4ccfea8b6959ca63d83 (patch) | |
| tree | 5c8e9c1cc4365cee43e407eb72871d5ba4b08357 /arch/arm/boot/dts/lpc3250-phy3250.dts | |
| parent | dc6fa31dd7b294f586a07d5929ae3765ddbf86f3 (diff) | |
| parent | cd7c926fa65431a20a044f55dbd7609beaffbe46 (diff) | |
Merge remote-tracking branch 'fslc/4.14-2.3.x-imx' into toradex_4.14-2.3.x-imx
Conflicts:
arch/arm64/boot/dts/freescale/Makefile
arch/arm64/boot/dts/freescale/fsl-imx8qm-device.dtsi
Diffstat (limited to 'arch/arm/boot/dts/lpc3250-phy3250.dts')
| -rw-r--r-- | arch/arm/boot/dts/lpc3250-phy3250.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/lpc3250-phy3250.dts b/arch/arm/boot/dts/lpc3250-phy3250.dts index b7bd3a110a8d..dd0bdf765599 100644 --- a/arch/arm/boot/dts/lpc3250-phy3250.dts +++ b/arch/arm/boot/dts/lpc3250-phy3250.dts @@ -49,8 +49,8 @@ sd_reg: regulator@2 { compatible = "regulator-fixed"; regulator-name = "sd_reg"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; gpio = <&gpio 5 5 0>; enable-active-high; }; |