Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 (0df28363) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/mach-omap1/board-h2-mmc.c

+4 −10

Original line number	Diff line number	Diff line
		@@ -26,19 +26,13 @@
		static int mmc_set_power(struct device *dev, int slot, int power_on,
		int vdd)
		{
		if (power_on)
		gpio_direction_output(H2_TPS_GPIO_MMC_PWR_EN, 1);
		else
		gpio_direction_output(H2_TPS_GPIO_MMC_PWR_EN, 0);

		gpio_set_value(H2_TPS_GPIO_MMC_PWR_EN, power_on);
		return 0;
		}

		static int mmc_late_init(struct device *dev)
		{
		int ret;

		ret = gpio_request(H2_TPS_GPIO_MMC_PWR_EN, "MMC power");
		int ret = gpio_request(H2_TPS_GPIO_MMC_PWR_EN, "MMC power");
		if (ret < 0)
		return ret;

		@@ -47,7 +41,7 @@ static int mmc_late_init(struct device *dev)
		return ret;
		}

		static void mmc_shutdown(struct device *dev)
		static void mmc_cleanup(struct device *dev)
		{
		gpio_free(H2_TPS_GPIO_MMC_PWR_EN);
		}
		@@ -60,7 +54,7 @@ static void mmc_shutdown(struct device *dev)
		static struct omap_mmc_platform_data mmc1_data = {
		.nr_slots = 1,
		.init = mmc_late_init,
		.shutdown = mmc_shutdown,
		.cleanup = mmc_cleanup,
		.dma_mask = 0xffffffff,
		.slots[0] = {
		.set_power = mmc_set_power,

arch/arm/mach-omap1/board-h3-mmc.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -26,11 +26,7 @@
		static int mmc_set_power(struct device *dev, int slot, int power_on,
		int vdd)
		{
		if (power_on)
		gpio_direction_output(H3_TPS_GPIO_MMC_PWR_EN, 1);
		else
		gpio_direction_output(H3_TPS_GPIO_MMC_PWR_EN, 0);

		gpio_set_value(H3_TPS_GPIO_MMC_PWR_EN, power_on);
		return 0;
		}

arch/arm/mach-omap1/board-h3.c

+0 −101

Original line number	Diff line number	Diff line
		@@ -39,12 +39,10 @@
		#include <asm/mach/flash.h>
		#include <asm/mach/map.h>

		#include <mach/gpioexpander.h>
		#include <mach/irqs.h>
		#include <mach/mux.h>
		#include <mach/tc.h>
		#include <mach/nand.h>
		#include <mach/irda.h>
		#include <mach/usb.h>
		#include <mach/keypad.h>
		#include <mach/dma.h>
		@@ -276,104 +274,6 @@ static struct platform_device h3_kp_device = {
		.resource = h3_kp_resources,
		};


		/* Select between the IrDA and aGPS module
		*/
		static int h3_select_irda(struct device *dev, int state)
		{
		unsigned char expa;
		int err = 0;

		if ((err = read_gpio_expa(&expa, 0x26))) {
		printk(KERN_ERR "Error reading from I/O EXPANDER \n");
		return err;
		}

		/* 'P6' enable/disable IRDA_TX and IRDA_RX */
		if (state & IR_SEL) { /* IrDA */
		if ((err = write_gpio_expa(expa \| 0x40, 0x26))) {
		printk(KERN_ERR "Error writing to I/O EXPANDER \n");
		return err;
		}
		} else {
		if ((err = write_gpio_expa(expa & ~0x40, 0x26))) {
		printk(KERN_ERR "Error writing to I/O EXPANDER \n");
		return err;
		}
		}
		return err;
		}

		static void set_trans_mode(struct work_struct *work)
		{
		struct omap_irda_config *irda_config =
		container_of(work, struct omap_irda_config, gpio_expa.work);
		int mode = irda_config->mode;
		unsigned char expa;
		int err = 0;

		if ((err = read_gpio_expa(&expa, 0x27)) != 0) {
		printk(KERN_ERR "Error reading from I/O expander\n");
		}

		expa &= ~0x03;

		if (mode & IR_SIRMODE) {
		expa \|= 0x01;
		} else { /* MIR/FIR */
		expa \|= 0x03;
		}

		if ((err = write_gpio_expa(expa, 0x27)) != 0) {
		printk(KERN_ERR "Error writing to I/O expander\n");
		}
		}

		static int h3_transceiver_mode(struct device *dev, int mode)
		{
		struct omap_irda_config *irda_config = dev->platform_data;

		irda_config->mode = mode;
		cancel_delayed_work(&irda_config->gpio_expa);
		PREPARE_DELAYED_WORK(&irda_config->gpio_expa, set_trans_mode);
		schedule_delayed_work(&irda_config->gpio_expa, 0);

		return 0;
		}

		static struct omap_irda_config h3_irda_data = {
		.transceiver_cap = IR_SIRMODE \| IR_MIRMODE \| IR_FIRMODE,
		.transceiver_mode = h3_transceiver_mode,
		.select_irda = h3_select_irda,
		.rx_channel = OMAP_DMA_UART3_RX,
		.tx_channel = OMAP_DMA_UART3_TX,
		.dest_start = UART3_THR,
		.src_start = UART3_RHR,
		.tx_trigger = 0,
		.rx_trigger = 0,
		};

		static struct resource h3_irda_resources[] = {
		[0] = {
		.start = INT_UART3,
		.end = INT_UART3,
		.flags = IORESOURCE_IRQ,
		},
		};

		static u64 irda_dmamask = 0xffffffff;

		static struct platform_device h3_irda_device = {
		.name = "omapirda",
		.id = 0,
		.dev = {
		.platform_data = &h3_irda_data,
		.dma_mask = &irda_dmamask,
		},
		.num_resources = ARRAY_SIZE(h3_irda_resources),
		.resource = h3_irda_resources,
		};

		static struct platform_device h3_lcd_device = {
		.name = "lcd_h3",
		.id = -1,
		@@ -395,7 +295,6 @@ static struct platform_device *devices[] __initdata = {
		&nand_device,
		&smc91x_device,
		&intlat_device,
		&h3_irda_device,
		&h3_kp_device,
		&h3_lcd_device,
		};

arch/arm/mach-omap1/board-nokia770.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -181,11 +181,7 @@ static struct omap_usb_config nokia770_usb_config __initdata = {
		static int nokia770_mmc_set_power(struct device *dev, int slot, int power_on,
		int vdd)
		{
		if (power_on)
		gpio_set_value(NOKIA770_GPIO_MMC_POWER, 1);
		else
		gpio_set_value(NOKIA770_GPIO_MMC_POWER, 0);

		gpio_set_value(NOKIA770_GPIO_MMC_POWER, power_on);
		return 0;
		}

arch/arm/mach-omap1/mcbsp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -40,8 +40,8 @@ static void omap1_mcbsp_request(unsigned int id)
		*/
		if (id == OMAP_MCBSP1 \|\| id == OMAP_MCBSP3) {
		if (dsp_use++ == 0) {
		api_clk = clk_get(NULL, "api_clk");
		dsp_clk = clk_get(NULL, "dsp_clk");
		api_clk = clk_get(NULL, "api_ck");
		dsp_clk = clk_get(NULL, "dsp_ck");
		if (!IS_ERR(api_clk) && !IS_ERR(dsp_clk)) {
		clk_enable(api_clk);
		clk_enable(dsp_clk);