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

Commit 1f5b7dcf authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'fixes-non-critical' into next/drivers2 



fixes-non-critical has already been merged upstream, and there are a
handful of annoying context conflicts that it makes sense to resolve
before sending up. Part of this is because there was parallel development
going on between more urgent fixes and general driver fixups, it should
settle down once the lpc32xx platform reaches a more steady state.

Conflicts:
	arch/arm/mach-lpc32xx/clock.c
	arch/arm/mach-lpc32xx/common.h

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4788d72c 489e7bec

arch/arm/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -901,6 +901,7 @@ config ARCH_U300 


config ARCH_U8500

	bool "ST-Ericsson U8500 Series"

	depends on MMU

	select CPU_V7

	select ARM_AMBA

	select GENERIC_CLOCKEVENTS
@@ -1577,7 +1578,7 @@ config LOCAL_TIMERS 
config ARCH_NR_GPIO

	int

	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA

	default 350 if ARCH_U8500

	default 355 if ARCH_U8500

	default 0

	help

	  Maximum number of GPIOs in the system.

arch/arm/configs/imx_v4_v5_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ CONFIG_MTD_CFI=y 
CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_GEOMETRY=y

# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set

CONFIG_MTD_MAP_BANK_WIDTH_4=y

# CONFIG_MTD_CFI_I2 is not set

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PHYSMAP=y

arch/arm/mach-davinci/cpufreq.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static int davinci_target(struct cpufreq_policy *policy, 
	if (freqs.old == freqs.new)

		return ret;



	dev_dbg(&cpufreq.dev, "transition: %u --> %u\n", freqs.old, freqs.new);

	dev_dbg(cpufreq.dev, "transition: %u --> %u\n", freqs.old, freqs.new);



	ret = cpufreq_frequency_table_target(policy, pdata->freq_table,

						freqs.new, relation, &idx);

arch/arm/mach-davinci/da850.c

+1 −1
Original line number Diff line number Diff line
@@ -1026,7 +1026,7 @@ static int da850_round_armrate(struct clk *clk, unsigned long rate) 
}

#endif



int da850_register_pm(struct platform_device *pdev)

int __init da850_register_pm(struct platform_device *pdev)

{

	int ret;

	struct davinci_pm_config *pdata = pdev->dev.platform_data;

arch/arm/mach-davinci/dma.c

+1 −5
Original line number Diff line number Diff line
@@ -1508,12 +1508,8 @@ static int __init edma_probe(struct platform_device *pdev) 
			goto fail;

		}



		/* Everything lives on transfer controller 1 until otherwise

		 * specified. This way, long transfers on the low priority queue

		 * started by the codec engine will not cause audio defects.

		 */

		for (i = 0; i < edma_cc[j]->num_channels; i++)

			map_dmach_queue(j, i, EVENTQ_1);

			map_dmach_queue(j, i, info[j]->default_queue);



		queue_tc_mapping = info[j]->queue_tc_mapping;

		queue_priority_mapping = info[j]->queue_priority_mapping;