guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: Add u-boot-pinebook-pro-rk3399.


From: guix-commits
Subject: branch master updated: gnu: Add u-boot-pinebook-pro-rk3399.
Date: Mon, 20 Apr 2020 22:14:16 -0400

This is an automated email from the git hooks/post-receive script.

vagrantc pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 5327b39  gnu: Add u-boot-pinebook-pro-rk3399.
5327b39 is described below

commit 5327b399a875a00304ccc1e6ece7190f26113539
Author: Vagrant Cascadian <address@hidden>
AuthorDate: Mon Apr 20 18:21:07 2020 -0700

    gnu: Add u-boot-pinebook-pro-rk3399.
    
    * gnu/packages/bootloaders (u-boot-pinebook-pro-rk3399): New variable.
    * gnu/packages/patches/u-boot-DT-for-Pinebook-Pro.patch: New file.
    * gnu/packages/patches/u-boot-add-boe-nv140fhmn49-display.patch: New file.
    * gnu/packages/patches/u-boot-gpio-keys-binding-cons.patch: New file.
    * gnu/packages/patches/u-boot-leds-common-binding-con.patch: New file.
    * gnu/packages/patches/u-boot-support-Pinebook-Pro-laptop.patch: New file.
    * gnu/packages/patches/u-boot-video-rockchip-fix-build.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add new patches.
    * gnu/bootloader/u-boot.scm (install-pinebook-pro-rk3399-u-boot,
      u-boot-pinebook-pro-rk3399-bootloader): New variable.
    
    Co-authored-by: Jan Nieuwenhuizen <address@hidden>
---
 gnu/bootloader/u-boot.scm                          |   11 +
 gnu/local.mk                                       |    6 +
 gnu/packages/bootloaders.scm                       |   30 +
 .../patches/u-boot-DT-for-Pinebook-Pro.patch       | 1132 ++++++++++++++++++++
 .../u-boot-add-boe-nv140fhmn49-display.patch       |   29 +
 .../patches/u-boot-gpio-keys-binding-cons.patch    |   37 +
 .../patches/u-boot-leds-common-binding-con.patch   |  115 ++
 .../u-boot-support-Pinebook-Pro-laptop.patch       |  367 +++++++
 .../patches/u-boot-video-rockchip-fix-build.patch  |   48 +
 9 files changed, 1775 insertions(+)

diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm
index 6f41d0a..1da9d04 100644
--- a/gnu/bootloader/u-boot.scm
+++ b/gnu/bootloader/u-boot.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2017 David Craven <address@hidden>
 ;;; Copyright © 2017, 2019 Mathieu Othacehe <address@hidden>
 ;;; Copyright © 2020 Julien Lepiller <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37,6 +38,7 @@
             u-boot-pine64-plus-bootloader
             u-boot-pine64-lts-bootloader
             u-boot-pinebook-bootloader
+            u-boot-pinebook-pro-rk3399-bootloader
             u-boot-puma-rk3399-bootloader
             u-boot-rock64-rk3328-bootloader
             u-boot-rockpro64-rk3399-bootloader
@@ -123,6 +125,8 @@
         (write-file-on-device u-boot (stat:size (stat u-boot))
                               device (* 16384 512)))))
 
+(define install-pinebook-pro-rk3399-u-boot install-rockpro64-rk3399-u-boot)
+
 
 
 ;;;
@@ -243,3 +247,10 @@
    (inherit u-boot-bootloader)
    (package u-boot-rockpro64-rk3399)
    (installer install-rockpro64-rk3399-u-boot)))
+
+(define u-boot-pinebook-pro-rk3399-bootloader
+  ;; SD and eMMC use the same format
+  (bootloader
+   (inherit u-boot-bootloader)
+   (package u-boot-pinebook-pro-rk3399)
+   (installer install-pinebook-pro-rk3399-u-boot)))
diff --git a/gnu/local.mk b/gnu/local.mk
index fb0454f..ca863a8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1482,6 +1482,12 @@ dist_patch_DATA =                                        
        \
   %D%/packages/patches/tomb-fix-errors-on-open.patch           \
   %D%/packages/patches/tuxpaint-stamps-path.patch              \
   %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch       \
+  %D%/packages/patches/u-boot-DT-for-Pinebook-Pro.patch                \
+  %D%/packages/patches/u-boot-add-boe-nv140fhmn49-display.patch        \
+  %D%/packages/patches/u-boot-gpio-keys-binding-cons.patch     \
+  %D%/packages/patches/u-boot-leds-common-binding-con.patch    \
+  %D%/packages/patches/u-boot-support-Pinebook-Pro-laptop.patch        \
+  %D%/packages/patches/u-boot-video-rockchip-fix-build.patch   \
   %D%/packages/patches/ucx-tcp-iface-ioctl.patch               \
   %D%/packages/patches/udiskie-no-appindicator.patch           \
   %D%/packages/patches/unzip-CVE-2014-8139.patch               \
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 28a088a..750579e 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2019 nee <address@hidden>
 ;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
 ;;; Copyright © 2020 Björn Höfling <address@hidden>
