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

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

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

Pull ARM SoC fixes from Olof Johansson:
 "This is a slightly larger batch of fixes that we've been sitting on a
  few -rcs.  Most of them are simple oneliners, but there are two sets
  that are slightly larger and worth pointing out:

   - A set of patches to OMAP to deal with hwmod for RTC on am33xx
     (beaglebone SoC, among others).  It's the only clock that ever has
     a valid offset of 0, so a new flag needed introduction once this
     problem was discovered.

   - A collection of CCI fixes for performance counters discovered once
     people started using it on X-Gene CPUs"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits)
  arm-cci: pmu: Fix typo in event name
  Revert "ARM: tegra: fix erroneous address in dts"
  ARM: dts: imx6qdl: Fix SPDIF regression
  ARM: imx6: add missing BM_CLPCR_BYPASS_PMIC_READY setting for imx6sx
  ARM: dts: imx7d-sdb: fix ti,x-plate-ohms property name
  ARM: dts: kirkwood: Fix PCIe label on OpenRD
  ARM: kirkwood: ib62x0: fix size of u-boot environment partition
  bus: arm-ccn: make event groups reliable
  bus: arm-ccn: fix hrtimer registration
  bus: arm-ccn: fix PMU interrupt flags
  ARM: tegra: Correct polarity for Tegra114 PMIC interrupt
  MAINTAINERS: add tree entry for ARM/UniPhier architecture
  ARM: sun5i: Fix typo in trip point temperature
  MAINTAINERS: Switch to kernel.org account for Krzysztof Kozlowski
  ARM: imx6ul: populates platform device at .init_machine
  bus: arm-ccn: Add missing event attribute exclusions for host/guest
  bus: arm-ccn: Correct required arguments for XP PMU events
  bus: arm-ccn: Fix XP watchpoint settings bitmask
  bus: arm-ccn: Do not attempt to configure XPs for cycle counter
  bus: arm-ccn: Fix PMU handling of MN
  ...
parents d71f0586 95390e32

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ Kay Sievers <kay.sievers@vrfy.org> 
Kenneth W Chen <kenneth.w.chen@intel.com>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Documentation/arm/CCN.txt

+10 −6
Original line number Diff line number Diff line
@@ -18,13 +18,17 @@ and config2 fields of the perf_event_attr structure. The "events" 
directory provides configuration templates for all documented

events, that can be used with perf tool. For example "xp_valid_flit"

is an equivalent of "type=0x8,event=0x4". Other parameters must be

explicitly specified. For events originating from device, "node"

defines its index. All crosspoint events require "xp" (index),

"port" (device port number) and "vc" (virtual channel ID) and

"dir" (direction). Watchpoints (special "event" value 0xfe) also

require comparator values ("cmp_l" and "cmp_h") and "mask", being

index of the comparator mask.

explicitly specified.



For events originating from device, "node" defines its index.



Crosspoint PMU events require "xp" (index), "bus" (bus number)

and "vc" (virtual channel ID).



Crosspoint watchpoint-based events (special "event" value 0xfe)

require "xp" and "vc" as as above plus "port" (device port index),

"dir" (transmit/receive direction), comparator values ("cmp_l"

and "cmp_h") and "mask", being index of the comparator mask.

Masks are defined separately from the event description

(due to limited number of the config values) in the "cmp_mask"

directory, with first 8 configurable by user and additional

MAINTAINERS

+10 −6
Original line number Diff line number Diff line
@@ -1624,7 +1624,7 @@ N: rockchip 


ARM/SAMSUNG EXYNOS ARM ARCHITECTURES

M:	Kukjin Kim <kgene@kernel.org>

M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

M:	Krzysztof Kozlowski <krzk@kernel.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

S:	Maintained
@@ -1831,6 +1831,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git 
ARM/UNIPHIER ARCHITECTURE

M:	Masahiro Yamada <yamada.masahiro@socionext.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git

S:	Maintained

F:	arch/arm/boot/dts/uniphier*

F:	arch/arm/include/asm/hardware/cache-uniphier.h
@@ -7464,7 +7465,8 @@ F: Documentation/devicetree/bindings/sound/max9860.txt 
F:	sound/soc/codecs/max9860.*



MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS

M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

M:	Krzysztof Kozlowski <krzk@kernel.org>

M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

L:	linux-pm@vger.kernel.org

S:	Supported

F:	drivers/power/max14577_charger.c
@@ -7480,7 +7482,8 @@ F: include/dt-bindings/*/*max77802.h 


MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS

M:	Chanwoo Choi <cw00.choi@samsung.com>

M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

M:	Krzysztof Kozlowski <krzk@kernel.org>

M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

L:	linux-kernel@vger.kernel.org

S:	Supported

F:	drivers/*/max14577*.c
@@ -9246,7 +9249,7 @@ F: drivers/pinctrl/sh-pfc/ 


PIN CONTROLLER - SAMSUNG

M:	Tomasz Figa <tomasz.figa@gmail.com>

M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

M:	Krzysztof Kozlowski <krzk@kernel.org>

M:	Sylwester Nawrocki <s.nawrocki@samsung.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
@@ -10179,7 +10182,7 @@ S: Maintained 
F:	drivers/platform/x86/samsung-laptop.c



SAMSUNG AUDIO (ASoC) DRIVERS

M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

M:	Krzysztof Kozlowski <krzk@kernel.org>

M:	Sangbeom Kim <sbkim73@samsung.com>

M:	Sylwester Nawrocki <s.nawrocki@samsung.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -10194,7 +10197,8 @@ F: drivers/video/fbdev/s3c-fb.c 


SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS

M:	Sangbeom Kim <sbkim73@samsung.com>

M:	Krzysztof Kozlowski <k.kozlowski@samsung.com>

M:	Krzysztof Kozlowski <krzk@kernel.org>

M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

L:	linux-kernel@vger.kernel.org

L:	linux-samsung-soc@vger.kernel.org

S:	Supported

arch/arm/boot/dts/am335x-baltos.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ 


		#address-cells = <1>;

		#size-cells = <1>;

		elm_id = <&elm>;

		ti,elm-id = <&elm>;

	};

};

arch/arm/boot/dts/am335x-igep0033.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ 


		#address-cells = <1>;

		#size-cells = <1>;

		elm_id = <&elm>;

		ti,elm-id = <&elm>;



		/* MTD partition table */

		partition@0 {