Most of these are for MMP (seeing a bunch of cleanups and refactorings
for the first time in a while), and for OMAP (a bunch of cleanups and
added support for voltage controller on OMAP4430).
Conflicts:
include/Kbuild: File deleted in mainline, just git rm here as well.
----------------------------------------------------------------
The following changes since commit 2f13437b8917627119d163d62f73e7a78a92303a:
Merge tag 'trace-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/armsoc-soc
for you to fetch changes up to ab818f0999dc73af3f966194d087e9f6650f939f:
Merge tag 'omap-for-v5.5/maintainers-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc
----------------------------------------------------------------
Adam Ford (1):
MAINTAINERS: Add logicpd-som-lv and logicpd-torpedo to OMAP TREE
Andreas Färber (2):
MAINTAINERS: Add mailing list for Realtek SoCs
arm64: realtek: Select reset controller
Andrey Smirnov (1):
ARM: imx: Drop imx_anatop_usb_chrg_detect_disable()
Anson Huang (1):
ARM: imx: Add serial number support for i.MX6/7 SoCs
Ben Dooks (6):
ARM: bcm: include local platsmp.h for bcm2836_smp_ops
ARM: bcm: fix missing __iomem in bcm_kona_smc.c
ARM: OMAP2+: do not export am43xx_control functions
ARM: OMAP2+: make dra7xx_sha0_hwmod static
ARM: OMAP2+: prm44xx: make prm_{save,restore}_context static
ARM: OMAP2+: make omap44xx_sha0_hwmod and omap44xx_l3_main_2__des static
Ben Dooks (Codethink) (1):
OMAP2: fixup doc comments in omap_device
Dmitry Osipenko (2):
ARM: tegra: Fix FLOW_CTLR_HALT register clobbering by tegra_resume()
ARM: tegra: Use WFE for power-gating on Tegra30
Florian Fainelli (1):
Merge tag 'tags/bcm2835-soc-next-2019-10-15' into soc/next
Geert Uytterhoeven (1):
ARM: shmobile: rcar-gen2: Drop legacy DT clock support
Jonathan Neuschäfer (1):
ARM: OMAP1: ams-delta FIQ: Fix a typo ("Initiaize")
Kefeng Wang (1):
ARM: hisi: drop useless depend on ARCH_MULTI_V7
Krzysztof Kozlowski (2):
ARM: s3c: Rename s3c64xx_spi_setname() function
ARM: s3c: Rename s5p_usb_phy functions
Lubomir Rintel (10):
ARM: l2c: add definition for FWA in PL310 aux register
ARM: mmp: don't select CACHE_TAUROS2 on all ARCH_MMP
ARM: mmp: map the PGU as well
ARM: mmp: DT: convert timer driver to use TIMER_OF_DECLARE
ARM: mmp: define MMP_CHIPID by the means of CIU_REG()
ARM: mmp: add support for MMP3 SoC
ARM: mmp: add SMP support
ARM: mmp: move cputype.h to include/linux/soc/
ARM: mmp: remove MMP3 USB PHY registers from regs-usb.h
MAINTAINERS: mmp: add Git repository
Markus Elfring (1):
ARM: OMAP2+: Add missing put_device() call in omapdss_init_of()
Mihaela Martinas (1):
arm64: Introduce config for S32
Olof Johansson (11):
Merge tag 'mmp-soc-for-v5.5-2' of git://git.kernel.org/.../lkundrak/linux-mmp into arm/soc
Merge tag 'arm-soc/for-5.5/soc' of https://github.com/Broadcom/stblinux into arm/soc
Merge tag 'omap-for-v5.5/soc-signed' of git://git.kernel.org/.../tmlind/linux-omap into arm/soc
Merge tag 'realtek-arm64-soc-for-5.5' of git://git.kernel.org/.../afaerber/linux-realtek into arm/soc
Merge tag 'hisi-armv7-soc-for-5.5' of git://github.com/hisilicon/linux-hisi into arm/soc
Merge tag 'renesas-arm-soc-for-v5.5-tag1' of git://git.kernel.org/.../geert/renesas-devel into arm/soc
Merge tag 'tegra-for-5.5-arm-core' of git://git.kernel.org/.../tegra/linux into arm/soc
Merge tag 'samsung-soc-5.5' of https://git.kernel.org/.../krzk/linux into arm/soc
Merge tag 'imx-soc-5.5' of git://git.kernel.org/.../shawnguo/linux into arm/soc
Merge tag 'omap-for-v5.5/soc-late-signed' of git://git.kernel.org/.../tmlind/linux-omap into arm/soc
Merge tag 'omap-for-v5.5/maintainers-signed' of git://git.kernel.org/.../tmlind/linux-omap into arm/soc
Sebastian Reichel (1):
ARM: OMAP2+: pdata-quirks: drop TI_ST/KIM support
Stefan Agner (1):
ARM: imx: use generic function to exit coherency
Stefan Wahren (1):
ARM: bcm: Add support for BCM2711 SoC
Sylwester Nawrocki (1):
ARM: exynos: Enable exynos-asv driver for ARCH_EXYNOS
Tao Ren (1):
ARM: ASPEED: update default ARCH_NR_GPIO for ARCH_ASPEED
Tony Lindgren (14):
ARM: OMAP2+: Remove unused wakeup_cpu
ARM: OMAP2+: Drop bogus wkup domain oswr setting
ARM: OMAP2+: Remove bogus warnings for machines without twl PMIC
ARM: OMAP2+: Update 4430 voltage controller operating points
ARM: OMAP2+: Configure voltage controller for cpcap
ARM: OMAP2+: Allow per oswr for omap4
ARM: OMAP2+: Allow core oswr for omap4
ARM: OMAP2+: Initialize voltage controller for omap4
ARM: OMAP2+: Drop unused enable_wakeup and disable_wakeup
ARM: OMAP2+: Simplify code for clkdm_clock_enable and disable
ARM: OMAP2+: Configure voltage controller for retention
ARM: OMAP2+: Configure voltage controller for cpcap to low-speed
Merge branch 'omap-for-v5.5/pm' into omap-for-v5.5/soc
Merge branch 'omap-for-v5.5/omap1' into omap-for-v5.5/soc
Uwe Kleine-König (1):
ARM: OMAP1: drop duplicated dependency on ARCH_OMAP1
YueHaibing (2):
ARM: OMAP2+: Make some functions static
ARM: OMAP2+: Remove duplicated include from pmic-cpcap.c
MAINTAINERS | 5 +
arch/arm/Kconfig | 2 +-
arch/arm/include/asm/hardware/cache-l2x0.h | 2 +
arch/arm/mach-bcm/Kconfig | 4 +-
arch/arm/mach-bcm/Makefile | 3 +-
arch/arm/mach-bcm/bcm2711.c | 24 ++
arch/arm/mach-bcm/bcm_kona_smc.c | 2 +-
arch/arm/mach-bcm/platsmp.c | 2 +
arch/arm/mach-exynos/Kconfig | 1 +
arch/arm/mach-hisi/Kconfig | 16 +-
arch/arm/mach-imx/anatop.c | 20 +-
arch/arm/mach-imx/cpu.c | 38 ++-
arch/arm/mach-imx/hotplug.c | 24 +-
arch/arm/mach-mmp/Kconfig | 22 +-
arch/arm/mach-mmp/Makefile | 4 +
arch/arm/mach-mmp/addr-map.h | 7 +
arch/arm/mach-mmp/common.c | 19 +-
arch/arm/mach-mmp/common.h | 1 +
arch/arm/mach-mmp/devices.c | 2 +-
arch/arm/mach-mmp/mmp-dt.c | 5 +-
arch/arm/mach-mmp/mmp2-dt.c | 7 +-
arch/arm/mach-mmp/mmp2.c | 2 +-
arch/arm/mach-mmp/mmp3.c | 29 ++
arch/arm/mach-mmp/platsmp.c | 32 +++
arch/arm/mach-mmp/pm-mmp2.c | 2 +-
arch/arm/mach-mmp/pm-pxa910.c | 2 +-
arch/arm/mach-mmp/pxa168.c | 2 +-
arch/arm/mach-mmp/pxa910.c | 2 +-
arch/arm/mach-mmp/regs-usb.h | 94 -------
arch/arm/mach-mmp/time.c | 43 +--
arch/arm/mach-omap1/Kconfig | 33 +--
arch/arm/mach-omap1/ams-delta-fiq.c | 2 +-
arch/arm/mach-omap2/Makefile | 5 +
arch/arm/mach-omap2/clockdomain.c | 78 ++----
arch/arm/mach-omap2/control.c | 4 +-
arch/arm/mach-omap2/control.h | 1 +
arch/arm/mach-omap2/display.c | 1 +
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 -
arch/arm/mach-omap2/omap_device.c | 19 +-
arch/arm/mach-omap2/omap_hwmod.c | 97 -------
arch/arm/mach-omap2/omap_hwmod.h | 3 -
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 4 +-
arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 +-
arch/arm/mach-omap2/omap_twl.c | 8 +-
arch/arm/mach-omap2/opp4xxx_data.c | 16 +-
arch/arm/mach-omap2/pdata-quirks.c | 52 ----
arch/arm/mach-omap2/pm.c | 1 +
arch/arm/mach-omap2/pm.h | 14 +
arch/arm/mach-omap2/pm44xx.c | 13 +-
arch/arm/mach-omap2/pmic-cpcap.c | 271 +++++++++++++++++++
arch/arm/mach-omap2/prm44xx.c | 4 +-
arch/arm/mach-omap2/vc.c | 57 +++-
arch/arm/mach-omap2/vc.h | 2 +-
arch/arm/mach-s3c24xx/s3c2416.c | 2 +-
arch/arm/mach-s3c24xx/s3c2443.c | 2 +-
arch/arm/mach-s3c24xx/spi-core.h | 2 +-
arch/arm/mach-s3c64xx/setup-usb-phy.c | 4 +-
arch/arm/mach-shmobile/setup-rcar-gen2.c | 1 -
arch/arm/mach-tegra/reset-handler.S | 6 +-
arch/arm/mach-tegra/sleep-tegra30.S | 4 +-
arch/arm/mm/Kconfig | 2 +-
arch/arm/plat-samsung/devs.c | 4 +-
arch/arm/plat-samsung/include/plat/usb-phy.h | 4 +-
arch/arm64/Kconfig.platforms | 11 +-
drivers/clk/Kconfig | 5 +
drivers/clk/mmp/Makefile | 2 +-
drivers/soc/tegra/flowctrl.c | 19 +-
.../linux/soc/mmp}/cputype.h | 27 ++
68 files changed, 708 insertions(+), 494 deletions(-)
create mode 100644 arch/arm/mach-bcm/bcm2711.c
create mode 100644 arch/arm/mach-mmp/mmp3.c
create mode 100644 arch/arm/mach-mmp/platsmp.c
create mode 100644 arch/arm/mach-omap2/pmic-cpcap.c
rename {arch/arm/mach-mmp => include/linux/soc/mmp}/cputype.h (71%)
We keep this in a separate branch to avoid cross-branch conflicts, but
most of the material here is fairly boring -- some new drivers turned on
for hardware since they were merged, and some refreshed files due to
time having moved a lot of entries around.
Conflicts: None
----------------------------------------------------------------
The following changes since commit 77dde8ce535d53cab7ff0655db6e00735e52b41c:
Merge branch 'arm/dt' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/armsoc-defconfig
for you to fetch changes up to a235f803dbc878d1db83cbaabf6963ca9ef3a1a2:
Merge tag 'aspeed-5.5-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into arm/defconfig
----------------------------------------------------------------
Adam Ford (4):
ARM: omap2plus_defconfig: Update for removed items
ARM: omap2plus_defconfig: Update for moved item
ARM: omap2plus_defconfig: Enable HW Crypto engine modules
configs: omap2plus: Enable VIDEO_MT9P031 module
Alexandre Belloni (1):
ARM: configs: at91: unselect PIT
Anson Huang (2):
ARM: imx_v6_v7_defconfig: Enable CONFIG_IMX7ULP_WDT by default
arm64: defconfig: Enable CONFIG_KEYBOARD_IMX_SC_KEY as module
Biju Das (1):
arm64: defconfig: Enable R8A774B1 SoC
Brian Masney (1):
ARM: qcom_defconfig: add ocmem support
Corentin Labbe (2):
ARM: configs: sunxi: add new Allwinner crypto options
arm64: defconfig: add new Allwinner crypto options
Dinh Nguyen (2):
arm64: defconfig: enable the Cadence QSPI controller
arm64: defconfig: enable Altera GPIO controller
Dmitry Osipenko (1):
ARM: tegra: Enable Tegra VDE driver in tegra_defconfig
Fabio Estevam (1):
ARM: imx_v6_v7_defconfig: Enable CONFIG_TOUCHSCREEN_DA9052
Geert Uytterhoeven (2):
arm64: defconfig: Enable R8A77961 SoC
ARM: shmobile: defconfig: Refresh for v5.4-rc1
Joel Stanley (5):
ARM: config: aspeed-g5: Enable 8250_DW quirks
ARM: config: aspeed-g5: Add SGPIO and FSI drivers
ARM: config: aspeed-g4: Add MMC, and cleanup
ARM: configs: multi_v7: ASPEED network, gpio, FSI
ARM: config: multi_v5: ASPEED SDHCI, SGPIO
Krzysztof Kozlowski (2):
ARM: multi_v7_defconfig: Enable options for boards with Exynos SoC
ARM: multi_v7_defconfig: Enable Exynos bus and memory frequency scaling (devfreq)
Leonard Crestez (1):
ARM: imx_v6_v7_defconfig: Build USB_CONFIGFS into kernel
Lubomir Rintel (1):
ARM: multi_v7_defconfig: enable MMP platforms
Lukasz Luba (1):
ARM: exynos_defconfig: Enable DMC driver
Manivannan Sadhasivam (1):
arm64: configs: Enable Actions Semi platform in defconfig
Mihaela Martinas (1):
arm64: defconfig: Enable configs for S32V234
Olivier Moysan (1):
ARM: multi_v7_defconfig: Enable audio support for stm32mp157
Olof Johansson (15):
Merge tag 'renesas-arm64-defconfig-for-v5.5-tag1' of git://git.kernel.org/.../geert/renesas-devel into arm/defconfig
Merge tag 'samsung-defconfig-5.5' of https://git.kernel.org/.../krzk/linux into arm/defconfig
Merge tag 'omap-for-v5.4/fixes-rc3-signed' of git://git.kernel.org/.../tmlind/linux-omap into arm/fixes
Merge tag 'omap-for-v5.5/defconfig-signed' of git://git.kernel.org/.../tmlind/linux-omap into arm/defconfig
Merge tag 'arm64_defconfig_for_v5.5' of git://git.kernel.org/.../dinguyen/linux into arm/defconfig
Merge tag 'hisi-arm64-defconfig-for-5.5' of git://github.com/hisilicon/linux-hisi into arm/defconfig
Merge tag 'renesas-arm-defconfig-for-v5.5-tag1' of git://git.kernel.org/.../geert/renesas-devel into arm/defconfig
Merge tag 'renesas-arm64-defconfig-for-v5.5-tag2' of git://git.kernel.org/.../geert/renesas-devel into arm/defconfig
Merge tag 'sunxi-config-for-5.5-2' of https://git.kernel.org/.../sunxi/linux into arm/defconfig
Merge tag 'sunxi-config64-for-5.5-1' of https://git.kernel.org/.../sunxi/linux into arm/defconfig
Merge tag 'tegra-for-5.5-arm-defconfig' of git://git.kernel.org/.../tegra/linux into arm/defconfig
Merge tag 'imx-defconfig-5.5' of git://git.kernel.org/.../shawnguo/linux into arm/defconfig
Merge tag 'qcom-defconfig-for-5.5' of git://git.kernel.org/.../qcom/linux into arm/defconfig
Merge tag 'at91-5.5-defconfig' of git://git.kernel.org/.../at91/linux into arm/defconfig
Merge tag 'aspeed-5.5-defconfig' of git://git.kernel.org/.../joel/aspeed into arm/defconfig
Peng Fan (1):
arm64: defconfig: Change CONFIG_AT803X_PHY from m to y
Priit Laes (1):
ARM: configs: sunxi: Enable MICREL_PHY
Richard Gong (1):
arm64: defconfig: enable rsu driver
Sylwester Nawrocki (1):
ARM: exynos_defconfig: Enable Arndale audio driver
Zhou Wang (2):
arm64: defconfig: Enable HiSilicon ZIP controller
arm64: defconfig: Enable SMMU v3 PMCG
arch/arm/configs/aspeed_g4_defconfig | 18 ++++++++-----
arch/arm/configs/aspeed_g5_defconfig | 4 +++
arch/arm/configs/at91_dt_defconfig | 1 +
arch/arm/configs/exynos_defconfig | 2 ++
arch/arm/configs/imx_v6_v7_defconfig | 4 ++-
arch/arm/configs/multi_v5_defconfig | 4 +++
arch/arm/configs/multi_v7_defconfig | 45 ++++++++++++++++++++++++++++++-
arch/arm/configs/omap2plus_defconfig | 10 ++++---
arch/arm/configs/qcom_defconfig | 1 +
arch/arm/configs/sama5_defconfig | 1 +
arch/arm/configs/shmobile_defconfig | 3 ---
arch/arm/configs/sunxi_defconfig | 3 +++
arch/arm/configs/tegra_defconfig | 2 ++
arch/arm64/configs/defconfig | 16 ++++++++++-
14 files changed, 98 insertions(+), 16 deletions(-)
The pull request you sent on Thu, 5 Dec 2019 10:04:53 -0800:
> git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/armsoc-defconfig
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b08baef02b26cf7c2123e4a24a2fa1fb7a593ffb
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
The pull request you sent on Thu, 5 Dec 2019 10:04:50 -0800:
> git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/armsoc-soc
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/38206c24ab09b4f4c2a57de5c1af0bb2e69cf5b6
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker