Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit de6f604de245b19ce2e330bc63b6522af134d7ae

Authored by Troy Kisky
Committed by Heiko Schocher
1 parent 211e47549b
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

mxc_i2c: specify i2c base address in config file 

The following platforms had their config files changed
flea3, imx31_phycore, mx35pdk, mx53ard, mx53evk, mx53smd
and mx53loco.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Stefano Babic <sbabic@denx.de>

Showing 10 changed files with 20 additions and 29 deletions Side-by-side Diff

arch/arm/include/asm/arch-mx31/imx-regs.h
Diff comments   View file @ de6f604
... ... @@ -606,6 +606,13 @@
606 606 #define UART4_BASE 0x43FB0000
607 607 #define UART5_BASE 0x43FB4000
608 608  
  609 +#define I2C1_BASE_ADDR 0x43f80000
  610 +#define I2C1_CLK_OFFSET 26
  611 +#define I2C2_BASE_ADDR 0x43F98000
  612 +#define I2C2_CLK_OFFSET 28
  613 +#define I2C3_BASE_ADDR 0x43f84000
  614 +#define I2C3_CLK_OFFSET 30
  615 +
609 616 #define ESDCTL_SDE (1 << 31)
610 617 #define ESDCTL_CMD_RW (0 << 28)
611 618 #define ESDCTL_CMD_PRECHARGE (1 << 28)
arch/arm/include/asm/arch-mx35/imx-regs.h
Diff comments   View file @ de6f604
... ... @@ -39,7 +39,7 @@
39 39 #define MAX_BASE_ADDR 0x43F04000
40 40 #define EVTMON_BASE_ADDR 0x43F08000
41 41 #define CLKCTL_BASE_ADDR 0x43F0C000
42   -#define I2C_BASE_ADDR 0x43F80000
  42 +#define I2C1_BASE_ADDR 0x43F80000
43 43 #define I2C3_BASE_ADDR 0x43F84000
44 44 #define ATA_BASE_ADDR 0x43F8C000
45 45 #define UART1_BASE 0x43F90000
drivers/i2c/mxc_i2c.c
Diff comments   View file @ de6f604
... ... @@ -59,27 +59,10 @@
59 59 #define I2SR_IIF (1 << 1)
60 60 #define I2SR_RX_NO_AK (1 << 0)
61 61  
62   -#if defined(CONFIG_SYS_I2C_MX31_PORT1)
63   -#define I2C_BASE 0x43f80000
64   -#define I2C_CLK_OFFSET 26
65   -#elif defined (CONFIG_SYS_I2C_MX31_PORT2)
66   -#define I2C_BASE 0x43f98000
67   -#define I2C_CLK_OFFSET 28
68   -#elif defined (CONFIG_SYS_I2C_MX31_PORT3)
69   -#define I2C_BASE 0x43f84000
70   -#define I2C_CLK_OFFSET 30
71   -#elif defined(CONFIG_SYS_I2C_MX53_PORT1)
72   -#define I2C_BASE I2C1_BASE_ADDR
73   -#elif defined(CONFIG_SYS_I2C_MX53_PORT2)
74   -#define I2C_BASE I2C2_BASE_ADDR
75   -#elif defined(CONFIG_SYS_I2C_MX35_PORT1)
76   -#define I2C_BASE I2C_BASE_ADDR
77   -#elif defined(CONFIG_SYS_I2C_MX35_PORT2)
78   -#define I2C_BASE I2C2_BASE_ADDR
79   -#elif defined(CONFIG_SYS_I2C_MX35_PORT3)
80   -#define I2C_BASE I2C3_BASE_ADDR
  62 +#ifdef CONFIG_SYS_I2C_BASE
  63 +#define I2C_BASE CONFIG_SYS_I2C_BASE
81 64 #else
82   -#error "define CONFIG_SYS_I2C_MX<Processor>_PORTx to use the mx I2C driver"
  65 +#error "define CONFIG_SYS_I2C_BASE to use the mxc_i2c driver"
