Commit b583cef5 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v5.5/fixes-rc5' of... 

Merge tag 'omap-for-v5.5/fixes-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes

Fixes for omaps for v5.5-rc cycle

Here are few fixes for v5.5-rc cycle:

- Two corner case fixes related to ti-sysc driver clock issues

- Fixes for am57xx dts for pcie gpios

- Beagle-x15 regulator dts fix

- Fix for wkup_m3_ipc driver race

* tag 'omap-for-v5.5/fixes-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  soc: ti: wkup_m3_ipc: Fix race condition with rproc_boot
  ARM: dts: beagle-x15-common: Model 5V0 regulator
  ARM: dts: am571x-idk: Fix gpios property to have the correct  gpio number
  ARM: dts: am57xx-beagle-x15/am57xx-idk: Remove "gpios" for  endpoint dt nodes
  bus: ti-sysc: Fix iterating over clocks
  ARM: OMAP2+: Fix ti_sysc_find_one_clockdomain to check for to_clk_hw_omap

Link: https://lore.kernel.org/r/pull-1578418121-413328@atomide.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 850e0a99 03729cfa

arch/arm/boot/dts/am571x-idk.dts

+1 −5
Original line number Diff line number Diff line
@@ -167,11 +167,7 @@ 


&pcie1_rc {

	status = "okay";

	gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;

};



&pcie1_ep {

	gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;

	gpios = <&gpio5 18 GPIO_ACTIVE_HIGH>;

};



&mmc1 {

arch/arm/boot/dts/am572x-idk-common.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -147,10 +147,6 @@ 
	gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;

};



&pcie1_ep {

	gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;

};



&mailbox5 {

	status = "okay";

	mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {

arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi

+21 −4
Original line number Diff line number Diff line
@@ -29,6 +29,27 @@ 
		reg = <0x0 0x80000000 0x0 0x80000000>;

	};



	main_12v0: fixedregulator-main_12v0 {

		/* main supply */

		compatible = "regulator-fixed";

		regulator-name = "main_12v0";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

		regulator-always-on;

		regulator-boot-on;

	};



	evm_5v0: fixedregulator-evm_5v0 {

		/* Output of TPS54531D */

		compatible = "regulator-fixed";

		regulator-name = "evm_5v0";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&main_12v0>;

		regulator-always-on;

		regulator-boot-on;

	};



	vdd_3v3: fixedregulator-vdd_3v3 {

		compatible = "regulator-fixed";

		regulator-name = "vdd_3v3";
@@ -547,10 +568,6 @@ 
	gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;

};



&pcie1_ep {

	gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;

};



&mcasp3 {

	#sound-dai-cells = <0>;

	assigned-clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>;

arch/arm/mach-omap2/pdata-quirks.c

+5 −1
Original line number Diff line number Diff line
@@ -306,10 +306,14 @@ static void __init dra7x_evm_mmc_quirk(void) 


static struct clockdomain *ti_sysc_find_one_clockdomain(struct clk *clk)

{

	struct clk_hw *hw = __clk_get_hw(clk);

	struct clockdomain *clkdm = NULL;

	struct clk_hw_omap *hwclk;



	hwclk = to_clk_hw_omap(__clk_get_hw(clk));

	hwclk = to_clk_hw_omap(hw);

	if (!omap2_clk_is_hw_omap(hw))

		return NULL;



	if (hwclk && hwclk->clkdm_name)

		clkdm = clkdm_lookup(hwclk->clkdm_name);

drivers/bus/ti-sysc.c

+8 −2
Original line number Diff line number Diff line
@@ -343,6 +343,12 @@ static int sysc_get_clocks(struct sysc *ddata) 
		return -EINVAL;

	}



	/* Always add a slot for main clocks fck and ick even if unused */

	if (!nr_fck)

		ddata->nr_clocks++;

	if (!nr_ick)

		ddata->nr_clocks++;



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

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

				     GFP_KERNEL);
@@ -421,7 +427,7 @@ static int sysc_enable_opt_clocks(struct sysc *ddata) 
	struct clk *clock;

	int i, error;



	if (!ddata->clocks)

	if (!ddata->clocks || ddata->nr_clocks < SYSC_OPTFCK0 + 1)

		return 0;



	for (i = SYSC_OPTFCK0; i < SYSC_MAX_CLOCKS; i++) {
@@ -455,7 +461,7 @@ static void sysc_disable_opt_clocks(struct sysc *ddata) 
	struct clk *clock;

	int i;



	if (!ddata->clocks)

	if (!ddata->clocks || ddata->nr_clocks < SYSC_OPTFCK0 + 1)

		return;



	for (i = SYSC_OPTFCK0; i < SYSC_MAX_CLOCKS; i++) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE