Commit 7ad915f5 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.10-rc1/fixes' of... 

Merge tag 'omap-for-v3.10-rc1/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren, fixes for omaps:
- a section mismatch fix for hwmod
- boot fix for omap2plus_defconfig for omap2
- musb interrupt fix when using device tree
- am33xx clock fix that I missed earlier somehow
- omap1 dma return code error fix

* tag 'omap-for-v3.10-rc1/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: AM33XX: Add missing .clkdm_name to clkdiv32k_ick clock
  ARM: OMAP2+: Add missing CONFIG_ARCH_MULTI_V6=y to omap2plus_defconfig
  ARM: OMAP: fix error return code in omap1_system_dma_init()
  ARM: OMAP: fix __init section mismatch for _enable_preprogram
  ARM: dts: Fix musb interrupt for device tree booting

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9f8466c6 a6d25f4c

arch/arm/boot/dts/omap3.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ 
		usb_otg_hs: usb_otg_hs@480ab000 {

			compatible = "ti,omap3-musb";

			reg = <0x480ab000 0x1000>;

			interrupts = <0 92 0x4>, <0 93 0x4>;

			interrupts = <92>, <93>;

			interrupt-names = "mc", "dma";

			ti,hwmods = "usb_otg_hs";

			multipoint = <1>;

arch/arm/configs/omap2plus_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_MULTI_V6=y

CONFIG_ARCH_OMAP2PLUS=y

CONFIG_OMAP_RESET_CLOCKS=y

CONFIG_OMAP_MUX_DEBUG=y

arch/arm/mach-omap1/dma.c

+1 −0
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ static int __init omap1_system_dma_init(void) 
		dev_err(&pdev->dev,

			"%s: Memory allocation failed for d->chan!\n",

			__func__);

		ret = -ENOMEM;

		goto exit_release_d;

	}

arch/arm/mach-omap2/cclock33xx_data.c

+23 −3
Original line number Diff line number Diff line
@@ -454,9 +454,29 @@ DEFINE_CLK_GATE(cefuse_fck, "sys_clkin_ck", &sys_clkin_ck, 0x0, 
 */

DEFINE_CLK_FIXED_FACTOR(clkdiv32k_ck, "clk_24mhz", &clk_24mhz, 0x0, 1, 732);



DEFINE_CLK_GATE(clkdiv32k_ick, "clkdiv32k_ck", &clkdiv32k_ck, 0x0,

		AM33XX_CM_PER_CLKDIV32K_CLKCTRL, AM33XX_MODULEMODE_SWCTRL_SHIFT,

		0x0, NULL);

static struct clk clkdiv32k_ick;



static const char *clkdiv32k_ick_parent_names[] = {

	"clkdiv32k_ck",

};



static const struct clk_ops clkdiv32k_ick_ops = {

	.enable         = &omap2_dflt_clk_enable,

	.disable        = &omap2_dflt_clk_disable,

	.is_enabled     = &omap2_dflt_clk_is_enabled,

	.init           = &omap2_init_clk_clkdm,

};



static struct clk_hw_omap clkdiv32k_ick_hw = {

	.hw	= {

		.clk	= &clkdiv32k_ick,

	},

	.enable_reg	= AM33XX_CM_PER_CLKDIV32K_CLKCTRL,

	.enable_bit	= AM33XX_MODULEMODE_SWCTRL_SHIFT,

	.clkdm_name	= "clk_24mhz_clkdm",

};



DEFINE_STRUCT_CLK(clkdiv32k_ick, clkdiv32k_ick_parent_names, clkdiv32k_ick_ops);



/* "usbotg_fck" is an additional clock and not really a modulemode */

DEFINE_CLK_GATE(usbotg_fck, "dpll_per_ck", &dpll_per_ck, 0x0,

arch/arm/mach-omap2/omap_hwmod.c

+1 −1
Original line number Diff line number Diff line
@@ -2065,7 +2065,7 @@ static int _omap4_get_context_lost(struct omap_hwmod *oh) 
 * do so is present in the hwmod data, then call it and pass along the

 * return value; otherwise, return 0.

 */

static int __init _enable_preprogram(struct omap_hwmod *oh)

static int _enable_preprogram(struct omap_hwmod *oh)

{

	if (!oh->class->enable_preprogram)

		return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE