Commit 8291ca5d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.19/dt-mcan-v2-signed-v2' of... 

Merge tag 'omap-for-v4.19/dt-mcan-v2-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

dts changes for mcan for omaps for v4.19 merge window

These changes configure the mcan clock, interconnect target
module and mcan device. These changes depend on the ti-sysc
related driver changes and are based on those.

Notably this is the first new driver that probes with ti-sysc
driver with no legacy hwmod platform data for the interconnect
target module.

* tag 'omap-for-v4.19/dt-mcan-v2-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: dra76x: Add MCAN node
  ARM: dts: Add generic interconnect target module node for MCAN
  ARM: dts: dra762: Add MCAN clock support
  bus: ti-sysc: Add support for software reset
  bus: ti-sysc: Add support for using ti-sysc for MCAN on dra76x
  clk: ti: dra7: Add clkctrl clock data for the mcan clocks
  bus: ti-sysc: Use 2-factor allocator arguments

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 260cfb9f 0adbe832

Documentation/devicetree/bindings/bus/ti-sysc.txt

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ Required standard properties: 
		"ti,sysc-omap-aes"

		"ti,sysc-mcasp"

		"ti,sysc-usb-host-fs"

		"ti,sysc-dra7-mcan"



- reg		shall have register areas implemented for the interconnect

		target module in question such as revision, sysc and syss

arch/arm/boot/dts/dra76-evm.dts

+6 −0
Original line number Diff line number Diff line
@@ -444,3 +444,9 @@ 
&extcon_usb2 {

	vbus-gpio = <&pcf_lcd 15 GPIO_ACTIVE_HIGH>;

};



&m_can0 {

	can-transceiver {

		max-bitrate = <5000000>;

	};

};

arch/arm/boot/dts/dra76x.dtsi

+64 −0
Original line number Diff line number Diff line
@@ -11,9 +11,73 @@ 
/ {

	compatible = "ti,dra762", "ti,dra7";



	ocp {

		target-module@42c01900 {

			compatible = "ti,sysc-dra7-mcan", "ti,sysc";

			ranges = <0x0 0x42c00000 0x2000>;

			#address-cells = <1>;

			#size-cells = <1>;

			reg = <0x42c01900 0x4>,

			      <0x42c01904 0x4>,

			      <0x42c01908 0x4>;

			reg-names = "rev", "sysc", "syss";

			ti,sysc-mask = <(SYSC_OMAP4_SOFTRESET |

					 SYSC_DRA7_MCAN_ENAWAKEUP)>;

			ti,syss-mask = <1>;

			clocks = <&wkupaon_clkctrl DRA7_ADC_CLKCTRL 0>;

			clock-names = "fck";



			m_can0: mcan@1a00 {

				compatible = "bosch,m_can";

				reg = <0x1a00 0x4000>, <0x0 0x18FC>;

				reg-names = "m_can", "message_ram";

				interrupt-parent = <&gic>;

				interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;

				interrupt-names = "int0", "int1";

				clocks = <&mcan_clk>, <&l3_iclk_div>;

				clock-names = "cclk", "hclk";

				bosch,mram-cfg = <0x0 0 0 32 0 0 1 1>;

			};

		};

	};



};



/* MCAN interrupts are hard-wired to irqs 67, 68 */

&crossbar_mpu {

	ti,irqs-skip = <10 67 68 133 139 140>;

};



&scm_conf_clocks {

	dpll_gmac_h14x2_ctrl_ck: dpll_gmac_h14x2_ctrl_ck@3fc {

		#clock-cells = <0>;

		compatible = "ti,divider-clock";

		clocks = <&dpll_gmac_x2_ck>;

		ti,max-div = <63>;

		reg = <0x03fc>;

		ti,bit-shift=<20>;

		ti,latch-bit=<26>;

		assigned-clocks = <&dpll_gmac_h14x2_ctrl_ck>;

		assigned-clock-rates = <80000000>;

	};



	dpll_gmac_h14x2_ctrl_mux_ck: dpll_gmac_h14x2_ctrl_mux_ck@3fc {

		#clock-cells = <0>;

		compatible = "ti,mux-clock";

		clocks = <&dpll_gmac_ck>, <&dpll_gmac_h14x2_ctrl_ck>;

		reg = <0x3fc>;

		ti,bit-shift = <29>;

		ti,latch-bit=<26>;

		assigned-clocks = <&dpll_gmac_h14x2_ctrl_mux_ck>;

		assigned-clock-parents = <&dpll_gmac_h14x2_ctrl_ck>;

	};



	mcan_clk: mcan_clk@3fc {

		#clock-cells = <0>;

		compatible = "ti,gate-clock";

		clocks = <&dpll_gmac_h14x2_ctrl_mux_ck>;

		ti,bit-shift = <27>;

		reg = <0x3fc>;

	};

};

drivers/bus/ti-sysc.c

+68 −4
Original line number Diff line number Diff line
@@ -23,11 +23,14 @@ 
#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/slab.h>

#include <linux/iopoll.h>



#include <linux/platform_data/ti-sysc.h>



#include <dt-bindings/bus/ti-sysc.h>



#define MAX_MODULE_SOFTRESET_WAIT		10000



static const char * const reg_names[] = { "rev", "sysc", "syss", };



