ARM: mx51: add imx-ssi devices (b8618661) · Commits · 戴 / test

arch/arm/mach-mx5/clock-mx51.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -949,6 +949,16 @@ DEFINE_CLOCK(fec_clk, 0, MXC_CCM_CCGR2, MXC_CCM_CCGRx_CG12_OFFSET,
		DEFINE_CLOCK1(nfc_clk, 0, MXC_CCM_CCGR5, MXC_CCM_CCGRx_CG10_OFFSET,
		clk_nfc, &emi_slow_clk, NULL);

		/* SSI */
		DEFINE_CLOCK(ssi1_ipg_clk, 0, MXC_CCM_CCGR3, MXC_CCM_CCGRx_CG8_OFFSET,
		NULL, NULL, &ipg_clk, NULL);
		DEFINE_CLOCK(ssi1_clk, 0, MXC_CCM_CCGR3, MXC_CCM_CCGRx_CG9_OFFSET,
		NULL, NULL, &pll3_sw_clk, &ssi1_ipg_clk);
		DEFINE_CLOCK(ssi2_ipg_clk, 1, MXC_CCM_CCGR3, MXC_CCM_CCGRx_CG10_OFFSET,
		NULL, NULL, &ipg_clk, NULL);
		DEFINE_CLOCK(ssi2_clk, 1, MXC_CCM_CCGR3, MXC_CCM_CCGRx_CG11_OFFSET,
		NULL, NULL, &pll3_sw_clk, &ssi2_ipg_clk);

		/* eCSPI */
		DEFINE_CLOCK_FULL(ecspi1_ipg_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG9_OFFSET,
		NULL, NULL, _clk_ccgr_enable_inrun, _clk_ccgr_disable,
		@@ -991,6 +1001,8 @@ static struct clk_lookup lookups[] = {
		_REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk)
		_REGISTER_CLOCK("imx-keypad.0", NULL, kpp_clk)
		_REGISTER_CLOCK("mxc_nand", NULL, nfc_clk)
		_REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)
		_REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
		_REGISTER_CLOCK("imx51-ecspi.0", NULL, ecspi1_clk)
		_REGISTER_CLOCK("imx51-ecspi.1", NULL, ecspi2_clk)
		_REGISTER_CLOCK("imx51-cspi.0", NULL, cspi_clk)

+4 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,10 @@ extern const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst;
		#define imx51_add_imx_i2c(id, pdata) \
		imx_add_imx_i2c(&imx51_imx_i2c_data[id], pdata)

		extern const struct imx_imx_ssi_data imx51_imx_ssi_data[] __initconst;
		#define imx51_add_imx_ssi(id, pdata) \
		imx_add_imx_ssi(&imx51_imx_ssi_data[id], pdata)

		extern const struct imx_imx_uart_1irq_data imx51_imx_uart_data[] __initconst;
		#define imx51_add_imx_uart(id, pdata) \
		imx_add_imx_uart_1irq(&imx51_imx_uart_data[id], pdata)

+9 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,15 @@ const struct imx_imx_ssi_data imx35_imx_ssi_data[] __initconst = {
		};
		#endif /* ifdef CONFIG_ARCH_MX35 */

		#ifdef CONFIG_ARCH_MX51
		const struct imx_imx_ssi_data imx51_imx_ssi_data[] __initconst = {
		#define imx51_imx_ssi_data_entry(_id, _hwid) \
		imx_imx_ssi_data_entry(MX51, _id, _hwid, SZ_4K)
		imx51_imx_ssi_data_entry(0, 1),
		imx51_imx_ssi_data_entry(1, 2),
		};
		#endif /* ifdef CONFIG_ARCH_MX51 */

		struct platform_device *__init imx_add_imx_ssi(
		const struct imx_imx_ssi_data *data,
		const struct imx_ssi_platform_data *pdata)

+10 −10