← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to arch/arm/mach-s5p64x0/dev-spi.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-s5p64x0/dev-spi.c
21
21
#include <mach/regs-clock.h>
22
22
#include <mach/spi-clocks.h>
23
23
 
 
24
#include <plat/cpu.h>
24
25
#include <plat/s3c64xx-spi.h>
25
26
#include <plat/gpio-cfg.h>
26
27
 
185
186
 
186
187
void __init s5p64x0_spi_set_info(int cntrlr, int src_clk_nr, int num_cs)
187
188
{
188
 
        unsigned int id;
189
189
        struct s3c64xx_spi_info *pd;
190
190
 
191
 
        id = __raw_readl(S5P64X0_SYS_ID) & 0xFF000;
192
 
 
193
191
        /* Reject invalid configuration */
194
192
        if (!num_cs || src_clk_nr < 0
195
193
                        || src_clk_nr > S5P64X0_SPI_SRCCLK_SCLK) {
199
197
 
200
198
        switch (cntrlr) {
201
199
        case 0:
202
 
                if (id == 0x50000)
 
200
                if (soc_is_s5p6450())
203
201
                        pd = &s5p6450_spi0_pdata;
204
202
                else
205
203
                        pd = &s5p6440_spi0_pdata;
207
205
                s5p64x0_device_spi0.dev.platform_data = pd;
208
206
                break;
209
207
        case 1:
210
 
                if (id == 0x50000)
 
208
                if (soc_is_s5p6450())
211
209
                        pd = &s5p6450_spi1_pdata;
212
210
                else
213
211
                        pd = &s5p6440_spi1_pdata;