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

Commit 125c9671 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.7-rc1/fixes-signed' of... 

Merge tag 'omap-for-v3.7-rc1/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren:

This branch contains one counter locking fix and an
alignment fix. Other fixes are warning fixes, fixes
for return value checks.

I've also included removal of some extra semicolons,
dropping of some duplicate includes, and an a change
for wl12xx enumeration that are not strictly fixes
but would be good to get out of the way for -rc1.

* tag 'omap-for-v3.7-rc1/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  arm/omap: Replace board_ref_clock with enum values
  ARM: OMAP2+: remove duplicated include from board-omap3stalker.c
  arch/arm/plat-omap/omap-pm-noop.c: Remove unecessary semicolon
  arch/arm/mach-omap2: Remove unecessary semicolon
  arch/arm/mach-omap1/devices.c: Remove unecessary semicolon
  AM35xx: Add missing hwmod entry for the HDQ/1-Wire present in AM3505/3517 CPUs.
  ARM: OMAP2+: gpmc: annotate exit sections properly
  ARM: OMAP: fix return value check in realtime_counter_init()
  ARM: OMAP: hsmmc: fix return value check in omap_hsmmc_init_one()
  OMAPDSS: fix return value check in create_dss_pdev()
  ARM: OMAP2+: Add am335x evm and bone targets to common Makefile
  arm: increase FORCE_MAX_ZONEORDER for TI AM33XX
  ARM: OMAP: OMAP_DEBUG_LEDS needs to select LEDS_CLASS
  ARM: OMAP: rx51: Fix a section mismatch warn
  ARM: OMAP2+: Round of the carve out memory requested to section_size
  ARM: OMAP: counter: add locking to read_persistent_clock
parents bfbad32a 224cd711

arch/arm/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -1767,6 +1767,7 @@ source "mm/Kconfig" 
config FORCE_MAX_ZONEORDER

config FORCE_MAX_ZONEORDER

	int "Maximum zone order" if ARCH_SHMOBILE

	int "Maximum zone order" if ARCH_SHMOBILE

	range 11 64 if ARCH_SHMOBILE

	range 11 64 if ARCH_SHMOBILE

	default "12" if SOC_AM33XX

	default "9" if SA1111

	default "9" if SA1111

	default "11"

	default "11"

	help

	help

arch/arm/boot/dts/Makefile

+3 −1
Original line number Original line Diff line number Diff line
@@ -68,7 +68,9 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap4-pandaES.dtb \

	omap4-pandaES.dtb \

	omap4-var_som.dtb \

	omap4-var_som.dtb \

	omap4-sdp.dtb \

	omap4-sdp.dtb \

	omap5-evm.dtb

	omap5-evm.dtb \

	am335x-evm.dtb \

	am335x-bone.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb

dtb-$(CONFIG_ARCH_U8500) += snowball.dtb

dtb-$(CONFIG_ARCH_U8500) += snowball.dtb

dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \

dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \

arch/arm/mach-omap1/devices.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -231,7 +231,7 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, 




		omap_mmc_add("mmci-omap", i, base, size, irq,

		omap_mmc_add("mmci-omap", i, base, size, irq,

				rx_req, tx_req, mmc_data[i]);

				rx_req, tx_req, mmc_data[i]);

	};

	}

}

}





#endif

#endif

arch/arm/mach-omap2/board-flash.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -218,7 +218,7 @@ void __init board_flash_init(struct flash_partitions partition_info[], 
			if (onenandcs > GPMC_CS_NUM)

			if (onenandcs > GPMC_CS_NUM)

				onenandcs = cs;

				onenandcs = cs;

			break;

			break;

		};

		}

		cs++;

		cs++;

	}

	}

arch/arm/mach-omap2/board-omap3stalker.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -48,11 +48,6 @@ 
#include <video/omap-panel-tfp410.h>

#include <video/omap-panel-tfp410.h>





#include <linux/platform_data/spi-omap2-mcspi.h>

#include <linux/platform_data/spi-omap2-mcspi.h>

#include <linux/input/matrix_keypad.h>

#include <linux/spi/spi.h>

#include <linux/interrupt.h>

#include <linux/smsc911x.h>

#include <linux/i2c/at24.h>





#include "sdram-micron-mt46h32m32lf-6.h"

#include "sdram-micron-mt46h32m32lf-6.h"

#include "mux.h"

#include "mux.h"