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

Commit b3262720 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 updates from Olof Johansson:
 "A couple of late-merged changes that would be useful to get in this
  merge window:

   - Driver support for reset of audio complex on Meson platforms. The
     audio driver went in this merge window, and these changes have been
     in -next for a while (just not in our tree).

   - Power management fixes for IOMMU on Rockchip platforms, getting
     closer to kexec working on them, including Chromebooks.

   - Another pass updating "arm,psci" -> "psci" for some properties that
     have snuck in since last time it was done"

* tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  iommu/rockchip: Move irq request past pm_runtime_enable
  iommu/rockchip: Handle errors returned from PM framework
  arm64: rockchip: Force CONFIG_PM on Rockchip systems
  ARM: rockchip: Force CONFIG_PM on Rockchip systems
  arm64: dts: Fix various entry-method properties to reflect documentation
  reset: imx7: Fix always writing bits as 0
  reset: meson: add meson audio arb driver
  reset: meson: add dt-bindings for meson-axg audio arb
parents 1bc27677 1aa55ca9

Documentation/devicetree/bindings/arm/cpu-capacity.txt

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ cpus { 
	};



	idle-states {

		entry-method = "arm,psci";

		entry-method = "psci";



		CPU_SLEEP_0: cpu-sleep-0 {

			compatible = "arm,idle-state";

Documentation/devicetree/bindings/arm/idle-states.txt

+2 −2
Original line number Diff line number Diff line
@@ -237,8 +237,8 @@ processor idle states, defined as device tree nodes, are listed. 
		Value type: <stringlist>

		Usage and definition depend on ARM architecture version.

			# On ARM v8 64-bit this property is required and must

			  be one of:

			   - "psci" (see bindings in [2])

			  be:

			   - "psci"

			# On ARM 32-bit systems this property is optional



The nodes describing the idle states (state) can only be defined within the

Documentation/devicetree/bindings/reset/amlogic,meson-axg-audio-arb.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
* Amlogic audio memory arbiter controller



The Amlogic Audio ARB is a simple device which enables or

disables the access of Audio FIFOs to DDR on AXG based SoC.



Required properties:

- compatible: 'amlogic,meson-axg-audio-arb'

- reg: physical base address of the controller and length of memory

       mapped region.

- clocks: phandle to the fifo peripheral clock provided by the audio

	  clock controller.

- #reset-cells: must be 1.



Example on the A113 SoC:



arb: reset-controller@280 {

	compatible = "amlogic,meson-axg-audio-arb";

	reg = <0x0 0x280 0x0 0x4>;

	#reset-cells = <1>;

	clocks = <&clkc_audio AUD_CLKID_DDR_ARB>;

};

arch/arm/mach-rockchip/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ config ARCH_ROCKCHIP 
	select ARM_GLOBAL_TIMER

	select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK

	select ZONE_DMA if ARM_LPAE

	select PM

	help

	  Support for Rockchip's Cortex-A9 Single-to-Quad-Core-SoCs

	  containing the RK2928, RK30xx and RK31xx series.

arch/arm64/Kconfig.platforms

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ config ARCH_ROCKCHIP 
	select GPIOLIB

	select PINCTRL

	select PINCTRL_ROCKCHIP

	select PM

	select ROCKCHIP_TIMER

	help

	  This enables support for the ARMv8 based Rockchip chipsets,