]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branch 'imx/cleanup' into imx/devel
authorArnd Bergmann <arnd@arndb.de>
Fri, 7 Oct 2011 19:57:31 +0000 (21:57 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 7 Oct 2011 19:57:31 +0000 (21:57 +0200)
This helps resolve the conflicts between the imx cleanups and the
new code that has gone into the imx tree.
Conflict resolution was originally done by Sascha Hauer.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
22 files changed:
1  2 
arch/arm/mach-imx/Makefile
arch/arm/mach-imx/mach-armadillo5x0.c
arch/arm/mach-imx/mach-cpuimx35.c
arch/arm/mach-imx/mach-mx1ads.c
arch/arm/mach-imx/mach-mx27_3ds.c
arch/arm/mach-imx/mach-vpr200.c
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/board-cpuimx51.c
arch/arm/mach-mx5/board-cpuimx51sd.c
arch/arm/mach-mx5/board-mx51_3ds.c
arch/arm/mach-mx5/board-mx51_babbage.c
arch/arm/mach-mx5/board-mx51_efikamx.c
arch/arm/mach-mx5/board-mx51_efikasb.c
arch/arm/mach-mx5/board-mx53_ard.c
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx51.h
arch/arm/mach-mx5/mx51_efika.c
arch/arm/mach-mxs/mach-mx23evk.c
arch/arm/mach-mxs/mach-mx28evk.c
arch/arm/mach-mxs/mach-stmp378x_devb.c
arch/arm/plat-mxc/devices/Kconfig
arch/arm/plat-mxc/include/mach/common.h

index 0a5332c694bd15c71ddc9894df1225f970a734bd,6cc821384ccd994f3de821124d2ebd52cb1fddb5..116d4b2d2817e0fad44d3608a80cce60e76ea07a
@@@ -1,16 -1,15 +1,15 @@@
  obj-$(CONFIG_IMX_HAVE_DMA_V1) += dma-v1.o
  
- obj-$(CONFIG_ARCH_MX1) += clock-imx1.o mm-imx1.o
- obj-$(CONFIG_MACH_MX21) += clock-imx21.o mm-imx21.o
+ obj-$(CONFIG_SOC_IMX1) += clock-imx1.o mm-imx1.o
+ obj-$(CONFIG_SOC_IMX21) += clock-imx21.o mm-imx21.o
  
- obj-$(CONFIG_ARCH_MX25) += clock-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o
 -obj-$(CONFIG_SOC_IMX25) += clock-imx25.o mm-imx25.o ehci-imx25.o
++obj-$(CONFIG_SOC_IMX25) += clock-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o
  
- obj-$(CONFIG_MACH_MX27) += cpu-imx27.o pm-imx27.o
- obj-$(CONFIG_MACH_MX27) += clock-imx27.o mm-imx27.o ehci-imx27.o
+ obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o
+ obj-$(CONFIG_SOC_IMX27) += clock-imx27.o mm-imx27.o ehci-imx27.o
  
- obj-$(CONFIG_SOC_IMX31) += mm-imx31.o cpu-imx31.o clock-imx31.o iomux-imx31.o ehci-imx31.o
- obj-$(CONFIG_SOC_IMX35) += mm-imx35.o cpu-imx35.o clock-imx35.o ehci-imx35.o
- obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o
+ obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o clock-imx31.o iomux-imx31.o ehci-imx31.o
+ obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clock-imx35.o ehci-imx35.o
  
  # Support for CMOS sensor interface
  obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index fb4c503bb052647bc0d85829665961db14d5f319,b4f5ab669e486685d8d210f4f30a36f4082287d7..3d4c31306ca7f1a0dce7513982419564a231f56b
@@@ -142,7 -152,7 +147,8 @@@ config MX51_EFIKA_COMMO
        bool
        select SOC_IMX51
        select IMX_HAVE_PLATFORM_IMX_UART
+       select IMX_HAVE_PLATFORM_MXC_EHCI
 +      select IMX_HAVE_PLATFORM_PATA_IMX
        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
        select IMX_HAVE_PLATFORM_SPI_IMX
        select MXC_ULPI if USB_ULPI
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 4a3cca3725f22e7d7e547e013f205a62fde2b9f3,8b3aa7afdae059cd49a3ab87b688008298cc2e5d..e7bff1e2cd2b7b0bc732598e0e0304ab7fc1c682
  #include <linux/platform_device.h>
  #include <linux/gpio.h>
  #include <linux/leds.h>
- #include <linux/irq.h>
  #include <linux/clk.h>
 +#include <linux/i2c.h>
 +#include <linux/regulator/machine.h>
 +#include <linux/regulator/fixed.h>
  
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
@@@ -373,50 -351,11 +372,55 @@@ static struct mxs_mmc_platform_data mx2
        },
  };
  
 +static struct i2c_board_info mxs_i2c0_board_info[] __initdata = {
 +      {
 +              I2C_BOARD_INFO("sgtl5000", 0x0a),
 +      },
 +};
 +
 +#if defined(CONFIG_REGULATOR_FIXED_VOLTAGE) || defined(CONFIG_REGULATOR_FIXED_VOLTAGE_MODULE)
 +static struct regulator_consumer_supply mx28evk_audio_consumer_supplies[] = {
 +      REGULATOR_SUPPLY("VDDA", "0-000a"),
 +      REGULATOR_SUPPLY("VDDIO", "0-000a"),
 +};
 +
 +static struct regulator_init_data mx28evk_vdd_reg_init_data = {
 +      .constraints    = {
 +              .name   = "3V3",
 +              .always_on = 1,
 +      },
 +      .consumer_supplies = mx28evk_audio_consumer_supplies,
 +      .num_consumer_supplies = ARRAY_SIZE(mx28evk_audio_consumer_supplies),
 +};
 +
 +static struct fixed_voltage_config mx28evk_vdd_pdata = {
 +      .supply_name    = "board-3V3",
 +      .microvolts     = 3300000,
 +      .gpio           = -EINVAL,
 +      .enabled_at_boot = 1,
 +      .init_data      = &mx28evk_vdd_reg_init_data,
 +};
 +static struct platform_device mx28evk_voltage_regulator = {
 +      .name           = "reg-fixed-voltage",
 +      .id             = -1,
 +      .num_resources  = 0,
 +      .dev            = {
 +              .platform_data  = &mx28evk_vdd_pdata,
 +      },
 +};
 +static void __init mx28evk_add_regulators(void)
 +{
 +      platform_device_register(&mx28evk_voltage_regulator);
 +}
 +#else
 +static void __init mx28evk_add_regulators(void) {}
 +#endif
 +
