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

Commit 98a5f673 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-fixes-for-v5.0' of... 

Merge tag 'davinci-fixes-for-v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes

This pull request fixes some more regressions on legacy
DaVinci board support due to GPIO driver clean-up introduced
in v4.20 kernel. These are marked for stable.

Also has fixes for some long standing Audio issues on DA850
boards.

* tag 'davinci-fixes-for-v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: dts: da850-lcdk: Correct the sound card name
  ARM: dts: da850-lcdk: Correct the audio codec regulators
  ARM: dts: da850-evm: Correct the sound card name
  ARM: dts: da850-evm: Correct the audio codec regulators
  ARM: davinci: omapl138-hawk: fix label names in GPIO lookup entries
  ARM: davinci: dm644x-evm: fix label names in GPIO lookup entries
  ARM: davinci: dm355-evm: fix label names in GPIO lookup entries
  ARM: davinci: da850-evm: fix label names in GPIO lookup entries
  ARM: davinci: da830-evm: fix label names in GPIO lookup entries

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 70bf439a c25748ac

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

+26 −5
Original line number Original line Diff line number Diff line
@@ -94,6 +94,28 @@ 
		regulator-boot-on;

		regulator-boot-on;

	};

	};





	baseboard_3v3: fixedregulator-3v3 {

		/* TPS73701DCQ */

		compatible = "regulator-fixed";

		regulator-name = "baseboard_3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vbat>;

		regulator-always-on;

		regulator-boot-on;

	};



	baseboard_1v8: fixedregulator-1v8 {

		/* TPS73701DCQ */

		compatible = "regulator-fixed";

		regulator-name = "baseboard_1v8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&vbat>;

		regulator-always-on;

		regulator-boot-on;

	};



	backlight_lcd: backlight-regulator {

	backlight_lcd: backlight-regulator {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

		regulator-name = "lcd_backlight_pwr";

		regulator-name = "lcd_backlight_pwr";
@@ -105,7 +127,7 @@ 




	sound {

	sound {

		compatible = "simple-audio-card";

		compatible = "simple-audio-card";

		simple-audio-card,name = "DA850/OMAP-L138 EVM";

		simple-audio-card,name = "DA850-OMAPL138 EVM";

		simple-audio-card,widgets =

		simple-audio-card,widgets =

			"Line", "Line In",

			"Line", "Line In",

			"Line", "Line Out";

			"Line", "Line Out";
@@ -210,10 +232,9 @@ 




		/* Regulators */

		/* Regulators */

		IOVDD-supply = <&vdcdc2_reg>;

		IOVDD-supply = <&vdcdc2_reg>;

		/* Derived from VBAT: Baseboard 3.3V / 1.8V */

		AVDD-supply = <&baseboard_3v3>;

		AVDD-supply = <&vbat>;

		DRVDD-supply = <&baseboard_3v3>;

		DRVDD-supply = <&vbat>;

		DVDD-supply = <&baseboard_1v8>;

		DVDD-supply = <&vbat>;

	};

	};

	tca6416: gpio@20 {

	tca6416: gpio@20 {

		compatible = "ti,tca6416";

		compatible = "ti,tca6416";

arch/arm/boot/dts/da850-lcdk.dts

+37 −1
Original line number Original line Diff line number Diff line
@@ -39,9 +39,39 @@ 
		};

		};

	};

	};





	vcc_5vd: fixedregulator-vcc_5vd {

		compatible = "regulator-fixed";

		regulator-name = "vcc_5vd";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-boot-on;

	};



	vcc_3v3d: fixedregulator-vcc_3v3d {

		/* TPS650250 - VDCDC1 */

		compatible = "regulator-fixed";

		regulator-name = "vcc_3v3d";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vcc_5vd>;

		regulator-always-on;

		regulator-boot-on;

	};



	vcc_1v8d: fixedregulator-vcc_1v8d {

		/* TPS650250 - VDCDC2 */

		compatible = "regulator-fixed";

		regulator-name = "vcc_1v8d";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&vcc_5vd>;

		regulator-always-on;

		regulator-boot-on;

	};



	sound {

	sound {

		compatible = "simple-audio-card";

		compatible = "simple-audio-card";

		simple-audio-card,name = "DA850/OMAP-L138 LCDK";

		simple-audio-card,name = "DA850-OMAPL138 LCDK";

		simple-audio-card,widgets =

		simple-audio-card,widgets =

			"Line", "Line In",

			"Line", "Line In",

			"Line", "Line Out";

			"Line", "Line Out";
@@ -221,6 +251,12 @@ 
		compatible = "ti,tlv320aic3106";

		compatible = "ti,tlv320aic3106";

		reg = <0x18>;

		reg = <0x18>;

		status = "okay";

		status = "okay";



		/* Regulators */

		IOVDD-supply = <&vcc_3v3d>;

		AVDD-supply = <&vcc_3v3d>;

		DRVDD-supply = <&vcc_3v3d>;

		DVDD-supply = <&vcc_1v8d>;

	};

	};

};

};

