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

Commit fb9bb182 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC bug fixes from Arnd Bergmann:
 "Four patches for arm-soc this week:

   - Kevin Hilman is no longer reachable under his previous email
     address.  He submitted the patch earlier, but nobody felt
     responsible to pick it up.

   - One Tegra fix for an incorect register address in device tree.

   - IMX multiplatform support exposes a configuration option that leads
     to unbootable kernels on all other machines and that needs to
     depend on that platform.

   - A nontrivial bug fix for the setup of the mxs video output."

* tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  MAINTAINERS: update email address for Kevin Hilman
  ARM: tegra: fix register address of slink controller
  ARM: imx: add dependency check for DEBUG_IMX_UART_PORT
  ARM: video: mxs: Fix mxsfb misconfiguring VDCTRL0
parents 844fdd9a c69d72ae

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -5683,7 +5683,7 @@ S: Maintained 
F:	arch/arm/*omap*/*clock*



OMAP POWER MANAGEMENT SUPPORT

M:	Kevin Hilman <khilman@ti.com>

M:	Kevin Hilman <khilman@deeprootsystems.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	arch/arm/*omap*/*pm*
@@ -5777,7 +5777,7 @@ F: arch/arm/*omap*/usb* 


OMAP GPIO DRIVER

M:	Santosh Shilimkar <santosh.shilimkar@ti.com>

M:	Kevin Hilman <khilman@ti.com>

M:	Kevin Hilman <khilman@deeprootsystems.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	drivers/gpio/gpio-omap.c
@@ -7173,7 +7173,7 @@ F: arch/arm/mach-s3c2410/bast-irq.c 


TI DAVINCI MACHINE SUPPORT

M:	Sekhar Nori <nsekhar@ti.com>

M:	Kevin Hilman <khilman@ti.com>

M:	Kevin Hilman <khilman@deeprootsystems.com>

L:	davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)

T:	git git://gitorious.org/linux-davinci/linux-davinci.git

Q:	http://patchwork.kernel.org/project/linux-davinci/list/

arch/arm/Kconfig.debug

+1 −0
Original line number Diff line number Diff line
@@ -495,6 +495,7 @@ config DEBUG_IMX_UART_PORT 
						DEBUG_IMX53_UART || \

						DEBUG_IMX6Q_UART

	default 1

	depends on ARCH_MXC

	help

	  Choose UART port on which kernel low-level debug messages

	  should be output.

arch/arm/boot/dts/tegra20.dtsi

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


	spi@7000d800 {

		compatible = "nvidia,tegra20-slink";

		reg = <0x7000d480 0x200>;

		reg = <0x7000d800 0x200>;

		interrupts = <0 83 0x04>;

		nvidia,dma-request-selector = <&apbdma 17>;

		#address-cells = <1>;

arch/arm/boot/dts/tegra30.dtsi

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


	spi@7000d800 {

		compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink";

		reg = <0x7000d480 0x200>;

		reg = <0x7000d800 0x200>;

		interrupts = <0 83 0x04>;

		nvidia,dma-request-selector = <&apbdma 17>;

		#address-cells = <1>;

arch/arm/mach-mxs/mach-mxs.c

+12 −12
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ static struct fb_videomode mx23evk_video_modes[] = { 
		.lower_margin	= 4,

		.hsync_len	= 1,

		.vsync_len	= 1,

		.sync		= FB_SYNC_DATA_ENABLE_HIGH_ACT |

				  FB_SYNC_DOTCLK_FAILING_ACT,

	},

};
@@ -59,8 +57,6 @@ static struct fb_videomode mx28evk_video_modes[] = { 
		.lower_margin	= 10,

		.hsync_len	= 10,

		.vsync_len	= 10,

		.sync		= FB_SYNC_DATA_ENABLE_HIGH_ACT |

				  FB_SYNC_DOTCLK_FAILING_ACT,

	},

};
@@ -77,7 +73,6 @@ static struct fb_videomode m28evk_video_modes[] = { 
		.lower_margin	= 45,

		.hsync_len	= 1,

		.vsync_len	= 1,

		.sync		= FB_SYNC_DATA_ENABLE_HIGH_ACT,

	},

};
@@ -94,9 +89,7 @@ static struct fb_videomode apx4devkit_video_modes[] = { 
		.lower_margin	= 13,

		.hsync_len	= 48,

		.vsync_len	= 3,

		.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT |

				  FB_SYNC_DATA_ENABLE_HIGH_ACT |

				  FB_SYNC_DOTCLK_FAILING_ACT,

		.sync		= FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,

	},

};
@@ -113,9 +106,7 @@ static struct fb_videomode apf28dev_video_modes[] = { 
		.lower_margin = 0x15,

		.hsync_len = 64,

		.vsync_len = 4,

		.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT |

				FB_SYNC_DATA_ENABLE_HIGH_ACT |

				FB_SYNC_DOTCLK_FAILING_ACT,

		.sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,

	},

};
@@ -132,7 +123,6 @@ static struct fb_videomode cfa10049_video_modes[] = { 
		.lower_margin	= 2,

		.hsync_len	= 15,

		.vsync_len	= 15,

		.sync		= FB_SYNC_DATA_ENABLE_HIGH_ACT

	},

};
@@ -259,6 +249,8 @@ static void __init imx23_evk_init(void) 
	mxsfb_pdata.mode_count = ARRAY_SIZE(mx23evk_video_modes);

	mxsfb_pdata.default_bpp = 32;

	mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT;

	mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT |

				MXSFB_SYNC_DOTCLK_FAILING_ACT;

}



static inline void enable_clk_enet_out(void)
@@ -278,6 +270,8 @@ static void __init imx28_evk_init(void) 
	mxsfb_pdata.mode_count = ARRAY_SIZE(mx28evk_video_modes);

	mxsfb_pdata.default_bpp = 32;

	mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT;

	mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT |

				MXSFB_SYNC_DOTCLK_FAILING_ACT;



	mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);

}
@@ -297,6 +291,7 @@ static void __init m28evk_init(void) 
	mxsfb_pdata.mode_count = ARRAY_SIZE(m28evk_video_modes);

	mxsfb_pdata.default_bpp = 16;

	mxsfb_pdata.ld_intf_width = STMLCDIF_18BIT;

	mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT;

}



static void __init sc_sps1_init(void)
@@ -322,6 +317,8 @@ static void __init apx4devkit_init(void) 
	mxsfb_pdata.mode_count = ARRAY_SIZE(apx4devkit_video_modes);

	mxsfb_pdata.default_bpp = 32;

	mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT;

	mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT |

				MXSFB_SYNC_DOTCLK_FAILING_ACT;

}



#define ENET0_MDC__GPIO_4_0	MXS_GPIO_NR(4, 0)
@@ -407,6 +404,7 @@ static void __init cfa10049_init(void) 
	mxsfb_pdata.mode_count = ARRAY_SIZE(cfa10049_video_modes);

	mxsfb_pdata.default_bpp = 32;

	mxsfb_pdata.ld_intf_width = STMLCDIF_18BIT;

	mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT;

}



static void __init cfa10037_init(void)
@@ -423,6 +421,8 @@ static void __init apf28_init(void) 
	mxsfb_pdata.mode_count = ARRAY_SIZE(apf28dev_video_modes);

	mxsfb_pdata.default_bpp = 16;

	mxsfb_pdata.ld_intf_width = STMLCDIF_16BIT;

	mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT |

				MXSFB_SYNC_DOTCLK_FAILING_ACT;

}



static void __init mxs_machine_init(void)