* [GIT PULL 5/7] ARM: SoC driver updates
@ 2017-07-04 14:24 Arnd Bergmann
2017-07-04 21:53 ` Linus Torvalds
0 siblings, 1 reply; 7+ messages in thread
From: Arnd Bergmann @ 2017-07-04 14:24 UTC (permalink / raw)
To: Linus Torvalds, arm-soc, Linux ARM, Linux Kernel Mailing List
The following changes since commit 5ed02dbb497422bf225783f46e6eadd237d23d6b:
Linux 4.12-rc3 (2017-05-28 17:20:53 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
tags/armsoc-drivers
for you to fetch changes up to ffe3744a591fdce695da6b891378261e2caedc69:
Merge tag 'actions-drivers-for-4.13' of
git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions
into next/drivers (2017-06-29 17:34:57 +0200)
----------------------------------------------------------------
ARM: SoC driver updates
- New SoC specific drivers
- NVIDIA Tegra PM Domain support for newer SoCs (Tegra186 and later)
based on the "BPMP" firmware
- Clocksource and system controller drivers for the newly added
Action Semi platforms (both arm and arm64).
- Reset subsystem, merged through arm-soc by tradition:
- New drivers for Altera Stratix10, TI Keystone and Cortina Gemini SoCs
- Various subsystem-wide cleanups
- Updates for existing SoC-specific drivers
- TI GPMC (General Purpose Memory Controller)
- Mediatek "scpsys" system controller support for MT6797
- Broadcom "brcmstb_gisb" bus arbitrer
- ARM SCPI firmware
- Renesas "SYSC" system controller
One more driver update was submitted for the Freescale/NXP DPAA
data path acceleration that has previously been used on PowerPC
chips. I ended up postponing the merge until some API questions
for its unusual MMIO access are resolved.
----------------------------------------------------------------
Andreas Färber (6):
clocksource: Add Owl timer
clocksource: owl: Add S900 support
dt-bindings: power: Add Owl SPS power domains
soc: actions: Add Owl SPS
soc: actions: owl-sps: Factor out owl_sps_set_pg() for power-gating
Merge branch 'v4.13/sps' into v4.13/drivers
Andrew F. Davis (2):
dt-bindings: reset: Add TI SCI reset binding
reset: Add the TI SCI reset driver
Arnd Bergmann (2):
Merge tag 'qcom-drivers-for-4.13' of
git://git.kernel.org/.../agross/linux into next/drivers
Merge tag 'actions-drivers-for-4.13' of
git://git.kernel.org/.../afaerber/linux-actions into next/drivers
Christophe Jaillet (2):
soc: mediatek: PMIC wrap: Fix error handling
soc/tegra: flowctrl: Fix error handling
Dan Carpenter (1):
firmware: tegra: Fix locking bugs in BPMP
Doug Berger (6):
bus: brcmstb_gisb: Use register offsets with writes too
bus: brcmstb_gisb: correct support for 64-bit address output
bus: brcmstb_gisb: add notifier handling
bus: brcmstb_gisb: remove low-level ARM hooks
bus: brcmstb_gisb: enable driver for ARM64 architecture
bus: brcmstb_gisb: update to support new revision
Geert Uytterhoeven (2):
soc: renesas: Rework Kconfig and Makefile logic
soc: renesas: rcar-sysc: Use GENPD_FLAG_ALWAYS_ON
Jonathan Neuschäfer (1):
soc: qcom: smsm: Improve error handling, quiesce probe deferral
Linus Walleij (2):
reset: add DT bindings header for Gemini reset controller
reset: Add a Gemini reset controller
Marc Ohlf (1):
soc: imx: gpc: build gpc only if hardware has gpc
Markus Elfring (1):
reset: sti: Use devm_kcalloc() in syscfg_reset_controller_register()
Markus Mayer (1):
soc: brcmstb: enable drivers for ARM64 and BMIPS
Mars Cheng (3):
soc: mediatek: avoid using fixed spm power status defines
soc: mediatek: add vdec item for scpsys
soc: mediatek: add MT6797 scpsys support
Olof Johansson (11):
Merge tag 'omap-for-v4.13/gpmc-signed' of
git://git.kernel.org/.../tmlind/linux-omap into next/drivers
Merge tag 'reset-for-4.13' of
git://git.pengutronix.de/git/pza/linux into next/drivers
Merge tag 'reset-for-4.13-2' of
git://git.pengutronix.de/git/pza/linux into next/drivers
Merge tag 'v4.12-next-soc' of
https://github.com/mbgg/linux-mediatek into next/drivers
Merge tag 'arm-soc/for-4.13/drivers' of
http://github.com/Broadcom/stblinux into next/drivers
Merge tag 'scpi-updates-4.13' of
git://git.kernel.org/.../sudeep.holla/linux into next/drivers
Merge tag 'tegra-for-4.13-soc' of
git://git.kernel.org/.../tegra/linux into next/drivers
Merge tag 'tegra-for-4.13-firmware' of
git://git.kernel.org/.../tegra/linux into next/drivers
Merge tag 'renesas-drivers-for-v4.13' of
https://git.kernel.org/.../horms/renesas into next/drivers
Merge tag 'renesas-rcar-sysc-for-v4.13' of
https://git.kernel.org/.../horms/renesas into next/drivers
Merge tag 'imx-drivers-4.13' of
git://git.kernel.org/.../shawnguo/linux into next/drivers
Philipp Zabel (1):
reset: use kref for reference counting
Richard Gong (1):
dt-bindings: reset: Add reset manager offsets for Stratix10
Sudeep Holla (2):
firmware: arm_scpi: add support to populate OPPs and get
transition latency
cpufreq: scpi: use new scpi_ops functions to remove duplicate code
Suman Anna (1):
reset: ti_syscon: Rename TI_SYSCON_RESET to RESET_TI_SYSCON
Thierry Reding (3):
PM / Domains: Allow overriding the ->xlate() callback
soc/tegra: bpmp: Update ABI header
soc/tegra: bpmp: Implement generic PM domains
Uwe Kleine-König (2):
memory: omap-gpmc: make dts snippet include semicolon
memory: omap-gpmc: add error message if bank-width property is absent
shailendra.v@samsung.com (1):
soc: mediatek: PMIC wrap: Fix possible NULL derefrence.
.../devicetree/bindings/bus/brcm,gisb-arb.txt | 3 +-
.../devicetree/bindings/power/actions,owl-sps.txt | 17 +
.../devicetree/bindings/reset/ti,sci-reset.txt | 62 +++
MAINTAINERS | 2 +
drivers/base/power/domain.c | 8 +-
drivers/bus/Kconfig | 2 +-
drivers/bus/brcmstb_gisb.c | 121 +++---
drivers/clocksource/Kconfig | 7 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/owl-timer.c | 172 +++++++++
drivers/cpufreq/scpi-cpufreq.c | 38 +-
drivers/firmware/arm_scpi.c | 63 ++++
drivers/firmware/tegra/bpmp.c | 32 +-
drivers/memory/omap-gpmc.c | 9 +-
drivers/reset/Kconfig | 17 +-
drivers/reset/Makefile | 4 +-
drivers/reset/core.c | 23 +-
drivers/reset/reset-gemini.c | 110 ++++++
drivers/reset/reset-ti-sci.c | 269 +++++++++++++
drivers/reset/sti/reset-syscfg.c | 6 +-
drivers/soc/Kconfig | 2 +
drivers/soc/Makefile | 3 +-
drivers/soc/actions/Kconfig | 16 +
drivers/soc/actions/Makefile | 2 +
drivers/soc/actions/owl-sps-helper.c | 51 +++
drivers/soc/actions/owl-sps.c | 224 +++++++++++
drivers/soc/bcm/Kconfig | 2 +-
drivers/soc/imx/Makefile | 2 +-
drivers/soc/mediatek/mtk-pmic-wrap.c | 14 +-
drivers/soc/mediatek/mtk-scpsys.c | 149 +++++++-
drivers/soc/qcom/smsm.c | 9 +-
drivers/soc/renesas/Kconfig | 63 ++++
drivers/soc/renesas/Makefile | 31 +-
drivers/soc/renesas/rcar-sysc.c | 52 +--
drivers/soc/renesas/rcar-sysc.h | 2 -
drivers/soc/tegra/Kconfig | 5 +
drivers/soc/tegra/Makefile | 1 +
drivers/soc/tegra/flowctrl.c | 2 +-
drivers/soc/tegra/powergate-bpmp.c | 359 ++++++++++++++++++
include/dt-bindings/power/mt6797-power.h | 30 ++
include/dt-bindings/power/owl-s500-powergate.h | 19 +
include/dt-bindings/reset/altr,rst-mgr-s10.h | 108 ++++++
include/dt-bindings/reset/cortina,gemini-reset.h | 36 ++
include/linux/pm_domain.h | 4 +
include/linux/scpi_protocol.h | 3 +
include/linux/soc/actions/owl-sps.h | 11 +
include/linux/soc/renesas/rcar-rst.h | 3 +-
include/soc/tegra/bpmp-abi.h | 418 ++++++++++++++++++++-
include/soc/tegra/bpmp.h | 12 +
49 files changed, 2401 insertions(+), 198 deletions(-)
create mode 100644 Documentation/devicetree/bindings/power/actions,owl-sps.txt
create mode 100644 Documentation/devicetree/bindings/reset/ti,sci-reset.txt
create mode 100644 drivers/clocksource/owl-timer.c
create mode 100644 drivers/reset/reset-gemini.c
create mode 100644 drivers/reset/reset-ti-sci.c
create mode 100644 drivers/soc/actions/Kconfig
create mode 100644 drivers/soc/actions/Makefile
create mode 100644 drivers/soc/actions/owl-sps-helper.c
create mode 100644 drivers/soc/actions/owl-sps.c
create mode 100644 drivers/soc/renesas/Kconfig
create mode 100644 drivers/soc/tegra/powergate-bpmp.c
create mode 100644 include/dt-bindings/power/mt6797-power.h
create mode 100644 include/dt-bindings/power/owl-s500-powergate.h
create mode 100644 include/dt-bindings/reset/altr,rst-mgr-s10.h
create mode 100644 include/dt-bindings/reset/cortina,gemini-reset.h
create mode 100644 include/linux/soc/actions/owl-sps.h
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PULL 5/7] ARM: SoC driver updates
2017-07-04 14:24 [GIT PULL 5/7] ARM: SoC driver updates Arnd Bergmann
@ 2017-07-04 21:53 ` Linus Torvalds
2017-07-05 12:31 ` Arnd Bergmann
0 siblings, 1 reply; 7+ messages in thread
From: Linus Torvalds @ 2017-07-04 21:53 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: arm-soc, Linux ARM, Linux Kernel Mailing List
On Tue, Jul 4, 2017 at 7:24 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> create mode 100644 drivers/soc/actions/Kconfig
> create mode 100644 drivers/soc/actions/Makefile
> create mode 100644 drivers/soc/actions/owl-sps-helper.c
> create mode 100644 drivers/soc/actions/owl-sps.c
You already had these in the platform updates.
Linus
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PULL 5/7] ARM: SoC driver updates
2017-07-04 21:53 ` Linus Torvalds
@ 2017-07-05 12:31 ` Arnd Bergmann
0 siblings, 0 replies; 7+ messages in thread
From: Arnd Bergmann @ 2017-07-05 12:31 UTC (permalink / raw)
To: Linus Torvalds; +Cc: arm-soc, Linux ARM, Linux Kernel Mailing List
On Tue, Jul 4, 2017 at 11:53 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Tue, Jul 4, 2017 at 7:24 AM, Arnd Bergmann <arnd@arndb.de> wrote:
>> create mode 100644 drivers/soc/actions/Kconfig
>> create mode 100644 drivers/soc/actions/Makefile
>> create mode 100644 drivers/soc/actions/owl-sps-helper.c
>> create mode 100644 drivers/soc/actions/owl-sps.c
>
> You already had these in the platform updates.
Yes, that was intentional. We had not originally decided which branch to send
first, so I asked Andreas to include the same commits in both branches.
The SMP support in arch/arm/mach-actions has a build-time dependency
on the code, so it needed to be in there, and the drivers branch simply
includes all the drivers/*/ changes.
In the past I sometimes generated the log in the pull request to match what
you are expected to see in the real merge, instead of the diff against mainline,
but now I only do that in case we have to do a backmerge for some reason
(most of the time we can avoid those, I think this time one of the pull requests
had a backmerge of 4.12-rc1..4.12-rc2).
Let me know if you would rather have us handle this differently.
Arnd
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL 5/7] ARM: SoC driver updates
2017-05-09 6:52 [GIT PULL 0/7] ARM: SoC contents for 4.12 merge window Olof Johansson
@ 2017-05-09 6:52 ` Olof Johansson
0 siblings, 0 replies; 7+ messages in thread
From: Olof Johansson @ 2017-05-09 6:52 UTC (permalink / raw)
To: torvalds; +Cc: arm, linux-kernel, linux-arm-kernel, Olof Johansson
Driver updates for ARM SoCs.
* Reset subsystem, merged through arm-soc by tradition:
- Make bool drivers explicitly non-modular
- New support for i.MX7 and Arria10 reset controllers
* PATA driver for Palmchip BK371 (acked by Tejun)
* Power domain drivers for i.MX (GPC, GPCv2)
- Moved out of mach-imx for GPC
- Bunch of tweaks, fixes, etc
* PMC support for Tegra186
* SoC detection support for Renesas RZ/G1H and RZ/G1N
* Move Tegra flow controller driver from mach directory to drivers/soc
- (Power management / CPU power driver)
* Misc smaller tweaks for other platforms
----------------------------------------------------------------
The following changes since commit 51cc83299ee9314351569df5267b891130cef79b:
Merge tag 'armsoc-defconfig' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/armsoc-drivers
for you to fetch changes up to b6942b68f85ed3161c91741791ec6f1779574919:
Merge branch 'for_4.12/soc-pmdomain-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/drivers
----------------------------------------------------------------
Alexey Klimov (1):
firmware: arm_scpi: reinit completion instead of full init_completion()
Andre Przywara (1):
reset: sunxi: fix for 64-bit compilation
Andrey Smirnov (3):
reset: Add i.MX7 SRC reset driver
dt-bindings: Add GPCv2 power gating driver
soc: imx: Add GPCv2 power gating driver
Arnd Bergmann (4):
Merge tag 'amlogic-drivers' of git://git.kernel.org/.../khilman/linux-amlogic into next/drivers
Merge tag 'arm-soc/for-4.12/drivers' of http://github.com/Broadcom/stblinux into next/drivers
soc/tegra: Fix link errors with PMC disabled
Merge branch 'for_4.12/soc-pmdomain-p2' of git://git.kernel.org/.../ssantosh/linux-keystone into next/drivers
Bartlomiej Zolnierkiewicz (3):
ata: add Palmchip BK3710 PATA controller driver
pata_bk3710: disable IORDY Timer on chipset initialization
pata_bk3710: clear status bits of BMISP on chipset initialization
Carlo Caione (2):
firmware: meson-sm: Check for buffer output size
firmware: meson-sm: Allow 0 as valid return value
Dave Gerlach (5):
PM / Domains: Add generic data pointer to genpd data struct
PM / Domains: Do not check if simple providers have phandle cells
dt-bindings: Add TI SCI PM Domains
soc: ti: Add ti_sci_pm_domains driver
ARM: keystone: Drop PM domain support for k2g
Dong Aisheng (8):
soc: imx: gpc: fix gpc clk get error handling
soc: imx: gpc: fix the wrong using of regmap cache
soc: imx: gpc: fix domain_index sanity check issue
soc: imx: gpc: fix imx6sl gpc power domain regression
soc: imx: gpc: fix comment when power up domain
soc: imx: gpc: keep PGC_X_CTRL name align with reference manual
dt-bindings: imx-gpc: correct the DOMAIN_INDEX using
soc: imx: gpc: remove unnecessary readable_reg callback
Florian Fainelli (1):
soc: bcm: brcmstb: Match additional compatible strings
Geert Uytterhoeven (7):
soc: renesas: Identify RZ/G1H
soc: renesas: Identify RZ/G1N
base: soc: Let soc_device_match() return no match when called too early
base: soc: Allow early registration of a single SoC device
soc: renesas: Register SoC device early
soc: renesas: rcar-sysc: Add support for fixing up power area tables
soc: renesas: rcar-sysc: Add support for R-Car H3 ES2.0
Jon Hunter (4):
ARM: tegra: Remove unnecessary inclusion of flowctrl header
soc/tegra: Move Tegra flowctrl driver
soc/tegra: flowctrl: Add basic platform driver
soc/tegra: Add initial flowctrl support for Tegra132/210
Krzysztof Kozlowski (1):
soc: samsung: Do not build ARMv7 PMU drivers on ARMv8
Linus Walleij (2):
ARM: plat-versatile: remove stale clock header
ARM/clk: move the ICST library to drivers/clk
Lucas Stach (5):
dt-bindings: add multidomain support to i.MX GPC DT binding
soc: imx: move PGC handling to a new GPC driver
soc: imx: gpc: add defines for domain index
dt-bindings: imx-gpc: add i.MX6 QuadPlus compatible
soc: imx: gpc: add workaround for i.MX6QP to the GPC PD driver
Masahiro Yamada (1):
reset: uniphier: add NAND and eMMC reset control
Olof Johansson (13):
Merge tag 'reset-for-4.12-1' of git://git.pengutronix.de/git/pza/linux into next/drivers
Merge tag 'renesas-drivers-for-v4.12' of https://git.kernel.org/.../horms/renesas into next/drivers
Merge tag 'scpi-update-4.12' of git://git.kernel.org/.../sudeep.holla/linux into next/drivers
Merge tag 'davinci-for-v4.12/drivers' of git://git.kernel.org/.../nsekhar/linux-davinci into next/drivers
Merge tag 'reset-for-4.12-2' of git://git.pengutronix.de/git/pza/linux into next/drivers
Merge tag 'arm-soc-pmdomain' of git://git.kernel.org/.../ssantosh/linux-keystone into next/drivers
Merge tag 'tegra-for-4.12-soc' of git://git.kernel.org/.../tegra/linux into next/drivers
Merge tag 'qcom-drivers-for-4.12' of git://git.kernel.org/.../agross/linux into next/drivers
Merge tag 'arm-to-clk-icst' of git://git.kernel.org/.../linusw/linux-integrator into next/drivers
Merge tag 'imx-drivers-4.12' of git://git.kernel.org/.../shawnguo/linux into next/drivers
Merge tag 'zte-drivers-4.12' of git://git.kernel.org/.../shawnguo/linux into next/drivers
Merge tag 'renesas-sysc-for-v4.12' of https://git.kernel.org/.../horms/renesas into next/drivers
Merge tag 'samsung-drivers-4.12' of git://git.kernel.org/.../krzk/linux into next/drivers
Paul Gortmaker (5):
reset: meson: make it explicitly non-modular
reset: oxnas: make it explicitly non-modular
reset: ath79: make it explicitly non-modular
reset: pistachio: make it explicitly non-modular
soc: tegra: make fuse-tegra explicitly non-modular
Rob Clark (1):
firmware/qcom: add qcom_scm_restore_sec_cfg()
Rojhalat Ibrahim (1):
reset-socfpga: Fix nr_resets property
Santosh Shilimkar (1):
soc: pm-domain: Fix the mangled urls
Stanimir Varbanov (1):
firmware: qcom_scm: add two scm calls for iommu secure page table
Thierry Reding (1):
soc/tegra: Implement Tegra186 PMC support
Thor Thayer (2):
dt-bindings: reset: a10sr: Add Arria10 SR Reset Controller offsets
reset: Add Altera Arria10 SR Reset Controller
Wei Yongjun (3):
reset: uniphier: fix non static symbol warnings
soc: zte: pm_domains: Remove redundant dev_err call in zx2967_pd_probe()
soc: zte: pm_domains: Remove .owner field for driver
.../bindings/arm/tegra/nvidia,tegra186-pmc.txt | 34 ++
.../devicetree/bindings/power/fsl,imx-gpc.txt | 85 ++--
.../devicetree/bindings/power/fsl,imx-gpcv2.txt | 71 +++
.../devicetree/bindings/reset/fsl,imx7-src.txt | 47 ++
.../bindings/soc/ti/sci-pm-domain.txt | 57 +++
MAINTAINERS | 6 +
arch/arm/common/Kconfig | 3 -
arch/arm/common/Makefile | 1 -
arch/arm/mach-imx/gpc.c | 217 --------
arch/arm/mach-keystone/Kconfig | 1 +
arch/arm/mach-keystone/pm_domain.c | 4 +-
arch/arm/mach-tegra/Makefile | 1 -
arch/arm/mach-tegra/cpuidle-tegra20.c | 3 +-
arch/arm/mach-tegra/platsmp.c | 2 +-
arch/arm/mach-tegra/pm.c | 2 +-
arch/arm/mach-tegra/reset-handler.S | 2 +-
arch/arm/mach-tegra/sleep-tegra20.S | 3 +-
arch/arm/mach-tegra/sleep-tegra30.S | 2 +-
arch/arm/mach-tegra/sleep.S | 2 -
arch/arm/mach-tegra/tegra.c | 2 -
arch/arm/plat-versatile/include/plat/clock.h | 15 -
drivers/ata/Kconfig | 9 +
drivers/ata/Makefile | 1 +
drivers/ata/pata_bk3710.c | 382 +++++++++++++++
drivers/base/power/domain.c | 2 -
drivers/base/soc.c | 52 +-
drivers/clk/versatile/Kconfig | 3 +
drivers/clk/versatile/Makefile | 2 +-
drivers/clk/versatile/clk-icst.c | 1 +
drivers/clk/versatile/clk-icst.h | 2 -
drivers/clk/versatile/clk-impd1.c | 1 +
drivers/clk/versatile/clk-realview.c | 1 +
drivers/clk/versatile/clk-versatile.c | 1 +
.../arm/common => drivers/clk/versatile}/icst.c | 2 +-
.../hardware => drivers/clk/versatile}/icst.h | 6 +-
drivers/firmware/arm_scpi.c | 7 +-
drivers/firmware/meson/meson_sm.c | 20 +-
drivers/firmware/qcom_scm-32.c | 18 +
drivers/firmware/qcom_scm-64.c | 58 +++
drivers/firmware/qcom_scm.c | 18 +
drivers/firmware/qcom_scm.h | 11 +
drivers/nvmem/meson-efuse.c | 2 +-
drivers/reset/Kconfig | 14 +
drivers/reset/Makefile | 3 +
drivers/reset/reset-a10sr.c | 138 ++++++
drivers/reset/reset-ath79.c | 27 +-
drivers/reset/reset-imx7.c | 158 ++++++
drivers/reset/reset-meson.c | 12 +-
drivers/reset/reset-oxnas.c | 6 +-
drivers/reset/reset-pistachio.c | 9 +-
drivers/reset/reset-socfpga.c | 13 +-
drivers/reset/reset-sunxi.c | 18 +-
drivers/reset/reset-uniphier.c | 37 +-
drivers/soc/Kconfig | 1 +
drivers/soc/Makefile | 1 +
drivers/soc/bcm/brcmstb/common.c | 9 +
drivers/soc/imx/Kconfig | 9 +
drivers/soc/imx/Makefile | 2 +
drivers/soc/imx/gpc.c | 489 +++++++++++++++++++
drivers/soc/imx/gpcv2.c | 363 ++++++++++++++
drivers/soc/renesas/r8a7795-sysc.c | 26 +-
drivers/soc/renesas/rcar-sysc.c | 25 +-
drivers/soc/renesas/rcar-sysc.h | 10 +
drivers/soc/renesas/renesas-soc.c | 18 +-
drivers/soc/samsung/Kconfig | 8 +-
drivers/soc/samsung/Makefile | 4 +-
drivers/soc/samsung/exynos-pmu.c | 22 +-
drivers/soc/samsung/exynos-pmu.h | 3 +
drivers/soc/tegra/Kconfig | 22 +
drivers/soc/tegra/Makefile | 4 +-
.../mach-tegra => drivers/soc/tegra}/flowctrl.c | 87 +++-
drivers/soc/tegra/fuse/fuse-tegra.c | 4 +-
drivers/soc/tegra/pmc-tegra186.c | 169 +++++++
drivers/soc/ti/Kconfig | 12 +
drivers/soc/ti/Makefile | 1 +
drivers/soc/ti/ti_sci_pm_domains.c | 202 ++++++++
drivers/soc/zte/zx296718_pm_domains.c | 1 -
drivers/soc/zte/zx2967_pm_domains.c | 4 +-
include/dt-bindings/genpd/k2g.h | 90 ++++
include/dt-bindings/power/imx7-power.h | 16 +
include/dt-bindings/power/r8a7795-sysc.h | 2 +-
include/dt-bindings/reset/altr,rst-mgr-a10sr.h | 33 ++
include/dt-bindings/reset/imx7-reset.h | 62 +++
include/linux/firmware/meson/meson_sm.h | 4 +-
include/linux/pm_domain.h | 1 +
include/linux/qcom_scm.h | 6 +
.../mach-tegra => include/soc/tegra}/flowctrl.h | 32 +-
include/soc/tegra/pmc.h | 29 +-
88 files changed, 2937 insertions(+), 428 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.txt
create mode 100644 Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt
create mode 100644 Documentation/devicetree/bindings/reset/fsl,imx7-src.txt
create mode 100644 Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
delete mode 100644 arch/arm/plat-versatile/include/plat/clock.h
create mode 100644 drivers/ata/pata_bk3710.c
rename {arch/arm/common => drivers/clk/versatile}/icst.c (98%)
rename {arch/arm/include/asm/hardware => drivers/clk/versatile}/icst.h (94%)
create mode 100644 drivers/reset/reset-a10sr.c
create mode 100644 drivers/reset/reset-imx7.c
create mode 100644 drivers/soc/imx/Kconfig
create mode 100644 drivers/soc/imx/Makefile
create mode 100644 drivers/soc/imx/gpc.c
create mode 100644 drivers/soc/imx/gpcv2.c
rename {arch/arm/mach-tegra => drivers/soc/tegra}/flowctrl.c (67%)
create mode 100644 drivers/soc/tegra/pmc-tegra186.c
create mode 100644 drivers/soc/ti/ti_sci_pm_domains.c
create mode 100644 include/dt-bindings/genpd/k2g.h
create mode 100644 include/dt-bindings/power/imx7-power.h
create mode 100644 include/dt-bindings/reset/altr,rst-mgr-a10sr.h
create mode 100644 include/dt-bindings/reset/imx7-reset.h
rename {arch/arm/mach-tegra => include/soc/tegra}/flowctrl.h (77%)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PULL 5/7] ARM: SoC driver updates
2015-02-17 17:41 ` Linus Torvalds
@ 2015-02-17 17:57 ` Olof Johansson
0 siblings, 0 replies; 7+ messages in thread
From: Olof Johansson @ 2015-02-17 17:57 UTC (permalink / raw)
To: Linus Torvalds; +Cc: ARM SoC, Linux Kernel Mailing List, linux-arm-kernel
On Tue, Feb 17, 2015 at 9:41 AM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Tue, Feb 17, 2015 at 12:33 AM, Olof Johansson <olof@lixom.net> wrote:
>>
>> Conflicts:
>>
>> arch/arm/boot/dts/rk3288.dtsi: add/add: Keep both sides
> ...
>
> You mixed up the aliases of this pull and the previous DT pull.
>
> Not a real problem, but while resolving the DT aliases (which you
> claimed had "No conflicts") I was wondering just what you had been
> doing..
Whoops, sorry for that. I took merge conflict notes in a separate
window and copied and pasted, and did it into the wrong email.
-Olof
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [GIT PULL 5/7] ARM: SoC driver updates
2015-02-17 8:33 ` [GIT PULL 5/7] ARM: SoC driver updates Olof Johansson
@ 2015-02-17 17:41 ` Linus Torvalds
2015-02-17 17:57 ` Olof Johansson
0 siblings, 1 reply; 7+ messages in thread
From: Linus Torvalds @ 2015-02-17 17:41 UTC (permalink / raw)
To: Olof Johansson; +Cc: ARM SoC, Linux Kernel Mailing List, linux-arm-kernel
On Tue, Feb 17, 2015 at 12:33 AM, Olof Johansson <olof@lixom.net> wrote:
>
> Conflicts:
>
> arch/arm/boot/dts/rk3288.dtsi: add/add: Keep both sides
...
You mixed up the aliases of this pull and the previous DT pull.
Not a real problem, but while resolving the DT aliases (which you
claimed had "No conflicts") I was wondering just what you had been
doing..
Linus
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL 5/7] ARM: SoC driver updates
2015-02-17 8:33 [GIT PULL 0/7] ARM: SoC changes for 3.20 Olof Johansson
@ 2015-02-17 8:33 ` Olof Johansson
2015-02-17 17:41 ` Linus Torvalds
0 siblings, 1 reply; 7+ messages in thread
From: Olof Johansson @ 2015-02-17 8:33 UTC (permalink / raw)
To: torvalds; +Cc: arm, linux-kernel, linux-arm-kernel, Olof Johansson
These are changes for drivers that are intimately tied to some SoC
and for some reason could not get merged through the respective
subsystem maintainer tree.
This time around, much of this is for at91, with the bulk of it being syscon
and udc drivers.
Also, there's:
- coupled cpuidle support for Samsung Exynos4210
- Renesas 73A0 common-clk work
- of/platform changes to tear down DMA mappings on device destruction
- a few updates to the TI Keystone knav code
Conflicts:
arch/arm/boot/dts/rk3288.dtsi: add/add: Keep both sides
arch/arm/boot/dts/stih407-family.dtsi: Duplicate patch causes context
mismatch, keep branch contents
arch/arm/boot/dts/stih410.dtsi: Duplicate patch causes context mismatch,
keep branch contents
arch/arm/boot/dts/sun5i-a13.dtsi: add/remove: Remove aliases, keep chosen
arch/arm/boot/dts/sun8i-a23.dtsi: add/remove: Remove aliases, keep chosen
----------------------------------------------------------------
The following changes since commit eaa27f34e91a14cdceed26ed6c6793ec1d186115:
linux 3.19-rc4 (2015-01-11 12:44:53 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/drivers-for-linus
for you to fetch changes up to 6f4554bdff6870c9e0f0b152bbec71d7a0f366f1:
Merge tag 'samsung-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
----------------------------------------------------------------
Alexandre Belloni (1):
pcmcia: at91_cf: depend on !ARCH_MULTIPLATFORM
Bartlomiej Zolnierkiewicz (2):
ARM: EXYNOS: apply S5P_CENTRAL_SEQ_OPTION fix only when necessary
cpuidle: exynos: add coupled cpuidle support for exynos4210
Boris Brezillon (12):
mfd: syscon: Add atmel-matrix registers definition
mfd: syscon: Add Atmel Matrix bus DT binding documentation
mfd: syscon: Add atmel-smc registers definition
mfd: syscon: Add Atmel SMC binding doc
usb: gadget: at91_udc: Fix clock names
usb: gadget: at91_udc: Drop uclk clock
usb: gadget: at91_udc: Document DT clocks and clock-names property
usb: gadget: at91_udc: Remove non-DT handling code
usb: gadget: at91_udc: Simplify probe and remove functions
usb: gadget: at91_udc: Rework for multi-platform kernel support
usb: gadget: at91_udc: Update DT binding documentation
usb: gadget: at91_udc: Allocate udc instance
Murali Karicheri (3):
soc: ti: knav_qmss_queue: export API calls for use by user driver
soc: ti: knav_qmss_queue: makefile tweak to build as dynamic module
soc: ti: knav_qmss_queue: change knav_range_setup_acc_irq to static
Olof Johansson (5):
Merge tag 'renesas-sh73a0-ccf-for-v3.20' of git://git.kernel.org/.../horms/renesas into next/drivers
Merge tag 'at91-drivers' of git://git.kernel.org/.../nferre/linux-at91 into next/drivers
Merge tag 'renesas-sh73a0-ccf2-for-v3.20' of git://git.kernel.org/.../horms/renesas into next/drivers
Merge tag 'drivers-soc-ti' of git://git.kernel.org/.../ssantosh/linux-keystone into next/drivers
Merge tag 'samsung-cpuidle' of git://git.kernel.org/.../kgene/linux-samsung into next/drivers
Ulrich Hecht (6):
clk: shmobile: sh73a0 common clock framework implementation
ARM: shmobile: sh73a0: Add CPG register bits header
ARM: shmobile: sh73a0: Common clock framework DT description
ARM: shmobile: kzm9g-reference: Common clock framework DT description
ARM: shmobile: sh73a0: add MSTP clock assignments to DT
ARM: shmobile: sh73a0: disable legacy clock initialization
Wei Yongjun (1):
clk: shmobile: fix sparse NULL pointer warning
Will Deacon (1):
of/platform: teardown DMA mappings on device destruction
.../clock/renesas,sh73a0-cpg-clocks.txt | 35 ++
.../devicetree/bindings/mfd/atmel-matrix.txt | 24 +
.../devicetree/bindings/mfd/atmel-smc.txt | 19 +
.../devicetree/bindings/usb/atmel-usb.txt | 10 +-
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 4 +
arch/arm/boot/dts/sh73a0.dtsi | 358 +++++++++++++
arch/arm/mach-exynos/common.h | 4 +
arch/arm/mach-exynos/exynos.c | 4 +
arch/arm/mach-exynos/platsmp.c | 2 +-
arch/arm/mach-exynos/pm.c | 133 ++++-
arch/arm/mach-exynos/suspend.c | 4 +
arch/arm/mach-shmobile/setup-sh73a0.c | 5 +-
drivers/clk/shmobile/Makefile | 1 +
drivers/clk/shmobile/clk-sh73a0.c | 218 ++++++++
drivers/cpuidle/Kconfig.arm | 1 +
drivers/cpuidle/cpuidle-exynos.c | 76 ++-
drivers/of/platform.c | 1 +
drivers/pcmcia/Kconfig | 1 +
drivers/soc/ti/Makefile | 3 +-
drivers/soc/ti/knav_qmss_acc.c | 2 +-
drivers/soc/ti/knav_qmss_queue.c | 9 +
drivers/usb/gadget/udc/Kconfig | 1 +
drivers/usb/gadget/udc/at91_udc.c | 525 ++++++++++---------
drivers/usb/gadget/udc/at91_udc.h | 9 +-
include/dt-bindings/clock/sh73a0-clock.h | 79 +++
include/linux/mfd/syscon/atmel-matrix.h | 117 +++++
include/linux/mfd/syscon/atmel-smc.h | 173 ++++++
include/linux/platform_data/cpuidle-exynos.h | 20 +
28 files changed, 1570 insertions(+), 268 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/renesas,sh73a0-cpg-clocks.txt
create mode 100644 Documentation/devicetree/bindings/mfd/atmel-matrix.txt
create mode 100644 Documentation/devicetree/bindings/mfd/atmel-smc.txt
create mode 100644 drivers/clk/shmobile/clk-sh73a0.c
create mode 100644 include/dt-bindings/clock/sh73a0-clock.h
create mode 100644 include/linux/mfd/syscon/atmel-matrix.h
create mode 100644 include/linux/mfd/syscon/atmel-smc.h
create mode 100644 include/linux/platform_data/cpuidle-exynos.h
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-07-05 12:31 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-04 14:24 [GIT PULL 5/7] ARM: SoC driver updates Arnd Bergmann
2017-07-04 21:53 ` Linus Torvalds
2017-07-05 12:31 ` Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2017-05-09 6:52 [GIT PULL 0/7] ARM: SoC contents for 4.12 merge window Olof Johansson
2017-05-09 6:52 ` [GIT PULL 5/7] ARM: SoC driver updates Olof Johansson
2015-02-17 8:33 [GIT PULL 0/7] ARM: SoC changes for 3.20 Olof Johansson
2015-02-17 8:33 ` [GIT PULL 5/7] ARM: SoC driver updates Olof Johansson
2015-02-17 17:41 ` Linus Torvalds
2015-02-17 17:57 ` Olof Johansson
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).