openbmc.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Joel Stanley <joel@jms.id.au>
To: Eddie James <eajames@linux.ibm.com>
Cc: Thomas.Ippolito@ibm.com, OpenBMC Maillist <openbmc@lists.ozlabs.org>
Subject: Re: [PATCH linux dev-5.10] ARM: dts: aspeed: Add ADC for AST2600 and enable for Rainier and Everest
Date: Wed, 22 Sep 2021 02:29:17 +0000	[thread overview]
Message-ID: <CACPK8XdN0JViQvdh-xbe9tkTsiy-fAZsWTgtoTVFHPWF-5MKcA@mail.gmail.com> (raw)
In-Reply-To: <20210916210045.31769-1-eajames@linux.ibm.com>

On Thu, 16 Sept 2021 at 21:00, Eddie James <eajames@linux.ibm.com> wrote:
>
> Add the ADC nodes to the AST2600 devicetree. Enable ADC1 for Rainier and
> Everest systems and add an iio-hwmon node for the 7th channel to report
> the battery voltage.
>
> Tested on Rainier:
> ~# cat /sys/class/hwmon/hwmon11/in1_input
> 1347
>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>

Applied, thanks.


> ---
>  arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 15 +++++++++++++++
>  arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 15 +++++++++++++++
>  arch/arm/boot/dts/aspeed-g6.dtsi             | 20 ++++++++++++++++++++
>  3 files changed, 50 insertions(+)
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
> index 91242983a7b2..4682c005440d 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
> @@ -243,6 +243,21 @@ led-pcieslot-power {
>                         gpios = <&gpio0 ASPEED_GPIO(P, 4) GPIO_ACTIVE_LOW>;
>                 };
>         };
> +
> +       iio-hwmon {
> +               compatible = "iio-hwmon";
> +               io-channels = <&adc1 7>;
> +       };
> +};
> +
> +&adc1 {
> +       status = "okay";
> +       aspeed,int-vref-microvolt = <2500000>;
> +       pinctrl-names = "default";
> +       pinctrl-0 = <&pinctrl_adc8_default &pinctrl_adc9_default
> +                                &pinctrl_adc10_default &pinctrl_adc11_default
> +                                &pinctrl_adc12_default &pinctrl_adc13_default
> +                                &pinctrl_adc14_default &pinctrl_adc15_default>;
>  };
>
>  &gpio0 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> index 665c61ab6710..3e8d34a8729e 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> @@ -218,6 +218,21 @@ fan5-presence {
>                         linux,code = <11>;
>                 };
>         };
> +
> +       iio-hwmon {
> +               compatible = "iio-hwmon";
> +               io-channels = <&adc1 7>;
> +       };
> +};
> +
> +&adc1 {
> +       status = "okay";
> +       aspeed,int-vref-microvolt = <2500000>;
> +       pinctrl-names = "default";
> +       pinctrl-0 = <&pinctrl_adc8_default &pinctrl_adc9_default
> +               &pinctrl_adc10_default &pinctrl_adc11_default
> +               &pinctrl_adc12_default &pinctrl_adc13_default
> +               &pinctrl_adc14_default &pinctrl_adc15_default>;
>  };
>
>  &ehci1 {
> diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi
> index f96607b7b4e2..02e54fb13815 100644
> --- a/arch/arm/boot/dts/aspeed-g6.dtsi
> +++ b/arch/arm/boot/dts/aspeed-g6.dtsi
> @@ -364,6 +364,26 @@ xdma: xdma@1e6e7000 {
>                                 status = "disabled";
>                         };
>
> +                       adc0: adc@1e6e9000 {
> +                               compatible = "aspeed,ast2600-adc0";
> +                               reg = <0x1e6e9000 0x100>;
> +                               clocks = <&syscon ASPEED_CLK_APB2>;
> +                               resets = <&syscon ASPEED_RESET_ADC>;
> +                               interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
> +                               #io-channel-cells = <1>;
> +                               status = "disabled";
> +                       };
> +
> +                       adc1: adc@1e6e9100 {
> +                               compatible = "aspeed,ast2600-adc1";
> +                               reg = <0x1e6e9100 0x100>;
> +                               clocks = <&syscon ASPEED_CLK_APB2>;
> +                               resets = <&syscon ASPEED_RESET_ADC>;
> +                               interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
> +                               #io-channel-cells = <1>;
> +                               status = "disabled";
> +                       };
> +
>                         gpio0: gpio@1e780000 {
>                                 #gpio-cells = <2>;
>                                 gpio-controller;
> --
> 2.27.0
>

      reply	other threads:[~2021-09-22  2:30 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-16 21:00 [PATCH linux dev-5.10] ARM: dts: aspeed: Add ADC for AST2600 and enable for Rainier and Everest Eddie James
2021-09-22  2:29 ` Joel Stanley [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CACPK8XdN0JViQvdh-xbe9tkTsiy-fAZsWTgtoTVFHPWF-5MKcA@mail.gmail.com \
    --to=joel@jms.id.au \
    --cc=Thomas.Ippolito@ibm.com \
    --cc=eajames@linux.ibm.com \
    --cc=openbmc@lists.ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).