| Message ID | 20241007090244.1731-1-macpaul.lin@mediatek.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/2] arm64: dts: mediatek: mt8390-genio-700-evk: update regulator names | expand |
On Mon, 07 Oct 2024 17:02:43 +0800, Macpaul Lin wrote: > Update regulator names to match schematics, replacing generic terms. > 1. Add system wide 'reg_vsys' node for 4.2V power rail. > 2. Add 'reg_vsys' node as 'vin-supply' for the following nodes > - common_fixed_5v, edp_panel_fixed_3v3, gpio_fixed_3v3, sdio_fixed_3v3, > touch0_fixed_3v3, usb_hub_fixed_3v3, usb_p0_vbus, and usb_p1_vbus. > 3. Update regulator names according to the stable output name on > schematics. > - vdd_5v, vedp_3v3, ext_3v3, vio18_conn, wifi_3v3, vio33_tp1, vhub_3v3, > vbus_p0, vbus_p1. > - vcn18_pmu, vcn33_2_pmu, dvdd_proc_l, dvdd_core, vpa_pmu, dvdd_adsp, > va12_abb2_pmu, vsim1_pmu, vufs18_pmu. > 4. Remove usb_hub_reset_1v8. Use 'hub' node to probe USB HUB > in subsequent patches. > > Suggested-by: Chen-Yu Tsai <wenst@chromium.org> > Signed-off-by: Macpaul Lin <macpaul.lin@mediatek.com> > --- > .../dts/mediatek/mt8390-genio-700-evk.dts | 65 ++++++++++++------- > 1 file changed, 42 insertions(+), 23 deletions(-) > > Changes for v2: > - Add Suggested-by: tag. > - Rebase on mediatek/dts64 branch (v6.12-rc1) > My bot found new DTB warnings on the .dts files added or changed in this series. Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings are fixed by another series. Ultimately, it is up to the platform maintainer whether these warnings are acceptable or not. No need to reply unless the platform maintainer has comments. If you already ran DT checks and didn't see these error(s), then make sure dt-schema is up to date: pip3 install dtschema --upgrade New warnings running 'make CHECK_DTBS=y mediatek/mt8390-genio-700-evk.dtb' for 20241007090244.1731-1-macpaul.lin@mediatek.com: arch/arm64/boot/dts/mediatek/mt8390-genio-700-evk.dtb: /soc/pwrap@10024000/pmic/keys: failed to match any schema with compatible: ['mediatek,mt6359-keys']
Il 07/10/24 11:02, Macpaul Lin ha scritto: > Update regulator names to match schematics, replacing generic terms. > 1. Add system wide 'reg_vsys' node for 4.2V power rail. > 2. Add 'reg_vsys' node as 'vin-supply' for the following nodes > - common_fixed_5v, edp_panel_fixed_3v3, gpio_fixed_3v3, sdio_fixed_3v3, > touch0_fixed_3v3, usb_hub_fixed_3v3, usb_p0_vbus, and usb_p1_vbus. > 3. Update regulator names according to the stable output name on > schematics. > - vdd_5v, vedp_3v3, ext_3v3, vio18_conn, wifi_3v3, vio33_tp1, vhub_3v3, > vbus_p0, vbus_p1. > - vcn18_pmu, vcn33_2_pmu, dvdd_proc_l, dvdd_core, vpa_pmu, dvdd_adsp, > va12_abb2_pmu, vsim1_pmu, vufs18_pmu. > 4. Remove usb_hub_reset_1v8. Use 'hub' node to probe USB HUB > in subsequent patches. > > Suggested-by: Chen-Yu Tsai <wenst@chromium.org> > Signed-off-by: Macpaul Lin <macpaul.lin@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
On Mon, 07 Oct 2024 17:02:43 +0800, Macpaul Lin wrote: > Update regulator names to match schematics, replacing generic terms. > 1. Add system wide 'reg_vsys' node for 4.2V power rail. > 2. Add 'reg_vsys' node as 'vin-supply' for the following nodes > - common_fixed_5v, edp_panel_fixed_3v3, gpio_fixed_3v3, sdio_fixed_3v3, > touch0_fixed_3v3, usb_hub_fixed_3v3, usb_p0_vbus, and usb_p1_vbus. > 3. Update regulator names according to the stable output name on > schematics. > - vdd_5v, vedp_3v3, ext_3v3, vio18_conn, wifi_3v3, vio33_tp1, vhub_3v3, > vbus_p0, vbus_p1. > - vcn18_pmu, vcn33_2_pmu, dvdd_proc_l, dvdd_core, vpa_pmu, dvdd_adsp, > va12_abb2_pmu, vsim1_pmu, vufs18_pmu. > 4. Remove usb_hub_reset_1v8. Use 'hub' node to probe USB HUB > in subsequent patches. > > [...] Applied to mediatek-next, thanks! [1/2] arm64: dts: mediatek: mt8390-genio-700-evk: update regulator names commit: 54a1168b1a0adf9ee033b29bf32affca6059be7e [2/2] arm64: dts: mediatek: mt8390-genio-700-evk: add keys and USB HUB commit: 46c2803425543deff4cb9be01da0cbd4bd6045a7 Cheers, Angelo
On Mon, 07 Oct 2024 17:02:43 +0800, Macpaul Lin wrote: > Update regulator names to match schematics, replacing generic terms. > 1. Add system wide 'reg_vsys' node for 4.2V power rail. > 2. Add 'reg_vsys' node as 'vin-supply' for the following nodes > - common_fixed_5v, edp_panel_fixed_3v3, gpio_fixed_3v3, sdio_fixed_3v3, > touch0_fixed_3v3, usb_hub_fixed_3v3, usb_p0_vbus, and usb_p1_vbus. > 3. Update regulator names according to the stable output name on > schematics. > - vdd_5v, vedp_3v3, ext_3v3, vio18_conn, wifi_3v3, vio33_tp1, vhub_3v3, > vbus_p0, vbus_p1. > - vcn18_pmu, vcn33_2_pmu, dvdd_proc_l, dvdd_core, vpa_pmu, dvdd_adsp, > va12_abb2_pmu, vsim1_pmu, vufs18_pmu. > 4. Remove usb_hub_reset_1v8. Use 'hub' node to probe USB HUB > in subsequent patches. > > [...] Applied to v6.12-next/dts64, thanks! [1/2] arm64: dts: mediatek: mt8390-genio-700-evk: update regulator names commit: 4fcf4347c2a74bbc297b6f626de4ad0ca8fee96b [2/2] arm64: dts: mediatek: mt8390-genio-700-evk: add keys and USB HUB commit: 13799dcd86813793349bf2136937bca91ae73253 Cheers, Angelo
Il 07/10/24 11:02, Macpaul Lin ha scritto: > Update regulator names to match schematics, replacing generic terms. > 1. Add system wide 'reg_vsys' node for 4.2V power rail. > 2. Add 'reg_vsys' node as 'vin-supply' for the following nodes > - common_fixed_5v, edp_panel_fixed_3v3, gpio_fixed_3v3, sdio_fixed_3v3, > touch0_fixed_3v3, usb_hub_fixed_3v3, usb_p0_vbus, and usb_p1_vbus. > 3. Update regulator names according to the stable output name on > schematics. > - vdd_5v, vedp_3v3, ext_3v3, vio18_conn, wifi_3v3, vio33_tp1, vhub_3v3, > vbus_p0, vbus_p1. > - vcn18_pmu, vcn33_2_pmu, dvdd_proc_l, dvdd_core, vpa_pmu, dvdd_adsp, > va12_abb2_pmu, vsim1_pmu, vufs18_pmu. > 4. Remove usb_hub_reset_1v8. Use 'hub' node to probe USB HUB > in subsequent patches. > > Suggested-by: Chen-Yu Tsai <wenst@chromium.org> > Signed-off-by: Macpaul Lin <macpaul.lin@mediatek.com> Please disregard the first "applied" email, as that was on the wrong kernel tree. I confirm the series was applied to v6.12-next/dts64 and that this is the right tree and right branch. Cheers, Angelo
diff --git a/arch/arm64/boot/dts/mediatek/mt8390-genio-700-evk.dts b/arch/arm64/boot/dts/mediatek/mt8390-genio-700-evk.dts index 0a6c9871b41e..96b272567cb1 100644 --- a/arch/arm64/boot/dts/mediatek/mt8390-genio-700-evk.dts +++ b/arch/arm64/boot/dts/mediatek/mt8390-genio-700-evk.dts @@ -87,103 +87,113 @@ vpu_mem: memory@57000000 { common_fixed_5v: regulator-0 { compatible = "regulator-fixed"; - regulator-name = "5v_en"; + regulator-name = "vdd_5v"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; gpio = <&pio 10 GPIO_ACTIVE_HIGH>; enable-active-high; regulator-always-on; + vin-supply = <®_vsys>; }; edp_panel_fixed_3v3: regulator-1 { compatible = "regulator-fixed"; - regulator-name = "edp_panel_3v3"; + regulator-name = "vedp_3v3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; enable-active-high; gpio = <&pio 15 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&edp_panel_3v3_en_pins>; + vin-supply = <®_vsys>; }; gpio_fixed_3v3: regulator-2 { compatible = "regulator-fixed"; - regulator-name = "gpio_3v3_en"; + regulator-name = "ext_3v3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&pio 9 GPIO_ACTIVE_HIGH>; enable-active-high; regulator-always-on; + vin-supply = <®_vsys>; }; + /* system wide 4.2V power rail from charger */ + reg_vsys: regulator-vsys { + compatible = "regulator-fixed"; + regulator-name = "vsys"; + regulator-always-on; + regulator-boot-on; + }; + + /* used by mmc2 */ sdio_fixed_1v8: regulator-3 { compatible = "regulator-fixed"; - regulator-name = "sdio_io"; + regulator-name = "vio18_conn"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; enable-active-high; regulator-always-on; }; + /* used by mmc2 */ sdio_fixed_3v3: regulator-4 { compatible = "regulator-fixed"; - regulator-name = "sdio_card"; + regulator-name = "wifi_3v3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&pio 74 GPIO_ACTIVE_HIGH>; enable-active-high; regulator-always-on; + vin-supply = <®_vsys>; }; touch0_fixed_3v3: regulator-5 { compatible = "regulator-fixed"; - regulator-name = "touch_3v3"; + regulator-name = "vio33_tp1"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&pio 119 GPIO_ACTIVE_HIGH>; enable-active-high; + vin-supply = <®_vsys>; }; usb_hub_fixed_3v3: regulator-6 { compatible = "regulator-fixed"; - regulator-name = "usb_hub_3v3"; + regulator-name = "vhub_3v3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&pio 112 GPIO_ACTIVE_HIGH>; /* HUB_3V3_EN */ startup-delay-us = <10000>; enable-active-high; + vin-supply = <®_vsys>; }; - usb_hub_reset_1v8: regulator-7 { - compatible = "regulator-fixed"; - regulator-name = "usb_hub_reset"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - gpio = <&pio 7 GPIO_ACTIVE_HIGH>; /* HUB_RESET */ - vin-supply = <&usb_hub_fixed_3v3>; - }; - - usb_p0_vbus: regulator-8 { + usb_p0_vbus: regulator-7 { compatible = "regulator-fixed"; - regulator-name = "usb_p0_vbus"; + regulator-name = "vbus_p0"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; gpio = <&pio 84 GPIO_ACTIVE_HIGH>; enable-active-high; + vin-supply = <®_vsys>; }; - usb_p1_vbus: regulator-9 { + usb_p1_vbus: regulator-8 { compatible = "regulator-fixed"; - regulator-name = "usb_p1_vbus"; + regulator-name = "vbus_p1"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; gpio = <&pio 87 GPIO_ACTIVE_HIGH>; enable-active-high; + vin-supply = <®_vsys>; }; - usb_p2_vbus: regulator-10 { + /* used by ssusb2 */ + usb_p2_vbus: regulator-9 { compatible = "regulator-fixed"; - regulator-name = "usb_p2_vbus"; + regulator-name = "wifi_3v3"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; enable-active-high; @@ -308,22 +318,27 @@ &mt6359_vbbck_ldo_reg { }; &mt6359_vcn18_ldo_reg { + regulator-name = "vcn18_pmu"; regulator-always-on; }; &mt6359_vcn33_2_bt_ldo_reg { + regulator-name = "vcn33_2_pmu"; regulator-always-on; }; &mt6359_vcore_buck_reg { + regulator-name = "dvdd_proc_l"; regulator-always-on; }; &mt6359_vgpu11_buck_reg { + regulator-name = "dvdd_core"; regulator-always-on; }; &mt6359_vpa_buck_reg { + regulator-name = "vpa_pmu"; regulator-max-microvolt = <3100000>; }; @@ -337,14 +352,17 @@ &mt6359_vproc2_buck_reg { }; &mt6359_vpu_buck_reg { + regulator-name = "dvdd_adsp"; regulator-always-on; }; &mt6359_vrf12_ldo_reg { + regulator-name = "va12_abb2_pmu"; regulator-always-on; }; &mt6359_vsim1_ldo_reg { + regulator-name = "vsim1_pmu"; regulator-enable-ramp-delay = <480>; }; @@ -358,6 +376,7 @@ &mt6359_vsram_others_ldo_reg { }; &mt6359_vufs_ldo_reg { + regulator-name = "vufs18_pmu"; regulator-always-on; }; @@ -902,10 +921,10 @@ &xhci0 { &xhci1 { status = "okay"; vusb33-supply = <&mt6359_vusb_ldo_reg>; - vbus-supply = <&usb_hub_reset_1v8>; }; &xhci2 { status = "okay"; vusb33-supply = <&mt6359_vusb_ldo_reg>; + vbus-supply = <&sdio_fixed_3v3>; /* wifi_3v3 */ };
Update regulator names to match schematics, replacing generic terms. 1. Add system wide 'reg_vsys' node for 4.2V power rail. 2. Add 'reg_vsys' node as 'vin-supply' for the following nodes - common_fixed_5v, edp_panel_fixed_3v3, gpio_fixed_3v3, sdio_fixed_3v3, touch0_fixed_3v3, usb_hub_fixed_3v3, usb_p0_vbus, and usb_p1_vbus. 3. Update regulator names according to the stable output name on schematics. - vdd_5v, vedp_3v3, ext_3v3, vio18_conn, wifi_3v3, vio33_tp1, vhub_3v3, vbus_p0, vbus_p1. - vcn18_pmu, vcn33_2_pmu, dvdd_proc_l, dvdd_core, vpa_pmu, dvdd_adsp, va12_abb2_pmu, vsim1_pmu, vufs18_pmu. 4. Remove usb_hub_reset_1v8. Use 'hub' node to probe USB HUB in subsequent patches. Suggested-by: Chen-Yu Tsai <wenst@chromium.org> Signed-off-by: Macpaul Lin <macpaul.lin@mediatek.com> --- .../dts/mediatek/mt8390-genio-700-evk.dts | 65 ++++++++++++------- 1 file changed, 42 insertions(+), 23 deletions(-) Changes for v2: - Add Suggested-by: tag. - Rebase on mediatek/dts64 branch (v6.12-rc1)