lkml.org 
[lkml]   [2011]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/2]: MIPS: sgi-ip32: Add support for rtc-ds1685 to SGI O2 (IP32)
    -----BEGIN PGP SIGNED MESSAGE-----
    Hash: SHA1


    These are the modifications needed to the SGI O2 (IP32) codebase to switch off
    of rtc-cmos to rtc-ds1685. It needs to be applied after the main rtc-ds1685 patch.

    Key changes here eliminate the custom power-off code and call upon the version
    built into the main driver via platform_data, as well as defining the required
    register step-size of 256 bytes (0x100).

    Signed-off-by: Joshua Kinard <kumba@gentoo.org>
    - ---

    include/asm/mach-ip32/mc146818rtc.h | 36 ----------
    sgi-ip32/ip32-platform.c | 49 ++++++++++++--
    sgi-ip32/ip32-reset.c | 118 ++++++++----------------------------
    3 files changed, 67 insertions(+), 136 deletions(-)

    diff -Naurp mipslinux.orig/arch/mips/include/asm/mach-ip32/mc146818rtc.h
    mipslinux.ip32-rtc/arch/mips/include/asm/mach-ip32/mc146818rtc.h
    - --- mipslinux.orig/arch/mips/include/asm/mach-ip32/mc146818rtc.h 2009-04-28
    20:29:27.000000000 -0400
    +++ mipslinux.ip32-rtc/arch/mips/include/asm/mach-ip32/mc146818rtc.h 1969-12-31
    19:00:00.000000000 -0500
    @@ -1,36 +0,0 @@
    - -/*
    - - * This file is subject to the terms and conditions of the GNU General Public
    - - * License. See the file "COPYING" in the main directory of this archive
    - - * for more details.
    - - *
    - - * Copyright (C) 1998, 2001, 03 by Ralf Baechle
    - - * Copyright (C) 2000 Harald Koerfgen
    - - *
    - - * RTC routines for IP32 style attached Dallas chip.
    - - */
    - -#ifndef __ASM_MACH_IP32_MC146818RTC_H
    - -#define __ASM_MACH_IP32_MC146818RTC_H
    - -
    - -#include <asm/ip32/mace.h>
    - -
    - -#define RTC_PORT(x) (0x70 + (x))
    - -
    - -static unsigned char CMOS_READ(unsigned long addr)
    - -{
    - - return mace->isa.rtc[addr << 8];
    - -}
    - -
    - -static inline void CMOS_WRITE(unsigned char data, unsigned long addr)
    - -{
    - - mace->isa.rtc[addr << 8] = data;
    - -}
    - -
    - -/*
    - - * FIXME: Do it right. For now just assume that noone lives in 20th century
    - - * and no O2 user in 22th century ;-)
    - - */
    - -#define mc146818_decode_year(year) ((year) + 2000)
    - -
    - -#define RTC_ALWAYS_BCD 0
    - -
    - -#endif /* __ASM_MACH_IP32_MC146818RTC_H */
    diff -Naurp mipslinux.orig/arch/mips/sgi-ip32/ip32-platform.c
    mipslinux.ip32-rtc/arch/mips/sgi-ip32/ip32-platform.c
    - --- mipslinux.orig/arch/mips/sgi-ip32/ip32-platform.c 2009-04-28
    20:29:28.000000000 -0400
    +++ mipslinux.ip32-rtc/arch/mips/sgi-ip32/ip32-platform.c 2011-04-07
    08:02:00.063871001 -0400
    @@ -9,10 +9,13 @@
    #include <linux/init.h>
    #include <linux/platform_device.h>
    #include <linux/serial_8250.h>
    +#include <linux/rtc/ds1685.h>

    #include <asm/ip32/mace.h>
    #include <asm/ip32/ip32_ints.h>

    +extern void inline ip32_prepare_poweroff(void);
    +
    #define MACEISA_SERIAL1_OFFS offsetof(struct sgi_mace, isa.serial1)
    #define MACEISA_SERIAL2_OFFS offsetof(struct sgi_mace, isa.serial2)

    @@ -90,22 +93,50 @@ static __init int sgio2btns_devinit(void

    device_initcall(sgio2btns_devinit);

    - -static struct resource sgio2_cmos_rsrc[] = {
    +#define MACE_RTC_RES_START (MACE_BASE + offsetof(struct sgi_mace, isa.rtc))
    +#define MACE_RTC_RES_END (MACE_RTC_RES_START + 32767)
    +
    +static struct resource ip32_rtc_resources[] = {
    {
    - - .start = 0x70,
    - - .end = 0x71,
    - - .flags = IORESOURCE_IO
    + .start = MACEISA_RTC_IRQ,
    + .end = MACEISA_RTC_IRQ,
    + .flags = IORESOURCE_IRQ
    + }, {
    + .start = MACE_RTC_RES_START,
    + .end = MACE_RTC_RES_END,
    + .flags = IORESOURCE_MEM,
    }
    };

    - -static __init int sgio2_cmos_devinit(void)
    +
    +/* RTC registers on IP32 are each padded by 256 bytes (0x100). */
    +static struct ds1685_rtc_platform_data
    +ip32_rtc_platform_data[] = {
    + {
    + .regstep = 0x100,
    + .plat_prepare_poweroff = ip32_prepare_poweroff,
    + },
    +};
    +
    +struct platform_device ip32_rtc_device = {
    + .name = "rtc-ds1685",
    + .id = -1,
    + .dev = {
    + .platform_data = ip32_rtc_platform_data,
    + },
    + .num_resources = ARRAY_SIZE(ip32_rtc_resources),
    + .resource = ip32_rtc_resources,
    +};
    +EXPORT_SYMBOL(ip32_rtc_device);
    +
    +static int __init sgio2_rtc_devinit(void)
    {
    - - return IS_ERR(platform_device_register_simple("rtc_cmos", -1,
    - - sgio2_cmos_rsrc, 1));
    + return platform_device_register(&ip32_rtc_device);
    +
    }

    - -device_initcall(sgio2_cmos_devinit);
    +device_initcall(sgio2_rtc_devinit);

    MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
    MODULE_LICENSE("GPL");
    - -MODULE_DESCRIPTION("8250 UART probe driver for SGI IP32 aka O2");
    +MODULE_DESCRIPTION("IP32 platform setup for SGI IP32 aka O2");
    diff -Naurp mipslinux.orig/arch/mips/sgi-ip32/ip32-reset.c
    mipslinux.ip32-rtc/arch/mips/sgi-ip32/ip32-reset.c
    - --- mipslinux.orig/arch/mips/sgi-ip32/ip32-reset.c 2009-05-23 12:01:03.025842703
    - -0400
    +++ mipslinux.ip32-rtc/arch/mips/sgi-ip32/ip32-reset.c 2011-04-07
    08:02:00.063871001 -0400
    @@ -13,7 +13,7 @@
    #include <linux/sched.h>
    #include <linux/notifier.h>
    #include <linux/delay.h>
    - -#include <linux/ds17287rtc.h>
    +#include <linux/rtc/ds1685.h>
    #include <linux/interrupt.h>
    #include <linux/pm.h>

    @@ -33,55 +33,31 @@
    #define POWERDOWN_FREQ (HZ / 4)
    #define PANIC_FREQ (HZ / 8)

    - -static struct timer_list power_timer, blink_timer, debounce_timer;
    - -static int has_panicked, shuting_down;
    +extern struct ds1685_rtc_platform_data ip32_rtc_platform_data[];
    +extern struct platform_device ip32_rtc_device;

    - -static void ip32_machine_restart(char *command) __attribute__((noreturn));
    - -static void ip32_machine_halt(void) __attribute__((noreturn));
    - -static void ip32_machine_power_off(void) __attribute__((noreturn));
    +static struct timer_list power_timer, blink_timer;
    +static int has_panicked, shutting_down;

    - -static void ip32_machine_restart(char *cmd)
    +static void ip32_poweroff(void *data)
    {
    - - crime->control = CRIME_CONTROL_HARD_RESET;
    +#if defined(CONFIG_RTC_DRV_DS1685_FAMILY) && \
    + (defined(CONFIG_RTC_DRV_DS1685) || defined(CONFIG_RTC_DRV_DS17285))
    + ds1685_rtc_poweroff((struct platform_device *)data);
    +#else
    while (1);
    +#endif
    }

    - -static inline void ip32_machine_halt(void)
    - -{
    - - ip32_machine_power_off();
    - -}

    - -static void ip32_machine_power_off(void)
    +static void ip32_machine_restart(char *cmd) __attribute__((noreturn));
    +static void ip32_machine_restart(char *cmd)
    {
    - - unsigned char reg_a, xctrl_a, xctrl_b;
    - -
    - - disable_irq(MACEISA_RTC_IRQ);
    - - reg_a = CMOS_READ(RTC_REG_A);
    - -
    - - /* setup for kickstart & wake-up (DS12287 Ref. Man. p. 19) */
    - - reg_a &= ~DS_REGA_DV2;
    - - reg_a |= DS_REGA_DV1;
    - -
    - - CMOS_WRITE(reg_a | DS_REGA_DV0, RTC_REG_A);
    - - wbflush();
    - - xctrl_b = CMOS_READ(DS_B1_XCTRL4B)
    - - | DS_XCTRL4B_ABE | DS_XCTRL4B_KFE;
    - - CMOS_WRITE(xctrl_b, DS_B1_XCTRL4B);
    - - xctrl_a = CMOS_READ(DS_B1_XCTRL4A) & ~DS_XCTRL4A_IFS;
    - - CMOS_WRITE(xctrl_a, DS_B1_XCTRL4A);
    - - wbflush();
    - - /* adios amigos... */
    - - CMOS_WRITE(xctrl_a | DS_XCTRL4A_PAB, DS_B1_XCTRL4A);
    - - CMOS_WRITE(reg_a, RTC_REG_A);
    - - wbflush();
    + msleep(10);
    + crime->control = CRIME_CONTROL_HARD_RESET;
    while (1);
    }

    - -static void power_timeout(unsigned long data)
    - -{
    - - ip32_machine_power_off();
    - -}
    - -
    static void blink_timeout(unsigned long data)
    {
    unsigned long led = mace->perif.ctrl.misc ^ MACEISA_LED_RED;
    @@ -89,44 +65,27 @@ static void blink_timeout(unsigned long
    mod_timer(&blink_timer, jiffies + data);
    }

    - -static void debounce(unsigned long data)
    +static void ip32_machine_halt(void)
    {
    - - unsigned char reg_a, reg_c, xctrl_a;
    - -
    - - reg_c = CMOS_READ(RTC_INTR_FLAGS);
    - - reg_a = CMOS_READ(RTC_REG_A);
    - - CMOS_WRITE(reg_a | DS_REGA_DV0, RTC_REG_A);
    - - wbflush();
    - - xctrl_a = CMOS_READ(DS_B1_XCTRL4A);
    - - if ((xctrl_a & DS_XCTRL4A_IFS) || (reg_c & RTC_IRQF )) {
    - - /* Interrupt still being sent. */
    - - debounce_timer.expires = jiffies + 50;
    - - add_timer(&debounce_timer);
    - -
    - - /* clear interrupt source */
    - - CMOS_WRITE(xctrl_a & ~DS_XCTRL4A_IFS, DS_B1_XCTRL4A);
    - - CMOS_WRITE(reg_a & ~DS_REGA_DV0, RTC_REG_A);
    - - return;
    - - }
    - - CMOS_WRITE(reg_a & ~DS_REGA_DV0, RTC_REG_A);
    - -
    - - if (has_panicked)
    - - ip32_machine_restart(NULL);
    + ip32_poweroff(&ip32_rtc_device);
    +}

    - - enable_irq(MACEISA_RTC_IRQ);
    +static void power_timeout(unsigned long data)
    +{
    + ip32_poweroff(&ip32_rtc_device);
    }

    - -static inline void ip32_power_button(void)
    +void ip32_prepare_poweroff(void)
    {
    if (has_panicked)
    return;

    - - if (shuting_down || kill_cad_pid(SIGINT, 1)) {
    + if (shutting_down || kill_cad_pid(SIGINT, 1)) {
    /* No init process or button pressed twice. */
    - - ip32_machine_power_off();
    + ip32_poweroff(&ip32_rtc_device);
    }

    - - shuting_down = 1;
    + shutting_down = 1;
    blink_timer.data = POWERDOWN_FREQ;
    blink_timeout(POWERDOWN_FREQ);

    @@ -135,27 +94,7 @@ static inline void ip32_power_button(voi
    power_timer.expires = jiffies + POWERDOWN_TIMEOUT * HZ;
    add_timer(&power_timer);
    }
    - -
    - -static irqreturn_t ip32_rtc_int(int irq, void *dev_id)
    - -{
    - - unsigned char reg_c;
    - -
    - - reg_c = CMOS_READ(RTC_INTR_FLAGS);
    - - if (!(reg_c & RTC_IRQF)) {
    - - printk(KERN_WARNING
    - - "%s: RTC IRQ without RTC_IRQF\n", __func__);
    - - }
    - - /* Wait until interrupt goes away */
    - - disable_irq_nosync(MACEISA_RTC_IRQ);
    - - init_timer(&debounce_timer);
    - - debounce_timer.function = debounce;
    - - debounce_timer.expires = jiffies + 50;
    - - add_timer(&debounce_timer);
    - -
    - - printk(KERN_DEBUG "Power button pressed\n");
    - - ip32_power_button();
    - - return IRQ_HANDLED;
    - -}
    +EXPORT_SYMBOL(ip32_prepare_poweroff);

    static int panic_event(struct notifier_block *this, unsigned long event,
    void *ptr)
    @@ -190,15 +129,12 @@ static __init int ip32_reboot_setup(void

    _machine_restart = ip32_machine_restart;
    _machine_halt = ip32_machine_halt;
    - - pm_power_off = ip32_machine_power_off;
    + pm_power_off = ip32_machine_halt;

    init_timer(&blink_timer);
    blink_timer.function = blink_timeout;
    atomic_notifier_chain_register(&panic_notifier_list, &panic_block);

    - - if (request_irq(MACEISA_RTC_IRQ, ip32_rtc_int, 0, "rtc", NULL))
    - - panic("Can't allocate MACEISA RTC IRQ");
    - -
    return 0;
    }

    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v2.0.17 (MingW32)
    iQIcBAEBAgAGBQJNnbleAAoJENsjoH7SXZXjJvEQAL3xKzPuM69n9mTUTtkZUhDg
    tmjBH96abi0sI6SqvjhbiNf3UnMU+iDPkF1hi79XA1aelwolGCh31tf8lrQ2nJ5C
    qvbBiTyaAvzDuRBwr+mMXe5wO4bMRcJl+z1ikQQ+S52AdEmKWR2PVUbtnv0obslr
    wVVdQ/a0QUYcagOcFwPUPilgiftQ0/tK3Ck6FGoq7QGgDlda05Of1s/KoIBc7fB1
    aZwc3z5VMaGnJuD6aAhu1BDWT3PBEMNBO73/PzpEtCsvHD/WjiAE7UwdaU9E/Rcf
    bpTDRa1F23qQ19ibS3EN5C7H3HtISPAo0SXr0iS+e0AsFfUCdAlQjD6v1PTXu46G
    7Ryd3fYwOPBepq36IGsxvaA/Ca2PpP0SQcAScnuwUrQ3h5XKADAyj3OC1c/i//Tl
    Qy1pI00itnQ174a2AUCY3+3TP7IBMD849lKsjP4gsvJNP4xe/63ovNmWif1TUxgB
    xdzkrlTKdr8dUDUT+1YlfqPKlq6JhTbJ6cuRIOIOv+MDxDfrHLUzPe4hxIs9+8+1
    Ya7yF0SznLGJ6Fftk0hm5gITl7mwmOtC7sLzzqJY8dCF7vXH4Rbz4qY83ydvoT0T
    U5cOh8xGETiwlgVaJ+38sy5saVeRXMcRySz6fTcuiAHB3j1JWKPUGPTuSaBsIc0/
    iTe4vX2Kh3gHNt1EyA0e
    =r1bG
    -----END PGP SIGNATURE-----

    \
     
     \ /
      Last update: 2011-04-07 22:53    [W:0.047 / U:1.608 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site