Merge 3.3-rc2 into the driver-core-next branch.

This was done to resolve a merge and build problem with the
drivers/acpi/processor_driver.c file.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

6 files changed, 45 insertions, 16 deletions

diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c
index 1455e2644ab5..cf0c318d6989 100644
--- a/drivers/media/dvb/dvb-usb/anysee.c
+++ b/drivers/media/dvb/dvb-usb/anysee.c
@@ -887,8 +887,7 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
 
                 /* attach demod */
                 adap->fe_adap[state->fe_id].fe = dvb_attach(cxd2820r_attach,
-                                &anysee_cxd2820r_config, &adap->dev->i2c_adap,
-                                NULL);
+                                &anysee_cxd2820r_config, &adap->dev->i2c_adap);
 
                 state->has_ci = true;
 
@@ -1189,6 +1188,14 @@ static int anysee_ci_init(struct dvb_usb_device *d)
         if (ret)
                 return ret;
 
+        ret = anysee_wr_reg_mask(d, REG_IOD, (0 << 2)|(0 << 1)|(0 << 0), 0x07);
+        if (ret)
+                return ret;
+
+        ret = anysee_wr_reg_mask(d, REG_IOD, (1 << 2)|(1 << 1)|(1 << 0), 0x07);
+        if (ret)
+                return ret;
+
         ret = dvb_ca_en50221_init(&d->adapter[0].dvb_adap, &state->ci, 0, 1);
         if (ret)
                 return ret;
diff --git a/drivers/media/dvb/dvb-usb/cinergyT2-fe.c b/drivers/media/dvb/dvb-usb/cinergyT2-fe.c
index 8a57ed8272de..1efc028a76c9 100644
--- a/drivers/media/dvb/dvb-usb/cinergyT2-fe.c
+++ b/drivers/media/dvb/dvb-usb/cinergyT2-fe.c
@@ -276,14 +276,15 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
         param.flags = 0;
 
         switch (fep->bandwidth_hz) {
+        default:
         case 8000000:
-                param.bandwidth = 0;
+                param.bandwidth = 8;
                 break;
         case 7000000:
-                param.bandwidth = 1;
+                param.bandwidth = 7;
                 break;
         case 6000000:
-                param.bandwidth = 2;
+                param.bandwidth = 6;
                 break;
         }
 