arch/arm/mach-davinci/board-da830-evm.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -208,9 +208,9 @@ static struct gpiod_lookup_table mmc_gpios_table = { 
	.dev_id = "da830-mmc.0",

	.dev_id = "da830-mmc.0",

	.table = {

	.table = {

		/* gpio chip 1 contains gpio range 32-63 */

		/* gpio chip 1 contains gpio range 32-63 */

		GPIO_LOOKUP("davinci_gpio.0", DA830_MMCSD_CD_PIN, "cd",

		GPIO_LOOKUP("davinci_gpio", DA830_MMCSD_CD_PIN, "cd",

			    GPIO_ACTIVE_LOW),

			    GPIO_ACTIVE_LOW),

		GPIO_LOOKUP("davinci_gpio.0", DA830_MMCSD_WP_PIN, "wp",

		GPIO_LOOKUP("davinci_gpio", DA830_MMCSD_WP_PIN, "wp",

			    GPIO_ACTIVE_LOW),

			    GPIO_ACTIVE_LOW),

	},

	},

};

};

arch/arm/mach-davinci/board-da850-evm.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -805,9 +805,9 @@ static struct gpiod_lookup_table mmc_gpios_table = { 
	.dev_id = "da830-mmc.0",

	.dev_id = "da830-mmc.0",

	.table = {

	.table = {

		/* gpio chip 2 contains gpio range 64-95 */

		/* gpio chip 2 contains gpio range 64-95 */

		GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_CD_PIN, "cd",

		GPIO_LOOKUP("davinci_gpio", DA850_MMCSD_CD_PIN, "cd",

			    GPIO_ACTIVE_LOW),

			    GPIO_ACTIVE_LOW),

		GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_WP_PIN, "wp",

		GPIO_LOOKUP("davinci_gpio", DA850_MMCSD_WP_PIN, "wp",

			    GPIO_ACTIVE_HIGH),

			    GPIO_ACTIVE_HIGH),

	},

	},

};

};

arch/arm/mach-davinci/board-dm355-evm.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -117,9 +117,9 @@ static struct platform_device davinci_nand_device = { 
static struct gpiod_lookup_table i2c_recovery_gpiod_table = {

static struct gpiod_lookup_table i2c_recovery_gpiod_table = {

	.dev_id = "i2c_davinci.1",

	.dev_id = "i2c_davinci.1",

	.table = {

	.table = {

		GPIO_LOOKUP("davinci_gpio.0", DM355_I2C_SDA_PIN, "sda",

		GPIO_LOOKUP("davinci_gpio", DM355_I2C_SDA_PIN, "sda",

			    GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

			    GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

		GPIO_LOOKUP("davinci_gpio.0", DM355_I2C_SCL_PIN, "scl",

		GPIO_LOOKUP("davinci_gpio", DM355_I2C_SCL_PIN, "scl",

			    GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

			    GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

	},

	},

};

};