Skip to contentSkip to conversation

Minor NPCM7xx modifications to dev-5.8

PATCH In review Tomer Maimon 2 participants 8 messages Jan 19, 2021 – Jan 20, 2021

Subsystems (3)
lore
Share & tools
lore

Tomer Maimon

author maintainer
#0 lore raw

cover Minor NPCM7xx modifications to dev-5.8

Minor NPCM7xx modifications to the latest patches
that been pushed to dev-5.8.

Tomer Maimon (4):
arm: dts: npcm7xx: Add syscon property
arm: dts: npcm7xx: modify PECI node.
arm: dts: Olympus: Enable PECI dimm temperature
watchdog: npcm: Modify get reset status function

 arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi        | 9 ++++++---
 arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus.dts | 2 ++
 drivers/watchdog/npcm_wdt.c                          | 4 +++-
 3 files changed, 11 insertions(+), 4 deletions(-)
Signature · 1 line
2.22.0
author maintainer
#1 lore raw

PATCH 1/4 arm: dts: npcm7xx: Add syscon property

Add syscon property to ADC and watchdog nodes.

---
 arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi +5 -1
index 455a96b23b85..448cfc9d4ae1 100644
@@ -82,7 +82,7 @@
 			"simple-mfd";
 			reg = <0x801000 0x6C>;
 		};
-		
+
 		fuse:fuse@18a000 {
 			compatible = "nuvoton,npcm750-fuse", "syscon",
 				"simple-mfd";
@@ -425,6 +425,7 @@
 				reg = <0x801C 0x4>;
 				status = "disabled";
 				clocks = <&clk NPCM7XX_CLK_TIMER>;
+				syscon = <&gcr>;
 			};
 
 			watchdog1: watchdog@901C {
@@ -433,6 +434,7 @@
 				reg = <0x901C 0x4>;
 				status = "disabled";
 				clocks = <&clk NPCM7XX_CLK_TIMER>;
+				syscon = <&gcr>;
 			};
 
 			watchdog2: watchdog@a01C {
@@ -441,6 +443,7 @@
 				reg = <0xa01C 0x4>;
 				status = "disabled";
 				clocks = <&clk NPCM7XX_CLK_TIMER>;
+				syscon = <&gcr>;
 			};
 
 			serial0: serial@1000 {
@@ -493,6 +496,7 @@
 				interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clk NPCM7XX_CLK_ADC>;
 				resets = <&rstc NPCM7XX_RESET_IPSRST1 NPCM7XX_RESET_ADC>;
+				syscon = <&fuse>;
 				status = "disabled";
 			};
 
Signature · 1 line
2.22.0
author maintainer
#2 lore raw

PATCH 2/4 arm: dts: npcm7xx: modify PECI node.

In reply to Tomer Maimon

Modify PECI compatible property and remove reg property.

---
 arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi +1 -2
index 448cfc9d4ae1..f4794b59fa55 100644
@@ -367,8 +367,7 @@
 			};
 
 			peci: peci-bus@100000 {
-				compatible = "nuvoton,npcm750-peci";
-				reg = <0x100000 0x200>;
+				compatible = "simple-bus";
 				#address-cells = <1>;
 				#size-cells = <1>;
 				ranges = <0x0 0x100000 0x200>;
Signature · 1 line
2.22.0
author maintainer
#3 lore raw

PATCH 3/4 arm: dts: Olympus: Enable PECI dimm temperature

In reply to Tomer Maimon

Enable PECI dimm temperature nodes in Olympus
Quanta machine.

---
 arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus.dts | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus.dts +2 -0
index 1692bb7314c5..de34c9b2ff2c 100644
@@ -910,10 +910,12 @@
 	intel-peci-dimmtemp@30 {
 		compatible = "intel,peci-client";
 		reg = <0x30>;
+		status = "okay";
 	};
 	intel-peci-dimmtemp@31 {
 		compatible = "intel,peci-client";
 		reg = <0x31>;
+		status = "okay";
 	};
 };
 
Signature · 1 line
2.22.0
#4 lore raw

