Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f4c9778 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'imx-fixes-4.4-2' of... 

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

Merge "ARM: imx: fixes for 4.4, 2nd round" from Shawn Guo:

The i.MX fixes for 4.4, 2nd round:
- Fix vf610 SAI clock configuration bug which is discovered by the newly
  added master mode support in SAI audio driver.
- Fix buggy L2 cache latency values in vf610 device trees, which may
  cause system hang when cpu runs at a higher frequency.

* tag 'imx-fixes-4.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: vf610: use reset values for L2 cache latencies
  ARM: dts: vf610: fix clock definition for SAI2
  ARM: imx: clk-vf610: fix SAI clock tree
parents 65347783 9c171905

arch/arm/boot/dts/vf610-colibri.dtsi

+0 −5
Original line number Diff line number Diff line
@@ -18,8 +18,3 @@ 
		reg = <0x80000000 0x10000000>;

	};

};
 


&L2 {

	arm,data-latency = <2 1 2>;

	arm,tag-latency = <3 2 3>;

};

arch/arm/boot/dts/vf610.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
		reg = <0x40006000 0x1000>;

		cache-unified;

		cache-level = <2>;

		arm,data-latency = <1 1 1>;

		arm,data-latency = <3 3 3>;

		arm,tag-latency = <2 2 2>;

	};

};

arch/arm/boot/dts/vfxxx.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -178,8 +178,10 @@ 
				compatible = "fsl,vf610-sai";

				reg = <0x40031000 0x1000>;

				interrupts = <86 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks VF610_CLK_SAI2>;

				clock-names = "sai";

				clocks = <&clks VF610_CLK_SAI2>,

					<&clks VF610_CLK_SAI2_DIV>,

					<&clks 0>, <&clks 0>;

				clock-names = "bus", "mclk1", "mclk2", "mclk3";

				dma-names = "tx", "rx";

				dmas = <&edma0 0 21>,

					<&edma0 0 20>;

drivers/clk/imx/clk-vf610.c

+4 −4
Original line number Diff line number Diff line
@@ -335,22 +335,22 @@ static void __init vf610_clocks_init(struct device_node *ccm_node) 
	clk[VF610_CLK_SAI0_SEL] = imx_clk_mux("sai0_sel", CCM_CSCMR1, 0, 2, sai_sels, 4);

	clk[VF610_CLK_SAI0_EN] = imx_clk_gate("sai0_en", "sai0_sel", CCM_CSCDR1, 16);

	clk[VF610_CLK_SAI0_DIV] = imx_clk_divider("sai0_div", "sai0_en", CCM_CSCDR1, 0, 4);

	clk[VF610_CLK_SAI0] = imx_clk_gate2("sai0", "sai0_div", CCM_CCGR0, CCM_CCGRx_CGn(15));

	clk[VF610_CLK_SAI0] = imx_clk_gate2("sai0", "ipg_bus", CCM_CCGR0, CCM_CCGRx_CGn(15));



	clk[VF610_CLK_SAI1_SEL] = imx_clk_mux("sai1_sel", CCM_CSCMR1, 2, 2, sai_sels, 4);

	clk[VF610_CLK_SAI1_EN] = imx_clk_gate("sai1_en", "sai1_sel", CCM_CSCDR1, 17);

	clk[VF610_CLK_SAI1_DIV] = imx_clk_divider("sai1_div", "sai1_en", CCM_CSCDR1, 4, 4);

	clk[VF610_CLK_SAI1] = imx_clk_gate2("sai1", "sai1_div", CCM_CCGR1, CCM_CCGRx_CGn(0));

	clk[VF610_CLK_SAI1] = imx_clk_gate2("sai1", "ipg_bus", CCM_CCGR1, CCM_CCGRx_CGn(0));



	clk[VF610_CLK_SAI2_SEL] = imx_clk_mux("sai2_sel", CCM_CSCMR1, 4, 2, sai_sels, 4);

	clk[VF610_CLK_SAI2_EN] = imx_clk_gate("sai2_en", "sai2_sel", CCM_CSCDR1, 18);

	clk[VF610_CLK_SAI2_DIV] = imx_clk_divider("sai2_div", "sai2_en", CCM_CSCDR1, 8, 4);

	clk[VF610_CLK_SAI2] = imx_clk_gate2("sai2", "sai2_div", CCM_CCGR1, CCM_CCGRx_CGn(1));

	clk[VF610_CLK_SAI2] = imx_clk_gate2("sai2", "ipg_bus", CCM_CCGR1, CCM_CCGRx_CGn(1));



	clk[VF610_CLK_SAI3_SEL] = imx_clk_mux("sai3_sel", CCM_CSCMR1, 6, 2, sai_sels, 4);

	clk[VF610_CLK_SAI3_EN] = imx_clk_gate("sai3_en", "sai3_sel", CCM_CSCDR1, 19);

	clk[VF610_CLK_SAI3_DIV] = imx_clk_divider("sai3_div", "sai3_en", CCM_CSCDR1, 12, 4);

	clk[VF610_CLK_SAI3] = imx_clk_gate2("sai3", "sai3_div", CCM_CCGR1, CCM_CCGRx_CGn(2));

	clk[VF610_CLK_SAI3] = imx_clk_gate2("sai3", "ipg_bus", CCM_CCGR1, CCM_CCGRx_CGn(2));



	clk[VF610_CLK_NFC_SEL] = imx_clk_mux("nfc_sel", CCM_CSCMR1, 12, 2, nfc_sels, 4);

	clk[VF610_CLK_NFC_EN] = imx_clk_gate("nfc_en", "nfc_sel", CCM_CSCDR2, 9);