Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 355387
b: refs/heads/master
c: 0bb9267
h: refs/heads/master
i:
  355385: 3bb9544
  355383: 761922a
v: v3
  • Loading branch information
Laurent Pinchart authored and Simon Horman committed Jan 25, 2013
1 parent 6be1e05 commit 25f4c0d
Show file tree
Hide file tree
Showing 6 changed files with 2,293 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: ac1ebc2190f575fce6685941f5eeecac808ba467
refs/heads/master: 0bb92677ab45e09f99bca06ec6635852ee6ec893
6 changes: 6 additions & 0 deletions trunk/drivers/pinctrl/sh-pfc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,10 @@ config PINCTRL_PFC_SH7734
depends on GENERIC_GPIO
select PINCTRL_SH_PFC

config PINCTRL_PFC_SH7757
def_bool y
depends on CPU_SUBTYPE_SH7757
depends on GENERIC_GPIO
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 @@ -15,3 +15,4 @@ obj-$(CONFIG_PINCTRL_PFC_SH7722) += pfc-sh7722.o
obj-$(CONFIG_PINCTRL_PFC_SH7723) += pfc-sh7723.o
obj-$(CONFIG_PINCTRL_PFC_SH7724) += pfc-sh7724.o
obj-$(CONFIG_PINCTRL_PFC_SH7734) += pfc-sh7734.o
obj-$(CONFIG_PINCTRL_PFC_SH7757) += pfc-sh7757.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 @@ -591,6 +591,9 @@ static const struct platform_device_id sh_pfc_id_table[] = {
#endif
#ifdef CONFIG_PINCTRL_PFC_SH7734
{ "pfc-sh7734", (kernel_ulong_t)&sh7734_pinmux_info },
#endif
#ifdef CONFIG_PINCTRL_PFC_SH7757
{ "pfc-sh7757", (kernel_ulong_t)&sh7757_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 @@ -63,5 +63,6 @@ extern struct sh_pfc_soc_info sh7722_pinmux_info;
extern struct sh_pfc_soc_info sh7723_pinmux_info;
extern struct sh_pfc_soc_info sh7724_pinmux_info;
extern struct sh_pfc_soc_info sh7734_pinmux_info;
extern struct sh_pfc_soc_info sh7757_pinmux_info;

#endif /* __SH_PFC_CORE_H__ */
Loading

0 comments on commit 25f4c0d

Please sign in to comment.