From 5ad9195f83471a3c16f4fe8824a0febeaf568709 Mon Sep 17 00:00:00 2001 From: MichaIng Date: Sat, 18 May 2024 17:00:21 +0200 Subject: [PATCH] dts: reduce diff to StarFive VisionFive 2 device tree Especially apply AXP15060 update, probably fixing CPUFreq: https://github.com/starfive-tech/linux/commit/2191d96 Also remove execute bits from device tree sources. Signed-off-by: MichaIng --- .../dts/starfive/jh7110-pine64-pinetabv.dtsi | 0 .../dts/starfive/jh7110-pine64-star64.dts | 44 +++--- .../dts/starfive/jh7110-pine64-star64.dtsi | 130 ++++++++++++------ arch/riscv/boot/dts/starfive/jh7110.dtsi | 0 4 files changed, 107 insertions(+), 67 deletions(-) mode change 100755 => 100644 arch/riscv/boot/dts/starfive/jh7110-pine64-pinetabv.dtsi mode change 100755 => 100644 arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dtsi mode change 100755 => 100644 arch/riscv/boot/dts/starfive/jh7110.dtsi diff --git a/arch/riscv/boot/dts/starfive/jh7110-pine64-pinetabv.dtsi b/arch/riscv/boot/dts/starfive/jh7110-pine64-pinetabv.dtsi old mode 100755 new mode 100644 diff --git a/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts b/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts index 8dbe8f8947240..bd73b7cd8e2e4 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts @@ -17,7 +17,6 @@ gpios = <&gpio 35 GPIO_ACTIVE_HIGH>; priority = <160>; }; - }; &gpio { @@ -65,24 +64,25 @@ starfive,pin-gpio-doen = ; }; - mmc0-pins-cLK { - starfive,pins = ; - starfive,pin-ioconfig = ; - }; - - mmc0-pins-cmd { - starfive,pins = ; - starfive,pin-ioconfig = ; - }; - - mmc0-pins-data0 { - starfive,pins = ; - starfive,pin-ioconfig = ; - }; - mmc0-pins-data1 { - starfive,pins = ; + mmc0-pins-cLK { + starfive,pins = ; + starfive,pin-ioconfig = ; + }; + + mmc0-pins-cmd { + starfive,pins = ; + starfive,pin-ioconfig = ; + }; + + mmc0-pins-data0 { + starfive,pins = ; + starfive,pin-ioconfig = ; + }; + + mmc0-pins-data1 { + starfive,pins = ; starfive,pin-ioconfig = ; - }; + }; mmc0-pins-data2 { starfive,pins = ; @@ -113,7 +113,6 @@ starfive,pins = ; starfive,pin-ioconfig = ; }; - }; sdcard1_pins: sdcard1-pins { @@ -187,17 +186,17 @@ starfive,pin-gpio-doen = ; starfive,pin-gpio-din = ; }; + inno_hdmi-cec-pins { starfive,pins = ; - //starfive,pinmux = ; starfive,pin-ioconfig = ; starfive,pin-gpio-doen = ; starfive,pin-gpio-dout = ; starfive,pin-gpio-din = ; }; + inno_hdmi-hpd-pins { starfive,pins = ; - //starfive,pinmux = ; starfive,pin-ioconfig = ; starfive,pin-gpio-doen = ; starfive,pin-gpio-din = ; @@ -235,15 +234,14 @@ &mmc1 { pinctrl-names = "default"; pinctrl-0 = <&sdcard1_pins>; - //cd-gpios = <&gpio 41 0>; status = "okay"; }; &hdmi { - status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&inno_hdmi_pins>; hpd-gpio = <&gpio 15 GPIO_ACTIVE_HIGH>; + status = "okay"; }; &i2stx_4ch0 { diff --git a/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dtsi b/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dtsi old mode 100755 new mode 100644 index 4c360713c4796..f0b056a0ffa49 --- a/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dtsi @@ -8,7 +8,6 @@ #include #include #include -#include #include "jh7110.dtsi" #include "codecs/sf_pwmdac.dtsi" @@ -134,7 +133,6 @@ radio-type = "wifi"; shutdown-gpios = <&gpioa 42 GPIO_ACTIVE_HIGH>; }; - }; &gpio { @@ -240,7 +238,7 @@ }; pwm_pins: pwm-pins { - // pwm_ch0-pins { GPIO46 is used by WIFI WIFI_ON signal + //pwm_ch0-pins { GPIO46 is used by WIFI WIFI_ON signal // starfive,pins = ; // starfive,pinmux = ; // starfive,pin-ioconfig = ; @@ -379,6 +377,40 @@ starfive,pin-gpio-doen = ; }; }; + + tdm0_pins: tdm0-pins { + tdm0-pins-tx { + starfive,pins = ; + starfive,pinmux = ; + starfive,pin-ioconfig = ; + starfive,pin-gpio-dout = ; + starfive,pin-gpio-doen = ; + }; + + tdm0-pins-rx { + starfive,pins = ; + starfive,pinmux = ; + starfive,pin-ioconfig = ; + starfive,pin-gpio-doen = ; + starfive,pin-gpio-din = ; + }; + + tdm0-pins-sync { + starfive,pins = ; + starfive,pinmux = ; + starfive,pin-ioconfig = ; + starfive,pin-gpio-doen = ; + starfive,pin-gpio-din = ; + }; + + tdm0-pins-pcmclk { + starfive,pins = ; + starfive,pinmux = ; + starfive,pin-ioconfig = ; + starfive,pin-gpio-doen = ; + starfive,pin-gpio-din = ; + }; + }; rfkill_wifi_pins: rfkill_wifi_pins { rfkill_wifi_disn { @@ -397,7 +429,6 @@ starfive,pin-gpio-doen = ; }; }; - }; &uart0 { @@ -463,58 +494,62 @@ }; pmic: axp15060_reg@36 { - compatible = "stf,axp15060-regulator"; + compatible = "x-powers,axp15060"; reg = <0x36>; regulators { mipi_0p9: ALDO1 { regulator-boot-on; - regulator-compatible = "mipi_0p9"; + regulator-compatible = "aldo1"; regulator-name = "mipi_0p9"; regulator-min-microvolt = <900000>; regulator-max-microvolt = <900000>; }; + hdmi_0p9: ALDO5 { regulator-boot-on; - regulator-compatible = "hdmi_0p9"; + regulator-compatible = "aldo5"; regulator-name = "hdmi_0p9"; regulator-min-microvolt = <900000>; regulator-max-microvolt = <900000>; }; + hdmi_1p8: ALDO3 { regulator-boot-on; - regulator-compatible = "hdmi_1p8"; + regulator-compatible = "aldo3"; regulator-name = "hdmi_1p8"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; + sdio_vdd: ALDO4 { regulator-boot-on; regulator-always-on; - regulator-compatible = "sdio_vdd"; + regulator-compatible = "aldo4"; regulator-name = "sdio_vdd"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; }; + vcc_3v3: DCDC1 { regulator-boot-on; regulator-always-on; - regulator-compatible = "vcc_3v3"; + regulator-compatible = "dcdc1"; regulator-name = "vcc_3v3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; + cpu_vdd: DCDC2 { regulator-boot-on; regulator-always-on; - regulator-compatible = "cpu_vdd"; + regulator-compatible = "dcdc2"; regulator-name = "cpu_vdd"; regulator-min-microvolt = <500000>; regulator-max-microvolt = <1540000>; }; }; }; - }; &i2c6 { @@ -547,14 +582,14 @@ &mmc1 { max-frequency = <100000000>; - assigned-clocks = <&clkgen JH7110_SDIO0_CLK_SDCARD>; + assigned-clocks = <&clkgen JH7110_SDIO1_CLK_SDCARD>; assigned-clock-rates = <50000000>; card-detect-delay = <300>; bus-width = <4>; - cap-sd-highspeed; no-sdio; no-mmc; broken-cd; + cap-sd-highspeed; post-power-on-delay-ms = <200>; status = "okay"; }; @@ -595,20 +630,20 @@ status = "okay"; #address-cells = <1>; #size-cells = <0>; - clock-names = "gtx", - "tx", - "ptp_ref", - "stmmaceth", - "pclk", - "gtxc", - "rmii_rtx"; - clocks = <&clkgen JH7110_GMAC0_GTXCLK>, - <&clkgen JH7110_U0_GMAC5_CLK_TX>, - <&clkgen JH7110_GMAC0_PTP>, - <&clkgen JH7110_U0_GMAC5_CLK_AHB>, - <&clkgen JH7110_U0_GMAC5_CLK_AXI>, - <&clkgen JH7110_GMAC0_GTXC>, - <&clkgen JH7110_GMAC0_RMII_RTX>; + clock-names = "gtx", + "tx", + "ptp_ref", + "stmmaceth", + "pclk", + "gtxc", + "rmii_rtx"; + clocks = <&clkgen JH7110_GMAC0_GTXCLK>, + <&clkgen JH7110_U0_GMAC5_CLK_TX>, + <&clkgen JH7110_GMAC0_PTP>, + <&clkgen JH7110_U0_GMAC5_CLK_AHB>, + <&clkgen JH7110_U0_GMAC5_CLK_AXI>, + <&clkgen JH7110_GMAC0_GTXC>, + <&clkgen JH7110_GMAC0_RMII_RTX>; phy0: ethernet-phy@0 { rgmii_sw_dr_2 = <0x0>; @@ -628,20 +663,20 @@ #address-cells = <1>; #size-cells = <0>; status = "okay"; - clock-names = "gtx", - "tx", - "ptp_ref", - "stmmaceth", - "pclk", - "gtxc", - "rmii_rtx"; - clocks = <&clkgen JH7110_GMAC1_GTXCLK>, - <&clkgen JH7110_GMAC5_CLK_TX>, - <&clkgen JH7110_GMAC5_CLK_PTP>, - <&clkgen JH7110_GMAC5_CLK_AHB>, - <&clkgen JH7110_GMAC5_CLK_AXI>, - <&clkgen JH7110_GMAC1_GTXC>, - <&clkgen JH7110_GMAC1_RMII_RTX>; + clock-names = "gtx", + "tx", + "ptp_ref", + "stmmaceth", + "pclk", + "gtxc", + "rmii_rtx"; + clocks = <&clkgen JH7110_GMAC1_GTXCLK>, + <&clkgen JH7110_GMAC5_CLK_TX>, + <&clkgen JH7110_GMAC5_CLK_PTP>, + <&clkgen JH7110_GMAC5_CLK_AHB>, + <&clkgen JH7110_GMAC5_CLK_AXI>, + <&clkgen JH7110_GMAC1_GTXC>, + <&clkgen JH7110_GMAC1_RMII_RTX>; phy1: ethernet-phy@1 { rgmii_sw_dr_2 = <0x0>; @@ -679,6 +714,12 @@ status = "disabled"; }; +&tdm { + pinctrl-names = "default"; + pinctrl-0 = <&tdm0_pins>; + status = "disabled"; +}; + &pwmdac_codec { status = "okay"; }; @@ -822,7 +863,7 @@ }; &co_process { - memory-region = <&e24_mem>; + memory-region = <&e24_mem>; status = "okay"; }; @@ -841,9 +882,9 @@ <&rstgen RSTN_U0_CDN_USB_UTMI_APB>; reset-names = "pwrup","apb","axi","utmi"; dr_mode = "host"; /*host or peripheral*/ - status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&usb_pins>; + status = "okay"; }; &xrp { @@ -889,3 +930,4 @@ }; }; }; + diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi old mode 100755 new mode 100644