| Message ID | 20120806153503.GH10524@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Aug 6, 2012 at 5:35 PM, Lee Jones <lee.jones@linaro.org> wrote: > Looks like I introduced a merge error on the last patch. Trying again: > .../mali/mali400ko/driver/src/devicedrv/mali/arch | 1 + (...) > diff --git a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch > new file mode 120000 > index 0000000..427334b > --- /dev/null > +++ b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch > @@ -0,0 +1 @@ > +/home/ljkenny/projects/linaro/snowball/snowball/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch-ux500 > \ No newline at end of file NACK, what is this stuff? It's even out-of-tree code. Please be careful with git add -A, I prefer to use git add <pathspec> I suspect that may be why this happened... Please fix it up and send a v3. Yours, Linus Walleij
> > diff --git a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch > > new file mode 120000 > > index 0000000..427334b > > --- /dev/null > > +++ b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch > > @@ -0,0 +1 @@ > > NACK, what is this stuff? It's even out-of-tree code. Whoa, no idea! Good spot though, I missed this completely. > Please be careful with git add -A, I prefer to use git add <pathspec> > I suspect that may be why this happened... I don't use `git add -A`, ever. If I'm adding files, I usually use `git commit -s -- <pathspec>`, or `git commit -a` if I'm sure I require all the necessary changes. I guess I could have accidentally collected it using `git add -i` whist fixing it up, or a similar misdemeanor. > Please fix it up and send a v3. Of course.
diff --git a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch new file mode 120000 index 0000000..427334b --- /dev/null +++ b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch @@ -0,0 +1 @@ +/home/ljkenny/projects/linaro/snowball/snowball/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch-ux500 \ No newline at end of file diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 5e6f1ee..61b00ed 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -350,10 +350,6 @@ static void setup_i2c_controller(struct nmk_i2c_dev *dev) i2c_clk = clk_get_rate(dev->clk); - /* fallback to std. mode if machine has not provided it */ - if (dev->cfg.clk_freq == 0) - dev->cfg.clk_freq = 100000; - /* * The spec says, in case of std. mode the divider is * 2 whereas it is 3 for fast and fastplus mode of @@ -911,20 +907,32 @@ static const struct i2c_algorithm nmk_i2c_algo = { .functionality = nmk_i2c_functionality }; +static struct nmk_i2c_controller u8500_i2c = { + /* + * Slave data setup time; 250ns, 100ns, and 10ns, which + * is 14, 6 and 2 respectively for a 48Mhz i2c clock. + */ + .slsu = 0xe, + .tft = 1, /* Tx FIFO threshold */ + .rft = 8, /* Rx FIFO threshold */ + .clk_freq = 400000, /* fast mode operation */ + .timeout = 200, /* Slave response timeout(ms) */ + .sm = I2C_FREQ_MODE_FAST, +}; + static atomic_t adapter_id = ATOMIC_INIT(0); static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) { int ret = 0; - struct nmk_i2c_controller *pdata = - adev->dev.platform_data; + struct nmk_i2c_controller *pdata = adev->dev.platform_data; struct nmk_i2c_dev *dev; struct i2c_adapter *adap; - if (!pdata) { - dev_warn(&adev->dev, "no platform data\n"); - return -ENODEV; - } + if (!pdata) + /* No i2c configuration found, using the default. */ + pdata = &u8500_i2c; + dev = kzalloc(sizeof(struct nmk_i2c_dev), GFP_KERNEL); if (!dev) { dev_err(&adev->dev, "cannot allocate memory\n");