+ static struct gpio mx28evk_lcd_gpios[] = {
+       { MX28EVK_LCD_ENABLE, GPIOF_OUT_INIT_HIGH, "lcd-enable" },
+       { MX28EVK_BL_ENABLE, GPIOF_OUT_INIT_HIGH, "bl-enable" },
+ };
  static void __init mx28evk_init(void)
  {
        int ret;
                mx28_add_flexcan(1, &mx28evk_flexcan_pdata[1]);
        }
  
-       ret = gpio_request_one(MX28EVK_LCD_ENABLE, GPIOF_DIR_OUT, "lcd-enable");
-       if (ret)
-               pr_warn("failed to request gpio lcd-enable: %d\n", ret);
-       else
-               gpio_set_value(MX28EVK_LCD_ENABLE, 1);
-       ret = gpio_request_one(MX28EVK_BL_ENABLE, GPIOF_DIR_OUT, "bl-enable");
+       ret = gpio_request_array(mx28evk_lcd_gpios,
+                                ARRAY_SIZE(mx28evk_lcd_gpios));
        if (ret)
-               pr_warn("failed to request gpio bl-enable: %d\n", ret);
+               pr_warn("failed to request gpio pins for lcd: %d\n", ret);
        else
-               gpio_set_value(MX28EVK_BL_ENABLE, 1);
-       mx28_add_mxsfb(&mx28evk_mxsfb_pdata);
+               mx28_add_mxsfb(&mx28evk_mxsfb_pdata);
  
 +      mx28_add_saif(0);
 +      mx28_add_saif(1);
 +
 +      mx28_add_mxs_i2c(0);
 +      i2c_register_board_info(0, mxs_i2c0_board_info,
 +                              ARRAY_SIZE(mxs_i2c0_board_info));
 +
 +      mx28evk_add_regulators();
 +
 +      mxs_add_platform_device("mxs-sgtl5000", 0, NULL, 0,
 +                      NULL, 0);
 +
        /* power on mmc slot by writing 0 to the gpio */
        ret = gpio_request_one(MX28EVK_MMC0_SLOT_POWER, GPIOF_OUT_INIT_LOW,
                               "mmc0-slot-power");
                               "mmc1-slot-power");
        if (ret)
                pr_warn("failed to request gpio mmc1-slot-power: %d\n", ret);
+       else
+               mx28_add_mxs_mmc(1, &mx28evk_mmc_pdata[1]);
 +      mx28_add_mxs_mmc(1, &mx28evk_mmc_pdata[1]);
 +      mx28_add_rtc_stmp3xxx();
 +
        gpio_led_register_device(0, &mx28evk_led_data);
  }
  
Simple merge
index 5bee446db51fdef18cb6ee0d7a6851e84291b9ac,d7149d1bd32c5e644df3a37edac171f0c7868415..ace4bb550edc6d7e02fd9d58da572a38e4e3a4e8
@@@ -72,19 -71,15 +71,30 @@@ extern void mxc_arch_reset_init(void __
  extern void mx51_efikamx_reset(void);
  extern int mx53_revision(void);
  extern int mx53_display_revision(void);
+ enum mxc_cpu_pwr_mode {
+       WAIT_CLOCKED,           /* wfi only */
+       WAIT_UNCLOCKED,         /* WAIT */
+       WAIT_UNCLOCKED_POWER_OFF,       /* WAIT + SRPG */
+       STOP_POWER_ON,          /* just STOP */
+       STOP_POWER_OFF,         /* STOP + SRPG */
+ };
+ extern void mx5_cpu_lp_set(enum mxc_cpu_pwr_mode mode);
+ extern void (*imx_idle)(void);
 +extern void imx_print_silicon_rev(const char *cpu, int srev);
 +
 +void avic_handle_irq(struct pt_regs *);
 +void tzic_handle_irq(struct pt_regs *);
 +
 +#define imx1_handle_irq avic_handle_irq
 +#define imx21_handle_irq avic_handle_irq
 +#define imx25_handle_irq avic_handle_irq
 +#define imx27_handle_irq avic_handle_irq
 +#define imx31_handle_irq avic_handle_irq
 +#define imx35_handle_irq avic_handle_irq
 +#define imx50_handle_irq tzic_handle_irq
 +#define imx51_handle_irq tzic_handle_irq
 +#define imx53_handle_irq tzic_handle_irq
 +
  #endif