arm64: dts: allwinner: pinebook: Make simplefb more consistent

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / allwinner / sun50i-a64-pinebook.dts

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
index 78c82a6..224bed6 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
@@ -1,15 +1,14 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.xyz>
- * Copyright (C) 2018 Vasily Khoruzhick <anarsoul@gmail.com>
- *
- */
+// Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.xyz>
+// Copyright (C) 2018 Vasily Khoruzhick <anarsoul@gmail.com>
 
 /dts-v1/;
 
 #include "sun50i-a64.dtsi"
+#include "sun50i-a64-cpu-opp.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/gpio-keys.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/pwm/pwm.h>
 
@@ -42,12 +41,6 @@
 
        chosen {
                stdout-path = "serial0:115200n8";
-
-               framebuffer-lcd {
-                       panel-supply = <&reg_dc1sw>;
-                       dvdd25-supply = <&reg_dldo2>;
-                       dvdd12-supply = <&reg_fldo1>;
-               };
        };
 
        gpio_keys {
@@ -60,16 +53,10 @@
                        linux,code = <SW_LID>;
                        linux,can-disable;
                        wakeup-source;
+                       wakeup-event-action = <EV_ACT_DEASSERTED>;
                };
        };
 
-       reg_vcc3v3: vcc3v3 {
-               compatible = "regulator-fixed";
-               regulator-name = "vcc3v3";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-       };
-
        wifi_pwrseq: wifi_pwrseq {
                compatible = "mmc-pwrseq-simple";
                reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */
@@ -98,6 +85,22 @@
        status = "okay";
 };
 
+&cpu0 {
+       cpu-supply = <&reg_dcdc2>;
+};
+
+&cpu1 {
+       cpu-supply = <&reg_dcdc2>;
+};
+
+&cpu2 {
+       cpu-supply = <&reg_dcdc2>;
+};
+
+&cpu3 {
+       cpu-supply = <&reg_dcdc2>;
+};
+
 &dai {
        status = "okay";
 };
@@ -163,6 +166,14 @@
        status = "okay";
 };
 
+/* The ANX6345 eDP-bridge is on r_i2c */
+&r_i2c {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&r_i2c_pl89_pins>;
+       status = "okay";
+};
+
 &r_rsb {
        status = "okay";
 
@@ -174,14 +185,6 @@
        };
 };
 
-/* The ANX6345 eDP-bridge is on r_i2c */
-&r_i2c {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&r_i2c_pl89_pins>;
-       status = "okay";
-};
-
 #include "axp803.dtsi"
 
 &ac_power_supply {
@@ -307,6 +310,12 @@
        regulator-name = "vcc-rtc";
 };
 
+&simplefb_lcd {
+       panel-supply = <&reg_dc1sw>;
+       dvdd25-supply = <&reg_dldo2>;
+       dvdd12-supply = <&reg_fldo1>;
+};
+
 &simplefb_hdmi {
        vcc-hdmi-supply = <&reg_dldo1>;
 };