Merge branch 'at91/cleanup' into next/dt

Browse source

Conflicts:
	arch/arm/boot/dts/at91sam9rl.dtsi

Needed as a dependency for the at91/dt2 branch

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

...

This commit is contained in:

Arnd Bergmann 2014-05-23 22:59:20 +02:00

parent 21c27cabe6 138e8f1c4e

commit d5cd8605e2

75 changed files with 2004 additions and 1005 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

128

Documentation/devicetree/bindings/clock/at91-clock.txt

View file

6

MAINTAINERS

View file

1

arch/arm/Kconfig

View file

5

arch/arm/boot/dts/at91-cosino_mega2560.dts

View file

8

arch/arm/boot/dts/at91-sama5d3_xplained.dts

View file

23

arch/arm/boot/dts/at91sam9261.dtsi

View file

4

arch/arm/boot/dts/at91sam9261ek.dts

View file

46

arch/arm/boot/dts/at91sam9rl.dtsi

View file

9

arch/arm/boot/dts/at91sam9rlek.dts

View file

61

arch/arm/boot/dts/sama5d3.dtsi

View file

8

arch/arm/boot/dts/sama5d3xcm.dtsi

View file

3

arch/arm/configs/at91sam9g45_defconfig

View file

3

arch/arm/configs/at91sam9rl_defconfig

View file

1

arch/arm/configs/sama5_defconfig

View file

1

arch/arm/mach-at91/at91rm9200_devices.c

View file

12

arch/arm/mach-at91/at91sam9260_devices.c

View file

2

arch/arm/mach-at91/at91sam9261_devices.c

View file

1

arch/arm/mach-at91/at91sam9263_devices.c

View file

2

arch/arm/mach-at91/at91sam9g45.c

View file

64

arch/arm/mach-at91/at91sam9g45_devices.c

View file

7

arch/arm/mach-at91/at91sam9rl.c

View file

82

arch/arm/mach-at91/at91sam9rl_devices.c

View file

2

arch/arm/mach-at91/board-1arm.c

View file

1

arch/arm/mach-at91/board-afeb-9260v1.c

View file

1

arch/arm/mach-at91/board-cam60.c

View file

1

arch/arm/mach-at91/board-carmeva.c

View file

1

arch/arm/mach-at91/board-cpu9krea.c

View file

2

arch/arm/mach-at91/board-cpuat91.c

View file

2

arch/arm/mach-at91/board-csb337.c

View file

1

arch/arm/mach-at91/board-csb637.c

View file

1

arch/arm/mach-at91/board-eb9200.c

View file

1

arch/arm/mach-at91/board-ecbat91.c

View file

2

arch/arm/mach-at91/board-eco920.c

View file

1

arch/arm/mach-at91/board-flexibity.c

View file

1

arch/arm/mach-at91/board-foxg20.c

View file

1

arch/arm/mach-at91/board-gsia18s.c

View file

1

arch/arm/mach-at91/board-kafa.c

View file

1

arch/arm/mach-at91/board-kb9202.c

View file

1

arch/arm/mach-at91/board-pcontrol-g20.c

View file

1

arch/arm/mach-at91/board-picotux200.c

View file

1

arch/arm/mach-at91/board-rm9200ek.c

View file

1

arch/arm/mach-at91/board-rsi-ews.c

View file

1

arch/arm/mach-at91/board-sam9-l9260.c

View file

1

arch/arm/mach-at91/board-sam9260ek.c

View file

1

arch/arm/mach-at91/board-sam9261ek.c

View file

1

arch/arm/mach-at91/board-sam9263ek.c

View file

1

arch/arm/mach-at91/board-sam9g20ek.c

View file

17

arch/arm/mach-at91/board-sam9m10g45ek.c

View file

17

arch/arm/mach-at91/board-sam9rlek.c

View file

1

arch/arm/mach-at91/board-snapper9260.c

View file

1

arch/arm/mach-at91/board-stamp9g20.c

View file

1

arch/arm/mach-at91/board-yl-9200.c

View file

3

arch/arm/mach-at91/board.h

View file

1

arch/arm/mach-at91/gpio.c

View file

8

arch/arm/mach-at91/include/mach/gpio.h → arch/arm/mach-at91/gpio.h

View file

107

arch/arm/mach-at91/include/mach/at91_adc.h

View file

15

arch/arm/mach-at91/include/mach/hardware.h

View file

1

arch/arm/mach-at91/leds.c

View file

1

arch/arm/mach-at91/pm.c

View file

4

drivers/clk/at91/Makefile

View file

599

drivers/clk/at91/clk-main.c

View file

467

drivers/clk/at91/clk-slow.c

View file

17

drivers/clk/at91/pmc.c

View file

9

drivers/clk/at91/pmc.h

View file

57

drivers/clk/at91/sckc.c

View file

22

drivers/clk/at91/sckc.h

View file

346

drivers/iio/adc/at91_adc.c

View file

12

drivers/input/touchscreen/Kconfig

View file

1

drivers/input/touchscreen/Makefile

View file

358

drivers/input/touchscreen/atmel_tsadcc.c

View file

1

include/linux/clk/at91_pmc.h

View file

27

include/linux/platform_data/at91_adc.h

View file

7

include/linux/platform_data/atmel.h

View file

1

sound/soc/atmel/sam9g20_wm8731.c

View file