Eric Lee / smarc-uboot

Download as
Browse Code »

Commit 3828c59e54eef1d6360564c3bbd0449223e77dbb

Authored by Marek Behún
Committed by Stefan Roese
1 parent 2251512345
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, 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_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

arm: mvebu: turris_omnia: remove redundant code 

The i2c slave disabling is done by mvtwsi driver and is not needed here.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Acked-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>

Showing 1 changed file with 0 additions and 13 deletions Side-by-side Diff

board/CZ.NIC/turris_omnia/turris_omnia.c
Diff comments   View file @ 3828c59
... ... @@ -50,8 +50,6 @@
50 50 #define OMNIA_ATSHA204_OTP_MAC0 3
51 51 #define OMNIA_ATSHA204_OTP_MAC1 4
52 52  
53   -#define MVTWSI_ARMADA_DEBUG_REG 0x8c
54   -
55 53 /*
56 54 * Those values and defines are taken from the Marvell U-Boot version
57 55 * "u-boot-2013.01-2014_T3.0"
... ... @@ -297,8 +295,6 @@
297 295  
298 296 int board_early_init_f(void)
299 297 {
300   - u32 i2c_debug_reg;
301   -
302 298 /* Configure MPP */
303 299 writel(0x11111111, MVEBU_MPP_BASE + 0x00);
304 300 writel(0x11111111, MVEBU_MPP_BASE + 0x04);
... ... @@ -320,15 +316,6 @@
320 316 /* Set GPP Out Enable */
321 317 writel(OMNIA_GPP_OUT_ENA_LOW, MVEBU_GPIO0_BASE + 0x04);
322 318 writel(OMNIA_GPP_OUT_ENA_MID, MVEBU_GPIO1_BASE + 0x04);
323   -
324   - /*
325   - * Disable I2C debug mode blocking 0x64 I2C address.
326   - * Note: that would be redundant once Turris Omnia migrates to DM_I2C,
327   - * because the mvtwsi driver includes equivalent code.
328   - */
329   - i2c_debug_reg = readl(MVEBU_TWSI_BASE + MVTWSI_ARMADA_DEBUG_REG);
330   - i2c_debug_reg &= ~(1<<18);
331   - writel(i2c_debug_reg, MVEBU_TWSI_BASE + MVTWSI_ARMADA_DEBUG_REG);
332 319  
333 320 return 0;
334 321 }