linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 0/3] ARM: dts: aspeed: fixup wedge40 device tree
@ 2020-07-23 23:05 rentao.bupt
  2020-07-23 23:05 ` [PATCH v2 1/3] ARM: dts: aspeed: wedge40: disable a few i2c controllers rentao.bupt
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: rentao.bupt @ 2020-07-23 23:05 UTC (permalink / raw)
  To: Rob Herring, Joel Stanley, Andrew Jeffery, devicetree,
	linux-arm-kernel, linux-aspeed, linux-kernel, openbmc, taoren
  Cc: Tao Ren

From: Tao Ren <rentao.bupt@gmail.com>

The patch series update several devices' settings in Facebook Wedge40
device tree.

Patch #1 disables a few i2c controllers as they are not being used at
present.

Patch #2 enables adc device for voltage monitoring.

Patch #3 enables pwm_tacho device for fan control and monitoring.

Tao Ren (3):
  ARM: dts: aspeed: wedge40: disable a few i2c controllers
  ARM: dts: aspeed: wedge40: enable adc device
  ARM: dts: aspeed: wedge40: enable pwm_tacho device

 .../boot/dts/aspeed-bmc-facebook-wedge40.dts  | 42 +++++++++++++++----
 1 file changed, 34 insertions(+), 8 deletions(-)

-- 
2.17.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v2 1/3] ARM: dts: aspeed: wedge40: disable a few i2c controllers
  2020-07-23 23:05 [PATCH v2 0/3] ARM: dts: aspeed: fixup wedge40 device tree rentao.bupt
@ 2020-07-23 23:05 ` rentao.bupt
  2020-07-23 23:05 ` [PATCH v2 2/3] ARM: dts: aspeed: wedge40: enable adc device rentao.bupt
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: rentao.bupt @ 2020-07-23 23:05 UTC (permalink / raw)
  To: Rob Herring, Joel Stanley, Andrew Jeffery, devicetree,
	linux-arm-kernel, linux-aspeed, linux-kernel, openbmc, taoren
  Cc: Tao Ren

From: Tao Ren <rentao.bupt@gmail.com>

Disable i2c bus #9, #10 and #13 as these i2c controllers are not used on
Wedge40.

Signed-off-by: Tao Ren <rentao.bupt@gmail.com>
---
 Changes in v2:
   - Nothing changed. Resending the patch just in case the previous
     email was not delivered.

 arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts
index 54e508530dce..aea23c313088 100644
--- a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts
@@ -115,14 +115,6 @@
 	status = "okay";
 };
 
-&i2c9 {
-	status = "okay";
-};
-
-&i2c10 {
-	status = "okay";
-};
-
 &i2c11 {
 	status = "okay";
 };
@@ -131,10 +123,6 @@
 	status = "okay";
 };
 
-&i2c13 {
-	status = "okay";
-};
-
 &vhub {
 	status = "okay";
 };
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v2 2/3] ARM: dts: aspeed: wedge40: enable adc device
  2020-07-23 23:05 [PATCH v2 0/3] ARM: dts: aspeed: fixup wedge40 device tree rentao.bupt
  2020-07-23 23:05 ` [PATCH v2 1/3] ARM: dts: aspeed: wedge40: disable a few i2c controllers rentao.bupt
