diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-08-20 10:43:54 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-10-01 03:33:00 -0400 |
commit | b86186610f639344a7db54da89267f645afc30ec (patch) | |
tree | c52f7f316ac08daf4ea81262dd36af1427940093 /arch/arm/mach-mx5 | |
parent | 04b73b1571c26d491c62c42cb06b96bf482fa7a2 (diff) |
ARM: mx51: add imx-ssi devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx5')
-rw-r--r-- | arch/arm/mach-mx5/clock-mx51.c | 12 | ||||
-rw-r--r-- | arch/arm/mach-mx5/devices-imx51.h | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/clock-mx51.c b/arch/arm/mach-mx5/clock-mx51.c index 0cef8c4f84ba..5c7901180c8e 100644 --- a/arch/arm/mach-mx5/clock-mx51.c +++ b/arch/arm/mach-mx5/clock-mx51.c | |||
@@ -949,6 +949,16 @@ DEFINE_CLOCK(fec_clk, 0, MXC_CCM_CCGR2, MXC_CCM_CCGRx_CG12_OFFSET, | |||
949 | DEFINE_CLOCK1(nfc_clk, 0, MXC_CCM_CCGR5, MXC_CCM_CCGRx_CG10_OFFSET, | 949 | DEFINE_CLOCK1(nfc_clk, 0, MXC_CCM_CCGR5, MXC_CCM_CCGRx_CG10_OFFSET, |
950 | clk_nfc, &emi_slow_clk, NULL); | 950 | clk_nfc, &emi_slow_clk, NULL); |
951 | 951 | ||
952 | /* SSI */ | ||
953 | DEFINE_CLOCK(ssi1_ipg_clk, 0, MXC_CCM_CCGR3, MXC_CCM_CCGRx_CG8_OFFSET, | ||
954 | NULL, NULL, &ipg_clk, NULL); | ||
955 | DEFINE_CLOCK(ssi1_clk, 0, MXC_CCM_CCGR3, MXC_CCM_CCGRx_CG9_OFFSET, | ||
956 | NULL, NULL, &pll3_sw_clk, &ssi1_ipg_clk); | ||
957 | DEFINE_CLOCK(ssi2_ipg_clk, 1, MXC_CCM_CCGR3, MXC_CCM_CCGRx_CG10_OFFSET, | ||
958 | NULL, NULL, &ipg_clk, NULL); | ||
959 | DEFINE_CLOCK(ssi2_clk, 1, MXC_CCM_CCGR3, MXC_CCM_CCGRx_CG11_OFFSET, | ||
960 | NULL, NULL, &pll3_sw_clk, &ssi2_ipg_clk); | ||
961 | |||
952 | /* eCSPI */ | 962 | /* eCSPI */ |
953 | DEFINE_CLOCK_FULL(ecspi1_ipg_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG9_OFFSET, | 963 | DEFINE_CLOCK_FULL(ecspi1_ipg_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG9_OFFSET, |
954 | NULL, NULL, _clk_ccgr_enable_inrun, _clk_ccgr_disable, | 964 | NULL, NULL, _clk_ccgr_enable_inrun, _clk_ccgr_disable, |
@@ -991,6 +1001,8 @@ static struct clk_lookup lookups[] = { | |||
991 | _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk) | 1001 | _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk) |
992 | _REGISTER_CLOCK("imx-keypad.0", NULL, kpp_clk) | 1002 | _REGISTER_CLOCK("imx-keypad.0", NULL, kpp_clk) |
993 | _REGISTER_CLOCK("mxc_nand", NULL, nfc_clk) | 1003 | _REGISTER_CLOCK("mxc_nand", NULL, nfc_clk) |
1004 | _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) | ||
1005 | _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) | ||
994 | _REGISTER_CLOCK("imx51-ecspi.0", NULL, ecspi1_clk) | 1006 | _REGISTER_CLOCK("imx51-ecspi.0", NULL, ecspi1_clk) |
995 | _REGISTER_CLOCK("imx51-ecspi.1", NULL, ecspi2_clk) | 1007 | _REGISTER_CLOCK("imx51-ecspi.1", NULL, ecspi2_clk) |
996 | _REGISTER_CLOCK("imx51-cspi.0", NULL, cspi_clk) | 1008 | _REGISTER_CLOCK("imx51-cspi.0", NULL, cspi_clk) |
diff --git a/arch/arm/mach-mx5/devices-imx51.h b/arch/arm/mach-mx5/devices-imx51.h index 8235b8c6729b..782b45bd916b 100644 --- a/arch/arm/mach-mx5/devices-imx51.h +++ b/arch/arm/mach-mx5/devices-imx51.h | |||
@@ -13,6 +13,10 @@ extern const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst; | |||
13 | #define imx51_add_imx_i2c(id, pdata) \ | 13 | #define imx51_add_imx_i2c(id, pdata) \ |
14 | imx_add_imx_i2c(&imx51_imx_i2c_data[id], pdata) | 14 | imx_add_imx_i2c(&imx51_imx_i2c_data[id], pdata) |
15 | 15 | ||
16 | extern const struct imx_imx_ssi_data imx51_imx_ssi_data[] __initconst; | ||
17 | #define imx51_add_imx_ssi(id, pdata) \ | ||
18 | imx_add_imx_ssi(&imx51_imx_ssi_data[id], pdata) | ||
19 | |||
16 | extern const struct imx_imx_uart_1irq_data imx51_imx_uart_data[] __initconst; | 20 | extern const struct imx_imx_uart_1irq_data imx51_imx_uart_data[] __initconst; |
17 | #define imx51_add_imx_uart(id, pdata) \ | 21 | #define imx51_add_imx_uart(id, pdata) \ |
18 | imx_add_imx_uart_1irq(&imx51_imx_uart_data[id], pdata) | 22 | imx_add_imx_uart_1irq(&imx51_imx_uart_data[id], pdata) |