Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 355377
b: refs/heads/master
c: 6e5469a
h: refs/heads/master
i:
  355375: 493e7b0
v: v3
  • Loading branch information
Laurent Pinchart authored and Simon Horman committed Jan 25, 2013
1 parent eadaf77 commit 281f845
Show file tree
Hide file tree
Showing 6 changed files with 1,668 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 881023d28b465eb457067dc8bbca0f24d8b34279
refs/heads/master: 6e5469a6b149568355e81d791099d0cbf2a4a37a
5 changes: 5 additions & 0 deletions trunk/drivers/pinctrl/sh-pfc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,9 @@ config PINCTRL_PFC_R8A7779
depends on ARCH_R8A7779
select PINCTRL_SH_PFC

config PINCTRL_PFC_SH7372
def_bool y
depends on ARCH_SH7372
select PINCTRL_SH_PFC

endif
1 change: 1 addition & 0 deletions trunk/drivers/pinctrl/sh-pfc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ endif
obj-$(CONFIG_PINCTRL_SH_PFC) += sh-pfc.o
obj-$(CONFIG_PINCTRL_PFC_R8A7740) += pfc-r8a7740.o
obj-$(CONFIG_PINCTRL_PFC_R8A7779) += pfc-r8a7779.o
obj-$(CONFIG_PINCTRL_PFC_SH7372) += pfc-sh7372.o
3 changes: 3 additions & 0 deletions trunk/drivers/pinctrl/sh-pfc/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,9 @@ static const struct platform_device_id sh_pfc_id_table[] = {
#endif
#ifdef CONFIG_PINCTRL_PFC_R8A7779
{ "pfc-r8a7779", (kernel_ulong_t)&r8a7779_pinmux_info },
#endif
#ifdef CONFIG_PINCTRL_PFC_SH7372
{ "pfc-sh7372", (kernel_ulong_t)&sh7372_pinmux_info },
#endif
{ "sh-pfc", 0 },
{ },
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/pinctrl/sh-pfc/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,6 @@ int sh_pfc_config_gpio(struct sh_pfc *pfc, unsigned gpio, int pinmux_type,

extern struct sh_pfc_soc_info r8a7740_pinmux_info;
extern struct sh_pfc_soc_info r8a7779_pinmux_info;
extern struct sh_pfc_soc_info sh7372_pinmux_info;

#endif /* __SH_PFC_CORE_H__ */
Loading

0 comments on commit 281f845

Please sign in to comment.