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

Commit 37e79cbf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh 

SH/R-Mobile fixes for 3.3-rc5

* tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh:
  arch/arm/mach-shmobile/board-ag5evm.c: included linux/dma-mapping.h twice
  ARM: mach-shmobile: r8a7779 PFC IPSR4 fix
  ARM: mach-shmobile: sh73a0 PSTR 32-bit access fix
  ARM: mach-shmobile: add GPIO-to-IRQ translation to sh7372
  ARM: mach-shmobile: clock-sh73a0: add DSIxPHY clock support
  arm: fix compile failure in mach-shmobile/board-ag5evm.c
  ARM: mach-shmobile: mackerel: add ak4642 amixer settings on comment
  ARM: mach-shmobile: mackerel: use renesas_usbhs instead of r8a66597_hcd
  ARM: mach-shmobile: simplify MMCIF DMA configuration
  ARM: mach-shmobile: IRQ driven GPIO key support for Kota2
  ARM: mach-shmobile: sh73a0 IRQ sparse alloc fix
  ARM: mach-shmobile: sh73a0 PINT IRQ base fix
parents 0e69e084 7372a4cd

arch/arm/mach-shmobile/board-ag5evm.c

+15 −14
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/serial_sci.h>

#include <linux/smsc911x.h>

#include <linux/gpio.h>

#include <linux/videodev2.h>

#include <linux/input.h>

#include <linux/input/sh_keysc.h>

#include <linux/mmc/host.h>
@@ -37,7 +38,6 @@ 
#include <linux/mmc/sh_mobile_sdhi.h>

#include <linux/mfd/tmio.h>

#include <linux/sh_clk.h>

#include <linux/dma-mapping.h>

#include <video/sh_mobile_lcdc.h>

#include <video/sh_mipi_dsi.h>

#include <sound/sh_fsi.h>
@@ -159,19 +159,12 @@ static struct resource sh_mmcif_resources[] = { 
	},

};



static struct sh_mmcif_dma sh_mmcif_dma = {

	.chan_priv_rx	= {

		.slave_id	= SHDMA_SLAVE_MMCIF_RX,

	},

	.chan_priv_tx	= {

		.slave_id	= SHDMA_SLAVE_MMCIF_TX,

	},

};

static struct sh_mmcif_plat_data sh_mmcif_platdata = {

	.sup_pclk	= 0,

	.ocr		= MMC_VDD_165_195,

	.caps		= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,

	.dma		= &sh_mmcif_dma,

	.slave_id_tx	= SHDMA_SLAVE_MMCIF_TX,

	.slave_id_rx	= SHDMA_SLAVE_MMCIF_RX,

};



static struct platform_device mmc_device = {
@@ -321,12 +314,11 @@ static struct resource mipidsi0_resources[] = { 
	},

};



#define DSI0PHYCR	0xe615006c

static int sh_mipi_set_dot_clock(struct platform_device *pdev,

				 void __iomem *base,

				 int enable)

{

	struct clk *pck;

	struct clk *pck, *phy;

	int ret;



	pck = clk_get(&pdev->dev, "dsip_clk");
@@ -335,18 +327,27 @@ static int sh_mipi_set_dot_clock(struct platform_device *pdev, 
		goto sh_mipi_set_dot_clock_pck_err;

	}



	phy = clk_get(&pdev->dev, "dsiphy_clk");

	if (IS_ERR(phy)) {

		ret = PTR_ERR(phy);

		goto sh_mipi_set_dot_clock_phy_err;

	}



	if (enable) {

		clk_set_rate(pck, clk_round_rate(pck,  24000000));

		__raw_writel(0x2a809010, DSI0PHYCR);

		clk_set_rate(phy, clk_round_rate(pck, 510000000));

		clk_enable(pck);

		clk_enable(phy);

	} else {

		clk_disable(pck);

		clk_disable(phy);

	}



	ret = 0;



	clk_put(phy);

sh_mipi_set_dot_clock_phy_err:

	clk_put(pck);



sh_mipi_set_dot_clock_pck_err:

	return ret;

}