+;;; Copyright © 2018, 2019, 2020 Vagrant Cascadian <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -834,6 +835,35 @@ to Novena upstream, does not load u-boot.img from the 
first partition.")
        `(("firmware" ,arm-trusted-firmware-rk3399)
          ,@(package-native-inputs base))))))
 
+(define-public u-boot-pinebook-pro-rk3399
+  (let ((base (make-u-boot-package "pinebook-pro-rk3399" "aarch64-linux-gnu")))
+    (package
+     (inherit base)
+     (source (origin
+              (inherit (package-source u-boot))
+              (patches
+               (search-patches "u-boot-add-boe-nv140fhmn49-display.patch"
+                               "u-boot-gpio-keys-binding-cons.patch"
+                               "u-boot-leds-common-binding-con.patch"
+                               "u-boot-DT-for-Pinebook-Pro.patch"
+                               "u-boot-support-Pinebook-Pro-laptop.patch"
+                               "u-boot-video-rockchip-fix-build.patch"))))
+      (arguments
+        (substitute-keyword-arguments (package-arguments base)
+          ((#:phases phases)
+           `(modify-phases ,phases
+              (add-after 'unpack 'set-environment
+                (lambda* (#:key inputs #:allow-other-keys)
+                  (setenv "BL31" (string-append (assoc-ref inputs "firmware")
+                                                "/bl31.elf"))
+                  #t))
+              ;; Phases do not succeed on the bl31 ELF.
+              (delete 'strip)
+              (delete 'validate-runpath)))))
+      (native-inputs
+       `(("firmware" ,arm-trusted-firmware-rk3399)
+         ,@(package-native-inputs base))))))
+
 (define-public vboot-utils
   (package
     (name "vboot-utils")
diff --git a/gnu/packages/patches/u-boot-DT-for-Pinebook-Pro.patch 
b/gnu/packages/patches/u-boot-DT-for-Pinebook-Pro.patch
new file mode 100644
index 0000000..f88d12f
--- /dev/null
+++ b/gnu/packages/patches/u-boot-DT-for-Pinebook-Pro.patch
@@ -0,0 +1,1132 @@
+From b128c2e0b480ee992fabe554d19cd471efb11095 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <address@hidden>
+Date: Mon, 20 Apr 2020 20:27:35 +0100
+Origin: https://patchwork.ozlabs.org/project/uboot/patch/address@hidden/
+Subject: [PATCH 4/5] arm: dts: rockchip: Add initial DT for Pinebook Pro
+
+Sync initial support for Pinebook Pro device tree from Linux 5.7-rc1.
+
+Signed-off-by: Peter Robinson <address@hidden>
+---
+ arch/arm/dts/Makefile                |    1 +
+ arch/arm/dts/rk3399-pinebook-pro.dts | 1096 ++++++++++++++++++++++++++
+ 2 files changed, 1097 insertions(+)
+ create mode 100644 arch/arm/dts/rk3399-pinebook-pro.dts
+
+diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
+index 820ee9733a..885bf0ef58 100644
+--- a/arch/arm/dts/Makefile
++++ b/arch/arm/dts/Makefile
+@@ -125,6 +125,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
+       rk3399-nanopi-m4.dtb \
+       rk3399-nanopi-neo4.dtb \
+       rk3399-orangepi.dtb \
++      rk3399-pinebook-pro.dtb \
+       rk3399-puma-ddr1333.dtb \
+       rk3399-puma-ddr1600.dtb \
+       rk3399-puma-ddr1866.dtb \
+diff --git a/arch/arm/dts/rk3399-pinebook-pro.dts 
b/arch/arm/dts/rk3399-pinebook-pro.dts
+new file mode 100644
+index 0000000000..294d21bf45
+--- /dev/null
++++ b/arch/arm/dts/rk3399-pinebook-pro.dts
+@@ -0,0 +1,1096 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++/*
++ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
++ * Copyright (c) 2018 Akash Gajjar <address@hidden>
++ * Copyright (c) 2020 Tobias Schramm <address@hidden>
++ */
++
++/dts-v1/;
++#include <dt-bindings/input/gpio-keys.h>
++#include <dt-bindings/input/linux-event-codes.h>
++#include <dt-bindings/pwm/pwm.h>
++#include <dt-bindings/usb/pd.h>
++#include <dt-bindings/leds/common.h>
++#include "rk3399.dtsi"
++#include "rk3399-opp.dtsi"
++
++/ {
++      model = "Pine64 Pinebook Pro";
++      compatible = "pine64,pinebook-pro", "rockchip,rk3399";
++
++      chosen {
++              stdout-path = "serial2:1500000n8";
++      };
++
++      backlight: edp-backlight {
++              compatible = "pwm-backlight";
++              power-supply = <&vcc_12v>;
++              pwms = <&pwm0 0 740740 0>;
++      };
++
++      edp_panel: edp-panel {
++              compatible = "boe,nv140fhmn49";
++              backlight = <&backlight>;
++              enable-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
++              pinctrl-names = "default";
++              pinctrl-0 = <&panel_en_gpio>;
++              power-supply = <&vcc3v3_panel>;
++
++              ports {
++                      #address-cells = <1>;
++                      #size-cells = <0>;
++
++                      port@0 {
++                              reg = <0>;
++                              #address-cells = <1>;
++                              #size-cells = <0>;
++
++                              panel_in_edp: endpoint@0 {
++                                      reg = <0>;
++                                      remote-endpoint = <&edp_out_panel>;
++                              };
++                      };
++              };
++      };
++
++      /*
++       * Use separate nodes for gpio-keys to allow for selective deactivation
++       * of wakeup sources via sysfs without disabling the whole key
++       */
++      gpio-key-lid {
++              compatible = "gpio-keys";
++              pinctrl-names = "default";
++              pinctrl-0 = <&lidbtn_gpio>;
++
++              lid {
++                      debounce-interval = <20>;
++                      gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_LOW>;
++                      label = "Lid";
++                      linux,code = <SW_LID>;
++                      linux,input-type = <EV_SW>;
++                      wakeup-event-action = <EV_ACT_DEASSERTED>;
++                      wakeup-source;
++              };
++      };
++
++      gpio-key-power {
++              compatible = "gpio-keys";
++              pinctrl-names = "default";
++              pinctrl-0 = <&pwrbtn_gpio>;
++
++              power {
++                      debounce-interval = <20>;
++                      gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
++                      label = "Power";
++                      linux,code = <KEY_POWER>;
++                      wakeup-source;
++              };
++      };
++
++      leds {
++              compatible = "gpio-leds";
++              pinctrl-names = "default";
++              pinctrl-0 = <&pwrled_gpio &slpled_gpio>;
++
++              green-led {
++                      color = <LED_COLOR_ID_GREEN>;
++                      default-state = "on";
++                      function = LED_FUNCTION_POWER;
++                      gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
++                      label = "green:power";
++              };
++
++              red-led {
++                      color = <LED_COLOR_ID_RED>;
++                      default-state = "off";
++                      function = LED_FUNCTION_STANDBY;
++                      gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
++                      label = "red:standby";
++                      panic-indicator;
++                      retain-state-suspended;
++              };
++      };
++
++      /* Power sequence for SDIO WiFi module */
++      sdio_pwrseq: sdio-pwrseq {
++              compatible = "mmc-pwrseq-simple";
++              clocks = <&rk808 1>;
++              clock-names = "ext_clock";
++              pinctrl-names = "default";
++              pinctrl-0 = <&wifi_enable_h_gpio>;
++              post-power-on-delay-ms = <100>;
++              power-off-delay-us = <500000>;
++
++              /* WL_REG_ON on module */
++              reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
++      };
++
++      /* Audio components */
++      es8316-sound {
++              compatible = "simple-audio-card";
++              pinctrl-names = "default";
++              pinctrl-0 = <&hp_det_gpio>;
++              simple-audio-card,name = "rockchip,es8316-codec";
++              simple-audio-card,format = "i2s";
++              simple-audio-card,mclk-fs = <256>;
++
++              simple-audio-card,widgets =
++                      "Microphone", "Mic Jack",
++                      "Headphone", "Headphones",
++                      "Speaker", "Speaker";
++              simple-audio-card,routing =
++                      "MIC1", "Mic Jack",
++                      "Headphones", "HPOL",
++                      "Headphones", "HPOR",
++                      "Speaker Amplifier INL", "HPOL",
++                      "Speaker Amplifier INR", "HPOR",
++                      "Speaker", "Speaker Amplifier OUTL",
++                      "Speaker", "Speaker Amplifier OUTR";
++
++              simple-audio-card,hp-det-gpio = <&gpio0 RK_PB0 
GPIO_ACTIVE_HIGH>;
++              simple-audio-card,aux-devs = <&speaker_amp>;
++              simple-audio-card,pin-switches = "Speaker";
++
++              simple-audio-card,cpu {
++                      sound-dai = <&i2s1>;
++              };
++
++              simple-audio-card,codec {
++                      sound-dai = <&es8316>;
++              };
++      };
++
++      speaker_amp: speaker-amplifier {
++              compatible = "simple-audio-amplifier";
++              enable-gpios = <&gpio4 RK_PD3 GPIO_ACTIVE_HIGH>;
++              sound-name-prefix = "Speaker Amplifier";
++              VCC-supply = <&pa_5v>;
++      };
++
++      /* Power tree */
++      /* Root power source */
++      vcc_sysin: vcc-sysin {
++              compatible = "regulator-fixed";
++              regulator-name = "vcc_sysin";
++              regulator-always-on;
++              regulator-boot-on;
++      };
++
++      /* Regulators supplied by vcc_sysin */
++      /* LCD backlight supply */
++      vcc_12v: vcc-12v {
++              compatible = "regulator-fixed";
++              regulator-name = "vcc_12v";
++              regulator-always-on;
++              regulator-boot-on;
++              regulator-min-microvolt = <12000000>;
++              regulator-max-microvolt = <12000000>;
++              vin-supply = <&vcc_sysin>;
++
++              regulator-state-mem {
++                      regulator-off-in-suspend;
++              };
++      };
++
++      /* Main 3.3 V supply */
++      vcc3v3_sys: wifi_bat: vcc3v3-sys {
++              compatible = "regulator-fixed";
++              regulator-name = "vcc3v3_sys";
++              regulator-always-on;
++              regulator-boot-on;
++              regulator-min-microvolt = <3300000>;
++              regulator-max-microvolt = <3300000>;
++              vin-supply = <&vcc_sysin>;
++
++              regulator-state-mem {
++                      regulator-on-in-suspend;
++              };
++      };
++
++      /* 5 V USB power supply */
++      vcc5v0_usb: pa_5v: vcc5v0-usb-regulator {
++              compatible = "regulator-fixed";
++              enable-active-high;
++              gpio = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>;
++              pinctrl-names = "default";
++              pinctrl-0 = <&pwr_5v_gpio>;
++              regulator-name = "vcc5v0_usb";
++              regulator-always-on;
++              regulator-min-microvolt = <5000000>;
++              regulator-max-microvolt = <5000000>;
++              vin-supply = <&vcc_sysin>;
++
++              regulator-state-mem {
++                      regulator-off-in-suspend;
++              };
++      };
++
++      /* RK3399 logic supply */
++      vdd_log: vdd-log {
++              compatible = "pwm-regulator";
++              pwms = <&pwm2 0 25000 1>;
++              regulator-name = "vdd_log";
++              regulator-always-on;
++              regulator-boot-on;
++              regulator-min-microvolt = <800000>;
++              regulator-max-microvolt = <1400000>;
++              vin-supply = <&vcc_sysin>;
++
++              regulator-state-mem {
++                      regulator-on-in-suspend;
++              };
++      };
++
++      /* Regulators supplied by vcc3v3_sys */
++      /* 0.9 V supply, always on */
++      vcc_0v9: vcc-0v9 {
++              compatible = "regulator-fixed";
++              regulator-name = "vcc_0v9";
++              regulator-always-on;
++              regulator-boot-on;
++              regulator-min-microvolt = <900000>;
++              regulator-max-microvolt = <900000>;
++              vin-supply = <&vcc3v3_sys>;
++      };
++
++      /* S3 1.8 V supply, switched by vcc1v8_s3 */
++      vcca1v8_s3: vcc1v8-s3 {
++              compatible = "regulator-fixed";
++              regulator-name = "vcca1v8_s3";
++              regulator-always-on;
++              regulator-boot-on;
++              regulator-min-microvolt = <1800000>;
++              regulator-max-microvolt = <1800000>;
++              vin-supply = <&vcc3v3_sys>;
++      };
++
++      /* micro SD card power */
++      vcc3v0_sd: vcc3v0-sd {
++              compatible = "regulator-fixed";
++              enable-active-high;
++              gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
++              pinctrl-names = "default";
++              pinctrl-0 = <&sdmmc0_pwr_h_gpio>;
++              regulator-name = "vcc3v0_sd";
++              regulator-always-on;
++              regulator-min-microvolt = <3000000>;
++              regulator-max-microvolt = <3000000>;
++              vin-supply = <&vcc3v3_sys>;
++
++              regulator-state-mem {
++                      regulator-off-in-suspend;
++              };
++      };
++
++      /* LCD panel power, called VCC3V3_S0 in schematic */
++      vcc3v3_panel: vcc3v3-panel {
++              compatible = "regulator-fixed";
++              enable-active-high;
++              gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>;
++              pinctrl-names = "default";
++              pinctrl-0 = <&lcdvcc_en_gpio>;
++              regulator-name = "vcc3v3_panel";
++              regulator-always-on;
++              regulator-min-microvolt = <3300000>;
++              regulator-max-microvolt = <3300000>;
++              regulator-enable-ramp-delay = <100000>;
++              vin-supply = <&vcc3v3_sys>;
++
++              regulator-state-mem {
++                      regulator-off-in-suspend;
++              };
++      };
++
++      /* M.2 adapter power, switched by vcc1v8_s3 */
++      vcc3v3_ssd: vcc3v3-ssd {
++              compatible = "regulator-fixed";
++              regulator-name = "vcc3v3_ssd";
++              regulator-min-microvolt = <3300000>;
++              regulator-max-microvolt = <3300000>;
++              vin-supply = <&vcc3v3_sys>;
++      };
++
++      /* Regulators supplied by vcc5v0_usb */
++      /* USB 3 port power supply regulator  */
++      vcc5v0_otg: vcc5v0-otg {
++              compatible = "regulator-fixed";
++              enable-active-high;
++              gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
++              pinctrl-names = "default";
++              pinctrl-0 = <&vcc5v0_host_en_gpio>;
++              regulator-name = "vcc5v0_otg";
++              regulator-always-on;
++              regulator-min-microvolt = <5000000>;
++              regulator-max-microvolt = <5000000>;
++              vin-supply = <&vcc5v0_usb>;
++
++              regulator-state-mem {
++                      regulator-off-in-suspend;
++              };
++      };
++
++      /* Regulators supplied by vcc5v0_usb */
++      /* Type C port power supply regulator */
++      vbus_5vout: vbus_typec: vbus-5vout {
++              compatible = "regulator-fixed";
++              enable-active-high;
++              gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
++              pinctrl-names = "default";
++              pinctrl-0 = <&vcc5v0_typec0_en_gpio>;
++              regulator-name = "vbus_5vout";
++              regulator-min-microvolt = <5000000>;
++              regulator-max-microvolt = <5000000>;
++              vin-supply = <&vcc5v0_usb>;
++
++              regulator-state-mem {
++                      regulator-off-in-suspend;
++              };
++      };
++
++      /* Regulators supplied by vcc_1v8 */
++      /* Primary 0.9 V LDO */
++      vcca0v9_s3: vcca0v9-s3 {
++              compatible = "regulator-fixed";
++              regulator-name = "vcc0v9_s3";
++              regulator-min-microvolt = <5000000>;
++              regulator-max-microvolt = <5000000>;
++              vin-supply = <&vcc_1v8>;
++
++              regulator-state-mem {
++                      regulator-on-in-suspend;
++              };
++      };
++
++      mains_charger: dc-charger {
++              compatible = "gpio-charger";
++              charger-type = "mains";
++              gpios = <&gpio4 RK_PD0 GPIO_ACTIVE_LOW>;
++
++              /* Also triggered by USB charger */
++              pinctrl-names = "default";
++              pinctrl-0 = <&dc_det_gpio>;
++      };
++};
++
++&cdn_dp {
++      status = "okay";
++};
++
++&cpu_b0 {
++      cpu-supply = <&vdd_cpu_b>;
++};
++
++&cpu_b1 {
++      cpu-supply = <&vdd_cpu_b>;
++};
++
++&cpu_l0 {
++      cpu-supply = <&vdd_cpu_l>;
++};
++
++&cpu_l1 {
++      cpu-supply = <&vdd_cpu_l>;
++};
++
++&cpu_l2 {
++      cpu-supply = <&vdd_cpu_l>;
++};
++
++&cpu_l3 {
++      cpu-supply = <&vdd_cpu_l>;
++};
++
++&edp {
++      force-hpd;
++      pinctrl-names = "default";
++      pinctrl-0 = <&edp_hpd>;
++      status = "okay";
++
++      ports {
++              edp_out: port@1 {
++                      reg = <1>;
++                      #address-cells = <1>;
++                      #size-cells = <0>;
++
++                      edp_out_panel: endpoint@0 {
++                              reg = <0>;
++                              remote-endpoint = <&panel_in_edp>;
++                      };
++              };
++      };
++};
++
++&emmc_phy {
++      status = "okay";
++};
++
++&gpu {
++      mali-supply = <&vdd_gpu>;
++      status = "okay";
++};
++
++&hdmi_sound {
++      status = "okay";
++};
++
++&i2c0 {
++      clock-frequency = <400000>;
++      i2c-scl-falling-time-ns = <4>;
++      i2c-scl-rising-time-ns = <168>;
++      status = "okay";
++
++      rk808: pmic@1b {
++              compatible = "rockchip,rk808";
++              reg = <0x1b>;
++              #clock-cells = <1>;
++              clock-output-names = "xin32k", "rk808-clkout2";
++              interrupt-parent = <&gpio3>;
++              interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
++              pinctrl-names = "default";
++              pinctrl-0 = <&pmic_int_l_gpio>;
++              rockchip,system-power-controller;
++              wakeup-source;
++
++              vcc1-supply = <&vcc_sysin>;
++              vcc2-supply = <&vcc_sysin>;
++              vcc3-supply = <&vcc_sysin>;
++              vcc4-supply = <&vcc_sysin>;
++              vcc6-supply = <&vcc_sysin>;
++              vcc7-supply = <&vcc_sysin>;
++              vcc8-supply = <&vcc3v3_sys>;
++              vcc9-supply = <&vcc_sysin>;
++              vcc10-supply = <&vcc_sysin>;
++              vcc11-supply = <&vcc_sysin>;
++              vcc12-supply = <&vcc3v3_sys>;
++              vcc13-supply = <&vcc_sysin>;
++              vcc14-supply = <&vcc_sysin>;
++
++              regulators {
++                      /* rk3399 center logic supply */
++                      vdd_center: DCDC_REG1 {
++                              regulator-name = "vdd_center";
++                              regulator-always-on;
++                              regulator-boot-on;
++                              regulator-min-microvolt = <750000>;
++                              regulator-max-microvolt = <1350000>;
++                              regulator-ramp-delay = <6001>;
++
++                              regulator-state-mem {
++                                      regulator-off-in-suspend;
++                              };
++                      };
++
++                      vdd_cpu_l: DCDC_REG2 {
++                              regulator-name = "vdd_cpu_l";
++                              regulator-always-on;
++                              regulator-boot-on;
++                              regulator-min-microvolt = <750000>;
++                              regulator-max-microvolt = <1350000>;
++                              regulator-ramp-delay = <6001>;
++
++                              regulator-state-mem {
++                                      regulator-off-in-suspend;
++                              };
++                      };
++
++                      vcc_ddr: DCDC_REG3 {
++                              regulator-name = "vcc_ddr";
++                              regulator-always-on;
++                              regulator-boot-on;
++
++                              regulator-state-mem {
++                                      regulator-on-in-suspend;
++                              };
++                      };
++
++                      vcc_1v8: vcc_wl: DCDC_REG4 {
++                              regulator-name = "vcc_1v8";
++                              regulator-always-on;
++                              regulator-boot-on;
++                              regulator-min-microvolt = <1800000>;
++                              regulator-max-microvolt = <1800000>;
++
++                              regulator-state-mem {
++                                      regulator-on-in-suspend;
++                                      regulator-suspend-microvolt = <1800000>;
++                              };
++                      };
++
++                      /* not used */
++                      LDO_REG1 {
++                      };
++
++                      /* not used */
++                      LDO_REG2 {
++                      };
++
++                      vcc1v8_pmupll: LDO_REG3 {
++                              regulator-name = "vcc1v8_pmupll";
++                              regulator-always-on;
++                              regulator-boot-on;
++                              regulator-min-microvolt = <1800000>;
++                              regulator-max-microvolt = <1800000>;
++
++                              regulator-state-mem {
++                                      regulator-on-in-suspend;
++                                      regulator-suspend-microvolt = <1800000>;
++                              };
++                      };
++
++                      vcc_sdio: LDO_REG4 {
++                              regulator-name = "vcc_sdio";
++                              regulator-always-on;
++                              regulator-boot-on;
++                              regulator-min-microvolt = <1800000>;
++                              regulator-max-microvolt = <3000000>;
++
++                              regulator-state-mem {
++                                      regulator-on-in-suspend;
++                                      regulator-suspend-microvolt = <3000000>;
++                              };
++                      };
++
++                      vcca3v0_codec: LDO_REG5 {
++                              regulator-name = "vcca3v0_codec";
++                              regulator-always-on;
++                              regulator-boot-on;
++                              regulator-min-microvolt = <3000000>;
++                              regulator-max-microvolt = <3000000>;
++
++                              regulator-state-mem {
++                                      regulator-off-in-suspend;
++                              };
++                      };
++
++                      vcc_1v5: LDO_REG6 {
++                              regulator-name = "vcc_1v5";
++                              regulator-always-on;
++                              regulator-boot-on;
++                              regulator-min-microvolt = <1500000>;
++                              regulator-max-microvolt = <1500000>;
++
++                              regulator-state-mem {
++                                      regulator-on-in-suspend;
++                                      regulator-suspend-microvolt = <1500000>;
++                              };
++                      };
++
++                      vcca1v8_codec: LDO_REG7 {
++                              regulator-name = "vcca1v8_codec";
++                              regulator-always-on;
++                              regulator-boot-on;
++                              regulator-min-microvolt = <1800000>;
++                              regulator-max-microvolt = <1800000>;
++
++                              regulator-state-mem {
++                                      regulator-off-in-suspend;
++                              };
++                      };
++
++                      vcc_3v0: LDO_REG8 {
++                              regulator-name = "vcc_3v0";
++                              regulator-always-on;
++                              regulator-boot-on;
++                              regulator-min-microvolt = <3000000>;
++                              regulator-max-microvolt = <3000000>;
++
++                              regulator-state-mem {
++                                      regulator-on-in-suspend;
++                                      regulator-suspend-microvolt = <3000000>;
++                              };
++                      };
++
++                      vcc3v3_s3: SWITCH_REG1 {
++                              regulator-name = "vcc3v3_s3";
++                              regulator-always-on;
++                              regulator-boot-on;
++
++                              regulator-state-mem {
++                                      regulator-off-in-suspend;
++                              };
++                      };
++
++                      vcc3v3_s0: SWITCH_REG2 {
++                              regulator-name = "vcc3v3_s0";
++                              regulator-always-on;
++                              regulator-boot-on;
++
++                              regulator-state-mem {
++                                      regulator-off-in-suspend;
++                              };
++                      };
++              };
++      };
++
++      vdd_cpu_b: regulator@40 {
++              compatible = "silergy,syr827";
++              reg = <0x40>;
++              fcs,suspend-voltage-selector = <1>;
++              pinctrl-names = "default";
++              pinctrl-0 = <&vsel1_gpio>;
++              regulator-name = "vdd_cpu_b";
++              regulator-always-on;
++              regulator-boot-on;
++              regulator-min-microvolt = <712500>;
++              regulator-max-microvolt = <1500000>;
++              regulator-ramp-delay = <1000>;
++              vin-supply = <&vcc_1v8>;
++
++              regulator-state-mem {
++                      regulator-off-in-suspend;
++              };
++      };
++
++      vdd_gpu: regulator@41 {
++              compatible = "silergy,syr828";
++              reg = <0x41>;
++              fcs,suspend-voltage-selector = <1>;
++              pinctrl-names = "default";
++              pinctrl-0 = <&vsel2_gpio>;
++              regulator-name = "vdd_gpu";
++              regulator-always-on;
++              regulator-boot-on;
++              regulator-min-microvolt = <712500>;
++              regulator-max-microvolt = <1500000>;
++              regulator-ramp-delay = <1000>;
++              vin-supply = <&vcc_1v8>;
++
++              regulator-state-mem {
++                      regulator-off-in-suspend;
++              };
++      };
++};
++
++&i2c1 {
++      clock-frequency = <100000>;
++      i2c-scl-falling-time-ns = <4>;
++      i2c-scl-rising-time-ns = <168>;
++      status = "okay";
++
++      es8316: es8316@11 {
++              compatible = "everest,es8316";
++              reg = <0x11>;
++              clocks = <&cru SCLK_I2S_8CH_OUT>;
++              clock-names = "mclk";
++              #sound-dai-cells = <0>;
++      };
++};
++
++&i2c3 {
++      i2c-scl-falling-time-ns = <15>;
++      i2c-scl-rising-time-ns = <450>;
++      status = "okay";
++};
++
++&i2c4 {
++      i2c-scl-falling-time-ns = <20>;
++      i2c-scl-rising-time-ns = <600>;
++      status = "okay";
++
++      fusb0: fusb30x@22 {
++              compatible = "fcs,fusb302";
++              reg = <0x22>;
++              fcs,int_n = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>;
++              pinctrl-names = "default";
++              pinctrl-0 = <&fusb0_int_gpio>;
++              vbus-supply = <&vbus_typec>;
++
++              connector {
++                      compatible = "usb-c-connector";
++                      data-role = "host";
++                      label = "USB-C";
++                      op-sink-microwatt = <1000000>;
++                      power-role = "dual";
++                      sink-pdos =
++                              <PDO_FIXED(5000, 2500, PDO_FIXED_USB_COMM)>;
++                      source-pdos =
++                              <PDO_FIXED(5000, 1400, PDO_FIXED_USB_COMM)>;
++                      try-power-role = "sink";
++
++                      ports {
++                              #address-cells = <1>;
++                              #size-cells = <0>;
++
++                              port@0 {
++                                      reg = <0>;
++
++                                      usbc_hs: endpoint {
++                                              remote-endpoint =
++                                                      <&u2phy0_typec_hs>;
++                                      };
++                              };
++
++                              port@1 {
++                                      reg = <1>;
++
++                                      usbc_ss: endpoint {
++                                              remote-endpoint =
++                                                      <&tcphy0_typec_ss>;
++                                      };
++                              };
++
++                              port@2 {
++                                      reg = <2>;
++
++                                      usbc_dp: endpoint {
++                                              remote-endpoint =
++                                                      <&tcphy0_typec_dp>;
++                                      };
++                              };
++                      };
++              };
++      };
++};
++
++&i2s1 {
++      #sound-dai-cells = <0>;
++      pinctrl-names = "default";
++      pinctrl-0 = <&i2s_8ch_mclk_gpio>, <&i2s1_2ch_bus>;
++      rockchip,capture-channels = <8>;
++      rockchip,playback-channels = <8>;
++      status = "okay";
++};
++
++&io_domains {
++      audio-supply = <&vcc_3v0>;
++      gpio1830-supply = <&vcc_3v0>;
++      sdmmc-supply = <&vcc_sdio>;
++      status = "okay";
++};
++
++&pcie_phy {
++      status = "okay";
++};
++
++&pcie0 {
++      bus-scan-delay-ms = <1000>;
++      ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
++      max-link-speed = <2>;
++      num-lanes = <4>;
++      pinctrl-names = "default";
++      pinctrl-0 = <&pcie_clkreqn_cpm>;
++      vpcie0v9-supply = <&vcca0v9_s3>;
++      vpcie1v8-supply = <&vcca1v8_s3>;
++      vpcie3v3-supply = <&vcc3v3_ssd>;
++      status = "okay";
++};
++
++&pinctrl {
++      buttons {
++              pwrbtn_gpio: pwrbtn-gpio {
++                      rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
++              };
++
++              lidbtn_gpio: lidbtn-gpio {
++                      rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
++              };
++      };
++
++      dc-charger {
++              dc_det_gpio: dc-det-gpio {
++                      rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
++              };
++      };
++
++      es8316 {
++              hp_det_gpio: hp-det-gpio {
++                      rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
++              };
++      };
++
++      fusb302x {
++              fusb0_int_gpio: fusb0-int-gpio {
++                      rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
++              };
++      };
++
++      i2s1 {
++              i2s_8ch_mclk_gpio: i2s-8ch-mclk-gpio {
++                      rockchip,pins = <4 RK_PA0 1 &pcfg_pull_none>;
++              };
++      };
++
++      lcd-panel {
++              lcdvcc_en_gpio: lcdvcc-en-gpio {
++                      rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
++              };
++
++              panel_en_gpio: panel-en-gpio {
++                      rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
++              };
++
++              lcd_panel_reset_gpio: lcd-panel-reset-gpio {
++                      rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>;
++              };
++      };
++
++      leds {
++              pwrled_gpio: pwrled_gpio {
++                      rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
++              };
++
++              slpled_gpio: slpled_gpio {
++                      rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
++              };
++      };
++
++      pmic {
++              pmic_int_l_gpio: pmic-int-l-gpio {
++                      rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;
++              };
++
++              vsel1_gpio: vsel1-gpio {
++                      rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
++              };
++
++              vsel2_gpio: vsel2-gpio {
++                      rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
++              };
++      };
++
++      sdcard {
++              sdmmc0_pwr_h_gpio: sdmmc0-pwr-h-gpio {
++                      rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
++              };
++
++      };
++
++      sdio-pwrseq {
++              wifi_enable_h_gpio: wifi-enable-h-gpio {
++                      rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
++              };
++      };
++
++      usb-typec {
++              vcc5v0_typec0_en_gpio: vcc5v0-typec0-en-gpio {
++                      rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
++              };
++      };
++
++      usb2 {
++              pwr_5v_gpio: pwr-5v-gpio {
++                      rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
++              };
++
++              vcc5v0_host_en_gpio: vcc5v0-host-en-gpio {
++                      rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
++              };
++      };
++
++      wireless-bluetooth {
++              bt_wake_gpio: bt-wake-gpio {
++                      rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
++              };
++
++              bt_host_wake_gpio: bt-host-wake-gpio {
++                      rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
++              };
++
++              bt_reset_gpio: bt-reset-gpio {
++                      rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
++              };
++      };
++};
++
++&pmu_io_domains {
++      pmu1830-supply = <&vcc_3v0>;
++      status = "okay";
++};
++
++&pwm0 {
++      status = "okay";
++};
++
++&pwm2 {
++      status = "okay";
++};
++
++&saradc {
++      vref-supply = <&vcca1v8_s3>;
++      status = "okay";
++};
++
++&sdmmc {
++      bus-width = <4>;
++      cap-mmc-highspeed;
++      cap-sd-highspeed;
++      cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
++      disable-wp;
++      pinctrl-names = "default";
++      pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
++      sd-uhs-sdr104;
++      vmmc-supply = <&vcc3v0_sd>;
++      vqmmc-supply = <&vcc_sdio>;
++      status = "okay";
++};
++
++&sdio0 {
++      bus-width = <4>;
++      cap-sd-highspeed;
++      cap-sdio-irq;
++      keep-power-in-suspend;
++      mmc-pwrseq = <&sdio_pwrseq>;
++      non-removable;
++      pinctrl-names = "default";
++      pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
++      sd-uhs-sdr104;
++      status = "okay";
++};
++
++&sdhci {
++      bus-width = <8>;
++      mmc-hs200-1_8v;
++      non-removable;
++      status = "okay";
++};
++
++&spi1 {
++      max-freq = <10000000>;
++      status = "okay";
++
++      spiflash: flash@0 {
++              compatible = "jedec,spi-nor";
++              reg = <0>;
++              m25p,fast-read;
++              spi-max-frequency = <10000000>;
++      };
++};
++
++&tcphy0 {
++      status = "okay";
++};
++
++&tcphy0_dp {
++      port {
++              tcphy0_typec_dp: endpoint {
++                      remote-endpoint = <&usbc_dp>;
++              };
++      };
++};
++
++&tcphy0_usb3 {
++      port {
++              tcphy0_typec_ss: endpoint {
++                      remote-endpoint = <&usbc_ss>;
++              };
++      };
++};
++
++&tcphy1 {
++      status = "okay";
++};
++
++&tsadc {
++      /* tshut mode 0:CRU 1:GPIO */
++      rockchip,hw-tshut-mode = <1>;
++      /* tshut polarity 0:LOW 1:HIGH */
++      rockchip,hw-tshut-polarity = <1>;
++      status = "okay";
++};
++
++&u2phy0 {
++      status = "okay";
++
++      u2phy0_otg: otg-port {
++              status = "okay";
++      };
++
++      u2phy0_host: host-port {
++              phy-supply = <&vcc5v0_otg>;
++              status = "okay";
++      };
++
++      port {
++              u2phy0_typec_hs: endpoint {
++                      remote-endpoint = <&usbc_hs>;
++              };
++      };
++};
++
++&u2phy1 {
++      status = "okay";
++
++      u2phy1_otg: otg-port {
++              status = "okay";
++      };
++
++      u2phy1_host: host-port {
++              phy-supply = <&vcc5v0_otg>;
++              status = "okay";
++      };
++};
++
++&uart0 {
++      pinctrl-names = "default";
++      pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
++      uart-has-rtscts;
++      status = "okay";
++
++      bluetooth {
++              compatible = "brcm,bcm4345c5";
++              clocks = <&rk808 1>;
++              clock-names = "lpo";
++              device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
++              host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
++              max-speed = <1500000>;
++              pinctrl-names = "default";
++              pinctrl-0 = <&bt_host_wake_gpio &bt_wake_gpio &bt_reset_gpio>;
++              shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
++              vbat-supply = <&wifi_bat>;
++              vddio-supply = <&vcc_wl>;
++      };
++};
++
++&uart2 {
++      status = "okay";
++};
++
++&usb_host0_ehci {
++      status = "okay";
++};
++
++&usb_host0_ohci {
++      status = "okay";
++};
++
++&usb_host1_ehci {
++      status = "okay";
++};
++
++&usb_host1_ohci {
++      status = "okay";
++};
++
++&usbdrd3_0 {
++      status = "okay";
++};
++
++&usbdrd_dwc3_0 {
++      dr_mode = "host";
++      status = "okay";
++};
++
++&usbdrd3_1 {
++      status = "okay";
++};
++
++&usbdrd_dwc3_1 {
++      dr_mode = "host";
++      status = "okay";
++};
++
++&vopb {
++      status = "okay";
++};
++
++&vopb_mmu {
++      status = "okay";
++};
++
++&vopl {
++      status = "okay";
++};
++
++&vopl_mmu {
++      status = "okay";
++};
+-- 
+2.20.1
+
diff --git a/gnu/packages/patches/u-boot-add-boe-nv140fhmn49-display.patch 
b/gnu/packages/patches/u-boot-add-boe-nv140fhmn49-display.patch
new file mode 100644
index 0000000..c359522
--- /dev/null
+++ b/gnu/packages/patches/u-boot-add-boe-nv140fhmn49-display.patch
@@ -0,0 +1,29 @@
+From 00978950fed39b6104b6b4f141450a66cc3400fa Mon Sep 17 00:00:00 2001
+From: Peter Robinson <address@hidden>
+Date: Mon, 20 Apr 2020 20:27:32 +0100
+Origin: https://patchwork.ozlabs.org/project/uboot/patch/address@hidden/
+Subject: [PATCH 1/5] video: simple_panel: add boe,nv140fhmn49 display
+
+add "boe,nv140fhmn49" display to compatible node.
+
+Signed-off-by: Peter Robinson <address@hidden>
+Cc: Anatolij Gustschin <address@hidden>
+---
+ drivers/video/simple_panel.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/video/simple_panel.c b/drivers/video/simple_panel.c
+index c3c0e84732..5722811117 100644
+--- a/drivers/video/simple_panel.c
++++ b/drivers/video/simple_panel.c
+@@ -105,6 +105,7 @@ static const struct udevice_id simple_panel_ids[] = {
+       { .compatible = "auo,b133xtn01" },
+       { .compatible = "auo,b116xw03" },
+       { .compatible = "auo,b133htn01" },
++      { .compatible = "boe,nv140fhmn49" },
+       { .compatible = "lg,lb070wv8" },
+       { }
+ };
+-- 
+2.20.1
+
diff --git a/gnu/packages/patches/u-boot-gpio-keys-binding-cons.patch 
b/gnu/packages/patches/u-boot-gpio-keys-binding-cons.patch
new file mode 100644
index 0000000..aec33a7
--- /dev/null
+++ b/gnu/packages/patches/u-boot-gpio-keys-binding-cons.patch
@@ -0,0 +1,37 @@
+From 451bd72bf966df7518682cb748a804634ea19424 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <address@hidden>
+Date: Mon, 20 Apr 2020 20:27:33 +0100
+Origin: https://patchwork.ozlabs.org/project/uboot/patch/address@hidden/
+Subject: [PATCH 2/5] dt-bindings: input: adopt Linux gpio-keys binding
+ constants
+
+Sync the gpio-keys input bindings from linux 5.7-rc1.
+
+Signed-off-by: Peter Robinson <address@hidden>
+---
+ include/dt-bindings/input/gpio-keys.h | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+ create mode 100644 include/dt-bindings/input/gpio-keys.h
+
+diff --git a/include/dt-bindings/input/gpio-keys.h 
b/include/dt-bindings/input/gpio-keys.h
+new file mode 100644
+index 0000000000..8962df79e7
+--- /dev/null
++++ b/include/dt-bindings/input/gpio-keys.h
+@@ -0,0 +1,13 @@
++/* SPDX-License-Identifier: GPL-2.0 */
++/*
++ * This header provides constants for gpio keys bindings.
++ */
++
++#ifndef _DT_BINDINGS_GPIO_KEYS_H
++#define _DT_BINDINGS_GPIO_KEYS_H
++
++#define EV_ACT_ANY            0x00    /* asserted or deasserted */
++#define EV_ACT_ASSERTED               0x01    /* asserted */
++#define EV_ACT_DEASSERTED     0x02    /* deasserted */
++
++#endif /* _DT_BINDINGS_GPIO_KEYS_H */
+-- 
+2.20.1
+
diff --git a/gnu/packages/patches/u-boot-leds-common-binding-con.patch 
b/gnu/packages/patches/u-boot-leds-common-binding-con.patch
new file mode 100644
index 0000000..8374081
--- /dev/null
+++ b/gnu/packages/patches/u-boot-leds-common-binding-con.patch
@@ -0,0 +1,115 @@
+From 282b6ca04abbe1302d04caa05be5fc5afb127141 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <address@hidden>
+Date: Mon, 20 Apr 2020 20:27:34 +0100
+Origin: https://patchwork.ozlabs.org/project/uboot/patch/address@hidden/
+Subject: [PATCH 3/5] dt-bindings: leds: adopt Linux leds common binding
+ constants
+
+Sync the common leds bindings from linux 5.7-rc1.
+
+Signed-off-by: Peter Robinson <address@hidden>
+---
+ include/dt-bindings/leds/common.h | 91 +++++++++++++++++++++++++++++++
+ 1 file changed, 91 insertions(+)
+ create mode 100644 include/dt-bindings/leds/common.h
+
+diff --git a/include/dt-bindings/leds/common.h 
b/include/dt-bindings/leds/common.h
+new file mode 100644
+index 0000000000..0ce7dfc00d
+--- /dev/null
++++ b/include/dt-bindings/leds/common.h
+@@ -0,0 +1,91 @@
++/* SPDX-License-Identifier: GPL-2.0 */
++/*
++ * This header provides macros for the common LEDs device tree bindings.
++ *
++ * Copyright (C) 2015, Samsung Electronics Co., Ltd.
++ * Author: Jacek Anaszewski <address@hidden>
++ *
++ * Copyright (C) 2019 Jacek Anaszewski <address@hidden>
++ * Copyright (C) 2020 Pavel Machek <address@hidden>
++ */
++
++#ifndef __DT_BINDINGS_LEDS_H
++#define __DT_BINDINGS_LEDS_H
++
++/* External trigger type */
++#define LEDS_TRIG_TYPE_EDGE   0
++#define LEDS_TRIG_TYPE_LEVEL  1
++
++/* Boost modes */
++#define LEDS_BOOST_OFF                0
++#define LEDS_BOOST_ADAPTIVE   1
++#define LEDS_BOOST_FIXED      2
++
++/* Standard LED colors */
++#define LED_COLOR_ID_WHITE    0
++#define LED_COLOR_ID_RED      1
++#define LED_COLOR_ID_GREEN    2
++#define LED_COLOR_ID_BLUE     3
++#define LED_COLOR_ID_AMBER    4
++#define LED_COLOR_ID_VIOLET   5
++#define LED_COLOR_ID_YELLOW   6
++#define LED_COLOR_ID_IR               7
++#define LED_COLOR_ID_MAX      8
++
++/* Standard LED functions */
++/* Keyboard LEDs, usually it would be input4::capslock etc. */
++/*   Obsolete equivalent: "shift-key-light" */
++#define LED_FUNCTION_CAPSLOCK "capslock"
++#define LED_FUNCTION_SCROLLLOCK "scrolllock"
++#define LED_FUNCTION_NUMLOCK "numlock"
++/*   Obsolete equivalents: "tpacpi::thinklight" (IBM/Lenovo Thinkpads),
++     "lp5523:kb{1,2,3,4,5,6}" (Nokia N900) */
++#define LED_FUNCTION_KBD_BACKLIGHT "kbd_backlight"
++
++/* System LEDs, usually found on system body.
++   platform::mute (etc) is sometimes seen, :mute would be better */
++#define LED_FUNCTION_POWER "power"
++#define LED_FUNCTION_DISK "disk"
++
++/*   Obsolete: "platform:*:charging" (allwinner sun50i) */
++#define LED_FUNCTION_CHARGING "charging"
++/*   Used RGB notification LEDs common on phones.
++     Obsolete equivalents: "status-led:{red,green,blue}" (Motorola Droid 4),
++     "lp5523:{r,g,b}" (Nokia N900) */
++#define LED_FUNCTION_STATUS "status"
++
++#define LED_FUNCTION_MICMUTE "micmute"
++#define LED_FUNCTION_MUTE "mute"
++
++/* Miscelleaus functions. Use functions above if you can. */
++#define LED_FUNCTION_ACTIVITY "activity"
++#define LED_FUNCTION_ALARM "alarm"
++#define LED_FUNCTION_BACKLIGHT "backlight"
++#define LED_FUNCTION_BLUETOOTH "bluetooth"
++#define LED_FUNCTION_BOOT "boot"
++#define LED_FUNCTION_CPU "cpu"
++#define LED_FUNCTION_DEBUG "debug"
++#define LED_FUNCTION_DISK_ACTIVITY "disk-activity"
++#define LED_FUNCTION_DISK_ERR "disk-err"
++#define LED_FUNCTION_DISK_READ "disk-read"
++#define LED_FUNCTION_DISK_WRITE "disk-write"
++#define LED_FUNCTION_FAULT "fault"
++#define LED_FUNCTION_FLASH "flash"
++#define LED_FUNCTION_HEARTBEAT "heartbeat"
++#define LED_FUNCTION_INDICATOR "indicator"
++#define LED_FUNCTION_LAN "lan"
++#define LED_FUNCTION_MAIL "mail"
++#define LED_FUNCTION_MTD "mtd"
++#define LED_FUNCTION_PANIC "panic"
++#define LED_FUNCTION_PROGRAMMING "programming"
++#define LED_FUNCTION_RX "rx"
++#define LED_FUNCTION_SD "sd"
++#define LED_FUNCTION_STANDBY "standby"
++#define LED_FUNCTION_TORCH "torch"
++#define LED_FUNCTION_TX "tx"
++#define LED_FUNCTION_USB "usb"
++#define LED_FUNCTION_WAN "wan"
++#define LED_FUNCTION_WLAN "wlan"
++#define LED_FUNCTION_WPS "wps"
++
++#endif /* __DT_BINDINGS_LEDS_H */
+-- 
+2.20.1
+
diff --git a/gnu/packages/patches/u-boot-support-Pinebook-Pro-laptop.patch 
b/gnu/packages/patches/u-boot-support-Pinebook-Pro-laptop.patch
new file mode 100644
index 0000000..c6f91fa
--- /dev/null
+++ b/gnu/packages/patches/u-boot-support-Pinebook-Pro-laptop.patch
@@ -0,0 +1,367 @@
+From 60381e4add64dddbd07e78248b2b0f819eb2776e Mon Sep 17 00:00:00 2001
+From: Peter Robinson <address@hidden>
+Date: Mon, 20 Apr 2020 20:27:36 +0100
+Origin: https://patchwork.ozlabs.org/project/uboot/patch/address@hidden/
+Subject: [PATCH 5/5] Add initial support for the Pinebook Pro laptop from
+ Pine64.
+
+Specification:
+- Rockchip RK3399
+- 4GB Dual-Channel LPDDR4
+- eMMC socket
+- mSD card slot
+- 128Mbit (16Mb) SPI Flash
+- AP6256 for 11AC WiFi + BT5
+- 14 inch 1920*1080 eDP MiPi display
+- Camera
+- USB 3.0, 2.0 ports
+- Type-C port with alt-mode display (DP 1.2) and 15W charge
+- DC 5V/3A
+- optional PCIe slot for NVMe SSD drive
+
+Signed-off-by: Peter Robinson <address@hidden>
+---
+ arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi  | 43 ++++++++++
+ arch/arm/mach-rockchip/rk3399/Kconfig         |  8 ++
+ board/pine64/pinebook-pro-rk3399/Kconfig      | 15 ++++
+ board/pine64/pinebook-pro-rk3399/MAINTAINERS  |  8 ++
+ board/pine64/pinebook-pro-rk3399/Makefile     |  1 +
+ .../pinebook-pro-rk3399/pinebook-pro-rk3399.c | 76 +++++++++++++++++
+ configs/pinebook-pro-rk3399_defconfig         | 84 +++++++++++++++++++
+ include/configs/pinebook-pro-rk3399.h         | 29 +++++++
+ 8 files changed, 264 insertions(+)
+ create mode 100644 arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
+ create mode 100644 board/pine64/pinebook-pro-rk3399/Kconfig
+ create mode 100644 board/pine64/pinebook-pro-rk3399/MAINTAINERS
+ create mode 100644 board/pine64/pinebook-pro-rk3399/Makefile
+ create mode 100644 board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
+ create mode 100644 configs/pinebook-pro-rk3399_defconfig
+ create mode 100644 include/configs/pinebook-pro-rk3399.h
+
+diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi 
b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
+new file mode 100644
+index 0000000000..1a2e24d3ef
+--- /dev/null
++++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
+@@ -0,0 +1,43 @@
++// SPDX-License-Identifier: GPL-2.0+
++/*
++ * Copyright (C) 2019 Peter Robinson <pbrobinson at gmail.com>
++ */
++
++#include "rk3399-u-boot.dtsi"
++#include "rk3399-sdram-lpddr4-100.dtsi"
++
++/ {
++      aliases {
++              spi0 = &spi1;
++      };
++
++      chosen {
++              u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
++      };
++};
++
++&i2c0 {
++      u-boot,dm-pre-reloc;
++};
++
++&rk808 {
++      u-boot,dm-pre-reloc;
++};
++
++&sdhci {
++      max-frequency = <25000000>;
++      u-boot,dm-pre-reloc;
++};
++
++&sdmmc {
++      max-frequency = <20000000>;
++      u-boot,dm-pre-reloc;
++};
++
++&spiflash {
++      u-boot,dm-pre-reloc;
++};
++
++&vdd_log {
++      regulator-init-microvolt = <950000>;
++};
+diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig 
b/arch/arm/mach-rockchip/rk3399/Kconfig
+index 927bb62a9f..254b9c5b4d 100644
+--- a/arch/arm/mach-rockchip/rk3399/Kconfig
++++ b/arch/arm/mach-rockchip/rk3399/Kconfig
+@@ -19,6 +19,13 @@ config TARGET_EVB_RK3399
+         with full function and physical connectors support like Type-C ports,
+         USB.0 host ports, LVDS, JTAG, MAC, SD card, HDMI, USB-to-serial...
+ 
++config TARGET_PINEBOOK_PRO_RK3399
++      bool "Pinebook Pro"
++      help
++        Pinebook Pro is a laptop based on the Rockchip rk3399 SoC
++        with 4Gb RAM, onboard eMMC, USB-C, a USB3 and USB2 port,
++        1920*1080 screen and all the usual laptop features.
++
+ config TARGET_PUMA_RK3399
+       bool "Theobroma Systems RK3399-Q7 (Puma)"
+       help
+@@ -144,6 +151,7 @@ endif # BOOTCOUNT_LIMIT
+ 
+ source "board/firefly/roc-pc-rk3399/Kconfig"
+ source "board/google/gru/Kconfig"
++source "board/pine64/pinebook-pro-rk3399/Kconfig"
+ source "board/pine64/rockpro64_rk3399/Kconfig"
+ source "board/rockchip/evb_rk3399/Kconfig"
+ source "board/theobroma-systems/puma_rk3399/Kconfig"
+diff --git a/board/pine64/pinebook-pro-rk3399/Kconfig 
b/board/pine64/pinebook-pro-rk3399/Kconfig
+new file mode 100644
+index 0000000000..3bb7ca448e
+--- /dev/null
++++ b/board/pine64/pinebook-pro-rk3399/Kconfig
+@@ -0,0 +1,15 @@
++if TARGET_PINEBOOK_PRO_RK3399
++
++config SYS_BOARD
++      default "pinebook-pro-rk3399"
++
++config SYS_VENDOR
++      default "pine64"
++
++config SYS_CONFIG_NAME
++      default "pinebook-pro-rk3399"
++
++config BOARD_SPECIFIC_OPTIONS
++      def_bool y
++
++endif
+diff --git a/board/pine64/pinebook-pro-rk3399/MAINTAINERS 
b/board/pine64/pinebook-pro-rk3399/MAINTAINERS
+new file mode 100644
+index 0000000000..7153eaf2e0
+--- /dev/null
++++ b/board/pine64/pinebook-pro-rk3399/MAINTAINERS
+@@ -0,0 +1,8 @@
++PINEBOOK_PRO
++M:    Peter Robinson <pbrobinson at gmail.com>
++S:    Maintained
++F:    board/pine64/rk3399-pinebook-pro/
++F:    include/configs/rk3399-pinebook-pro.h
++F:    arch/arm/dts/rk3399-pinebook-pro.dts
++F:    arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
++F:    configs/pinebook-pro-rk3399_defconfig
+diff --git a/board/pine64/pinebook-pro-rk3399/Makefile 
b/board/pine64/pinebook-pro-rk3399/Makefile
+new file mode 100644
+index 0000000000..2f692a12a6
+--- /dev/null
++++ b/board/pine64/pinebook-pro-rk3399/Makefile
+@@ -0,0 +1 @@
++obj-y += pinebook-pro-rk3399.o
+diff --git a/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c 
b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
+new file mode 100644
+index 0000000000..01421cbac2
+--- /dev/null
++++ b/board/pine64/pinebook-pro-rk3399/pinebook-pro-rk3399.c
+@@ -0,0 +1,76 @@
++/*
++ * (C) Copyright 2016 Rockchip Electronics Co., Ltd
++ * (C) Copyright 2020 Peter Robinson <pbrobinson at gmail.com>
++ *
++ * SPDX-License-Identifier:     GPL-2.0+
++ */
++
++#include <common.h>
++#include <dm.h>
++#include <syscon.h>
++#include <asm/io.h>
++#include <asm/arch-rockchip/clock.h>
++#include <asm/arch-rockchip/grf_rk3399.h>
++#include <asm/arch-rockchip/hardware.h>
++#include <asm/arch-rockchip/misc.h>
++#include <power/regulator.h>
++
++#define GRF_IO_VSEL_BT565_SHIFT 0
++#define PMUGRF_CON0_VSEL_SHIFT 8
++
++#ifndef CONFIG_SPL_BUILD
++int board_early_init_f(void)
++{
++      struct udevice *regulator;
++      int ret;
++
++      ret = regulator_get_by_platname("vcc5v0_usb", &regulator);
++      if (ret) {
++              debug("%s vcc5v0_usb init fail! ret %d\n", __func__, ret);
++              goto out;
++      }
++
++      ret = regulator_set_enable(regulator, true);
++      if (ret)
++              debug("%s vcc5v0-host-en-gpio set fail! ret %d\n", __func__, 
ret);
++
++out:
++      return 0;
++}
++#endif
++
++#ifdef CONFIG_MISC_INIT_R
++static void setup_iodomain(void)
++{
++      struct rk3399_grf_regs *grf =
++         syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
++      struct rk3399_pmugrf_regs *pmugrf =
++         syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF);
++
++      /* BT565 is in 1.8v domain */
++      rk_setreg(&grf->io_vsel, 1 << GRF_IO_VSEL_BT565_SHIFT);
++
++      /* Set GPIO1 1.8v/3.0v source select to PMU1830_VOL */
++      rk_setreg(&pmugrf->soc_con0, 1 << PMUGRF_CON0_VSEL_SHIFT);
++}
++
++int misc_init_r(void)
++{
++      const u32 cpuid_offset = 0x7;
++      const u32 cpuid_length = 0x10;
++      u8 cpuid[cpuid_length];
++      int ret;
++
++      setup_iodomain();
++
++      ret = rockchip_cpuid_from_efuse(cpuid_offset, cpuid_length, cpuid);
++      if (ret)
++              return ret;
++
++      ret = rockchip_cpuid_set(cpuid, cpuid_length);
++      if (ret)
++              return ret;
++
++      return ret;
++}
++#endif
+diff --git a/configs/pinebook-pro-rk3399_defconfig 
b/configs/pinebook-pro-rk3399_defconfig
+new file mode 100644
+index 0000000000..0e9f0ec250
+--- /dev/null
++++ b/configs/pinebook-pro-rk3399_defconfig
+@@ -0,0 +1,84 @@
++CONFIG_ARM=y
++CONFIG_ARCH_ROCKCHIP=y
++CONFIG_SYS_TEXT_BASE=0x00200000
++CONFIG_ENV_OFFSET=0x3F8000
++CONFIG_ROCKCHIP_RK3399=y
++CONFIG_RAM_RK3399_LPDDR4=y
++CONFIG_NR_DRAM_BANKS=1
++CONFIG_TARGET_PINEBOOK_PRO_RK3399=y
++CONFIG_BAUDRATE=1500000
++CONFIG_DEBUG_UART=y
++CONFIG_DEBUG_UART_SHIFT=2
++CONFIG_DEBUG_UART_BASE=0xFF1A0000
++CONFIG_DEBUG_UART_CLOCK=24000000
++CONFIG_SPL_SPI_SUPPORT=y
++CONFIG_SPL_SPI_FLASH_SUPPORT=y
++CONFIG_SPL_MTD_SUPPORT=y
++CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-pinebook-pro.dtb"
++CONFIG_MISC_INIT_R=y
++CONFIG_DISPLAY_BOARDINFO_LATE=y
++# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
++CONFIG_SPL_STACK_R=y
++CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
++CONFIG_TPL=y
++CONFIG_SPL_OF_CONTROL=y
++CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro"
++CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names 
interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
++CONFIG_SYS_RELOC_GD_ENV_ADDR=y
++CONFIG_CMD_BOOTZ=y
++CONFIG_CMD_GPIO=y
++CONFIG_CMD_GPT=y
++CONFIG_CMD_I2C=y
++CONFIG_CMD_MMC=y
++CONFIG_CMD_MTDPARTS=y
++CONFIG_CMD_PMIC=y
++CONFIG_CMD_REGULATOR=y
++# CONFIG_CMD_SETEXPR is not set
++CONFIG_CMD_SF=y
++CONFIG_CMD_TIME=y
++CONFIG_CMD_USB=y
++CONFIG_ROCKCHIP_GPIO=y
++CONFIG_SYS_I2C_ROCKCHIP=y
++CONFIG_BOOTDELAY=3
++CONFIG_LED=y
++CONFIG_LED_GPIO=y
++CONFIG_MISC=y
++CONFIG_ROCKCHIP_EFUSE=y
++CONFIG_MMC_DW=y
++CONFIG_MMC_DW_ROCKCHIP=y
++CONFIG_MMC_SDHCI=y
++CONFIG_MMC_SDHCI_SDMA=y
++CONFIG_MMC_SDHCI_ROCKCHIP=y
++CONFIG_ROCKCHIP_SPI=y
++CONFIG_SF_DEFAULT_SPEED=20000000
++CONFIG_SPI_FLASH=y
++CONFIG_SPI_FLASH_GIGADEVICE=y
++CONFIG_SPI_FLASH_WINBOND=y
++CONFIG_DM_ETH=y
++CONFIG_PMIC_RK8XX=y
++CONFIG_DM_PMIC_FAN53555=y
++CONFIG_REGULATOR_PWM=y
++CONFIG_REGULATOR_RK8XX=y
++CONFIG_PWM_ROCKCHIP=y
++CONFIG_SYSRESET=y
++CONFIG_USB=y
++CONFIG_USB_XHCI_HCD=y
++CONFIG_USB_XHCI_DWC3=y
++# CONFIG_USB_XHCI_ROCKCHIP is not set
++CONFIG_USB_EHCI_HCD=y
++CONFIG_USB_EHCI_GENERIC=y
++CONFIG_USB_DWC3=y
++CONFIG_ROCKCHIP_USB2_PHY=y
++CONFIG_USB_HOST_ETHER=y
++CONFIG_USB_ETHER_ASIX=y
++CONFIG_USB_ETHER_RTL8152=y
++CONFIG_USB_KEYBOARD=y
++CONFIG_USE_TINY_PRINTF=y
++CONFIG_SPL_TINY_MEMSET=y
++CONFIG_ERRNO_STR=y
++CONFIG_DM_VIDEO=y
++CONFIG_VIDEO_BPP16=y
++CONFIG_VIDEO_BPP32=y
++CONFIG_DISPLAY=y
++CONFIG_VIDEO_ROCKCHIP=y
++CONFIG_DISPLAY_ROCKCHIP_EDP=y
+diff --git a/include/configs/pinebook-pro-rk3399.h 
b/include/configs/pinebook-pro-rk3399.h
+new file mode 100644
+index 0000000000..423d742a79
+--- /dev/null
++++ b/include/configs/pinebook-pro-rk3399.h
+@@ -0,0 +1,29 @@
++/*
++ * Copyright (C) 2016 Rockchip Electronics Co., Ltd
++ * Copyright (C) 2020 Peter Robinson <pbrobinson at gmail.com>
++ *
++ * SPDX-License-Identifier:     GPL-2.0+
++ */
++
++#ifndef __PINEBOOK_PRO_RK3399_H
++#define __PINEBOOK_PRO_RK3399_H
++
++#define ROCKCHIP_DEVICE_SETTINGS \
++              "stdin=serial,usbkbd\0" \
++              "stdout=serial,vidconsole\0" \
++              "stderr=serial,vidconsole\0"
++
++#include <configs/rk3399_common.h>
++
++#if defined(CONFIG_ENV_IS_IN_MMC)
++#define CONFIG_SYS_MMC_ENV_DEV 0
++#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
++#define CONFIG_ENV_SECT_SIZE          (8 * 1024)
++#endif
++
++#undef CONFIG_SYS_SPI_U_BOOT_OFFS
++#define CONFIG_SYS_SPI_U_BOOT_OFFS    1024 * 512
++
++#define SDRAM_BANK_SIZE                       (2UL << 30)
++
++#endif
+-- 
+2.20.1
+
diff --git a/gnu/packages/patches/u-boot-video-rockchip-fix-build.patch 
b/gnu/packages/patches/u-boot-video-rockchip-fix-build.patch
new file mode 100644
index 0000000..ca2be8d
--- /dev/null
+++ b/gnu/packages/patches/u-boot-video-rockchip-fix-build.patch
@@ -0,0 +1,48 @@
+From ecc69ec25df07e1ce63d7add6b235b37673ed608 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <address@hidden>
+Date: Mon, 20 Apr 2020 19:18:25 +0100
+Origin: https://patchwork.ozlabs.org/project/uboot/patch/address@hidden/
+Subject: [PATCH 6/6] drivers: video: rockchip: fix building eDP and LVDS
+ drivers
+
+The rk_edp.c and rk_lvds.c files reference rk_setreg which is declared in
+hardware.h so include it so the drivers build. Adjust rk_lvds.c so
+includes are in alphabetical order while updating.
+
+Signed-off-by: Peter Robinson <address@hidden>
+Reviewed-by: Anatolij Gustschin <address@hidden>
+---
+ drivers/video/rockchip/rk_edp.c  | 1 +
+ drivers/video/rockchip/rk_lvds.c | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c
+index 8703df0ec0..cf84b886e7 100644
+--- a/drivers/video/rockchip/rk_edp.c
++++ b/drivers/video/rockchip/rk_edp.c
+@@ -18,6 +18,7 @@
+ #include <asm/arch-rockchip/clock.h>
+ #include <asm/arch-rockchip/edp_rk3288.h>
+ #include <asm/arch-rockchip/grf_rk3288.h>
++#include <asm/arch-rockchip/hardware.h>
+ #include <dt-bindings/clock/rk3288-cru.h>
+ 
+ #define MAX_CR_LOOP 5
+diff --git a/drivers/video/rockchip/rk_lvds.c 
b/drivers/video/rockchip/rk_lvds.c
+index cf5c0439b1..79e24baf53 100644
+--- a/drivers/video/rockchip/rk_lvds.c
++++ b/drivers/video/rockchip/rk_lvds.c
+@@ -13,8 +13,9 @@
+ #include <asm/gpio.h>
+ #include <asm/io.h>
+ #include <asm/arch-rockchip/clock.h>
+-#include <asm/arch-rockchip/lvds_rk3288.h>
+ #include <asm/arch-rockchip/grf_rk3288.h>
++#include <asm/arch-rockchip/hardware.h>
++#include <asm/arch-rockchip/lvds_rk3288.h>
+ #include <dt-bindings/clock/rk3288-cru.h>
+ #include <dt-bindings/video/rk3288.h>
+ 
+-- 
+2.20.1
+



reply via email to

[Prev in Thread] Current Thread [Next in Thread]