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

Commit 139ef17a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5446/1: ohci-at91: Limit vbus_pin assignment to the size of the array
  [ARM] 5445/1: AT91: Remove flexible array from USBH platform data
  [ARM] 5447/1: Add SZ_32K
  [ARM] omap: fix omap1 clock usecount decrement bug
  [ARM] pxa: register AC97 controller devices
  [ARM] pxa/csb701: do not register devices on non-csb726 boads
  [ARM] pxa/colibri: get rid of set_irq_type()
  [ARM] pxa/colibri: provide MAC address from ATAG_SERIAL
  [ARM] pxa/cm-x2xx: fix ucb1400 not being registered
  [ARM] pxa: Add support for suspend on PalmTX, T5 and LD
  [ARM] pxa: PalmTE2 support for battery, UDC, IrDA and backlight
  [ARM] pxa: Palm Tungsten E2 basic support
  [ARM] pxa/em-x270: add libertas device registration
  [ARM] pxa/magician: Enable bq24022 regulator for gpio_vbus and pda_power
parents d2e2d7ca 3d6fdf75

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ P: Dirk Opfer 
M:	dirk@opfer-online.de

S:	Maintained



ARM/PALMTX,PALMT5,PALMLD SUPPORT

ARM/PALMTX,PALMT5,PALMLD,PALMTE2 SUPPORT

P:	Marek Vasut

M:	marek.vasut@gmail.com

W:	http://hackndev.com

arch/arm/configs/magician_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -1183,7 +1183,11 @@ CONFIG_RTC_INTF_DEV=y 
CONFIG_RTC_DRV_SA1100=y

# CONFIG_RTC_DRV_PXA is not set

# CONFIG_DMADEVICES is not set

# CONFIG_REGULATOR is not set

CONFIG_REGULATOR=y

# CONFIG_REGULATOR_DEBUG is not set

# CONFIG_REGULATOR_FIXED_VOLTAGE is not set

# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set

CONFIG_REGULATOR_BQ24022=y

# CONFIG_UIO is not set

# CONFIG_STAGING is not set

arch/arm/include/asm/sizes.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#define SZ_4K                           0x00001000

#define SZ_8K                           0x00002000

#define SZ_16K                          0x00004000

#define SZ_32K                          0x00008000

#define SZ_64K                          0x00010000

#define SZ_128K                         0x00020000

#define SZ_256K                         0x00040000

arch/arm/mach-at91/include/mach/board.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ extern void __init at91_add_device_eth(struct at91_eth_data *data); 
 /* USB Host */

struct at91_usbh_data {

	u8		ports;		/* number of ports on root hub */

	u8		vbus_pin[];	/* port power-control pin */

	u8		vbus_pin[2];	/* port power-control pin */

};

extern void __init at91_add_device_usbh(struct at91_usbh_data *data);

arch/arm/mach-omap1/clock.c

+11 −10
Original line number Diff line number Diff line
@@ -590,27 +590,28 @@ static void omap1_init_ext_clk(struct clk * clk) 
static int omap1_clk_enable(struct clk *clk)

{

	int ret = 0;



	if (clk->usecount++ == 0) {

		if (likely(clk->parent)) {

		if (clk->parent) {

			ret = omap1_clk_enable(clk->parent);



			if (unlikely(ret != 0)) {

				clk->usecount--;

				return ret;

			}

			if (ret)

				goto err;



			if (clk->flags & CLOCK_NO_IDLE_PARENT)

				omap1_clk_deny_idle(clk->parent);

		}



		ret = clk->ops->enable(clk);



		if (unlikely(ret != 0) && clk->parent) {

		if (ret) {

			if (clk->parent)

				omap1_clk_disable(clk->parent);

			clk->usecount--;

			goto err;

		}

	}

	return ret;



err:

	clk->usecount--;

	return ret;

}