From: Olof Johansson <olof@lixom.net>
To: torvalds@linux-foundation.org
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, arm@kernel.org,
soc@kernel.org, Olof Johansson <olof@lixom.net>
Subject: [GIT PULL 3/5] ARM: SoC-related driver updates
Date: Sat, 8 Feb 2020 03:20:16 -0800 [thread overview]
Message-ID: <20200208112018.29819-4-olof@lixom.net> (raw)
In-Reply-To: <20200208112018.29819-1-olof@lixom.net>
Various driver updates for platforms:
- Nvidia: Fuse support for Tegra194, continued memory controller pieces
for Tegra30
- NXP/FSL: Refactorings of QuickEngine drivers to support ARM/ARM64/PPC
- NXP/FSL: i.MX8MP SoC driver pieces
- TI Keystone: ring accelerator driver
- Qualcomm: SCM driver cleanup/refactoring + support for new SoCs.
- Xilinx ZynqMP: feature checking interface for firmware. Mailbox
communication for power management
- Overall support patch set for cpuidle on more complex hierarchies
(PSCI-based)
+ Misc cleanups, refactorings of Marvell, TI, other platforms.
Conflicts:
drivers/soc/tegra/fuse/tegra-apbmisc.c:
This branch has one conflict due to ioremap_nocache() removal touching
same lines as some error path fixes for tegra. Keep the ioremap()
version of the call, but the rest from this side.
----------------------------------------------------------------
The following changes since commit a1a0cfaf7fb7c1a90201e6b0937f742c8c212d8e:
Merge tag 'armsoc-defconfig' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/armsoc-drivers
for you to fetch changes up to 88b4750151a2739761bb1af7fedeae1ff5d9aed9:
Merge tag 'zynqmp-soc-for-v5.6' of https://github.com/Xilinx/linux-xlnx into arm/drivers
----------------------------------------------------------------
arch/arm/boot/dts/am33xx.dtsi | 25 ++
arch/arm/boot/dts/am4372.dtsi | 20 +
arch/arm/boot/dts/am437x-sk-evm.dts | 27 +-
arch/arm/boot/dts/am43x-epos-evm.dts | 23 +-
arch/arm/boot/dts/am43xx-clocks.dtsi | 54 +++
arch/arm/boot/dts/dra7-l4.dtsi | 71 +++-
arch/arm/boot/dts/dra7.dtsi | 18 +
arch/arm/boot/dts/dra72-evm-common.dtsi | 31 ++
arch/arm/boot/dts/dra72x.dtsi | 42 ++
arch/arm/boot/dts/dra76-evm.dts | 35 ++
arch/arm/boot/dts/dra76x.dtsi | 42 ++
arch/arm/boot/dts/dra7xx-clocks.dtsi | 32 +-
arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 5 +-
arch/arm/boot/dts/motorola-mapphone-common.dtsi | 19 +
arch/arm/boot/dts/omap4-l4.dtsi | 49 ++-
arch/arm/boot/dts/omap4.dtsi | 110 +++--
arch/arm/boot/dts/omap44xx-clocks.dtsi | 11 +-
arch/arm/boot/dts/omap5-l4.dtsi | 20 +-
arch/arm/boot/dts/omap54xx-clocks.dtsi | 10 +-
arch/arm/mach-davinci/Makefile | 3 +-
arch/arm/mach-davinci/board-dm365-evm.c | 20 +
arch/arm/mach-davinci/board-dm644x-evm.c | 20 +
arch/arm/mach-davinci/devices-da8xx.c | 1 -
arch/arm/mach-davinci/devices.c | 19 -
arch/arm/mach-davinci/dm365.c | 22 +-
arch/arm/mach-davinci/include/mach/common.h | 17 -
arch/arm/mach-davinci/include/mach/time.h | 33 --
arch/arm/mach-davinci/time.c | 400 -------------------
arch/arm/mach-omap2/clockdomains7xx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 135 -------
drivers/clk/ti/clk-44xx.c | 13 +
drivers/clk/ti/clk-54xx.c | 13 +
drivers/clocksource/timer-davinci.c | 8 +-
include/dt-bindings/clock/omap4.h | 11 +
include/dt-bindings/clock/omap5.h | 11 +
35 files changed, 697 insertions(+), 675 deletions(-)
delete mode 100644 arch/arm/mach-davinci/include/mach/time.h
delete mode 100644 arch/arm/mach-davinci/time.c
next prev parent reply other threads:[~2020-02-08 11:20 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-08 11:20 [GIT PULL 0/5] ARM: Changes for 5.6 merge window Olof Johansson
2020-02-08 11:20 ` [GIT PULL 1/5] ARM: SoC platform updates Olof Johansson
2020-02-08 22:35 ` pr-tracker-bot
2020-02-08 11:20 ` [GIT PULL 2/5] ARM: Device-tree updates Olof Johansson
2020-02-08 22:35 ` pr-tracker-bot
2020-02-08 11:20 ` Olof Johansson [this message]
2020-02-08 22:35 ` [GIT PULL 3/5] ARM: SoC-related driver updates pr-tracker-bot
2020-02-08 11:20 ` [GIT PULL 4/5] ARM: SoC defconfig updates Olof Johansson
2020-02-08 22:35 ` pr-tracker-bot
2020-02-08 11:20 ` [GIT PULL 5/5] ARM: SoC: late updates Olof Johansson
2020-02-08 22:35 ` pr-tracker-bot
2020-02-08 21:25 ` [GIT PULL 0/5 v2] ARM: SoC contents for 5.6 Olof Johansson
2020-02-08 21:25 ` [GIT PULL 1/5 v2] ARM: SoC platform updates Olof Johansson
2020-02-08 21:25 ` [GIT PULL 2/5 v2] ARM: Device-tree updates Olof Johansson
2020-02-08 21:25 ` [GIT PULL 3/5 v2] ARM: SoC-related driver updates Olof Johansson
2020-02-08 21:25 ` [GIT PULL 4/5 v2] ARM: SoC defconfig updates Olof Johansson
2020-02-08 21:25 ` [GIT PULL 5/5 v2] ARM: SoC: late updates Olof Johansson
2020-10-23 22:31 [GIT PULL 0/5] ARM: SoC contents for 5.10 Olof Johansson
2020-10-23 22:31 ` [GIT PULL 3/5] ARM: SoC-related driver updates Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200208112018.29819-4-olof@lixom.net \
--to=olof@lixom.net \
--cc=arm@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=soc@kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).