Merge branch 'cris' of git://www.jni.nu/cris
* 'cris' of git://www.jni.nu/cris: (158 commits) CRIS v32: Remove hwregs/timer_defs.h, it is now architecture specific. CRIS v32: Change drivers/i2c.c locking. CRIS v32: Rewrite ARTPEC-3 gpio driver to avoid volatiles and general cleanup. CRIS: Add new timerfd syscall entries. MAINTAINERS: Add my information for the CRIS port. CRIS v32: Correct spelling of bandwidth in function name. CRIS v32: Clean up nandflash.c for ARTPEC-3 and ETRAX FS. CRIS v10: Cleanup of drivers/gpio.c CRIS v10: drivers/net/cris/eth_v10.c rename LED defines to CRIS_LED to avoid name clash. CRIS: Make io_pwm_set_period members unsigned in etraxgpio.h CRIS: Move ETRAX_AXISFLASHMAP to common Kconfig file. CRIS: Drop regs parameter from call to profile_tick in kernel/time.c CRIS v32: Fix minor formatting issue in mach-a3/io.c CRIS v32: Initialize GIO even if we're rambooting in kernel/head.S CRIS v32: Remove kernel/arbiter.c, it now exists in machine dependent directory. CRIS v32: Minor changes to avoid errors in asm-cris/arch-v32/hwregs/reg_rdwr.h CRIS v32: arch-v32/hwregs/intr_vect_defs.h moved to machine dependent directory. CRIS v32: Correct offset for TASK_pid in asm-cris/arch-v32/offset.h CRIS v32: Move register map header to machine dependent directory. CRIS v32: Let compiler know that memory is clobbered after a break op. ...
No related branches found
No related tags found
Showing
- MAINTAINERS 2 additions, 0 deletionsMAINTAINERS
- arch/cris/Kconfig 498 additions, 40 deletionsarch/cris/Kconfig
- arch/cris/Makefile 70 additions, 69 deletionsarch/cris/Makefile
- arch/cris/arch-v10/Kconfig 4 additions, 63 deletionsarch/cris/arch-v10/Kconfig
- arch/cris/arch-v10/boot/Makefile 16 additions, 8 deletionsarch/cris/arch-v10/boot/Makefile
- arch/cris/arch-v10/boot/compressed/Makefile 19 additions, 29 deletionsarch/cris/arch-v10/boot/compressed/Makefile
- arch/cris/arch-v10/boot/compressed/misc.c 2 additions, 4 deletionsarch/cris/arch-v10/boot/compressed/misc.c
- arch/cris/arch-v10/boot/rescue/Makefile 19 additions, 37 deletionsarch/cris/arch-v10/boot/rescue/Makefile
- arch/cris/arch-v10/boot/rescue/head.S 68 additions, 61 deletionsarch/cris/arch-v10/boot/rescue/head.S
- arch/cris/arch-v10/boot/rescue/kimagerescue.S 29 additions, 29 deletionsarch/cris/arch-v10/boot/rescue/kimagerescue.S
- arch/cris/arch-v10/boot/rescue/testrescue.S 5 additions, 7 deletionsarch/cris/arch-v10/boot/rescue/testrescue.S
- arch/cris/arch-v10/drivers/Kconfig 0 additions, 181 deletionsarch/cris/arch-v10/drivers/Kconfig
- arch/cris/arch-v10/drivers/Makefile 6 additions, 6 deletionsarch/cris/arch-v10/drivers/Makefile
- arch/cris/arch-v10/drivers/axisflashmap.c 37 additions, 144 deletionsarch/cris/arch-v10/drivers/axisflashmap.c
- arch/cris/arch-v10/drivers/ds1302.c 2 additions, 2 deletionsarch/cris/arch-v10/drivers/ds1302.c
- arch/cris/arch-v10/drivers/eeprom.c 2 additions, 73 deletionsarch/cris/arch-v10/drivers/eeprom.c
- arch/cris/arch-v10/drivers/gpio.c 250 additions, 384 deletionsarch/cris/arch-v10/drivers/gpio.c
- arch/cris/arch-v10/drivers/i2c.c 3 additions, 78 deletionsarch/cris/arch-v10/drivers/i2c.c
- arch/cris/arch-v10/drivers/pcf8563.c 220 additions, 173 deletionsarch/cris/arch-v10/drivers/pcf8563.c
- arch/cris/arch-v10/drivers/sync_serial.c 1441 additions, 0 deletionsarch/cris/arch-v10/drivers/sync_serial.c
Loading
Please register or sign in to comment