Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (44b4b461) · Commits · 戴 / test

Pull ARM SoC fixes from Olof Johansson: "We've been sitting on fixes for a while, and they keep trickling in at a low rate. Nothing in here comes across as particularly scary or noteworthy, for the most part it's a large collection of small DT tweaks" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (24 commits) ARM: dts: da850-evm: fix read access to SPI flash ARM: dts: omap3: Fix Card Detect and Write Protect on Logic PD SOM-LV ARM64: dts: meson-gxbb-odroidc2: Disable SCPI DVFS ARM: dts: OMAP5 / DRA7: indicate that SATA port 0 is available. ARM: dts: NSP: Fix DT ranges error ARM: multi_v7_defconfig: set bcm47xx watchdog ARM: multi_v7_defconfig: fix config typo ARM: dts: dra72-evm-revc: fix typo in ethernet-phy node soc: ti: wkup_m3_ipc: Fix error return code in wkup_m3_ipc_probe() ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation ARM: dts: sunxi: Change node name for pwrseq pin on Olinuxino-lime2-emmc ARM: dts: sun8i: Support DTB build for NanoPi M1 ARM: dts: sun6i: hummingbird: Enable display engine again ARM: dts: sun6i: Disable display pipeline by default ARM, ARM64: dts: drop "arm,amba-bus" in favor of "simple-bus" part 3 ARM: dts: imx6qdl-nitrogen6_som2: fix sgtl5000 pinctrl init ARM: dts: imx6qdl-nitrogen6_max: fix sgtl5000 pinctrl init ARM: OMAP1: DMA: Correct the number of logical channels ARM: dts: am335x-icev2: Remove the duplicated pinmux setting ARM: OMAP2+: Fix WL1283 Bluetooth Baud Rate ...

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -1690,6 +1690,7 @@ M: Krzysztof Kozlowski <krzk@kernel.org>
		R: Javier Martinez Canillas <javier@osg.samsung.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
		Q: https://patchwork.kernel.org/project/linux-samsung-soc/list/
		S: Maintained
		F: arch/arm/boot/dts/s3c*
		F: arch/arm/boot/dts/s5p*

arch/arm/boot/dts/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -846,6 +846,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
		sun8i-a83t-allwinner-h8homlet-v2.dtb \
		sun8i-a83t-cubietruck-plus.dtb \
		sun8i-h3-bananapi-m2-plus.dtb \
		sun8i-h3-nanopi-m1.dtb \
		sun8i-h3-nanopi-neo.dtb \
		sun8i-h3-orangepi-2.dtb \
		sun8i-h3-orangepi-lite.dtb \

arch/arm/boot/dts/am335x-icev2.dts

+0 −1

Original line number	Diff line number	Diff line
		@@ -170,7 +170,6 @@
		AM33XX_IOPAD(0x8fc, PIN_INPUT_PULLUP \| MUX_MODE0) /* (G16) mmc0_dat0.mmc0_dat0 */
		AM33XX_IOPAD(0x900, PIN_INPUT_PULLUP \| MUX_MODE0) /* (G17) mmc0_clk.mmc0_clk */
		AM33XX_IOPAD(0x904, PIN_INPUT_PULLUP \| MUX_MODE0) /* (G18) mmc0_cmd.mmc0_cmd */
		AM33XX_IOPAD(0x960, PIN_INPUT_PULLUP \| MUX_MODE5) /* (C15) spi0_cs1.mmc0_sdcd */
		>;
		};

arch/arm/boot/dts/bcm-nsp.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@

		axi {
		compatible = "simple-bus";
		ranges = <0x00000000 0x18000000 0x0011c40a>;
		ranges = <0x00000000 0x18000000 0x0011c40c>;
		#address-cells = <1>;
		#size-cells = <1>;

arch/arm/boot/dts/da850-evm.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@
		#size-cells = <1>;
		compatible = "m25p64";
		spi-max-frequency = <30000000>;
		m25p,fast-read;
		reg = <0>;
		partition@0 {
		label = "U-Boot-SPL";

Admin message