diff for duplicates of <51C9D714.4000703@samsung.com> diff --git a/a/1.txt b/N1/1.txt index be75b15..78ced4c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,7 +49,7 @@ than NUM_PHYS. I think I'll drop that then. >> + addr = state->regs + EXYNOS_MIPI_PHY_CONTROL(id / 2); >> + ->> + if (id = PHY_DSIM0 || id = PHY_DSIM1) +>> + if (id == PHY_DSIM0 || id == PHY_DSIM1) >> + reset = EXYNOS_MIPI_PHY_MRESETN; >> + else >> + reset = EXYNOS_MIPI_PHY_SRESETN; @@ -154,7 +154,7 @@ phy_{get, set}_drvdata as you suggested. >> + char label[8]; >> + >> + snprintf(label, sizeof(label), "%s.%d", ->> + i = PHY_DSIM0 || i = PHY_DSIM1 ? +>> + i == PHY_DSIM0 || i == PHY_DSIM1 ? >> + "dsim" : "csis", i / 2); >> + >> + state->phys[i] = devm_phy_create(dev, i, &exynos_video_phy_ops, diff --git a/a/content_digest b/N1/content_digest index 0004d68..ff412d6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,8 +2,21 @@ "ref\020130625150649.GA21334@arwen.pp.htv.fi\0" "From\0Sylwester Nawrocki <s.nawrocki@samsung.com>\0" "Subject\0Re: [PATCH v2 1/5] phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs\0" - "Date\0Tue, 25 Jun 2013 17:44:52 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Tue, 25 Jun 2013 19:44:52 +0200\0" + "To\0balbi@ti.com\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + linux-samsung-soc@vger.kernel.org + kishon@ti.com + linux-media@vger.kernel.org + kyungmin.park@samsung.com + t.figa@samsung.com + devicetree-discuss@lists.ozlabs.org + kgene.kim@samsung.com + dh09.lee@samsung.com + jg1.han@samsung.com + inki.dae@samsung.com + plagnioj@jcrosoft.com + " linux-fbdev@vger.kernel.org\0" "\00:1\0" "b\0" "Hi Felipe,\n" @@ -57,7 +70,7 @@ "\n" ">> +\taddr = state->regs + EXYNOS_MIPI_PHY_CONTROL(id / 2);\n" ">> +\n" - ">> +\tif (id = PHY_DSIM0 || id = PHY_DSIM1)\n" + ">> +\tif (id == PHY_DSIM0 || id == PHY_DSIM1)\n" ">> +\t\treset = EXYNOS_MIPI_PHY_MRESETN;\n" ">> +\telse\n" ">> +\t\treset = EXYNOS_MIPI_PHY_SRESETN;\n" @@ -162,7 +175,7 @@ ">> +\t\tchar label[8];\n" ">> +\n" ">> +\t\tsnprintf(label, sizeof(label), \"%s.%d\",\n" - ">> +\t\t\t\ti = PHY_DSIM0 || i = PHY_DSIM1 ?\n" + ">> +\t\t\t\ti == PHY_DSIM0 || i == PHY_DSIM1 ?\n" ">> +\t\t\t\t\"dsim\" : \"csis\", i / 2);\n" ">> +\n" ">> +\t\tstate->phys[i] = devm_phy_create(dev, i, &exynos_video_phy_ops,\n" @@ -218,4 +231,4 @@ "Thanks,\n" Sylwester -67fb23df4e9bedd7fc9b53dbb5ecc67ac79ac39611967d6cb105662222d8e171 +79904736cbcea31eae5355e11e49d7457d6c5f31d9dd473390be4cd3adf71094
diff --git a/a/1.txt b/N2/1.txt index be75b15..78ced4c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -49,7 +49,7 @@ than NUM_PHYS. I think I'll drop that then. >> + addr = state->regs + EXYNOS_MIPI_PHY_CONTROL(id / 2); >> + ->> + if (id = PHY_DSIM0 || id = PHY_DSIM1) +>> + if (id == PHY_DSIM0 || id == PHY_DSIM1) >> + reset = EXYNOS_MIPI_PHY_MRESETN; >> + else >> + reset = EXYNOS_MIPI_PHY_SRESETN; @@ -154,7 +154,7 @@ phy_{get, set}_drvdata as you suggested. >> + char label[8]; >> + >> + snprintf(label, sizeof(label), "%s.%d", ->> + i = PHY_DSIM0 || i = PHY_DSIM1 ? +>> + i == PHY_DSIM0 || i == PHY_DSIM1 ? >> + "dsim" : "csis", i / 2); >> + >> + state->phys[i] = devm_phy_create(dev, i, &exynos_video_phy_ops, diff --git a/a/content_digest b/N2/content_digest index 0004d68..b933fbd 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,8 @@ "ref\01372170110-12993-1-git-send-email-s.nawrocki@samsung.com\0" "ref\020130625150649.GA21334@arwen.pp.htv.fi\0" - "From\0Sylwester Nawrocki <s.nawrocki@samsung.com>\0" - "Subject\0Re: [PATCH v2 1/5] phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs\0" - "Date\0Tue, 25 Jun 2013 17:44:52 +0000\0" + "From\0s.nawrocki@samsung.com (Sylwester Nawrocki)\0" + "Subject\0[PATCH v2 1/5] phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs\0" + "Date\0Tue, 25 Jun 2013 19:44:52 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -57,7 +57,7 @@ "\n" ">> +\taddr = state->regs + EXYNOS_MIPI_PHY_CONTROL(id / 2);\n" ">> +\n" - ">> +\tif (id = PHY_DSIM0 || id = PHY_DSIM1)\n" + ">> +\tif (id == PHY_DSIM0 || id == PHY_DSIM1)\n" ">> +\t\treset = EXYNOS_MIPI_PHY_MRESETN;\n" ">> +\telse\n" ">> +\t\treset = EXYNOS_MIPI_PHY_SRESETN;\n" @@ -162,7 +162,7 @@ ">> +\t\tchar label[8];\n" ">> +\n" ">> +\t\tsnprintf(label, sizeof(label), \"%s.%d\",\n" - ">> +\t\t\t\ti = PHY_DSIM0 || i = PHY_DSIM1 ?\n" + ">> +\t\t\t\ti == PHY_DSIM0 || i == PHY_DSIM1 ?\n" ">> +\t\t\t\t\"dsim\" : \"csis\", i / 2);\n" ">> +\n" ">> +\t\tstate->phys[i] = devm_phy_create(dev, i, &exynos_video_phy_ops,\n" @@ -218,4 +218,4 @@ "Thanks,\n" Sylwester -67fb23df4e9bedd7fc9b53dbb5ecc67ac79ac39611967d6cb105662222d8e171 +b4fe478cb7259c749bfc58e85a1fdb3e64f2d710d213cb61b3da4f285cbe474e
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.