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

Pull ARM SoC fixes from Olof Johansson: - A revert of all SCPI changes from the 4.15 merge window. They had regressions on the Amlogic platforms, and the submaintainer isn't around to fix these bugs due to vacation, etc. So we agreed to revert and revisit in next release cycle. - A series fixing a number of bugs for ARM CCN interconnect, around module unload, smp_processor_id() in preemptable context, and fixing some memory allocation failure checks. - A handful of devicetree fixes for different platforms, fixing warnings and errors that were previously ignored by the compiler. - The usual set of mostly minor fixes for different platforms. * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (42 commits) ARM64: dts: meson-gx: fix UART pclk clock name ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds arm: dts: nspire: Add missing #phy-cells to usb-nop-xceiv ARM: dts: Fix dm814x missing phy-cells property ARM: dts: Fix elm interrupt compiler warning bus: arm-ccn: fix module unloading Error: Removing state 147 which has instances left. bus: arm-cci: Fix use of smp_processor_id() in preemptible context bus: arm-ccn: Fix use of smp_processor_id() in preemptible context bus: arm-ccn: Simplify code bus: arm-ccn: Check memory allocation failure bus: arm-ccn: constify attribute_group structures. firmware: arm_scpi: Revert updates made during v4.15 merge window arm: dts: marvell: Add missing #phy-cells to usb-nop-xceiv arm64: dts: sort vendor subdirectories in Makefile alphabetically meson-gx-socinfo: Fix package id parsing ARM: meson: fix spelling mistake: "Couln't" -> "Couldn't" ARM: dts: meson: fix the memory region of the GPIO interrupt controller ARM: dts: meson: correct the sort order for the the gpio_intc node MAINTAINERS: exclude other Socionext SoC DT files from ARM/UNIPHIER entry arm64: dts: uniphier: remove unnecessary interrupt-parent ...

Documentation/devicetree/bindings/usb/am33xx-usb.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,7 @@ usb: usb@47400000 {
		reg = <0x47401300 0x100>;
		reg-names = "phy";
		ti,ctrl_mod = <&ctrl_mod>;
		#phy-cells = <0>;
		};

		usb0: usb@47401000 {
		@@ -141,6 +142,7 @@ usb: usb@47400000 {
		reg = <0x47401b00 0x100>;
		reg-names = "phy";
		ti,ctrl_mod = <&ctrl_mod>;
		#phy-cells = <0>;
		};

		usb1: usb@47401800 {

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -2047,7 +2047,7 @@ F: arch/arm/boot/dts/uniphier*
		F: arch/arm/include/asm/hardware/cache-uniphier.h
		F: arch/arm/mach-uniphier/
		F: arch/arm/mm/cache-uniphier.c
		F: arch/arm64/boot/dts/socionext/
		F: arch/arm64/boot/dts/socionext/uniphier*
		F: drivers/bus/uniphier-system-bus.c
		F: drivers/clk/uniphier/
		F: drivers/gpio/gpio-uniphier.c

arch/arm/boot/dts/am33xx.dtsi

+2 −0

Original line number	Diff line number	Diff line
		@@ -630,6 +630,7 @@
		reg-names = "phy";
		status = "disabled";
		ti,ctrl_mod = <&usb_ctrl_mod>;
		#phy-cells = <0>;
		};

		usb0: usb@47401000 {
		@@ -678,6 +679,7 @@
		reg-names = "phy";
		status = "disabled";
		ti,ctrl_mod = <&usb_ctrl_mod>;
		#phy-cells = <0>;
		};

		usb1: usb@47401800 {

arch/arm/boot/dts/am4372.dtsi

+4 −2

Original line number	Diff line number	Diff line
		@@ -927,7 +927,8 @@
		reg = <0x48038000 0x2000>,
		<0x46000000 0x400000>;
		reg-names = "mpu", "dat";
		interrupts = <80>, <81>;
		interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
		interrupt-names = "tx", "rx";
		status = "disabled";
		dmas = <&edma 8 2>,
		@@ -941,7 +942,8 @@
		reg = <0x4803C000 0x2000>,
		<0x46400000 0x400000>;
		reg-names = "mpu", "dat";
		interrupts = <82>, <83>;
		interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
		interrupt-names = "tx", "rx";
		status = "disabled";
		dmas = <&edma 10 2>,

arch/arm/boot/dts/am437x-cm-t43.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -301,8 +301,8 @@
		status = "okay";
		pinctrl-names = "default";
		pinctrl-0 = <&spi0_pins>;
		dmas = <&edma 16
		&edma 17>;
		dmas = <&edma 16 0
		&edma 17 0>;
		dma-names = "tx0", "rx0";

		flash: w25q64cvzpig@0 {

Admin message