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

Pull ARM SoC fixes from Arnd Bergmann: - a couple of OMAP 4.11 regression fixes, including a boot regression for SmartReflex, hypervisor mode in thumb2 mode, and reference counting of device nodes - a fix for cpu_idle on at91 - minor DT fixes on across several platforms: sunxi, bcm53xx, at91, nsp, ns2, ux500, omap - a fix to correct an API change in the reset controllers * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (22 commits) arm64: dts: NS2: Add dma-coherent to relevant DT entries reset: fix optional reset_control_get stubs to return NULL ARM: sun8i: a23/a33: drop bl_en_pin GPIO pinmux in reference design DTSI ARM: dts: sun7i: lamobo-r1: Fix CPU port RGMII settings ARM: dts: NSP: GPIO reboot open-source ARM: at91: pm: cpu_idle: switch DDR to power-down mode ARM: dts: add the AB8500 clocks to the device tree ARM: dts: imx6sx-udoo-neo: Fix reboot hang ARM: sun8i: Fix the mali clock rate ARM: dts: BCM5301X: Correct GIC_PPI interrupt flags ARM: dts: BCM5301X: Fix memory start address ARM: dts: BCM5301X: Fix UARTs on bcm953012k Revert "ARM: at91/dt: sama5d2: Use new compatible for ohci node" ARM: OMAP2+: Release device node after it is no longer needed. ARM: OMAP2+: Fix device node reference counts ARM: OMAP2+: Remove legacy gpmc-nand.c ARM: OMAP2+: gpmc-onenand: propagate error on initialization failure ARM: dts: am335x-pcm953: Fix legacy wakeup source binding ARM: omap2plus_defconfig: Enable INPUT_MOUSEDEV as loadable modules ARM: dts: am57xx-idk: tpic2810 is on I2C bus, not SPI ...

arch/arm/boot/dts/am335x-pcm-953.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -63,14 +63,14 @@
		label = "home";
		linux,code = <KEY_HOME>;
		gpios = <&gpio3 7 GPIO_ACTIVE_HIGH>;
		gpio-key,wakeup;
		wakeup-source;
		};

		button@1 {
		label = "menu";
		linux,code = <KEY_MENU>;
		gpios = <&gpio3 8 GPIO_ACTIVE_HIGH>;
		gpio-key,wakeup;
		wakeup-source;
		};

		};

arch/arm/boot/dts/am57xx-idk-common.dtsi

+7 −7

Original line number	Diff line number	Diff line
		@@ -315,6 +315,13 @@
		/* ID & VBUS GPIOs provided in board dts */
		};
		};

		tpic2810: tpic2810@60 {
		compatible = "ti,tpic2810";
		reg = <0x60>;
		gpio-controller;
		#gpio-cells = <2>;
		};
		};

		&mcspi3 {
		@@ -330,13 +337,6 @@
		spi-max-frequency = <1000000>;
		spi-cpol;
		};

		tpic2810: tpic2810@60 {
		compatible = "ti,tpic2810";
		reg = <0x60>;
		gpio-controller;
		#gpio-cells = <2>;
		};
		};

		&uart3 {

arch/arm/boot/dts/bcm5301x.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -66,14 +66,14 @@
		timer@20200 {
		compatible = "arm,cortex-a9-global-timer";
		reg = <0x20200 0x100>;
		interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
		interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;
		clocks = <&periph_clk>;
		};

		local-timer@20600 {
		compatible = "arm,cortex-a9-twd-timer";
		reg = <0x20600 0x100>;
		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
		interrupts = <GIC_PPI 13 IRQ_TYPE_EDGE_RISING>;
		clocks = <&periph_clk>;
		};

arch/arm/boot/dts/bcm953012k.dts

+2 −3

Original line number	Diff line number	Diff line
		@@ -48,15 +48,14 @@
		};

		memory {
		reg = <0x00000000 0x10000000>;
		reg = <0x80000000 0x10000000>;
		};
		};

		&uart0 {
		clock-frequency = <62499840>;
		status = "okay";
		};

		&uart1 {
		clock-frequency = <62499840>;
		status = "okay";
		};

arch/arm/boot/dts/bcm958522er.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@
		gpio-restart {
		compatible = "gpio-restart";
		gpios = <&gpioa 15 GPIO_ACTIVE_LOW>;
		open-source;
		priority = <200>;
		};
		};

Admin message