@ 2020-07-23 23:05 ` rentao.bupt
  2020-07-23 23:05 ` [PATCH v2 3/3] ARM: dts: aspeed: wedge40: enable pwm_tacho device rentao.bupt
  2020-07-24  5:32 ` [PATCH v2 0/3] ARM: dts: aspeed: fixup wedge40 device tree Joel Stanley
  3 siblings, 0 replies; 6+ messages in thread
From: rentao.bupt @ 2020-07-23 23:05 UTC (permalink / raw)
  To: Rob Herring, Joel Stanley, Andrew Jeffery, devicetree,
	linux-arm-kernel, linux-aspeed, linux-kernel, openbmc, taoren
  Cc: Tao Ren

From: Tao Ren <rentao.bupt@gmail.com>

Enable adc controller and corresponding voltage sensoring channels for
Wedge40.

Signed-off-by: Tao Ren <rentao.bupt@gmail.com>
---
 Changes in v2:
   - Nothing changed. Resending the patch just in case the previous
     email was not delivered.

 arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts
index aea23c313088..1049cfa80ac2 100644
--- a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts
@@ -27,6 +27,11 @@
 	memory@40000000 {
 		reg = <0x40000000 0x20000000>;
 	};
+
+	ast-adc-hwmon {
+		compatible = "iio-hwmon";
+		io-channels = <&adc 5>, <&adc 6>, <&adc 7>, <&adc 8>, <&adc 9>;
+	};
 };
 
 &wdt1 {
@@ -126,3 +131,7 @@
 &vhub {
 	status = "okay";
 };
+
+&adc {
+	status = "okay";
+};
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v2 3/3] ARM: dts: aspeed: wedge40: enable pwm_tacho device
  2020-07-23 23:05 [PATCH v2 0/3] ARM: dts: aspeed: fixup wedge40 device tree rentao.bupt
  2020-07-23 23:05 ` [PATCH v2 1/3] ARM: dts: aspeed: wedge40: disable a few i2c controllers rentao.bupt
  2020-07-23 23:05 ` [PATCH v2 2/3] ARM: dts: aspeed: wedge40: enable adc device rentao.bupt
@ 2020-07-23 23:05 ` rentao.bupt
  2020-07-24  5:32 ` [PATCH v2 0/3] ARM: dts: aspeed: fixup wedge40 device tree Joel Stanley
  3 siblings, 0 replies; 6+ messages in thread
From: rentao.bupt @ 2020-07-23 23:05 UTC (permalink / raw)
  To: Rob Herring, Joel Stanley, Andrew Jeffery, devicetree,
	linux-arm-kernel, linux-aspeed, linux-kernel, openbmc, taoren
  Cc: Tao Ren

From: Tao Ren <rentao.bupt@gmail.com>

Enable pwm_tacho device for fan control and monitoring in Wedge40.

Signed-off-by: Tao Ren <rentao.bupt@gmail.com>
---
 Changes in v2:
   - Nothing changed. Resending the patch just in case the previous
     email was not delivered.

 .../boot/dts/aspeed-bmc-facebook-wedge40.dts  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts
index 1049cfa80ac2..8ac23ff6b09e 100644
--- a/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts
@@ -135,3 +135,32 @@
 &adc {
 	status = "okay";
 };
+
+&pwm_tacho {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_pwm0_default
+		     &pinctrl_pwm1_default
+		     &pinctrl_pwm6_default
+		     &pinctrl_pwm7_default>;
+
+	fan@0 {
+		reg = <0x00>;
+		aspeed,fan-tach-ch = /bits/ 8 <0x00 0x01>;
+	};
+
+	fan@1 {
+		reg = <0x01>;
+		aspeed,fan-tach-ch = /bits/ 8 <0x02 0x03>;
+	};
+
+	fan@6 {
+		reg = <0x06>;
+		aspeed,fan-tach-ch = /bits/ 8 <0x04 0x05>;
+	};
+
+	fan@7 {
+		reg = <0x07>;
+		aspeed,fan-tach-ch = /bits/ 8 <0x06 0x07>;
+	};
+};
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v2 0/3] ARM: dts: aspeed: fixup wedge40 device tree
  2020-07-23 23:05 [PATCH v2 0/3] ARM: dts: aspeed: fixup wedge40 device tree rentao.bupt
                   ` (2 preceding siblings ...)
  2020-07-23 23:05 ` [PATCH v2 3/3] ARM: dts: aspeed: wedge40: enable pwm_tacho device rentao.bupt
@ 2020-07-24  5:32 ` Joel Stanley
  2020-07-24  7:57   ` Tao Ren
  3 siblings, 1 reply; 6+ messages in thread
From: Joel Stanley @ 2020-07-24  5:32 UTC (permalink / raw)
  To: Tao Ren
  Cc: Rob Herring, Andrew Jeffery, devicetree, Linux ARM, linux-aspeed,
	Linux Kernel Mailing List, OpenBMC Maillist, Tao Ren

On Thu, 23 Jul 2020 at 23:05, <rentao.bupt@gmail.com> wrote:
>
> From: Tao Ren <rentao.bupt@gmail.com>
>
> The patch series update several devices' settings in Facebook Wedge40
> device tree.
>
> Patch #1 disables a few i2c controllers as they are not being used at
> present.
>
> Patch #2 enables adc device for voltage monitoring.
>
> Patch #3 enables pwm_tacho device for fan control and monitoring.
>
> Tao Ren (3):
>   ARM: dts: aspeed: wedge40: disable a few i2c controllers
>   ARM: dts: aspeed: wedge40: enable adc device
>   ARM: dts: aspeed: wedge40: enable pwm_tacho device

I have merged this series into the aspeed dt-for-5.9 branch.

Cheers,

Joel

>
>  .../boot/dts/aspeed-bmc-facebook-wedge40.dts  | 42 +++++++++++++++----
>  1 file changed, 34 insertions(+), 8 deletions(-)
>
> --
> 2.17.1
>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2 0/3] ARM: dts: aspeed: fixup wedge40 device tree
  2020-07-24  5:32 ` [PATCH v2 0/3] ARM: dts: aspeed: fixup wedge40 device tree Joel Stanley
