| Message ID | 20200218143210.105000-1-wolfgang.wallner@br-automation.com |
|---|---|
| State | Accepted |
| Commit | 5a9d7f9c919d8c9009d5c75a9c2dcdf5214a4589 |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | x86: p2sb: Drop 'apl' prefix | expand |
On Tue, 18 Feb 2020 at 07:32, Wolfgang Wallner <wolfgang.wallner@br-automation.com> wrote: > > Drop the Apollo Lake prefix 'apl' from the functions, types and > variables in the P2SB driver. > > The P2SB is not Apollo Lake specific, and as such it was moved in > commit 2999846c1127 ("x86: Move P2SB from Apollo Lake to a more generic > location") from the Apollo Lake folder to the intel_common folder. > > Signed-off-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com> > > --- > This patch follows a similar rational for P2SB as commit 03fe85a27b23 > ("x86: itss: Remove apl-prefix") for the ITSS. > > arch/x86/cpu/intel_common/p2sb.c | 30 +++++++++---------- > arch/x86/dts/chromebook_coral.dts | 2 +- > .../gpio/intel,apl-gpio.txt | 2 +- > .../pinctrl/intel,apl-pinctrl.txt | 2 +- > 4 files changed, 18 insertions(+), 18 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Tue, Feb 18, 2020 at 10:32 PM Wolfgang Wallner <wolfgang.wallner@br-automation.com> wrote: > > Drop the Apollo Lake prefix 'apl' from the functions, types and > variables in the P2SB driver. > > The P2SB is not Apollo Lake specific, and as such it was moved in > commit 2999846c1127 ("x86: Move P2SB from Apollo Lake to a more generic > location") from the Apollo Lake folder to the intel_common folder. > > Signed-off-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com> > > --- > This patch follows a similar rational for P2SB as commit 03fe85a27b23 > ("x86: itss: Remove apl-prefix") for the ITSS. > > arch/x86/cpu/intel_common/p2sb.c | 30 +++++++++---------- > arch/x86/dts/chromebook_coral.dts | 2 +- > .../gpio/intel,apl-gpio.txt | 2 +- > .../pinctrl/intel,apl-pinctrl.txt | 2 +- > 4 files changed, 18 insertions(+), 18 deletions(-) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
On Thu, Feb 27, 2020 at 5:40 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > On Tue, Feb 18, 2020 at 10:32 PM Wolfgang Wallner > <wolfgang.wallner@br-automation.com> wrote: > > > > Drop the Apollo Lake prefix 'apl' from the functions, types and > > variables in the P2SB driver. > > > > The P2SB is not Apollo Lake specific, and as such it was moved in > > commit 2999846c1127 ("x86: Move P2SB from Apollo Lake to a more generic > > location") from the Apollo Lake folder to the intel_common folder. > > > > Signed-off-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com> > > > > --- > > This patch follows a similar rational for P2SB as commit 03fe85a27b23 > > ("x86: itss: Remove apl-prefix") for the ITSS. > > > > arch/x86/cpu/intel_common/p2sb.c | 30 +++++++++---------- > > arch/x86/dts/chromebook_coral.dts | 2 +- > > .../gpio/intel,apl-gpio.txt | 2 +- > > .../pinctrl/intel,apl-pinctrl.txt | 2 +- > > 4 files changed, 18 insertions(+), 18 deletions(-) > > > > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> applied to u-boot-x86, thanks!
diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c index b72f50a627..d5b4846e0a 100644 --- a/arch/x86/cpu/intel_common/p2sb.c +++ b/arch/x86/cpu/intel_common/p2sb.c @@ -16,7 +16,7 @@ struct p2sb_platdata { #if CONFIG_IS_ENABLED(OF_PLATDATA) - struct dtd_intel_apl_p2sb dtplat; + struct dtd_intel_p2sb dtplat; #endif ulong mmio_base; pci_dev_t bdf; @@ -43,14 +43,14 @@ struct p2sb_platdata { #define P2SB_HPTC_ADDRESS_SELECT_3 (3 << 0) /* - * apl_p2sb_early_init() - Enable decoding for HPET range + * p2sb_early_init() - Enable decoding for HPET range * * This is needed by FSP-M which uses the High Precision Event Timer. * * @dev: P2SB device * @return 0 if OK, -ve on error */ -static int apl_p2sb_early_init(struct udevice *dev) +static int p2sb_early_init(struct udevice *dev) { struct p2sb_platdata *plat = dev_get_platdata(dev); pci_dev_t pdev = plat->bdf; @@ -76,7 +76,7 @@ static int apl_p2sb_early_init(struct udevice *dev) return 0; } -static int apl_p2sb_spl_init(struct udevice *dev) +static int p2sb_spl_init(struct udevice *dev) { /* Enable decoding for HPET. Needed for FSP global pointer storage */ dm_pci_write_config(dev, P2SB_HPTC, P2SB_HPTC_ADDRESS_SELECT_0 | @@ -85,7 +85,7 @@ static int apl_p2sb_spl_init(struct udevice *dev) return 0; } -int apl_p2sb_ofdata_to_platdata(struct udevice *dev) +int p2sb_ofdata_to_platdata(struct udevice *dev) { struct p2sb_uc_priv *upriv = dev_get_uclass_priv(dev); struct p2sb_platdata *plat = dev_get_platdata(dev); @@ -117,10 +117,10 @@ int apl_p2sb_ofdata_to_platdata(struct udevice *dev) return 0; } -static int apl_p2sb_probe(struct udevice *dev) +static int p2sb_probe(struct udevice *dev) { if (spl_phase() == PHASE_TPL) { - return apl_p2sb_early_init(dev); + return p2sb_early_init(dev); } else { struct p2sb_platdata *plat = dev_get_platdata(dev); @@ -130,7 +130,7 @@ static int apl_p2sb_probe(struct udevice *dev) return -EINVAL; if (spl_phase() == PHASE_SPL) - return apl_p2sb_spl_init(dev); + return p2sb_spl_init(dev); } return 0; @@ -152,17 +152,17 @@ static int p2sb_child_post_bind(struct udevice *dev) return 0; } -static const struct udevice_id apl_p2sb_ids[] = { - { .compatible = "intel,apl-p2sb" }, +static const struct udevice_id p2sb_ids[] = { + { .compatible = "intel,p2sb" }, { } }; -U_BOOT_DRIVER(apl_p2sb_drv) = { - .name = "intel_apl_p2sb", +U_BOOT_DRIVER(p2sb_drv) = { + .name = "intel_p2sb", .id = UCLASS_P2SB, - .of_match = apl_p2sb_ids, - .probe = apl_p2sb_probe, - .ofdata_to_platdata = apl_p2sb_ofdata_to_platdata, + .of_match = p2sb_ids, + .probe = p2sb_probe, + .ofdata_to_platdata = p2sb_ofdata_to_platdata, .platdata_auto_alloc_size = sizeof(struct p2sb_platdata), .per_child_platdata_auto_alloc_size = sizeof(struct p2sb_child_platdata), diff --git a/arch/x86/dts/chromebook_coral.dts b/arch/x86/dts/chromebook_coral.dts index 44a4619a66..af52e11c89 100644 --- a/arch/x86/dts/chromebook_coral.dts +++ b/arch/x86/dts/chromebook_coral.dts @@ -136,7 +136,7 @@ p2sb: p2sb@d,0 { u-boot,dm-pre-reloc; reg = <0x02006810 0 0 0 0>; - compatible = "intel,apl-p2sb"; + compatible = "intel,p2sb"; early-regs = <IOMAP_P2SB_BAR 0x100000>; n { diff --git a/doc/device-tree-bindings/gpio/intel,apl-gpio.txt b/doc/device-tree-bindings/gpio/intel,apl-gpio.txt index e27a40b437..cf0659b70e 100644 --- a/doc/device-tree-bindings/gpio/intel,apl-gpio.txt +++ b/doc/device-tree-bindings/gpio/intel,apl-gpio.txt @@ -23,7 +23,7 @@ Example: { p2sb: p2sb@d,0 { reg = <0x02006810 0 0 0 0>; - compatible = "intel,apl-p2sb"; + compatible = "intel,p2sb"; early-regs = <IOMAP_P2SB_BAR 0x100000>; north { diff --git a/doc/device-tree-bindings/pinctrl/intel,apl-pinctrl.txt b/doc/device-tree-bindings/pinctrl/intel,apl-pinctrl.txt index cd7f8a0ca3..12ec846107 100644 --- a/doc/device-tree-bindings/pinctrl/intel,apl-pinctrl.txt +++ b/doc/device-tree-bindings/pinctrl/intel,apl-pinctrl.txt @@ -23,7 +23,7 @@ Example: { p2sb: p2sb@d,0 { reg = <0x02006810 0 0 0 0>; - compatible = "intel,apl-p2sb"; + compatible = "intel,p2sb"; early-regs = <IOMAP_P2SB_BAR 0x100000>; n {
Drop the Apollo Lake prefix 'apl' from the functions, types and variables in the P2SB driver. The P2SB is not Apollo Lake specific, and as such it was moved in commit 2999846c1127 ("x86: Move P2SB from Apollo Lake to a more generic location") from the Apollo Lake folder to the intel_common folder. Signed-off-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com> --- This patch follows a similar rational for P2SB as commit 03fe85a27b23 ("x86: itss: Remove apl-prefix") for the ITSS. arch/x86/cpu/intel_common/p2sb.c | 30 +++++++++---------- arch/x86/dts/chromebook_coral.dts | 2 +- .../gpio/intel,apl-gpio.txt | 2 +- .../pinctrl/intel,apl-pinctrl.txt | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-)