Hi Hansson,
Have you include this patch to PR? If so could you tell me at which git repository it is.
BR
Peter.Guo
-----Original Message-----
From: Ulf Hansson [mailto:[email protected]]
Sent: Wednesday, May 14, 2014 5:55 PM
To: Peter Guo
Cc: Chris Ball; [email protected]; linux-mmc; [email protected]; Samuel Guan
Subject: Re: [PATCH v3] mmc: sdhci-pci-o2micro: Add SeaBird SeaEagle SD3 support
On 5 May 2014 12:50, peter.guo <[email protected]> wrote:
> From: Peter Guo <[email protected]>
>
> Add O2Micro/BayHubTech chip 8520 subversion B1 SD3.0 support.
> Add O2Micro/BayHubTech chip 8620 and 8621 SD3.0 support Enable Led
> function of 8520 chip.
>
> Signed-off-by: Peter Guo <[email protected]>
> Signed-off-by: Adam Lee <[email protected]>
Thanks Peter, Adam!
Unless someone objects, I intend to include this in the next PR I send to Chris.
Kind regards
Ulf Hansson
> ---
> drivers/mmc/host/sdhci-pci-o2micro.c | 78
> +++++++++++++++++++++++++++++++++++-
> drivers/mmc/host/sdhci-pci-o2micro.h | 3 ++
> 2 files changed, 80 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c
> b/drivers/mmc/host/sdhci-pci-o2micro.c
> index f49666b..eafcd92 100644
> --- a/drivers/mmc/host/sdhci-pci-o2micro.c
> +++ b/drivers/mmc/host/sdhci-pci-o2micro.c
> @@ -21,6 +21,45 @@
> #include "sdhci-pci.h"
> #include "sdhci-pci-o2micro.h"
>
> +static void o2_pci_set_baseclk(struct sdhci_pci_chip *chip, u32
> +value) {
> + u32 scratch_32;
> + pci_read_config_dword(chip->pdev,
> + O2_SD_PLL_SETTING, &scratch_32);
> +
> + scratch_32 &= 0x0000FFFF;
> + scratch_32 |= value;
> +
> + pci_write_config_dword(chip->pdev,
> + O2_SD_PLL_SETTING, scratch_32); }
> +
> +static void o2_pci_led_enable(struct sdhci_pci_chip *chip) {
> + int ret;
> + u32 scratch_32;
> +
> + /* Set led of SD host function enable */
> + ret = pci_read_config_dword(chip->pdev,
> + O2_SD_FUNC_REG0, &scratch_32);
> + if (ret)
> + return;
> +
> + scratch_32 &= ~O2_SD_FREG0_LEDOFF;
> + pci_write_config_dword(chip->pdev,
> + O2_SD_FUNC_REG0, scratch_32);
> +
> + ret = pci_read_config_dword(chip->pdev,
> + O2_SD_TEST_REG, &scratch_32);
> + if (ret)
> + return;
> +
> + scratch_32 |= O2_SD_LED_ENABLE;
> + pci_write_config_dword(chip->pdev,
> + O2_SD_TEST_REG, scratch_32);
> +
> +}
> +
> void sdhci_pci_o2_fujin2_pci_init(struct sdhci_pci_chip *chip) {
> u32 scratch_32;
> @@ -216,6 +255,40 @@ int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
> scratch &= 0x7f;
> pci_write_config_byte(chip->pdev, O2_SD_LOCK_WP,
> scratch);
>
> + /* DevId=8520 subId= 0x11 or 0x12 Type Chip support */
> + if (chip->pdev->device == PCI_DEVICE_ID_O2_FUJIN2) {
> + ret = pci_read_config_dword(chip->pdev,
> + O2_SD_FUNC_REG0,
> + &scratch_32);
> + scratch_32 = ((scratch_32 & 0xFF000000) >>
> + 24);
> +
> + /* Check Whether subId is 0x11 or 0x12 */
> + if ((scratch_32 == 0x11) || (scratch_32 == 0x12)) {
> + scratch_32 = 0x2c280000;
> +
> + /* Set Base Clock to 208MZ */
> + o2_pci_set_baseclk(chip, scratch_32);
> + ret = pci_read_config_dword(chip->pdev,
> + O2_SD_FUNC_REG4,
> +
> + &scratch_32);
> +
> + /* Enable Base Clk setting change */
> + scratch_32 |= O2_SD_FREG4_ENABLE_CLK_SET;
> + pci_write_config_dword(chip->pdev,
> + O2_SD_FUNC_REG4,
> + scratch_32);
> +
> + /* Set Tuning Window to 4 */
> + pci_write_config_byte(chip->pdev,
> +
> + O2_SD_TUNING_CTRL, 0x44);
> +
> + break;
> + }
> + }
> +
> + /* Enable 8520 led function */
> + o2_pci_led_enable(chip);
> +
> /* Set timeout CLK */
> ret = pci_read_config_dword(chip->pdev,
> O2_SD_CLK_SETTING,
> &scratch_32); @@ -276,7 +349,7 @@ int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
> pci_write_config_byte(chip->pdev, O2_SD_LOCK_WP,
> scratch);
>
> ret = pci_read_config_dword(chip->pdev,
> - O2_SD_FUNC_REG0, &scratch_32);
> + O2_SD_PLL_SETTING,
> + &scratch_32);
>
> if ((scratch_32 & 0xff000000) == 0x01000000) {
> scratch_32 &= 0x0000FFFF; @@ -299,6 +372,9 @@
> int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)
> O2_SD_FUNC_REG4, scratch_32);
> }
>
> + /* Set Tuning Windows to 5 */
> + pci_write_config_byte(chip->pdev,
> + O2_SD_TUNING_CTRL, 0x55);
> /* Lock WP */
> ret = pci_read_config_byte(chip->pdev,
> O2_SD_LOCK_WP, &scratch);
> diff --git a/drivers/mmc/host/sdhci-pci-o2micro.h
> b/drivers/mmc/host/sdhci-pci-o2micro.h
> index dbec4c9..a87ae24 100644
> --- a/drivers/mmc/host/sdhci-pci-o2micro.h
> +++ b/drivers/mmc/host/sdhci-pci-o2micro.h
> @@ -57,6 +57,9 @@
> #define O2_SD_UHS2_L1_CTRL 0x35C
> #define O2_SD_FUNC_REG3 0x3E0
> #define O2_SD_FUNC_REG4 0x3E4
> +#define O2_SD_LED_ENABLE BIT(6)
> +#define O2_SD_FREG0_LEDOFF BIT(13)
> +#define O2_SD_FREG4_ENABLE_CLK_SET BIT(22)
>
> #define O2_SD_VENDOR_SETTING 0x110
> #define O2_SD_VENDOR_SETTING2 0x1C8
> --
> 2.0.0.rc0
>
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay? ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m???? ????????I?
On 4 June 2014 04:03, Peter Guo <[email protected]> wrote:
> Hi Hansson,
>
> Have you include this patch to PR? If so could you tell me at which git repository it is.
It has been included in those PRs I have sent to Chris during this
release cycle. So currently it sits in Chris mmc tree on his next
branch.
Yes, I host my own mmc tree now as well. Don't mix them up. :-)
Kind regards
Ulf Hansson