Unverified Commit bee75748 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-5.14' of... 

Merge tag 'imx-fixes-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes

i.MX fixes for 5.14:

- A couple of fixes on MMDC driver to add missing iounmap() and
  clk_disable_unprepare(), and a follow-up fix.
- Fix missing-prototypes warning in SRC driver.
- Revert commit 7d981405 ("soc: imx8m: change to use platform
  driver"), which breaks i.MX8M system that has CAAM driver enabled.
- One fix on imx53-m53menlo pinctrl configuration.
- Increase the PHY reset duration for imx6qdl-sr-som to fix intermittent
  issues where the PHY would be unresponsive every once in a while.
- Add missing flag for in-band signalling between PHY and MAC on
  kontron-sl28-var2 board to fix network support.
- Limit the SDIO Clock on Colibri iMX6ULL to 25MHz for fixing wireless
  noise issue.
- Fix sysclk node name for LS1028A so that U-Boot is able to update the
  "clock-frequency" property.

* tag 'imx-fixes-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx: Swap M53Menlo pinctrl_power_button/pinctrl_power_out pins
  ARM: imx: fix missing 3rd argument in macro imx_mmdc_perf_init
  ARM: dts: colibri-imx6ull: limit SDIO clock to 25MHz
  arm64: dts: ls1028: sl28: fix networking for variant 2
  Revert "soc: imx8m: change to use platform driver"
  ARM: dts: imx6qdl-sr-som: Increase the PHY reset duration to 10ms
  ARM: imx: common: Move prototype outside the SMP block
  ARM: imx: add missing clk_disable_unprepare()
  ARM: imx: add missing iounmap()
  arm64: dts: ls1028a: fix node name for the sysclk

Link: https://lore.kernel.org/r/20210726023221.GF5901@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 796a8c85 3d9e30a5

arch/arm/boot/dts/imx53-m53menlo.dts

+2 −2
Original line number Diff line number Diff line
@@ -388,13 +388,13 @@ MX53_PAD_LVDS0_TX3_P__LDB_LVDS0_TX3 0x80000000 


		pinctrl_power_button: powerbutgrp {

			fsl,pins = <

				MX53_PAD_SD2_DATA2__GPIO1_13		0x1e4

				MX53_PAD_SD2_DATA0__GPIO1_15		0x1e4

			>;

		};



		pinctrl_power_out: poweroutgrp {

			fsl,pins = <

				MX53_PAD_SD2_DATA0__GPIO1_15		0x1e4

				MX53_PAD_SD2_DATA2__GPIO1_13		0x1e4

			>;

		};

arch/arm/boot/dts/imx6qdl-sr-som.dtsi

+7 −1
Original line number Diff line number Diff line
@@ -54,7 +54,13 @@ &fec { 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_microsom_enet_ar8035>;

	phy-mode = "rgmii-id";

	phy-reset-duration = <2>;



	/*

	 * The PHY seems to require a long-enough reset duration to avoid

	 * some rare issues where the PHY gets stuck in an inconsistent and

	 * non-functional state at boot-up. 10ms proved to be fine .

	 */

	phy-reset-duration = <10>;

	phy-reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;

	status = "okay";

arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ &usdhc2 { 
	assigned-clock-rates = <0>, <198000000>;

	cap-power-off-card;

	keep-power-in-suspend;

	max-frequency = <25000000>;

	mmc-pwrseq = <&wifi_pwrseq>;

	no-1-8-v;

	non-removable;

arch/arm/mach-imx/common.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ void imx_set_cpu_arg(int cpu, u32 arg); 
void v7_secondary_startup(void);

void imx_scu_map_io(void);

void imx_smp_prepare(void);

void imx_gpcv2_set_core1_pdn_pup_by_software(bool pdn);

#else

static inline void imx_scu_map_io(void) {}

static inline void imx_smp_prepare(void) {}
@@ -81,6 +80,7 @@ void imx_gpc_mask_all(void); 
void imx_gpc_restore_all(void);

void imx_gpc_hwirq_mask(unsigned int hwirq);

void imx_gpc_hwirq_unmask(unsigned int hwirq);

void imx_gpcv2_set_core1_pdn_pup_by_software(bool pdn);

void imx_anatop_init(void);

void imx_anatop_pre_suspend(void);

void imx_anatop_post_resume(void);

arch/arm/mach-imx/mmdc.c

+14 −3
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ struct mmdc_pmu { 
	struct perf_event *mmdc_events[MMDC_NUM_COUNTERS];

	struct hlist_node node;

	struct fsl_mmdc_devtype_data *devtype_data;

	struct clk *mmdc_ipg_clk;

};



/*
@@ -462,11 +463,14 @@ static int imx_mmdc_remove(struct platform_device *pdev) 


	cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &pmu_mmdc->node);

	perf_pmu_unregister(&pmu_mmdc->pmu);

	iounmap(pmu_mmdc->mmdc_base);

	clk_disable_unprepare(pmu_mmdc->mmdc_ipg_clk);

	kfree(pmu_mmdc);

	return 0;

}



static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_base)

static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_base,

			      struct clk *mmdc_ipg_clk)

{

	struct mmdc_pmu *pmu_mmdc;

	char *name;
@@ -494,6 +498,7 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b 
	}



	mmdc_num = mmdc_pmu_init(pmu_mmdc, mmdc_base, &pdev->dev);

	pmu_mmdc->mmdc_ipg_clk = mmdc_ipg_clk;

	if (mmdc_num == 0)

		name = "mmdc";

	else
@@ -529,7 +534,7 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b 


#else

#define imx_mmdc_remove NULL

#define imx_mmdc_perf_init(pdev, mmdc_base) 0

#define imx_mmdc_perf_init(pdev, mmdc_base, mmdc_ipg_clk) 0

#endif



static int imx_mmdc_probe(struct platform_device *pdev)
@@ -567,7 +572,13 @@ static int imx_mmdc_probe(struct platform_device *pdev) 
	val &= ~(1 << BP_MMDC_MAPSR_PSD);

	writel_relaxed(val, reg);



	return imx_mmdc_perf_init(pdev, mmdc_base);

	err = imx_mmdc_perf_init(pdev, mmdc_base, mmdc_ipg_clk);

	if (err) {

		iounmap(mmdc_base);

		clk_disable_unprepare(mmdc_ipg_clk);

	}



	return err;

}



int imx_mmdc_get_ddr_type(void)