| Message ID | 20210114131622.8951-4-chiawei_wang@aspeedtech.com |
|---|---|
| State | New |
| Headers | show |
| Series | Remove LPC register partitioning | expand |
On Thu, 14 Jan 2021, at 23:46, Chia-Wei, Wang wrote: > Add check against LPC device v2 compatible string to > ensure that the fixed device tree layout is adopted. > The LPC register offsets are also fixed accordingly. > > Signed-off-by: Chia-Wei, Wang <chiawei_wang@aspeedtech.com> > Acked-by: Haiyue Wang <haiyue.wang@linux.intel.com> Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Hi Corey, Could you help to review this patch to kcs_bmc_aspeed.c? It mainly fixes the register layout/offsets of Aspeed LPC controller. Thanks, Chiawei > -----Original Message----- > From: Andrew Jeffery <andrew@aj.id.au> > Sent: Wednesday, January 20, 2021 1:03 PM > Subject: Re: [PATCH v5 3/5] ipmi: kcs: aspeed: Adapt to new LPC DTS layout > > > > On Thu, 14 Jan 2021, at 23:46, Chia-Wei, Wang wrote: > > Add check against LPC device v2 compatible string to ensure that the > > fixed device tree layout is adopted. > > The LPC register offsets are also fixed accordingly. > > > > Signed-off-by: Chia-Wei, Wang <chiawei_wang@aspeedtech.com> > > Acked-by: Haiyue Wang <haiyue.wang@linux.intel.com> > > Reviewed-by: Andrew Jeffery <andrew@aj.id.au> Thanks for the review.
On Fri, Jan 22, 2021 at 09:55:56AM +0000, ChiaWei Wang wrote: > Hi Corey, > > Could you help to review this patch to kcs_bmc_aspeed.c? > It mainly fixes the register layout/offsets of Aspeed LPC controller. I am not really qualified to review this. It looks ok from a structural and style point of view, but that's all I can tell. So I'm ok with it. Acked-by: Corey Minyard <cminyard@mvista.com> > > Thanks, > Chiawei > > > -----Original Message----- > > From: Andrew Jeffery <andrew@aj.id.au> > > Sent: Wednesday, January 20, 2021 1:03 PM > > Subject: Re: [PATCH v5 3/5] ipmi: kcs: aspeed: Adapt to new LPC DTS layout > > > > > > > > On Thu, 14 Jan 2021, at 23:46, Chia-Wei, Wang wrote: > > > Add check against LPC device v2 compatible string to ensure that the > > > fixed device tree layout is adopted. > > > The LPC register offsets are also fixed accordingly. > > > > > > Signed-off-by: Chia-Wei, Wang <chiawei_wang@aspeedtech.com> > > > Acked-by: Haiyue Wang <haiyue.wang@linux.intel.com> > > > > Reviewed-by: Andrew Jeffery <andrew@aj.id.au> > > Thanks for the review.
diff --git a/drivers/char/ipmi/kcs_bmc_aspeed.c b/drivers/char/ipmi/kcs_bmc_aspeed.c index a140203c079b..eefe362f65f0 100644 --- a/drivers/char/ipmi/kcs_bmc_aspeed.c +++ b/drivers/char/ipmi/kcs_bmc_aspeed.c @@ -27,7 +27,6 @@ #define KCS_CHANNEL_MAX 4 -/* mapped to lpc-bmc@0 IO space */ #define LPC_HICR0 0x000 #define LPC_HICR0_LPC3E BIT(7) #define LPC_HICR0_LPC2E BIT(6) @@ -52,15 +51,13 @@ #define LPC_STR1 0x03C #define LPC_STR2 0x040 #define LPC_STR3 0x044 - -/* mapped to lpc-host@80 IO space */ -#define LPC_HICRB 0x080 +#define LPC_HICRB 0x100 #define LPC_HICRB_IBFIF4 BIT(1) #define LPC_HICRB_LPC4E BIT(0) -#define LPC_LADR4 0x090 -#define LPC_IDR4 0x094 -#define LPC_ODR4 0x098 -#define LPC_STR4 0x09C +#define LPC_LADR4 0x110 +#define LPC_IDR4 0x114 +#define LPC_ODR4 0x118 +#define LPC_STR4 0x11C struct aspeed_kcs_bmc { struct regmap *map; @@ -348,12 +345,20 @@ static int aspeed_kcs_probe(struct platform_device *pdev) struct device_node *np; int rc; - np = pdev->dev.of_node; + np = dev->of_node->parent; + if (!of_device_is_compatible(np, "aspeed,ast2400-lpc-v2") && + !of_device_is_compatible(np, "aspeed,ast2500-lpc-v2") && + !of_device_is_compatible(np, "aspeed,ast2600-lpc-v2")) { + dev_err(dev, "unsupported LPC device binding\n"); + return -ENODEV; + } + + np = dev->of_node; if (of_device_is_compatible(np, "aspeed,ast2400-kcs-bmc") || - of_device_is_compatible(np, "aspeed,ast2500-kcs-bmc")) + of_device_is_compatible(np, "aspeed,ast2500-kcs-bmc")) kcs_bmc = aspeed_kcs_probe_of_v1(pdev); else if (of_device_is_compatible(np, "aspeed,ast2400-kcs-bmc-v2") || - of_device_is_compatible(np, "aspeed,ast2500-kcs-bmc-v2")) + of_device_is_compatible(np, "aspeed,ast2500-kcs-bmc-v2")) kcs_bmc = aspeed_kcs_probe_of_v2(pdev); else return -EINVAL;