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

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

Merge tag 'omap-for-v5.1/fixes-signed' of... 

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

Fixes for omaps for v5.1-rc cycle

Few small fixes for omap variants:

- Fix ams-delta gpio IDs
- Add missing of_node_put for omapdss platform init code
- Fix unconfigured audio regulators for two am335x boards
- Fix use of wrong offset for am335x d_can clocks

* tag 'omap-for-v5.1/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: Fix dcan clkctrl clock for am3
  ARM: dts: am335x-evmsk: Correct the regulators for the audio codec
  ARM: dts: am335x-evm: Correct the regulators for the audio codec
  ARM: OMAP2+: add missing of_node_put after of_device_is_available
  ARM: OMAP1: ams-delta: Fix broken GPIO ID allocation

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fccf5166 81717283

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

+22 −4
Original line number Diff line number Diff line
@@ -57,6 +57,24 @@ 
		enable-active-high;

	};



	/* TPS79501 */

	v1_8d_reg: fixedregulator-v1_8d {

		compatible = "regulator-fixed";

		regulator-name = "v1_8d";

		vin-supply = <&vbat>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	/* TPS79501 */

	v3_3d_reg: fixedregulator-v3_3d {

		compatible = "regulator-fixed";

		regulator-name = "v3_3d";

		vin-supply = <&vbat>;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	matrix_keypad: matrix_keypad0 {

		compatible = "gpio-matrix-keypad";

		debounce-delay-ms = <5>;
@@ -499,10 +517,10 @@ 
		status = "okay";



		/* Regulators */

		AVDD-supply = <&vaux2_reg>;

		IOVDD-supply = <&vaux2_reg>;

		DRVDD-supply = <&vaux2_reg>;

		DVDD-supply = <&vbat>;

		AVDD-supply = <&v3_3d_reg>;

		IOVDD-supply = <&v3_3d_reg>;

		DRVDD-supply = <&v3_3d_reg>;

		DVDD-supply = <&v1_8d_reg>;

	};

};

arch/arm/boot/dts/am335x-evmsk.dts

+22 −4
Original line number Diff line number Diff line
@@ -73,6 +73,24 @@ 
		enable-active-high;

	};



	/* TPS79518 */

	v1_8d_reg: fixedregulator-v1_8d {

		compatible = "regulator-fixed";

		regulator-name = "v1_8d";

		vin-supply = <&vbat>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	/* TPS78633 */

	v3_3d_reg: fixedregulator-v3_3d {

		compatible = "regulator-fixed";

		regulator-name = "v3_3d";

		vin-supply = <&vbat>;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	leds {

		pinctrl-names = "default";

		pinctrl-0 = <&user_leds_s0>;
@@ -501,10 +519,10 @@ 
		status = "okay";



		/* Regulators */

		AVDD-supply = <&vaux2_reg>;

		IOVDD-supply = <&vaux2_reg>;

		DRVDD-supply = <&vaux2_reg>;

		DVDD-supply = <&vbat>;

		AVDD-supply = <&v3_3d_reg>;

		IOVDD-supply = <&v3_3d_reg>;

		DRVDD-supply = <&v3_3d_reg>;

		DVDD-supply = <&v1_8d_reg>;

	};

};

arch/arm/boot/dts/am33xx-l4.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1762,7 +1762,7 @@ 
			reg = <0xcc000 0x4>;

			reg-names = "rev";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM3_D_CAN0_CLKCTRL 0>;

			clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;
@@ -1785,7 +1785,7 @@ 
			reg = <0xd0000 0x4>;

			reg-names = "rev";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM3_D_CAN1_CLKCTRL 0>;

			clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>;

			clock-names = "fck";

			#address-cells = <1>;

			#size-cells = <1>;

arch/arm/mach-omap1/board-ams-delta.c

+2 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ static struct resource latch1_resources[] = { 


static struct bgpio_pdata latch1_pdata = {

	.label	= LATCH1_LABEL,

	.base	= -1,

	.ngpio	= LATCH1_NGPIO,

};
@@ -219,6 +220,7 @@ static struct resource latch2_resources[] = { 


static struct bgpio_pdata latch2_pdata = {

	.label	= LATCH2_LABEL,

	.base	= -1,

	.ngpio	= LATCH2_NGPIO,

};

arch/arm/mach-omap2/display.c

+3 −1
Original line number Diff line number Diff line
@@ -250,8 +250,10 @@ static int __init omapdss_init_of(void) 
	if (!node)

		return 0;



	if (!of_device_is_available(node))

	if (!of_device_is_available(node)) {

		of_node_put(node);

		return 0;

	}



	pdev = of_find_device_by_node(node);