@ 2020-07-24  7:57   ` Tao Ren
  0 siblings, 0 replies; 6+ messages in thread
From: Tao Ren @ 2020-07-24  7:57 UTC (permalink / raw)
  To: Joel Stanley
  Cc: Rob Herring, Andrew Jeffery, devicetree, Linux ARM, linux-aspeed,
	Linux Kernel Mailing List, OpenBMC Maillist, Tao Ren

On Fri, Jul 24, 2020 at 05:32:30AM +0000, Joel Stanley wrote:
> On Thu, 23 Jul 2020 at 23:05, <rentao.bupt@gmail.com> wrote:
> >
> > From: Tao Ren <rentao.bupt@gmail.com>
> >
> > The patch series update several devices' settings in Facebook Wedge40
> > device tree.
> >
> > Patch #1 disables a few i2c controllers as they are not being used at
> > present.
> >
> > Patch #2 enables adc device for voltage monitoring.
> >
> > Patch #3 enables pwm_tacho device for fan control and monitoring.
> >
> > Tao Ren (3):
> >   ARM: dts: aspeed: wedge40: disable a few i2c controllers
> >   ARM: dts: aspeed: wedge40: enable adc device
> >   ARM: dts: aspeed: wedge40: enable pwm_tacho device
> 
> I have merged this series into the aspeed dt-for-5.9 branch.
> 
> Cheers,
> 
> Joel

Thanks a lot Joel. Have a great weekend.


Cheers,

Tao

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-07-24  7:57 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-23 23:05 [PATCH v2 0/3] ARM: dts: aspeed: fixup wedge40 device tree rentao.bupt
2020-07-23 23:05 ` [PATCH v2 1/3] ARM: dts: aspeed: wedge40: disable a few i2c controllers rentao.bupt
2020-07-23 23:05 ` [PATCH v2 2/3] ARM: dts: aspeed: wedge40: enable adc device rentao.bupt
2020-07-23 23:05 ` [PATCH v2 3/3] ARM: dts: aspeed: wedge40: enable pwm_tacho device rentao.bupt
2020-07-24  5:32 ` [PATCH v2 0/3] ARM: dts: aspeed: fixup wedge40 device tree Joel Stanley
2020-07-24  7:57   ` Tao Ren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).