Merge branch 'samsung/pinctrl-exynos' into late/dt

Browse source

* samsung/pinctrl-exynos:
  ARM: EXYNOS: skip wakeup interrupt registration for exynos5250 if pinctrl is enabled
  gpio: samsung: skip gpiolib registration if pinctrl support is enabled for exynos5250
  pinctrl: exynos: add exynos5250 SoC specific data

...

This commit is contained in:

Olof Johansson 2013-04-28 12:02:44 -07:00

parent 41ef2d5678 97916777d6

commit 4fac6f0e65

5 changed files with 113 additions and 0 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

1

arch/arm/mach-exynos/common.c

View file

1

drivers/gpio/gpio-samsung.c

View file

108

drivers/pinctrl/pinctrl-exynos.c

View file

2

drivers/pinctrl/pinctrl-samsung.c

View file

1

drivers/pinctrl/pinctrl-samsung.h

View file