Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30cc0ed7 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Marc Kleine-Budde
Browse files

can: rcar_can: Remove unused platform data support 



All R-Car platforms use DT for describing CAN controllers. R-Car CAN
platform data support was never used in any upstream kernel.

Move the Clock Select Register settings enum into the driver, and remove
platform data support and the corresponding header file.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 932630fa

drivers/net/can/rcar/rcar_can.c

+9 −13
Original line number Diff line number Diff line
@@ -15,11 +15,17 @@ 
#include <linux/can/led.h>

#include <linux/can/dev.h>

#include <linux/clk.h>

#include <linux/can/platform/rcar_can.h>

#include <linux/of.h>



#define RCAR_CAN_DRV_NAME	"rcar_can"



/* Clock Select Register settings */

enum CLKR {

	CLKR_CLKP1 = 0, /* Peripheral clock (clkp1) */

	CLKR_CLKP2 = 1, /* Peripheral clock (clkp2) */

	CLKR_CLKEXT = 3, /* Externally input clock */

};



#define RCAR_SUPPORTED_CLOCKS	(BIT(CLKR_CLKP1) | BIT(CLKR_CLKP2) | \

				 BIT(CLKR_CLKEXT))
@@ -736,7 +742,6 @@ static const char * const clock_names[] = { 


static int rcar_can_probe(struct platform_device *pdev)

{

	struct rcar_can_platform_data *pdata;

	struct rcar_can_priv *priv;

	struct net_device *ndev;

	struct resource *mem;
@@ -745,17 +750,8 @@ static int rcar_can_probe(struct platform_device *pdev) 
	int err = -ENODEV;

	int irq;



	if (pdev->dev.of_node) {

		of_property_read_u32(pdev->dev.of_node,

				     "renesas,can-clock-select", &clock_select);

	} else {

		pdata = dev_get_platdata(&pdev->dev);

		if (!pdata) {

			dev_err(&pdev->dev, "No platform data provided!\n");

			goto fail;

		}

		clock_select = pdata->clock_select;

	}

	of_property_read_u32(pdev->dev.of_node, "renesas,can-clock-select",

			     &clock_select);



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

include/linux/can/platform/rcar_can.h

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _CAN_PLATFORM_RCAR_CAN_H_

#define _CAN_PLATFORM_RCAR_CAN_H_



#include <linux/types.h>



/* Clock Select Register settings */

enum CLKR {

	CLKR_CLKP1 = 0,	/* Peripheral clock (clkp1) */

	CLKR_CLKP2 = 1,	/* Peripheral clock (clkp2) */

	CLKR_CLKEXT = 3	/* Externally input clock */

};



struct rcar_can_platform_data {

	enum CLKR clock_select;	/* Clock source select */

};



#endif	/* !_CAN_PLATFORM_RCAR_CAN_H_ */