clk: mvebu: armada-37xx-periph: save the IP base address in the driver data (d9d95e78) · Commits · 戴 / test

drivers/clk/mvebu/armada-37xx-periph.c

+7 −8

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@
		struct clk_periph_driver_data {
		struct clk_hw_onecell_data *hw_data;
		spinlock_t lock;
		void __iomem *reg;
		};

		struct clk_double_div {
		@@ -680,7 +681,6 @@ static int armada_3700_periph_clock_probe(struct platform_device *pdev)
		struct device *dev = &pdev->dev;
		int num_periph = 0, i, ret;
		struct resource *res;
		void __iomem *reg;

		data = of_device_get_match_data(dev);
		if (!data)
		@@ -689,11 +689,6 @@ static int armada_3700_periph_clock_probe(struct platform_device *pdev)
		while (data[num_periph].name)
		num_periph++;

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		reg = devm_ioremap_resource(dev, res);
		if (IS_ERR(reg))
		return PTR_ERR(reg);

		driver_data = devm_kzalloc(dev, sizeof(*driver_data), GFP_KERNEL);
		if (!driver_data)
		return -ENOMEM;
		@@ -706,12 +701,16 @@ static int armada_3700_periph_clock_probe(struct platform_device *pdev)
		return -ENOMEM;
		driver_data->hw_data->num = num_periph;

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		driver_data->reg = devm_ioremap_resource(dev, res);
		if (IS_ERR(driver_data->reg))
		return PTR_ERR(driver_data->reg);

		spin_lock_init(&driver_data->lock);

		for (i = 0; i < num_periph; i++) {
		struct clk_hw **hw = &driver_data->hw_data->hws[i];

		if (armada_3700_add_composite_clk(&data[i], reg,
		if (armada_3700_add_composite_clk(&data[i], driver_data->reg,
		&driver_data->lock, dev, hw))
		dev_err(dev, "Can't register periph clock %s\n",
		data[i].name);