From patchwork Fri Feb 21 01:17:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1241735 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=qLnCa4uz; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Ntqr3M3Dz9sRG for ; Fri, 21 Feb 2020 12:18:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 844F3818DA; Fri, 21 Feb 2020 02:17:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=rock-chips.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qLnCa4uz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C9F80818C4; Fri, 21 Feb 2020 02:17:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EBA3E818C4 for ; Fri, 21 Feb 2020 02:17:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=rock-chips.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kever.yang@gmail.com Received: by mail-pf1-x42a.google.com with SMTP id x185so325686pfc.5 for ; Thu, 20 Feb 2020 17:17:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=KpLeBOqgr0Vzvpme7V8E7uD2Ijxj1NTlfjpQ2kdfEt8=; b=qLnCa4uzG8g4MM66YplXhAUxqgF/C8ZkX2ECPpQntf0KicAeW/Qg5QnUJ4+cJJP7fy hVIDC5MeNEjtMF//cxudVZx6ZT1IYR/j/QBOfUkM5mo9+9GHq9cGZoxXBK0DuSDogjmY 086f63JxrzbvOqJr8guBTeQnXQC76hC3B1GSBw0u7PbHT4X7CQEUeDlCdKV4cKdZquY5 UL8E0a0gnfMSqVpCLDIbEDpqHmBdBt8fxxhdNbd1pb8ksWBEUr/zYhMYKmSkXw5IhA0x pAbf4a7k29BgIYJnMMS3+TtJVVJIGspya3jbm7qCp4jXK7Zi474LGvo+0GL63Iezr9WY Yfvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=KpLeBOqgr0Vzvpme7V8E7uD2Ijxj1NTlfjpQ2kdfEt8=; b=JmCjCyBZgeNAE3yP016thElKGKdH0iHjudL3wlwmkfXbW7XZwR+V3LXYUo2/2Yl64H w6h4OyGtm9C7c12/4HFRASX8I9p6lBcQGvYogbH9KEGrR3+fyKllusdN7RGtbjnMyKHx p51lK/1+CEmAWR4+5yI8fglPV3XQzieP42WLhkVoD+c2fgRF9whNM+NanpuIkhSHHo9p jZAzHb9Wdq1yBqjqFPbHEDqNXjMa6IrkUkaEnqP4ZGioT/fZ5eKY62SuslZZulviY7GM Ro1NlMtcBJxFho8lQj6CkrJh9WwmPi/DlwW6wj5L/06kjWjCIjkm9yp2hQEDHX6Yftlm Zohw== X-Gm-Message-State: APjAAAWNmftCSGF8Ea70zxFVIUGIxgzf6a7JtQ7zHT/W1gK6q0wjP5HH 43czAONn3WZwP/+n5uZuSyg= X-Google-Smtp-Source: APXvYqxFETQ4FMVFqW52mtVa8yFAjpgNVxOS3uikkPdUcdKRvkyLmr7qNiXozwheXMfRVSFTuTdepQ== X-Received: by 2002:aa7:9aeb:: with SMTP id y11mr35973415pfp.63.1582247865793; Thu, 20 Feb 2020 17:17:45 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id k8sm523907pgg.18.2020.02.20.17.17.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 17:17:45 -0800 (PST) From: Kever Yang To: trini@konsulko.com Cc: u-boot@lists.denx.de Subject: Pull request: u-boot-rockchip-20200220 Date: Fri, 21 Feb 2020 09:17:41 +0800 Message-Id: <20200221011741.23645-1-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean Hi Tom, Please pull the rockchip updates/fixes: - rk3399: split roc-pc-rk3399 out of evb_rk3399 - sync dts from upstream kernel for rk3399,rk3288,px30 - boot_mode: find the saradc device name Travis: https://travis-ci.org/keveryang/u-boot/builds/652785865 Thanks, - Kever The following changes since commit f2a73d6867ef973fbb8471cc87058205999b5e5c: Merge tag 'u-boot-stm32-20200214' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm (2020-02-14 07:31:47 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20200220 for you to fetch changes up to f9561d8e3671415c7780df4b5e70f0f1e2d2bf57: arch: arm: rockchip: order the rk3399 entries alphabetically (2020-02-20 09:18:14 +0800) ---------------------------------------------------------------- Heiko Stuebner (3): rockchip: make_fit_atf: use correct fdt_x references in config nodes rockchip: make the global board_fit_config_name_match __weak rockchip: px30: sync the main px30 dtsi from mainline Hugh Cole-Baker (1): rockchip: boot_mode: find the saradc device name Jagan Teki (4): rockchip: rk3288: Enable pre console buffer ARM: dts: rockchip: Sync rk3288-vyasa dts from linux rk3288: tinker: Enable HDMI output rk3288: vyasa: Add console settings Jared Baldridge (1): configs: fix typos in khadas-edge defconfigs Kever Yang (1): rockchip: rk3399: add target type for evb based board Peter Robinson (4): arm: dts: rockchip: Update EVB/Puma devices to upstream USB/dwc3 conventions arm: dts: rockchip: rk3399: Move U-Boot specific bits to rk3399-u-boot arm: dts: rockchip: puma: move U-Boot specific bits to u-boot.dtsi arch: arm: rockchip: order the rk3399 entries alphabetically Suniel Mahesh (2): rockchip: rk3399: split roc-pc-rk3399 out of evb_rk3399 board: roc-pc-rk3399: Add support for onboard LED's and push button to indicate power mode arch/arm/dts/px30.dtsi | 182 +++++++++++++++++++++++++-- arch/arm/dts/rk3288-vyasa.dts | 79 +++++------- arch/arm/dts/rk3399-evb.dts | 4 +- arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi | 4 + arch/arm/dts/rk3399-puma-ddr1333.dts | 2 - arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi | 4 + arch/arm/dts/rk3399-puma-ddr1600.dts | 2 - arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi | 4 + arch/arm/dts/rk3399-puma-ddr1866.dts | 2 - arch/arm/dts/rk3399-puma-u-boot.dtsi | 24 ++++ arch/arm/dts/rk3399-puma.dtsi | 23 +--- arch/arm/dts/rk3399-u-boot.dtsi | 55 ++++++-- arch/arm/dts/rk3399.dtsi | 38 ------ arch/arm/mach-rockchip/Kconfig | 1 + arch/arm/mach-rockchip/boot_mode.c | 22 +++- arch/arm/mach-rockchip/make_fit_atf.py | 2 +- arch/arm/mach-rockchip/rk3399/Kconfig | 42 +++++-- arch/arm/mach-rockchip/spl.c | 2 +- arch/arm/mach-rockchip/tpl.c | 7 ++ board/firefly/roc-pc-rk3399/Kconfig | 16 +++ board/firefly/roc-pc-rk3399/MAINTAINERS | 6 + board/firefly/roc-pc-rk3399/Makefile | 7 ++ board/firefly/roc-pc-rk3399/roc-pc-rk3399.c | 61 +++++++++ board/rockchip/evb_rk3399/MAINTAINERS | 6 - common/Kconfig | 1 + configs/evb-rk3399_defconfig | 1 + configs/firefly-rk3399_defconfig | 1 + configs/khadas-edge-captain-rk3399_defconfig | 3 +- configs/khadas-edge-rk3399_defconfig | 1 + configs/khadas-edge-v-rk3399_defconfig | 3 +- configs/leez-rk3399_defconfig | 1 + configs/nanopc-t4-rk3399_defconfig | 1 + configs/nanopi-m4-rk3399_defconfig | 1 + configs/nanopi-neo4-rk3399_defconfig | 1 + configs/orangepi-rk3399_defconfig | 1 + configs/roc-pc-rk3399_defconfig | 2 + configs/rock-pi-4-rk3399_defconfig | 1 + configs/tinker-rk3288_defconfig | 6 + include/configs/roc-pc-rk3399.h | 22 ++++ include/configs/tinker_rk3288.h | 6 +- include/configs/vyasa-rk3288.h | 6 +- 41 files changed, 494 insertions(+), 159 deletions(-) create mode 100644 arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-puma-u-boot.dtsi create mode 100644 board/firefly/roc-pc-rk3399/Kconfig create mode 100644 board/firefly/roc-pc-rk3399/MAINTAINERS create mode 100644 board/firefly/roc-pc-rk3399/Makefile create mode 100644 board/firefly/roc-pc-rk3399/roc-pc-rk3399.c create mode 100644 include/configs/roc-pc-rk3399.h