mirror of
https://github.com/torvalds/linux.git
synced 2026-05-22 22:22:08 +02:00
Allwinner driver changes for 6.18
Some changes to the sram driver. One to register a syscon explicitly. Another to add a new driver entry for the A523, which has two Ethernet controllers, and thus has two RGMII clock delay control registers. -----BEGIN PGP SIGNATURE----- iQJCBAABCgAsFiEE2nN1m/hhnkhOWjtHOJpUIZwPJDAFAmjK4tAOHHdlbnNAY3Np ZS5vcmcACgkQOJpUIZwPJDCVdA/8DabyvP4jSnWZZx+RJDUhdEFDRzRVAt88oA2B an7U/sCzzPtsI1qi+PV37QqziySQ1X1oS9W1Vzya5lBAxLBjuBG7z08oMyMJOsJF TsF/1GeBTPmYUUs/Pt5bei2Rw7iIW10RMRlzefo0zG4/rFAWqcySjgDP5PZw5uT0 ztYFfznE6ufOx3vlD/37G5MbftIjgY/u4+xd2ahnzcokpN/Mn4wL4GGdfWJKBgl/ WSBSQx9fcEj0kr1j6DUIqCDWmrSjSa3CfKEd8ARM85tezen+NF+1SLFBQysYjyWm il1XAgFxQjGB0M16y/n4b51So1yWIHbE7UaVBJVceJLYIRYoMaW/6fp9/EfPNpyO I7JNzGuN5P0JxeyJOY290wvm/BS9K8KW6E9EjkQRaxQBMPDL6eAF0hc0j9q2fvrd NjWVUICvS16gGjpZR0EDLTRb/hIf3NAwWKPoXfe8LqAKCovN0dCFlPsZjoAhKToe MwySbcVlXnOySRa4t/7qtHkvBpBmzXbbR/BQ3nqUr40XU1KpMtV0CkLzH3T4Xtto tkxio30xEhPWR/7PIEKl7YjKmLmJWtBw4Jq4ZMgfInzVyqwt0r2U28jdpbapj0CY 5LaRvi/I+mGdhvuuyGKyksSe9N3pDzhJ7JAFKEXZ7vcqwxkGjC/sOlgEcTgn2O3+ DMlN1ic= =9X/c -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmjTCwIACgkQmmx57+YA GNky1w//cQZjuYHQ9mmfJMYtfZHq4Kug0LqljOUQKD41EmZQic9rjSGhYYtxDu5u JW9FdIqpYjT79oYb0n3ATs3ajkxae0fVphqDrfmzDPYK6QbFuFQgN4cxF5mUQ6bK fx14HGqDc6BZEcsTuOzniAISapaa8sdrtlhHuFAuKiXaudGcTZi2MbHsbyOWg8KB DNK3Ri7gV5e2LDqvVyOphYGRw6yRIbz/kCROJ3FeMQkDnNaTXLtv54a4Gc4DmvbM 0HjXujggNyh1DNxy4fEZTLk535B9RIpcItCHOFud8MOnJrbIkz+5QCz2mJh/dvMk IZDYlz1C2+uDQS96lGhk9SciTGIvtkZH47O1Gw2V7MVA43EwQxEUrngdaRQPvp94 1kgvelvH+7rBJzmsXEBUtsloLwf/S9kSH1Go8SXH/gIhqGZRbkF1LMdUJh+kou6X lX4dAk+t/2bIR3SvLjqInTLjj5bg4P7EEPcSGq0dIktr/zup6vitv+NG7lCxfzyo 2SUUtawgu0Z9SVjz9dBwYLeisdCC/YsYAIPZwXeav59aMm0uhbuMh0YqtMui+89H 3gsG406duPQuS9xCmMdGzDgnI/8SB6T0SVb6PQ0LllA9ekp4ZG0iyBpqtuMGOcku VHxWyfzIXOoFaKqgPxgI3pP1O7QK6rgBvTrtaX6GjfeXd0YqW7o= =zN5T -----END PGP SIGNATURE----- Merge tag 'sunxi-drivers-for-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/drivers Allwinner driver changes for 6.18 Some changes to the sram driver. One to register a syscon explicitly. Another to add a new driver entry for the A523, which has two Ethernet controllers, and thus has two RGMII clock delay control registers. * tag 'sunxi-drivers-for-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: soc: sunxi: sram: register regmap as syscon soc: sunxi: sram: add entry for a523 Link: https://lore.kernel.org/r/aMrsfw-_v3IAiKH8@wens.tw Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
7150189b62
|
|
@ -12,6 +12,7 @@
|
|||
|
||||
#include <linux/debugfs.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/mfd/syscon.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_address.h>
|
||||
|
|
@ -310,6 +311,10 @@ static const struct sunxi_sramc_variant sun50i_h616_sramc_variant = {
|
|||
.has_ths_offset = true,
|
||||
};
|
||||
|
||||
static const struct sunxi_sramc_variant sun55i_a523_sramc_variant = {
|
||||
.num_emac_clocks = 2,
|
||||
};
|
||||
|
||||
#define SUNXI_SRAM_THS_OFFSET_REG 0x0
|
||||
#define SUNXI_SRAM_EMAC_CLOCK_REG 0x30
|
||||
#define SUNXI_SYS_LDO_CTRL_REG 0x150
|
||||
|
|
@ -363,6 +368,7 @@ static int __init sunxi_sram_probe(struct platform_device *pdev)
|
|||
const struct sunxi_sramc_variant *variant;
|
||||
struct device *dev = &pdev->dev;
|
||||
struct regmap *regmap;
|
||||
int ret;
|
||||
|
||||
sram_dev = &pdev->dev;
|
||||
|
||||
|
|
@ -380,6 +386,10 @@ static int __init sunxi_sram_probe(struct platform_device *pdev)
|
|||
regmap = devm_regmap_init_mmio(dev, base, &sunxi_sram_regmap_config);
|
||||
if (IS_ERR(regmap))
|
||||
return PTR_ERR(regmap);
|
||||
|
||||
ret = of_syscon_register_regmap(dev->of_node, regmap);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
of_platform_populate(dev->of_node, NULL, NULL, dev);
|
||||
|
|
@ -430,6 +440,10 @@ static const struct of_device_id sunxi_sram_dt_match[] = {
|
|||
.compatible = "allwinner,sun50i-h616-system-control",
|
||||
.data = &sun50i_h616_sramc_variant,
|
||||
},
|
||||
{
|
||||
.compatible = "allwinner,sun55i-a523-system-control",
|
||||
.data = &sun55i_a523_sramc_variant,
|
||||
},
|
||||
{ },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, sunxi_sram_dt_match);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user