From patchwork Sat Jul 11 14:35:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 1327338 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=socionext.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=nifty.com header.i=@nifty.com header.a=rsa-sha256 header.s=dec2015msa header.b=IISQkWRH; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4B3ssw176bz9sRR for ; Sun, 12 Jul 2020 00:36:19 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6A4BE81BDD; Sat, 11 Jul 2020 16:36:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=socionext.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=nifty.com header.i=@nifty.com header.b="IISQkWRH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DA37881BEF; Sat, 11 Jul 2020 16:36:12 +0200 (CEST) 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 conssluserg-03.nifty.com (conssluserg-03.nifty.com [210.131.2.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DD35081BC6 for ; Sat, 11 Jul 2020 16:36:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=socionext.com Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=yamada.masahiro@socionext.com Received: from mail-ua1-f54.google.com (mail-ua1-f54.google.com [209.85.222.54]) (authenticated) by conssluserg-03.nifty.com with ESMTP id 06BEZn6V011203 for ; Sat, 11 Jul 2020 23:35:50 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-03.nifty.com 06BEZn6V011203 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1594478150; bh=dOqdtHJj+HP21JpOTMLHgpTXGgSgLjeVxKxgKYC953c=; h=From:Date:Subject:To:Cc:From; b=IISQkWRH1fArEQOPcp4mdOQIpe8Oegz+DGlqGsnvq00b9czmxgg2QcKkWvZrqsn7N iT4Zd821cSemQ37Pvx4zOqyB0+X9e289UPhZcRjn9YtduG4bT31w8q2576E/JpcfBa 3UAElPEV7RGlhmqNKPdQDpIOcBmrI9V1Wa8knRpqP46xbkjceuAC7BstbZ6P/TFLPS 2W3KvMa2Uawk0owGz5fIkD4xN2gX3i17tvr3hlaS9GoQacAffrg6crQ2IL7DnPTrgp NTXU0GjnTcPADI/FwDUqMBt3358oRZgoYOrxNMbHIWTCerMJyRDerY6xiG9r/lSXo3 VQ4jmDCD1JJtg== X-Nifty-SrcIP: [209.85.222.54] Received: by mail-ua1-f54.google.com with SMTP id c7so2717916uap.0 for ; Sat, 11 Jul 2020 07:35:50 -0700 (PDT) X-Gm-Message-State: AOAM532lUPte1OBCsFHc3a7liOOvoqGwiD5Q7SxGVq0sqf5bF9iSgUhs 1vKL71MDR8OeZ1/jnPL+zIKwyflIIY+2x6MVqMY= X-Google-Smtp-Source: ABdhPJwEGEIDILl1fjb0ke3AZ93Hz+EIWqUEp3XRKra6hvyEQ+RHJzEhCAjhZLe/KEFsyE7mGJXcc6kbckrY4/2i+l8= X-Received: by 2002:ab0:5b91:: with SMTP id y17mr55495883uae.95.1594478148760; Sat, 11 Jul 2020 07:35:48 -0700 (PDT) MIME-Version: 1.0 From: Masahiro Yamada Date: Sat, 11 Jul 2020 23:35:12 +0900 X-Gmail-Original-Message-ID: Message-ID: Subject: [GIT PULL] UniPhier SoC updates for v2020.10 To: Tom Rini Cc: U-Boot Mailing List , Masahiro Yamada X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.3 at phobos.denx.de X-Virus-Status: Clean Hi Tom, Please pull changes for v2020.10 Thanks. The following changes since commit 3113c84ba25ec3ceae072cc5ad450c4238425939: Merge tag 'rpi-next-2020.10' of https://gitlab.denx.de/u-boot/custodians/u-boot-raspberrypi (2020-07-10 14:31:22 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier.git tags/uniphier-v2020.10 for you to fetch changes up to 5785950369cd68d4409bf4d0e34d4b1894e5d0e9: ARM: uniphier: remove NAND reset code (2020-07-11 21:56:51 +0900) ---------------------------------------------------------------- UniPhier SoC updates for v2020.10 - remove workaround for Cortex-A72 - increase U-Boot proper size to 2MB - sync DT with Linux - add system bus controller driver - improve serial driver - add reset assertion to Denali NAND driver ---------------------------------------------------------------- Ley Foon Tan (2): mtd: nand: raw: denali: Assert reset before deassert mtd: nand: raw: denali: Wait for reset completion status Masahiro Yamada (14): Revert "ARM: uniphier: add weird workaround code for LD20" ARM: uniphier: increase CONFIG_SYS_MONITOR_LEN to 2MB ARM: uniphier: consolidate SoC select menu ARM: uniphier: sync with Linux 5.8-rc4 ARM: uniphier: fix build error when CONFIG_MICRO_SUPPORT_CARD=n ARM: uniphier: remove unused uniphier_sbc_init_admulti() ARM: uniphier: remove support for NOR Flash on support card bus: uniphier-system-bus: add UniPhier System Bus driver bus: uniphier-system-bus: move hardware init from board files ARM: uniphier: remove sbc/ directory serial: uniphier: use register macros instead of structure serial: uniphier: flush transmitter before changing hardware settings serial: uniphier: enable FIFO ARM: uniphier: remove NAND reset code arch/arm/dts/uniphier-ld11-global.dts | 1 + arch/arm/dts/uniphier-ld11-ref.dts | 1 + arch/arm/dts/uniphier-ld11.dtsi | 16 ++++++- arch/arm/dts/uniphier-ld20-global.dts | 1 + arch/arm/dts/uniphier-ld20-ref.dts | 1 + arch/arm/dts/uniphier-ld20.dtsi | 28 +++++++++--- arch/arm/dts/uniphier-ld4.dtsi | 2 + arch/arm/dts/uniphier-ld6b-ref.dts | 1 + arch/arm/dts/uniphier-pro4-ace.dts | 1 + arch/arm/dts/uniphier-pro4-ref.dts | 1 + arch/arm/dts/uniphier-pro4.dtsi | 10 +++++ arch/arm/dts/uniphier-pro5.dtsi | 16 ++++++- arch/arm/dts/uniphier-pxs2-gentil.dts | 1 + arch/arm/dts/uniphier-pxs2-vodka.dts | 1 + arch/arm/dts/uniphier-pxs2.dtsi | 16 ++++++- arch/arm/dts/uniphier-pxs3-ref.dts | 28 ++++++++++++ arch/arm/dts/uniphier-pxs3.dtsi | 59 +++++++++++++++++++++++- arch/arm/dts/uniphier-sld8.dtsi | 2 + arch/arm/mach-uniphier/Kconfig | 34 +++++++------- arch/arm/mach-uniphier/Makefile | 2 - arch/arm/mach-uniphier/arm64/Makefile | 1 - arch/arm/mach-uniphier/arm64/lowlevel_init.S | 13 ------ arch/arm/mach-uniphier/board_init.c | 44 ++++++++++++------ arch/arm/mach-uniphier/boot-device/boot-device.c | 9 +++- arch/arm/mach-uniphier/init.h | 35 --------------- arch/arm/mach-uniphier/micro-support-card.c | 110 +++++---------------------------------------- arch/arm/mach-uniphier/nand-reset.c | 43 ------------------ arch/arm/mach-uniphier/sbc/Makefile | 15 ------- arch/arm/mach-uniphier/sbc/sbc-boot.c | 13 ------ arch/arm/mach-uniphier/sbc/sbc-ld11.c | 26 ----------- arch/arm/mach-uniphier/sbc/sbc-ld4.c | 25 ----------- arch/arm/mach-uniphier/sbc/sbc-pxs2.c | 23 ---------- arch/arm/mach-uniphier/sbc/sbc-regs.h | 82 --------------------------------- arch/arm/mach-uniphier/sbc/sbc.c | 95 --------------------------------------- configs/uniphier_ld4_sld8_defconfig | 4 -- configs/uniphier_v7_defconfig | 3 -- configs/uniphier_v8_defconfig | 3 -- drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/bus/Kconfig | 16 +++++++ drivers/bus/Makefile | 6 +++ drivers/bus/uniphier-system-bus.c | 100 +++++++++++++++++++++++++++++++++++++++++ drivers/mtd/nand/raw/denali.c | 11 +++++ drivers/mtd/nand/raw/denali.h | 1 + drivers/mtd/nand/raw/denali_dt.c | 8 +++- drivers/serial/serial_uniphier.c | 90 +++++++++++++++++++------------------ include/configs/uniphier.h | 24 +--------- 47 files changed, 432 insertions(+), 593 deletions(-) delete mode 100644 arch/arm/mach-uniphier/arm64/lowlevel_init.S delete mode 100644 arch/arm/mach-uniphier/nand-reset.c delete mode 100644 arch/arm/mach-uniphier/sbc/Makefile delete mode 100644 arch/arm/mach-uniphier/sbc/sbc-boot.c delete mode 100644 arch/arm/mach-uniphier/sbc/sbc-ld11.c delete mode 100644 arch/arm/mach-uniphier/sbc/sbc-ld4.c delete mode 100644 arch/arm/mach-uniphier/sbc/sbc-pxs2.c delete mode 100644 arch/arm/mach-uniphier/sbc/sbc-regs.h delete mode 100644 arch/arm/mach-uniphier/sbc/sbc.c create mode 100644 drivers/bus/Kconfig create mode 100644 drivers/bus/Makefile create mode 100644 drivers/bus/uniphier-system-bus.c