Re: [PATCH linux dev-5.8 v1 3/4] arm: dts: Olympus: Enable PECI dimm temperature

Quoted 14 lines · Tomer Maimon

Enable PECI dimm temperature nodes in Olympus
Quanta machine.

---
 arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus.dts | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus.dts +0 -0
index 1692bb7314c5..de34c9b2ff2c 100644

arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus.dts line 913

Quoted 4 lines
arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus.dts +1 -0
@@ -910,10 +910,12 @@
        intel-peci-dimmtemp@30 {
                compatible = "intel,peci-client";
                reg = <0x30>;
+               status = "okay";

Nodes are enabled by default, you shouldn't need to add "okay" for it to work. Can you confirm it works without adding this?

Quoted 11 lines
arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus.dts +1 -1
        };
        intel-peci-dimmtemp@31 {
                compatible = "intel,peci-client";
                reg = <0x31>;
+               status = "okay";
        };
 };
 
--

2.22.0

author maintainer
#5 lore raw

Re: [PATCH linux dev-5.8 v1 3/4] arm: dts: Olympus: Enable PECI dimm temperature

Quoted 24 lines · Joel Stanley

Review

Quoted 10 lines · Tomer Maimon

Enable PECI dimm temperature nodes in Olympus
Quanta machine.

---
 arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus.dts | 2 ++
 1 file changed, 2 insertions(+)
(quoted diff) +0 -0

b/arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus.dts

arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus.dts line 913

Quoted 8 lines

index 1692bb7314c5..de34c9b2ff2c 100644

arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus.dts +1 -0
@@ -910,10 +910,12 @@
        intel-peci-dimmtemp@30 {
                compatible = "intel,peci-client";
                reg = <0x30>;
+               status = "okay";

Nodes are enabled by default, you shouldn't need to add "okay" for it to work. Can you confirm it works without adding this?

Quoted 1 line

Yes you right.

is working fine without "okay"

Quoted 9 lines
Quoted 9 lines
arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus.dts +1 -0
        };
        intel-peci-dimmtemp@31 {
                compatible = "intel,peci-client";
                reg = <0x31>;
+               status = "okay";
        };
 };
 
Quoted 4 lines
Quoted 3 lines

--
2.22.0

Cheers,

Tomer

author maintainer
#6 lore raw

PATCH 4/4 watchdog: npcm: Modify get reset status function

In reply to Tomer Maimon

Once the syscon phandle not found the WD reset
status will not supported and return to the
function caller.

---
 drivers/watchdog/npcm_wdt.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/watchdog/npcm_wdt.c +3 -1
index a93180d0a6f4..f87cfadd8d9b 100644
@@ -202,8 +202,10 @@ static void npcm_get_reset_status(struct npcm_wdt *wdt, struct device *dev)
 	u32 rstval;
 
 	gcr_regmap = syscon_regmap_lookup_by_phandle(dev->of_node, "syscon");
-	if (IS_ERR(gcr_regmap))
+	if (IS_ERR(gcr_regmap)) {
 		dev_warn(dev, "Failed to find gcr syscon, WD reset status not supported\n");
+		return;
+	}
 
 	regmap_read(gcr_regmap, NPCM7XX_RESSR_OFFSET, &rstval);
 	if (!rstval) {
Signature · 1 line
2.22.0
#7 lore raw
In reply to Tomer Maimon
Quoted 9 lines · Tomer Maimon

Minor NPCM7xx modifications to the latest patches
that been pushed to dev-5.8.

Tomer Maimon (4):
arm: dts: npcm7xx: Add syscon property
arm: dts: npcm7xx: modify PECI node.
arm: dts: Olympus: Enable PECI dimm temperature
watchdog: npcm: Modify get reset status function

I have merged patches 1, 2 and 4.

Cheers,

Joel

Quoted 9 lines
 arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi        | 9 ++++++---
 arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus.dts | 2 ++
 drivers/watchdog/npcm_wdt.c                          | 4 +++-
 3 files changed, 11 insertions(+), 4 deletions(-)

--
2.22.0