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

Commit 2a645171 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "Two weeks worth of small bug fixes this time, nothing sticking out
  this time:

   - one defconfig change to adapt to a modified Kconfig symbol

   - two fixes for i.MX for backwards compatibility with older DT files
     that was accidentally broken

   - one regression fix for irq handling on pxa

   - three small dt files on omap, and one each for imx and exynos"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: multi_v7_defconfig: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760
  ARM: imx6: gpc: don't register power domain if DT data is missing
  ARM: imx6: allow booting with old DT
  ARM: dts: set display clock correctly for exynos4412-trats2
  ARM: pxa: pxa_cplds: signedness bug in probe
  ARM: dts: Fix WLAN interrupt line for AM335x EVM-SK
  ARM: dts: omap3-devkit8000: Fix NAND DT node
  ARM: dts: am335x-boneblack: disable RTC-only sleep
  ARM: dts: fix imx27 dtb build rule
  ARM: dts: imx27: only map 4 Kbyte for fec registers
parents 0f1e5b5d 5530c84f

arch/arm/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ dtb-$(CONFIG_SOC_IMX25) += \ 
	imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dtb \

	imx25-karo-tx25.dtb \

	imx25-pdk.dtb

dtb-$(CONFIG_SOC_IMX31) += \

dtb-$(CONFIG_SOC_IMX27) += \

	imx27-apf27.dtb \

	imx27-apf27dev.dtb \

	imx27-eukrea-mbimxsd27-baseboard.dtb \

arch/arm/boot/dts/am335x-boneblack.dts

+0 −4
Original line number Diff line number Diff line
@@ -80,7 +80,3 @@ 
		status = "okay";

	};

};
 


&rtc {

	system-power-controller;

};

arch/arm/boot/dts/am335x-evmsk.dts

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ 
	wlcore: wlcore@2 {

		compatible = "ti,wl1271";

		reg = <2>;

		interrupt-parent = <&gpio1>;

		interrupt-parent = <&gpio0>;

		interrupts = <31 IRQ_TYPE_LEVEL_HIGH>; /* gpio 31 */

		ref-clock-frequency = <38400000>;

	};

arch/arm/boot/dts/exynos4412-trats2.dts

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


			display-timings {

				timing-0 {

					clock-frequency = <0>;

					clock-frequency = <57153600>;

					hactive = <720>;

					vactive = <1280>;

					hfront-porch = <5>;

arch/arm/boot/dts/imx27.dtsi

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


			fec: ethernet@1002b000 {

				compatible = "fsl,imx27-fec";

				reg = <0x1002b000 0x4000>;

				reg = <0x1002b000 0x1000>;

				interrupts = <50>;

				clocks = <&clks IMX27_CLK_FEC_IPG_GATE>,

					 <&clks IMX27_CLK_FEC_AHB_GATE>;