| Message ID | 20170330010846.6394-1-raltherr@google.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Thu, Mar 30, 2017 at 11:38 AM, Rick Altherr <raltherr@google.com> wrote: > Signed-off-by: Rick Altherr <raltherr@google.com> Applied to dev-4.7. Cheers, Joel > --- > > arch/arm/boot/dts/aspeed-g4.dtsi | 7 +++++++ > arch/arm/boot/dts/aspeed-g5.dtsi | 8 +++++++- > 2 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi > index 28408a2e2ad5..e5be87076a6b 100644 > --- a/arch/arm/boot/dts/aspeed-g4.dtsi > +++ b/arch/arm/boot/dts/aspeed-g4.dtsi > @@ -840,6 +840,13 @@ > reg = <0x1e6e202c 0x4>; > }; > > + adc: adc@1e6e9000 { > + compatible = "aspeed,ast2400-adc"; > + reg = <0x1e6e9000 0xB0>; > + clocks = <&clk_apb>; > + #io-channel-cells = <1>; > + }; > + > sram@1e720000 { > compatible = "mmio-sram"; > reg = <0x1e720000 0x8000>; // 32K > diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi > index 7c09a26eea6e..48fd068251d6 100644 > --- a/arch/arm/boot/dts/aspeed-g5.dtsi > +++ b/arch/arm/boot/dts/aspeed-g5.dtsi > @@ -394,7 +394,6 @@ > function = "LAD0"; > groups = "LAD0"; > }; > - > pinctrl_lad1_default: lad1_default { > function = "LAD1"; > groups = "LAD1"; > @@ -1019,6 +1018,13 @@ > status = "disabled"; > }; > > + adc: adc@1e6e9000 { > + compatible = "aspeed,ast2500-adc"; > + reg = <0x1e6e9000 0xB0>; > + clocks = <&clk_apb>; > + #io-channel-cells = <1>; > + }; > + > sram@1e720000 { > compatible = "mmio-sram"; > reg = <0x1e720000 0x9000>; // 36K > -- > 2.12.2.564.g063fe858b8-goog >
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 28408a2e2ad5..e5be87076a6b 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -840,6 +840,13 @@ reg = <0x1e6e202c 0x4>; }; + adc: adc@1e6e9000 { + compatible = "aspeed,ast2400-adc"; + reg = <0x1e6e9000 0xB0>; + clocks = <&clk_apb>; + #io-channel-cells = <1>; + }; + sram@1e720000 { compatible = "mmio-sram"; reg = <0x1e720000 0x8000>; // 32K diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 7c09a26eea6e..48fd068251d6 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -394,7 +394,6 @@ function = "LAD0"; groups = "LAD0"; }; - pinctrl_lad1_default: lad1_default { function = "LAD1"; groups = "LAD1"; @@ -1019,6 +1018,13 @@ status = "disabled"; }; + adc: adc@1e6e9000 { + compatible = "aspeed,ast2500-adc"; + reg = <0x1e6e9000 0xB0>; + clocks = <&clk_apb>; + #io-channel-cells = <1>; + }; + sram@1e720000 { compatible = "mmio-sram"; reg = <0x1e720000 0x9000>; // 36K
Signed-off-by: Rick Altherr <raltherr@google.com> --- arch/arm/boot/dts/aspeed-g4.dtsi | 7 +++++++ arch/arm/boot/dts/aspeed-g5.dtsi | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-)