Skip to content

L
linux
Commit e15ebe05 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'omap-fixes-for-v3.5-rc5' of... 

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

PM related fixes for omaps mostly to get suspend/resume
working again.

* tag 'omap-fixes-for-v3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: hwmod data: Fix wrong McBSP clock alias on OMAP4
  ARM: OMAP4: hwmod data: temporarily comment out data for the usb_host_fs and aess IP blocks
  ARM: OMAP4: TWL6030: ensure sys_nirq1 is mux'd and wakeup enabled
  ARM: OMAP2: Overo: init I2C before MMC to fix MMC suspend/resume failure
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8d111444 fa2976a8
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 15 deletions
arch/arm/mach-omap2/board-overo.c
View file @ e15ebe05
...@@ -494,8 +494,8 @@ static void __init overo_init(void) ...@@ -494,8 +494,8 @@ static void __init overo_init(void)
regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies)); regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
omap_hsmmc_init(mmc);
overo_i2c_init(); overo_i2c_init();
omap_hsmmc_init(mmc);
omap_display_init(&overo_dss_data); omap_display_init(&overo_dss_data);
omap_serial_init(); omap_serial_init();
omap_sdrc_init(mt46h32m32lf6_sdrc_params, omap_sdrc_init(mt46h32m32lf6_sdrc_params,
......
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
View file @ e15ebe05
...@@ -1928,7 +1928,7 @@ static struct omap_hwmod_dma_info omap44xx_mcbsp1_sdma_reqs[] = { ...@@ -1928,7 +1928,7 @@ static struct omap_hwmod_dma_info omap44xx_mcbsp1_sdma_reqs[] = {
static struct omap_hwmod_opt_clk mcbsp1_opt_clks[] = { static struct omap_hwmod_opt_clk mcbsp1_opt_clks[] = {
{ .role = "pad_fck", .clk = "pad_clks_ck" }, { .role = "pad_fck", .clk = "pad_clks_ck" },
{ .role = "prcm_clk", .clk = "mcbsp1_sync_mux_ck" }, { .role = "prcm_fck", .clk = "mcbsp1_sync_mux_ck" },
}; };
static struct omap_hwmod omap44xx_mcbsp1_hwmod = { static struct omap_hwmod omap44xx_mcbsp1_hwmod = {
...@@ -1963,7 +1963,7 @@ static struct omap_hwmod_dma_info omap44xx_mcbsp2_sdma_reqs[] = { ...@@ -1963,7 +1963,7 @@ static struct omap_hwmod_dma_info omap44xx_mcbsp2_sdma_reqs[] = {
static struct omap_hwmod_opt_clk mcbsp2_opt_clks[] = { static struct omap_hwmod_opt_clk mcbsp2_opt_clks[] = {
{ .role = "pad_fck", .clk = "pad_clks_ck" }, { .role = "pad_fck", .clk = "pad_clks_ck" },
{ .role = "prcm_clk", .clk = "mcbsp2_sync_mux_ck" }, { .role = "prcm_fck", .clk = "mcbsp2_sync_mux_ck" },
}; };
static struct omap_hwmod omap44xx_mcbsp2_hwmod = { static struct omap_hwmod omap44xx_mcbsp2_hwmod = {
...@@ -1998,7 +1998,7 @@ static struct omap_hwmod_dma_info omap44xx_mcbsp3_sdma_reqs[] = { ...@@ -1998,7 +1998,7 @@ static struct omap_hwmod_dma_info omap44xx_mcbsp3_sdma_reqs[] = {
static struct omap_hwmod_opt_clk mcbsp3_opt_clks[] = { static struct omap_hwmod_opt_clk mcbsp3_opt_clks[] = {
{ .role = "pad_fck", .clk = "pad_clks_ck" }, { .role = "pad_fck", .clk = "pad_clks_ck" },
{ .role = "prcm_clk", .clk = "mcbsp3_sync_mux_ck" }, { .role = "prcm_fck", .clk = "mcbsp3_sync_mux_ck" },
}; };
static struct omap_hwmod omap44xx_mcbsp3_hwmod = { static struct omap_hwmod omap44xx_mcbsp3_hwmod = {
...@@ -2033,7 +2033,7 @@ static struct omap_hwmod_dma_info omap44xx_mcbsp4_sdma_reqs[] = { ...@@ -2033,7 +2033,7 @@ static struct omap_hwmod_dma_info omap44xx_mcbsp4_sdma_reqs[] = {
static struct omap_hwmod_opt_clk mcbsp4_opt_clks[] = { static struct omap_hwmod_opt_clk mcbsp4_opt_clks[] = {
{ .role = "pad_fck", .clk = "pad_clks_ck" }, { .role = "pad_fck", .clk = "pad_clks_ck" },
{ .role = "prcm_clk", .clk = "mcbsp4_sync_mux_ck" }, { .role = "prcm_fck", .clk = "mcbsp4_sync_mux_ck" },
}; };
static struct omap_hwmod omap44xx_mcbsp4_hwmod = { static struct omap_hwmod omap44xx_mcbsp4_hwmod = {
...@@ -3864,7 +3864,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__l3_main_2 = { ...@@ -3864,7 +3864,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__l3_main_2 = {
}; };
/* usb_host_fs -> l3_main_2 */ /* usb_host_fs -> l3_main_2 */
static struct omap_hwmod_ocp_if omap44xx_usb_host_fs__l3_main_2 = { static struct omap_hwmod_ocp_if __maybe_unused omap44xx_usb_host_fs__l3_main_2 = {
.master = &omap44xx_usb_host_fs_hwmod, .master = &omap44xx_usb_host_fs_hwmod,
.slave = &omap44xx_l3_main_2_hwmod, .slave = &omap44xx_l3_main_2_hwmod,
.clk = "l3_div_ck", .clk = "l3_div_ck",
...@@ -3922,7 +3922,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__l3_main_3 = { ...@@ -3922,7 +3922,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__l3_main_3 = {
}; };
/* aess -> l4_abe */ /* aess -> l4_abe */
static struct omap_hwmod_ocp_if omap44xx_aess__l4_abe = { static struct omap_hwmod_ocp_if __maybe_unused omap44xx_aess__l4_abe = {
.master = &omap44xx_aess_hwmod, .master = &omap44xx_aess_hwmod,
.slave = &omap44xx_l4_abe_hwmod, .slave = &omap44xx_l4_abe_hwmod,
.clk = "ocp_abe_iclk", .clk = "ocp_abe_iclk",
...@@ -4013,7 +4013,7 @@ static struct omap_hwmod_addr_space omap44xx_aess_addrs[] = { ...@@ -4013,7 +4013,7 @@ static struct omap_hwmod_addr_space omap44xx_aess_addrs[] = {
}; };
/* l4_abe -> aess */ /* l4_abe -> aess */
static struct omap_hwmod_ocp_if omap44xx_l4_abe__aess = { static struct omap_hwmod_ocp_if __maybe_unused omap44xx_l4_abe__aess = {
.master = &omap44xx_l4_abe_hwmod, .master = &omap44xx_l4_abe_hwmod,
.slave = &omap44xx_aess_hwmod, .slave = &omap44xx_aess_hwmod,
.clk = "ocp_abe_iclk", .clk = "ocp_abe_iclk",
...@@ -4031,7 +4031,7 @@ static struct omap_hwmod_addr_space omap44xx_aess_dma_addrs[] = { ...@@ -4031,7 +4031,7 @@ static struct omap_hwmod_addr_space omap44xx_aess_dma_addrs[] = {
}; };
/* l4_abe -> aess (dma) */ /* l4_abe -> aess (dma) */
static struct omap_hwmod_ocp_if omap44xx_l4_abe__aess_dma = { static struct omap_hwmod_ocp_if __maybe_unused omap44xx_l4_abe__aess_dma = {
.master = &omap44xx_l4_abe_hwmod, .master = &omap44xx_l4_abe_hwmod,
.slave = &omap44xx_aess_hwmod, .slave = &omap44xx_aess_hwmod,
.clk = "ocp_abe_iclk", .clk = "ocp_abe_iclk",
...@@ -5857,7 +5857,7 @@ static struct omap_hwmod_addr_space omap44xx_usb_host_fs_addrs[] = { ...@@ -5857,7 +5857,7 @@ static struct omap_hwmod_addr_space omap44xx_usb_host_fs_addrs[] = {
}; };
/* l4_cfg -> usb_host_fs */ /* l4_cfg -> usb_host_fs */
static struct omap_hwmod_ocp_if omap44xx_l4_cfg__usb_host_fs = { static struct omap_hwmod_ocp_if __maybe_unused omap44xx_l4_cfg__usb_host_fs = {
.master = &omap44xx_l4_cfg_hwmod, .master = &omap44xx_l4_cfg_hwmod,
.slave = &omap44xx_usb_host_fs_hwmod, .slave = &omap44xx_usb_host_fs_hwmod,
.clk = "l4_div_ck", .clk = "l4_div_ck",
...@@ -6014,13 +6014,13 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { ...@@ -6014,13 +6014,13 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
&omap44xx_iva__l3_main_2, &omap44xx_iva__l3_main_2,
&omap44xx_l3_main_1__l3_main_2, &omap44xx_l3_main_1__l3_main_2,
&omap44xx_l4_cfg__l3_main_2, &omap44xx_l4_cfg__l3_main_2,
&omap44xx_usb_host_fs__l3_main_2, /* &omap44xx_usb_host_fs__l3_main_2, */
&omap44xx_usb_host_hs__l3_main_2, &omap44xx_usb_host_hs__l3_main_2,
&omap44xx_usb_otg_hs__l3_main_2, &omap44xx_usb_otg_hs__l3_main_2,
&omap44xx_l3_main_1__l3_main_3, &omap44xx_l3_main_1__l3_main_3,
&omap44xx_l3_main_2__l3_main_3, &omap44xx_l3_main_2__l3_main_3,
&omap44xx_l4_cfg__l3_main_3, &omap44xx_l4_cfg__l3_main_3,
&omap44xx_aess__l4_abe, /* &omap44xx_aess__l4_abe, */
&omap44xx_dsp__l4_abe, &omap44xx_dsp__l4_abe,
&omap44xx_l3_main_1__l4_abe, &omap44xx_l3_main_1__l4_abe,
&omap44xx_mpu__l4_abe, &omap44xx_mpu__l4_abe,
...@@ -6029,8 +6029,8 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { ...@@ -6029,8 +6029,8 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
&omap44xx_l4_cfg__l4_wkup, &omap44xx_l4_cfg__l4_wkup,
&omap44xx_mpu__mpu_private, &omap44xx_mpu__mpu_private,
&omap44xx_l4_cfg__ocp_wp_noc, &omap44xx_l4_cfg__ocp_wp_noc,
&omap44xx_l4_abe__aess, /* &omap44xx_l4_abe__aess, */
&omap44xx_l4_abe__aess_dma, /* &omap44xx_l4_abe__aess_dma, */
&omap44xx_l3_main_2__c2c, &omap44xx_l3_main_2__c2c,
&omap44xx_l4_wkup__counter_32k, &omap44xx_l4_wkup__counter_32k,
&omap44xx_l4_cfg__ctrl_module_core, &omap44xx_l4_cfg__ctrl_module_core,
...@@ -6136,7 +6136,7 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { ...@@ -6136,7 +6136,7 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
&omap44xx_l4_per__uart2, &omap44xx_l4_per__uart2,
&omap44xx_l4_per__uart3, &omap44xx_l4_per__uart3,
&omap44xx_l4_per__uart4, &omap44xx_l4_per__uart4,
&omap44xx_l4_cfg__usb_host_fs, /* &omap44xx_l4_cfg__usb_host_fs, */
&omap44xx_l4_cfg__usb_host_hs, &omap44xx_l4_cfg__usb_host_hs,
&omap44xx_l4_cfg__usb_otg_hs, &omap44xx_l4_cfg__usb_otg_hs,
&omap44xx_l4_cfg__usb_tll_hs, &omap44xx_l4_cfg__usb_tll_hs,
......
arch/arm/mach-omap2/twl-common.c
View file @ e15ebe05
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "twl-common.h" #include "twl-common.h"
#include "pm.h" #include "pm.h"
#include "voltage.h" #include "voltage.h"
#include "mux.h"
static struct i2c_board_info __initdata pmic_i2c_board_info = { static struct i2c_board_info __initdata pmic_i2c_board_info = {
.addr = 0x48, .addr = 0x48,
...@@ -77,6 +78,7 @@ void __init omap4_pmic_init(const char *pmic_type, ...@@ -77,6 +78,7 @@ void __init omap4_pmic_init(const char *pmic_type,
struct twl6040_platform_data *twl6040_data, int twl6040_irq) struct twl6040_platform_data *twl6040_data, int twl6040_irq)
{ {
/* PMIC part*/ /* PMIC part*/
omap_mux_init_signal("sys_nirq1", OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE);
strncpy(omap4_i2c1_board_info[0].type, pmic_type, strncpy(omap4_i2c1_board_info[0].type, pmic_type,
sizeof(omap4_i2c1_board_info[0].type)); sizeof(omap4_i2c1_board_info[0].type));
omap4_i2c1_board_info[0].irq = OMAP44XX_IRQ_SYS_1N; omap4_i2c1_board_info[0].irq = OMAP44XX_IRQ_SYS_1N;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7