summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonela Voinescu <ionela.voinescu@imgtec.com>2015-02-17 18:45:28 +0000
committerPatrick Georgi <pgeorgi@google.com>2015-04-14 12:08:49 +0200
commit1d9515ff4c5f2339372ef055da5834827d0c91c4 (patch)
tree7c10c3af9d269ee268991370d8261834c03c282a
parentfdce680759be398535c40d2f692f36e94e21f86e (diff)
downloadcoreboot-1d9515ff4c5f2339372ef055da5834827d0c91c4.tar.xz
urara: setup I2C0 clock and MFIOs
BUG=chrome-os-partner:31438 TEST=tested on Pistachio bring up board; works properly BRANCH=none Change-Id: Ic805311d3aaf40da601c88cd05a73254088374bd Signed-off-by: Stefan Reinauer <reinauer@chromium.org> Original-Commit-Id: ad9427c069ed34ab91e93df59ec3361499b54982 Original-Change-Id: If8e142273afd2d591a975f4e7e34aa73e8d71b0c Original-Signed-off-by: Ionela Voinescu <ionela.voinescu@imgtec.com> Original-Reviewed-on: https://chromium-review.googlesource.com/250451 Original-Reviewed-by: David Hendricks <dhendrix@chromium.org> Reviewed-on: http://review.coreboot.org/9674 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--src/mainboard/google/urara/bootblock.c59
1 files changed, 47 insertions, 12 deletions
diff --git a/src/mainboard/google/urara/bootblock.c b/src/mainboard/google/urara/bootblock.c
index f8f62f7031..b2f6b70cd4 100644
--- a/src/mainboard/google/urara/bootblock.c
+++ b/src/mainboard/google/urara/bootblock.c
@@ -23,15 +23,13 @@
#include <stdint.h>
#include <soc/clocks.h>
+#define PADS_FUNCTION_SELECT0_ADDR (0xB8101C00 + 0xC0)
+
#define GPIO_BIT_EN_ADDR(bank) (0xB8101C00 + 0x200 + (0x24 * (bank)))
-/* MFIO definitions for UART0/1 */
+/* MFIO definitions for UART1 */
#define UART1_RXD_MFIO 59
#define UART1_TXD_MFIO 60
-#define UART0_RXD_MFIO 55
-#define UART0_TXD_MFIO 56
-#define UART0_RTS_MFIO 57
-#define UART0_CTS_MFIO 58
/* MFIO definitions for SPIM */
#define SPIM1_D0_TXD_MFIO 5
@@ -41,6 +39,14 @@
#define SPIM1_D3_MFIO 7
#define SPIM1_CS0_MFIO 0
+/* MFIO definitions for I2C0 */
+#define I2C0_DATA_MFIO 28
+#define I2C0_CLK_MFIO 29
+#define I2C0_DATA_FUNCTION_OFFSET 20
+#define I2C0_CLK_FUNCTION_OFFSET 21
+#define I2C0_DATA_FUNCTION_MASK 0x1
+#define I2C0_CLK_FUNCTION_MASK 0x1
+
static void uart1_mfio_setup(void)
{
u32 reg, mfio_mask;
@@ -48,7 +54,7 @@ static void uart1_mfio_setup(void)
/*
* Disable GPIO for UART1 MFIOs
* All UART MFIOs have MFIO/16 = 3, therefore we use GPIO pad 3
- * This is the primary function (0) of these MFIOs and therfore there
+ * This is the only function (0) of these MFIOs and therfore there
* is no need to set up a function number in the corresponding
* function select register.
*/
@@ -71,21 +77,18 @@ static void spim1_mfio_setup(void)
/*
* Disable GPIO for SPIM1 MFIOs
* All SPFI1 MFIOs have MFIO/16 = 0, therefore we use GPIO pad 0
- * This is the primary function (0) of these MFIOs and therfore there
+ * This is the only function (0) of these MFIOs and therfore there
* is no need to set up a function number in the corresponding
* function select register.
*/
reg = read32(GPIO_BIT_EN_ADDR(0));
- /* Disable GPIO for UART0 MFIOs */
+ /* Disable GPIO for SPIM1 MFIOs */
mfio_mask = 1 << (SPIM1_D0_TXD_MFIO % 16);
mfio_mask |= 1 << (SPIM1_D1_RXD_MFIO % 16);
mfio_mask |= 1 << (SPIM1_MCLK_MFIO % 16);
mfio_mask |= 1 << (SPIM1_D2_MFIO % 16);
mfio_mask |= 1 << (SPIM1_D3_MFIO % 16);
-
- /* TODO: for the moment it only sets up CS0 (NOR) */
- /* There is no need for other CS lines in Coreboot */
mfio_mask |= 1 << (SPIM1_CS0_MFIO % 16);
/* Clear relevant bits */
@@ -98,6 +101,36 @@ static void spim1_mfio_setup(void)
write32(GPIO_BIT_EN_ADDR(0), reg);
}
+static void i2c0_mfio_setup(void)
+{
+ u32 reg, mfio_mask;
+
+ /*
+ * Disable GPIO for I2C0 MFIOs
+ * All UART MFIOs have MFIO/16 = 1, therefore we use GPIO pad 1
+ */
+ reg = read32(GPIO_BIT_EN_ADDR(1));
+ mfio_mask = 1 << (I2C0_DATA_MFIO % 16);
+ mfio_mask |= 1 << (I2C0_CLK_MFIO % 16);
+ /* Clear relevant bits */
+ reg &= ~mfio_mask;
+ /*
+ * Set corresponding bits in the upper half word
+ * in order to be able to modify the chosen pins
+ */
+ reg |= mfio_mask << 16;
+ write32(GPIO_BIT_EN_ADDR(1), reg);
+
+ /* Set bits to 0 (clear) which is the primary function
+ * for these MFIOs; those bits will all be set to 1 by
+ * default
+ */
+ reg = read32(PADS_FUNCTION_SELECT0_ADDR);
+ reg &= ~(I2C0_DATA_FUNCTION_MASK << I2C0_DATA_FUNCTION_OFFSET);
+ reg &= ~(I2C0_CLK_FUNCTION_MASK << I2C0_CLK_FUNCTION_OFFSET);
+ write32(PADS_FUNCTION_SELECT0_ADDR, reg);
+}
+
static int init_clocks(void)
{
int ret;
@@ -124,6 +157,8 @@ static int init_clocks(void)
/* System PLL divided by 7 divided by 62 -> 1.8433 Mhz */
uart1_clk_setup(6, 61);
+ /* System PLL divided by 4 divided by 3 -> 33.33 MHz */
+ i2c0_clk_setup(3, 2);
/* Ethernet clocks setup: ENET as clock source */
eth_clk_setup(0, 7);
@@ -148,6 +183,6 @@ static void bootblock_mainboard_init(void)
/* Disable GPIO on the peripheral lines */
uart1_mfio_setup();
spim1_mfio_setup();
+ i2c0_mfio_setup();
}
-
}