diff options
author | Martin Blumenstingl <martin.blumenstingl@googlemail.com> | 2017-01-22 13:17:14 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@baylibre.com> | 2017-01-30 13:44:04 -0500 |
commit | bd80ef5ed46233d90f216805ff40aba326ff1bdd (patch) | |
tree | 980f6e5d81bd0a66bfc3c7434aa631cbba6a34f2 | |
parent | 249a2243e97edcd2cb0bef01a934d4ba21fb167f (diff) |
ARM64: dts: meson: meson-gx: add the SAR ADC
Add the SAR ADC to meson-gxbb.dtsi and meson-gxl.dtsi. GXBB provides a
10-bit ADC while GXL and GXM provide a 12-bit ADC.
Some boards use resistor ladder buttons connected through one of the ADC
channels. On newer devices (GXL and GXM) some boards use pull-ups/downs
to change the resistance (and thus the ADC value) on one of the ADC
channels to indicate the board revision.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Tested-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
-rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 8 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 10 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 10 | ||||
-rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 4 |
4 files changed, 32 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 9110dc1a2481..f100d0b013b4 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi | |||
@@ -237,6 +237,14 @@ | |||
237 | status = "disabled"; | 237 | status = "disabled"; |
238 | }; | 238 | }; |
239 | 239 | ||
240 | saradc: adc@8680 { | ||
241 | compatible = "amlogic,meson-saradc"; | ||
242 | reg = <0x0 0x8680 0x0 0x34>; | ||
243 | #io-channel-cells = <1>; | ||
244 | interrupts = <GIC_SPI 73 IRQ_TYPE_EDGE_RISING>; | ||
245 | status = "disabled"; | ||
246 | }; | ||
247 | |||
240 | pwm_ef: pwm@86c0 { | 248 | pwm_ef: pwm@86c0 { |
241 | compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm"; | 249 | compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm"; |
242 | reg = <0x0 0x086c0 0x0 0x10>; | 250 | reg = <0x0 0x086c0 0x0 0x10>; |
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index 39a774ad83ce..04b3324bc132 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | |||
@@ -490,6 +490,16 @@ | |||
490 | clocks = <&clkc CLKID_I2C>; | 490 | clocks = <&clkc CLKID_I2C>; |
491 | }; | 491 | }; |
492 | 492 | ||
493 | &saradc { | ||
494 | compatible = "amlogic,meson-gxbb-saradc", "amlogic,meson-saradc"; | ||
495 | clocks = <&xtal>, | ||
496 | <&clkc CLKID_SAR_ADC>, | ||
497 | <&clkc CLKID_SANA>, | ||
498 | <&clkc CLKID_SAR_ADC_CLK>, | ||
499 | <&clkc CLKID_SAR_ADC_SEL>; | ||
500 | clock-names = "clkin", "core", "sana", "adc_clk", "adc_sel"; | ||
501 | }; | ||
502 | |||
493 | &sd_emmc_a { | 503 | &sd_emmc_a { |
494 | clocks = <&clkc CLKID_SD_EMMC_A>, | 504 | clocks = <&clkc CLKID_SD_EMMC_A>, |
495 | <&xtal>, | 505 | <&xtal>, |
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index 5f1100af72b1..fe11b5fc61f7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | |||
@@ -347,6 +347,16 @@ | |||
347 | clocks = <&clkc CLKID_I2C>; | 347 | clocks = <&clkc CLKID_I2C>; |
348 | }; | 348 | }; |
349 | 349 | ||
350 | &saradc { | ||
351 | compatible = "amlogic,meson-gxl-saradc", "amlogic,meson-saradc"; | ||
352 | clocks = <&xtal>, | ||
353 | <&clkc CLKID_SAR_ADC>, | ||
354 | <&clkc CLKID_SANA>, | ||
355 | <&clkc CLKID_SAR_ADC_CLK>, | ||
356 | <&clkc CLKID_SAR_ADC_SEL>; | ||
357 | clock-names = "clkin", "core", "sana", "adc_clk", "adc_sel"; | ||
358 | }; | ||
359 | |||
350 | &sd_emmc_a { | 360 | &sd_emmc_a { |
351 | clocks = <&clkc CLKID_SD_EMMC_A>, | 361 | clocks = <&clkc CLKID_SD_EMMC_A>, |
352 | <&xtal>, | 362 | <&xtal>, |
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi index 4c55665a253f..ddea7305c644 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | |||
@@ -117,6 +117,10 @@ | |||
117 | }; | 117 | }; |
118 | }; | 118 | }; |
119 | 119 | ||
120 | &saradc { | ||
121 | compatible = "amlogic,meson-gxm-saradc", "amlogic,meson-saradc"; | ||
122 | }; | ||
123 | |||
120 | &scpi_dvfs { | 124 | &scpi_dvfs { |
121 | clock-indices = <0 1>; | 125 | clock-indices = <0 1>; |
122 | clock-output-names = "vbig", "vlittle"; | 126 | clock-output-names = "vbig", "vlittle"; |