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

Commit c1a5a43c authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'for_3.19/samsung-pinctrl' of... 

Merge tag 'for_3.19/samsung-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/tfiga/samsung-pinctrl into devel

Samsung pinctrl patches for v3.19

1) pinctrl-samsung data structure clean-up

8100cf47 pinctrl: samsung: Separate per-bank init and runtime data
1bf00d7a pinctrl: samsung: Constify samsung_pin_ctrl struct
94ce944b pinctrl: samsung: Constify samsung_pin_bank_type struct
e06deff9 pinctrl: samsung: Drop unused label field in samsung_pin_ctrl struct
87993273 pinctrl: samsung: Make samsung_pinctrl_get_soc_data use ERR_PTR()

2) pinctrl-samsung Exynos7 support

50cea0cf pinctrl: exynos: Add initial driver data for Exynos7
14c255d3 pinctrl: exynos: Add irq_chip instance for Exynos7 wakeup interrupts
6f5e41bd pinctrl: exynos: Consolidate irq domain callbacks
0d3d30db pinctrl: exynos: Generalize the eint16_31 demux code

3) pinctrl-samsung Exynos4415 support

2891ba29 pinctrl: exynos: Add support for Exynos4415
parents 6e08d6bb 2891ba29

Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Required Properties: 
  - "samsung,exynos5250-pinctrl": for Exynos5250 compatible pin-controller.

  - "samsung,exynos5260-pinctrl": for Exynos5260 compatible pin-controller.

  - "samsung,exynos5420-pinctrl": for Exynos5420 compatible pin-controller.

  - "samsung,exynos7-pinctrl": for Exynos7 compatible pin-controller.



- reg: Base address of the pin controller hardware module and length of

  the address space it occupies.
@@ -136,6 +137,8 @@ B. External Wakeup Interrupts: For supporting external wakeup interrupts, a 
       found on Samsung S3C64xx SoCs,

     - samsung,exynos4210-wakeup-eint: represents wakeup interrupt controller

       found on Samsung Exynos4210 and S5PC110/S5PV210 SoCs.

     - samsung,exynos7-wakeup-eint: represents wakeup interrupt controller

       found on Samsung Exynos7 SoC.

   - interrupt-parent: phandle of the interrupt parent to which the external

     wakeup interrupts are forwarded to.

   - interrupts: interrupt used by multiplexed wakeup interrupts.