[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/7] hw/arm: Use unit number in quanta-gsj eeprom files
From: |
Hao Wu |
Subject: |
[PATCH 7/7] hw/arm: Use unit number in quanta-gsj eeprom files |
Date: |
Fri, 13 Aug 2021 16:33:53 -0700 |
Use unique unit numbers in quanta-gsj eeprom files.
Signed-off-by: Hao Wu <wuhaotsh@google.com>
Reviewed-by: Patrick Venture<venture@google.com>
---
hw/arm/npcm7xx_boards.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c
index 54cf9785ec..be6c81b29d 100644
--- a/hw/arm/npcm7xx_boards.c
+++ b/hw/arm/npcm7xx_boards.c
@@ -107,17 +107,6 @@ static I2CBus *npcm7xx_i2c_get_bus(NPCM7xxState *soc,
uint32_t num)
return I2C_BUS(qdev_get_child_bus(DEVICE(&soc->smbus[num]), "i2c-bus"));
}
-static void at24c_eeprom_init(NPCM7xxState *soc, int bus, uint8_t addr,
- uint32_t rsize)
-{
- I2CBus *i2c_bus = npcm7xx_i2c_get_bus(soc, bus);
- I2CSlave *i2c_dev = i2c_slave_new("at24c-eeprom", addr);
- DeviceState *dev = DEVICE(i2c_dev);
-
- qdev_prop_set_uint32(dev, "rom-size", rsize);
- i2c_slave_realize_and_unref(i2c_dev, i2c_bus, &error_abort);
-}
-
static void npcm7xx_init_pwm_splitter(NPCM7xxMachine *machine,
NPCM7xxState *soc, const int *fan_counts)
{
@@ -220,8 +209,8 @@ static void quanta_gsj_i2c_init(NPCM7xxState *soc)
i2c_slave_create_simple(npcm7xx_i2c_get_bus(soc, 3), "tmp105", 0x5c);
i2c_slave_create_simple(npcm7xx_i2c_get_bus(soc, 4), "tmp105", 0x5c);
- at24c_eeprom_init(soc, 9, 0x55, 8192);
- at24c_eeprom_init(soc, 10, 0x55, 8192);
+ at24c_eeprom_init_one(npcm7xx_i2c_get_bus(soc, 9), 9, 0x55, 8192, 0);
+ at24c_eeprom_init_one(npcm7xx_i2c_get_bus(soc, 10), 10, 0x55, 8192, 1);
/*
* i2c-11:
--
2.33.0.rc1.237.g0d66db33f3-goog
- [PATCH 0/7] Misc NPCM7XX patches, Hao Wu, 2021/08/13
- [PATCH 1/7] hw/i2c: Clear ACK bit in NPCM7xx SMBus module, Hao Wu, 2021/08/13
- [PATCH 2/7] hw/i2c: Read FIFO during RXF_CTL change in NPCM7XX SMBus, Hao Wu, 2021/08/13
- [PATCH 3/7] hw/adc: Fix CONV bit in NPCM7XX ADC CON register, Hao Wu, 2021/08/13
- [PATCH 5/7] hw/nvram: Add a new auxiliary function to init at24c eeprom, Hao Wu, 2021/08/13
- [PATCH 6/7] hw/arm: quanta-gbs-bmc add i2c devices, Hao Wu, 2021/08/13
- [PATCH 4/7] hw/adc: Make adci[*] R/W in NPCM7XX ADC, Hao Wu, 2021/08/13
- [PATCH 7/7] hw/arm: Use unit number in quanta-gsj eeprom files,
Hao Wu <=
- Re: [PATCH 0/7] Misc NPCM7XX patches, Peter Maydell, 2021/08/19