Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / amlogic / meson-axg-s400.dts

diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
index dff9b15eb3c0b63a70c65070c465305c35985dee..d5c01427a5ca08cc9543acbfed8d22ecfdec4297 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts
@@ -6,21 +6,75 @@
 /dts-v1/;
 
 #include "meson-axg.dtsi"
+#include <dt-bindings/input/input.h>
 
 / {
        compatible = "amlogic,s400", "amlogic,a113d", "amlogic,meson-axg";
        model = "Amlogic Meson AXG S400 Development Board";
 
+       adc_keys {
+               compatible = "adc-keys";
+               io-channels = <&saradc 0>;
+               io-channel-names = "buttons";
+               keyup-threshold-microvolt = <1800000>;
+
+               button-next {
+                       label = "Next";
+                       linux,code = <KEY_NEXT>;
+                       press-threshold-microvolt = <1116000>; /* 62% */
+               };
+
+               button-prev {
+                       label = "Previous";
+                       linux,code = <KEY_PREVIOUS>;
+                       press-threshold-microvolt = <900000>; /* 50% */
+               };
+
+               button-wifi {
+                       label = "Wifi";
+                       linux,code = <KEY_WLAN>;
+                       press-threshold-microvolt = <684000>; /* 38% */
+               };
+
+               button-up {
+                       label = "Volume Up";
+                       linux,code = <KEY_VOLUMEUP>;
+                       press-threshold-microvolt = <468000>; /* 26% */
+               };
+
+               button-down {
+                       label = "Volume Down";
+                       linux,code = <KEY_VOLUMEDOWN>;
+                       press-threshold-microvolt = <252000>; /* 14% */
+               };
+
+               button-voice {
+                       label = "Voice";
+                       linux,code = <KEY_VOICECOMMAND>;
+                       press-threshold-microvolt = <0>; /* 0% */
+               };
+       };
+
        aliases {
                serial0 = &uart_AO;
                serial1 = &uart_A;
        };
 
+       main_12v: regulator-main_12v {
+               compatible = "regulator-fixed";
+               regulator-name = "12V";
+               regulator-min-microvolt = <12000000>;
+               regulator-max-microvolt = <12000000>;
+               regulator-always-on;
+       };
+
        vddio_boot: regulator-vddio_boot {
                compatible = "regulator-fixed";
                regulator-name = "VDDIO_BOOT";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
+               vin-supply = <&vddao_3v3>;
+               regulator-always-on;
        };
 
        vddao_3v3: regulator-vddao_3v3 {
@@ -28,6 +82,8 @@
                regulator-name = "VDDAO_3V3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
+               vin-supply = <&main_12v>;
+               regulator-always-on;
        };
 
        vddio_ao18: regulator-vddio_ao18 {
@@ -35,6 +91,8 @@
                regulator-name = "VDDIO_AO18";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
+               vin-supply = <&vddao_3v3>;
+               regulator-always-on;
        };
 
        vcc_3v3: regulator-vcc_3v3 {
@@ -42,6 +100,30 @@
                regulator-name = "VCC_3V3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
+               vin-supply = <&vddao_3v3>;
+               regulator-always-on;
+       };
+
+       vcc_5v: regulator-vcc_5v {
+               compatible = "regulator-fixed";
+               regulator-name = "VCC5V";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               vin-supply = <&main_12v>;
+
+               gpio = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
+
+       usb_pwr: regulator-usb_pwr {
+               compatible = "regulator-fixed";
+               regulator-name = "USB_PWR";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               vin-supply = <&vcc_5v>;
+
+               gpio = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
        };
 
        emmc_pwrseq: emmc-pwrseq {
@@ -62,6 +144,66 @@
                clock-frequency = <32768>;
                pwms = <&pwm_ab 0 30518 0>; /* PWM_A at 32.768KHz */
        };
+
+       speaker-leds {
+               compatible = "gpio-leds";
+
+               aled1 {
+                       label = "speaker:aled1";
+                       gpios = <&gpio_speaker 7 0>;
+               };
+
+               aled2 {
+                       label = "speaker:aled2";
+                       gpios = <&gpio_speaker 6 0>;
+               };
+
+               aled3 {
+                       label = "speaker:aled3";
+                       gpios = <&gpio_speaker 5 0>;
+               };
+
+               aled4 {
+                       label = "speaker:aled4";
+                       gpios = <&gpio_speaker 4 0>;
+               };
+
+               aled5 {
+                       label = "speaker:aled5";
+                       gpios = <&gpio_speaker 3 0>;
+               };
+
+               aled6 {
+                       label = "speaker:aled6";
+                       gpios = <&gpio_speaker 2 0>;
+               };
+       };
+
+       linein: audio-codec@0 {
+               #sound-dai-cells = <0>;
+               compatible = "everest,es7241";
+               VDDA-supply = <&vcc_3v3>;
+               VDDP-supply = <&vcc_3v3>;
+               VDDD-supply = <&vcc_3v3>;
+               status = "okay";
+               sound-name-prefix = "Linein";
+       };
+
+       lineout: audio-codec@1 {
+               #sound-dai-cells = <0>;
+               compatible = "everest,es7154";
+               VDD-supply = <&vcc_3v3>;
+               PVDD-supply = <&vcc_5v>;
+               status = "okay";
+               sound-name-prefix = "Lineout";
+       };
+
+       spdif_dit: audio-codec@2 {
+               #sound-dai-cells = <0>;
+               compatible = "linux,spdif-dit";
+               status = "okay";
+               sound-name-prefix = "DIT";
+       };
 };
 
 &ethmac {
@@ -106,12 +248,33 @@
        status = "okay";
        pinctrl-0 = <&i2c1_z_pins>;
        pinctrl-names = "default";
+
+       speaker_amp1: audio-codec@1b {
+               compatible = "ti,tas5707";
+               reg = <0x1b>;
+               reset-gpios = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_LOW>;
+               #sound-dai-cells = <0>;
+               AVDD-supply = <&vcc_3v3>;
+               DVDD-supply = <&vcc_3v3>;
+               PVDD_A-supply = <&main_12v>;
+               PVDD_B-supply = <&main_12v>;
+               PVDD_C-supply = <&main_12v>;
+               PVDD_D-supply = <&main_12v>;
+       };
 };
 
 &i2c_AO {
        status = "okay";
        pinctrl-0 = <&i2c_ao_sck_10_pins>, <&i2c_ao_sda_11_pins>;
        pinctrl-names = "default";
+
+       gpio_speaker: gpio-controller@1f {
+               compatible = "nxp,pca9557";
+               reg = <0x1f>;
+               gpio-controller;
+               #gpio-cells = <2>;
+               vcc-supply = <&vddao_3v3>;
+       };
 };
 
 &pwm_ab {
@@ -166,3 +329,8 @@
                compatible = "brcm,bcm4329-fmac";
        };
 };
+
+&saradc {
+       status = "okay";
+       vref-supply = <&vddio_ao18>;
+};