enum sysc_clocks {
@@ -88,6 +91,11 @@ struct sysc { 
	struct delayed_work idle_work;

};



void sysc_write(struct sysc *ddata, int offset, u32 value)

{

	writel_relaxed(value, ddata->module_va + offset);

}



static u32 sysc_read(struct sysc *ddata, int offset)

{

	if (ddata->cfg.quirks & SYSC_QUIRK_16BIT) {
@@ -169,9 +177,9 @@ static int sysc_get_clocks(struct sysc *ddata) 
	const char *name;

	int nr_fck = 0, nr_ick = 0, i, error = 0;



	ddata->clock_roles = devm_kzalloc(ddata->dev,

					  sizeof(*ddata->clock_roles) *

	ddata->clock_roles = devm_kcalloc(ddata->dev,

					  SYSC_MAX_CLOCKS,

					  sizeof(*ddata->clock_roles),

					  GFP_KERNEL);

	if (!ddata->clock_roles)

		return -ENOMEM;
@@ -200,8 +208,8 @@ static int sysc_get_clocks(struct sysc *ddata) 
		return -EINVAL;

	}



	ddata->clocks = devm_kzalloc(ddata->dev,

				     sizeof(*ddata->clocks) * ddata->nr_clocks,

	ddata->clocks = devm_kcalloc(ddata->dev,

				     ddata->nr_clocks, sizeof(*ddata->clocks),

				     GFP_KERNEL);

	if (!ddata->clocks)

		return -ENOMEM;
@@ -943,6 +951,36 @@ static void sysc_init_revision_quirks(struct sysc *ddata) 
	}

}



static int sysc_reset(struct sysc *ddata)

{

	int offset = ddata->offsets[SYSC_SYSCONFIG];

	int val;



	if (ddata->legacy_mode || offset < 0 ||

	    ddata->cfg.quirks & SYSC_QUIRK_NO_RESET_ON_INIT)

		return 0;



	/*

	 * Currently only support reset status in sysstatus.

	 * Warn and return error in all other cases

	 */

	if (!ddata->cfg.syss_mask) {

		dev_err(ddata->dev, "No ti,syss-mask. Reset failed\n");

		return -EINVAL;

	}



	val = sysc_read(ddata, offset);

	val |= (0x1 << ddata->cap->regbits->srst_shift);

	sysc_write(ddata, offset, val);



	/* Poll on reset status */

	offset = ddata->offsets[SYSC_SYSSTATUS];



	return readl_poll_timeout(ddata->module_va + offset, val,

				  (val & ddata->cfg.syss_mask) == 0x0,

				  100, MAX_MODULE_SOFTRESET_WAIT);

}



/* At this point the module is configured enough to read the revision */

static int sysc_init_module(struct sysc *ddata)

{
@@ -960,6 +998,14 @@ static int sysc_init_module(struct sysc *ddata) 
		return 0;

	}



	error = sysc_reset(ddata);

	if (error) {

		dev_err(ddata->dev, "Reset failed with %d\n", error);

		pm_runtime_put_sync(ddata->dev);



		return error;

	}



	ddata->revision = sysc_read_revision(ddata);

	pm_runtime_put_sync(ddata->dev);
@@ -1552,6 +1598,23 @@ static const struct sysc_capabilities sysc_omap4_usb_host_fs = { 
	.regbits = &sysc_regbits_omap4_usb_host_fs,

};



static const struct sysc_regbits sysc_regbits_dra7_mcan = {

	.dmadisable_shift = -ENODEV,

	.midle_shift = -ENODEV,

	.sidle_shift = -ENODEV,

	.clkact_shift = -ENODEV,

	.enwkup_shift = 4,

	.srst_shift = 0,

	.emufree_shift = -ENODEV,

	.autoidle_shift = -ENODEV,

};



static const struct sysc_capabilities sysc_dra7_mcan = {

	.type = TI_SYSC_DRA7_MCAN,

	.sysc_mask = SYSC_DRA7_MCAN_ENAWAKEUP | SYSC_OMAP4_SOFTRESET,

	.regbits = &sysc_regbits_dra7_mcan,

};



static int sysc_init_pdata(struct sysc *ddata)

{

	struct ti_sysc_platform_data *pdata = dev_get_platdata(ddata->dev);
@@ -1743,6 +1806,7 @@ static const struct of_device_id sysc_match[] = { 
	{ .compatible = "ti,sysc-mcasp", .data = &sysc_omap4_mcasp, },

	{ .compatible = "ti,sysc-usb-host-fs",

	  .data = &sysc_omap4_usb_host_fs, },

	{ .compatible = "ti,sysc-dra7-mcan", .data = &sysc_dra7_mcan, },

	{  },

};

MODULE_DEVICE_TABLE(of, sysc_match);

drivers/clk/ti/clk-7xx.c

+1 −0
Original line number Diff line number Diff line
@@ -708,6 +708,7 @@ static const struct omap_clkctrl_reg_data dra7_wkupaon_clkctrl_regs[] __initcons 
	{ DRA7_COUNTER_32K_CLKCTRL, NULL, 0, "wkupaon_iclk_mux" },

	{ DRA7_UART10_CLKCTRL, dra7_uart10_bit_data, CLKF_SW_SUP, "wkupaon_cm:clk:0060:24" },

	{ DRA7_DCAN1_CLKCTRL, dra7_dcan1_bit_data, CLKF_SW_SUP, "wkupaon_cm:clk:0068:24" },

	{ DRA7_ADC_CLKCTRL, NULL, CLKF_SW_SUP, "mcan_clk"},

	{ 0 },

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE