Message ID | CAK8P3a08ONpuYxcNOOr1Yr04SYosAPKH+i=PPp9h0hvhknn+Mg@mail.gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 01d7136894410a71932096e0fb9f1d301b6ccf07 |
Headers | show
Return-Path: <SRS0=6ihi=JX=lists.infradead.org=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@kernel.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-24.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH, INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63ED6C433ED for <linux-arm-kernel@archiver.kernel.org>; Mon, 26 Apr 2021 15:55:51 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9CF0A610A2 for <linux-arm-kernel@archiver.kernel.org>; Mon, 26 Apr 2021 15:55:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9CF0A610A2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=U+Yht4Lpyl3u6PXISNAEZscbBhzih3PejnQU+QGL23o=; b=QfO42qknR9TrxMbhrJVSVVaQR dUJe0OBqTsdLWAiJW1KMaALDLCxUGSALK1V8L5wtZtyhzp+liteL5Pfa4U8zhpf0jQc89BXdbbLLe O58cymLS5iK1Sc1VWorYPX221SCEBljZe8SoLG5wLYDWQUEWG5wzXmy7beCyS8+qtPuiEZPwZiQZW n555/VfYbh86T4ScqpVjZGKAB9l0J7i7hq8gPisu204zbjLeiVp2C4sAjZ8KYwNZu0Kc/kapgh2i3 C5Ud9CyQbTw/YJlG5aqyvWRckHbw4bnloi3Zl8DFgTFBIMPC0L6VuX+6SV72MrKONMCce+ZWG5Beu AI/myWalQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lb3Yu-0080dM-Go; Mon, 26 Apr 2021 15:54:16 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lb3Yk-0080bb-CU for linux-arm-kernel@desiato.infradead.org; Mon, 26 Apr 2021 15:54:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:Cc:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Sender:Reply-To:Content-ID:Content-Description; bh=S6gc99Etddv7mli4Ieb59FYE8xkQ03lVO2lCKhNIAS0=; b=bLX3iSxMFZ56VYe8sJoO7vmF/k PJcJzHtZh0qlinC1D5A3fF88Sird5VmWWwONgNkc//SSTumOyQkzkJ5YnzUwYasI5g/bGbKX0rvNE qvQQc5oncQAFb4/l3npnSOtqaLR+nOiFTg3ocesEygHqMWqbTyNNZt3z5ZWxOCBzVt69Fec5FNzjf IeoHGV4zVP13sz3pdBkiYsDqg/Gau3FU/nYR9u8v5x414Qnwj70R92nHjYPP5Ik8bFeW1ng6aeh2x ty6+uZdkNAVPLduFGszCqpyrL6Z+5eqOKsO9OsCkmOalnQYmCk5uZeGL9z67T0WCss2bKsrQXdyT3 Q4ZQf7og==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lb3Yh-00G3qS-5F for linux-arm-kernel@lists.infradead.org; Mon, 26 Apr 2021 15:54:05 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9C805610E6 for <linux-arm-kernel@lists.infradead.org>; Mon, 26 Apr 2021 15:54:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619452442; bh=TE7uIUuIOd16ye9QIYhsbNWruh7Bx1Fy1JdO96nYQ4Q=; h=References:In-Reply-To:From:Date:Subject:To:List-Id:Cc:From; b=Kfn01iFQBY3HYEBVxS8sd8QjagNaccMyd9pTsZfqYBBrn0LFSEpcW/ODnE8bkTXxV BI/DT2ojCSd7l/l8EO+lI2yz2gBa6o+KA/Gw0mvvwTZEJ6iIdx5p1sKH7D6aRRMKyY ckCoO1Ctuc9RslLa62raYI2WxipqbRMvFNzRBXSVIgiomM9qrmQVRDW/iTvjkYySIt DFopSYBLc5soucq1DQhx1CY7Knm5UipAcntkKP7s86RsaclST+F5CdeIuJP6JY/O5O p01y/QwTO9vTUeEVN1qz4yJum0VyCeX+YgTs6V0nJ9xfcydxUlyM+G08vNGp/CiNjh hA9s/FJFE91cA== Received: by mail-wr1-f45.google.com with SMTP id j5so55460293wrn.4 for <linux-arm-kernel@lists.infradead.org>; Mon, 26 Apr 2021 08:54:02 -0700 (PDT) X-Gm-Message-State: AOAM530/2dqalCwOG8evEOmngc2oQW6tCEcUJJrRQzoUGZvzKSKo2bIM d4K2P3t6xb357bkdtf65oSN6jSyd//PutCV0xok= X-Google-Smtp-Source: ABdhPJxFbQu8riTUQC+1nsiYnTb+GcS9yx3yczeqwR8QBUJqtxR3x3Tov+wftq/u5PyK2TgPmj+ME5+zsaXwmd8p7qw= X-Received: by 2002:adf:db4f:: with SMTP id f15mr23845275wrj.99.1619452441026; Mon, 26 Apr 2021 08:54:01 -0700 (PDT) MIME-Version: 1.0 References: <CAK8P3a2RjRSjTcmwVf3VHy2CUB2HBj5AaJTx=1NSYuA_Qy4E-w@mail.gmail.com> In-Reply-To: <CAK8P3a2RjRSjTcmwVf3VHy2CUB2HBj5AaJTx=1NSYuA_Qy4E-w@mail.gmail.com> From: Arnd Bergmann <arnd@kernel.org> Date: Mon, 26 Apr 2021 17:53:31 +0200 X-Gmail-Original-Message-ID: <CAK8P3a08ONpuYxcNOOr1Yr04SYosAPKH+i=PPp9h0hvhknn+Mg@mail.gmail.com> Message-ID: <CAK8P3a08ONpuYxcNOOr1Yr04SYosAPKH+i=PPp9h0hvhknn+Mg@mail.gmail.com> Subject: [GIT PULL 1/6] ARM: SoC changes for v5.13 To: Linus Torvalds <torvalds@linux-foundation.org> List-Id: <soc.lore.kernel.org> Cc: SoC Team <soc@kernel.org>, Linux ARM <linux-arm-kernel@lists.infradead.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210426_085403_305966_5E8616EE X-CRM114-Status: GOOD ( 14.69 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org |
Series |
ARM SoC branches for 5.13
|
expand
|
The pull request you sent on Mon, 26 Apr 2021 17:53:31 +0200:
> git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/arm-soc-5.13
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/01d7136894410a71932096e0fb9f1d301b6ccf07
Thank you!
The following changes since commit 4c9f4865f4604744d4f1a43db22ac6ec9dc8e587: Merge branch 'fixes-rc2' into fixes (2021-03-08 11:34:12 +0200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/arm-soc-5.13 for you to fetch changes up to d92e5e32fb4fce7ae939ad322aad77955dd5dcda: Merge tag 'arm-soc/for-5.13/maintainers' of https://github.com/Broadcom/stblinux into arm/soc (2021-04-09 21:48:03 +0200) ---------------------------------------------------------------- ARM: SoC changes for v5.13 Almost all SoC code changes this time are for the TI OMAP platform, which continues its decade-long quest to move from describing a complex SoC in code to device tree. Aside from this, the Uniphier platform has a new maintainer and some platforms have minor bugfixes and cleanups that were not urgent enough for v5.12. Signed-off-by: Arnd Bergmann <arnd@arndb.de> ---------------------------------------------------------------- Aditya Srivastava (2): ARM: OMAP2+: fix incorrect kernel-doc comment syntax in file ARM: OMAP1: fix incorrect kernel-doc comment syntax in file Arnd Bergmann (7): Merge tag 'omap-for-v5.13/genpd-cleanup-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc Merge tag 'imx-soc-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/soc Merge tag 'at91-soc-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/soc Merge tag 'hisi-armv7soc-for-5.13' of git://github.com/hisilicon/linux-hisi into arm/soc Merge tag 'omap-for-v5.13/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc Merge tag 'samsung-soc-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/soc Merge tag 'arm-soc/for-5.13/maintainers' of https://github.com/Broadcom/stblinux into arm/soc Ben Dooks (1): ARM: ux500: make ux500_cpu_die static Bhaskar Chowdhury (1): ARM: mach-imx: Fix a spelling in the file pm-imx5.c Hao Fang (1): ARM: hisi: use the correct HiSilicon copyright Jiapeng Chong (1): ARM: OMAP2+: Replace DEFINE_SIMPLE_ATTRIBUTE with DEFINE_DEBUGFS_ATTRIBUTE Krzysztof Kozlowski (2): MAINTAINERS: use Krzysztof Kozlowski's Canonical address ARM: exynos: correct kernel doc in platsmp Kunihiko Hayashi (1): MAINTAINERS: Update ARM/UniPhier SoCs maintainers and status Lee Jones (1): ARM: at91: pm: Move prototypes to mutually included header Lifu Chen (1): ARM: OMAP2+: Use DEFINE_SPINLOCK() for spinlock Nicolas Saenz Julienne (2): MAINTAINERS: Update BCM2711/BCM2335 maintainer's mail mailmap: Update email address for Nicolas Saenz Nobuhiro Iwamatsu (1): ARM: imx: Kconfig: Fix typo in help Tony Lindgren (81): bus: ti-sysc: Fix initializing module_pa for modules without sysc register bus: ti-sysc: Probe for l4_wkup and l4_cfg interconnect devices first bus: ti-sysc: Detect more modules for debugging bus: ti-sysc: Check for old incomplete dtb ARM: OMAP2+: Init both prm and prcm nodes early for clocks soc: ti: omap-prm: Allow hardware supported retention when idle clk: ti: omap5: Add missing gpmc and ocmc clkctrl PCI: pci-dra7xx: Prepare for deferred probe with module_platform_driver ARM: dts: Update pcie ranges for dra7 ARM: dts: Configure interconnect target module for dra7 pcie ARM: dts: Properly configure dra7 edma sysconfig registers ARM: OMAP2+: Drop legacy platform data for dra7 pcie ARM: dts: Move dra7 l3 noc to a separate node ARM: OMAP2+: Drop legacy platform data for dra7 qspi ARM: dts: Configure interconnect target module for dra7 qspi ARM: OMAP2+: Drop legacy platform data for dra7 sata ARM: dts: Configure interconnect target module for dra7 sata ARM: OMAP2+: Drop legacy platform data for dra7 mpu ARM: dts: Configure interconnect target module for dra7 mpu ARM: OMAP2+: Drop legacy platform data for dra7 dmm ARM: dts: Configure interconnect target module for dra7 dmm ARM: OMAP2+: Drop legacy platform data for dra7 l4_wkup ARM: dts: Configure simple-pm-bus for dra7 l4_wkup ARM: OMAP2+: Drop legacy platform data for dra7 l4_per1 ARM: dts: Configure simple-pm-bus for dra7 l4_per1 ARM: OMAP2+: Drop legacy platform data for dra7 l4_per2 ARM: dts: Configure simple-pm-bus for dra7 l4_per2 ARM: OMAP2+: Drop legacy platform data for dra7 l4_per3 ARM: dts: Configure simple-pm-bus for dra7 l4_per3 ARM: OMAP2+: Drop legacy platform data for dra7 l4_cfg ARM: dts: Configure simple-pm-bus for dra7 l4_cfg ARM: OMAP2+: Drop legacy platform data for dra7 l3 ARM: dts: Configure simple-pm-bus for dra7 l3 ARM: OMAP2+: Drop legacy platform data for dra7 hwmod ARM: dts: Configure power-domain for omap4 gfx ARM: dts: Configure power-domain for omap4 dts iss ARM: dts: Configure interconnect target module for omap4 dmm ARM: dts: Configure interconnect target module for omap4 emif ARM: dts: Configure interconnect target module for omap4 debugss ARM: dts: Configure interconnect target module for omap4 mpu ARM: dts: Move omap4 mmio-sram out of l3 interconnect ARM: dts: Move omap4 l3-noc to a separate node ARM: dts: Configure simple-pm-bus for omap4 l4_wkup ARM: dts: Configure simple-pm-bus for omap4 l4_per ARM: dts: Configure simple-pm-bus for omap4 l4_cfg ARM: OMAP2+: Drop legacy platform data for omap4 iss ARM: OMAP2+: Drop legacy platform data for omap4 control modules ARM: dts: Prepare for simple-pm-bus for omap4 l3 ARM: OMAP2+: Drop legacy platform data for omap4 dmm ARM: OMAP2+: Drop legacy platform data for omap4 emif ARM: OMAP2+: Drop legacy platform data for omap4 debugss ARM: OMAP2+: Drop legacy platform data for omap4 mpu ARM: OMAP2+: Drop legacy platform data for omap4 l4_wkup ARM: OMAP2+: Drop legacy platform data for omap4 l4_per ARM: OMAP2+: Drop legacy platform data for omap4 l4_cfg ARM: OMAP2+: Drop legacy platform data for omap4 l3 ARM: OMAP2+: Drop legacy platform data for omap4 hwmod ARM: dts: Configure interconnect target module for omap5 dmm ARM: dts: Configure interconnect target module for omap5 emif ARM: dts: Configure interconnect target module for omap5 mpu ARM: dts: Configure interconnect target module for omap5 gpmc ARM: dts: Configure interconnect target module for omap5 sata ARM: dts: Move omap5 mmio-sram out of l3 interconnect ARM: dts: Move omap5 l3-noc to a separate node ARM: dts: Configure simple-pm-bus for omap5 l4_wkup ARM: dts: Configure simple-pm-bus for omap5 l4_per ARM: dts: Configure simple-pm-bus for omap5 l4_cfg ARM: dts: Configure simple-pm-bus for omap5 l3 ARM: OMAP2+: Drop legacy platform data for omap5 dmm ARM: OMAP2+: Drop legacy platform data for omap5 emif ARM: OMAP2+: Drop legacy platform data for omap5 mpu ARM: OMAP2+: Drop legacy platform data for omap5 sata ARM: OMAP2+: Drop legacy platform data for omap5 l4_wkup ARM: OMAP2+: Drop legacy platform data for omap5 l4_per ARM: OMAP2+: Drop legacy platform data for omap5 l4_cfg ARM: OMAP2+: Drop legacy platform data for omap5 l3 ARM: OMAP2+: Drop legacy platform data for omap5 hwmod Merge tags 'genpd-dts-dra7', 'genpd-dts-omap4' and 'genpd-dts-omap5' into omap-for-v5.13/dts-genpd Merge branches 'omap-for-v5.13/genpd-dra7', 'omap-for-v5.13/genpd-omap4' and 'omap-for-v5.13/genpd-omap5' into omap-for-v5.13/genpd-drop-legacy ARM: OMAP2+: Stop building legacy code for dra7 and omap4/5 bus: ti-sysc: Warn about old dtb for dra7 and omap4/5 Uwe Kleine-König (1): ARM: s3c: Use pwm_get() in favour of pwm_request() in RX1950 Yang Li (2): ARM: OMAP2+: add missing call to of_node_put() ARM: OMAP2+: use true and false for bool variable .mailmap | 2 + MAINTAINERS | 30 +- arch/arm/boot/dts/dra7-l4.dtsi | 75 ++- arch/arm/boot/dts/dra7.dtsi | 220 +++++--- arch/arm/boot/dts/omap4-l4.dtsi | 43 +- arch/arm/boot/dts/omap4.dtsi | 169 ++++-- arch/arm/boot/dts/omap4460.dtsi | 13 +- arch/arm/boot/dts/omap5-l4.dtsi | 67 ++- arch/arm/boot/dts/omap5.dtsi | 204 ++++--- arch/arm/mach-at91/pm.c | 19 +- arch/arm/mach-exynos/platsmp.c | 28 +- arch/arm/mach-hisi/hisilicon.c | 4 +- arch/arm/mach-hisi/hotplug.c | 2 +- arch/arm/mach-hisi/platmcpm.c | 2 +- arch/arm/mach-hisi/platsmp.c | 2 +- arch/arm/mach-imx/Kconfig | 2 +- arch/arm/mach-imx/pm-imx5.c | 2 +- arch/arm/mach-omap1/timer.c | 2 +- arch/arm/mach-omap2/Kconfig | 3 - arch/arm/mach-omap2/Makefile | 11 +- arch/arm/mach-omap2/common.h | 9 - arch/arm/mach-omap2/io.c | 12 +- arch/arm/mach-omap2/omap_hwmod.c | 9 +- arch/arm/mach-omap2/omap_hwmod.h | 14 +- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 877 ----------------------------- arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 467 --------------- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 719 ----------------------- arch/arm/mach-omap2/omap_twl.c | 2 +- arch/arm/mach-omap2/pdata-quirks.c | 31 +- arch/arm/mach-omap2/pm-debug.c | 4 +- arch/arm/mach-omap2/powerdomain.c | 12 +- arch/arm/mach-omap2/sr_device.c | 7 + arch/arm/mach-s3c/mach-rx1950.c | 11 +- arch/arm/mach-ux500/platsmp.c | 2 +- arch/arm/plat-omap/dma.c | 3 +- drivers/bus/ti-sysc.c | 81 ++- drivers/clk/ti/clk-54xx.c | 2 + drivers/pci/controller/dwc/pci-dra7xx.c | 13 +- drivers/pinctrl/pinctrl-at91.c | 2 + drivers/soc/ti/omap_prm.c | 16 +- include/dt-bindings/clock/omap5.h | 2 + include/soc/at91/pm.h | 16 + 42 files changed, 758 insertions(+), 2453 deletions(-) delete mode 100644 arch/arm/mach-omap2/omap_hwmod_44xx_data.c delete mode 100644 arch/arm/mach-omap2/omap_hwmod_54xx_data.c delete mode 100644 arch/arm/mach-omap2/omap_hwmod_7xx_data.c create mode 100644 include/soc/at91/pm.h