Merge tag 'for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / meson8b-ec100.dts

diff --git a/arch/arm/boot/dts/meson8b-ec100.dts b/arch/arm/boot/dts/meson8b-ec100.dts
index d50fc2f60fa31fc24e296de7f3ed2af3e4834321..3ca9638fad09def6dbd6ed943b0b25e8b8ab3411 100644 (file)
--- a/arch/arm/boot/dts/meson8b-ec100.dts
+++ b/arch/arm/boot/dts/meson8b-ec100.dts
@@ -23,6 +23,7 @@
        };
 
        memory {
+               device_type = "memory";
                reg = <0x40000000 0x40000000>;
        };
 
@@ -64,6 +65,11 @@
                timeout-ms = <20000>;
        };
 
+       iio-hwmon {
+               compatible = "iio-hwmon";
+               io-channels = <&saradc 8>;
+       };
+
        leds {
                compatible = "gpio-leds";
 
@@ -83,6 +89,9 @@
        };
 
        usb_vbus: regulator-usb-vbus {
+               /*
+                * Silergy SY6288CCAC-GP 2A Power Distribution Switch.
+                */
                compatible = "regulator-fixed";
 
                regulator-name = "USB_VBUS";
@@ -90,11 +99,20 @@
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;
 
+               vin-supply = <&vcc_5v>;
+
+               /*
+                * signal name from the schematics: USB_PWR_EN
+                */
                gpio = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>;
                enable-active-high;
        };
 
        vcc_5v: regulator-vcc5v {
+               /*
+                * supplied by the main power input which called PWR_5V_STB
+                * in the schematics
+                */
                compatible = "regulator-fixed";
 
                regulator-name = "VCC5V";
@@ -102,6 +120,9 @@
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;
 
+               /*
+                * signal name from the schematics: 3V3_5V_EN
+                */
                gpio = <&gpio GPIODV_29 GPIO_ACTIVE_LOW>;
 
                regulator-boot-on;
@@ -109,12 +130,18 @@
        };
 
        vcck: regulator-vcck {
+               /*
+                * Silergy SY8089AAC-GP 2A continuous, 3A peak, 1MHz
+                * Synchronous Step Down Regulator.
+                */
                compatible = "pwm-regulator";
 
                regulator-name = "VCCK";
                regulator-min-microvolt = <860000>;
                regulator-max-microvolt = <1140000>;
 
+               vin-supply = <&vcc_5v>;
+
                pwms = <&pwm_cd 0 1148 0>;
                pwm-dutycycle-range = <100 0>;
 
@@ -123,19 +150,66 @@
        };
 
        vcc_1v8: regulator-vcc1v8 {
+               /*
+                * ABLIC S-1339D18-M5001-GP
+                */
                compatible = "regulator-fixed";
 
                regulator-name = "VCC1V8";
                regulator-min-microvolt = <1800000>;
                regulator-max-microvolt = <1800000>;
+
+               vin-supply = <&vcc_3v3>;
        };
 
        vcc_3v3: regulator-vcc3v3 {
+               /*
+                * Silergy SY8089AAC-GP 2A continuous, 3A peak, 1MHz
+                * Synchronous Step Down Regulator. Also called
+                * VDDIO_AO3.3V in the schematics.
+                */
                compatible = "regulator-fixed";
 
                regulator-name = "VCC3V3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
+
+               vin-supply = <&vcc_5v>;
+       };
+
+       vcc_ddr3: regulator-vcc-ddr3 {
+               /*
+                * Silergy SY8089AAC-GP 2A continuous, 3A peak, 1MHz
+                * Synchronous Step Down Regulator. Also called
+                * DDR3_1.5V in the schematics.
+                */
+               compatible = "regulator-fixed";
+
+               regulator-name = "VCC_DDR3_1V5";
+               regulator-min-microvolt = <1500000>;
+               regulator-max-microvolt = <1500000>;
+
+               vin-supply = <&vcc_5v>;
+
+               regulator-boot-on;
+               regulator-always-on;
+       };
+
+       vcc_rtc: regulator-vcc-rtc {
+               /*
+                * Global Mixed-mode Technology Inc. G918T12U-GP
+                */
+               compatible = "regulator-fixed";
+
+               regulator-name = "VCC_RTC";
+               regulator-min-microvolt = <900000>;
+               regulator-max-microvolt = <900000>;
+
+               /*
+                * When the board is powered then the input is VCC3V3,
+                * otherwise power is taken from the coin cell battery.
+                */
+               vin-supply = <&vcc_3v3>;
        };
 };
 
