diff options
author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2022-02-25 13:44:44 +0000 |
---|---|---|
committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2022-02-25 13:44:44 +0000 |
commit | db927686e43ffebfc5d1693c1cb4fd74f462d99b (patch) | |
tree | 0cbd82aea0825efc1cb10bad4af664ed1bed9b83 /arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | |
parent | drm/i915: Check stolen memory size before calling drm_mm_init (diff) | |
parent | Merge tag 'drm-misc-next-2022-02-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (diff) | |
download | linux-dev-db927686e43ffebfc5d1693c1cb4fd74f462d99b.tar.xz linux-dev-db927686e43ffebfc5d1693c1cb4fd74f462d99b.zip |
Merge drm/drm-next into drm-intel-gt-next
Matt needed some buddy allocator changes for landing DG2 small BAR
support patches.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi index 0bd1e98a0eef..ddb1b345397f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi @@ -48,7 +48,7 @@ regulator-max-microvolt = <3300000>; vin-supply = <&vcc_5v>; - enable-gpio = <&gpio GPIOE_2 GPIO_ACTIVE_HIGH>; + enable-gpio = <&gpio_ao GPIOE_2 GPIO_OPEN_DRAIN>; enable-active-high; regulator-always-on; |