MediaTek MT7629 OF_UPSTREAM migration
Subsystems (4)
cover MediaTek MT7629 OF_UPSTREAM migration
This patch series migrates MediaTek MT7629 to OF_UPSTREAM
Sam Shih (2):
clk: mediatek: mt7629: fix gate offset of peri clock tree
board: mediatek: mt7629: Migrate to OF_UPSTREAM
arch/arm/dts/mt7629-rfb-u-boot.dtsi | 113 +++++++- arch/arm/dts/mt7629-rfb.dts | 123 --------- arch/arm/dts/mt7629.dtsi | 360 ------------------------- configs/mt7629_rfb_defconfig | 3 +- drivers/clk/mediatek/clk-mt7629.c | 14 +- include/dt-bindings/clock/mt7629-clk.h | 206 -------------- 6 files changed, 127 insertions(+), 692 deletions(-) delete mode 100644 arch/arm/dts/mt7629-rfb.dts delete mode 100644 arch/arm/dts/mt7629.dtsi delete mode 100644 include/dt-bindings/clock/mt7629-clk.h
Signature · 1 line
2.34.1
PATCH 1/2 clk: mediatek: mt7629: fix gate offset of peri clock tree
From: Sam Shih <[email protected]>
The clock definitions in mt7629-clk.h indicate that CLK_PERIBUS_SEL is the first element in the pericfg clock tree and also serves as a clock mux, unlike other clocks belonging to the clock gate in pericfg.
This make the clock consumer get a wrong clock gate during request a clock from <&pericfg>.
Since CLK_PERIBUS_SEL clock is not required in U-Boot, add a clock gate offset for the pericfg clock tree to resolve this problem.
--- drivers/clk/mediatek/clk-mt7629.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/clk/mediatek/clk-mt7629.c +13 -1
@@ -574,6 +574,18 @@ static const struct mtk_clk_tree mt7629_clk_tree = { .muxes = top_muxes, }; +static const struct mtk_clk_tree mt7629_peri_clk_tree = { + .xtal_rate =40 *MHZ , + .xtal2_rate =20 *MHZ , + .gates_offs =CLK_PERI_PWM1_PD , + .fdivs_offs =CLK_TOP_TO_USB3_SYS , + .muxes_offs =CLK_TOP_AXI_SEL , + .plls = apmixed_plls, + .fclks = top_fixed_clks, + .fdivs = top_fixed_divs, + .muxes = top_muxes, +}; +static int mt7629_mcucfg_probe (struct udevice *dev) {void __iomem *base;
@@ -619,7 +631,7 @@ static int mt7629_infracfg_probe(struct udevice *dev)static int mt7629_pericfg_probe (struct udevice *dev) { -return mtk_common_clk_gate_init (dev, &mt7629_clk_tree, peri_cgs); +return mtk_common_clk_gate_init (dev, &mt7629_peri_clk_tree, peri_cgs); }static int mt7629_ethsys_probe (struct udevice *dev)
Signature · 1 line
2.34.1
PATCH 2/2 board: mediatek: mt7629: Migrate to OF_UPSTREAM
In reply to Weijie GaoFrom: Sam Shih <[email protected]>
Move differences in DT files between upstream Linux DT and U-Boot DT to mt7629-rfb-u-boot.dtsi.
Remove old copies of mt7629-related clock bindings, .dts, and .dtsi files. Update defconfig to switch the whole mt7629 SoC to use OF_UPSTREAM.
--- arch/arm/dts/mt7629-rfb-u-boot.dtsi | 113 +++++++- arch/arm/dts/mt7629-rfb.dts | 123 --------- arch/arm/dts/mt7629.dtsi | 360 ------------------------- configs/mt7629_rfb_defconfig | 3 +- include/dt-bindings/clock/mt7629-clk.h | 206 -------------- 5 files changed, 114 insertions(+), 691 deletions(-) delete mode 100644 arch/arm/dts/mt7629-rfb.dts delete mode 100644 arch/arm/dts/mt7629.dtsi delete mode 100644 include/dt-bindings/clock/mt7629-clk.h
arch/arm/dts/mt7629-rfb-u-boot.dtsi +112 -1
@@ -5,6 +5,53 @@ * Author: Weijie Gao <[email protected]> */ +#include <dt-bindings/reset/mt7629-reset.h> + +/ { + dramc: dramc@10203000 { + compatible = "mediatek,mt7629-dramc"; + reg = <0x10203000 0x600>, /* EMI */ + <0x10213000 0x1000>, /* DDRPHY */ + <0x10214000 0xd00>; /* DRAMC_AO */ + clocks = <&topckgen CLK_TOP_DDRPHYCFG_SEL>, + <&topckgen CLK_TOP_SYSPLL1_D8>, + <&topckgen CLK_TOP_MEM_SEL>, + <&topckgen CLK_TOP_DMPLL>; + clock-names = "phy", "phy_mux", "mem", "mem_mux"; + }; + + mcucfg: syscon@10200000 { + compatible = "mediatek,mt7629-mcucfg", "syscon"; + reg = <0x10200000 0x1000>; + #clock-cells = <1>; + }; + + timer0: timer@10004000 { + compatible = "mediatek,timer"; + reg = <0x10004000 0x80>; + interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_LOW>; + clocks = <&topckgen CLK_TOP_CLKXTAL_D4>, + <&topckgen CLK_TOP_10M_SEL>; + clock-names = "mux", "src"; + }; + + snand: snand@1100d000 { + compatible = "mediatek,mt7629-snand"; + reg = <0x1100d000 0x1000>, + <0x1100e000 0x1000>; + reg-names = "nfi", "ecc"; + clocks = <&pericfg CLK_PERI_NFI_PD>, + <&pericfg CLK_PERI_SNFI_PD>, + <&pericfg CLK_PERI_NFIECC_PD>; + clock-names = "nfi_clk", "pad_clk", "ecc_clk"; + assigned-clocks = <&topckgen CLK_TOP_AXI_SEL>, + <&topckgen CLK_TOP_NFI_INFRA_SEL>; + assigned-clock-parents = <&topckgen CLK_TOP_SYSPLL1_D2>, + <&topckgen CLK_TOP_UNIVPLL2_D8>; + status = "disabled"; + }; +}; + &infracfg { bootph-all; };
@@ -35,8 +82,72 @@ &uart0 { bootph-all; + reg-shift = <2>; + assigned-clocks = <&topckgen CLK_TOP_AXI_SEL>; + assigned-clock-parents = <&topckgen CLK_TOP_SYSPLL1_D2>; +}; + +&qspi { + bootph-all; + compatible = "mediatek,mtk-snor"; + reg = <0x11014000 0x1000>; + pinctrl-names = "default"; + pinctrl-0 = <&qspi_pins>; + status = "okay"; + + /delete-node/ flash@0; + + spi-flash@0{ + bootph-all; + compatible = "jedec,spi-nor"; + reg = <0>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; +}; + +&pio { + bootph-all; + snfi_pins: snfi-pins { + mux { + bootph-all; + function = "flash"; + groups = "snfi"; + }; + }; + snor_pins: snor-pins { + mux { + bootph-all; + function = "flash"; + groups = "spi_nor"; + }; + }; }; -&snfi { +&snand { + pinctrl-names = "default"; + pinctrl-0 = <&snfi_pins>; + status = "okay"; + quad-spi; bootph-all; }; + +ð { + resets = <ðsys ETHSYS_FE_RST>; + reset-names = "fe"; + status = "okay"; + mediatek,gmac-id = <0>; + phy-mode = "2500base-x"; + mediatek,switch = "mt7531"; + reset-gpios = <&pio 28 GPIO_ACTIVE_HIGH>; + assigned-clocks = <&topckgen CLK_TOP_ETH_SEL>, + <&topckgen CLK_TOP_F10M_REF_SEL>, + <&topckgen CLK_TOP_SGMII_REF_1_SEL>; + assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL1_D2>, + <&topckgen CLK_TOP_SYSPLL4_D16>, + <&topckgen CLK_TOP_SGMIIPLL_D2>; + fixed-link { + speed = <2500>; + full-duplex; + }; +};
arch/arm/dts/mt7629-rfb.dts deleted +0 -123
123 lines not on this page · raw message
arch/arm/dts/mt7629.dtsi deleted +0 -360
360 lines not on this page · raw message
configs/mt7629_rfb_defconfig +2 -1
@@ -9,7 +9,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x41fffef0 CONFIG_ENV_SIZE=0x1000 -CONFIG_DEFAULT_DEVICE_TREE="mt7629-rfb" +CONFIG_DEFAULT_DEVICE_TREE="mediatek/mt7629-rfb" CONFIG_TARGET_MT7629=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y
@@ -52,6 +52,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_LOG=y +CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-parents" CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
include/dt-bindings/clock/mt7629-clk.h deleted +0 -206
206 lines not on this page · raw message
Signature · 1 line
2.34.1