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

Commit 5e0af24c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32 

Pull AVR32 fixes from Hans-Christian Egtvedt.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  avr32: favr-32: clk_round_rate() can return a zero upon error
  avr32: remove deprecated IRQF_DISABLED
  cpufreq_ at32ap-cpufreq.c: Fix section mismatch
  avr32: pm: Fix section mismatch
  avr32: Kill CONFIG_MTD_PARTITIONS
parents 22056614 464b500e

arch/avr32/boards/favr-32/setup.c

+3 −1
Original line number Diff line number Diff line
@@ -298,8 +298,10 @@ static int __init set_abdac_rate(struct platform_device *pdev) 
	 */

	retval = clk_round_rate(pll1,

			CONFIG_BOARD_FAVR32_ABDAC_RATE * 256 * 16);

	if (retval < 0)

	if (retval <= 0) {

		retval = -EINVAL;

		goto out_abdac;

	}



	retval = clk_set_rate(pll1, retval);

	if (retval != 0)

arch/avr32/configs/atngw100_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 
# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

arch/avr32/configs/atngw100_evklcd100_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 
# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

arch/avr32/configs/atngw100_evklcd101_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 
# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

arch/avr32/configs/atngw100_mrmt_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 
# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y