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

Pull ARM SoC fixes from Olof Johansson: "I didn't get a batch in this weekend, so here's what we queued up last week and today. - A couple of defconfigs add back debugfs -- it used to be implicitly enabled through CONFIG_TRACING, but ("tracing: Remove unnecessary DEBUG_FS dependency") removed that. - The rest are mostly minor fixlets of the usual kind; some DT tweaks, a headerfile refactor that needs a build fix now, etc" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (30 commits) ARM: bcm: Add missing sentinel to bcm2711_compat[] ARM: shmobile: defconfig: Restore debugfs support bus: ti-sysc: Fix missing reset delay handling ARM: imx: Fix boot crash if ocotp is not found ARM: imx_v6_v7_defconfig: Explicitly restore CONFIG_DEBUG_FS ARM: dts: imx6ul-evk: Fix peripheral regulator arm64: dts: ls1028a: fix reboot node ARM: mmp: include the correct cputype.h ARM: dts: am437x-gp/epos-evm: fix panel compatible arm64: dts: ls1028a: fix typo in TMU calibration data ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs ARM: dts: bcm283x: Fix critical trip point ARM: omap2plus_defconfig: Add back DEBUG_FS ARM: omap2plus_defconfig: enable NET_SWITCHDEV ARM: dts: am335x-sancloud-bbe: fix phy mode bus: ti-sysc: Fix missing force mstandby quirk handling reset: Do not register resource data for missing resets reset: Fix {of,devm}_reset_control_array_get kerneldoc return types reset: brcmstb: Remove resource checks dt-bindings: reset: Fix brcmstb-reset example ...

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
		Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
		Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
		Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>
		Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
		Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
		Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>

Documentation/devicetree/bindings/reset/brcm,brcmstb-reset.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,6 @@ Example:
		};

		&ethernet_switch {
		resets = <&reset>;
		resets = <&reset 26>;
		reset-names = "switch";
		};

MAINTAINERS

+2 −1

Original line number	Diff line number	Diff line
		@@ -2272,6 +2272,7 @@ F: drivers//s3c64xx*
		F: drivers//s5pv210*
		F: drivers/memory/samsung/
		F: drivers/soc/samsung/
		F: drivers/tty/serial/samsung*
		F: include/linux/soc/samsung/
		F: Documentation/arm/samsung/
		F: Documentation/devicetree/bindings/arm/samsung/
		@@ -5000,7 +5001,7 @@ F: include/linux/dma-mapping.h
		F: include/linux/dma-noncoherent.h

		DMC FREQUENCY DRIVER FOR SAMSUNG EXYNOS5422
		M: Lukasz Luba <l.luba@partner.samsung.com>
		M: Lukasz Luba <lukasz.luba@arm.com>
		L: linux-pm@vger.kernel.org
		L: linux-samsung-soc@vger.kernel.org
		S: Maintained

arch/arm/boot/dts/am335x-sancloud-bbe.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@

		&cpsw_emac0 {
		phy-handle = <&ethphy0>;
		phy-mode = "rgmii-txid";
		phy-mode = "rgmii-id";
		};

		&i2c0 {

arch/arm/boot/dts/am437x-gp-evm.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@
		};

		lcd0: display {
		compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";
		compatible = "osddisplays,osd070t1718-19ts", "panel-dpi";
		label = "lcd";

		backlight = <&lcd_bl>;

Admin message