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

Commit 669bb4c5 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 updates from Hans-Christian Noren Egtvedt.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  avr32: wire up pkey syscalls
  AVR32-pio: Replace two seq_printf() calls by seq_puts() in pio_bank_show()
  AVR32-pio: Use seq_putc() in pio_bank_show()
  AVR32-clock: Combine nine seq_printf() calls into one call in clk_show()
  AVR32-clock: Use seq_putc() in two functions
parents 0261b5d3 8712a5b8

arch/avr32/include/uapi/asm/unistd.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -340,5 +340,8 @@ 
#define __NR_copy_file_range    325

#define __NR_copy_file_range    325

#define __NR_preadv2            326

#define __NR_preadv2            326

#define __NR_pwritev2           327

#define __NR_pwritev2           327

#define __NR_pkey_mprotect      328

#define __NR_pkey_alloc         329

#define __NR_pkey_free          330





#endif /* _UAPI__ASM_AVR32_UNISTD_H */
 
#endif /* _UAPI__ASM_AVR32_UNISTD_H */

arch/avr32/kernel/syscall_table.S

+3 −0
Original line number Original line Diff line number Diff line
@@ -341,4 +341,7 @@ sys_call_table: 
	.long __sys_copy_file_range

	.long __sys_copy_file_range

	.long __sys_preadv2

	.long __sys_preadv2

	.long __sys_pwritev2

	.long __sys_pwritev2

	.long sys_pkey_mprotect

	.long sys_pkey_alloc

	.long sys_pkey_free /* 330 */

	.long sys_ni_syscall /* r8 is saturated at nr_syscalls */
 
	.long sys_ni_syscall /* r8 is saturated at nr_syscalls */

arch/avr32/mach-at32ap/clock.c

+21 −12
Original line number Original line Diff line number Diff line
@@ -242,7 +242,7 @@ dump_clock(struct clk *parent, struct clkinf *r) 
		clk_get_rate(parent));

		clk_get_rate(parent));

	if (parent->dev)

	if (parent->dev)

		seq_printf(r->s, ", for %s", dev_name(parent->dev));

		seq_printf(r->s, ", for %s", dev_name(parent->dev));

	seq_printf(r->s, "\n");

	seq_putc(r->s, '\n');





	/* cost of this scan is small, but not linear... */

	/* cost of this scan is small, but not linear... */

	r->nest = nest + NEST_DELTA;

	r->nest = nest + NEST_DELTA;
@@ -261,23 +261,32 @@ static int clk_show(struct seq_file *s, void *unused) 
	struct clk 	*clk;

	struct clk 	*clk;





	/* show all the power manager registers */

	/* show all the power manager registers */

	seq_printf(s, "MCCTRL  = %8x\n", pm_readl(MCCTRL));

	seq_printf(s,

	seq_printf(s, "CKSEL   = %8x\n", pm_readl(CKSEL));

		   "MCCTRL  = %8x\n"

	seq_printf(s, "CPUMASK = %8x\n", pm_readl(CPU_MASK));

		   "CKSEL   = %8x\n"

	seq_printf(s, "HSBMASK = %8x\n", pm_readl(HSB_MASK));

		   "CPUMASK = %8x\n"

	seq_printf(s, "PBAMASK = %8x\n", pm_readl(PBA_MASK));

		   "HSBMASK = %8x\n"

	seq_printf(s, "PBBMASK = %8x\n", pm_readl(PBB_MASK));

		   "PBAMASK = %8x\n"

	seq_printf(s, "PLL0    = %8x\n", pm_readl(PLL0));

		   "PBBMASK = %8x\n"

	seq_printf(s, "PLL1    = %8x\n", pm_readl(PLL1));

		   "PLL0    = %8x\n"

	seq_printf(s, "IMR     = %8x\n", pm_readl(IMR));

		   "PLL1    = %8x\n"

		   "IMR     = %8x\n",

		   pm_readl(MCCTRL),

		   pm_readl(CKSEL),

		   pm_readl(CPU_MASK),

		   pm_readl(HSB_MASK),

		   pm_readl(PBA_MASK),

		   pm_readl(PBB_MASK),

		   pm_readl(PLL0),

		   pm_readl(PLL1),

		   pm_readl(IMR));

	for (i = 0; i < 8; i++) {

	for (i = 0; i < 8; i++) {

		if (i == 5)

		if (i == 5)

			continue;

			continue;

		seq_printf(s, "GCCTRL%d = %8x\n", i, pm_readl(GCCTRL(i)));

		seq_printf(s, "GCCTRL%d = %8x\n", i, pm_readl(GCCTRL(i)));

	}

	}





	seq_printf(s, "\n");

	seq_putc(s, '\n');



	r.s = s;

	r.s = s;

	r.nest = 0;

	r.nest = 0;

	/* protected from changes on the list while dumping */

	/* protected from changes on the list while dumping */

arch/avr32/mach-at32ap/pio.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -367,13 +367,13 @@ static void pio_bank_show(struct seq_file *s, struct gpio_chip *chip) 
			(mask & pdsr) ? "hi" : "lo",

			(mask & pdsr) ? "hi" : "lo",

			(mask & pusr) ? "  " : "up");

			(mask & pusr) ? "  " : "up");

		if (ifsr & mask)

		if (ifsr & mask)

			seq_printf(s, " deglitch");

			seq_puts(s, " deglitch");

		if ((osr & mdsr) & mask)

		if ((osr & mdsr) & mask)

			seq_printf(s, " open-drain");

			seq_puts(s, " open-drain");

		if (imr & mask)

		if (imr & mask)

			seq_printf(s, " irq-%d edge-both",

			seq_printf(s, " irq-%d edge-both",

				gpio_to_irq(chip->base + i));

				gpio_to_irq(chip->base + i));

		seq_printf(s, "\n");

		seq_putc(s, '\n');

	}

	}

}

}