diff options
4 files changed, 63 insertions, 24 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-verdin-dahlia.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-verdin-dahlia.dtsi index 1aa361be0edf..d160f97cb23c 100755 --- a/arch/arm64/boot/dts/freescale/imx8mp-verdin-dahlia.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp-verdin-dahlia.dtsi @@ -4,6 +4,22 @@ */ / { + /* Carrier Board Supply +V1.8 */ + reg_1p8v: regulator-1p8v { + compatible = "regulator-fixed"; + regulator-max-microvolt = <1800000>; + regulator-min-microvolt = <1800000>; + regulator-name = "+V1.8_SW"; + }; + + /* Carrier Board Supply +V3.3 */ + reg_3p3v: regulator-3p3v { + compatible = "regulator-fixed"; + regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <3300000>; + regulator-name = "+V3.3_SW"; + }; + sound_card: sound-card { compatible = "simple-audio-card"; simple-audio-card,bitclock-master = <&dailink_master>; @@ -48,6 +64,10 @@ }; }; +&backlight { + power-supply = <®_3p3v>; +}; + /* Verdin SPI_1 */ &ecspi1 { status = "okay"; @@ -115,16 +135,17 @@ clocks = <&audiomix_clk IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1>; clock-names = "mclk"; reg = <0x1a>; - DCVDD-supply = <®_3p3v>; - DBVDD-supply = <®_3p3v>; - AVDD-supply = <®_3p3v>; - CPVDD-supply = <®_3p3v>; - MICVDD-supply = <®_3p3v>; + DCVDD-supply = <®_1p8v>; + DBVDD-supply = <®_1p8v>; + AVDD-supply = <®_1p8v>; + CPVDD-supply = <®_1p8v>; + MICVDD-supply = <®_1p8v>; }; }; /* Verdin PCIE_1 */ &pcie { + epdev_on-supply = <®_3p3v>; status = "okay"; }; @@ -147,6 +168,10 @@ status = "okay"; }; +®_usdhc2_vmmc { + vin-supply = <®_3p3v>; +}; + /* VERDIN I2S_1 */ &sai1 { status = "okay"; diff --git a/arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi index 9188d64f49ca..31885fe7f7d5 100755 --- a/arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi @@ -6,6 +6,18 @@ #include "imx8mp-verdin-dahlia.dtsi" / { + reg_eth2phy: regulator-eth2phy { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio_expander_21 4 GPIO_ACTIVE_HIGH>; /* ETH_PWR_EN */ + off-on-delay = <500000>; + regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <3300000>; + regulator-name = "+V3.3_ETH"; + startup-delay-us = <200000>; + vin-supply = <®_3p3v>; + }; + sound_card: sound-card { compatible = "simple-audio-card"; simple-audio-card,bitclock-master = <&dailink_master>; @@ -42,11 +54,13 @@ }; &fec { + phy-supply = <®_eth2phy>; status = "okay"; }; &gpio_expander_21 { status = "okay"; + vcc-supply = <®_1p8v>; }; /* Verdin I2C_1 */ diff --git a/arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi.dtsi index 6742d93fce41..610408358cb9 100755 --- a/arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi.dtsi @@ -10,7 +10,7 @@ gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_wifi_pwr_en>; - regulator-name = "V3.3_WI-FI"; + regulator-name = "On-module +V3.3_Wi-Fi"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; startup-delay-us = <2000>; diff --git a/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi index 661a3c18331c..34a4caf81065 100755 --- a/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi @@ -25,7 +25,6 @@ enable-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2s_2_d_out_dsi_1_bkl_en>; - power-supply = <®_3p3v>; /* Verdin PWM_3_DSI/PWM_3_DSI_LVDS (SODIMM 19) */ pwms = <&pwm3 0 6666667 PWM_POLARITY_INVERTED>; status = "disabled"; @@ -46,29 +45,21 @@ }; }; - /* Carrier Board Supply */ - reg_3p3v: regulator-3p3v { - compatible = "regulator-fixed"; - regulator-max-microvolt = <3300000>; - regulator-min-microvolt = <3300000>; - regulator-name = "REG_3P3V"; - }; - reg_aux_usb: regulator-aux-usb { compatible = "regulator-fixed"; regulator-max-microvolt = <3300000>; regulator-min-microvolt = <3300000>; - regulator-name = "REG_AUX_USB"; + regulator-name = "AUX_USB"; }; reg_mipi_phy: regulator-mipi-phy { compatible = "regulator-fixed"; regulator-max-microvolt = <1000000>; regulator-min-microvolt = <1000000>; - regulator-name = "REG_MIPI_PHY"; + regulator-name = "MIPI_PHY"; }; - reg_ethphy: regulator-ethphy { + reg_module_eth1phy: regulator-module-eth1phy { compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio2 20 GPIO_ACTIVE_HIGH>; /* PMIC_EN_ETH */ @@ -79,8 +70,9 @@ regulator-boot-on; regulator-max-microvolt = <3300000>; regulator-min-microvolt = <3300000>; - regulator-name = "V3.3_ETH"; + regulator-name = "On-module +V3.3_ETH"; startup-delay-us = <200000>; + vin-supply = <&buck4_reg>; }; reg_usb0_vbus: regulator-usb0-vbus { @@ -116,9 +108,10 @@ pinctrl-0 = <&pinctrl_usdhc2_pwr_en>; regulator-max-microvolt = <3300000>; regulator-min-microvolt = <3300000>; - regulator-name = "V3.3_SD"; + regulator-name = "+V3.3_SD"; startup-delay-us = <2000>; off-on-delay = <100000>; + vin-supply = <&buck4_reg>; }; reserved-memory { @@ -155,7 +148,7 @@ &eqos { phy-handle = <ðphy0>; phy-mode = "rgmii-id"; -// phy-supply = <®_ethphy>; + phy-supply = <®_module_eth1phy>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_eqos>; @@ -283,6 +276,7 @@ regulator-max-microvolt = <2187500>; regulator-boot-on; regulator-always-on; + regulator-name = "On-module +VDD_SOC (buck1)"; regulator-ramp-delay = <3125>; }; @@ -293,6 +287,7 @@ regulator-max-microvolt = <2187500>; regulator-boot-on; regulator-always-on; + regulator-name = "On-module +VDD_ARM (buck2)"; regulator-ramp-delay = <3125>; }; @@ -323,6 +318,7 @@ regulator-max-microvolt = <3400000>; regulator-boot-on; regulator-always-on; + regulator-name = "On-module +VDD_DDR (buck6)"; }; ldo1_reg: regulator@6 { @@ -332,6 +328,7 @@ regulator-max-microvolt = <3300000>; regulator-boot-on; regulator-always-on; + regulator-name = "On-module +V1.8_SNVS (ldo1)"; }; ldo2_reg: regulator@7 { @@ -341,6 +338,7 @@ regulator-max-microvolt = <1150000>; regulator-boot-on; regulator-always-on; + regulator-name = "On-module +V0.8_SNVS (ldo2)"; }; ldo3_reg: regulator@8 { @@ -350,6 +348,7 @@ regulator-max-microvolt = <3300000>; regulator-boot-on; regulator-always-on; + regulator-name = "On-module +V1.8A (ldo3)"; }; ldo4_reg: regulator@9 { @@ -358,6 +357,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; + regulator-name = "On-module +V3.3_ADC (ldo4)"; }; ldo5_reg: regulator@10 { @@ -367,6 +367,8 @@ regulator-max-microvolt = <3300000>; regulator-boot-on; regulator-always-on; + regulator-name = + "On-module +V3.3_1.8_SD (ldo5)"; }; }; }; @@ -479,7 +481,6 @@ gpio-controller; reg = <0x21>; status = "disabled"; - vcc-supply = <®_3p3v>; }; lvds_ti_sn65dsi83: bridge@2c { @@ -568,7 +569,6 @@ <&clk IMX8MP_CLK_PCIE_AUX>; assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_500M>, <&clk IMX8MP_SYS_PLL2_50M>; - epdev_on-supply = <®_3p3v>; ext_osc = <0>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pcie>; @@ -1197,7 +1197,7 @@ MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d0 /* SODIMM 82 */ MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d0 /* SODIMM 70 */ MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d0 /* SODIMM 72 */ - MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0x4 + MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0x4 /* PMIC_USDHC_VSELECT */ >; }; |