On Tue, 11 Jun 2019 at 11:57, Manish Narani <manish.narani@xxxxxxxxxx> wrote:
>
> Apart from taps set by auto tuning, ZynqMP platform has feature to set
> the tap values manually. Add support to read tap delay values from
> DT and set the same in HW via ZynqMP SoC framework. Reading Tap
> Delays from DT is optional, if the property is not available in DT the
> driver will use the pre-defined Tap Delay Values.
>
> Signed-off-by: Manish Narani <manish.narani@xxxxxxxxxx>
> ---
> drivers/mmc/host/sdhci-of-arasan.c | 173 ++++++++++++++++++++++++++++++++++++-
> 1 file changed, 172 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c
> index b12abf9..7af6cec 100644
> --- a/drivers/mmc/host/sdhci-of-arasan.c
> +++ b/drivers/mmc/host/sdhci-of-arasan.c
> @@ -22,6 +22,7 @@
> #include <linux/phy/phy.h>
> #include <linux/regmap.h>
> #include <linux/of.h>
> +#include <linux/firmware/xlnx-zynqmp.h>
>
> #include "cqhci.h"
> #include "sdhci-pltfm.h"
> @@ -32,6 +33,10 @@
>
> #define PHY_CLK_TOO_SLOW_HZ 400000
>
> +/* Default settings for ZynqMP Tap Delays */
> +#define ZYNQMP_ITAP_DELAYS {0, 0x15, 0x15, 0, 0x15, 0, 0, 0x3D, 0x12, 0, 0}
> +#define ZYNQMP_OTAP_DELAYS {0, 0x5, 0x6, 0, 0x5, 0x3, 0x3, 0x4, 0x6, 0x3, 0}
> +
> /*
> * On some SoCs the syscon area has a feature where the upper 16-bits of
> * each 32-bit register act as a write mask for the lower 16-bits. This allows
> @@ -81,6 +86,7 @@ struct sdhci_arasan_soc_ctl_map {
> * @sdcardclk: Pointer to normal 'struct clock' for sdcardclk_hw.
> * @soc_ctl_base: Pointer to regmap for syscon for soc_ctl registers.
> * @soc_ctl_map: Map to get offsets into soc_ctl registers.
> + * @of_data: Platform specific runtime data storage pointer
> */
> struct sdhci_arasan_data {
> struct sdhci_host *host;
> @@ -101,6 +107,15 @@ struct sdhci_arasan_data {
> /* Controller immediately reports SDHCI_CLOCK_INT_STABLE after enabling the
> * internal clock even when the clock isn't stable */
> #define SDHCI_ARASAN_QUIRK_CLOCK_UNSTABLE BIT(1)
> +
> + void *of_data;
> +};
> +
> +struct sdhci_arasan_zynqmp_data {
> + void (*set_tap_delay)(struct sdhci_host *host);
> + const struct zynqmp_eemi_ops *eemi_ops;
> + u8 tapdly[MMC_TIMING_MMC_HS400 + 1][2]; /* [0] for input delay, */
> + /* [1] for output delay */
> };
Please use two different structs, one for the clock provider data and
one for the mmc variant/platform data. This makes the code more
readable.
In regards to the mmc data part, I suggest to drop the
->set_tap_delay() callback, but rather use a boolean flag to indicate
whether clock phases needs to be changed for the variant. Potentially
that could even be skipped and instead call clk_set_phase()
unconditionally, as the clock core deals fine with clock providers
that doesn't support the ->set_phase() callback.
[...]
Otherwise this looks good to me!
When it comes to patch1, I need an ack from Michal to pick it up.
Kind regards
Uffe
