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

Commit d4113f2f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC late fixes and dependencies from Kevin Hilman:
 "This is a collection of a few late fixes and other misc stuff that had
  dependencies on things being merged from other trees.

  Other than the fixes, the primary feature being added is the
  conversion of some OMAP drivers to the new generic wakeirq interface"

* tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: multi_v7_defconfig: Enable BRCMNAND driver
  ARM: BCM: Do not select CONFIG_MTD_NAND_BRCMNAND
  ARM: at91/dt: update udc compatible strings
  ARM: at91/dt: trivial: fix USB udc compatible string
  arm64: dts: Add APM X-Gene standby GPIO controller DTS entries
  soc: qcom: spm: Fix idle on THUMB2 kernels
  ARM: dove: fix legacy dove IRQ numbers
  ARM: mvebu: fix suspend to RAM on big-endian configurations
  ARM: mvebu: adjust Armada XP DT spi muxing after pinctrl function rename
  serial: 8250_omap: Move wake-up interrupt to generic wakeirq
  serial: omap: Switch wake-up interrupt to generic wakeirq
  mmc: omap_hsmmc: Change wake-up interrupt to use generic wakeirq
parents 84807727 ae41a0b7

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

+3 −3
Original line number Diff line number Diff line
@@ -79,9 +79,9 @@ Atmel High-Speed USB device controller 


Required properties:

 - compatible: Should be one of the following

	       "at91sam9rl-udc"

	       "at91sam9g45-udc"

	       "sama5d3-udc"

	       "atmel,at91sam9rl-udc"

	       "atmel,at91sam9g45-udc"

	       "atmel,sama5d3-udc"

 - reg: Address and length of the register set for the device

 - interrupts: Should contain usba interrupt

 - clocks: Should reference the peripheral and host clocks

arch/arm/boot/dts/armada-xp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ 
	spi0_pins: spi0-pins {

		marvell,pins = "mpp36", "mpp37",

			       "mpp38", "mpp39";

		marvell,function = "spi";

		marvell,function = "spi0";

	};



	uart2_pins: uart2-pins {

arch/arm/boot/dts/at91sam9g45.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1148,7 +1148,7 @@ 
			usb2: gadget@fff78000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "atmel,at91sam9rl-udc";

				compatible = "atmel,at91sam9g45-udc";

				reg = <0x00600000 0x80000

				       0xfff78000 0x400>;

				interrupts = <27 IRQ_TYPE_LEVEL_HIGH 0>;

arch/arm/boot/dts/at91sam9x5.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1108,7 +1108,7 @@ 
			usb2: gadget@f803c000 {

				#address-cells = <1>;

				#size-cells = <0>;

				compatible = "atmel,at91sam9rl-udc";

				compatible = "atmel,at91sam9g45-udc";

				reg = <0x00500000 0x80000

				       0xf803c000 0x400>;

				interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;

arch/arm/boot/dts/sama5d3.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1321,7 +1321,7 @@ 
		usb0: gadget@00500000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "atmel,at91sam9rl-udc";

			compatible = "atmel,sama5d3-udc";

			reg = <0x00500000 0x100000

			       0xf8030000 0x4000>;

			interrupts = <33 IRQ_TYPE_LEVEL_HIGH 2>;