Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history 
…/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
  • Loading branch information
Linus Torvalds committed Dec 10, 2013
2 parents 2205661 + 464b500 commit 5e0af24
Show file tree
Hide file tree
Showing 19 changed files with 6 additions and 19 deletions.
4 changes: 3 additions & 1 deletion arch/avr32/boards/favr-32/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion arch/avr32/configs/atngw100_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/avr32/configs/atngw100_evklcd100_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/avr32/configs/atngw100_evklcd101_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/avr32/configs/atngw100_mrmt_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/avr32/configs/atngw100mkii_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/avr32/configs/atngw100mkii_evklcd100_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,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
Expand Down
1 change: 0 additions & 1 deletion arch/avr32/configs/atngw100mkii_evklcd101_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/avr32/configs/atstk1002_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,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
Expand Down
1 change: 0 additions & 1 deletion arch/avr32/configs/atstk1003_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,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
Expand Down
1 change: 0 additions & 1 deletion arch/avr32/configs/atstk1004_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,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
Expand Down
1 change: 0 additions & 1 deletion arch/avr32/configs/atstk1006_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,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
Expand Down
1 change: 0 additions & 1 deletion arch/avr32/configs/favr-32_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,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
Expand Down
1 change: 0 additions & 1 deletion arch/avr32/configs/hammerhead_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,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
Expand Down
1 change: 0 additions & 1 deletion arch/avr32/configs/merisc_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
# CONFIG_FW_LOADER is not set
CONFIG_MTD=y
CONFIG_MTD_CONCAT=y
CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
Expand Down
1 change: 0 additions & 1 deletion arch/avr32/configs/mimc200_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,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
Expand Down
2 changes: 1 addition & 1 deletion arch/avr32/kernel/time.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
static struct irqaction timer_irqaction = {
.handler = timer_interrupt,
/* Oprofile uses the same irq as the timer, so allow it to be shared */
.flags = IRQF_TIMER | IRQF_DISABLED | IRQF_SHARED,
.flags = IRQF_TIMER | IRQF_SHARED,
.name = "avr32_comparator",
};

Expand Down
2 changes: 1 addition & 1 deletion arch/avr32/mach-at32ap/pm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ static const struct platform_suspend_ops avr32_pm_ops = {
.enter = avr32_pm_enter,
};

static unsigned long avr32_pm_offset(void *symbol)
static unsigned long __init avr32_pm_offset(void *symbol)
{
extern u8 pm_exception[];

Expand Down
2 changes: 1 addition & 1 deletion drivers/cpufreq/at32ap-cpufreq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ static int at32_set_target(struct cpufreq_policy *policy, unsigned int index)
return 0;
}

static int __init at32_cpufreq_driver_init(struct cpufreq_policy *policy)
static int at32_cpufreq_driver_init(struct cpufreq_policy *policy)
{
unsigned int frequency, rate, min_freq;
int retval, steps, i;
Expand Down

0 comments on commit 5e0af24

Please sign in to comment.