Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert class names of pib and fsi targets for odyssey chips #83

Closed
wants to merge 1 commit into from
Closed

Revert class names of pib and fsi targets for odyssey chips #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bmc-kernel.dts.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ define(`PIB_ODY',
#address-cells = <0x2>;
#size-cells = <0x1>;
reg = <0x0 0x$1 0x8000>; /*dummy to fix dts warning*/
compatible = "ibm,kernel-pib-ody";
compatible = "ibm,kernel-pib";
index = <0x$1>;
proc = <0x$2>;
port = <$4>;
Expand Down Expand Up @@ -146,7 +146,7 @@ define(`HMFSI_ODY',
hmfsi-ody@$3$4 {
#address-cells = <0x2>;
#size-cells = <0x1>;
compatible = "ibm,kernel-fsi-ody";
compatible = "ibm,kernel-fsi";
device-path = "/i2cr$3$4/slave@00:00/raw";
reg = <0x0 0x$1 0x8000>; /*dummy to fix dts warning*/
index = <0x$1>;
Expand Down
28 changes: 0 additions & 28 deletions libpdbg/kernel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,20 +214,6 @@ static struct fsi kernel_fsi = {
};
DECLARE_HW_UNIT(kernel_fsi);

static struct fsi kernel_fsi_ody = {
.target = {
.name = "Kernel based FSI master for odyssey",
.compatible = "ibm,kernel-fsi-ody",
.class = "fsi-ody",
.probe = kernel_fsi_probe,
.release = kernel_fsi_release,
},
.read = kernel_fsi_getcfam,
.write = kernel_fsi_putcfam,
};
DECLARE_HW_UNIT(kernel_fsi_ody);


static int kernel_pib_getscom(struct pib *pib, uint64_t addr, uint64_t *value)
{
int rc;
Expand Down Expand Up @@ -284,24 +270,10 @@ struct pib kernel_pib = {
};
DECLARE_HW_UNIT(kernel_pib);

struct pib kernel_pib_ody = {
.target = {
.name = "Kernel based FSI SCOM for odyssey",
.compatible = "ibm,kernel-pib-ody",
.class = "pib-ody",
.probe = kernel_pib_probe,
},
.read = kernel_pib_getscom,
.write = kernel_pib_putscom,
};
DECLARE_HW_UNIT(kernel_pib_ody);


__attribute__((constructor))
static void register_kernel(void)
{
pdbg_hwunit_register(PDBG_DEFAULT_BACKEND, &kernel_fsi_hw_unit);
pdbg_hwunit_register(PDBG_DEFAULT_BACKEND, &kernel_fsi_ody_hw_unit);
pdbg_hwunit_register(PDBG_DEFAULT_BACKEND, &kernel_pib_hw_unit);
pdbg_hwunit_register(PDBG_DEFAULT_BACKEND, &kernel_pib_ody_hw_unit);
}
4 changes: 2 additions & 2 deletions libpdbg/target.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,12 +865,12 @@ struct chipop_ody *ody_ocmb_to_chipop(struct pdbg_target *target)

struct pdbg_target* get_ody_pib_target(struct pdbg_target *target)
{
return get_backend_target("pib-ody", target);
return get_backend_target("pib", target);
}

struct pdbg_target* get_ody_fsi_target(struct pdbg_target *target)
{
return get_backend_target("fsi-ody", target);
return get_backend_target("fsi", target);
}

struct pdbg_target* get_ody_chipop_target(struct pdbg_target *target)
Expand Down
Loading