83 66 #endif
84 67  
85 68 #define I2C_MAX_TIMEOUT 10000
... ... @@ -114,7 +97,7 @@
114 97 (struct clock_control_regs *)CCM_BASE;
115 98  
116 99 /* start the required I2C clock */
117   - writel(readl(&sc_regs->cgr0) | (3 << I2C_CLK_OFFSET),
  100 + writel(readl(&sc_regs->cgr0) | (3 << CONFIG_SYS_I2C_CLK_OFFSET),
118 101 &sc_regs->cgr0);
119 102 #endif
120 103  
include/configs/flea3.h
Diff comments   View file @ de6f604
... ... @@ -66,7 +66,7 @@
66 66 */
67 67 #define CONFIG_HARD_I2C
68 68 #define CONFIG_I2C_MXC
69   -#define CONFIG_SYS_I2C_MX35_PORT3
  69 +#define CONFIG_SYS_I2C_BASE I2C3_BASE_ADDR
70 70 #define CONFIG_SYS_I2C_SPEED 100000
71 71 #define CONFIG_SYS_I2C_SLAVE 0xfe
72 72 #define CONFIG_MXC_SPI
include/configs/imx31_phycore.h
Diff comments   View file @ de6f604
... ... @@ -54,7 +54,8 @@
54 54  
55 55 #define CONFIG_HARD_I2C
56 56 #define CONFIG_I2C_MXC
57   -#define CONFIG_SYS_I2C_MX31_PORT2
  57 +#define CONFIG_SYS_I2C_BASE I2C2_BASE_ADDR
  58 +#define CONFIG_SYS_I2C_CLK_OFFSET I2C2_CLK_OFFSET
58 59 #define CONFIG_SYS_I2C_SPEED 100000
59 60  
60 61 #define CONFIG_MXC_UART
include/configs/mx35pdk.h
Diff comments   View file @ de6f604
... ... @@ -57,7 +57,7 @@
57 57 */
58 58 #define CONFIG_HARD_I2C
59 59 #define CONFIG_I2C_MXC
60   -#define CONFIG_SYS_I2C_MX35_PORT1
  60 +#define CONFIG_SYS_I2C_BASE I2C1_BASE_ADDR
61 61 #define CONFIG_SYS_I2C_SPEED 100000
62 62 #define CONFIG_MXC_SPI
63 63 #define CONFIG_MXC_GPIO
include/configs/mx53ard.h
Diff comments   View file @ de6f604
... ... @@ -50,7 +50,7 @@
50 50 #define CONFIG_CMD_I2C
51 51 #define CONFIG_HARD_I2C
52 52 #define CONFIG_I2C_MXC
53   -#define CONFIG_SYS_I2C_MX53_PORT2
  53 +#define CONFIG_SYS_I2C_BASE I2C2_BASE_ADDR
54 54 #define CONFIG_SYS_I2C_SPEED 100000
55 55  
56 56 /* MMC Configs */
include/configs/mx53evk.h
Diff comments   View file @ de6f604
... ... @@ -53,7 +53,7 @@
53 53 #define CONFIG_CMD_I2C
54 54 #define CONFIG_HARD_I2C
55 55 #define CONFIG_I2C_MXC
56   -#define CONFIG_SYS_I2C_MX53_PORT2 1
  56 +#define CONFIG_SYS_I2C_BASE I2C2_BASE_ADDR
57 57 #define CONFIG_SYS_I2C_SPEED 100000
58 58  
59 59 /* PMIC Configs */
include/configs/mx53loco.h
Diff comments   View file @ de6f604
... ... @@ -89,7 +89,7 @@
89 89 /* I2C Configs */
90 90 #define CONFIG_HARD_I2C
91 91 #define CONFIG_I2C_MXC
92   -#define CONFIG_SYS_I2C_MX53_PORT1
  92 +#define CONFIG_SYS_I2C_BASE I2C1_BASE_ADDR
93 93 #define CONFIG_SYS_I2C_SPEED 100000
94 94  
95 95 /* PMIC Controller */
include/configs/mx53smd.h
Diff comments   View file @ de6f604
... ... @@ -50,7 +50,7 @@
50 50 #define CONFIG_CMD_I2C
51 51 #define CONFIG_HARD_I2C
52 52 #define CONFIG_I2C_MXC
53   -#define CONFIG_SYS_I2C_MX53_PORT2
  53 +#define CONFIG_SYS_I2C_BASE I2C2_BASE_ADDR
54 54 #define CONFIG_SYS_I2C_SPEED 100000
55 55  
56 56 /* MMC Configs */