From 302f69453721e5ee19f583339a3a646821d4a173 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Fri, 20 Feb 2015 23:58:54 +0100 Subject: [PATCH 2/6] MIPS: BCM63XX: switch to new gpio driver Signed-off-by: Jonas Gorski --- arch/mips/bcm63xx/boards/board_common.c | 2 + arch/mips/bcm63xx/gpio.c | 145 ++++++++++------------------------------------ arch/mips/bcm63xx/setup.c | 3 - 3 files changed, 32 insertions(+), 118 deletions(-) --- a/arch/mips/bcm63xx/boards/board_common.c +++ b/arch/mips/bcm63xx/boards/board_common.c @@ -188,6 +188,8 @@ int __init board_register_devices(void) } #endif + bcm63xx_gpio_init(); + if (board.has_uart0) bcm63xx_uart_register(0); --- a/arch/mips/bcm63xx/gpio.c +++ b/arch/mips/bcm63xx/gpio.c @@ -5,147 +5,62 @@ * * Copyright (C) 2008 Maxime Bizon * Copyright (C) 2008-2011 Florian Fainelli + * Copyright (C) Jonas Gorski */ #include #include -#include #include #include #include #include -#include #include -static u32 gpio_out_low_reg; - -static void bcm63xx_gpio_out_low_reg_init(void) +static void __init bcm63xx_gpio_init_one(int id, int dir, int data, int ngpio) { - switch (bcm63xx_get_cpu_id()) { - case BCM6345_CPU_ID: - gpio_out_low_reg = GPIO_DATA_LO_REG_6345; - break; - default: - gpio_out_low_reg = GPIO_DATA_LO_REG; - break; - } -} - -static DEFINE_SPINLOCK(bcm63xx_gpio_lock); -static u32 gpio_out_low, gpio_out_high; + struct resource res[2]; + struct bgpio_pdata pdata; -static void bcm63xx_gpio_set(struct gpio_chip *chip, - unsigned gpio, int val) -{ - u32 reg; - u32 mask; - u32 *v; - unsigned long flags; - - if (gpio >= chip->ngpio) - BUG(); - - if (gpio < 32) { - reg = gpio_out_low_reg; - mask = 1 << gpio; - v = &gpio_out_low; - } else { - reg = GPIO_DATA_HI_REG; - mask = 1 << (gpio - 32); - v = &gpio_out_high; - } - - spin_lock_irqsave(&bcm63xx_gpio_lock, flags); - if (val) - *v |= mask; - else - *v &= ~mask; - bcm_gpio_writel(*v, reg); - spin_unlock_irqrestore(&bcm63xx_gpio_lock, flags); -} + memset(res, 0, sizeof(res)); + memset(&pdata, 0, sizeof(pdata)); -static int bcm63xx_gpio_get(struct gpio_chip *chip, unsigned gpio) -{ - u32 reg; - u32 mask; + res[0].flags = IORESOURCE_MEM; + res[0].start = bcm63xx_regset_address(RSET_GPIO); + res[0].start += dir; - if (gpio >= chip->ngpio) - BUG(); + res[0].end = res[0].start + 3; - if (gpio < 32) { - reg = gpio_out_low_reg; - mask = 1 << gpio; - } else { - reg = GPIO_DATA_HI_REG; - mask = 1 << (gpio - 32); - } + res[1].flags = IORESOURCE_MEM; + res[1].start = bcm63xx_regset_address(RSET_GPIO); + res[1].start += data; - return !!(bcm_gpio_readl(reg) & mask); -} + res[1].end = res[1].start + 3; -static int bcm63xx_gpio_set_direction(struct gpio_chip *chip, - unsigned gpio, int dir) -{ - u32 reg; - u32 mask; - u32 tmp; - unsigned long flags; - - if (gpio >= chip->ngpio) - BUG(); - - if (gpio < 32) { - reg = GPIO_CTL_LO_REG; - mask = 1 << gpio; - } else { - reg = GPIO_CTL_HI_REG; - mask = 1 << (gpio - 32); - } - - spin_lock_irqsave(&bcm63xx_gpio_lock, flags); - tmp = bcm_gpio_readl(reg); - if (dir == BCM63XX_GPIO_DIR_IN) - tmp &= ~mask; - else - tmp |= mask; - bcm_gpio_writel(tmp, reg); - spin_unlock_irqrestore(&bcm63xx_gpio_lock, flags); + pdata.base = id * 32; + pdata.ngpio = ngpio; - return 0; + platform_device_register_resndata(NULL, "bcm63xx-gpio", id, res, 2, + &pdata, sizeof(pdata)); } -static int bcm63xx_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) +int __init bcm63xx_gpio_init(void) { - return bcm63xx_gpio_set_direction(chip, gpio, BCM63XX_GPIO_DIR_IN); -} + int ngpio = bcm63xx_gpio_count(); + int data_low_reg; -static int bcm63xx_gpio_direction_output(struct gpio_chip *chip, - unsigned gpio, int value) -{ - bcm63xx_gpio_set(chip, gpio, value); - return bcm63xx_gpio_set_direction(chip, gpio, BCM63XX_GPIO_DIR_OUT); -} + if (BCMCPU_IS_6345()) + data_low_reg = GPIO_DATA_LO_REG_6345; + else + data_low_reg = GPIO_DATA_LO_REG; + bcm63xx_gpio_init_one(0, GPIO_CTL_LO_REG, data_low_reg, min(ngpio, 32)); -static struct gpio_chip bcm63xx_gpio_chip = { - .label = "bcm63xx-gpio", - .direction_input = bcm63xx_gpio_direction_input, - .direction_output = bcm63xx_gpio_direction_output, - .get = bcm63xx_gpio_get, - .set = bcm63xx_gpio_set, - .base = 0, -}; + if (ngpio <= 32) + return 0; -int __init bcm63xx_gpio_init(void) -{ - bcm63xx_gpio_out_low_reg_init(); + bcm63xx_gpio_init_one(1, GPIO_CTL_HI_REG, GPIO_DATA_HI_REG, ngpio - 32); - gpio_out_low = bcm_gpio_readl(gpio_out_low_reg); - if (!BCMCPU_IS_6345()) - gpio_out_high = bcm_gpio_readl(GPIO_DATA_HI_REG); - bcm63xx_gpio_chip.ngpio = bcm63xx_gpio_count(); - pr_info("registering %d GPIOs\n", bcm63xx_gpio_chip.ngpio); + return 0; - return gpiochip_add_data(&bcm63xx_gpio_chip, NULL); } --- a/arch/mips/bcm63xx/setup.c +++ b/arch/mips/bcm63xx/setup.c @@ -164,9 +164,6 @@ void __init plat_mem_setup(void) int __init bcm63xx_register_devices(void) { - /* register gpiochip */ - bcm63xx_gpio_init(); - return board_register_devices(); } 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211