arch/arm/mach-shmobile/board-ap4evb.c

+2 −10
Original line number Diff line number Diff line
@@ -295,15 +295,6 @@ static struct resource sh_mmcif_resources[] = { 
	},

};



static struct sh_mmcif_dma sh_mmcif_dma = {

	.chan_priv_rx	= {

		.slave_id	= SHDMA_SLAVE_MMCIF_RX,

	},

	.chan_priv_tx	= {

		.slave_id	= SHDMA_SLAVE_MMCIF_TX,

	},

};



static struct sh_mmcif_plat_data sh_mmcif_plat = {

	.sup_pclk	= 0,

	.ocr		= MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
@@ -311,7 +302,8 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = { 
			  MMC_CAP_8_BIT_DATA |

			  MMC_CAP_NEEDS_POLL,

	.get_cd		= slot_cn7_get_cd,

	.dma		= &sh_mmcif_dma,

	.slave_id_tx	= SHDMA_SLAVE_MMCIF_TX,

	.slave_id_rx	= SHDMA_SLAVE_MMCIF_RX,

};



static struct platform_device sh_mmcif_device = {

arch/arm/mach-shmobile/board-kota2.c

+1 −2
Original line number Diff line number Diff line
@@ -143,11 +143,10 @@ static struct gpio_keys_button gpio_buttons[] = { 
static struct gpio_keys_platform_data gpio_key_info = {

	.buttons        = gpio_buttons,

	.nbuttons       = ARRAY_SIZE(gpio_buttons),

	.poll_interval  = 250, /* polled for now */

};



static struct platform_device gpio_keys_device = {

	.name   = "gpio-keys-polled", /* polled for now */

	.name   = "gpio-keys",

	.id     = -1,

	.dev    = {

		.platform_data  = &gpio_key_info,

arch/arm/mach-shmobile/board-mackerel.c

+21 −74
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include <linux/smsc911x.h>

#include <linux/sh_intc.h>

#include <linux/tca6416_keypad.h>

#include <linux/usb/r8a66597.h>

#include <linux/usb/renesas_usbhs.h>

#include <linux/dma-mapping.h>
@@ -145,11 +144,6 @@ 
 * 1-2 short | VBUS 5V       | Host

 * open      | external VBUS | Function

 *

 * *1

 * CN31 is used as

 * CONFIG_USB_R8A66597_HCD	Host

 * CONFIG_USB_RENESAS_USBHS	Function

 *

 * CAUTION

 *

 * renesas_usbhs driver can use external interrupt mode
@@ -161,15 +155,6 @@ 
 * mackerel can not use external interrupt (IRQ7-PORT167) mode on "USB0",

 * because Touchscreen is using IRQ7-PORT40.

 * It is impossible to use IRQ7 demux on this board.

 *

 * We can use external interrupt mode USB-Function on "USB1".

 * USB1 can become Host by r8a66597, and become Function by renesas_usbhs.

 * But don't select both drivers in same time.

 * These uses same IRQ number for request_irq(), and aren't supporting

 * IRQF_SHARED / IORESOURCE_IRQ_SHAREABLE.

 *

 * Actually these are old/new version of USB driver.

 * This mean its register will be broken if it supports shared IRQ,

 */



/*
@@ -207,6 +192,16 @@ 
 *

 */



/*

 * FSI - AK4642

 *

 * it needs amixer settings for playing

 *

 * amixer set "Headphone" on

 * amixer set "HPOUTL Mixer DACH" on

 * amixer set "HPOUTR Mixer DACH" on

 */



/*

 * FIXME !!

 *
@@ -676,51 +671,16 @@ static struct platform_device usbhs0_device = { 
 * Use J30 to select between Host and Function. This setting

 * can however not be detected by software. Hotplug of USBHS1

 * is provided via IRQ8.

 *

 * Current USB1 works as "USB Host".

 *  - set J30 "short"

 *

 * If you want to use it as "USB gadget",

 *  - J30 "open"

 *  - modify usbhs1_get_id() USBHS_HOST -> USBHS_GADGET

 *  - add .get_vbus = usbhs_get_vbus in usbhs1_private

 */

#define IRQ8 evt2irq(0x0300)



/* USBHS1 USB Host support via r8a66597_hcd */

static void usb1_host_port_power(int port, int power)

{

	if (!power) /* only power-on is supported for now */

		return;



	/* set VBOUT/PWEN and EXTLP1 in DVSTCTR */

	__raw_writew(__raw_readw(0xE68B0008) | 0x600, 0xE68B0008);

}



static struct r8a66597_platdata usb1_host_data = {

	.on_chip	= 1,

	.port_power	= usb1_host_port_power,

};



static struct resource usb1_host_resources[] = {

	[0] = {

		.name	= "USBHS1",

		.start	= 0xe68b0000,

		.end	= 0xe68b00e6 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= evt2irq(0x1ce0) /* USB1_USB1I0 */,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device usb1_host_device = {

	.name	= "r8a66597_hcd",

	.id	= 1,

	.dev = {

		.dma_mask		= NULL,         /*  not use dma */

		.coherent_dma_mask	= 0xffffffff,

		.platform_data		= &usb1_host_data,

	},

	.num_resources	= ARRAY_SIZE(usb1_host_resources),

	.resource	= usb1_host_resources,

};



/* USBHS1 USB Function support via renesas_usbhs */



#define USB_PHY_MODE		(1 << 4)

#define USB_PHY_INT_EN		((1 << 3) | (1 << 2))

#define USB_PHY_ON		(1 << 1)
@@ -776,7 +736,7 @@ static void usbhs1_hardware_exit(struct platform_device *pdev) 


static int usbhs1_get_id(struct platform_device *pdev)

{

	return USBHS_GADGET;

	return USBHS_HOST;

}



static u32 usbhs1_pipe_cfg[] = {
@@ -807,7 +767,6 @@ static struct usbhs_private usbhs1_private = { 
			.hardware_exit	= usbhs1_hardware_exit,

			.get_id		= usbhs1_get_id,

			.phy_reset	= usbhs_phy_reset,

			.get_vbus	= usbhs_get_vbus,

		},

		.driver_param = {

			.buswait_bwait	= 4,
@@ -1184,15 +1143,6 @@ static struct resource sh_mmcif_resources[] = { 
	},

};



static struct sh_mmcif_dma sh_mmcif_dma = {

	.chan_priv_rx	= {

		.slave_id	= SHDMA_SLAVE_MMCIF_RX,

	},

	.chan_priv_tx	= {

		.slave_id	= SHDMA_SLAVE_MMCIF_TX,

	},

};



static struct sh_mmcif_plat_data sh_mmcif_plat = {

	.sup_pclk	= 0,

	.ocr		= MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
@@ -1200,7 +1150,8 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = { 
			  MMC_CAP_8_BIT_DATA |

			  MMC_CAP_NEEDS_POLL,

	.get_cd		= slot_cn7_get_cd,

	.dma		= &sh_mmcif_dma,

	.slave_id_tx	= SHDMA_SLAVE_MMCIF_TX,

	.slave_id_rx	= SHDMA_SLAVE_MMCIF_RX,

};



static struct platform_device sh_mmcif_device = {
@@ -1311,7 +1262,6 @@ static struct platform_device *mackerel_devices[] __initdata = { 
	&nor_flash_device,

	&smc911x_device,

	&lcdc_device,

	&usb1_host_device,

	&usbhs1_device,

	&usbhs0_device,

	&leds_device,
@@ -1473,9 +1423,6 @@ static void __init mackerel_init(void) 
	gpio_pull_down(GPIO_PORT167CR); /* VBUS0_1 pull down */

	gpio_request(GPIO_FN_IDIN_1_113, NULL);



	/* USB phy tweak to make the r8a66597_hcd host driver work */

	__raw_writew(0x8a0a, 0xe6058130);       /* USBCR4 */



	/* enable FSI2 port A (ak4643) */

	gpio_request(GPIO_FN_FSIAIBT,	NULL);

	gpio_request(GPIO_FN_FSIAILR,	NULL);

arch/arm/mach-shmobile/clock-sh73a0.c

+113 −0
Original line number Diff line number Diff line
@@ -365,6 +365,114 @@ static struct clk div6_clks[DIV6_NR] = { 
			dsi_parent, ARRAY_SIZE(dsi_parent), 12, 3),

};



/* DSI DIV */

static unsigned long dsiphy_recalc(struct clk *clk)

{

	u32 value;



	value = __raw_readl(clk->mapping->base);



	/* FIXME */

	if (!(value & 0x000B8000))

		return clk->parent->rate;



	value &= 0x3f;

	value += 1;



	if ((value < 12) ||

	    (value > 33)) {

		pr_err("DSIPHY has wrong value (%d)", value);

		return 0;

	}



	return clk->parent->rate / value;

}



static long dsiphy_round_rate(struct clk *clk, unsigned long rate)

{

	return clk_rate_mult_range_round(clk, 12, 33, rate);

}



static void dsiphy_disable(struct clk *clk)

{

	u32 value;



	value = __raw_readl(clk->mapping->base);

	value &= ~0x000B8000;



	__raw_writel(value , clk->mapping->base);

}



static int dsiphy_enable(struct clk *clk)

{

	u32 value;

	int multi;



	value = __raw_readl(clk->mapping->base);

	multi = (value & 0x3f) + 1;



	if ((multi < 12) || (multi > 33))

		return -EIO;



	__raw_writel(value | 0x000B8000, clk->mapping->base);



	return 0;

}



static int dsiphy_set_rate(struct clk *clk, unsigned long rate)

{

	u32 value;

	int idx;



	idx = rate / clk->parent->rate;

	if ((idx < 12) || (idx > 33))

		return -EINVAL;



	idx += -1;



	value = __raw_readl(clk->mapping->base);

	value = (value & ~0x3f) + idx;



	__raw_writel(value, clk->mapping->base);



	return 0;

}



static struct clk_ops dsiphy_clk_ops = {

	.recalc		= dsiphy_recalc,

	.round_rate	= dsiphy_round_rate,

	.set_rate	= dsiphy_set_rate,

	.enable		= dsiphy_enable,

	.disable	= dsiphy_disable,

};



static struct clk_mapping dsi0phy_clk_mapping = {

	.phys	= DSI0PHYCR,

	.len	= 4,

};



static struct clk_mapping dsi1phy_clk_mapping = {

	.phys	= DSI1PHYCR,

	.len	= 4,

};



static struct clk dsi0phy_clk = {

	.ops		= &dsiphy_clk_ops,

	.parent		= &div6_clks[DIV6_DSI0P], /* late install */

	.mapping	= &dsi0phy_clk_mapping,

};



static struct clk dsi1phy_clk = {

	.ops		= &dsiphy_clk_ops,

	.parent		= &div6_clks[DIV6_DSI1P], /* late install */

	.mapping	= &dsi1phy_clk_mapping,

};



static struct clk *late_main_clks[] = {

	&dsi0phy_clk,

	&dsi1phy_clk,

};



enum { MSTP001,

	MSTP129, MSTP128, MSTP127, MSTP126, MSTP125, MSTP118, MSTP116, MSTP100,

	MSTP219,
@@ -429,6 +537,8 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSIT]),

	CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]),

	CLKDEV_ICK_ID("dsip_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSI1P]),

	CLKDEV_ICK_ID("dsiphy_clk", "sh-mipi-dsi.0", &dsi0phy_clk),

	CLKDEV_ICK_ID("dsiphy_clk", "sh-mipi-dsi.1", &dsi1phy_clk),



	/* MSTP32 clocks */

	CLKDEV_DEV_ID("i2c-sh_mobile.2", &mstp_clks[MSTP001]), /* I2C2 */
@@ -504,6 +614,9 @@ void __init sh73a0_clock_init(void) 
	if (!ret)

		ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);



	for (k = 0; !ret && (k < ARRAY_SIZE(late_main_clks)); k++)

		ret = clk_register(late_main_clks[k]);



	clkdev_add_table(lookups, ARRAY_SIZE(lookups));



	if (!ret)