Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc (4c4a5c99) · Commits · 戴 / test

Pull ARM SoC late updates from Olof Johansson: "This is some material that we picked up into our tree late. Most of it are smaller fixes and additions, some defconfig updates due to recent development, etc. Code-wise the largest portion is a series of PM updates for the at91 platform, and those have been in linux-next a while through the at91 tree before we picked them up" * tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (29 commits) arm64: dts: sprd: Add clock properties for serial devices Opt out of scripts/get_maintainer.pl ARM: ixp4xx: Remove duplicated include from common.c soc: ixp4xx: qmgr: Fix an NULL vs IS_ERR() check in probe arm64: tegra: Disable XUSB support on Jetson TX2 arm64: tegra: Enable SMMU translation for PCI on Tegra186 arm64: tegra: Fix insecure SMMU users for Tegra186 arm64: tegra: Select ARM_GIC_PM amba: tegra-ahb: Mark PM functions as __maybe_unused ARM: dts: logicpd-som-lv: Fix MMC1 card detect ARM: mvebu: drop return from void function ARM: mvebu: prefix coprocessor operand with p ARM: mvebu: drop unnecessary label ARM: mvebu: fix a leaked reference by adding missing of_node_put ARM: socfpga_defconfig: enable LTC2497 ARM: mvebu: kirkwood: remove error message when retrieving mac address ARM: at91: sama5: make ov2640 as a module ARM: OMAP1: ams-delta: fix early boot crash when LED support is disabled ARM: at91: remove HAVE_FB_ATMEL for sama5 SoC as they use DRM soc/fsl/qe: Fix an error code in qe_pin_request() ...

.get_maintainer.ignore

+1 −0

Original line number	Diff line number	Diff line
		Christoph Hellwig <hch@lst.de>
		Marc Gonzalez <marc.w.gonzalez@free.fr>

Documentation/devicetree/bindings/arm/atmel-at91.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ compatible: must be one of:
		o "atmel,at91sam9n12"
		o "atmel,at91sam9rl"
		o "atmel,at91sam9xe"
		o "microchip,sam9x60"
		* "atmel,sama5" for SoCs using a Cortex-A5, shall be extended with the specific
		SoC family:
		o "atmel,sama5d2" shall be extended with the specific SoC compatible:

arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@
		pinctrl-names = "default";
		pinctrl-0 = <&mmc1_pins>;
		wp-gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>; /* gpio_126 */
		cd-gpios = <&gpio4 14 IRQ_TYPE_LEVEL_LOW>; /* gpio_110 */
		cd-gpios = <&gpio4 14 GPIO_ACTIVE_LOW>; /* gpio_110 */
		vmmc-supply = <&vmmc1>;
		bus-width = <4>;
		cap-power-off-card;

arch/arm/configs/sama5_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
		CONFIG_V4L_PLATFORM_DRIVERS=y
		CONFIG_SOC_CAMERA=y
		CONFIG_VIDEO_ATMEL_ISI=y
		CONFIG_SOC_CAMERA_OV2640=y
		CONFIG_SOC_CAMERA_OV2640=m
		CONFIG_DRM=y
		CONFIG_DRM_ATMEL_HLCDC=y
		CONFIG_DRM_PANEL_SIMPLE=y

arch/arm/configs/socfpga_defconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ CONFIG_NEON=y
		CONFIG_OPROFILE=y
		CONFIG_MODULES=y
		CONFIG_MODULE_UNLOAD=y
		# CONFIG_LBDAF is not set
		# CONFIG_BLK_DEV_BSG is not set
		CONFIG_NET=y
		CONFIG_PACKET=y
		@@ -128,6 +127,8 @@ CONFIG_RTC_DRV_DS1307=y
		CONFIG_DMADEVICES=y
		CONFIG_PL330_DMA=y
		CONFIG_DMATEST=m
		CONFIG_IIO=y
		CONFIG_LTC2497=y
		CONFIG_FPGA=y
		CONFIG_FPGA_MGR_SOCFPGA=y
		CONFIG_FPGA_MGR_SOCFPGA_A10=y

Admin message