diff --git a/openpower/package/pdata/0001-Added-backward-support-to-pdbg-compatible-property.patch b/openpower/package/pdata/0001-Added-backward-support-to-pdbg-compatible-property.patch
deleted file mode 100644
index 71ff7cb..0000000
--- a/openpower/package/pdata/0001-Added-backward-support-to-pdbg-compatible-property.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Ramesh Iyyar <rameshi1@in.ibm.com>
-Date: Tue, 16 Jun 2020 10:28:06 -0500
-Subject: [PATCH] data/p10: Added backward support to pdbg compatible property
-
-The op-build ci will use released version of openbmc image and this image
-have pdbg library which is used p9 compatible property so, when using
-p10 targets compatible property value in generated device tree with that
-library, ipling is failing at 3.22 with following trace
-"No functional MC unit target found on master chip" at sbe side.
-So, added p9 targets compatible property value to support previous released
-version of bmc image.
-
-To use updated pdbg version in bmc, bmc will expect respective device tree
-and the device tree is one of partition in pnor image and this image will
-build in op-build so, there is cyclic dependency between bmc and pnor image
-to release. To avoid cyclic dependency in image added backward support.
-
-Once bmc image released with updated pdbg version to support
-p10 targets compatible property value then this patch should reverted.
-
-Signed-off-by: Ramesh Iyyar <rameshi1@in.ibm.com>
----
- data/p10/pdbg_compatible_propMapping.lsv | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/data/p10/pdbg_compatible_propMapping.lsv b/data/p10/pdbg_compatible_propMapping.lsv
-index f4325c6..72cf0b0 100644
---- a/data/p10/pdbg_compatible_propMapping.lsv
-+++ b/data/p10/pdbg_compatible_propMapping.lsv
-@@ -1,17 +1,17 @@
- # Targets pdbg mapping info
- # Format : MRWTargetType:PdbgCompatiblePropValue
--unit-eq-power10:ibm,power10-eq
--unit-fc-power10:ibm,power10-fc
--unit-core-power10:ibm,power10-core
--unit-perv-power10:ibm,power10-chiplet
--unit-pauc-power10:ibm,power10-pauc
--unit-pec-power10:ibm,power10-pec
--unit-phb-power10:ibm,power10-phb
--unit-nmmu-power10:ibm,power10-nmmu
--unit-iohs-power10:ibm,power10-iohs
--unit-pau-power10:ibm,power10-pau
--unit-mc-power10:ibm,power10-mc
--unit-mi-power10:ibm,power10-mi
-+unit-eq-power10:"ibm,power10-eq", "ibm,power9-eq"
-+unit-fc-power10:"ibm,power10-fc", "ibm,power9-fc"
-+unit-core-power10:"ibm,power10-core", "ibm,power9-core"
-+unit-perv-power10:"ibm,power10-chiplet", "ibm,power9-chiplet"
-+unit-pauc-power10:"ibm,power10-pauc", "ibm,power9-pauc"
-+unit-pec-power10:"ibm,power10-pec", "ibm,power9-pec"
-+unit-phb-power10:"ibm,power10-phb", "ibm,power9-phb"
-+unit-nmmu-power10:"ibm,power10-nmmu", "ibm,power9-nmmu"
-+unit-iohs-power10:"ibm,power10-iohs", "ibm,power9-iohs"
-+unit-pau-power10:"ibm,power10-pau", "ibm,power9-pau"
-+unit-mc-power10:"ibm,power10-mc", "ibm,power9-mc"
-+unit-mi-power10:"ibm,power10-mi", "ibm,power9-mi"
- chip-processor-power10:"ibm,power-proc", "ibm,power10-proc", "ibm,processor"
- unit-mcc-power10:ibm,power10-mcc
- unit-omic-power10:ibm,power10-omic
--- 
-1.8.3.1
-
diff --git a/openpower/package/pdata/Config.in b/openpower/package/pdata/Config.in
index a557ef0..1100a17 100644
--- a/openpower/package/pdata/Config.in
+++ b/openpower/package/pdata/Config.in
@@ -32,7 +32,7 @@
 
 config BR2_PDATA_VERSION
     string
-    default "f35110ea6e3b91ac67b9d1910de999a83f0f0ac4" if BR2_PDATA_LATEST_VERSION
+    default "6c37e31b74c6a6e159c25d2c06562c9e50cf0a1c" if BR2_PDATA_LATEST_VERSION
     default BR2_PDATA_CUSTOM_VERSION_VALUE if BR2_PDATA_CUSTOM_VERSION
 
 endif
diff --git a/openpower/package/pdata/pdata.mk b/openpower/package/pdata/pdata.mk
index 0cb3546..b354c8e 100644
--- a/openpower/package/pdata/pdata.mk
+++ b/openpower/package/pdata/pdata.mk
@@ -29,7 +29,9 @@
 
 QSTRIP_MACHINE_XML = $(call qstrip,$(BR2_OPENPOWER_MACHINE_XML_FILENAME))
 
-PDATA_CONF_OPTS = --enable-gen_dynamicdt
+PDATA_CONF_OPTS = --enable-gen_dynamicdt \
+                  CHIP=$(TARGET_PROC) \
+
 PDATA_MAKE_OPTS =  SYSTEM_NAME=$(call qstrip,$(BR2_OPENPOWER_CONFIG_NAME)) \
 				   TARGET_PROC=$(TARGET_PROC) \
 				   EKB=$(EKB_STAGING_DIR) \