[PATCH v2 1/2] can: c_can: Add device tree support to Bosch C_CAN/D_CAN controller

[Marc Kleine-Budde]

On 07/25/2012 02:18 PM, AnilKumar Ch wrote:
> Add device tree support to C_CAN/D_CAN controller and usage details
> are added to device tree documentation. Driver was tested on AM335x
> EVM.

Does not apply to linux-can-next, as Viresh Kumar's patch "net/c_can:
remove conditional compilation of clk code" is not yet included. I
suggest to delay this patch until we have Viresh's patch in net-next.

See comment inline.

> Signed-off-by: AnilKumar Ch <anilkumar at ti.com>
> ---
>  .../devicetree/bindings/net/can/c_can.txt          |   37 +++++++++++++
>  drivers/net/can/c_can/c_can.h                      |    5 +-
>  drivers/net/can/c_can/c_can_platform.c             |   57 ++++++++++++++------
>  3 files changed, 80 insertions(+), 19 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/net/can/c_can.txt
> 
> diff --git a/Documentation/devicetree/bindings/net/can/c_can.txt b/Documentation/devicetree/bindings/net/can/c_can.txt
> new file mode 100644
> index 0000000..dc4aec5
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/net/can/c_can.txt
> @@ -0,0 +1,37 @@
> +Bosch C_CAN/D_CAN controller Device Tree Bindings
> +-------------------------------------------------
> +
> +Required properties:
> +- compatible		: Should be "bosch,c_can" for C_CAN controllers and
> +			  "bosch,d_can" for D_CAN controllers.
> +- reg			: physical base address and size of the C_CAN/D_CAN
> +			  registers map
> +- interrupts		: property with a value describing the interrupt
> +			  number
> +- interrupt-parent	: The parent interrupt controller
> +
> +Optional properties:
> +- ti,hwmods		: Must be "d_can<n>" or "c_can<n>", n being the
> +			  instance number
> +
> +Note: "ti,hwmods" field is used to fetch the base address and irq
> +resources from TI, omap hwmod data base during device registration.
> +Future plan is to migrate hwmod data base contents into device tree
> +blob so that, all the required data will be used from device tree dts
> +file.
> +
> +Examples:
> +
> +	d_can at 481D0000 {
> +		compatible = "bosch,d_can";
> +		reg = <0x481D0000 0x1000>;
> +		interrupts = <55 0x4>;
> +		interrupt-parent = <&intc>;
> +	};
> +
> +(or)
> +
> +	d_can at 481D0000 {
> +		compatible = "bosch,d_can";
> +		ti,hwmods = "d_can1";
> +	};
> diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h
> index 01a7049..4e56baa 100644
> --- a/drivers/net/can/c_can/c_can.h
> +++ b/drivers/net/can/c_can/c_can.h
> @@ -143,8 +143,9 @@ static const u16 reg_map_d_can[] = {
>  };
>  
>  enum c_can_dev_id {
> -	C_CAN_DEVTYPE,
> -	D_CAN_DEVTYPE,
> +	BOSCH_C_CAN_PLATFORM,
> +	BOSCH_C_CAN,
> +	BOSCH_D_CAN,

Note: these symbols are used in "drivers/net/can/c_can/c_can_pci.c", too.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 262 bytes
Desc: OpenPGP digital signature
URL: <http://lists.ozlabs.org/pipermail/devicetree-discuss/attachments/20120725/051493d1/attachment-0001.sig>