]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge tag 'soc-exynos5420-2' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Wed, 26 Jun 2013 08:26:22 +0000 (17:26 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Wed, 26 Jun 2013 08:26:22 +0000 (17:26 +0900)
based on tags/soc-exynos5420-1
- add pinctrl support for exynos5420

1  2 
Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
drivers/pinctrl/pinctrl-samsung.c
drivers/pinctrl/pinctrl-samsung.h

Simple merge
index 79fcc2076c00d4919df10def1474a5f1cda10bf3,d45caf02b37252771806c6e2ee0b808134a3aa14..11bb75ba81a949e9bf33caa04e97847c494e905f
@@@ -254,10 -254,7 +254,11 @@@ struct samsung_pmx_func 
  extern struct samsung_pin_ctrl exynos4210_pin_ctrl[];
  extern struct samsung_pin_ctrl exynos4x12_pin_ctrl[];
  extern struct samsung_pin_ctrl exynos5250_pin_ctrl[];
+ extern struct samsung_pin_ctrl exynos5420_pin_ctrl[];
  extern struct samsung_pin_ctrl s3c64xx_pin_ctrl[];
 +extern struct samsung_pin_ctrl s3c2412_pin_ctrl[];
 +extern struct samsung_pin_ctrl s3c2416_pin_ctrl[];
 +extern struct samsung_pin_ctrl s3c2440_pin_ctrl[];
 +extern struct samsung_pin_ctrl s3c2450_pin_ctrl[];
  
  #endif /* __PINCTRL_SAMSUNG_H */