diff options
| author | Christophe Leroy <christophe.leroy@c-s.fr> | 2017-12-13 12:26:23 +0100 |
|---|---|---|
| committer | Scott Wood <oss@buserror.net> | 2018-01-21 06:29:02 +0100 |
| commit | c095ff93f901c1620b28dce4d813dd548bc5236b (patch) | |
| tree | 55eae5b85d07619c35e7f7053568559d9f1a1545 /arch/powerpc/include/asm | |
| parent | powerpc/fsl_pci: Fix ptr_ret.cocci warnings (diff) | |
| download | linux-c095ff93f901c1620b28dce4d813dd548bc5236b.tar.xz linux-c095ff93f901c1620b28dce4d813dd548bc5236b.zip | |
powerpc/sysdev: change CPM GPIO to platform_device
Since commit 9427ecbed46cc ("gpio: Rework of_gpiochip_set_names()
to use device property accessors"), gpio chips have to have a
parent, otherwise devprop_gpiochip_set_names() prematurely exists
with message "GPIO chip parent is NULL" and doesn't proceed
'gpio-line-names' DT property.
This patch wraps the CPM GPIO into a platform driver to allow
assignment of the parent device.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'arch/powerpc/include/asm')
| -rw-r--r-- | arch/powerpc/include/asm/cpm.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/cpm1.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/cpm.h b/arch/powerpc/include/asm/cpm.h index b925df1b87d0..4c24ea8209bb 100644 --- a/arch/powerpc/include/asm/cpm.h +++ b/arch/powerpc/include/asm/cpm.h @@ -166,6 +166,6 @@ static inline int cpm_command(u32 command, u8 opcode) } #endif /* CONFIG_CPM */ -int cpm2_gpiochip_add32(struct device_node *np); +int cpm2_gpiochip_add32(struct device *dev); #endif diff --git a/arch/powerpc/include/asm/cpm1.h b/arch/powerpc/include/asm/cpm1.h index 3db821876d48..a116fe931789 100644 --- a/arch/powerpc/include/asm/cpm1.h +++ b/arch/powerpc/include/asm/cpm1.h @@ -605,5 +605,7 @@ enum cpm_clk { }; int cpm1_clk_setup(enum cpm_clk_target target, int clock, int mode); +int cpm1_gpiochip_add16(struct device *dev); +int cpm1_gpiochip_add32(struct device *dev); #endif /* __CPM1__ */ |