diff options
Diffstat (limited to 'arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 47 |
1 files changed, 30 insertions, 17 deletions
diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi index e21feb85d822..d77f6af19065 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi @@ -58,7 +58,7 @@ gpios = <&pio 69 GPIO_ACTIVE_LOW>; linux,code = <SW_LID>; linux,input-type = <EV_SW>; - gpio-key,wakeup; + wakeup-source; }; switch-power { @@ -66,7 +66,7 @@ gpios = <&pio 14 GPIO_ACTIVE_HIGH>; linux,code = <KEY_POWER>; debounce-interval = <30>; - gpio-key,wakeup; + wakeup-source; }; switch-tablet-mode { @@ -74,7 +74,7 @@ gpios = <&pio 121 GPIO_ACTIVE_HIGH>; linux,code = <SW_TABLET_MODE>; linux,input-type = <EV_SW>; - gpio-key,wakeup; + wakeup-source; }; switch-volume-down { @@ -90,18 +90,6 @@ }; }; - panel: panel { - compatible = "lg,lp120up1"; - power-supply = <&panel_fixed_3v3>; - backlight = <&backlight>; - - port { - panel_in: endpoint { - remote-endpoint = <&ps8640_out>; - }; - }; - }; - panel_fixed_3v3: regulator1 { compatible = "regulator-fixed"; regulator-name = "PANEL_3V3"; @@ -161,6 +149,18 @@ }; }; }; + + watchdog { + compatible = "arm,smc-wdt"; + }; +}; + +/* + * Disable the original MMIO watch dog and switch to the SMC watchdog, which + * operates on the same MMIO. + */ +&watchdog { + status = "disabled"; }; &mfg_async { @@ -282,6 +282,20 @@ }; }; }; + + aux-bus { + panel: panel { + compatible = "lg,lp120up1"; + power-supply = <&panel_fixed_3v3>; + backlight = <&backlight>; + + port { + panel_in: endpoint { + remote-endpoint = <&ps8640_out>; + }; + }; + }; + }; }; }; @@ -913,7 +927,7 @@ }; &pwrap { - pmic: mt6397 { + pmic: pmic { compatible = "mediatek,mt6397"; #address-cells = <1>; #size-cells = <1>; @@ -929,7 +943,6 @@ pio6397: pinctrl { compatible = "mediatek,mt6397-pinctrl"; - pins-are-numbered; gpio-controller; #gpio-cells = <2>; }; |