tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 2a645171 0f1e5b5d

+21 -13
+1 -1
arch/arm/boot/dts/Makefile
··· 223 223 imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dtb \ 224 224 imx25-karo-tx25.dtb \ 225 225 imx25-pdk.dtb 226 - dtb-$(CONFIG_SOC_IMX31) += \ 226 + dtb-$(CONFIG_SOC_IMX27) += \ 227 227 imx27-apf27.dtb \ 228 228 imx27-apf27dev.dtb \ 229 229 imx27-eukrea-mbimxsd27-baseboard.dtb \
-4
arch/arm/boot/dts/am335x-boneblack.dts
··· 80 80 status = "okay"; 81 81 }; 82 82 }; 83 - 84 - &rtc { 85 - system-power-controller; 86 - };
+1 -1
arch/arm/boot/dts/am335x-evmsk.dts
··· 654 654 wlcore: wlcore@2 { 655 655 compatible = "ti,wl1271"; 656 656 reg = <2>; 657 - interrupt-parent = <&gpio1>; 657 + interrupt-parent = <&gpio0>; 658 658 interrupts = <31 IRQ_TYPE_LEVEL_HIGH>; /* gpio 31 */ 659 659 ref-clock-frequency = <38400000>; 660 660 };
+1 -1
arch/arm/boot/dts/exynos4412-trats2.dts
··· 736 736 737 737 display-timings { 738 738 timing-0 { 739 - clock-frequency = <0>; 739 + clock-frequency = <57153600>; 740 740 hactive = <720>; 741 741 vactive = <1280>; 742 742 hfront-porch = <5>;
+1 -1
arch/arm/boot/dts/imx27.dtsi
··· 533 533 534 534 fec: ethernet@1002b000 { 535 535 compatible = "fsl,imx27-fec"; 536 - reg = <0x1002b000 0x4000>; 536 + reg = <0x1002b000 0x1000>; 537 537 interrupts = <50>; 538 538 clocks = <&clks IMX27_CLK_FEC_IPG_GATE>, 539 539 <&clks IMX27_CLK_FEC_AHB_GATE>;
+2
arch/arm/boot/dts/omap3-devkit8000.dts
··· 110 110 nand@0,0 { 111 111 reg = <0 0 4>; /* CS0, offset 0, IO size 4 */ 112 112 nand-bus-width = <16>; 113 + gpmc,device-width = <2>; 114 + ti,nand-ecc-opt = "sw"; 113 115 114 116 gpmc,sync-clk-ps = <0>; 115 117 gpmc,cs-on-ns = <0>;
+1 -1
arch/arm/configs/multi_v7_defconfig
··· 429 429 CONFIG_USB_EHCI_TEGRA=y 430 430 CONFIG_USB_EHCI_HCD_STI=y 431 431 CONFIG_USB_EHCI_HCD_PLATFORM=y 432 - CONFIG_USB_ISP1760_HCD=y 432 + CONFIG_USB_ISP1760=y 433 433 CONFIG_USB_OHCI_HCD=y 434 434 CONFIG_USB_OHCI_HCD_STI=y 435 435 CONFIG_USB_OHCI_HCD_PLATFORM=y
+13 -3
arch/arm/mach-imx/gpc.c
··· 280 280 struct device_node *np; 281 281 282 282 np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpc"); 283 - if (WARN_ON(!np || 284 - !of_find_property(np, "interrupt-controller", NULL))) 285 - pr_warn("Outdated DT detected, system is about to crash!!!\n"); 283 + if (WARN_ON(!np)) 284 + return; 285 + 286 + if (WARN_ON(!of_find_property(np, "interrupt-controller", NULL))) { 287 + pr_warn("Outdated DT detected, suspend/resume will NOT work\n"); 288 + 289 + /* map GPC, so that at least CPUidle and WARs keep working */ 290 + gpc_base = of_iomap(np, 0); 291 + } 286 292 } 287 293 288 294 #ifdef CONFIG_PM_GENERIC_DOMAINS ··· 448 442 { 449 443 struct regulator *pu_reg; 450 444 int ret; 445 + 446 + /* bail out if DT too old and doesn't provide the necessary info */ 447 + if (!of_property_read_bool(pdev->dev.of_node, "#power-domain-cells")) 448 + return 0; 451 449 452 450 pu_reg = devm_regulator_get_optional(&pdev->dev, "pu"); 453 451 if (PTR_ERR(pu_reg) == -ENODEV)
+1 -1
arch/arm/mach-pxa/pxa_cplds_irqs.c
··· 107 107 struct resource *res; 108 108 struct cplds *fpga; 109 109 int ret; 110 - unsigned int base_irq = 0; 110 + int base_irq; 111 111 unsigned long irqflags = 0; 112 112 113 113 fpga = devm_kzalloc(&pdev->dev, sizeof(*fpga), GFP_KERNEL);