diff --git a/drivers/media/dvb/frontends/cxd2820r.h b/drivers/media/dvb/frontends/cxd2820r.h
index cf0f546aa1d1..5aa306ebb7ef 100644
--- a/drivers/media/dvb/frontends/cxd2820r.h
+++ b/drivers/media/dvb/frontends/cxd2820r.h
@@ -77,14 +77,12 @@ struct cxd2820r_config {
         (defined(CONFIG_DVB_CXD2820R_MODULE) && defined(MODULE))
 extern struct dvb_frontend *cxd2820r_attach(
         const struct cxd2820r_config *config,
-        struct i2c_adapter *i2c,
-        struct dvb_frontend *fe
+        struct i2c_adapter *i2c
 );
 #else
 static inline struct dvb_frontend *cxd2820r_attach(
         const struct cxd2820r_config *config,
-        struct i2c_adapter *i2c,
-        struct dvb_frontend *fe
+        struct i2c_adapter *i2c
 )
 {
         printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
diff --git a/drivers/media/dvb/frontends/cxd2820r_core.c b/drivers/media/dvb/frontends/cxd2820r_core.c
index caae7f79c837..5c7c2aaf9bf5 100644
--- a/drivers/media/dvb/frontends/cxd2820r_core.c
+++ b/drivers/media/dvb/frontends/cxd2820r_core.c
@@ -482,10 +482,19 @@ static enum dvbfe_search cxd2820r_search(struct dvb_frontend *fe)
 
         /* switch between DVB-T and DVB-T2 when tune fails */
         if (priv->last_tune_failed) {
-                if (priv->delivery_system == SYS_DVBT)
+                if (priv->delivery_system == SYS_DVBT) {
+                        ret = cxd2820r_sleep_t(fe);
+                        if (ret)
+                                goto error;
+
                         c->delivery_system = SYS_DVBT2;
-                else if (priv->delivery_system == SYS_DVBT2)
+                } else if (priv->delivery_system == SYS_DVBT2) {
+                        ret = cxd2820r_sleep_t2(fe);
+                        if (ret)
+                                goto error;
+
                         c->delivery_system = SYS_DVBT;
+                }
         }
 
         /* set frontend */
@@ -562,7 +571,7 @@ static const struct dvb_frontend_ops cxd2820r_ops = {
         .delsys = { SYS_DVBT, SYS_DVBT2, SYS_DVBC_ANNEX_A },
         /* default: DVB-T/T2 */
         .info = {
-                .name = "Sony CXD2820R (DVB-T/T2)",
+                .name = "Sony CXD2820R",
 
                 .caps = FE_CAN_FEC_1_2                  |
                         FE_CAN_FEC_2_3                  |
@@ -572,7 +581,9 @@ static const struct dvb_frontend_ops cxd2820r_ops = {
                         FE_CAN_FEC_AUTO                 |
                         FE_CAN_QPSK                     |
                         FE_CAN_QAM_16                   |
+                        FE_CAN_QAM_32                   |
                         FE_CAN_QAM_64                   |
+                        FE_CAN_QAM_128                  |
                         FE_CAN_QAM_256                  |
                         FE_CAN_QAM_AUTO                 |
                         FE_CAN_TRANSMISSION_MODE_AUTO   |
@@ -602,8 +613,7 @@ static const struct dvb_frontend_ops cxd2820r_ops = {
 };
 
 struct dvb_frontend *cxd2820r_attach(const struct cxd2820r_config *cfg,
-                                     struct i2c_adapter *i2c,
-                                     struct dvb_frontend *fe)
+                struct i2c_adapter *i2c)
 {
         struct cxd2820r_priv *priv = NULL;
         int ret;
diff --git a/drivers/media/video/atmel-isi.c b/drivers/media/video/atmel-isi.c
index 9fe4519176a4..ec3f6a06f9c3 100644
--- a/drivers/media/video/atmel-isi.c
+++ b/drivers/media/video/atmel-isi.c
@@ -922,7 +922,9 @@ static int __devexit atmel_isi_remove(struct platform_device *pdev)
                         isi->fb_descriptors_phys);
 
         iounmap(isi->regs);
+        clk_unprepare(isi->mck);
         clk_put(isi->mck);
+        clk_unprepare(isi->pclk);
         clk_put(isi->pclk);
         kfree(isi);
 
@@ -955,6 +957,10 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)
         if (IS_ERR(pclk))
                 return PTR_ERR(pclk);
 
+        ret = clk_prepare(pclk);
+        if (ret)
+                goto err_clk_prepare_pclk;
+
         isi = kzalloc(sizeof(struct atmel_isi), GFP_KERNEL);
         if (!isi) {
                 ret = -ENOMEM;
@@ -978,6 +984,10 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)
                 goto err_clk_get;
         }
 
+        ret = clk_prepare(isi->mck);
+        if (ret)
+                goto err_clk_prepare_mck;
+
         /* Set ISI_MCK's frequency, it should be faster than pixel clock */
         ret = clk_set_rate(isi->mck, pdata->mck_hz);
         if (ret < 0)
@@ -1059,10 +1069,14 @@ err_alloc_ctx:
                         isi->fb_descriptors_phys);
 err_alloc_descriptors:
 err_set_mck_rate:
+        clk_unprepare(isi->mck);
+err_clk_prepare_mck:
         clk_put(isi->mck);
 err_clk_get:
         kfree(isi);
 err_alloc_isi:
+        clk_unprepare(pclk);
+err_clk_prepare_pclk:
         clk_put(pclk);
 
         return ret;
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index 9449423098e0..aabbf4854f66 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -853,8 +853,7 @@ static int em28xx_dvb_init(struct em28xx *dev)
         case EM28174_BOARD_PCTV_290E:
                 dvb->fe[0] = dvb_attach(cxd2820r_attach,
                                         &em28xx_cxd2820r_config,
-                                        &dev->i2c_adap,
-                                        NULL);
+                                        &dev->i2c_adap);
                 if (dvb->fe[0]) {
                         /* FE 0 attach tuner */
                         if (!dvb_attach(tda18271_attach,