Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee4c54d0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'fixes' into for-next 

* fixes: (27 commits)
  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
  MAINTAINERS: exclude other Socionext SoC DT files from ARM/UNIPHIER entry
  arm64: dts: uniphier: remove unnecessary interrupt-parent
  arm64: dts: uniphier: correct on-board device IRQ number for PXs3
  optee: fix invalid of_node_put() in optee_driver_init()
  Revert "ARM: dts: imx53: add srtc node"
  ARM: dts: vf610-zii-dev-rev-c: Fix the I2C EEPROM address
  ARM: dts: am437x-cm-t43: Correct the dmas property of spi0
  ARM: dts: am4372: Correct the interrupts_properties of McASP
  ARM: dts: logicpd-somlv: Fix wl127x pinmux
  ARM: dts: logicpd-som-lv: Fix gpmc addresses for NAND and enet
  ARM: dts: Fix omap4 hang with GPS connected to USB by using wakeupgen
  ARM: OMAP2+: Missing error code in omap_device_build()
  ARM: AM33xx: PRM: Remove am33xx_pwrdm_read_prev_pwrst function
  ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context
  ARM: dts: NSP: Fix PPI interrupt types
  ARM: dts: NSP: Disable AHCI controller for HR NSP boards
  ARM: dts: r8a779x: Add '#reset-cells' in cpg-mssr
  ...
parents 4fbd8d19 81faa556

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
@@ -2046,7 +2046,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 {