Merge pull request linux4kix#8 from linux4kix/linux-linaro-lsk-v3.14-mx6

Various small fixups
n-aizu · Sep 28, 2014 · c841c70 · c841c70
2 parents e85332f + 4354226
commit c841c70
Show file tree

Hide file tree

Showing 6 changed files with 821 additions and 7 deletions.
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
@@ -153,8 +153,8 @@
 	sgtl5000: sgtl5000@0a {
 		clocks = <&clks 201>;
 		compatible = "fsl,sgtl5000";
-		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_hummingboard_sgtl5000>;
+		pinctrl-names = "default";
 		reg = <0x0a>;
 		VDDA-supply = <&reg_3p3v>;
 		VDDIO-supply = <&reg_3p3v>;
@@ -336,4 +336,6 @@
 	>;
 	reset-gpio = <&gpio3 4 0>;
 	status = "okay";
+	no-msi;
 };
+
diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
@@ -29,6 +29,7 @@
 #include <linux/types.h>
 #include <linux/busfreq-imx6.h>
 
+#include "../pci.h"
 #include "pcie-designware.h"
 
 #define to_imx6_pcie(x)	container_of(x, struct imx6_pcie, pp)
@@ -867,6 +868,9 @@ static int __init imx6_pcie_probe(struct platform_device *pdev)
 		goto err;
 	}
 
+        if (of_find_property(np, "no-msi", NULL))
+                pci_no_msi();
+
 	if (IS_ENABLED(CONFIG_EP_MODE_IN_EP_RC_SYS)) {
 		if (IS_ENABLED(CONFIG_EP_SELF_IO_TEST)) {
 			/* Prepare the test regions and data */

diff --git a/drivers/staging/media/lirc/Kconfig b/drivers/staging/media/lirc/Kconfig
@@ -38,6 +38,12 @@ config LIRC_PARALLEL
 	help
 	  Driver for Homebrew Parallel Port Receivers
 
+config LIRC_GPIO
+       tristate "Homebrew GPIO Port Receiver/Transmitter"
+       depends on LIRC
+       help
+         Driver for Homebrew GPIO Port Receiver/Transmitter
+
 config LIRC_SASEM
 	tristate "Sasem USB IR Remote"
 	depends on LIRC && USB