aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/soc/amd/cezanne/chip.c49
-rw-r--r--src/soc/amd/cezanne/chipset.cb16
-rw-r--r--src/soc/amd/mendocino/chip.c53
-rw-r--r--src/soc/amd/mendocino/chipset_mendocino.cb22
-rw-r--r--src/soc/amd/mendocino/chipset_rembrandt.cb22
-rw-r--r--src/soc/amd/morgana/chip.c52
-rw-r--r--src/soc/amd/morgana/chipset.cb22
-rw-r--r--src/soc/amd/picasso/chip.c45
-rw-r--r--src/soc/amd/picasso/chipset.cb14
9 files changed, 61 insertions, 234 deletions
diff --git a/src/soc/amd/cezanne/chip.c b/src/soc/amd/cezanne/chip.c
index 86aaf6ced2..e4aa7040e6 100644
--- a/src/soc/amd/cezanne/chip.c
+++ b/src/soc/amd/cezanne/chip.c
@@ -12,14 +12,7 @@
#include <types.h>
#include "chip.h"
-/* Supplied by i2c.c */
-extern struct device_operations soc_amd_i2c_mmio_ops;
-/* Supplied by uart.c */
-extern struct device_operations cezanne_uart_mmio_ops;
-/* Supplied by emmc.c */
-extern struct device_operations cezanne_emmc_mmio_ops;
-
-struct device_operations cpu_bus_ops = {
+struct device_operations cezanne_cpu_bus_ops = {
.read_resources = noop_read_resources,
.set_resources = noop_set_resources,
.init = mp_cpu_bus_init,
@@ -39,50 +32,13 @@ static const char *soc_acpi_name(const struct device *dev)
return NULL;
};
-static struct device_operations pci_domain_ops = {
+struct device_operations cezanne_pci_domain_ops = {
.read_resources = pci_domain_read_resources,
.set_resources = pci_domain_set_resources,
.scan_bus = pci_domain_scan_bus,
.acpi_name = soc_acpi_name,
};
-static void set_mmio_dev_ops(struct device *dev)
-{
- switch (dev->path.mmio.addr) {
- case APU_I2C0_BASE:
- case APU_I2C1_BASE:
- case APU_I2C2_BASE:
- case APU_I2C3_BASE:
- dev->ops = &soc_amd_i2c_mmio_ops;
- break;
- case APU_UART0_BASE:
- case APU_UART1_BASE:
- dev->ops = &cezanne_uart_mmio_ops;
- break;
- case APU_EMMC_BASE:
- dev->ops = &cezanne_emmc_mmio_ops;
- break;
- }
-}
-
-static void enable_dev(struct device *dev)
-{
- /* Set the operations if it is a special bus type */
- switch (dev->path.type) {
- case DEVICE_PATH_DOMAIN:
- dev->ops = &pci_domain_ops;
- break;
- case DEVICE_PATH_CPU_CLUSTER:
- dev->ops = &cpu_bus_ops;
- break;
- case DEVICE_PATH_MMIO:
- set_mmio_dev_ops(dev);
- break;
- default:
- break;
- }
-}
-
static void soc_init(void *chip_info)
{
default_dev_ops_root.write_acpi_tables = agesa_write_acpi_tables;
@@ -101,7 +57,6 @@ static void soc_final(void *chip_info)
struct chip_operations soc_amd_cezanne_ops = {
CHIP_NAME("AMD Cezanne SoC")
- .enable_dev = enable_dev,
.init = soc_init,
.final = soc_final
};
diff --git a/src/soc/amd/cezanne/chipset.cb b/src/soc/amd/cezanne/chipset.cb
index 6ee79ebc9a..3426f4e537 100644
--- a/src/soc/amd/cezanne/chipset.cb
+++ b/src/soc/amd/cezanne/chipset.cb
@@ -1,7 +1,9 @@
chip soc/amd/cezanne
device cpu_cluster 0 on
+ ops cezanne_cpu_bus_ops
end
device domain 0 on
+ ops cezanne_pci_domain_ops
device pci 00.0 alias gnb on end
device pci 00.2 alias iommu off end
@@ -102,11 +104,11 @@ chip soc/amd/cezanne
device pci 18.7 alias data_fabric_7 on end
end
- device mmio 0xfedc2000 alias i2c_0 off end
- device mmio 0xfedc3000 alias i2c_1 off end
- device mmio 0xfedc4000 alias i2c_2 off end
- device mmio 0xfedc5000 alias i2c_3 off end
- device mmio 0xfedc9000 alias uart_0 off end
- device mmio 0xfedca000 alias uart_1 off end
- device mmio 0xfedd5000 alias emmc off end
+ device mmio 0xfedc2000 alias i2c_0 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc3000 alias i2c_1 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc4000 alias i2c_2 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc5000 alias i2c_3 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc9000 alias uart_0 off ops cezanne_uart_mmio_ops end
+ device mmio 0xfedca000 alias uart_1 off ops cezanne_uart_mmio_ops end
+ device mmio 0xfedd5000 alias emmc off ops cezanne_emmc_mmio_ops end
end
diff --git a/src/soc/amd/mendocino/chip.c b/src/soc/amd/mendocino/chip.c
index f71c28586f..99e33ce3e7 100644
--- a/src/soc/amd/mendocino/chip.c
+++ b/src/soc/amd/mendocino/chip.c
@@ -14,15 +14,7 @@
#include <types.h>
#include "chip.h"
-/* Supplied by i2c.c */
-extern struct device_operations soc_amd_i2c_mmio_ops;
-/* Supplied by uart.c */
-extern struct device_operations mendocino_uart_mmio_ops;
-/* Supplied by emmc.c */
-extern struct device_operations mendocino_emmc_mmio_ops;
-
-
-struct device_operations cpu_bus_ops = {
+struct device_operations mendocino_cpu_bus_ops = {
.read_resources = noop_read_resources,
.set_resources = noop_set_resources,
.init = mp_cpu_bus_init,
@@ -42,53 +34,13 @@ static const char *soc_acpi_name(const struct device *dev)
return NULL;
};
-static struct device_operations pci_domain_ops = {
+struct device_operations mendocino_pci_domain_ops = {
.read_resources = pci_domain_read_resources,
.set_resources = pci_domain_set_resources,
.scan_bus = pci_domain_scan_bus,
.acpi_name = soc_acpi_name,
};
-static void set_mmio_dev_ops(struct device *dev)
-{
- switch (dev->path.mmio.addr) {
- case APU_I2C0_BASE:
- case APU_I2C1_BASE:
- case APU_I2C2_BASE:
- case APU_I2C3_BASE:
- dev->ops = &soc_amd_i2c_mmio_ops;
- break;
- case APU_UART0_BASE:
- case APU_UART1_BASE:
- case APU_UART2_BASE:
- case APU_UART3_BASE:
- case APU_UART4_BASE:
- dev->ops = &mendocino_uart_mmio_ops;
- break;
- case APU_EMMC_BASE:
- dev->ops = &mendocino_emmc_mmio_ops;
- break;
- }
-}
-
-static void enable_dev(struct device *dev)
-{
- /* Set the operations if it is a special bus type */
- switch (dev->path.type) {
- case DEVICE_PATH_DOMAIN:
- dev->ops = &pci_domain_ops;
- break;
- case DEVICE_PATH_CPU_CLUSTER:
- dev->ops = &cpu_bus_ops;
- break;
- case DEVICE_PATH_MMIO:
- set_mmio_dev_ops(dev);
- break;
- default:
- break;
- }
-}
-
static void soc_init(void *chip_info)
{
default_dev_ops_root.write_acpi_tables = agesa_write_acpi_tables;
@@ -107,7 +59,6 @@ static void soc_final(void *chip_info)
struct chip_operations soc_amd_mendocino_ops = {
CHIP_NAME("AMD Mendocino SoC")
- .enable_dev = enable_dev,
.init = soc_init,
.final = soc_final
};
diff --git a/src/soc/amd/mendocino/chipset_mendocino.cb b/src/soc/amd/mendocino/chipset_mendocino.cb
index 3a16123fcd..bfdddef733 100644
--- a/src/soc/amd/mendocino/chipset_mendocino.cb
+++ b/src/soc/amd/mendocino/chipset_mendocino.cb
@@ -1,7 +1,9 @@
chip soc/amd/mendocino
device cpu_cluster 0 on
+ ops mendocino_cpu_bus_ops
end
device domain 0 on
+ ops mendocino_pci_domain_ops
device pci 00.0 alias gnb on end
device pci 00.2 alias iommu off end
@@ -80,14 +82,14 @@ chip soc/amd/mendocino
device pci 18.7 alias data_fabric_7 on end
end
- device mmio 0xfedc2000 alias i2c_0 off end
- device mmio 0xfedc3000 alias i2c_1 off end
- device mmio 0xfedc4000 alias i2c_2 off end
- device mmio 0xfedc5000 alias i2c_3 off end
- device mmio 0xfedc9000 alias uart_0 off end
- device mmio 0xfedca000 alias uart_1 off end
- device mmio 0xfedce000 alias uart_2 off end
- device mmio 0xfedcf000 alias uart_3 off end
- device mmio 0xfedd1000 alias uart_4 off end
- device mmio 0xfedd5000 alias emmc off end
+ device mmio 0xfedc2000 alias i2c_0 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc3000 alias i2c_1 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc4000 alias i2c_2 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc5000 alias i2c_3 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc9000 alias uart_0 off ops mendocino_uart_mmio_ops end
+ device mmio 0xfedca000 alias uart_1 off ops mendocino_uart_mmio_ops end
+ device mmio 0xfedce000 alias uart_2 off ops mendocino_uart_mmio_ops end
+ device mmio 0xfedcf000 alias uart_3 off ops mendocino_uart_mmio_ops end
+ device mmio 0xfedd1000 alias uart_4 off ops mendocino_uart_mmio_ops end
+ device mmio 0xfedd5000 alias emmc off ops mendocino_emmc_mmio_ops end
end
diff --git a/src/soc/amd/mendocino/chipset_rembrandt.cb b/src/soc/amd/mendocino/chipset_rembrandt.cb
index 3a16123fcd..bfdddef733 100644
--- a/src/soc/amd/mendocino/chipset_rembrandt.cb
+++ b/src/soc/amd/mendocino/chipset_rembrandt.cb
@@ -1,7 +1,9 @@
chip soc/amd/mendocino
device cpu_cluster 0 on
+ ops mendocino_cpu_bus_ops
end
device domain 0 on
+ ops mendocino_pci_domain_ops
device pci 00.0 alias gnb on end
device pci 00.2 alias iommu off end
@@ -80,14 +82,14 @@ chip soc/amd/mendocino
device pci 18.7 alias data_fabric_7 on end
end
- device mmio 0xfedc2000 alias i2c_0 off end
- device mmio 0xfedc3000 alias i2c_1 off end
- device mmio 0xfedc4000 alias i2c_2 off end
- device mmio 0xfedc5000 alias i2c_3 off end
- device mmio 0xfedc9000 alias uart_0 off end
- device mmio 0xfedca000 alias uart_1 off end
- device mmio 0xfedce000 alias uart_2 off end
- device mmio 0xfedcf000 alias uart_3 off end
- device mmio 0xfedd1000 alias uart_4 off end
- device mmio 0xfedd5000 alias emmc off end
+ device mmio 0xfedc2000 alias i2c_0 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc3000 alias i2c_1 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc4000 alias i2c_2 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc5000 alias i2c_3 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc9000 alias uart_0 off ops mendocino_uart_mmio_ops end
+ device mmio 0xfedca000 alias uart_1 off ops mendocino_uart_mmio_ops end
+ device mmio 0xfedce000 alias uart_2 off ops mendocino_uart_mmio_ops end
+ device mmio 0xfedcf000 alias uart_3 off ops mendocino_uart_mmio_ops end
+ device mmio 0xfedd1000 alias uart_4 off ops mendocino_uart_mmio_ops end
+ device mmio 0xfedd5000 alias emmc off ops mendocino_emmc_mmio_ops end
end
diff --git a/src/soc/amd/morgana/chip.c b/src/soc/amd/morgana/chip.c
index 09f15023d9..086211e2c2 100644
--- a/src/soc/amd/morgana/chip.c
+++ b/src/soc/amd/morgana/chip.c
@@ -14,14 +14,7 @@
#include <types.h>
#include "chip.h"
-/* Supplied by i2c.c */
-extern struct device_operations soc_amd_i2c_mmio_ops;
-/* Supplied by uart.c */
-extern struct device_operations morgana_uart_mmio_ops;
-/* Supplied by emmc.c */
-extern struct device_operations morgana_emmc_mmio_ops;
-
-struct device_operations cpu_bus_ops = {
+struct device_operations morgana_cpu_bus_ops = {
.read_resources = noop_read_resources,
.set_resources = noop_set_resources,
.init = mp_cpu_bus_init,
@@ -41,53 +34,13 @@ static const char *soc_acpi_name(const struct device *dev)
return NULL;
};
-static struct device_operations pci_domain_ops = {
+struct device_operations morgana_pci_domain_ops = {
.read_resources = pci_domain_read_resources,
.set_resources = pci_domain_set_resources,
.scan_bus = pci_domain_scan_bus,
.acpi_name = soc_acpi_name,
};
-static void set_mmio_dev_ops(struct device *dev)
-{
- switch (dev->path.mmio.addr) {
- case APU_I2C0_BASE:
- case APU_I2C1_BASE:
- case APU_I2C2_BASE:
- case APU_I2C3_BASE:
- dev->ops = &soc_amd_i2c_mmio_ops;
- break;
- case APU_UART0_BASE:
- case APU_UART1_BASE:
- case APU_UART2_BASE:
- case APU_UART3_BASE:
- case APU_UART4_BASE:
- dev->ops = &morgana_uart_mmio_ops;
- break;
- case APU_EMMC_BASE:
- dev->ops = &morgana_emmc_mmio_ops;
- break;
- }
-}
-
-static void enable_dev(struct device *dev)
-{
- /* Set the operations if it is a special bus type */
- switch (dev->path.type) {
- case DEVICE_PATH_DOMAIN:
- dev->ops = &pci_domain_ops;
- break;
- case DEVICE_PATH_CPU_CLUSTER:
- dev->ops = &cpu_bus_ops;
- break;
- case DEVICE_PATH_MMIO:
- set_mmio_dev_ops(dev);
- break;
- default:
- break;
- }
-}
-
static void soc_init(void *chip_info)
{
default_dev_ops_root.write_acpi_tables = agesa_write_acpi_tables;
@@ -106,7 +59,6 @@ static void soc_final(void *chip_info)
struct chip_operations soc_amd_morgana_ops = {
CHIP_NAME("AMD Morgana SoC")
- .enable_dev = enable_dev,
.init = soc_init,
.final = soc_final
};
diff --git a/src/soc/amd/morgana/chipset.cb b/src/soc/amd/morgana/chipset.cb
index fe072a217e..75e9778c3e 100644
--- a/src/soc/amd/morgana/chipset.cb
+++ b/src/soc/amd/morgana/chipset.cb
@@ -2,8 +2,10 @@
chip soc/amd/morgana
device cpu_cluster 0 on
+ ops morgana_cpu_bus_ops
end
device domain 0 on
+ ops morgana_pci_domain_ops
device pci 00.0 alias gnb on end
device pci 00.2 alias iommu off end
@@ -82,14 +84,14 @@ chip soc/amd/morgana
device pci 18.7 alias data_fabric_7 on end
end
- device mmio 0xfedc2000 alias i2c_0 off end
- device mmio 0xfedc3000 alias i2c_1 off end
- device mmio 0xfedc4000 alias i2c_2 off end
- device mmio 0xfedc5000 alias i2c_3 off end
- device mmio 0xfedc9000 alias uart_0 off end
- device mmio 0xfedca000 alias uart_1 off end
- device mmio 0xfedce000 alias uart_2 off end
- device mmio 0xfedcf000 alias uart_3 off end
- device mmio 0xfedd1000 alias uart_4 off end
- device mmio 0xfedd5000 alias emmc off end
+ device mmio 0xfedc2000 alias i2c_0 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc3000 alias i2c_1 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc4000 alias i2c_2 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc5000 alias i2c_3 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc9000 alias uart_0 off ops morgana_uart_mmio_ops end
+ device mmio 0xfedca000 alias uart_1 off ops morgana_uart_mmio_ops end
+ device mmio 0xfedce000 alias uart_2 off ops morgana_uart_mmio_ops end
+ device mmio 0xfedcf000 alias uart_3 off ops morgana_uart_mmio_ops end
+ device mmio 0xfedd1000 alias uart_4 off ops morgana_uart_mmio_ops end
+ device mmio 0xfedd5000 alias emmc off ops morgana_emmc_mmio_ops end
end
diff --git a/src/soc/amd/picasso/chip.c b/src/soc/amd/picasso/chip.c
index 6a6c49e28f..37e62e2b8f 100644
--- a/src/soc/amd/picasso/chip.c
+++ b/src/soc/amd/picasso/chip.c
@@ -13,12 +13,7 @@
#include "chip.h"
#include <fsp/api.h>
-/* Supplied by i2c.c */
-extern struct device_operations soc_amd_i2c_mmio_ops;
-/* Supplied by uart.c */
-extern struct device_operations picasso_uart_mmio_ops;
-
-struct device_operations cpu_bus_ops = {
+struct device_operations picasso_cpu_bus_ops = {
.read_resources = noop_read_resources,
.set_resources = noop_set_resources,
.init = mp_cpu_bus_init,
@@ -38,48 +33,13 @@ static const char *soc_acpi_name(const struct device *dev)
return NULL;
};
-static struct device_operations pci_domain_ops = {
+struct device_operations picasso_pci_domain_ops = {
.read_resources = pci_domain_read_resources,
.set_resources = pci_domain_set_resources,
.scan_bus = pci_domain_scan_bus,
.acpi_name = soc_acpi_name,
};
-static void set_mmio_dev_ops(struct device *dev)
-{
- switch (dev->path.mmio.addr) {
- case APU_I2C2_BASE:
- case APU_I2C3_BASE:
- case APU_I2C4_BASE:
- dev->ops = &soc_amd_i2c_mmio_ops;
- break;
- case APU_UART0_BASE:
- case APU_UART1_BASE:
- case APU_UART2_BASE:
- case APU_UART3_BASE:
- dev->ops = &picasso_uart_mmio_ops;
- break;
- }
-}
-
-static void enable_dev(struct device *dev)
-{
- /* Set the operations if it is a special bus type */
- switch (dev->path.type) {
- case DEVICE_PATH_DOMAIN:
- dev->ops = &pci_domain_ops;
- break;
- case DEVICE_PATH_CPU_CLUSTER:
- dev->ops = &cpu_bus_ops;
- break;
- case DEVICE_PATH_MMIO:
- set_mmio_dev_ops(dev);
- break;
- default:
- break;
- }
-}
-
static void soc_init(void *chip_info)
{
default_dev_ops_root.write_acpi_tables = agesa_write_acpi_tables;
@@ -97,7 +57,6 @@ static void soc_final(void *chip_info)
struct chip_operations soc_amd_picasso_ops = {
CHIP_NAME("AMD Picasso SOC")
- .enable_dev = enable_dev,
.init = soc_init,
.final = soc_final
};
diff --git a/src/soc/amd/picasso/chipset.cb b/src/soc/amd/picasso/chipset.cb
index dfa5418198..76953c73ae 100644
--- a/src/soc/amd/picasso/chipset.cb
+++ b/src/soc/amd/picasso/chipset.cb
@@ -2,8 +2,10 @@
chip soc/amd/picasso
device cpu_cluster 0 on
+ ops picasso_cpu_bus_ops
end
device domain 0 on
+ ops picasso_pci_domain_ops
device pci 00.0 alias gnb on end
device pci 00.2 alias iommu off end
device pci 01.0 on end # Dummy Host Bridge, do not disable
@@ -43,10 +45,10 @@ chip soc/amd/picasso
device pci 18.7 alias data_fabric_7 on end
end
- device mmio 0xfedc4000 alias i2c_2 off end
- device mmio 0xfedc5000 alias i2c_3 off end
- device mmio 0xfedc9000 alias uart_0 off end
- device mmio 0xfedca000 alias uart_1 off end
- device mmio 0xfedce000 alias uart_2 off end
- device mmio 0xfedcf000 alias uart_3 off end
+ device mmio 0xfedc4000 alias i2c_2 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc5000 alias i2c_3 off ops soc_amd_i2c_mmio_ops end
+ device mmio 0xfedc9000 alias uart_0 off ops picasso_uart_mmio_ops end
+ device mmio 0xfedca000 alias uart_1 off ops picasso_uart_mmio_ops end
+ device mmio 0xfedce000 alias uart_2 off ops picasso_uart_mmio_ops end
+ device mmio 0xfedcf000 alias uart_3 off ops picasso_uart_mmio_ops end
end
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-22 17:39:57 +0000