From 155a677e358e411b4fbb252a2d45d1533feb7844 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 15 Dec 2012 23:51:04 +0100 Subject: [PATCH] --- yaml --- r: 355358 b: refs/heads/master c: 8fdff1dc26fc0f50be2c64656229efca2e9de8c5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/include/cpu-common/cpu/pfc.h | 30 +++++++++++++++ trunk/arch/sh/kernel/cpu/Makefile | 2 +- trunk/arch/sh/kernel/cpu/pfc.c | 44 ++++++++++++++++++++++ 4 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 trunk/arch/sh/include/cpu-common/cpu/pfc.h create mode 100644 trunk/arch/sh/kernel/cpu/pfc.c diff --git a/[refs] b/[refs] index 33cbc1ac0fdf..9111202050f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2a163c8304023267e557d9eda61c7ff8e14a158 +refs/heads/master: 8fdff1dc26fc0f50be2c64656229efca2e9de8c5 diff --git a/trunk/arch/sh/include/cpu-common/cpu/pfc.h b/trunk/arch/sh/include/cpu-common/cpu/pfc.h new file mode 100644 index 000000000000..40e864360543 --- /dev/null +++ b/trunk/arch/sh/include/cpu-common/cpu/pfc.h @@ -0,0 +1,30 @@ +/* + * SH Pin Function Control Initialization + * + * Copyright (C) 2012 Renesas Solutions Corp. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __ARCH_SH_CPU_PFC_H__ +#define __ARCH_SH_CPU_PFC_H__ + +#include + +struct pinmux_info; +struct resource; + +int sh_pfc_register(const char *name, + struct resource *resource, u32 num_resources); +int sh_pfc_register_info(const char *name, + struct resource *resource, u32 num_resources, + struct pinmux_info *pdata); + +#endif /* __ARCH_SH_CPU_PFC_H__ */ diff --git a/trunk/arch/sh/kernel/cpu/Makefile b/trunk/arch/sh/kernel/cpu/Makefile index fa58bfd30d82..accc7ca722e1 100644 --- a/trunk/arch/sh/kernel/cpu/Makefile +++ b/trunk/arch/sh/kernel/cpu/Makefile @@ -18,4 +18,4 @@ obj-$(CONFIG_ARCH_SHMOBILE) += shmobile/ obj-$(CONFIG_SH_ADC) += adc.o obj-$(CONFIG_SH_CLK_CPG_LEGACY) += clock-cpg.o -obj-y += irq/ init.o clock.o fpu.o proc.o +obj-y += irq/ init.o clock.o fpu.o pfc.o proc.o diff --git a/trunk/arch/sh/kernel/cpu/pfc.c b/trunk/arch/sh/kernel/cpu/pfc.c new file mode 100644 index 000000000000..d045d75c05be --- /dev/null +++ b/trunk/arch/sh/kernel/cpu/pfc.c @@ -0,0 +1,44 @@ +/* + * SH Pin Function Control Initialization + * + * Copyright (C) 2012 Renesas Solutions Corp. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include + +#include + +static struct platform_device sh_pfc_device = { + .name = "sh-pfc", + .id = -1, +}; + +int __init sh_pfc_register(const char *name, + struct resource *resource, u32 num_resources) +{ + if (name) + sh_pfc_device.name = name; + sh_pfc_device.num_resources = num_resources; + sh_pfc_device.resource = resource; + + return platform_device_register(&sh_pfc_device); +} + +int __init sh_pfc_register_info(const char *name, + struct resource *resource, u32 num_resources, + struct pinmux_info *pdata) +{ + sh_pfc_device.dev.platform_data = pdata; + + return sh_pfc_register(name, resource, num_resources); +}