lkml.org 
[lkml]   [2009]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 7/7] powerpc/ps3: Add rtc-ps3
    Date
    Create a real RTC driver for PS3, and unhook the deprecated
    ppc_md.[gs]et_rtc_time.

    Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
    Cc: Geoff Levand <geoffrey.levand@am.sony.com>
    ---
    arch/powerpc/include/asm/ps3.h | 3 +
    arch/powerpc/platforms/ps3/os-area.c | 2 +
    arch/powerpc/platforms/ps3/platform.h | 2 -
    arch/powerpc/platforms/ps3/setup.c | 2 -
    arch/powerpc/platforms/ps3/time.c | 26 ++++-----
    drivers/rtc/Kconfig | 9 +++
    drivers/rtc/Makefile | 1 +
    drivers/rtc/rtc-ps3.c | 105 +++++++++++++++++++++++++++++++++
    8 files changed, 132 insertions(+), 18 deletions(-)
    create mode 100644 drivers/rtc/rtc-ps3.c

    diff --git a/arch/powerpc/include/asm/ps3.h b/arch/powerpc/include/asm/ps3.h
    index 67f1812..cdb6fd8 100644
    --- a/arch/powerpc/include/asm/ps3.h
    +++ b/arch/powerpc/include/asm/ps3.h
    @@ -50,6 +50,9 @@ enum ps3_param_av_multi_out {

    enum ps3_param_av_multi_out ps3_os_area_get_av_multi_out(void);

    +extern u64 ps3_os_area_get_rtc_diff(void);
    +extern void ps3_os_area_set_rtc_diff(u64 rtc_diff);
    +
    /* dma routines */

    enum ps3_dma_page_size {
    diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
    index e1c83c2..86e392b 100644
    --- a/arch/powerpc/platforms/ps3/os-area.c
    +++ b/arch/powerpc/platforms/ps3/os-area.c
    @@ -808,6 +808,7 @@ u64 ps3_os_area_get_rtc_diff(void)
    {
    return saved_params.rtc_diff;
    }
    +EXPORT_SYMBOL(ps3_os_area_get_rtc_diff);

    /**
    * ps3_os_area_set_rtc_diff - Set the rtc diff value.
    @@ -823,6 +824,7 @@ void ps3_os_area_set_rtc_diff(u64 rtc_diff)
    os_area_queue_work();
    }
    }
    +EXPORT_SYMBOL(ps3_os_area_set_rtc_diff);

    /**
    * ps3_os_area_get_av_multi_out - Returns the default video mode.
    diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h
    index 235c13e..136aa06 100644
    --- a/arch/powerpc/platforms/ps3/platform.h
    +++ b/arch/powerpc/platforms/ps3/platform.h
    @@ -64,8 +64,6 @@ int ps3_set_rtc_time(struct rtc_time *time);

    void __init ps3_os_area_save_params(void);
    void __init ps3_os_area_init(void);
    -u64 ps3_os_area_get_rtc_diff(void);
    -void ps3_os_area_set_rtc_diff(u64 rtc_diff);

    /* spu */

    diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
    index 3331ccb..6618182 100644
    --- a/arch/powerpc/platforms/ps3/setup.c
    +++ b/arch/powerpc/platforms/ps3/setup.c
    @@ -270,8 +270,6 @@ define_machine(ps3) {
    .init_IRQ = ps3_init_IRQ,
    .panic = ps3_panic,
    .get_boot_time = ps3_get_boot_time,
    - .set_rtc_time = ps3_set_rtc_time,
    - .get_rtc_time = ps3_get_rtc_time,
    .set_dabr = ps3_set_dabr,
    .calibrate_decr = ps3_calibrate_decr,
    .progress = ps3_progress,
    diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c
    index d0daf7d..b178a1e 100644
    --- a/arch/powerpc/platforms/ps3/time.c
    +++ b/arch/powerpc/platforms/ps3/time.c
    @@ -19,6 +19,7 @@
    */

    #include <linux/kernel.h>
    +#include <linux/platform_device.h>

    #include <asm/rtc.h>
    #include <asm/lv1call.h>
    @@ -74,23 +75,20 @@ static u64 read_rtc(void)
    return rtc_val;
    }

    -int ps3_set_rtc_time(struct rtc_time *tm)
    +unsigned long __init ps3_get_boot_time(void)
    {
    - u64 now = mktime(tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
    - tm->tm_hour, tm->tm_min, tm->tm_sec);
    -
    - ps3_os_area_set_rtc_diff(now - read_rtc());
    - return 0;
    + return read_rtc() + ps3_os_area_get_rtc_diff();
    }

    -void ps3_get_rtc_time(struct rtc_time *tm)
    +static int __init ps3_rtc_init(void)
    {
    - to_tm(read_rtc() + ps3_os_area_get_rtc_diff(), tm);
    - tm->tm_year -= 1900;
    - tm->tm_mon -= 1;
    -}
    + struct platform_device *pdev;

    -unsigned long __init ps3_get_boot_time(void)
    -{
    - return read_rtc() + ps3_os_area_get_rtc_diff();
    + pdev = platform_device_register_simple("rtc-ps3", -1, NULL, 0);
    + if (IS_ERR(pdev))
    + return PTR_ERR(pdev);
    +
    + return 0;
    }
    +
    +module_init(ps3_rtc_init);
    diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
    index 6488c50..7b6b63a 100644
    --- a/drivers/rtc/Kconfig
    +++ b/drivers/rtc/Kconfig
    @@ -730,4 +730,13 @@ config RTC_DRV_MV
    This driver can also be built as a module. If so, the module
    will be called rtc-mv.

    +config RTC_DRV_PS3
    + tristate "PS3 RTC"
    + depends on PPC_PS3
    + help
    + If you say yes here you will get support for the RTC on PS3.
    +
    + This driver can also be built as a module. If so, the module
    + will be called rtc-ps3.
    +
    endif # RTC_CLASS
    diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
    index bd209a5..d161d1d 100644
    --- a/drivers/rtc/Makefile
    +++ b/drivers/rtc/Makefile
    @@ -75,3 +75,4 @@ obj-$(CONFIG_RTC_DRV_VR41XX) += rtc-vr41xx.o
    obj-$(CONFIG_RTC_DRV_WM8350) += rtc-wm8350.o
    obj-$(CONFIG_RTC_DRV_X1205) += rtc-x1205.o
    obj-$(CONFIG_RTC_DRV_PCF50633) += rtc-pcf50633.o
    +obj-$(CONFIG_RTC_DRV_PS3) += rtc-ps3.o
    diff --git a/drivers/rtc/rtc-ps3.c b/drivers/rtc/rtc-ps3.c
    new file mode 100644
    index 0000000..bacf37f
    --- /dev/null
    +++ b/drivers/rtc/rtc-ps3.c
    @@ -0,0 +1,105 @@
    +/*
    + * PS3 RTC Driver
    + *
    + * Copyright 2009 Sony Corporation
    + *
    + * 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.
    + *
    + * You should have received a copy of the GNU General Public License
    + * along with this program.
    + * If not, see <http://www.gnu.org/licenses/>.
    + */
    +
    +#include <linux/kernel.h>
    +#include <linux/module.h>
    +#include <linux/platform_device.h>
    +#include <linux/rtc.h>
    +
    +#include <asm/lv1call.h>
    +#include <asm/ps3.h>
    +
    +
    +static u64 read_rtc(void)
    +{
    + int result;
    + u64 rtc_val;
    + u64 tb_val;
    +
    + result = lv1_get_rtc(&rtc_val, &tb_val);
    + BUG_ON(result);
    +
    + return rtc_val;
    +}
    +
    +static int ps3_get_time(struct device *dev, struct rtc_time *tm)
    +{
    + to_tm(read_rtc() + ps3_os_area_get_rtc_diff(), tm);
    + tm->tm_year -= 1900;
    + tm->tm_mon -= 1;
    + return 0;
    +}
    +
    +static int ps3_set_time(struct device *dev, struct rtc_time *tm)
    +{
    + u64 now = mktime(tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
    + tm->tm_hour, tm->tm_min, tm->tm_sec);
    + ps3_os_area_set_rtc_diff(now - read_rtc());
    + return 0;
    +}
    +
    +static const struct rtc_class_ops ps3_rtc_ops = {
    + .read_time = ps3_get_time,
    + .set_time = ps3_set_time,
    +};
    +
    +static int __init ps3_rtc_probe(struct platform_device *dev)
    +{
    + struct rtc_device *rtc;
    +
    + rtc = rtc_device_register("rtc-ps3", &dev->dev, &ps3_rtc_ops,
    + THIS_MODULE);
    + if (IS_ERR(rtc))
    + return PTR_ERR(rtc);
    +
    + platform_set_drvdata(dev, rtc);
    + return 0;
    +}
    +
    +static int __exit ps3_rtc_remove(struct platform_device *dev)
    +{
    + rtc_device_unregister(platform_get_drvdata(dev));
    + return 0;
    +}
    +
    +static struct platform_driver ps3_rtc_driver = {
    + .driver = {
    + .name = "rtc-ps3",
    + .owner = THIS_MODULE,
    + },
    + .remove = __exit_p(ps3_rtc_remove),
    +};
    +
    +static int __init ps3_rtc_init(void)
    +{
    + return platform_driver_probe(&ps3_rtc_driver, ps3_rtc_probe);
    +}
    +
    +static void __exit ps3_rtc_fini(void)
    +{
    + platform_driver_unregister(&ps3_rtc_driver);
    +}
    +
    +module_init(ps3_rtc_init);
    +module_exit(ps3_rtc_fini);
    +
    +MODULE_AUTHOR("Sony Corporation");
    +MODULE_LICENSE("GPL");
    +MODULE_DESCRIPTION("ps3 RTC driver");
    +MODULE_ALIAS("platform:rtc-ps3");
    --
    1.6.0.4


    \
     
     \ /
      Last update: 2009-03-09 14:31    [W:0.030 / U:33.484 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site