| Message ID | 20200208112018.29819-6-olof@lixom.net (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | a832eb203ecd34e486bdde0042cf166e687eb227 |
| Headers | show |
| Series | ARM: Changes for 5.6 merge window | expand |
The pull request you sent on Sat, 8 Feb 2020 03:20:18 -0800:
> git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/armsoc-late
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/4ef1a30c6bd2555d4177fc9286df32e9166d58ba
Thank you!
This is some material that we picked up into our tree late, or that had more complex dependencies on more than one topic branch that makes sense to keep separately. - TI support for secure accelerators and hwrng on OMAP4/5 - TI camera changes for dra7 and am437x and SGX improvement due to better reset control support on am335x, am437x and dra7 - Davinci moves to proper clocksource on DM365, and regulator/audio improvements for DM365 and DM644x eval boards ---------------------------------------------------------------- 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-late for you to fetch changes up to a832eb203ecd34e486bdde0042cf166e687eb227: Merge tag 'davinci-for-v5.6/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into arm/late ---------------------------------------------------------------- Bartosz Golaszewski (3): clocksource: davinci: only enable clockevents once tim34 is initialized ARM: davinci: dm365: switch to using the clocksource driver ARM: davinci: remove legacy timer support Benoit Parrot (11): ARM: dts: dra7: add cam clkctrl node ARM: OMAP: DRA7xx: Make CAM clock domain SWSUP only ARM: dts: dra7-l4: Add ti-sysc node for CAM ARM: dts: DRA72: Add CAL dtsi node arm: dts: dra72-evm-common: Add entries for the CSI2 cameras arm: dtsi: dra76x: Add CAL dtsi node arm: dts: dra76-evm: Add CAL and OV5640 nodes ARM: dts: am437x-sk-evm: Add VPFE and OV2659 entries ARM: dts: am43x-epos-evm: Add VPFE and OV2659 entries ARM: dts: dra7: add vpe clkctrl node ARM: dts: dra7: Add ti-sysc node for VPE Olof Johansson (3): Merge tag 'omap-for-v5.6/ti-sysc-drop-pdata-crypto-signed' of git://git.kernel.org/.../tmlind/linux-omap into arm/late Merge tag 'omap-for-v5.6/dt-late-signed' of git://git.kernel.org/.../tmlind/linux-omap into arm/late Merge tag 'davinci-for-v5.6/soc' of git://git.kernel.org/.../nsekhar/linux-davinci into arm/late Peter Ujfalusi (2): ARM: davinci: dm365-evm: Add Fixed regulators needed for tlv320aic3101 ARM: davinci: dm644x-evm: Add Fixed regulators needed for tlv320aic33 Tero Kristo (1): ARM: dts: am43xx: add support for clkout1 clock Tony Lindgren (17): ARM: dts: Add missing omap4 secure clocks ARM: dts: Add missing omap5 secure clocks ARM: dts: Configure omap4 rng to probe with ti-sysc ARM: dts: Configure omap5 rng to probe with ti-sysc ARM: dts: Configure interconnect target module for omap4 sham ARM: dts: Configure interconnect target module for omap4 aes ARM: dts: Configure interconnect target module for omap4 des ARM: OMAP2+: Drop legacy platform data for omap4 aes ARM: OMAP2+: Drop legacy platform data for omap4 sham ARM: OMAP2+: Drop legacy platform data for omap4 des Merge branch 'omap-for-v5.6/ti-sysc-omap45-rng' into omap-for-v5.6/ti-sysc-drop-pdata Merge branch 'omap-for-v5.6/ti-sysc-dt-cam' into omap-for-v5.6/dt ARM: dts: Configure rstctrl reset for am335x SGX ARM: dts: Configure sgx for dra7 ARM: dts: Configure interconnect target module for am437x sgx ARM: dts: motorola-cpcap-mapphone: Configure calibration interrupt ARM: dts: omap4-droid4: Enable hdq for droid4 ds250x 1-wire battery nvmem 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 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#1352): https://linux.kernel.org/g/patchwork-soc/message/1352 Mute This Topic: https://linux.kernel.org/mt/71077678/1554929 Group Owner: patchwork-soc+owner@linux.kernel.org Unsubscribe: https://linux.kernel.org/g/patchwork-soc/unsub [patchwork-linux-kernel-org@patchwork.kernel.org] -=-=-=-=-=-=-=-=-=-=-=-