@@ -164,6 +238,10 @@
                eth_phy0: ethernet-phy@0 {
                        /* IC Plus IP101A/G (0x02430c54) */
                        reg = <0>;
+                       icplus,select-interrupt;
+                       interrupt-parent = <&gpio_intc>;
+                       /* GPIOH_3 */
+                       interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
                };
        };
 };
@@ -211,6 +289,56 @@
        };
 };
 
+&gpio_ao {
+       gpio-line-names = "Linux_TX", "Linux_RX",
+                         "SLP_S5_N", "USB2_OC_FLAG#",
+                         "HUB_RST", "USB_PWR_EN",
+                         "I2S_IN", "SLP_S1_N",
+                         "TCK", "TMS", "TDI", "TDO",
+                         "HDMI_CEC", "5640_IRQ",
+                         "MUTE", "S805_TEST#";
+};
+
+&gpio {
+       gpio-line-names = /* Bank GPIOX */
+                         "WIFI_SD_D0", "WIFI_SD_D1", "WIFI_SD_D2",
+                         "WIFI_SD_D3", "BTPCM_DOUT", "BTPCM_DIN",
+                         "BTPCM_SYNC", "BTPCM_CLK", "WIFI_SD_CLK",
+                         "WIFI_SD_CMD", "WIFI_32K", "WIFI_PWREN",
+                         "UART_B_TX", "UART_B_RX", "UART_B_CTS_N",
+                         "UART_B_RTS_N", "BT_EN", "WIFI_WAKE_HOST",
+                         /* Bank GPIOY */
+                         "", "", "", "", "", "", "", "", "", "",
+                         "", "",
+                         /* Bank GPIODV */
+                         "VCCK_PWM_C", "I2C_SDA_A", "I2C_SCL_A",
+                         "I2C_SDA_B", "I2C_SCL_B", "VDDEE_PWM_D",
+                         "VDDEE_PWM 3V3_5V_EN",
+                         /* Bank GPIOH */
+                         "HDMI_HPD", "HDMI_I2C_SDA", "HDMI_I2C_SCL",
+                         "RMII_IRQ", "RMII_RST#", "RMII_TXD1",
+                         "RMII_TXD0", "AV_select_1", "AV_select_2",
+                         "MCU_Control_S",
+                         /* Bank CARD */
+                         "SD_D1_B", "SD_D0_B", "SD_CLK_8726MX",
+                         "SD_CMD_8726MX", "SD_D3_B", "SD_D2_B",
+                         "CARD_EN_DET (CARD_DET)",
+                         /* Bank BOOT */
+                         "NAND_D0 (EMMC)", "NAND_D1 (EMMC)",
+                         "NAND_D2 (EMMC)", "NAND_D3 (EMMC)",
+                         "NAND_D4 (EMMC)", "NAND_D5 (EMMC)",
+                         "NAND_D6 (EMMC)", "NAND_D7 (EMMC)",
+                         "NAND_CS1 (EMMC)", "NAND_CS2 iNAND_RS1 (EMMC)",
+                         "NAND_nR/B iNAND_CMD (EMMC)", "NAND_ALE (EMMC)",
+                         "NAND_CLE (EMMC)", "nRE_S1 NAND_nRE (EMMC)",
+                         "nWE_S1 NAND_nWE (EMMC)",  "", "", "SPI_CS",
+                         /* Bank DIF */
+                         "RMII_RXD1", "RMII_RXD0", "RMII_CRS_DV",
+                         "RMII_50M_IN", "GPIODIF_4", "GPIODIF_5",
+                         "RMII_TXEN", "CPUETH_25MOUT", "RMII_MDC",
+                         "RMII_MDIO";
+};
+
 &pwm_cd {
        status = "okay";
        pinctrl-0 = <&pwm_c1_pins>;