From: Colin Cross Date: Tue, 31 May 2011 19:00:09 +0000 (-0700) Subject: ARM: omap2+: mux: Allow board mux settings to be NULL X-Git-Tag: v3.0-rc3~51^2~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d4ff6121b44081601206980cafcd6ed3ecb367b6;p=platform%2Fkernel%2Flinux-3.10.git ARM: omap2+: mux: Allow board mux settings to be NULL OMAP4 has two mux instances, and the board may not have settings for one of them. Allow the board file to pass NULL for an instance's mux settings, which will initialize the mux instance but skip writing board settings. Signed-off-by: Colin Cross Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index b4f9066..c7fb22a 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c @@ -83,6 +83,9 @@ void omap_mux_write(struct omap_mux_partition *partition, u16 val, void omap_mux_write_array(struct omap_mux_partition *partition, struct omap_board_mux *board_mux) { + if (!board_mux) + return; + while (board_mux->reg_offset != OMAP_MUX_TERMINATOR) { omap_mux_write(partition, board_mux->value, board_mux->reg_offset);