| Message ID | 40598de79a6317fdd3a44dfe29ce4223e1e0d3ed.1649671814.git.lorenzo@kernel.org |
|---|---|
| State | Accepted |
| Commit | 4263f77a5144f708a00aa8e9570b392777ab2482 |
| Headers | show |
| Series | [net-next] net: ethernet: mtk_eth_soc: use standard property for cci-control-port | expand |
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Mon, 11 Apr 2022 12:13:25 +0200 you wrote: > Rely on standard cci-control-port property to identify CCI port > reference. > Update mt7622 dts binding. > > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> > --- > arch/arm64/boot/dts/mediatek/mt7622.dtsi | 2 +- > drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Here is the summary with links: - [net-next] net: ethernet: mtk_eth_soc: use standard property for cci-control-port https://git.kernel.org/netdev/net-next/c/4263f77a5144 You are awesome, thank you!
diff --git a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/mediatek/mt7622.dtsi index 47d223e28f8d..f232f8baf4e8 100644 --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi @@ -970,7 +970,7 @@ eth: ethernet@1b100000 { power-domains = <&scpsys MT7622_POWER_DOMAIN_ETHSYS>; mediatek,ethsys = <ðsys>; mediatek,sgmiisys = <&sgmiisys>; - mediatek,cci-control = <&cci_control2>; + cci-control-port = <&cci_control2>; mediatek,wed = <&wed0>, <&wed1>; mediatek,pcie-mirror = <&pcie_mirror>; mediatek,hifsys = <&hifsys>; diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 209d00f56f62..18eebcaa6a76 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -3149,7 +3149,7 @@ static int mtk_probe(struct platform_device *pdev) struct regmap *cci; cci = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, - "mediatek,cci-control"); + "cci-control-port"); /* enable CPU/bus coherency */ if (!IS_ERR(cci)) regmap_write(cci, 0, 3);
Rely on standard cci-control-port property to identify CCI port reference. Update mt7622 dts binding. Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> --- arch/arm64/boot/dts/mediatek/mt7622.dtsi | 2 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)