diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml index d8e86445fbe731..02e522aea292a0 100644 --- a/Documentation/devicetree/bindings/arm/fsl.yaml +++ b/Documentation/devicetree/bindings/arm/fsl.yaml @@ -1275,8 +1275,10 @@ properties: - description: PHYTEC phyCORE-i.MX93 SoM based boards items: - - const: phytec,imx93-phyboard-nash # phyBOARD-Nash-i.MX93 - - const: phytec,imx93-phyboard-segin # phyBOARD-Segin with i.MX93 + - enum: + - chargebyte,imx93-charge-control-y # chargebyte Charge Control Y + - phytec,imx93-phyboard-nash # phyBOARD-Nash-i.MX93 + - phytec,imx93-phyboard-segin # phyBOARD-Segin with i.MX93 - const: phytec,imx93-phycore-som # phyCORE-i.MX93 SoM - const: fsl,imx93 diff --git a/arch/arm64/boot/dts/freescale/imx93-charge-control-y.dts b/arch/arm64/boot/dts/freescale/imx93-charge-control-y.dts index b8efc0adda6002..b3d01613de8d09 100644 --- a/arch/arm64/boot/dts/freescale/imx93-charge-control-y.dts +++ b/arch/arm64/boot/dts/freescale/imx93-charge-control-y.dts @@ -21,14 +21,14 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_user_leds>; - USER_RED { + led-user-red { color = ; function = LED_FUNCTION_BOOT; gpios = <&gpio2 24 GPIO_ACTIVE_HIGH>; linux,default-trigger = "timer"; }; - USER_GREEN { + led-user-green { color = ; function = LED_FUNCTION_SD; gpios = <&gpio2 16 GPIO_ACTIVE_HIGH>; @@ -97,7 +97,7 @@ status = "okay"; ethernet@0 { - compatible = "microchip,lan8651"; + compatible = "microchip,lan8651", "microchip,lan8650"; reg = <0>; interrupt-parent = <&gpio2>; interrupts = <7 IRQ_TYPE_EDGE_FALLING>; @@ -130,13 +130,12 @@ &mdio { ethphy2: ethernet-phy@2 { reg = <2>; - compatible = "ethernet-phy-id2000.a111", "ethernet-phy-ieee802.3-c22"; + compatible = "ethernet-phy-ieee802.3-c22"; reset-gpios = <&gpio4 13 GPIO_ACTIVE_LOW>; reset-assert-us = <30>; }; }; -/* EEPROM SPI */ &lpi2c3 { pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_lpi2c3>; @@ -169,7 +168,7 @@ /* SD */ &usdhc2 { - pinctrl-names = "default", "state_100mhz", "state_200mhz"; + pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc2_default>; bus-width = <4>; no-1-8-v;