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

Commit af073c34 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-noncritical-fixes-3.10' of... 

Merge tag 'imx-noncritical-fixes-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/fixes-non-critical

From Shawn Guo:
The imx noncritical fixes for 3.10:

* A bunch of fixes for sparse warings
* One fix for the typo in use of Kconfig symbol
  MACH_EUKREA_CPUIMX27_USEUART4

* tag 'imx-noncritical-fixes-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6

:
  ARM: cpuimx27 and mbimx27: prepend CONFIG_ to Kconfig macro
  ARM: mach-imx: mach-imx6q: Fix sparse warnings
  ARM: mach-imx: src: Include "common.h
  ARM: mach-imx: gpc: Include "common.h"
  ARM: mach-imx: avic: Staticize *avic_base
  ARM: mach-imx: tzic: Staticize *tzic_base
  ARM: mach-imx: clk: Include "clk.h"
  ARM: mach-imx: clk-busy: Staticize clk_busy_mux_ops
  ARM: mach-imx: irq-common: Remove imx_irq_set_priority()
  ARM: mach-imx: clk-gate2: Include "clk.h"
  ARM: mach-imx: clk-pllv2: Staticize clk_pllv2_ops
  ARM: mach-imx: clk-pllv1: Staticize clk_pllv1_ops
  ARM: mach-imx: cpu-imx5: Include "common.h"
  ARM: mach-imx: iomux-imx31: Staticize mxc_pin_alloc_map
  ARM: mach-imx: mm-imx3: Staticize imx3_init_l2x0()
  ARM: mach-imx: cpu: Include "common.h"

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 7e16063b 4f5ef62c

arch/arm/mach-imx/avic.c

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


#define AVIC_NUM_IRQS 64



void __iomem *avic_base;

static void __iomem *avic_base;

static struct irq_domain *domain;



static u32 avic_saved_mask_reg[2];

arch/arm/mach-imx/clk-busy.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static int clk_busy_mux_set_parent(struct clk_hw *hw, u8 index) 
	return ret;

}



struct clk_ops clk_busy_mux_ops = {

static struct clk_ops clk_busy_mux_ops = {

	.get_parent = clk_busy_mux_get_parent,

	.set_parent = clk_busy_mux_set_parent,

};

arch/arm/mach-imx/clk-gate2.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/io.h>

#include <linux/err.h>

#include <linux/string.h>

#include "clk.h"



/**

 * DOC: basic gatable clock which can gate and ungate it's ouput

arch/arm/mach-imx/clk-pllv1.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static unsigned long clk_pllv1_recalc_rate(struct clk_hw *hw, 
	return ll;

}



struct clk_ops clk_pllv1_ops = {

static struct clk_ops clk_pllv1_ops = {

	.recalc_rate = clk_pllv1_recalc_rate,

};

arch/arm/mach-imx/clk-pllv2.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static void clk_pllv2_unprepare(struct clk_hw *hw) 
	__raw_writel(reg, pllbase + MXC_PLL_DP_CTL);

}



struct clk_ops clk_pllv2_ops = {

static struct clk_ops clk_pllv2_ops = {

	.prepare = clk_pllv2_prepare,

	.unprepare = clk_pllv2_unprepare,

	.recalc_rate = clk_pllv2_recalc_rate,