x86: p2sb: Drop 'apl' prefix

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>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c
index b72f50a6274dc17ff9e1df4ebc3ba49d2a191dcf..d5b4846e0a20e108f77d2c513fc6496ddc50f96c 100644 (file)
--- 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 44a4619a6694e86b84993dfbc6401b23538ab5d8..af52e11c89a6d58006a0f546e252bb5be8595142 100644 (file)
--- 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 e27a40b4374c74690ac8fbe280274d9d82de3a44..cf0659b70ec9bed72aa9ad563c29352d27849339 100644 (file)
--- 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 cd7f8a0ca38059243fbf9a3d09558b0de88fcd32..12ec8461073527768084775575f7fa6de24b6fe5 100644 (file)
--- 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 {