i2c: octeon_i2c: Misc fixes for ARM Octeon TX2 support
PATCH 1/1 i2c: octeon_i2c: Misc fixes for ARM Octeon TX2 support
This patch fixes a few issues noticed, when testing this new driver on ARM Octeon TX2 again. Here the details:
- Remove "common.h" header inclusion
- Use correct THP define on Octeon TX2
- Octeon TX2 uses the same compatible as Octeon TX. We can't distinguish both platforms this way. Remove the unused "cavium,thunder2-99xx-twsi" compatible and add a check to the Octeon TX2 specific "cavium,thunderx-i2c" so that the correct driver data is selected.
- Removed "struct pci_device_id" definition and U_BOOT_PCI_DEVICE() as its not needed for the PCI based probing on Octeon TX2
--- drivers/i2c/octeon_i2c.c | 59 ++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 33 deletions(-)
drivers/i2c/octeon_i2c.c +26 -33
@@ -3,11 +3,10 @@* Copyright (C) 2018 Marvell International Ltd. */ -#include <common.h> #include <clk.h> #include <dm.h> #include <i2c.h> -#include <pci_ids.h> +#include <time.h> #include <asm/io.h> #include <linux/bitfield.h> #include <linux/compat.h>
@@ -749,6 +748,27 @@ static int octeon_i2c_set_bus_speed(struct udevice *bus, unsigned int speed)return 0 ; } +static const struct octeon_i2c_data i2c_octeon_data = { + .probe =PROBE_DT , + .reg_offs =0x0000 , + .thp =3 , + .clk_method =CLK_METHOD_OCTEON , +}; + +static const struct octeon_i2c_data i2c_octeontx_data = { + .probe =PROBE_PCI , + .reg_offs =0x1000 , + .thp =24 , + .clk_method =CLK_METHOD_OCTEON , +}; + +static const struct octeon_i2c_data i2c_octeontx2_data = { + .probe =PROBE_PCI , + .reg_offs =0x1000 , + .thp =3 , + .clk_method =CLK_METHOD_OCTEONTX2 , +}; +/** * Driver probe function *
@@ -761,6 +781,10 @@ static int octeon_i2c_probe(struct udevice *dev)u32 i2c_slave_addr;int ret; +/* Octeon TX2 needs a different data struct */ +if (device_is_compatible (dev,"cavium,thunderx-i2c" )) + dev->driver_data = (long )&i2c_octeontx2_data; + twsi->data = (const struct octeon_i2c_data *)dev_get_driver_data (dev);if (twsi->data->probe ==PROBE_PCI ) {
@@ -798,34 +822,11 @@ static const struct dm_i2c_ops octeon_i2c_ops = { .set_bus_speed = octeon_i2c_set_bus_speed, }; -static const struct octeon_i2c_data i2c_octeon_data = { - .probe =PROBE_DT , - .reg_offs =0x0000 , - .thp =3 , - .clk_method =CLK_METHOD_OCTEON , -}; - -static const struct octeon_i2c_data i2c_octeontx_data = { - .probe =PROBE_PCI , - .reg_offs =0x8000 , - .thp =3 , - .clk_method =CLK_METHOD_OCTEON , -}; - -static const struct octeon_i2c_data i2c_octeontx2_data = { - .probe =PROBE_PCI , - .reg_offs =0x8000 , - .thp =24 , - .clk_method =CLK_METHOD_OCTEONTX2 , -}; -static const struct udevice_id octeon_i2c_ids[] = { { .compatible ="cavium,octeon-7890-twsi" , .data = (ulong)&i2c_octeon_data }, { .compatible ="cavium,thunder-8890-twsi" , .data = (ulong)&i2c_octeontx_data }, - { .compatible ="cavium,thunder2-99xx-twsi" , - .data = (ulong)&i2c_octeontx2_data }, { } };
@@ -837,11 +838,3 @@ U_BOOT_DRIVER(octeon_pci_twsi) = { .priv_auto_alloc_size = sizeof(struct octeon_twsi), .ops = &octeon_i2c_ops, }; - -static struct pci_device_id octeon_twsi_supported[] = { - {PCI_VDEVICE (CAVIUM ,PCI_DEVICE_ID_CAVIUM_TWSI ), - .driver_data = (ulong)&i2c_octeontx2_data }, - { }, -}; - -U_BOOT_PCI_DEVICE (octeon_pci_twsi, octeon_twsi_supported);
Signature · 1 line
2.27.0
PATCH 1/1 i2c: octeon_i2c: Misc fixes for ARM Octeon TX2 support
Quoted 18 lines
This patch fixes a few issues noticed, when testing this new driver on ARM Octeon TX2 again. Here the details:
- Remove "
common.h" header inclusion
- Use correct THP define on Octeon TX2
- Octeon TX2 uses the same compatible as Octeon TX. We can't distinguish both platforms this way. Remove the unused "cavium,thunder2-99xx-twsi" compatible and add a check to the Octeon TX2 specific "cavium,thunderx-i2c" so that the correct driver data is selected.
- Removed "structpci_device_id" definition andU_BOOT_PCI_DEVICE()as its not needed for the PCI based probing on Octeon TX2Signed-off-by Stefan Roese <[email protected]>Cc Heiko Schocher <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Suneel Garapati <[email protected]>Cc Aaron Williams <[email protected]>Cc Chandrakala Chavva <[email protected]>
Quoted 5 lines
--- drivers/i2c/octeon_i2c.c | 59 ++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 33 deletions(-)
Signature · 1 line
- Daniel
PATCH 1/1 i2c: octeon_i2c: Misc fixes for ARM Octeon TX2 support
In reply to Stefan RoeseHello Stefan,
Am 23.07.2020 um 14:09 schrieb Stefan Roese:
Quoted 18 lines
This patch fixes a few issues noticed, when testing this new driver on ARM Octeon TX2 again. Here the details:
- Remove "
common.h" header inclusion
- Use correct THP define on Octeon TX2
- Octeon TX2 uses the same compatible as Octeon TX. We can't distinguish both platforms this way. Remove the unused "cavium,thunder2-99xx-twsi" compatible and add a check to the Octeon TX2 specific "cavium,thunderx-i2c" so that the correct driver data is selected.
- Removed "structpci_device_id" definition andU_BOOT_PCI_DEVICE()as its not needed for the PCI based probing on Octeon TX2Signed-off-by Stefan Roese <[email protected]>Cc Heiko Schocher <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Suneel Garapati <[email protected]>Cc Aaron Williams <[email protected]>Cc Chandrakala Chavva <[email protected]>
Quoted 3 lines
--- drivers/i2c/octeon_i2c.c | 59 ++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 33 deletions(-)
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de
PATCH 1/1 i2c: octeon_i2c: Misc fixes for ARM Octeon TX2 support
In reply to Stefan RoeseHello Stefan,
Am 23.07.2020 um 14:09 schrieb Stefan Roese:
Quoted 18 lines
This patch fixes a few issues noticed, when testing this new driver on ARM Octeon TX2 again. Here the details:
- Remove "
common.h" header inclusion
- Use correct THP define on Octeon TX2
- Octeon TX2 uses the same compatible as Octeon TX. We can't distinguish both platforms this way. Remove the unused "cavium,thunder2-99xx-twsi" compatible and add a check to the Octeon TX2 specific "cavium,thunderx-i2c" so that the correct driver data is selected.
- Removed "structpci_device_id" definition andU_BOOT_PCI_DEVICE()as its not needed for the PCI based probing on Octeon TX2Signed-off-by Stefan Roese <[email protected]>Cc Heiko Schocher <[email protected]>Cc Daniel Schwierzeck <[email protected]>Cc Suneel Garapati <[email protected]>Cc Aaron Williams <[email protected]>Cc Chandrakala Chavva <[email protected]>
Quoted 3 lines
--- drivers/i2c/octeon_i2c.c | 59 ++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 33 deletions(-)
Applied to u-boot-i2c.git
Thanks!
bye,
Heiko
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de