omap1: omap7xx clocks, mux, serial fixes

This change adds in the necessary clocks and mux pins for UART
control on omap7xx devices.  I also made a change in the serial
code to only try and initialize two UARTs in omap_serial_init, as
these devices don't have three.

Signed-off-by: Cory Maccarrone <darkstar6262@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 20 insertions, 0 deletions

diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c
index aa8558adbf1c..9240bc1026a3 100644
--- a/arch/arm/mach-omap1/clock_data.c
+++ b/arch/arm/mach-omap1/clock_data.c
@@ -478,6 +478,24 @@ static struct clk usb_dc_ck7xx = {
         .enable_bit     = 8,
 };
 
+static struct clk uart1_7xx = {
+        .name           = "uart1_ck",
+        .ops            = &clkops_generic,
+        /* Direct from ULPD, no parent */
+        .rate           = 12000000,
+        .enable_reg     = OMAP1_IO_ADDRESS(SOFT_REQ_REG),
+        .enable_bit     = 9,
+};
+
+static struct clk uart2_7xx = {
+        .name           = "uart2_ck",
+        .ops            = &clkops_generic,
+        /* Direct from ULPD, no parent */
+        .rate           = 12000000,
+        .enable_reg     = OMAP1_IO_ADDRESS(SOFT_REQ_REG),
+        .enable_bit     = 11,
+};
+
 static struct clk mclk_1510 = {
         .name           = "mclk",
         .ops            = &clkops_generic,
@@ -620,7 +638,9 @@ static struct omap_clk omap_clks[] = {
         /* ULPD clocks */
         CLK(NULL,       "uart1_ck",     &uart1_1510,    CK_1510 | CK_310),
         CLK(NULL,       "uart1_ck",     &uart1_16xx.clk, CK_16XX),
+        CLK(NULL,       "uart1_ck",     &uart1_7xx,     CK_7XX),
         CLK(NULL,       "uart2_ck",     &uart2_ck,      CK_16XX | CK_1510 | CK_310),
+        CLK(NULL,       "uart2_ck",     &uart2_7xx,     CK_7XX),
         CLK(NULL,       "uart3_ck",     &uart3_1510,    CK_1510 | CK_310),
         CLK(NULL,       "uart3_ck",     &uart3_16xx.clk, CK_16XX),
         CLK(NULL,       "usb_clko",     &usb_clko,      CK_16XX | CK_1510 | CK_310),