From: Linus Torvalds Date: Thu, 17 Dec 2020 00:22:36 +0000 (-0800) Subject: Merge tag 'arm-soc-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc X-Git-Tag: v5.15~2146 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b06db0b3936956352a6ff693ea589bd4671c071d;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'arm-soc-5.11' of git://git./linux/kernel/git/soc/soc Pull ARM SoC updates from Arnd Bergmann: "These are updates for SoC specific code, mostly in the 32-bit architecture: - A rework for handling MMIO accesses in Renesas SoCs in a more portable way - Updates to SoC version detection in NXP i.MX SoCs. - Smaller bug fixes for OMAP, Samsung, Marvell, Amlogic" * tag 'arm-soc-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (24 commits) arm64: Kconfig: meson: drop pinctrl ARM: mxs: Add serial number support for i.MX23, i.MX28 SoCs MAINTAINERS: switch mvebu tree to kernel.org MAINTAINERS: Add an entry for MikroTik CRS3xx 98DX3236 boards ARM: shmobile: Stop using __raw_*() I/O accessors ARM: shmobile: sh73a0: Remove obsolete static mapping ARM: shmobile: sh73a0: Use ioremap() to map SMP registers ARM: shmobile: sh73a0: Use ioremap() to map L2C registers ARM: shmobile: r8a7779: Remove obsolete static mappings ARM: shmobile: r8a7779: Use ioremap() to map SMP registers ARM: shmobile: r8a7779: Use ioremap() to map INTC2 registers ARM: shmobile: r8a7778: Introduce HPBREG_BASE ARM: OMAP1: clock: Use IS_ERR_OR_NULL() to clean code ARM: OMAP2+: Remove redundant null check before clk_prepare_enable/clk_disable_unprepare ARM: OMAP2+: Remove redundant assignment to variable ret ARM: OMAP2+: Fix kfree NULL pointer in omap2xxx_clkt_vps_init ARM: OMAP2+: Fix memleak in omap2xxx_clkt_vps_init ARM: exynos: extend cpuidle support to P4 Note boards ARM: imx: mach-imx6q: correctly identify i.MX6QP SoCs ARM: imx: imx7ulp: Add a comment explaining the B2 silicon version ... --- b06db0b3936956352a6ff693ea589bd4671c071d diff --cc MAINTAINERS index f81d598,08628ee..00e85fa --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -11780,17 -11626,17 +11780,28 @@@ M: Oliver Neukum + M: Luka Perkov + S: Maintained + F: arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts + F: arch/arm/boot/dts/armada-xp-crs305-1g-4s.dts + F: arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts + F: arch/arm/boot/dts/armada-xp-crs326-24g-2s.dts + F: arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts + F: arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dts + +MIPI CCS, SMIA AND SMIA++ IMAGE SENSOR DRIVER +M: Sakari Ailus +L: linux-media@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml +F: Documentation/driver-api/media/drivers/ccs/ +F: drivers/media/i2c/ccs-pll.c +F: drivers/media/i2c/ccs-pll.h +F: drivers/media/i2c/ccs/ +F: include/uapi/linux/smiapp.h + MIPS M: Thomas Bogendoerfer L: linux-mips@vger.kernel.org