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

Commit be2874cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-3.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

These are the bug fixes that have accumulated since 3.3-rc3 in arm-soc.
The majority of them are regression fixes for stuff that broke during
the merge 3.3 window.

The notable ones are:

* The at91 ata drivers both broke because of an earlier cleanup patch that
  some other patches were based on. Jean-Christophe decided to remove
  the legacy at91_ide driver and fix the new-style at91-pata driver while
  keeping the cleanup patch. I almost rejected the patches for being too
  late and too big but in the end decided to accept them because they
  fix a regression.

* A patch fixing build breakage from the sysdev-to-device conversion
  colliding with other changes touches a number of mach-s3c files.

* b0654037 "ARM: orion: Fix Orion5x GPIO regression from MPP cleanup"
  is a mechanical change that unfortunately touches a lot of lines
  that should up in the diffstat.

* tag 'fixes-3.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
  ARM: at91: drop ide driver in favor of the pata one
  pata/at91: use newly introduced SMC accessors
  ARM: at91: add accessor to manage SMC
  ARM: at91:rtc/rtc-at91sam9: ioremap register bank
  ARM: at91: USB AT91 gadget registration for module
  ep93xx: fix build of vision_ep93xx.c
  ARM: OMAP2xxx: PM: fix OMAP2xxx-specific UART idle bug in v3.3
  ARM: orion: Fix USB phy for orion5x.
  ARM: orion: Fix Orion5x GPIO regression from MPP cleanup
  ARM: EXYNOS: Add cpu-offset property in gic device tree node
  ARM: EXYNOS: Bring exynos4-dt up to date
  ARM: OMAP3: cm-t35: fix section mismatch warning
  ARM: OMAP2: Fix the OMAP2 only build break seen with 2011+ ARM tool-chains
  ARM: tegra: paz00: fix wrong UART port on mini-pcie plug
  ARM: tegra: paz00: fix wrong SD1 power gpio
  i2c: tegra: Add devexit_p() for remove
  ARM: EXYNOS: Correct M-5MOLS sensor clock frequency on Universal C210 board
  ARM: EXYNOS: Correct framebuffer window size on Nuri board
  ARM: SAMSUNG: Fix missing api-change from subsys_interface change
  ARM: EXYNOS: Fix "warning: initialization from incompatible pointer type"
  ...
parents 584216b7 a5368e77

arch/arm/boot/dts/exynos4210.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
		compatible = "arm,cortex-a9-gic";

		#interrupt-cells = <3>;

		interrupt-controller;

		cpu-offset = <0x8000>;

		reg = <0x10490000 0x1000>, <0x10480000 0x100>;

	};

arch/arm/boot/dts/tegra-paz00.dts

+3 −3
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ 
	};



	serial@70006200 {

		status = "disable";

		clock-frequency = <216000000>;

	};



	serial@70006300 {

		clock-frequency = <216000000>;

		status = "disable";

	};



	serial@70006400 {
@@ -60,7 +60,7 @@ 
	sdhci@c8000000 {

		cd-gpios = <&gpio 173 0>; /* gpio PV5 */

		wp-gpios = <&gpio 57 0>;  /* gpio PH1 */

		power-gpios = <&gpio 155 0>; /* gpio PT3 */

		power-gpios = <&gpio 169 0>; /* gpio PV1 */

	};



	sdhci@c8000200 {

arch/arm/mach-at91/at91rm9200_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} 
 *  USB Device (Gadget)

 * -------------------------------------------------------------------- */



#ifdef CONFIG_USB_AT91

#if defined(CONFIG_USB_AT91) || defined(CONFIG_USB_AT91_MODULE)

static struct at91_udc_data udc_data;



static struct resource udc_resources[] = {

arch/arm/mach-at91/at91sam9260_devices.c

+3 −6
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} 
 *  USB Device (Gadget)

 * -------------------------------------------------------------------- */



#ifdef CONFIG_USB_AT91

#if defined(CONFIG_USB_AT91) || defined(CONFIG_USB_AT91_MODULE)

static struct at91_udc_data udc_data;



static struct resource udc_resources[] = {
@@ -1215,8 +1215,7 @@ void __init at91_add_device_serial(void) {} 
 *  CF/IDE

 * -------------------------------------------------------------------- */



#if defined(CONFIG_BLK_DEV_IDE_AT91) || defined(CONFIG_BLK_DEV_IDE_AT91_MODULE) || \

	defined(CONFIG_PATA_AT91) || defined(CONFIG_PATA_AT91_MODULE) || \

#if defined(CONFIG_PATA_AT91) || defined(CONFIG_PATA_AT91_MODULE) || \

	defined(CONFIG_AT91_CF) || defined(CONFIG_AT91_CF_MODULE)



static struct at91_cf_data cf0_data;
@@ -1313,10 +1312,8 @@ void __init at91_add_device_cf(struct at91_cf_data *data) 
	if (data->flags & AT91_CF_TRUE_IDE)

#if defined(CONFIG_PATA_AT91) || defined(CONFIG_PATA_AT91_MODULE)

		pdev->name = "pata_at91";

#elif defined(CONFIG_BLK_DEV_IDE_AT91) || defined(CONFIG_BLK_DEV_IDE_AT91_MODULE)

		pdev->name = "at91_ide";

#else

#warning "board requires AT91_CF_TRUE_IDE: enable either at91_ide or pata_at91"

#warning "board requires AT91_CF_TRUE_IDE: enable pata_at91"

#endif

	else

		pdev->name = "at91_cf";

arch/arm/mach-at91/at91sam9261_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} 
 *  USB Device (Gadget)

 * -------------------------------------------------------------------- */



#ifdef CONFIG_USB_AT91

#if defined(CONFIG_USB_AT91) || defined(CONFIG_USB_AT91_MODULE)

static struct at91_udc_data udc_data;



static struct resource udc_resources[] = {