Skip to content

Commit

Permalink
dts: reduce diff to StarFive VisionFive 2 device tree
Browse files Browse the repository at this point in the history 
Especially apply AXP15060 update, probably fixing CPUFreq:
starfive-tech@2191d96

Also remove execute bits from device tree sources.

Signed-off-by: MichaIng <[email protected]>
  • Loading branch information
@MichaIng
MichaIng committed May 18, 2024
1 parent 76a73fb commit c12b670
Show file tree
Hide file tree
Showing 4 changed files with 107 additions and 67 deletions.
Empty file modified arch/riscv/boot/dts/starfive/jh7110-pine64-pinetabv.dtsi
100755 → 100644
View file
Empty file.
44 changes: 21 additions & 23 deletions arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
priority = <160>;
};

};

&gpio {
Expand Down Expand Up @@ -65,24 +64,25 @@
starfive,pin-gpio-doen = <OEN_LOW>;
};

mmc0-pins-cLK {
starfive,pins = <PAD_SD0_CLK>;
starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(2) | GPIO_SLEW(1))>;
};

mmc0-pins-cmd {
starfive,pins = <PAD_SD0_CMD>;
starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(1))>;
};

mmc0-pins-data0 {
starfive,pins = <PAD_SD0_DATA0>;
starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(1))>;
};
mmc0-pins-data1 {
starfive,pins = <PAD_SD0_DATA1>;
mmc0-pins-cLK {
starfive,pins = <PAD_SD0_CLK>;
starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(2) | GPIO_SLEW(1))>;
};

mmc0-pins-cmd {
starfive,pins = <PAD_SD0_CMD>;
starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(1))>;
};

mmc0-pins-data0 {
starfive,pins = <PAD_SD0_DATA0>;
starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(1))>;
};

mmc0-pins-data1 {
starfive,pins = <PAD_SD0_DATA1>;
starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(1))>;
};
};

mmc0-pins-data2 {
starfive,pins = <PAD_SD0_DATA2>;
Expand Down Expand Up @@ -113,7 +113,6 @@
starfive,pins = <PAD_SD0_DATA7>;
starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)) | GPIO_DS(1))>;
};

};

sdcard1_pins: sdcard1-pins {
Expand Down Expand Up @@ -187,17 +186,17 @@
starfive,pin-gpio-doen = <OEN_HDMI0_DDC_SDA_OEN>;
starfive,pin-gpio-din = <GPI_HDMI0_DDC_SDA_IN>;
};

inno_hdmi-cec-pins {
starfive,pins = <PAD_GPIO14>;
//starfive,pinmux = <PAD_GPIO14_FUNC_SEL 0>;
starfive,pin-ioconfig = <IO(GPIO_IE(1) | (GPIO_PU(1)))>;
starfive,pin-gpio-doen = <OEN_HDMI0_CEC_SDA_OEN>;
starfive,pin-gpio-dout = <GPO_HDMI0_CEC_SDA_OUT>;
starfive,pin-gpio-din = <GPI_HDMI0_CEC_SDA_IN>;
};

inno_hdmi-hpd-pins {
starfive,pins = <PAD_GPIO15>;
//starfive,pinmux = <PAD_GPIO15_FUNC_SEL 0>;
starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
starfive,pin-gpio-doen = <OEN_HIGH>;
starfive,pin-gpio-din = <GPI_HDMI0_HPD>;
Expand Down Expand Up @@ -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 {
Expand Down
130 changes: 86 additions & 44 deletions arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dtsi
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/leds/common.h>
#include <dt-bindings/pinctrl/starfive,jh7110-pinfunc.h>
#include <dt-bindings/phy/phy.h>
#include "jh7110.dtsi"
#include "codecs/sf_pwmdac.dtsi"

Expand Down Expand Up @@ -134,7 +133,6 @@
radio-type = "wifi";
shutdown-gpios = <&gpioa 42 GPIO_ACTIVE_HIGH>;
};

};

&gpio {
Expand Down Expand Up @@ -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 = <PAD_GPIO46>;
// starfive,pinmux = <PAD_GPIO46_FUNC_SEL 0>;
// starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
Expand Down Expand Up @@ -379,6 +377,40 @@
starfive,pin-gpio-doen = <OEN_LOW>;
};
};

tdm0_pins: tdm0-pins {
tdm0-pins-tx {
starfive,pins = <PAD_GPIO44>;
starfive,pinmux = <PAD_GPIO44_FUNC_SEL 0>;
starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
starfive,pin-gpio-dout = <GPO_TDM0_PCM_TXD>;
starfive,pin-gpio-doen = <OEN_LOW>;
};

tdm0-pins-rx {
starfive,pins = <PAD_GPIO61>;
starfive,pinmux = <PAD_GPIO61_FUNC_SEL 0>;
starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
starfive,pin-gpio-doen = <OEN_HIGH>;
starfive,pin-gpio-din = <GPI_TDM0_PCM_RXD>;
};

tdm0-pins-sync {
starfive,pins = <PAD_GPIO63>;
starfive,pinmux = <PAD_GPIO63_FUNC_SEL 0>;
starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
starfive,pin-gpio-doen = <OEN_HIGH>;
starfive,pin-gpio-din = <GPI_TDM0_PCM_SYNCIN>;
};

tdm0-pins-pcmclk {
starfive,pins = <PAD_GPIO38>;
starfive,pinmux = <PAD_GPIO38_FUNC_SEL 0>;
starfive,pin-ioconfig = <IO(GPIO_IE(1))>;
starfive,pin-gpio-doen = <OEN_HIGH>;
starfive,pin-gpio-din = <GPI_TDM0_CLK_SLV>;
};
};

rfkill_wifi_pins: rfkill_wifi_pins {
rfkill_wifi_disn {
Expand All @@ -397,7 +429,6 @@
starfive,pin-gpio-doen = <OEN_HIGH>;
};
};

};

&uart0 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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";
};
Expand Down Expand Up @@ -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>;
Expand All @@ -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>;
Expand Down Expand Up @@ -679,6 +714,12 @@
status = "disabled";
};

&tdm {
pinctrl-names = "default";
pinctrl-0 = <&tdm0_pins>;
status = "disabled";
};

&pwmdac_codec {
status = "okay";
};
Expand Down Expand Up @@ -822,7 +863,7 @@
};

&co_process {
memory-region = <&e24_mem>;
memory-region = <&e24_mem>;
status = "okay";
};

Expand All @@ -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 {
Expand Down Expand Up @@ -889,3 +930,4 @@
};
};
};

Empty file modified arch/riscv/boot/dts/starfive/jh7110.dtsi
100755 → 100644
View file
Empty file.

0 comments on commit c12b670

Please sign in to comment.