diff mbox series

[linux,dev-4.18] ARM: dts: Add OCC description to Power9 dtsi

Message ID 20180903051913.25145-1-joel@jms.id.au
State Accepted, archived
Headers show
Series [linux,dev-4.18] ARM: dts: Add OCC description to Power9 dtsi | expand

Commit Message

Joel Stanley Sept. 3, 2018, 5:19 a.m. UTC 
These are not in the upstream submission. They are required for the out
of tree OCC HWMON driver.

Signed-off-by: Joel Stanley <joel@jms.id.au>
---
 arch/arm/boot/dts/ibm-power9-cfam.dtsi | 6 ++++++
 arch/arm/boot/dts/ibm-power9-dual.dtsi | 9 +++++++++
 2 files changed, 15 insertions(+)
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/ibm-power9-cfam.dtsi b/arch/arm/boot/dts/ibm-power9-cfam.dtsi
index 5bda517f93cc..945e57993e27 100644
--- a/arch/arm/boot/dts/ibm-power9-cfam.dtsi
+++ b/arch/arm/boot/dts/ibm-power9-cfam.dtsi
@@ -4,6 +4,7 @@ 
 #define __MAKE_LABEL(p,i)	p##i
 #define _MAKE_LABEL(p,i)	__MAKE_LABEL(p,i)
 #define HUB_LABEL		_MAKE_LABEL(fsi_hub,CFAM_CHIP_ID)
+#define OCC_LABEL		_MAKE_LABEL(fsi_occ,CFAM_CHIP_ID)
 #define I2C_LABEL(n)		_MAKE_LABEL(_MAKE_LABEL(cfam,CFAM_CHIP_ID),_i2c##n)
 
 #address-cells = <1>;
@@ -87,6 +88,10 @@  sbefifo@2400 {
 	reg = <0x2400 0x400>;
 	#address-cells = <1>;
 	#size-cells = <0>;
+
+	OCC_LABEL: occ {
+		compatible = "ibm,p9-occ";
+	};
 };
 
 HUB_LABEL: hub@3400 {
@@ -101,4 +106,5 @@  HUB_LABEL: hub@3400 {
 #undef __MAKE_LABEL
 #undef _MAKE_LABEL
 #undef HUB_LABEL
+#undef OCC_LABEL
 #undef I2C_LABEL
diff --git a/arch/arm/boot/dts/ibm-power9-dual.dtsi b/arch/arm/boot/dts/ibm-power9-dual.dtsi
index 8807c1106566..d66c97a84b33 100644
--- a/arch/arm/boot/dts/ibm-power9-dual.dtsi
+++ b/arch/arm/boot/dts/ibm-power9-dual.dtsi
@@ -21,6 +21,15 @@ 
 };
 #undef CFAM_CHIP_ID
 
+/* Legacy OCC numbering (to get rid of when userspace is fixed) */
+&fsi_occ0 {
+	reg = <1>;
+};
+
+&fsi_occ1 {
+	reg = <2>;
+};
+
 / {
 	aliases {
 		i2c100 = &cfam0_i2c0;