[PATCH 00/20] i2c: Chip away at some old code
This series aims to remove some of the older contents of i2c.h so that we can move towards having just the dm API.
It removes four boards which are getting in the way.
Simon Glass (20): arm: Remove pg_wcom boards i2c: Remove board_i2c_init() i2c: Remove IC2_xxx enum i2c: Remove CFG_I2C_MULTI_BUS mips: malta: Drop CMD_DATE armv8: ls2085a: Drop CMD_DATE mx28 / mx51: Drop CMD_DATE MPC837XERDB: ethernut5: work_92105: Drop CMD_DATE rtc: Drop CFG_SYS_RTC_BUS_NUM date: Drop the legacy I2C code keymile: Remove use of legacy I2C i2c: mxc: pg_wcom: Drop legacy I2c i2c: Drop reference to SYS_I2C_INIT_BOARD octeon: Drop OCTEON_I2C_FDT dead code i2c: Remove I2C_SET_BUS() i2c: Remove I2C_GET_BUS() i2c: Drop CFG_SYS_MAX_I2C_BUS i2c: Drop i2c_get_bus_num_fdt() and i2c_reset_port_fdt() i2c: Remove CFG_SYS_I2C_MAX_HOPS i2c: Remove CFG_SYS_I2C_DIRECT_BUS
README | 27 +-- arch/arm/dts/ls1021a-pg-wcom-expu1.dts | 141 ----------- arch/arm/dts/ls1021a-pg-wcom-seli8.dts | 124 ---------- arch/mips/mach-octeon/octeon_fdt.c | 22 -- board/keymile/Kconfig | 4 - board/keymile/common/common.c | 69 ------ board/keymile/pg-wcom-ls102xa/Kconfig | 39 ---- board/keymile/pg-wcom-ls102xa/MAINTAINERS | 16 -- board/keymile/pg-wcom-ls102xa/Makefile | 11 - board/keymile/pg-wcom-ls102xa/ddr.c | 91 -------- .../keymile/pg-wcom-ls102xa/pg-wcom-expu1.env | 3 - .../keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c | 218 ------------------ .../keymile/pg-wcom-ls102xa/pg-wcom-seli8.env | 3 - cmd/date.c | 32 --- cmd/i2c.c | 23 -- configs/MPC837XERDB_defconfig | 1 - configs/ethernut5_defconfig | 1 - configs/ls2080aqds_nand_defconfig | 1 - configs/ls2080aqds_qspi_defconfig | 1 - configs/ls2080ardb_nand_defconfig | 1 - configs/malta64_defconfig | 1 - configs/malta64el_defconfig | 1 - configs/malta_defconfig | 1 - configs/maltael_defconfig | 1 - configs/mx28evk_defconfig | 1 - configs/mx51evk_defconfig | 1 - configs/pg_wcom_expu1_defconfig | 109 --------- configs/pg_wcom_expu1_update_defconfig | 107 --------- configs/pg_wcom_seli8_defconfig | 109 --------- configs/pg_wcom_seli8_update_defconfig | 107 --------- configs/work_92105_defconfig | 1 - doc/I2C_Edge_Conditions | 10 +- drivers/ddr/fsl/main.c | 3 +- drivers/i2c/i2c_core.c | 141 ----------- drivers/i2c/soft_i2c.c | 11 - drivers/power/power_i2c.c | 5 - drivers/usb/host/ohci-lpc32xx.c | 4 - include/configs/ethernut5.h | 3 - include/configs/km/pg-wcom-ls102xa.h | 167 -------------- include/configs/ls1028aqds.h | 1 - include/configs/ls1028ardb.h | 2 - include/configs/ls1046afrwy.h | 1 - include/configs/lx2160aqds.h | 3 - include/configs/lx2160ardb.h | 3 - include/configs/lx2162aqds.h | 3 - include/configs/m53menlo.h | 2 - include/configs/omap3_beagle.h | 3 - include/configs/pg-wcom-expu1.h | 49 ---- include/configs/pg-wcom-seli8.h | 40 ---- include/configs/sniper.h | 14 -- include/configs/tqma6.h | 3 - include/configs/tqma6_wru4.h | 1 - include/i2c.h | 107 --------- 53 files changed, 6 insertions(+), 1837 deletions(-) delete mode 100644 arch/arm/dts/ls1021a-pg-wcom-expu1.dts delete mode 100644 arch/arm/dts/ls1021a-pg-wcom-seli8.dts delete mode 100644 board/keymile/pg-wcom-ls102xa/Kconfig delete mode 100644 board/keymile/pg-wcom-ls102xa/MAINTAINERS delete mode 100644 board/keymile/pg-wcom-ls102xa/Makefile delete mode 100644 board/keymile/pg-wcom-ls102xa/ddr.c delete mode 100644 board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env delete mode 100644 board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c delete mode 100644 board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env delete mode 100644 configs/pg_wcom_expu1_defconfig delete mode 100644 configs/pg_wcom_expu1_update_defconfig delete mode 100644 configs/pg_wcom_seli8_defconfig delete mode 100644 configs/pg_wcom_seli8_update_defconfig delete mode 100644 include/configs/km/pg-wcom-ls102xa.h delete mode 100644 include/configs/pg-wcom-expu1.h delete mode 100644 include/configs/pg-wcom-seli8.h
These board has not been converted to CONFIG_DM_I2C by the deadline:
pg_wcom_expu1 pg_wcom_expu1_update pg_wcom_seli8 pg_wcom_seli8_update
Remove them.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/arm/dts/ls1021a-pg-wcom-expu1.dts | 141 ----------- arch/arm/dts/ls1021a-pg-wcom-seli8.dts | 124 ---------- board/keymile/Kconfig | 1 - board/keymile/pg-wcom-ls102xa/Kconfig | 39 ---- board/keymile/pg-wcom-ls102xa/MAINTAINERS | 16 -- board/keymile/pg-wcom-ls102xa/Makefile | 11 - board/keymile/pg-wcom-ls102xa/ddr.c | 91 -------- .../keymile/pg-wcom-ls102xa/pg-wcom-expu1.env | 3 - .../keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c | 218 ------------------ .../keymile/pg-wcom-ls102xa/pg-wcom-seli8.env | 3 - configs/pg_wcom_expu1_defconfig | 109 --------- configs/pg_wcom_expu1_update_defconfig | 107 --------- configs/pg_wcom_seli8_defconfig | 109 --------- configs/pg_wcom_seli8_update_defconfig | 107 --------- include/configs/km/pg-wcom-ls102xa.h | 167 -------------- include/configs/pg-wcom-expu1.h | 49 ---- include/configs/pg-wcom-seli8.h | 40 ---- 17 files changed, 1335 deletions(-) delete mode 100644 arch/arm/dts/ls1021a-pg-wcom-expu1.dts delete mode 100644 arch/arm/dts/ls1021a-pg-wcom-seli8.dts delete mode 100644 board/keymile/pg-wcom-ls102xa/Kconfig delete mode 100644 board/keymile/pg-wcom-ls102xa/MAINTAINERS delete mode 100644 board/keymile/pg-wcom-ls102xa/Makefile delete mode 100644 board/keymile/pg-wcom-ls102xa/ddr.c delete mode 100644 board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env delete mode 100644 board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c delete mode 100644 board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env delete mode 100644 configs/pg_wcom_expu1_defconfig delete mode 100644 configs/pg_wcom_expu1_update_defconfig delete mode 100644 configs/pg_wcom_seli8_defconfig delete mode 100644 configs/pg_wcom_seli8_update_defconfig delete mode 100644 include/configs/km/pg-wcom-ls102xa.h delete mode 100644 include/configs/pg-wcom-expu1.h delete mode 100644 include/configs/pg-wcom-seli8.h
diff --git a/arch/arm/dts/ls1021a-pg-wcom-expu1.dts b/arch/arm/dts/ls1021a-pg-wcom-expu1.dts deleted file mode 100644 index ec8e7dee271..00000000000 --- a/arch/arm/dts/ls1021a-pg-wcom-expu1.dts +++ /dev/null @@ -1,141 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Hitachi ABB Power Grids EXPU1 board device tree source - * - * Copyright 2020 Hitachi ABB Power Grids - * - * Copyright 2013-2015 Freescale Semiconductor, Inc. - */ - -/dts-v1/; -#include "ls1021a.dtsi" - -/ { - model = "EXPU1 Service Unit for XMC and FOX"; - - aliases { - enet2-rgmii-debug-phy = &debug_phy; - }; - - chosen { - stdout-path = &uart0; - }; -}; - -&enet0 { - status = "okay"; - tbi-handle = <&tbi0>; - phy-connection-type = "sgmii"; - fixed-link { - speed = <1000>; - full-duplex; - }; -}; - -&enet1 { - status = "okay"; - tbi-handle = <&tbi1>; - phy-connection-type = "sgmii"; - fixed-link { - speed = <1000>; - full-duplex; - }; -}; - -&enet2 { - phy-handle = <&debug_phy>; - phy-connection-type = "rgmii-id"; - max-speed = <100>; - status = "okay"; -}; - -&i2c0 { - status = "okay"; -}; - -&dspi1 { - bus-num = <0>; - status = "okay"; - zl30343@0 { - compatible = "gen,spidev", "zarlink,zl30343"; - reg = <0>; - spi-max-frequency = <8000000>; - }; -}; - -&ifc { - #address-cells = <2>; - #size-cells = <1>; - /* NOR Flash on board */ - ranges = <0x0 0x0 0x60000000 0x04000000>; - status = "okay"; - - nor@0,0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "cfi-flash"; - reg = <0x0 0x0 0x4000000>; - bank-width = <2>; - device-width = <1>; - - partition@0 { - label = "rcw"; - reg = <0x0 0x20000>; - read-only; - }; - partition@20000 { - label = "qe"; - reg = <0x20000 0x20000>; - }; - partition@40000 { - label = "envred"; - reg = <0x40000 0x20000>; - }; - partition@60000 { - label = "env"; - reg = <0x60000 0x20000>; - }; - partition@100000 { - label = "u-boot"; - reg = <0x100000 0x100000>; - }; - partition@200000 { - label = "redenvred"; - reg = <0x200000 0x20000>; - }; - partition@220000 { - label = "redenv"; - reg = <0x220000 0x20000>; - }; - partition@240000 { - label = "redu-boot"; - reg = <0x240000 0x100000>; - }; - partition@340000 { - label = "ubi0"; - reg = <0x340000 0x03C00000>; - }; - }; -}; - -&mdio0 { - debug_phy: ethernet-phy@11 { - reg = <0x11>; - }; - - tbi0: tbi-phy@0xb { - reg = <0xb>; - device_type = "tbi-phy"; - }; -}; - -&mdio1 { - tbi1: tbi-phy@0xd { - reg = <0xd>; - device_type = "tbi-phy"; - }; -}; - -&uart0 { - status = "okay"; -}; diff --git a/arch/arm/dts/ls1021a-pg-wcom-seli8.dts b/arch/arm/dts/ls1021a-pg-wcom-seli8.dts deleted file mode 100644 index 03ce3ab4e47..00000000000 --- a/arch/arm/dts/ls1021a-pg-wcom-seli8.dts +++ /dev/null @@ -1,124 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2013-2015 Freescale Semiconductor, Inc. - * Copyright 2020 Hitachi Power Grids. All rights reserved. - */ - -/dts-v1/; -#include "ls1021a.dtsi" - -/ { - model = "Hitachi-Powergrids SELI8 Service Unit for XMC and FOX"; - - chosen { - stdout-path = &uart0; - }; -}; - -&enet0 { - status = "okay"; - tbi-handle = <&tbi0>; - phy-connection-type = "sgmii"; - fixed-link { - speed = <1000>; - full-duplex; - }; -}; - -&enet1 { - status = "okay"; - tbi-handle = <&tbi1>; - phy-connection-type = "sgmii"; - fixed-link { - speed = <1000>; - full-duplex; - }; -}; - -&enet2 { - phy-handle = <&debug_phy>; - phy-connection-type = "rgmii-id"; - max-speed = <100>; - status = "okay"; -}; - -&i2c0 { - status = "okay"; -}; - -&ifc { - #address-cells = <2>; - #size-cells = <1>; - /* NOR Flash on board */ - ranges = <0x0 0x0 0x60000000 0x04000000>; - status = "okay"; - - nor@0,0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "cfi-flash"; - reg = <0x0 0x0 0x4000000>; - bank-width = <2>; - device-width = <1>; - - partition@0 { - label = "rcw"; - reg = <0x0 0x20000>; - read-only; - }; - partition@20000 { - label = "qe"; - reg = <0x20000 0x20000>; - }; - partition@40000 { - label = "envred"; - reg = <0x40000 0x20000>; - }; - partition@60000 { - label = "env"; - reg = <0x60000 0x20000>; - }; - partition@100000 { - label = "u-boot"; - reg = <0x100000 0x100000>; - }; - partition@200000 { - label = "redenvred"; - reg = <0x200000 0x20000>; - }; - partition@220000 { - label = "redenv"; - reg = <0x220000 0x20000>; - }; - partition@240000 { - label = "redu-boot"; - reg = <0x240000 0x100000>; - }; - partition@340000 { - label = "ubi0"; - reg = <0x340000 0x03C00000>; - }; - }; -}; - -&mdio0 { - debug_phy: ethernet-phy@11 { - reg = <0x11>; - }; - - tbi0: tbi-phy@0xb { - reg = <0xb>; - device_type = "tbi-phy"; - }; -}; - -&mdio1 { - tbi1: tbi-phy@0xd { - reg = <0xd>; - device_type = "tbi-phy"; - }; -}; - -&uart0 { - status = "okay"; -}; diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig index f7e9b74f578..18ef689b334 100644 --- a/board/keymile/Kconfig +++ b/board/keymile/Kconfig @@ -154,7 +154,6 @@ config PG_WCOM_UBOOT_UPDATE
source "board/keymile/km83xx/Kconfig" source "board/keymile/kmcent2/Kconfig" -source "board/keymile/pg-wcom-ls102xa/Kconfig"
endmenu
diff --git a/board/keymile/pg-wcom-ls102xa/Kconfig b/board/keymile/pg-wcom-ls102xa/Kconfig deleted file mode 100644 index f0b5ceabb69..00000000000 --- a/board/keymile/pg-wcom-ls102xa/Kconfig +++ /dev/null @@ -1,39 +0,0 @@ -if TARGET_PG_WCOM_SELI8 - -config SYS_BOARD - default "pg-wcom-ls102xa" - -config SYS_VENDOR - default "keymile" - -config SYS_SOC - default "ls102xa" - -config SYS_CONFIG_NAME - default "pg-wcom-seli8" - -config BOARD_SPECIFIC_OPTIONS - def_bool y - imply FS_CRAMFS - -endif - -if TARGET_PG_WCOM_EXPU1 - -config SYS_BOARD - default "pg-wcom-ls102xa" - -config SYS_VENDOR - default "keymile" - -config SYS_SOC - default "ls102xa" - -config SYS_CONFIG_NAME - default "pg-wcom-expu1" - -config BOARD_SPECIFIC_OPTIONS - def_bool y - imply FS_CRAMFS - -endif diff --git a/board/keymile/pg-wcom-ls102xa/MAINTAINERS b/board/keymile/pg-wcom-ls102xa/MAINTAINERS deleted file mode 100644 index ed5baf269a7..00000000000 --- a/board/keymile/pg-wcom-ls102xa/MAINTAINERS +++ /dev/null @@ -1,16 +0,0 @@ -Hitachi Power Grids LS102XA BOARD -M: Aleksandar Gerasimovski aleksandar.gerasimovski@hitachienergy.com -M: Rainer Boschung rainer.boschung@hitachienergy.com -S: Maintained -F: board/keymile/pg-wcom-ls102xa/ -F: board/keymile/common/ -F: board/keymile/scripts/ -F: include/configs/km/pg-wcom-ls102xa.h -F: include/configs/pg-wcom-seli8.h -F: include/configs/pg-wcom-expu1.h -F: configs/pg_wcom_seli8_defconfig -F: configs/pg_wcom_seli8_update_defconfig -F: configs/pg_wcom_expu1_defconfig -F: configs/pg_wcom_expu1_update_defconfig -F: arch/arm/dts/ls1021a-pg-wcom-seli8.dts -F: arch/arm/dts/ls1021a-pg-wcom-expu1.dts diff --git a/board/keymile/pg-wcom-ls102xa/Makefile b/board/keymile/pg-wcom-ls102xa/Makefile deleted file mode 100644 index 229b0c28278..00000000000 --- a/board/keymile/pg-wcom-ls102xa/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright 2021 Hitachi Power Grids. All rights reserved. -# - -obj-y += pg-wcom-ls102xa.o ddr.o -obj-y += ../common/common.o ../common/ivm.o ../common/qrio.o -obj-$(CONFIG_LAYERSCAPE_NS_ACCESS) += ../../freescale/common/ns_access.o -obj-$(CONFIG_LS102XA_STREAM_ID) += ../../freescale/common/ls102xa_stream_id.o -obj-$(CONFIG_ID_EEPROM) += ../../freescale/common/sys_eeprom.o diff --git a/board/keymile/pg-wcom-ls102xa/ddr.c b/board/keymile/pg-wcom-ls102xa/ddr.c deleted file mode 100644 index 51938a1b4d8..00000000000 --- a/board/keymile/pg-wcom-ls102xa/ddr.c +++ /dev/null @@ -1,91 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2014 Freescale Semiconductor, Inc. - * Copyright 2020 Hitachi Power Grids. All rights reserved. - */ - -#include <config.h> -#include <fsl_ddr_sdram.h> -#include <fsl_ddr_dimm_params.h> -#include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/global_data.h> -#include <asm/arch/ls102xa_soc.h> - -DECLARE_GLOBAL_DATA_PTR; - -void fsl_ddr_board_options(memctl_options_t *popts, - dimm_params_t *pdimm, - unsigned int ctrl_num) -{ - if (ctrl_num > 1) { - printf("Not supported controller number %d\n", ctrl_num); - return; - } - - // 1/2 DRAM cycle (should be increased in case of ADDR/CMD heavily loaded than the clock) - popts->clk_adjust = 0x4; - popts->write_data_delay = 0x4; - // wr leveling start value for lane 0 - popts->wrlvl_start = 0x5; - // wr leveling start values for lanes 1-3 (lane 4 not there) - popts->wrlvl_ctl_2 = 0x05050500; - // 32-bit DRAM, no need to set start values for lanes we do not have (5-8) - popts->wrlvl_ctl_3 = 0x0; - popts->cpo_override = 0x1f; - - /* force DDR bus width to 32 bits */ - popts->data_bus_width = 1; - popts->otf_burst_chop_en = 0; - popts->burst_length = DDR_BL8; - - /* - * Factors to consider for half-strength driver enable: - * - number of DIMMs installed - */ - popts->half_strength_driver_enable = 1; - /* - * Write leveling override - */ - popts->wrlvl_override = 1; - popts->wrlvl_sample = 0xf; - - /* - * Rtt and Rtt_WR override - */ - popts->rtt_override = 0; - - /* Enable ZQ calibration */ - popts->zq_en = 1; - - popts->cswl_override = DDR_CSWL_CS0; - - /* optimize cpo for erratum A-009942 */ - popts->cpo_sample = 0x58; - - /* DHC_EN =1, ODT = 75 Ohm */ - popts->ddr_cdr1 = DDR_CDR1_DHC_EN | DDR_CDR1_ODT(DDR_CDR_ODT_75ohm); - popts->ddr_cdr2 = DDR_CDR2_ODT(DDR_CDR_ODT_75ohm); -} - -int fsl_initdram(void) -{ - phys_size_t dram_size; - - puts("Initializing DDR....using SPD\n"); - dram_size = fsl_ddr_sdram(); - - erratum_a008850_post(); - - gd->ram_size = dram_size; - - return 0; -} - -int dram_init_banksize(void) -{ - gd->bd->bi_dram[0].start = CFG_SYS_SDRAM_BASE; - gd->bd->bi_dram[0].size = gd->ram_size; - - return 0; -} diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env b/board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env deleted file mode 100644 index 1054dbf9f54..00000000000 --- a/board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env +++ /dev/null @@ -1,3 +0,0 @@ -#include <env/pg-wcom/ls102xa.env> - -hostname=EXPU1 diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c deleted file mode 100644 index cc3611e2dec..00000000000 --- a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c +++ /dev/null @@ -1,218 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2020 Hitachi Power Grids. All rights reserved. - */ - -#include <config.h> -#include <event.h> -#include <i2c.h> -#include <asm/io.h> -#include <asm/arch/immap_ls102xa.h> -#include <asm/arch/clock.h> -#include <asm/arch/fsl_serdes.h> -#include <asm/arch/ls102xa_devdis.h> -#include <asm/arch/ls102xa_soc.h> -#include <hwconfig.h> -#include <mmc.h> -#include <fsl_csu.h> -#include <fsl_esdhc.h> -#include <fsl_ifc.h> -#include <fsl_immap.h> -#include <netdev.h> -#include <fsl_mdio.h> -#include <tsec.h> -#include <fsl_sec.h> -#include <fsl_devdis.h> -#include <fsl_ddr.h> -#include <spl.h> -#include <fdt_support.h> -#include <fsl_qe.h> -#include <fsl_validate.h> - -#include "../common/common.h" -#include "../common/qrio.h" - -DECLARE_GLOBAL_DATA_PTR; - -static uchar ivm_content[CONFIG_SYS_IVM_EEPROM_MAX_LEN]; - -int checkboard(void) -{ - show_qrio(); - - return 0; -} - -int dram_init(void) -{ - return fsl_initdram(); -} - -int board_early_init_f(void) -{ - struct ccsr_scfg *scfg = (struct ccsr_scfg *)CFG_SYS_FSL_SCFG_ADDR; - struct ccsr_gur __iomem *gur = (void *)CFG_SYS_FSL_GUTS_ADDR; - struct fsl_ifc ifc = {(void *)CFG_SYS_IFC_ADDR, (void *)NULL}; - - /* Disable unused MCK1 */ - setbits_be32(&gur->ddrclkdr, 2); - - /* IFC Global Configuration */ - setbits_be32(&ifc.gregs->ifc_gcr, 12 << IFC_GCR_TBCTL_TRN_TIME_SHIFT); - setbits_be32(&ifc.gregs->ifc_ccr, IFC_CCR_CLK_DIV(3) | - IFC_CCR_INV_CLK_EN); - - /* clear BD & FR bits for BE BD's and frame data */ - clrbits_be32(&scfg->etsecdmamcr, SCFG_ETSECDMAMCR_LE_BD_FR); - out_be32(&scfg->etsecmcr, SCFG_ETSECCMCR_GE2_CLK125); - - init_early_memctl_regs(); - - /* QRIO Configuration */ - qrio_uprstreq(UPREQ_CORE_RST); - -#if IS_ENABLED(CONFIG_TARGET_PG_WCOM_SELI8) - qrio_prstcfg(KM_LIU_RST, PRSTCFG_POWUP_UNIT_RST); - qrio_wdmask(KM_LIU_RST, true); - - qrio_prstcfg(KM_PAXK_RST, PRSTCFG_POWUP_UNIT_RST); - qrio_wdmask(KM_PAXK_RST, true); -#endif - -#if IS_ENABLED(CONFIG_TARGET_PG_WCOM_EXPU1) - qrio_prstcfg(WCOM_TMG_RST, PRSTCFG_POWUP_UNIT_RST); - qrio_wdmask(WCOM_TMG_RST, true); - - qrio_prstcfg(WCOM_PHY_RST, PRSTCFG_POWUP_UNIT_RST); - qrio_prst(WCOM_PHY_RST, false, false); - - qrio_prstcfg(WCOM_QSFP_RST, PRSTCFG_POWUP_UNIT_RST); - qrio_wdmask(WCOM_QSFP_RST, true); - - qrio_prstcfg(WCOM_CLIPS_RST, PRSTCFG_POWUP_UNIT_RST); - qrio_prst(WCOM_CLIPS_RST, false, false); -#endif - - /* deasset debug phy reset only if piggy is present */ - qrio_prstcfg(KM_DBG_ETH_RST, PRSTCFG_POWUP_UNIT_CORE_RST); - qrio_prst(KM_DBG_ETH_RST, !qrio_get_pgy_pres_pin(), false); - - i2c_deblock_gpio_cfg(); - - /* enable the Unit LED (red) & Boot LED (on) */ - qrio_set_leds(); - - /* enable Application Buffer */ - qrio_enable_app_buffer(); - - arch_soc_init(); - - return 0; -} - -static int pg_wcom_misc_init_f(void) -{ - if (IS_ENABLED(CONFIG_PG_WCOM_UBOOT_UPDATE_SUPPORTED)) - check_for_uboot_update(); - - return 0; -} -EVENT_SPY_SIMPLE(EVT_MISC_INIT_F, pg_wcom_misc_init_f); - -int board_init(void) -{ - if (IS_ENABLED(CONFIG_SYS_FSL_ERRATUM_A010315)) - erratum_a010315(); - - fsl_serdes_init(); - - ls102xa_smmu_stream_id_init(); - - u_qe_init(); - - return 0; -} - -int board_late_init(void) -{ - return 0; -} - -int misc_init_r(void) -{ - device_disable(devdis_tbl, ARRAY_SIZE(devdis_tbl)); - - ivm_read_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN, - CONFIG_PIGGY_MAC_ADDRESS_OFFSET); - - return 0; -} - -int ft_board_setup(void *blob, struct bd_info *bd) -{ - ft_cpu_setup(blob, bd); - - if (IS_ENABLED(CONFIG_PCI)) - ft_pci_setup(blob, bd); - - return 0; -} - -#if defined(CONFIG_POST) -int post_hotkeys_pressed(void) -{ - /* DIC26_SELFTEST: QRIO, SLFTEST */ - return qrio_get_selftest_pin(); -} - -/* POST word is located in the unused SCRATCHRW4 register */ -#define CCSR_SCRATCHRW4_ADDR 0x1ee020c - -ulong post_word_load(void) -{ - void *addr = (void *)CCSR_SCRATCHRW4_ADDR; - return in_le32(addr); -} - -void post_word_store(ulong value) -{ - void *addr = (void *)CCSR_SCRATCHRW4_ADDR; - out_le32(addr, value); -} - -int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset) -{ - /* Define only 1MiB range for mem_regions at the middle of the RAM */ - /* For 1GiB range mem_regions takes approx. 4min */ - *vstart = CFG_SYS_SDRAM_BASE + (gd->ram_size >> 1); - *size = 1 << 20; - return 0; -} -#endif - -u8 flash_read8(void *addr) -{ - return __raw_readb(addr + 1); -} - -void flash_write16(u16 val, void *addr) -{ - u16 shftval = (((val >> 8) & 0xff) | ((val << 8) & 0xff00)); - - __raw_writew(shftval, addr); -} - -u16 flash_read16(void *addr) -{ - u16 val = __raw_readw(addr); - - return (((val) >> 8) & 0x00ff) | (((val) << 8) & 0xff00); -} - -int hush_init_var(void) -{ - ivm_analyze_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN); - return 0; -} - -EVENT_SPY_SIMPLE(EVT_LAST_STAGE_INIT, set_km_env); diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env b/board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env deleted file mode 100644 index 1232fe9da8b..00000000000 --- a/board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env +++ /dev/null @@ -1,3 +0,0 @@ -#include <env/pg-wcom/ls102xa.env> - -hostname=SELI8 diff --git a/configs/pg_wcom_expu1_defconfig b/configs/pg_wcom_expu1_defconfig deleted file mode 100644 index 61513c9e2ec..00000000000 --- a/configs/pg_wcom_expu1_defconfig +++ /dev/null @@ -1,109 +0,0 @@ -CONFIG_ARM=y -CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_COUNTER_FREQUENCY=8333333 -CONFIG_TARGET_PG_WCOM_EXPU1=y -CONFIG_TEXT_BASE=0x60100000 -CONFIG_SYS_MALLOC_LEN=0x1004000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SOURCE_FILE="pg-wcom-expu1" -CONFIG_ENV_SIZE=0x4000 -CONFIG_ENV_SECT_SIZE=0x20000 -CONFIG_SYS_I2C_MXC_I2C1=y -CONFIG_SYS_I2C_MXC_I2C2=y -CONFIG_SYS_I2C_MXC_I2C3=y -CONFIG_DEFAULT_DEVICE_TREE="ls1021a-pg-wcom-expu1" -CONFIG_SYS_MONITOR_LEN=1048576 -CONFIG_BOOTCOUNT_BOOTLIMIT=3 -CONFIG_SYS_BOOTCOUNT_ADDR=0x70000020 -CONFIG_SYS_CLK_FREQ=66666666 -# CONFIG_HAS_ARMV7_SECURE_BASE is not set -CONFIG_SYS_LOAD_ADDR=0x82000000 -CONFIG_ENV_ADDR=0x60060000 -# CONFIG_DEEP_SLEEP is not set -CONFIG_LAYERSCAPE_NS_ACCESS=y -CONFIG_KM_COMMON_ETH_INIT=y -CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3 -CONFIG_PG_WCOM_UBOOT_UPDATE_SUPPORTED=y -CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE=y -CONFIG_PG_WCOM_UBOOT_UPDATE_TEXT_BASE=0x60240000 -CONFIG_SYS_MEMTEST_START=0x80000000 -CONFIG_SYS_MEMTEST_END=0x9fffffff -CONFIG_FIT=y -CONFIG_FIT_VERBOSE=y -CONFIG_SYS_BOOTM_LEN=0x4000000 -CONFIG_DISTRO_DEFAULTS=y -CONFIG_BOOTDELAY=3 -CONFIG_AUTOBOOT_KEYED=y -CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" -CONFIG_AUTOBOOT_STOP_STR=" " -CONFIG_OF_BOARD_SETUP=y -CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0" -CONFIG_SYS_CBSIZE=512 -CONFIG_SYS_PBSIZE=532 -CONFIG_SILENT_CONSOLE=y -CONFIG_LAST_STAGE_INIT=y -CONFIG_MISC_INIT_R=y -CONFIG_SYS_MAXARGS=32 -CONFIG_CMD_IMLS=y -CONFIG_CMD_GREPENV=y -CONFIG_CMD_MEMINFO=y -CONFIG_CMD_MEMTEST=y -CONFIG_CMD_GPT=y -CONFIG_CMD_I2C=y -CONFIG_LOADS_ECHO=y -CONFIG_SYS_LOADS_BAUD_CHANGE=y -CONFIG_CMD_NAND=y -CONFIG_CMD_NAND_TRIMFFS=y -CONFIG_BOOTP_BOOTFILESIZE=y -CONFIG_CMD_CRAMFS=y -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nor0=60000000.nor,nand0=68000000.flash" -CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:128k(rcw),128k(qe),128k(envred),128k(env),512k(res),1m(u-boot),128k(redenvred),128k(redenv),1m(redu-boot),-(ubi0);68000000.flash:-(ubi1)" -CONFIG_CMD_UBI=y -# CONFIG_CMD_UBIFS is not set -CONFIG_OF_CONTROL=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -CONFIG_ENV_ADDR_REDUND=0x60040000 -CONFIG_USE_ETHPRIME=y -CONFIG_ETHPRIME="ethernet@2d90000" -CONFIG_USE_HOSTNAME=y -CONFIG_HOSTNAME="EXPU1" -CONFIG_VERSION_VARIABLE=y -# CONFIG_SCSI_AHCI is not set -CONFIG_BOOTCOUNT_LIMIT=y -CONFIG_SYS_BOOTCOUNT_BE=y -CONFIG_DDR_CLK_FREQ=50000000 -CONFIG_SYS_FSL_DDR3=y -CONFIG_SYS_I2C_LEGACY=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS=y -CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y -CONFIG_SYS_FLASH_EMPTY_INFO=y -CONFIG_FLASH_CFI_MTD=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_SYS_FLASH_QUIET_TEST=y -CONFIG_MTD_RAW_NAND=y -CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_ONFI_DETECTION=y -CONFIG_PHY_MARVELL=y -CONFIG_PHY_FIXED=y -CONFIG_DM_MDIO=y -CONFIG_PHY_GIGE=y -CONFIG_MII=y -CONFIG_TSEC_ENET=y -CONFIG_SYS_QE_FW_ADDR=0x60020000 -# CONFIG_SCSI is not set -CONFIG_SPECIFY_CONSOLE_INDEX=y -CONFIG_DM_SERIAL=y -CONFIG_SYS_NS16550=y -CONFIG_LZO=y -# CONFIG_EFI_LOADER is not set -CONFIG_POST=y -CONFIG_HUSH_OLD_PARSER=y diff --git a/configs/pg_wcom_expu1_update_defconfig b/configs/pg_wcom_expu1_update_defconfig deleted file mode 100644 index ec0f975ae36..00000000000 --- a/configs/pg_wcom_expu1_update_defconfig +++ /dev/null @@ -1,107 +0,0 @@ -CONFIG_ARM=y -CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_COUNTER_FREQUENCY=8333333 -CONFIG_TARGET_PG_WCOM_EXPU1=y -CONFIG_TEXT_BASE=0x60240000 -CONFIG_SYS_MALLOC_LEN=0x1004000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SOURCE_FILE="pg-wcom-expu1" -CONFIG_ENV_SIZE=0x4000 -CONFIG_ENV_SECT_SIZE=0x20000 -CONFIG_SYS_I2C_MXC_I2C1=y -CONFIG_SYS_I2C_MXC_I2C2=y -CONFIG_SYS_I2C_MXC_I2C3=y -CONFIG_DEFAULT_DEVICE_TREE="ls1021a-pg-wcom-expu1" -CONFIG_SYS_MONITOR_LEN=1048576 -CONFIG_BOOTCOUNT_BOOTLIMIT=3 -CONFIG_SYS_BOOTCOUNT_ADDR=0x70000020 -# CONFIG_HAS_ARMV7_SECURE_BASE is not set -CONFIG_SYS_LOAD_ADDR=0x82000000 -CONFIG_ENV_ADDR=0x60220000 -# CONFIG_DEEP_SLEEP is not set -CONFIG_LAYERSCAPE_NS_ACCESS=y -CONFIG_KM_COMMON_ETH_INIT=y -CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3 -CONFIG_PG_WCOM_UBOOT_UPDATE_SUPPORTED=y -CONFIG_PG_WCOM_UBOOT_UPDATE=y -CONFIG_SYS_MEMTEST_START=0x80000000 -CONFIG_SYS_MEMTEST_END=0x9fffffff -CONFIG_FIT=y -CONFIG_FIT_VERBOSE=y -CONFIG_SYS_BOOTM_LEN=0x4000000 -CONFIG_DISTRO_DEFAULTS=y -CONFIG_BOOTDELAY=3 -CONFIG_AUTOBOOT_KEYED=y -CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" -CONFIG_AUTOBOOT_STOP_STR=" " -CONFIG_OF_BOARD_SETUP=y -CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0" -CONFIG_SYS_CBSIZE=512 -CONFIG_SYS_PBSIZE=532 -CONFIG_SILENT_CONSOLE=y -CONFIG_LAST_STAGE_INIT=y -CONFIG_MISC_INIT_R=y -CONFIG_SYS_MAXARGS=32 -CONFIG_CMD_IMLS=y -CONFIG_CMD_GREPENV=y -CONFIG_CMD_MEMINFO=y -CONFIG_CMD_MEMTEST=y -CONFIG_CMD_GPT=y -CONFIG_CMD_I2C=y -CONFIG_LOADS_ECHO=y -CONFIG_SYS_LOADS_BAUD_CHANGE=y -CONFIG_CMD_NAND=y -CONFIG_CMD_NAND_TRIMFFS=y -CONFIG_BOOTP_BOOTFILESIZE=y -CONFIG_CMD_CRAMFS=y -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nor0=60000000.nor,nand0=68000000.flash" -CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:128k(rcw),128k(qe),128k(envred),128k(env),512k(res),1m(u-boot),128k(redenvred),128k(redenv),1m(redu-boot),-(ubi0);68000000.flash:-(ubi1)" -CONFIG_CMD_UBI=y -# CONFIG_CMD_UBIFS is not set -CONFIG_OF_CONTROL=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -CONFIG_ENV_ADDR_REDUND=0x60200000 -CONFIG_USE_ETHPRIME=y -CONFIG_ETHPRIME="ethernet@2d90000" -CONFIG_USE_HOSTNAME=y -CONFIG_HOSTNAME="EXPU1" -CONFIG_VERSION_VARIABLE=y -# CONFIG_SCSI_AHCI is not set -CONFIG_BOOTCOUNT_LIMIT=y -CONFIG_SYS_BOOTCOUNT_BE=y -CONFIG_DDR_CLK_FREQ=50000000 -CONFIG_SYS_FSL_DDR3=y -CONFIG_SYS_I2C_LEGACY=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS=y -CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y -CONFIG_SYS_FLASH_EMPTY_INFO=y -CONFIG_FLASH_CFI_MTD=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_SYS_FLASH_QUIET_TEST=y -CONFIG_MTD_RAW_NAND=y -CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_ONFI_DETECTION=y -CONFIG_PHY_MARVELL=y -CONFIG_PHY_FIXED=y -CONFIG_DM_MDIO=y -CONFIG_PHY_GIGE=y -CONFIG_MII=y -CONFIG_TSEC_ENET=y -CONFIG_SYS_QE_FW_ADDR=0x60020000 -# CONFIG_SCSI is not set -CONFIG_SPECIFY_CONSOLE_INDEX=y -CONFIG_DM_SERIAL=y -CONFIG_SYS_NS16550=y -CONFIG_LZO=y -# CONFIG_EFI_LOADER is not set -CONFIG_POST=y -CONFIG_HUSH_OLD_PARSER=y diff --git a/configs/pg_wcom_seli8_defconfig b/configs/pg_wcom_seli8_defconfig deleted file mode 100644 index 82923d32ca6..00000000000 --- a/configs/pg_wcom_seli8_defconfig +++ /dev/null @@ -1,109 +0,0 @@ -CONFIG_ARM=y -CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_COUNTER_FREQUENCY=8333333 -CONFIG_TARGET_PG_WCOM_SELI8=y -CONFIG_TEXT_BASE=0x60100000 -CONFIG_SYS_MALLOC_LEN=0x1004000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SOURCE_FILE="pg-wcom-seli8" -CONFIG_ENV_SIZE=0x4000 -CONFIG_ENV_SECT_SIZE=0x20000 -CONFIG_SYS_I2C_MXC_I2C1=y -CONFIG_SYS_I2C_MXC_I2C2=y -CONFIG_SYS_I2C_MXC_I2C3=y -CONFIG_DEFAULT_DEVICE_TREE="ls1021a-pg-wcom-seli8" -CONFIG_SYS_MONITOR_LEN=1048576 -CONFIG_BOOTCOUNT_BOOTLIMIT=3 -CONFIG_SYS_BOOTCOUNT_ADDR=0x70000020 -CONFIG_SYS_CLK_FREQ=66666666 -# CONFIG_HAS_ARMV7_SECURE_BASE is not set -CONFIG_SYS_LOAD_ADDR=0x82000000 -CONFIG_ENV_ADDR=0x60060000 -# CONFIG_DEEP_SLEEP is not set -CONFIG_LAYERSCAPE_NS_ACCESS=y -CONFIG_KM_COMMON_ETH_INIT=y -CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3 -CONFIG_PG_WCOM_UBOOT_UPDATE_SUPPORTED=y -CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE=y -CONFIG_PG_WCOM_UBOOT_UPDATE_TEXT_BASE=0x60240000 -CONFIG_SYS_MEMTEST_START=0x80000000 -CONFIG_SYS_MEMTEST_END=0x9fffffff -CONFIG_FIT=y -CONFIG_FIT_VERBOSE=y -CONFIG_SYS_BOOTM_LEN=0x4000000 -CONFIG_DISTRO_DEFAULTS=y -CONFIG_BOOTDELAY=3 -CONFIG_AUTOBOOT_KEYED=y -CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" -CONFIG_AUTOBOOT_STOP_STR=" " -CONFIG_OF_BOARD_SETUP=y -CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0" -CONFIG_SYS_CBSIZE=512 -CONFIG_SYS_PBSIZE=532 -CONFIG_SILENT_CONSOLE=y -CONFIG_LAST_STAGE_INIT=y -CONFIG_MISC_INIT_R=y -CONFIG_SYS_MAXARGS=32 -CONFIG_CMD_IMLS=y -CONFIG_CMD_GREPENV=y -CONFIG_CMD_MEMINFO=y -CONFIG_CMD_MEMTEST=y -CONFIG_CMD_GPT=y -CONFIG_CMD_I2C=y -CONFIG_LOADS_ECHO=y -CONFIG_SYS_LOADS_BAUD_CHANGE=y -CONFIG_CMD_NAND=y -CONFIG_CMD_NAND_TRIMFFS=y -CONFIG_BOOTP_BOOTFILESIZE=y -CONFIG_CMD_CRAMFS=y -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nor0=60000000.nor,nand0=68000000.flash" -CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:128k(rcw),128k(qe),128k(envred),128k(env),512k(res),1m(u-boot),128k(redenvred),128k(redenv),1m(redu-boot),-(ubi0);68000000.flash:-(ubi1)" -CONFIG_CMD_UBI=y -# CONFIG_CMD_UBIFS is not set -CONFIG_OF_CONTROL=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -CONFIG_ENV_ADDR_REDUND=0x60040000 -CONFIG_USE_ETHPRIME=y -CONFIG_ETHPRIME="ethernet@2d90000" -CONFIG_USE_HOSTNAME=y -CONFIG_HOSTNAME="SELI8" -CONFIG_VERSION_VARIABLE=y -# CONFIG_SCSI_AHCI is not set -CONFIG_BOOTCOUNT_LIMIT=y -CONFIG_SYS_BOOTCOUNT_BE=y -CONFIG_DDR_CLK_FREQ=50000000 -CONFIG_SYS_FSL_DDR3=y -CONFIG_SYS_I2C_LEGACY=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS=y -CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y -CONFIG_SYS_FLASH_EMPTY_INFO=y -CONFIG_FLASH_CFI_MTD=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_SYS_FLASH_QUIET_TEST=y -CONFIG_MTD_RAW_NAND=y -CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_ONFI_DETECTION=y -CONFIG_PHY_MARVELL=y -CONFIG_PHY_FIXED=y -CONFIG_DM_MDIO=y -CONFIG_PHY_GIGE=y -CONFIG_MII=y -CONFIG_TSEC_ENET=y -CONFIG_SYS_QE_FW_ADDR=0x60020000 -# CONFIG_SCSI is not set -CONFIG_SPECIFY_CONSOLE_INDEX=y -CONFIG_DM_SERIAL=y -CONFIG_SYS_NS16550=y -CONFIG_LZO=y -# CONFIG_EFI_LOADER is not set -CONFIG_POST=y -CONFIG_HUSH_OLD_PARSER=y diff --git a/configs/pg_wcom_seli8_update_defconfig b/configs/pg_wcom_seli8_update_defconfig deleted file mode 100644 index 41931e24768..00000000000 --- a/configs/pg_wcom_seli8_update_defconfig +++ /dev/null @@ -1,107 +0,0 @@ -CONFIG_ARM=y -CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_COUNTER_FREQUENCY=8333333 -CONFIG_TARGET_PG_WCOM_SELI8=y -CONFIG_TEXT_BASE=0x60240000 -CONFIG_SYS_MALLOC_LEN=0x1004000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SOURCE_FILE="pg-wcom-seli8" -CONFIG_ENV_SIZE=0x4000 -CONFIG_ENV_SECT_SIZE=0x20000 -CONFIG_SYS_I2C_MXC_I2C1=y -CONFIG_SYS_I2C_MXC_I2C2=y -CONFIG_SYS_I2C_MXC_I2C3=y -CONFIG_DEFAULT_DEVICE_TREE="ls1021a-pg-wcom-seli8" -CONFIG_SYS_MONITOR_LEN=1048576 -CONFIG_BOOTCOUNT_BOOTLIMIT=3 -CONFIG_SYS_BOOTCOUNT_ADDR=0x70000020 -# CONFIG_HAS_ARMV7_SECURE_BASE is not set -CONFIG_SYS_LOAD_ADDR=0x82000000 -CONFIG_ENV_ADDR=0x60220000 -# CONFIG_DEEP_SLEEP is not set -CONFIG_LAYERSCAPE_NS_ACCESS=y -CONFIG_KM_COMMON_ETH_INIT=y -CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3 -CONFIG_PG_WCOM_UBOOT_UPDATE_SUPPORTED=y -CONFIG_PG_WCOM_UBOOT_UPDATE=y -CONFIG_SYS_MEMTEST_START=0x80000000 -CONFIG_SYS_MEMTEST_END=0x9fffffff -CONFIG_FIT=y -CONFIG_FIT_VERBOSE=y -CONFIG_SYS_BOOTM_LEN=0x4000000 -CONFIG_DISTRO_DEFAULTS=y -CONFIG_BOOTDELAY=3 -CONFIG_AUTOBOOT_KEYED=y -CONFIG_AUTOBOOT_PROMPT="Hit <SPACE> key to stop autoboot in %2ds\n" -CONFIG_AUTOBOOT_STOP_STR=" " -CONFIG_OF_BOARD_SETUP=y -CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0" -CONFIG_SYS_CBSIZE=512 -CONFIG_SYS_PBSIZE=532 -CONFIG_SILENT_CONSOLE=y -CONFIG_LAST_STAGE_INIT=y -CONFIG_MISC_INIT_R=y -CONFIG_SYS_MAXARGS=32 -CONFIG_CMD_IMLS=y -CONFIG_CMD_GREPENV=y -CONFIG_CMD_MEMINFO=y -CONFIG_CMD_MEMTEST=y -CONFIG_CMD_GPT=y -CONFIG_CMD_I2C=y -CONFIG_LOADS_ECHO=y -CONFIG_SYS_LOADS_BAUD_CHANGE=y -CONFIG_CMD_NAND=y -CONFIG_CMD_NAND_TRIMFFS=y -CONFIG_BOOTP_BOOTFILESIZE=y -CONFIG_CMD_CRAMFS=y -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nor0=60000000.nor,nand0=68000000.flash" -CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:128k(rcw),128k(qe),128k(envred),128k(env),512k(res),1m(u-boot),128k(redenvred),128k(redenv),1m(redu-boot),-(ubi0);68000000.flash:-(ubi1)" -CONFIG_CMD_UBI=y -# CONFIG_CMD_UBIFS is not set -CONFIG_OF_CONTROL=y -CONFIG_ENV_OVERWRITE=y -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -CONFIG_ENV_ADDR_REDUND=0x60200000 -CONFIG_USE_ETHPRIME=y -CONFIG_ETHPRIME="ethernet@2d90000" -CONFIG_USE_HOSTNAME=y -CONFIG_HOSTNAME="SELI8" -CONFIG_VERSION_VARIABLE=y -# CONFIG_SCSI_AHCI is not set -CONFIG_BOOTCOUNT_LIMIT=y -CONFIG_SYS_BOOTCOUNT_BE=y -CONFIG_DDR_CLK_FREQ=50000000 -CONFIG_SYS_FSL_DDR3=y -CONFIG_SYS_I2C_LEGACY=y -# CONFIG_MMC is not set -CONFIG_MTD=y -CONFIG_MTD_NOR_FLASH=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS=y -CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y -CONFIG_SYS_FLASH_EMPTY_INFO=y -CONFIG_FLASH_CFI_MTD=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_SYS_FLASH_QUIET_TEST=y -CONFIG_MTD_RAW_NAND=y -CONFIG_NAND_FSL_IFC=y -CONFIG_SYS_NAND_ONFI_DETECTION=y -CONFIG_PHY_MARVELL=y -CONFIG_PHY_FIXED=y -CONFIG_DM_MDIO=y -CONFIG_PHY_GIGE=y -CONFIG_MII=y -CONFIG_TSEC_ENET=y -CONFIG_SYS_QE_FW_ADDR=0x60020000 -# CONFIG_SCSI is not set -CONFIG_SPECIFY_CONSOLE_INDEX=y -CONFIG_DM_SERIAL=y -CONFIG_SYS_NS16550=y -CONFIG_LZO=y -# CONFIG_EFI_LOADER is not set -CONFIG_POST=y -CONFIG_HUSH_OLD_PARSER=y diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h deleted file mode 100644 index 15ef68a0507..00000000000 --- a/include/configs/km/pg-wcom-ls102xa.h +++ /dev/null @@ -1,167 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright 2020 Hitachi Power Grids. All rights reserved. - */ - -#ifndef __CONFIG_PG_WCOM_LS102XA_H -#define __CONFIG_PG_WCOM_LS102XA_H - -#define CFG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR -#define CFG_SYS_INIT_RAM_SIZE OCRAM_SIZE - -#define CFG_PRAM ((CONFIG_KM_PNVRAM + \ - CONFIG_KM_PHRAM + \ - CONFIG_KM_RESERVED_PRAM) >> 10) - -#define PHYS_SDRAM 0x80000000 -#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) - -#define CFG_SYS_DDR_SDRAM_BASE 0x80000000UL -#define CFG_SYS_SDRAM_BASE CFG_SYS_DDR_SDRAM_BASE - -#define SPD_EEPROM_ADDRESS 0x54 - -/* POST memory regions test */ -#define CFG_POST (CFG_SYS_POST_MEM_REGIONS) -#define CFG_POST_EXTERNAL_WORD_FUNCS - -/* - * IFC Definitions - */ -/* NOR Flash Definitions */ -#define CFG_SYS_FLASH_BASE 0x60000000 -#define CFG_SYS_FLASH_BASE_PHYS CFG_SYS_FLASH_BASE - -#define CFG_SYS_NOR0_CSPR_EXT (0x0) -#define CFG_SYS_NOR0_CSPR (CSPR_PHYS_ADDR(CFG_SYS_FLASH_BASE_PHYS) | \ - CSPR_PORT_SIZE_16 | \ - CSPR_TE | \ - CSPR_MSEL_NOR | \ - CSPR_V) -#define CFG_SYS_NOR_AMASK IFC_AMASK(64 * 1024 * 1024) - -#define CFG_SYS_NOR_CSOR (CSOR_NOR_AVD_TGL_PGM_EN | \ - CSOR_NOR_ADM_SHIFT(0x4) | \ - CSOR_NOR_NOR_MODE_ASYNC_NOR | \ - CSOR_NOR_TRHZ_20 | \ - CSOR_NOR_BCTLD) -#define CFG_SYS_NOR_FTIM0 (FTIM0_NOR_TACSE(0x1) | \ - FTIM0_NOR_TEADC(0x7) | \ - FTIM0_NOR_TAVDS(0x0) | \ - FTIM0_NOR_TEAHC(0x1)) -#define CFG_SYS_NOR_FTIM1 (FTIM1_NOR_TACO(0x1) | \ - FTIM1_NOR_TRAD_NOR(0x21) | \ - FTIM1_NOR_TSEQRAD_NOR(0x21)) -#define CFG_SYS_NOR_FTIM2 (FTIM2_NOR_TCS(0x1) | \ - FTIM2_NOR_TCH(0x1) | \ - FTIM2_NOR_TWPH(0x6) | \ - FTIM2_NOR_TWP(0xb)) -#define CFG_SYS_NOR_FTIM3 0 - -#define CFG_SYS_FLASH_BANKS_LIST { CFG_SYS_FLASH_BASE_PHYS } - -#define CFG_SYS_WRITE_SWAPPED_DATA - -#define CFG_SYS_CSPR0_EXT CFG_SYS_NOR0_CSPR_EXT -#define CFG_SYS_CSPR0 CFG_SYS_NOR0_CSPR -#define CFG_SYS_AMASK0 CFG_SYS_NOR_AMASK -#define CFG_SYS_CSOR0 CFG_SYS_NOR_CSOR -#define CFG_SYS_CS0_FTIM0 CFG_SYS_NOR_FTIM0 -#define CFG_SYS_CS0_FTIM1 CFG_SYS_NOR_FTIM1 -#define CFG_SYS_CS0_FTIM2 CFG_SYS_NOR_FTIM2 -#define CFG_SYS_CS0_FTIM3 CFG_SYS_NOR_FTIM3 - -/* NAND Flash Definitions */ -#define CFG_SYS_NAND_BASE 0x68000000 -#define CFG_SYS_NAND_BASE_PHYS CFG_SYS_NAND_BASE - -#define CFG_SYS_NAND_CSPR_EXT (0x0) -#define CFG_SYS_NAND_CSPR (CSPR_PHYS_ADDR(CFG_SYS_NAND_BASE) | \ - CSPR_PORT_SIZE_8 | \ - CSPR_TE | \ - CSPR_MSEL_NAND | \ - CSPR_V) -#define CFG_SYS_NAND_AMASK IFC_AMASK(64 * 1024) -#define CFG_SYS_NAND_CSOR (CSOR_NAND_ECC_ENC_EN \ - | CSOR_NAND_ECC_DEC_EN \ - | CSOR_NAND_ECC_MODE_4 \ - | CSOR_NAND_RAL_3 \ - | CSOR_NAND_PGS_2K \ - | CSOR_NAND_SPRZ_64 \ - | CSOR_NAND_PB(64) \ - | CSOR_NAND_TRHZ_40 \ - | CSOR_NAND_BCTLD) - -#define CFG_SYS_NAND_FTIM0 (FTIM0_NAND_TCCST(0x3) | \ - FTIM0_NAND_TWP(0x8) | \ - FTIM0_NAND_TWCHT(0x3) | \ - FTIM0_NAND_TWH(0x5)) -#define CFG_SYS_NAND_FTIM1 (FTIM1_NAND_TADLE(0x1e) | \ - FTIM1_NAND_TWBE(0x1e) | \ - FTIM1_NAND_TRR(0x6) | \ - FTIM1_NAND_TRP(0x8)) -#define CFG_SYS_NAND_FTIM2 (FTIM2_NAND_TRAD(0x9) | \ - FTIM2_NAND_TREH(0x5) | \ - FTIM2_NAND_TWHRE(0x3c)) -#define CFG_SYS_NAND_FTIM3 (FTIM3_NAND_TWW(0x1e)) - -#define CFG_SYS_CSPR1_EXT CFG_SYS_NAND_CSPR_EXT -#define CFG_SYS_CSPR1 CFG_SYS_NAND_CSPR -#define CFG_SYS_AMASK1 CFG_SYS_NAND_AMASK -#define CFG_SYS_CSOR1 CFG_SYS_NAND_CSOR -#define CFG_SYS_CS1_FTIM0 CFG_SYS_NAND_FTIM0 -#define CFG_SYS_CS1_FTIM1 CFG_SYS_NAND_FTIM1 -#define CFG_SYS_CS1_FTIM2 CFG_SYS_NAND_FTIM2 -#define CFG_SYS_CS1_FTIM3 CFG_SYS_NAND_FTIM3 - -#define CFG_SYS_NAND_BASE_LIST { CFG_SYS_NAND_BASE } - -/* QRIO FPGA Definitions */ -#define CFG_SYS_QRIO_BASE 0x70000000 -#define CFG_SYS_QRIO_BASE_PHYS CFG_SYS_QRIO_BASE - -#define CFG_SYS_CSPR2_EXT (0x00) -#define CFG_SYS_CSPR2 (CSPR_PHYS_ADDR(CFG_SYS_QRIO_BASE) | \ - CSPR_PORT_SIZE_8 | \ - CSPR_TE | \ - CSPR_MSEL_GPCM | \ - CSPR_V) -#define CFG_SYS_AMASK2 IFC_AMASK(64 * 1024) -#define CFG_SYS_CSOR2 (CSOR_GPCM_ADM_SHIFT(0x4) | \ - CSOR_GPCM_TRHZ_20 | \ - CSOR_GPCM_BCTLD) -#define CFG_SYS_CS2_FTIM0 (FTIM0_GPCM_TACSE(0x2) | \ - FTIM0_GPCM_TEADC(0x8) | \ - FTIM0_GPCM_TEAHC(0x2)) -#define CFG_SYS_CS2_FTIM1 (FTIM1_GPCM_TACO(0x2) | \ - FTIM1_GPCM_TRAD(0x6)) -#define CFG_SYS_CS2_FTIM2 (FTIM2_GPCM_TCS(0x1) | \ - FTIM2_GPCM_TCH(0x1) | \ - FTIM2_GPCM_TWP(0x7)) -#define CFG_SYS_CS2_FTIM3 0x04000000 - -/* - * Serial Port - */ -#define CFG_SYS_NS16550_CLK get_serial_clock() - -/* - * I2C - */ - -#define CFG_SYS_I2C_MAX_HOPS 1 -#define CFG_SYS_NUM_I2C_BUSES 3 -#define I2C_MUX_PCA_ADDR 0x70 -#define I2C_MUX_CH_DEFAULT 0x0 -#define CFG_SYS_I2C_BUSES { {0, {I2C_NULL_HOP} }, \ - {0, {{I2C_MUX_PCA9547, 0x70, 1 } } }, \ - {1, {I2C_NULL_HOP} }, \ - } - -#define CFG_SMP_PEN_ADDR 0x01ee0200 - -#define HWCONFIG_BUFFER_SIZE 256 - -#define CFG_SYS_BOOTMAPSZ (256 << 20) /* Increase map for Linux */ - -#endif diff --git a/include/configs/pg-wcom-expu1.h b/include/configs/pg-wcom-expu1.h deleted file mode 100644 index 2c38cffa8a0..00000000000 --- a/include/configs/pg-wcom-expu1.h +++ /dev/null @@ -1,49 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright 2020 Hitachi ABB Power Grids - */ - -#ifndef __CONFIG_PG_WCOM_EXPU1_H -#define __CONFIG_PG_WCOM_EXPU1_H - -#define WCOM_EXPU1 - -/* CLIPS FPGA Definitions */ -#define CFG_SYS_CSPR3_EXT (0x00) -#define CFG_SYS_CSPR3 (CSPR_PHYS_ADDR(CONFIG_SYS_CLIPS_BASE) | \ - CSPR_PORT_SIZE_8 | \ - CSPR_MSEL_GPCM | \ - CSPR_V) -#define CFG_SYS_AMASK3 IFC_AMASK(64 * 1024) -#define CFG_SYS_CSOR3 (CSOR_GPCM_ADM_SHIFT(0x4) | \ - CSOR_GPCM_TRHZ_40) -#define CFG_SYS_CS3_FTIM0 (FTIM0_GPCM_TACSE(0x6) | \ - FTIM0_GPCM_TEADC(0x7) | \ - FTIM0_GPCM_TEAHC(0x2)) -#define CFG_SYS_CS3_FTIM1 (FTIM1_GPCM_TACO(0x2) | \ - FTIM1_GPCM_TRAD(0x12)) -#define CFG_SYS_CS3_FTIM2 (FTIM2_GPCM_TCS(0x3) | \ - FTIM2_GPCM_TCH(0x1) | \ - FTIM2_GPCM_TWP(0x12)) -#define CFG_SYS_CS3_FTIM3 0x04000000 - -/* PRST */ -#define WCOM_CLIPS_RST 0 -#define WCOM_QSFP_RST 1 -#define WCOM_PHY_RST 2 -#define WCOM_TMG_RST 3 -#define KM_DBG_ETH_RST 15 - -/* QRIO GPIOs used for deblocking */ -#define KM_I2C_DEBLOCK_PORT QRIO_GPIO_A -#define KM_I2C_DEBLOCK_SCL 20 -#define KM_I2C_DEBLOCK_SDA 21 - -/* ZL30343 on SPI */ -#define WCOM_ZL30343_CFG_ADDR 0xe8070000 -#define WCOM_ZL30343_SPI_BUS 0 -#define WCOM_ZL30343_CS 0 - -#include "km/pg-wcom-ls102xa.h" - -#endif /* __CONFIG_PG_WCOM_EXPU1_H */ diff --git a/include/configs/pg-wcom-seli8.h b/include/configs/pg-wcom-seli8.h deleted file mode 100644 index 9474d3bd7bd..00000000000 --- a/include/configs/pg-wcom-seli8.h +++ /dev/null @@ -1,40 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright 2020 Hitachi Power Grids. All rights reserved. - */ - -#ifndef __CONFIG_PG_WCOM_SELI8_H -#define __CONFIG_PG_WCOM_SELI8_H - -/* PAXK FPGA Definitions */ -#define CFG_SYS_CSPR3_EXT (0x00) -#define CFG_SYS_CSPR3 (CSPR_PHYS_ADDR(CONFIG_SYS_PAX_BASE) | \ - CSPR_PORT_SIZE_8 | \ - CSPR_MSEL_GPCM | \ - CSPR_V) -#define CFG_SYS_AMASK3 IFC_AMASK(64 * 1024) -#define CFG_SYS_CSOR3 (CSOR_GPCM_ADM_SHIFT(0x4) | \ - CSOR_GPCM_TRHZ_40) -#define CFG_SYS_CS3_FTIM0 (FTIM0_GPCM_TACSE(0x6) | \ - FTIM0_GPCM_TEADC(0x7) | \ - FTIM0_GPCM_TEAHC(0x2)) -#define CFG_SYS_CS3_FTIM1 (FTIM1_GPCM_TACO(0x2) | \ - FTIM1_GPCM_TRAD(0x12)) -#define CFG_SYS_CS3_FTIM2 (FTIM2_GPCM_TCS(0x3) | \ - FTIM2_GPCM_TCH(0x1) | \ - FTIM2_GPCM_TWP(0x12)) -#define CFG_SYS_CS3_FTIM3 0x04000000 - -/* PRST */ -#define KM_LIU_RST 0 -#define KM_PAXK_RST 1 -#define KM_DBG_ETH_RST 15 - -/* QRIO GPIOs used for deblocking */ -#define KM_I2C_DEBLOCK_PORT QRIO_GPIO_A -#define KM_I2C_DEBLOCK_SCL 20 -#define KM_I2C_DEBLOCK_SDA 21 - -#include "km/pg-wcom-ls102xa.h" - -#endif /* __CONFIG_PG_WCOM_SELI8_H */
Hello Simon,
On Thu, 18 Jul 2024 18:35:52 +0100 Simon Glass sjg@chromium.org wrote:
These board has not been converted to CONFIG_DM_I2C by the deadline:
pg_wcom_expu1 pg_wcom_expu1_update pg_wcom_seli8 pg_wcom_seli8_update
Remove them.
Please keep these boards. I got the task to do DM_I2C conversion to prevent board removal from mainline. Thanks.
-- Anatolij
Hi Simon,
On Fri, 19 Jul 2024 10:50:16 +0200 Anatolij Gustschin agust@denx.de wrote:
Hello Simon,
On Thu, 18 Jul 2024 18:35:52 +0100 Simon Glass sjg@chromium.org wrote:
These board has not been converted to CONFIG_DM_I2C by the deadline:
pg_wcom_expu1 pg_wcom_expu1_update pg_wcom_seli8 pg_wcom_seli8_update
Remove them.
Please keep these boards. I got the task to do DM_I2C conversion to prevent board removal from mainline. Thanks.
DM_I2C conversion patch is here:
https://patchwork.ozlabs.org/project/uboot/patch/20240719191656.3323947-1-ag...
-- Anatolij
This function is not used, so drop it.
Signed-off-by: Simon Glass sjg@chromium.org ---
include/i2c.h | 8 -------- 1 file changed, 8 deletions(-)
diff --git a/include/i2c.h b/include/i2c.h index 4e59009cd93..8d91b24b43b 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -972,14 +972,6 @@ enum { I2C_8, I2C_9, I2C_10, };
-/** - * Get FDT values for i2c bus. - * - * @param blob Device tree blbo - * Return: the number of I2C bus - */ -void board_i2c_init(const void *blob); - /** * Find the I2C bus number by given a FDT I2C node. *
This is only used by devkit3250 which is being removed. Drop it.
Signed-off-by: Simon Glass sjg@chromium.org ---
drivers/usb/host/ohci-lpc32xx.c | 4 ---- include/i2c.h | 6 ------ 2 files changed, 10 deletions(-)
diff --git a/drivers/usb/host/ohci-lpc32xx.c b/drivers/usb/host/ohci-lpc32xx.c index ed04cae7afe..bf89bf8ab49 100644 --- a/drivers/usb/host/ohci-lpc32xx.c +++ b/drivers/usb/host/ohci-lpc32xx.c @@ -94,10 +94,6 @@ static int isp1301_set_value(struct udevice *dev, int reg, u8 value)
static void isp1301_configure(struct udevice *dev) { -#if !CONFIG_IS_ENABLED(DM_I2C) - i2c_set_bus_num(I2C_2); -#endif - /* * LPC32XX only supports DAT_SE0 USB mode * This sequence is important diff --git a/include/i2c.h b/include/i2c.h index 8d91b24b43b..1d3be3f6759 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -966,12 +966,6 @@ static inline void I2C_SET_BUS(unsigned int bus) i2c_set_bus_num(bus); }
-/* Multi I2C definitions */ -enum { - I2C_0, I2C_1, I2C_2, I2C_3, I2C_4, I2C_5, I2C_6, I2C_7, - I2C_8, I2C_9, I2C_10, -}; - /** * Find the I2C bus number by given a FDT I2C node. *
This is used by a few boards but we are years past the migration date, so let's drop it now.
Signed-off-by: Simon Glass sjg@chromium.org ---
README | 7 ------- include/configs/omap3_beagle.h | 3 --- include/configs/sniper.h | 14 -------------- include/configs/tqma6.h | 3 --- include/i2c.h | 2 +- 5 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/README b/README index b89768f1791..9fd2aee4b04 100644 --- a/README +++ b/README @@ -883,13 +883,6 @@ The following options need to be configured: You should define these to the GPIO value as given directly to the generic GPIO functions.
- CFG_I2C_MULTI_BUS - - This option allows the use of multiple I2C buses, each of which - must have a controller. At any point in time, only one bus is - active. To switch to a different bus, use the 'i2c dev' command. - Note that bus numbering is zero-based. - CFG_SYS_I2C_NOPROBES
This option specifies a list of I2C devices that will be skipped diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index af7cb3513f8..b616dd2608c 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -28,9 +28,6 @@ /* NAND: SPL falcon mode configs */ #endif /* CONFIG_MTD_RAW_NAND */
-/* Enable Multi Bus support for I2C */ -#define CFG_I2C_MULTI_BUS - /* DSS Support */
/* TWL4030 LED Support */ diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 45a3102aeee..d0ae5e18605 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -34,20 +34,6 @@
#define CFG_SYS_SDRAM_BASE 0x80000000
-/* - * I2C - */ - -#define CFG_I2C_MULTI_BUS - -/* - * Input - */ - -/* - * SPL - */ - /* * Serial */ diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 2da76f15431..ceeed174ec5 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -26,9 +26,6 @@
#define TQMA6_SPI_FLASH_SECTOR_SIZE SZ_64K
-/* I2C Configs */ -#define CFG_I2C_MULTI_BUS - #if !defined(CONFIG_DM_PMIC) #define CFG_POWER_PFUZE100_I2C_ADDR 0x08 #define TQMA6_PFUZE100_I2C_BUS 2 diff --git a/include/i2c.h b/include/i2c.h index 1d3be3f6759..622540c8265 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -942,7 +942,7 @@ unsigned int i2c_get_bus_speed(void); * only for backwardcompatibility, should go away if we switched * completely to new multibus support. */ -#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CFG_I2C_MULTI_BUS) +#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) # if !defined(CFG_SYS_MAX_I2C_BUS) # define CFG_SYS_MAX_I2C_BUS 2 # endif
These boards use pre-driver model code and it is several years since the migration deadline. Disable the 'date' command so that this old code can be removed.
Signed-off-by: Simon Glass sjg@chromium.org ---
configs/malta64_defconfig | 1 - configs/malta64el_defconfig | 1 - configs/malta_defconfig | 1 - configs/maltael_defconfig | 1 - 4 files changed, 4 deletions(-)
diff --git a/configs/malta64_defconfig b/configs/malta64_defconfig index ff371daaa0d..8ac29b9289f 100644 --- a/configs/malta64_defconfig +++ b/configs/malta64_defconfig @@ -27,7 +27,6 @@ CONFIG_CMD_PCI=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_IDE_MAXBUS=1 diff --git a/configs/malta64el_defconfig b/configs/malta64el_defconfig index 5b130bcde9b..0a71013d5fc 100644 --- a/configs/malta64el_defconfig +++ b/configs/malta64el_defconfig @@ -29,7 +29,6 @@ CONFIG_CMD_PCI=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_IDE_MAXBUS=1 diff --git a/configs/malta_defconfig b/configs/malta_defconfig index ce917a69de5..355292ef950 100644 --- a/configs/malta_defconfig +++ b/configs/malta_defconfig @@ -26,7 +26,6 @@ CONFIG_CMD_PCI=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_IDE_MAXBUS=1 diff --git a/configs/maltael_defconfig b/configs/maltael_defconfig index de29a7a3a5b..ffd27713963 100644 --- a/configs/maltael_defconfig +++ b/configs/maltael_defconfig @@ -28,7 +28,6 @@ CONFIG_CMD_PCI=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_IDE_MAXBUS=1
These boards use pre-driver model code and it is several years since the migration deadline. Disable the 'date' command so that this old code can be removed.
Signed-off-by: Simon Glass sjg@chromium.org ---
configs/ls2080aqds_nand_defconfig | 1 - configs/ls2080aqds_qspi_defconfig | 1 - configs/ls2080ardb_nand_defconfig | 1 - 3 files changed, 3 deletions(-)
diff --git a/configs/ls2080aqds_nand_defconfig b/configs/ls2080aqds_nand_defconfig index 06e41546d67..0066414f0f5 100644 --- a/configs/ls2080aqds_nand_defconfig +++ b/configs/ls2080aqds_nand_defconfig @@ -61,7 +61,6 @@ CONFIG_CMD_PCI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_CACHE=y -CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y diff --git a/configs/ls2080aqds_qspi_defconfig b/configs/ls2080aqds_qspi_defconfig index 0b54bc999e7..44a1459749f 100644 --- a/configs/ls2080aqds_qspi_defconfig +++ b/configs/ls2080aqds_qspi_defconfig @@ -43,7 +43,6 @@ CONFIG_CMD_PCI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_CACHE=y -CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y diff --git a/configs/ls2080ardb_nand_defconfig b/configs/ls2080ardb_nand_defconfig index f1009e1738b..cbc8d6a5cf4 100644 --- a/configs/ls2080ardb_nand_defconfig +++ b/configs/ls2080ardb_nand_defconfig @@ -68,7 +68,6 @@ CONFIG_CMD_PCI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_CACHE=y -CONFIG_CMD_DATE=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y
These use pre-driver model code and it is several years since the migration deadline. Disable the 'date' command so that this old code can be removed.
Signed-off-by: Simon Glass sjg@chromium.org ---
configs/mx28evk_defconfig | 1 - configs/mx51evk_defconfig | 1 - 2 files changed, 2 deletions(-)
diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig index 1fe68ef93f9..dddb57efd3e 100644 --- a/configs/mx28evk_defconfig +++ b/configs/mx28evk_defconfig @@ -32,7 +32,6 @@ CONFIG_CMD_MMC=y CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_CACHE=y -CONFIG_CMD_DATE=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index e5178fb3d6b..5932a15a33d 100644 --- a/configs/mx51evk_defconfig +++ b/configs/mx51evk_defconfig @@ -31,7 +31,6 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y
These use pre-driver model code and it is several years since the migration deadline. Disable the 'date' command so that this old code can be removed.
Signed-off-by: Simon Glass sjg@chromium.org ---
configs/MPC837XERDB_defconfig | 1 - configs/ethernut5_defconfig | 1 - configs/work_92105_defconfig | 1 - 3 files changed, 3 deletions(-)
diff --git a/configs/MPC837XERDB_defconfig b/configs/MPC837XERDB_defconfig index 9eac43a0fcb..dd30e8d30da 100644 --- a/configs/MPC837XERDB_defconfig +++ b/configs/MPC837XERDB_defconfig @@ -139,7 +139,6 @@ CONFIG_CMD_USB=y CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y diff --git a/configs/ethernut5_defconfig b/configs/ethernut5_defconfig index cc2f567c8a8..004f1866162 100644 --- a/configs/ethernut5_defconfig +++ b/configs/ethernut5_defconfig @@ -46,7 +46,6 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DNS=y CONFIG_CMD_BSP=y CONFIG_CMD_CACHE=y -CONFIG_CMD_DATE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_JFFS2=y diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig index 1de61886b38..f05a2f15c13 100644 --- a/configs/work_92105_defconfig +++ b/configs/work_92105_defconfig @@ -48,7 +48,6 @@ CONFIG_CMD_NAND=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y -CONFIG_CMD_DATE=y CONFIG_DOS_PARTITION=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
This option is very old and the migration deadline was years ago. Drop it so that the I2C system can be simplified.
Signed-off-by: Simon Glass sjg@chromium.org ---
README | 5 ----- cmd/date.c | 6 ------ include/configs/ls1028aqds.h | 1 - include/configs/ls1028ardb.h | 2 -- include/configs/ls1046afrwy.h | 1 - include/configs/lx2160aqds.h | 3 --- include/configs/lx2160ardb.h | 3 --- include/configs/lx2162aqds.h | 3 --- include/configs/m53menlo.h | 2 -- include/configs/tqma6_wru4.h | 1 - include/i2c.h | 5 ----- 11 files changed, 32 deletions(-)
diff --git a/README b/README index 9fd2aee4b04..4b4d946e3fa 100644 --- a/README +++ b/README @@ -893,11 +893,6 @@ The following options need to be configured:
will skip addresses 0x50 and 0x68 on a board with one I2C bus
- CFG_SYS_RTC_BUS_NUM - - If defined, then this indicates the I2C bus number for the RTC. - If not defined, then U-Boot assumes that RTC is on I2C bus 0. - CONFIG_SOFT_I2C_READ_REPEATED_START
defining this will force the i2c_read() function in diff --git a/cmd/date.c b/cmd/date.c index 755adec1e71..bdb3e199b43 100644 --- a/cmd/date.c +++ b/cmd/date.c @@ -42,12 +42,6 @@ static int do_date(struct cmd_tbl *cmdtp, int flag, int argc, return CMD_RET_FAILURE; } } -#elif CONFIG_IS_ENABLED(SYS_I2C_LEGACY) - old_bus = i2c_get_bus_num(); - i2c_set_bus_num(CFG_SYS_RTC_BUS_NUM); -#else - old_bus = I2C_GET_BUS(); - I2C_SET_BUS(CFG_SYS_RTC_BUS_NUM); #endif
switch (argc) { diff --git a/include/configs/ls1028aqds.h b/include/configs/ls1028aqds.h index 769ece901c1..ed93b51d808 100644 --- a/include/configs/ls1028aqds.h +++ b/include/configs/ls1028aqds.h @@ -47,7 +47,6 @@ #endif
/* RTC */ -#define CFG_SYS_RTC_BUS_NUM 1 #define I2C_MUX_CH_RTC 0xB
/* Store environment at top of flash */ diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h index 0f591e3c4ab..d44ce45fd6b 100644 --- a/include/configs/ls1028ardb.h +++ b/include/configs/ls1028ardb.h @@ -10,8 +10,6 @@
#define COUNTER_FREQUENCY_REAL (get_board_sys_clk() / 4)
-#define CFG_SYS_RTC_BUS_NUM 0 - /* Store environment at top of flash */
/* diff --git a/include/configs/ls1046afrwy.h b/include/configs/ls1046afrwy.h index 5e03a962d10..21804fc6654 100644 --- a/include/configs/ls1046afrwy.h +++ b/include/configs/ls1046afrwy.h @@ -66,7 +66,6 @@
/* RTC */ #define CFG_SYS_I2C_RTC_ADDR 0x51 /* Channel 0 I2C bus 0*/ -#define CFG_SYS_RTC_BUS_NUM 0
/* * Environment diff --git a/include/configs/lx2160aqds.h b/include/configs/lx2160aqds.h index 3a316e73308..5b397e23d89 100644 --- a/include/configs/lx2160aqds.h +++ b/include/configs/lx2160aqds.h @@ -8,9 +8,6 @@
#include "lx2160a_common.h"
-/* RTC */ -#define CFG_SYS_RTC_BUS_NUM 0 - /* MAC/PHY configuration */
/* Initial environment variables */ diff --git a/include/configs/lx2160ardb.h b/include/configs/lx2160ardb.h index 6404b359111..e700a7b1135 100644 --- a/include/configs/lx2160ardb.h +++ b/include/configs/lx2160ardb.h @@ -8,9 +8,6 @@
#include "lx2160a_common.h"
-/* RTC */ -#define CFG_SYS_RTC_BUS_NUM 4 - #if defined(CONFIG_FSL_MC_ENET) #define AQR113C_PHY_ADDR1 0x0 #define AQR113C_PHY_ADDR2 0x08 diff --git a/include/configs/lx2162aqds.h b/include/configs/lx2162aqds.h index 54d7cea4c59..2d0db47b334 100644 --- a/include/configs/lx2162aqds.h +++ b/include/configs/lx2162aqds.h @@ -10,9 +10,6 @@
/* USB */
-/* RTC */ -#define CFG_SYS_RTC_BUS_NUM 0 - /* Initial environment variables */ #define CFG_EXTRA_ENV_SETTINGS \ EXTRA_ENV_SETTINGS \ diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 9cf46b2c362..c245cbe427b 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -57,8 +57,6 @@ #define CFG_FEC_MXC_PHYADDR 0x0 #endif
-#define CFG_SYS_RTC_BUS_NUM 1 /* I2C2 */ - /* * RTC */ diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index e06fc7fe155..5e21463305a 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -16,7 +16,6 @@ /* Watchdog */
/* Config on-board RTC */ -#define CFG_SYS_RTC_BUS_NUM 2 #define CFG_SYS_I2C_RTC_ADDR 0x68 /* Turn off RTC square-wave output to save battery */
diff --git a/include/i2c.h b/include/i2c.h index 622540c8265..45ca3d63e3f 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -655,11 +655,6 @@ void i2c_early_init_f(void); #undef CFG_SYS_I2C_DIRECT_BUS #endif
-/* define the I2C bus number for RTC and DTT if not already done */ -#if !defined(CFG_SYS_RTC_BUS_NUM) -#define CFG_SYS_RTC_BUS_NUM 0 -#endif - struct i2c_adapter { void (*init)(struct i2c_adapter *adap, int speed, int slaveaddr);
Drop two generations of old code in this command. All boards should use driver model for I2C from 2021.
Signed-off-by: Simon Glass sjg@chromium.org ---
cmd/date.c | 26 -------------------------- 1 file changed, 26 deletions(-)
diff --git a/cmd/date.c b/cmd/date.c index bdb3e199b43..8614f022761 100644 --- a/cmd/date.c +++ b/cmd/date.c @@ -31,7 +31,6 @@ static int do_date(struct cmd_tbl *cmdtp, int flag, int argc, int old_bus __maybe_unused;
/* switch to correct I2C bus */ -#ifdef CONFIG_DM_RTC struct udevice *dev;
rcode = uclass_get_device_by_seq(UCLASS_RTC, 0, &dev); @@ -42,29 +41,19 @@ static int do_date(struct cmd_tbl *cmdtp, int flag, int argc, return CMD_RET_FAILURE; } } -#endif
switch (argc) { case 2: /* set date & time */ if (strcmp(argv[1],"reset") == 0) { puts ("Reset RTC...\n"); -#ifdef CONFIG_DM_RTC rcode = dm_rtc_reset(dev); if (!rcode) rcode = dm_rtc_set(dev, &default_tm); -#else - rtc_reset(); - rcode = rtc_set(&default_tm); -#endif if (rcode) puts("## Failed to set date after RTC reset\n"); } else { /* initialize tm with current time */ -#ifdef CONFIG_DM_RTC rcode = dm_rtc_get(dev, &tm); -#else - rcode = rtc_get(&tm); -#endif if (!rcode) { /* insert new date & time */ if (mk_date(argv[1], &tm) != 0) { @@ -72,11 +61,7 @@ static int do_date(struct cmd_tbl *cmdtp, int flag, int argc, break; } /* and write to RTC */ -#ifdef CONFIG_DM_RTC rcode = dm_rtc_set(dev, &tm); -#else - rcode = rtc_set(&tm); -#endif if (rcode) { printf("## Set date failed: err=%d\n", rcode); @@ -87,11 +72,7 @@ static int do_date(struct cmd_tbl *cmdtp, int flag, int argc, } fallthrough; case 1: /* get date & time */ -#ifdef CONFIG_DM_RTC rcode = dm_rtc_get(dev, &tm); -#else - rcode = rtc_get(&tm); -#endif if (rcode) { puts("## Get date failed\n"); break; @@ -108,13 +89,6 @@ static int do_date(struct cmd_tbl *cmdtp, int flag, int argc, rcode = CMD_RET_USAGE; }
- /* switch back to original I2C bus */ -#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) - i2c_set_bus_num(old_bus); -#elif !defined(CONFIG_DM_RTC) - I2C_SET_BUS(old_bus); -#endif - return rcode ? CMD_RET_FAILURE : 0; }
Drop this old code to permit removal of legacy I2C code.
Signed-off-by: Simon Glass sjg@chromium.org ---
board/keymile/Kconfig | 3 -- board/keymile/common/common.c | 69 ----------------------------------- 2 files changed, 72 deletions(-)
diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig index 18ef689b334..3585941470e 100644 --- a/board/keymile/Kconfig +++ b/board/keymile/Kconfig @@ -11,9 +11,6 @@ if VENDOR_KM
menu "KM Board Setup"
-config SYS_I2C_INIT_BOARD - def_bool y if ARM - config HUSH_INIT_VAR def_bool y
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 9358c25dcb0..5aa7c4e5383 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -129,75 +129,6 @@ void check_for_uboot_update(void) } #endif
-#if defined(CONFIG_SYS_I2C_INIT_BOARD) -static void i2c_write_start_seq(void) -{ - set_sda(1); - udelay(DELAY_HALF_PERIOD); - set_scl(1); - udelay(DELAY_HALF_PERIOD); - set_sda(0); - udelay(DELAY_HALF_PERIOD); - set_scl(0); - udelay(DELAY_HALF_PERIOD); -} - -/* - * I2C is a synchronous protocol and resets of the processor in the middle - * of an access can block the I2C Bus until a powerdown of the full unit is - * done. This function toggles the SCL until the SCL and SCA line are - * released, but max. 16 times, after this a I2C start-sequence is sent. - * This I2C Deblocking mechanism was developed by Keymile in association - * with Anatech and Atmel in 1998. - */ -int i2c_make_abort(void) -{ - int scl_state = 0; - int sda_state = 0; - int i = 0; - int ret = 0; - - if (!get_sda()) { - ret = -1; - while (i < 16) { - i++; - set_scl(0); - udelay(DELAY_ABORT_SEQ); - set_scl(1); - udelay(DELAY_ABORT_SEQ); - scl_state = get_scl(); - sda_state = get_sda(); - if (scl_state && sda_state) { - ret = 0; - break; - } - } - } - if (ret == 0) - for (i = 0; i < 5; i++) - i2c_write_start_seq(); - - /* respect stop setup time */ - udelay(DELAY_ABORT_SEQ); - set_scl(1); - udelay(DELAY_ABORT_SEQ); - set_sda(1); - get_sda(); - - return ret; -} - -/** - * i2c_init_board - reset i2c bus. When the board is powercycled during a - * bus transfer it might hang; for details see doc/I2C_Edge_Conditions. - */ -void i2c_init_board(void) -{ - /* Now run the AbortSequence() */ - i2c_make_abort(); -} -#endif - #if defined(CONFIG_KM_COMMON_ETH_INIT) int board_eth_init(struct bd_info *bis) {
Hi Simon,
On Thu, 18 Jul 2024 18:36:02 +0100 Simon Glass sjg@chromium.org wrote:
Drop this old code to permit removal of legacy I2C code.
Signed-off-by: Simon Glass sjg@chromium.org
board/keymile/Kconfig | 3 -- board/keymile/common/common.c | 69 ----------------------------------- 2 files changed, 72 deletions(-)
Please do not remove this i2c deblocking code. I've updated the DM_I2C conversion patch, it preserves this deblocking code, but legacy I2C code is removed:
https://patchwork.ozlabs.org/project/uboot/patch/20240719232422.3403700-1-ag...
Thanks,
-- Anatolij
Hello Simon,
On 20.07.24 01:36, Anatolij Gustschin wrote:
Hi Simon,
On Thu, 18 Jul 2024 18:36:02 +0100 Simon Glass sjg@chromium.org wrote:
Drop this old code to permit removal of legacy I2C code.
Signed-off-by: Simon Glass sjg@chromium.org
board/keymile/Kconfig | 3 -- board/keymile/common/common.c | 69 ----------------------------------- 2 files changed, 72 deletions(-)
Please do not remove this i2c deblocking code. I've updated the DM_I2C conversion patch, it preserves this deblocking code, but legacy I2C code is removed:
https://patchwork.ozlabs.org/project/uboot/patch/20240719232422.3403700-1-ag...
Can you add this patch to your patchseries and resend a v2?
Thanks!
bye, Heiko
Drop use of this feature, but keep the board building. This will allow removal of very old common I2C code.
Signed-off-by: Simon Glass sjg@chromium.org ---
drivers/ddr/fsl/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c index 31091bb4495..6474e0d64c7 100644 --- a/drivers/ddr/fsl/main.c +++ b/drivers/ddr/fsl/main.c @@ -111,7 +111,7 @@ static int ddr_i2c_read(DEV_TYPE *dev, unsigned int addr, #if CONFIG_IS_ENABLED(DM_I2C) ret = dm_i2c_read(dev, 0, buf, len); #else - ret = i2c_read(dev->chip, addr, alen, buf, len); + ret = -ENOSYS; #endif
return ret; @@ -162,7 +162,6 @@ static void __get_spd(generic_spd_eeprom_t *spd, u8 i2c_address) }; dev = &ldev;
- i2c_set_bus_num(CONFIG_SYS_SPD_BUS_NUM); #endif
#ifdef CONFIG_SYS_FSL_DDR4
This is not now used by any boards, so drop it.
Signed-off-by: Simon Glass sjg@chromium.org ---
doc/I2C_Edge_Conditions | 10 ++++------ drivers/i2c/soft_i2c.c | 11 ----------- 2 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/doc/I2C_Edge_Conditions b/doc/I2C_Edge_Conditions index f4a99687011..9ccb21c5092 100644 --- a/doc/I2C_Edge_Conditions +++ b/doc/I2C_Edge_Conditions @@ -31,12 +31,10 @@ Notes !!!THIS IS AN UNDOCUMENTED I2C BUS BUG, NOT A AMCC 4xx BUG!!!
This reset edge condition could possibly be present in every I2C -controller and device available. For boards where a I2C bus reset -function can be implemented a i2c_init_board() function should be -provided and enabled by #define'ing CONFIG_SYS_I2C_INIT_BOARD in your -board's config file. Note that this is NOT necessary when using the -bit-banging I2C driver (common/soft_i2c.c) as this already includes -the I2C bus reset sequence. +controller and device available. + +Note that this problem does not happen when using the bit-banging I2C driver +(common/soft_i2c.c) as this already includes the I2C bus reset sequence.
Many thanks to Bill Hunter for finding this serious BUG. diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c index 1f2afc65e8b..6b2bff03f13 100644 --- a/drivers/i2c/soft_i2c.c +++ b/drivers/i2c/soft_i2c.c @@ -108,16 +108,13 @@ DECLARE_GLOBAL_DATA_PTR; /*----------------------------------------------------------------------- * Local functions */ -#if !defined(CONFIG_SYS_I2C_INIT_BOARD) static void send_reset (void); -#endif static void send_start (void); static void send_stop (void); static void send_ack (int); static int write_byte (uchar byte); static uchar read_byte (int);
-#if !defined(CONFIG_SYS_I2C_INIT_BOARD) /*----------------------------------------------------------------------- * Send a reset sequence consisting of 9 clocks with the data signal high * to clock any confused device back into an idle state. Also send a @@ -145,7 +142,6 @@ static void send_reset(void) send_stop(); I2C_TRISTATE; } -#endif
/*----------------------------------------------------------------------- * START: High -> Low on SDA while SCL is High @@ -278,12 +274,6 @@ static uchar read_byte(int ack) */ static void soft_i2c_init(struct i2c_adapter *adap, int speed, int slaveaddr) { -#if defined(CONFIG_SYS_I2C_INIT_BOARD) - /* call board specific i2c bus reset routine before accessing the */ - /* environment, which might be in a chip on that bus. For details */ - /* about this problem see doc/I2C_Edge_Conditions. */ - i2c_init_board(); -#else /* * WARNING: Do NOT save speed in a static variable: if the * I2C routines are called before RAM is initialized (to read @@ -291,7 +281,6 @@ static void soft_i2c_init(struct i2c_adapter *adap, int speed, int slaveaddr) * system will crash. */ send_reset (); -#endif }
/*-----------------------------------------------------------------------
This option is not defined by any board, so drop the code.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/mips/mach-octeon/octeon_fdt.c | 7 ------- 1 file changed, 7 deletions(-)
diff --git a/arch/mips/mach-octeon/octeon_fdt.c b/arch/mips/mach-octeon/octeon_fdt.c index c74fe9d9fb8..15ce292be95 100644 --- a/arch/mips/mach-octeon/octeon_fdt.c +++ b/arch/mips/mach-octeon/octeon_fdt.c @@ -687,13 +687,6 @@ int octeon_fdt_i2c_get_bus(const void *fdt, int node_offset) while (node_offset > 0 && !(found = !fdt_node_check_compatible(fdt, node_offset, compat))) { node_offset = fdt_parent_offset(fdt, node_offset); -#ifdef CONFIG_OCTEON_I2C_FDT - bus = i2c_get_bus_num_fdt(node_offset); - if (bus >= 0) { - debug("%s: Found bus 0x%x\n", __func__, bus); - return bus; - } -#endif } if (!found) { printf("Error: node %d in device tree is not a child of the I2C bus\n",
This is very old, predating even the legacy I2C support, so drop it.
Signed-off-by: Simon Glass sjg@chromium.org ---
drivers/power/power_i2c.c | 5 ----- include/i2c.h | 7 ------- 2 files changed, 12 deletions(-)
diff --git a/drivers/power/power_i2c.c b/drivers/power/power_i2c.c index a871fc41987..c2fc1c6b42f 100644 --- a/drivers/power/power_i2c.c +++ b/drivers/power/power_i2c.c @@ -33,8 +33,6 @@ int pmic_reg_write(struct pmic *p, u32 reg, u32 val) p->bus); return -ENXIO; } -#else /* Non DM I2C support - will be removed */ - I2C_SET_BUS(p->bus); #endif
switch (pmic_i2c_tx_num) { @@ -93,9 +91,6 @@ int pmic_reg_read(struct pmic *p, u32 reg, u32 *val) return -ENXIO; } ret = dm_i2c_read(dev, reg, buf, pmic_i2c_tx_num); -#else /* Non DM I2C support - will be removed */ - I2C_SET_BUS(p->bus); - ret = i2c_read(pmic_i2c_addr, reg, 1, buf, pmic_i2c_tx_num); #endif if (ret) return ret; diff --git a/include/i2c.h b/include/i2c.h index 45ca3d63e3f..1d1430b74a6 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -954,13 +954,6 @@ static inline unsigned int I2C_GET_BUS(void) return I2C_MULTI_BUS ? i2c_get_bus_num() : 0; }
-static inline void I2C_SET_BUS(unsigned int bus) __attribute__((always_inline)); -static inline void I2C_SET_BUS(unsigned int bus) -{ - if (I2C_MULTI_BUS) - i2c_set_bus_num(bus); -} - /** * Find the I2C bus number by given a FDT I2C node. *
This is very old, predating even the legacy I2C support, so drop it.
Signed-off-by: Simon Glass sjg@chromium.org ---
include/i2c.h | 7 ------- 1 file changed, 7 deletions(-)
diff --git a/include/i2c.h b/include/i2c.h index 1d1430b74a6..b6727bb2a73 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -947,13 +947,6 @@ unsigned int i2c_get_bus_speed(void); # define I2C_MULTI_BUS 0 #endif
-/* NOTE: These two functions MUST be always_inline to avoid code growth! */ -static inline unsigned int I2C_GET_BUS(void) __attribute__((always_inline)); -static inline unsigned int I2C_GET_BUS(void) -{ - return I2C_MULTI_BUS ? i2c_get_bus_num() : 0; -} - /** * Find the I2C bus number by given a FDT I2C node. *
Only one board uses this option and it is very old. Let's drop it.
Signed-off-by: Simon Glass sjg@chromium.org ---
include/configs/ethernut5.h | 3 --- include/i2c.h | 14 -------------- 2 files changed, 17 deletions(-)
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 807c6963192..c327bbbe07d 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -59,9 +59,6 @@ #define CFG_SYS_I2C_RTC_ADDR 0x51 #endif
-/* I2C */ -#define CFG_SYS_MAX_I2C_BUS 1 - #define I2C_SOFT_DECLARATIONS
#define GPIO_I2C_SCL AT91_PIO_PORTA, 24 diff --git a/include/i2c.h b/include/i2c.h index b6727bb2a73..282f3cd700f 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -933,20 +933,6 @@ int i2c_set_bus_speed(unsigned int); unsigned int i2c_get_bus_speed(void); #endif /* CONFIG_SYS_I2C_LEGACY */
-/* - * only for backwardcompatibility, should go away if we switched - * completely to new multibus support. - */ -#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) -# if !defined(CFG_SYS_MAX_I2C_BUS) -# define CFG_SYS_MAX_I2C_BUS 2 -# endif -# define I2C_MULTI_BUS 1 -#else -# define CFG_SYS_MAX_I2C_BUS 1 -# define I2C_MULTI_BUS 0 -#endif - /** * Find the I2C bus number by given a FDT I2C node. *
These functions are 11 years old and are not actually used by any board, even though one board (cl-som-imx7) does enable CONFIG_PCA953X
Drop them.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/mips/mach-octeon/octeon_fdt.c | 15 --------------- include/i2c.h | 18 ------------------ 2 files changed, 33 deletions(-)
diff --git a/arch/mips/mach-octeon/octeon_fdt.c b/arch/mips/mach-octeon/octeon_fdt.c index 15ce292be95..aa5d7d00c0d 100644 --- a/arch/mips/mach-octeon/octeon_fdt.c +++ b/arch/mips/mach-octeon/octeon_fdt.c @@ -908,21 +908,6 @@ int octeon_fdt_get_gpio_info(int fdt_node, enum octeon_gpio_type *type, debug("%s: Found PCA953x compatible GPIO", __func__); *type = GPIO_TYPE_PCA953X; } -#endif -#if defined(CONFIG_PCA953X) || \ - defined(CONFIG_PCA9555) || defined(CONFIG_PCA9554) - if (!i2c_addr || !i2c_bus) { - printf("%s: Error: i2c_addr or i2c_bus is NULL\n", __func__); - return -1; - } - - *i2c_addr = fdtdec_get_int(fdt, fdt_node, "reg", -1); - i2c_bus_node = fdt_parent_offset(fdt, fdt_node); - if (i2c_bus_node < 0) { - printf("%s: Invalid parent\n", __func__); - return -1; - } - *i2c_bus = i2c_get_bus_num_fdt(i2c_bus_node); #endif return (*type != GPIO_TYPE_UNKNOWN) ? 0 : -1; } diff --git a/include/i2c.h b/include/i2c.h index 282f3cd700f..f468b52cd7b 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -933,24 +933,6 @@ int i2c_set_bus_speed(unsigned int); unsigned int i2c_get_bus_speed(void); #endif /* CONFIG_SYS_I2C_LEGACY */
-/** - * Find the I2C bus number by given a FDT I2C node. - * - * @param blob Device tree blbo - * @param node FDT I2C node to find - * Return: the number of I2C bus (zero based), or -1 on error - */ -int i2c_get_bus_num_fdt(int node); - -/** - * Reset the I2C bus represented by the given a FDT I2C node. - * - * @param blob Device tree blbo - * @param node FDT I2C node to find - * Return: 0 if port was reset, -1 if not found - */ -int i2c_reset_port_fdt(const void *blob, int node); - #endif /* !CONFIG_DM_I2C */
#endif /* _I2C_H_ */
Now that this is always 0, remove it and the associated dead code.
Signed-off-by: Simon Glass sjg@chromium.org ---
README | 10 +--------- cmd/i2c.c | 23 ----------------------- drivers/i2c/i2c_core.c | 37 ------------------------------------- include/i2c.h | 7 ------- 4 files changed, 1 insertion(+), 76 deletions(-)
diff --git a/README b/README index 4b4d946e3fa..44dafa3be98 100644 --- a/README +++ b/README @@ -773,19 +773,11 @@ The following options need to be configured:
CFG_SYS_I2C_DIRECT_BUS define this, if you don't use i2c muxes on your hardware. - if CFG_SYS_I2C_MAX_HOPS is not defined or == 0 you can - omit this define. - - CFG_SYS_I2C_MAX_HOPS - define how many muxes are maximal consecutively connected - on one i2c bus. If you not use i2c muxes, omit this - define.
CFG_SYS_I2C_BUSES hold a list of buses you want to use, only used if CFG_SYS_I2C_DIRECT_BUS is not defined, for example - a board with CFG_SYS_I2C_MAX_HOPS = 1 and - CFG_SYS_NUM_I2C_BUSES = 9: + a board with CFG_SYS_NUM_I2C_BUSES = 9:
CFG_SYS_I2C_BUSES {{0, {I2C_NULL_HOP}}, \ {0, {{I2C_MUX_PCA9547, 0x70, 1}}}, \ diff --git a/cmd/i2c.c b/cmd/i2c.c index 7dac0a9fb6c..7246c4fa3e7 100644 --- a/cmd/i2c.c +++ b/cmd/i2c.c @@ -1698,18 +1698,6 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,
for (i = 0; i < CFG_SYS_NUM_I2C_BUSES; i++) { printf("Bus %d:\t%s", i, I2C_ADAP_NR(i)->name); -#ifndef CFG_SYS_I2C_DIRECT_BUS - int j; - - for (j = 0; j < CFG_SYS_I2C_MAX_HOPS; j++) { - if (i2c_bus[i].next_hop[j].chip == 0) - break; - printf("->%s@0x%2x:%d", - i2c_bus[i].next_hop[j].mux.name, - i2c_bus[i].next_hop[j].chip, - i2c_bus[i].next_hop[j].channel); - } -#endif printf("\n"); } #endif @@ -1734,17 +1722,6 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc, return -1; } printf("Bus %d:\t%s", i, I2C_ADAP_NR(i)->name); -#ifndef CFG_SYS_I2C_DIRECT_BUS - int j; - for (j = 0; j < CFG_SYS_I2C_MAX_HOPS; j++) { - if (i2c_bus[i].next_hop[j].chip == 0) - break; - printf("->%s@0x%2x:%d", - i2c_bus[i].next_hop[j].mux.name, - i2c_bus[i].next_hop[j].chip, - i2c_bus[i].next_hop[j].channel); - } -#endif printf("\n"); #endif } diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c index 7c43a5546d3..f371d952af5 100644 --- a/drivers/i2c/i2c_core.c +++ b/drivers/i2c/i2c_core.c @@ -111,23 +111,6 @@ static int i2c_mux_set_all(void) struct i2c_bus_hose *i2c_bus_tmp = &i2c_bus[I2C_BUS]; int i;
- /* Connect requested bus if behind muxes */ - if (i2c_bus_tmp->next_hop[0].chip != 0) { - /* Set all muxes along the path to that bus */ - for (i = 0; i < CFG_SYS_I2C_MAX_HOPS; i++) { - int ret; - - if (i2c_bus_tmp->next_hop[i].chip == 0) - break; - - ret = i2c_mux_set(I2C_ADAP, - i2c_bus_tmp->next_hop[i].mux.id, - i2c_bus_tmp->next_hop[i].chip, - i2c_bus_tmp->next_hop[i].channel); - if (ret != 0) - return ret; - } - } return 0; }
@@ -140,26 +123,6 @@ static int i2c_mux_disconnect_all(void) if (I2C_ADAP->init_done == 0) return 0;
- /* Disconnect current bus (turn off muxes if any) */ - if ((i2c_bus_tmp->next_hop[0].chip != 0) && - (I2C_ADAP->init_done != 0)) { - i = CFG_SYS_I2C_MAX_HOPS; - do { - uint8_t chip; - int ret; - - chip = i2c_bus_tmp->next_hop[--i].chip; - if (chip == 0) - continue; - - ret = I2C_ADAP->write(I2C_ADAP, chip, 0, 0, &buf, 1); - if (ret != 0) { - printf("i2c: mux disconnect error\n"); - return ret; - } - } while (i > 0); - } - return 0; } #endif diff --git a/include/i2c.h b/include/i2c.h index f468b52cd7b..180b71f1451 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -645,15 +645,9 @@ void i2c_early_init_f(void); */ #define I2C_RXTX_LEN 128 /* maximum tx/rx buffer length */
-#if !defined(CFG_SYS_I2C_MAX_HOPS) /* no muxes used bus = i2c adapters */ #define CFG_SYS_I2C_DIRECT_BUS 1 -#define CFG_SYS_I2C_MAX_HOPS 0 #define CFG_SYS_NUM_I2C_BUSES ll_entry_count(struct i2c_adapter, i2c) -#else -/* we use i2c muxes */ -#undef CFG_SYS_I2C_DIRECT_BUS -#endif
struct i2c_adapter { void (*init)(struct i2c_adapter *adap, int speed, @@ -712,7 +706,6 @@ struct i2c_next_hop {
struct i2c_bus_hose { int adapter; - struct i2c_next_hop next_hop[CFG_SYS_I2C_MAX_HOPS]; }; #define I2C_NULL_HOP {{-1, ""}, 0, 0} extern struct i2c_bus_hose i2c_bus[];
Now that this is always 1, remove it and the associated dead code.
Signed-off-by: Simon Glass sjg@chromium.org ---
README | 7 +-- drivers/i2c/i2c_core.c | 104 ----------------------------------------- include/i2c.h | 35 -------------- 3 files changed, 1 insertion(+), 145 deletions(-)
diff --git a/README b/README index 44dafa3be98..461c5d4d0e3 100644 --- a/README +++ b/README @@ -771,13 +771,8 @@ The following options need to be configured: CFG_SYS_NUM_I2C_BUSES Hold the number of i2c buses you want to use.
- CFG_SYS_I2C_DIRECT_BUS - define this, if you don't use i2c muxes on your hardware. - CFG_SYS_I2C_BUSES - hold a list of buses you want to use, only used if - CFG_SYS_I2C_DIRECT_BUS is not defined, for example - a board with CFG_SYS_NUM_I2C_BUSES = 9: + hold a list of buses you want to use
CFG_SYS_I2C_BUSES {{0, {I2C_NULL_HOP}}, \ {0, {{I2C_MUX_PCA9547, 0x70, 1}}}, \ diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c index f371d952af5..cccd45027db 100644 --- a/drivers/i2c/i2c_core.c +++ b/drivers/i2c/i2c_core.c @@ -33,100 +33,8 @@ struct i2c_adapter *i2c_get_adapter(int index) return i2c_adap_p; }
-#if !defined(CFG_SYS_I2C_DIRECT_BUS) -struct i2c_bus_hose i2c_bus[CFG_SYS_NUM_I2C_BUSES] = - CFG_SYS_I2C_BUSES; -#endif - DECLARE_GLOBAL_DATA_PTR;
-#ifndef CFG_SYS_I2C_DIRECT_BUS -/* - * i2c_mux_set() - * ------------- - * - * This turns on the given channel on I2C multiplexer chip connected to - * a given I2C adapter directly or via other multiplexers. In the latter - * case the entire multiplexer chain must be initialized first starting - * with the one connected directly to the adapter. When disabling a chain - * muxes must be programmed in reverse order, starting with the one - * farthest from the adapter. - * - * mux_id is the multiplexer chip type from defined in i2c.h. So far only - * NXP (Philips) PCA954x multiplexers are supported. Switches are NOT - * supported (anybody uses them?) - */ - -static int i2c_mux_set(struct i2c_adapter *adap, int mux_id, int chip, - int channel) -{ - uint8_t buf; - int ret; - - /* channel < 0 - turn off the mux */ - if (channel < 0) { - buf = 0; - ret = adap->write(adap, chip, 0, 0, &buf, 1); - if (ret) - printf("%s: Could not turn off the mux.\n", __func__); - return ret; - } - - switch (mux_id) { - case I2C_MUX_PCA9540_ID: - case I2C_MUX_PCA9542_ID: - if (channel > 1) - return -1; - buf = (uint8_t)((channel & 0x01) | (1 << 2)); - break; - case I2C_MUX_PCA9544_ID: - if (channel > 3) - return -1; - buf = (uint8_t)((channel & 0x03) | (1 << 2)); - break; - case I2C_MUX_PCA9547_ID: - if (channel > 7) - return -1; - buf = (uint8_t)((channel & 0x07) | (1 << 3)); - break; - case I2C_MUX_PCA9548_ID: - if (channel > 7) - return -1; - buf = (uint8_t)(0x01 << channel); - break; - default: - printf("%s: wrong mux id: %d\n", __func__, mux_id); - return -1; - } - - ret = adap->write(adap, chip, 0, 0, &buf, 1); - if (ret) - printf("%s: could not set mux: id: %d chip: %x channel: %d\n", - __func__, mux_id, chip, channel); - return ret; -} - -static int i2c_mux_set_all(void) -{ - struct i2c_bus_hose *i2c_bus_tmp = &i2c_bus[I2C_BUS]; - int i; - - return 0; -} - -static int i2c_mux_disconnect_all(void) -{ - struct i2c_bus_hose *i2c_bus_tmp = &i2c_bus[I2C_BUS]; - int i; - uint8_t buf = 0; - - if (I2C_ADAP->init_done == 0) - return 0; - - return 0; -} -#endif - /* * i2c_init_bus(): * --------------- @@ -200,11 +108,6 @@ int i2c_set_bus_num(unsigned int bus) if ((bus == I2C_BUS) && (I2C_ADAP->init_done > 0)) return 0;
-#ifndef CFG_SYS_I2C_DIRECT_BUS - if (bus >= CFG_SYS_NUM_I2C_BUSES) - return -1; -#endif - max = ll_entry_count(struct i2c_adapter, i2c); if (I2C_ADAPTER(bus) >= max) { printf("Error, wrong i2c adapter %d max %d possible\n", @@ -212,17 +115,10 @@ int i2c_set_bus_num(unsigned int bus) return -2; }
-#ifndef CFG_SYS_I2C_DIRECT_BUS - i2c_mux_disconnect_all(); -#endif - gd->cur_i2c_bus = bus; if (I2C_ADAP->init_done == 0) i2c_init_bus(bus, I2C_ADAP->speed, I2C_ADAP->slaveaddr);
-#ifndef CFG_SYS_I2C_DIRECT_BUS - i2c_mux_set_all(); -#endif return 0; }
diff --git a/include/i2c.h b/include/i2c.h index 180b71f1451..91917f54be9 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -646,7 +646,6 @@ void i2c_early_init_f(void); #define I2C_RXTX_LEN 128 /* maximum tx/rx buffer length */
/* no muxes used bus = i2c adapters */ -#define CFG_SYS_I2C_DIRECT_BUS 1 #define CFG_SYS_NUM_I2C_BUSES ll_entry_count(struct i2c_adapter, i2c)
struct i2c_adapter { @@ -692,47 +691,13 @@ struct i2c_adapter {
struct i2c_adapter *i2c_get_adapter(int index);
-#ifndef CFG_SYS_I2C_DIRECT_BUS -struct i2c_mux { - int id; - char name[16]; -}; - -struct i2c_next_hop { - struct i2c_mux mux; - uint8_t chip; - uint8_t channel; -}; - -struct i2c_bus_hose { - int adapter; -}; -#define I2C_NULL_HOP {{-1, ""}, 0, 0} -extern struct i2c_bus_hose i2c_bus[]; - -#define I2C_ADAPTER(bus) i2c_bus[bus].adapter -#else #define I2C_ADAPTER(bus) bus -#endif #define I2C_BUS gd->cur_i2c_bus
#define I2C_ADAP_NR(bus) i2c_get_adapter(I2C_ADAPTER(bus)) #define I2C_ADAP I2C_ADAP_NR(gd->cur_i2c_bus) #define I2C_ADAP_HWNR (I2C_ADAP->hwadapnr)
-#ifndef CFG_SYS_I2C_DIRECT_BUS -#define I2C_MUX_PCA9540_ID 1 -#define I2C_MUX_PCA9540 {I2C_MUX_PCA9540_ID, "PCA9540B"} -#define I2C_MUX_PCA9542_ID 2 -#define I2C_MUX_PCA9542 {I2C_MUX_PCA9542_ID, "PCA9542A"} -#define I2C_MUX_PCA9544_ID 3 -#define I2C_MUX_PCA9544 {I2C_MUX_PCA9544_ID, "PCA9544A"} -#define I2C_MUX_PCA9547_ID 4 -#define I2C_MUX_PCA9547 {I2C_MUX_PCA9547_ID, "PCA9547A"} -#define I2C_MUX_PCA9548_ID 5 -#define I2C_MUX_PCA9548 {I2C_MUX_PCA9548_ID, "PCA9548"} -#endif - #ifndef I2C_SOFT_DECLARATIONS # if (defined(CONFIG_AT91RM9200) || \ defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9261) || \
-cc most
Hi,
On Thu, 18 Jul 2024 at 11:36, Simon Glass sjg@chromium.org wrote:
This series aims to remove some of the older contents of i2c.h so that we can move towards having just the dm API.
It removes four boards which are getting in the way.
Simon Glass (20): arm: Remove pg_wcom boards i2c: Remove board_i2c_init() i2c: Remove IC2_xxx enum i2c: Remove CFG_I2C_MULTI_BUS mips: malta: Drop CMD_DATE armv8: ls2085a: Drop CMD_DATE mx28 / mx51: Drop CMD_DATE MPC837XERDB: ethernut5: work_92105: Drop CMD_DATE rtc: Drop CFG_SYS_RTC_BUS_NUM date: Drop the legacy I2C code keymile: Remove use of legacy I2C i2c: mxc: pg_wcom: Drop legacy I2c i2c: Drop reference to SYS_I2C_INIT_BOARD octeon: Drop OCTEON_I2C_FDT dead code i2c: Remove I2C_SET_BUS() i2c: Remove I2C_GET_BUS() i2c: Drop CFG_SYS_MAX_I2C_BUS i2c: Drop i2c_get_bus_num_fdt() and i2c_reset_port_fdt() i2c: Remove CFG_SYS_I2C_MAX_HOPS i2c: Remove CFG_SYS_I2C_DIRECT_BUS
README | 27 +-- arch/arm/dts/ls1021a-pg-wcom-expu1.dts | 141 ----------- arch/arm/dts/ls1021a-pg-wcom-seli8.dts | 124 ---------- arch/mips/mach-octeon/octeon_fdt.c | 22 -- board/keymile/Kconfig | 4 - board/keymile/common/common.c | 69 ------ board/keymile/pg-wcom-ls102xa/Kconfig | 39 ---- board/keymile/pg-wcom-ls102xa/MAINTAINERS | 16 -- board/keymile/pg-wcom-ls102xa/Makefile | 11 - board/keymile/pg-wcom-ls102xa/ddr.c | 91 -------- .../keymile/pg-wcom-ls102xa/pg-wcom-expu1.env | 3 - .../keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c | 218 ------------------ .../keymile/pg-wcom-ls102xa/pg-wcom-seli8.env | 3 - cmd/date.c | 32 --- cmd/i2c.c | 23 -- configs/MPC837XERDB_defconfig | 1 - configs/ethernut5_defconfig | 1 - configs/ls2080aqds_nand_defconfig | 1 - configs/ls2080aqds_qspi_defconfig | 1 - configs/ls2080ardb_nand_defconfig | 1 - configs/malta64_defconfig | 1 - configs/malta64el_defconfig | 1 - configs/malta_defconfig | 1 - configs/maltael_defconfig | 1 - configs/mx28evk_defconfig | 1 - configs/mx51evk_defconfig | 1 - configs/pg_wcom_expu1_defconfig | 109 --------- configs/pg_wcom_expu1_update_defconfig | 107 --------- configs/pg_wcom_seli8_defconfig | 109 --------- configs/pg_wcom_seli8_update_defconfig | 107 --------- configs/work_92105_defconfig | 1 - doc/I2C_Edge_Conditions | 10 +- drivers/ddr/fsl/main.c | 3 +- drivers/i2c/i2c_core.c | 141 ----------- drivers/i2c/soft_i2c.c | 11 - drivers/power/power_i2c.c | 5 - drivers/usb/host/ohci-lpc32xx.c | 4 - include/configs/ethernut5.h | 3 - include/configs/km/pg-wcom-ls102xa.h | 167 -------------- include/configs/ls1028aqds.h | 1 - include/configs/ls1028ardb.h | 2 - include/configs/ls1046afrwy.h | 1 - include/configs/lx2160aqds.h | 3 - include/configs/lx2160ardb.h | 3 - include/configs/lx2162aqds.h | 3 - include/configs/m53menlo.h | 2 - include/configs/omap3_beagle.h | 3 - include/configs/pg-wcom-expu1.h | 49 ---- include/configs/pg-wcom-seli8.h | 40 ---- include/configs/sniper.h | 14 -- include/configs/tqma6.h | 3 - include/configs/tqma6_wru4.h | 1 - include/i2c.h | 107 --------- 53 files changed, 6 insertions(+), 1837 deletions(-) delete mode 100644 arch/arm/dts/ls1021a-pg-wcom-expu1.dts delete mode 100644 arch/arm/dts/ls1021a-pg-wcom-seli8.dts delete mode 100644 board/keymile/pg-wcom-ls102xa/Kconfig delete mode 100644 board/keymile/pg-wcom-ls102xa/MAINTAINERS delete mode 100644 board/keymile/pg-wcom-ls102xa/Makefile delete mode 100644 board/keymile/pg-wcom-ls102xa/ddr.c delete mode 100644 board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env delete mode 100644 board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c delete mode 100644 board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env delete mode 100644 configs/pg_wcom_expu1_defconfig delete mode 100644 configs/pg_wcom_expu1_update_defconfig delete mode 100644 configs/pg_wcom_seli8_defconfig delete mode 100644 configs/pg_wcom_seli8_update_defconfig delete mode 100644 include/configs/km/pg-wcom-ls102xa.h delete mode 100644 include/configs/pg-wcom-expu1.h delete mode 100644 include/configs/pg-wcom-seli8.h
-- 2.34.1
What shall we do with this series?
Regards, Simon
On Fri, Aug 09, 2024 at 12:37:52PM -0600, Simon Glass wrote:
-cc most
Hi,
On Thu, 18 Jul 2024 at 11:36, Simon Glass sjg@chromium.org wrote:
This series aims to remove some of the older contents of i2c.h so that we can move towards having just the dm API.
It removes four boards which are getting in the way.
Simon Glass (20): arm: Remove pg_wcom boards i2c: Remove board_i2c_init() i2c: Remove IC2_xxx enum i2c: Remove CFG_I2C_MULTI_BUS mips: malta: Drop CMD_DATE armv8: ls2085a: Drop CMD_DATE mx28 / mx51: Drop CMD_DATE MPC837XERDB: ethernut5: work_92105: Drop CMD_DATE rtc: Drop CFG_SYS_RTC_BUS_NUM date: Drop the legacy I2C code keymile: Remove use of legacy I2C i2c: mxc: pg_wcom: Drop legacy I2c i2c: Drop reference to SYS_I2C_INIT_BOARD octeon: Drop OCTEON_I2C_FDT dead code i2c: Remove I2C_SET_BUS() i2c: Remove I2C_GET_BUS() i2c: Drop CFG_SYS_MAX_I2C_BUS i2c: Drop i2c_get_bus_num_fdt() and i2c_reset_port_fdt() i2c: Remove CFG_SYS_I2C_MAX_HOPS i2c: Remove CFG_SYS_I2C_DIRECT_BUS
README | 27 +-- arch/arm/dts/ls1021a-pg-wcom-expu1.dts | 141 ----------- arch/arm/dts/ls1021a-pg-wcom-seli8.dts | 124 ---------- arch/mips/mach-octeon/octeon_fdt.c | 22 -- board/keymile/Kconfig | 4 - board/keymile/common/common.c | 69 ------ board/keymile/pg-wcom-ls102xa/Kconfig | 39 ---- board/keymile/pg-wcom-ls102xa/MAINTAINERS | 16 -- board/keymile/pg-wcom-ls102xa/Makefile | 11 - board/keymile/pg-wcom-ls102xa/ddr.c | 91 -------- .../keymile/pg-wcom-ls102xa/pg-wcom-expu1.env | 3 - .../keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c | 218 ------------------ .../keymile/pg-wcom-ls102xa/pg-wcom-seli8.env | 3 - cmd/date.c | 32 --- cmd/i2c.c | 23 -- configs/MPC837XERDB_defconfig | 1 - configs/ethernut5_defconfig | 1 - configs/ls2080aqds_nand_defconfig | 1 - configs/ls2080aqds_qspi_defconfig | 1 - configs/ls2080ardb_nand_defconfig | 1 - configs/malta64_defconfig | 1 - configs/malta64el_defconfig | 1 - configs/malta_defconfig | 1 - configs/maltael_defconfig | 1 - configs/mx28evk_defconfig | 1 - configs/mx51evk_defconfig | 1 - configs/pg_wcom_expu1_defconfig | 109 --------- configs/pg_wcom_expu1_update_defconfig | 107 --------- configs/pg_wcom_seli8_defconfig | 109 --------- configs/pg_wcom_seli8_update_defconfig | 107 --------- configs/work_92105_defconfig | 1 - doc/I2C_Edge_Conditions | 10 +- drivers/ddr/fsl/main.c | 3 +- drivers/i2c/i2c_core.c | 141 ----------- drivers/i2c/soft_i2c.c | 11 - drivers/power/power_i2c.c | 5 - drivers/usb/host/ohci-lpc32xx.c | 4 - include/configs/ethernut5.h | 3 - include/configs/km/pg-wcom-ls102xa.h | 167 -------------- include/configs/ls1028aqds.h | 1 - include/configs/ls1028ardb.h | 2 - include/configs/ls1046afrwy.h | 1 - include/configs/lx2160aqds.h | 3 - include/configs/lx2160ardb.h | 3 - include/configs/lx2162aqds.h | 3 - include/configs/m53menlo.h | 2 - include/configs/omap3_beagle.h | 3 - include/configs/pg-wcom-expu1.h | 49 ---- include/configs/pg-wcom-seli8.h | 40 ---- include/configs/sniper.h | 14 -- include/configs/tqma6.h | 3 - include/configs/tqma6_wru4.h | 1 - include/i2c.h | 107 --------- 53 files changed, 6 insertions(+), 1837 deletions(-) delete mode 100644 arch/arm/dts/ls1021a-pg-wcom-expu1.dts delete mode 100644 arch/arm/dts/ls1021a-pg-wcom-seli8.dts delete mode 100644 board/keymile/pg-wcom-ls102xa/Kconfig delete mode 100644 board/keymile/pg-wcom-ls102xa/MAINTAINERS delete mode 100644 board/keymile/pg-wcom-ls102xa/Makefile delete mode 100644 board/keymile/pg-wcom-ls102xa/ddr.c delete mode 100644 board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env delete mode 100644 board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c delete mode 100644 board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env delete mode 100644 configs/pg_wcom_expu1_defconfig delete mode 100644 configs/pg_wcom_expu1_update_defconfig delete mode 100644 configs/pg_wcom_seli8_defconfig delete mode 100644 configs/pg_wcom_seli8_update_defconfig delete mode 100644 include/configs/km/pg-wcom-ls102xa.h delete mode 100644 include/configs/pg-wcom-expu1.h delete mode 100644 include/configs/pg-wcom-seli8.h
What shall we do with this series?
Later today once I merge Heiko's PR for -next to -next, rebase on top there please, I believe all of the platforms have been converted now. Thanks.
On Fri, 9 Aug 2024 12:56:41 -0600 Tom Rini trini@konsulko.com wrote: ...
What shall we do with this series?
Later today once I merge Heiko's PR for -next to -next, rebase on top there please, I believe all of the platforms have been converted now. Thanks.
there are still a few arm/arm64/powerpc boards that need DM_I2C conversion. I think we can disable date command for these boards until the rtc drivers are converted to DM_RTC. After that we can finish DM_I2C conversion.
-- Anatolij
participants (4)
-
Anatolij Gustschin -
Heiko Schocher -
Simon Glass -
Tom Rini