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

Pull ARM SoC cleanups and fixes from Arnd Bergmann: "Traditionally we've had two separate branches for cleanups and non-critical bug fixes, but both of these got smaller with each release and the differences are rather unclear now, so it seems more appropriate to have a combined branch. The most notable change is for OMAP, which gets a small rework to simplify handling of the AUXDATA mechanism used on machines that are not completely DT based yet, along with other work that is used as preparation for dropping the legacy board files" * tag 'armsoc-cleanups-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: dts: exynos: Add interrupt line to MAX8997 PMIC on exynos4210-trats ARM: dts: exynos: Fix regulator name to avoid forbidden character on exynos4210-trats ARM: dts: exynos: Add MFC memory banks for Peach boards ARM: OMAP2+: n900 needs MMC slot names for legacy user space ARM: OMAP2+: Add more functions to pwm pdata for ir-rx51 ARM: debug: remove extraneous DEBUG_HI3716_UART option ARM: OMAP2+: Simplify auxdata by using the generic match of/platform: Allow secondary compatible match in of_dev_lookup ARM: davinci: use IRQCHIP_DECLARE for cp_intc ARM: davinci: remove unused DA8XX_NUM_UARTS ARM: davinci: simplify call to of populate ARM: DaVinci USB: removed deprecated properties from MUSB config ARM: rockchip: Fix use of plain integer as NULL pointer ARM: realview: hide unused 'pmu_device' object soc: versatile: dynamically detect RealView HBI numbers

arch/arm/Kconfig.debug

+0 −8

Original line number	Diff line number	Diff line
		@@ -268,14 +268,6 @@ choice
		Say Y here if you want kernel low-level debugging support
		on HI3620 UART.

		config DEBUG_HI3716_UART
		bool "Hisilicon Hi3716 Debug UART"
		depends on ARCH_HI3xxx
		select DEBUG_UART_PL01X
		help
		Say Y here if you want kernel low-level debugging support
		on HI3716 UART.

		config DEBUG_HIGHBANK_UART
		bool "Kernel low-level debugging messages via Highbank UART"
		depends on ARCH_HIGHBANK

arch/arm/boot/dts/exynos4210-trats.dts

+3 −1

Original line number	Diff line number	Diff line
		@@ -298,6 +298,8 @@
		compatible = "maxim,max8997-pmic";

		reg = <0x66>;
		interrupt-parent = <&gpx0>;
		interrupts = <7 0>;

		max8997,pmic-buck1-uses-gpio-dvs;
		max8997,pmic-buck2-uses-gpio-dvs;
		@@ -359,7 +361,7 @@
		};

		vusbdac_reg: LDO8 {
		regulator-name = "VUSB/VDAC_3.3V_C210";
		regulator-name = "VUSB+VDAC_3.3V_C210";
		regulator-min-microvolt = <3300000>;
		regulator-max-microvolt = <3300000>;
		};

arch/arm/boot/dts/exynos5420-peach-pit.dts

+5 −0

Original line number	Diff line number	Diff line
		@@ -696,6 +696,11 @@
		status = "okay";
		};

		&mfc {
		samsung,mfc-r = <0x43000000 0x800000>;
		samsung,mfc-l = <0x51000000 0x800000>;
		};

		&mmc_0 {
		status = "okay";
		num-slots = <1>;

arch/arm/boot/dts/exynos5800-peach-pi.dts

+5 −0

Original line number	Diff line number	Diff line
		@@ -671,6 +671,11 @@
		status = "okay";
		};

		&mfc {
		samsung,mfc-r = <0x43000000 0x800000>;
		samsung,mfc-l = <0x51000000 0x800000>;
		};

		&mmc_0 {
		status = "okay";
		num-slots = <1>;

arch/arm/mach-davinci/cp_intc.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		#include <linux/export.h>
		#include <linux/init.h>
		#include <linux/irq.h>
		#include <linux/irqchip.h>
		#include <linux/irqdomain.h>
		#include <linux/io.h>
		#include <linux/of.h>
		@@ -210,3 +211,5 @@ void __init cp_intc_init(void)
		{
		cp_intc_of_init(NULL, NULL);
		}

		IRQCHIP_DECLARE(cp_intc, "ti,cp-intc", cp_intc_of_init);

Admin message