Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
soc/tegra: cbb: Update slave maps for Tegra234
Updating the slave map for fabrics and using the same maps for DCE, RCE
and SCE as they all are a replica in Tegra234.
Signed-off-by: Sumit Gupta <sumitg@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
authored by
Sumit Gupta
and committed by
Thierry Reding
cd1d719b
33af51a6
+13
-21
+13
-21
drivers/soc/tegra/cbb/tegra234-cbb.c
+13
-21
drivers/soc/tegra/cbb/tegra234-cbb.c
···
516
516
u32 status = tegra_cbb_get_status(cbb);
517
517
518
518
if (status && (irq == priv->sec_irq)) {
519
-
tegra_cbb_print_err(NULL, "CPU:%d, Error: %s@%llx, irq=%d\n",
519
+
tegra_cbb_print_err(NULL, "CPU:%d, Error: %s@0x%llx, irq=%d\n",
520
520
smp_processor_id(), priv->fabric->name,
521
521
priv->res->start, irq);
522
522
···
732
732
.off_mask_erd = 0x3a004
733
733
};
734
734
735
-
static const struct tegra234_slave_lookup tegra234_dce_slave_map[] = {
735
+
static const struct tegra234_slave_lookup tegra234_common_slave_map[] = {
736
736
{ "AXI2APB", 0x00000 },
737
737
{ "AST0", 0x15000 },
738
738
{ "AST1", 0x16000 },
739
+
{ "CBB", 0x17000 },
740
+
{ "RSVD", 0x00000 },
739
741
{ "CPU", 0x18000 },
740
742
};
741
743
742
744
static const struct tegra234_cbb_fabric tegra234_dce_fabric = {
743
745
.name = "dce-fabric",
744
746
.master_id = tegra234_master_id,
745
-
.slave_map = tegra234_dce_slave_map,
747
+
.slave_map = tegra234_common_slave_map,
746
748
.errors = tegra234_cbb_errors,
747
749
.notifier_offset = 0x19000,
748
-
};
749
-
750
-
static const struct tegra234_slave_lookup tegra234_rce_slave_map[] = {
751
-
{ "AXI2APB", 0x00000 },
752
-
{ "AST0", 0x15000 },
753
-
{ "AST1", 0x16000 },
754
-
{ "CPU", 0x18000 },
755
750
};
756
751
757
752
static const struct tegra234_cbb_fabric tegra234_rce_fabric = {
758
753
.name = "rce-fabric",
759
754
.master_id = tegra234_master_id,
760
-
.slave_map = tegra234_rce_slave_map,
755
+
.slave_map = tegra234_common_slave_map,
761
756
.errors = tegra234_cbb_errors,
762
757
.notifier_offset = 0x19000,
763
-
};
764
-
765
-
static const struct tegra234_slave_lookup tegra234_sce_slave_map[] = {
766
-
{ "AXI2APB", 0x00000 },
767
-
{ "AST0", 0x15000 },
768
-
{ "AST1", 0x16000 },
769
-
{ "CBB", 0x17000 },
770
-
{ "CPU", 0x18000 },
771
758
};
772
759
773
760
static const struct tegra234_cbb_fabric tegra234_sce_fabric = {
774
761
.name = "sce-fabric",
775
762
.master_id = tegra234_master_id,
776
-
.slave_map = tegra234_sce_slave_map,
763
+
.slave_map = tegra234_common_slave_map,
777
764
.errors = tegra234_cbb_errors,
778
765
.notifier_offset = 0x19000,
779
766
};
···
875
888
};
876
889
877
890
static const struct tegra234_slave_lookup tegra241_cbb_slave_map[] = {
878
-
{ "CCPLEX", 0x50000 },
891
+
{ "RSVD", 0x00000 },
879
892
{ "PCIE_C8", 0x51000 },
880
893
{ "PCIE_C9", 0x52000 },
881
894
{ "RSVD", 0x00000 },
···
928
941
{ "PCIE_C3", 0x58000 },
929
942
{ "PCIE_C0", 0x59000 },
930
943
{ "PCIE_C1", 0x5a000 },
944
+
{ "CCPLEX", 0x50000 },
931
945
{ "AXI2APB_29", 0x85000 },
932
946
{ "AXI2APB_30", 0x86000 },
947
+
{ "CBB_CENTRAL", 0x00000 },
948
+
{ "AXI2APB_31", 0x8E000 },
949
+
{ "AXI2APB_32", 0x8F000 },
933
950
};
934
951
935
952
static const struct tegra234_cbb_fabric tegra241_cbb_fabric = {
···
946
955
};
947
956
948
957
static const struct tegra234_slave_lookup tegra241_bpmp_slave_map[] = {
958
+
{ "RSVD", 0x00000 },
949
959
{ "RSVD", 0x00000 },
950
960
{ "RSVD", 0x00000 },
951
961
{ "CBB", 0x15000 },