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

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

Merge tag 'samsung-dt-4.19-2' of... 

Merge tag 'samsung-dt-4.19-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Samsung DTS ARM changes for v4.19, part 2

1. Add missing interrupts to PWM nodes on Exynos5.
2. Add missing interrupt pin pull up/down configuration on Exynos4412
   Midas boards.  The interrupts were mostly working thanks to initial
   configuration by bootloader.

* tag 'samsung-dt-4.19-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: dts: exynos: Configure Midas SD card CD pin
  ARM: dts: exynos: Configure max77686 IRQ pin on Midas
  ARM: dts: exynos: Add pinctrl for Midas fuelgauge IRQ pin
  ARM: dts: exynos: Add pinctrl config for Midas keys
  ARM: dts: exynos: Add max77693 pinctrl config for Midas
  ARM: dts: exynos: Add missing interrupts for pwm node on Exynos5

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 74e828c8 965228d3

arch/arm/boot/dts/exynos4412-midas.dtsi

+34 −1
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ 


	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&gpio_keys>;



		key-down {

			gpios = <&gpx3 3 GPIO_ACTIVE_LOW>;
@@ -138,6 +140,8 @@ 
			compatible = "maxim,max77693";

			interrupt-parent = <&gpx1>;

			interrupts = <5 IRQ_TYPE_EDGE_FALLING>;

			pinctrl-names = "default";

			pinctrl-0 = <&max77693_irq>;

			reg = <0x66>;



			regulators {
@@ -184,6 +188,8 @@ 
			compatible = "maxim,max17047";

			interrupt-parent = <&gpx2>;

			interrupts = <3 IRQ_TYPE_EDGE_FALLING>;

			pinctrl-names = "default";

			pinctrl-0 = <&max77693_fuel_irq>;

			reg = <0x36>;



			maxim,over-heat-temp = <700>;
@@ -574,6 +580,8 @@ 
		compatible = "maxim,max77686";

		interrupt-parent = <&gpx0>;

		interrupts = <7 IRQ_TYPE_NONE>;

		pinctrl-0 = <&max77686_irq>;

		pinctrl-names = "default";

		reg = <0x09>;

		#clock-cells = <1>;
@@ -1007,6 +1015,31 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&sleep1>;



	gpio_keys: gpio-keys {

		samsung,pins = "gpx0-1", "gpx2-2", "gpx2-7", "gpx3-3";

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

	};



	max77686_irq: max77686-irq {

		samsung,pins = "gpx0-7";

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

	};



	max77693_irq: max77693-irq {

		samsung,pins = "gpx1-5";

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

	};



	max77693_fuel_irq: max77693-fuel-irq {

		samsung,pins = "gpx2-3";

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

	};



	sdhci2_cd: sdhci2-cd-irq {

		samsung,pins = "gpx3-4";

		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;

	};



	hdmi_hpd: hdmi-hpd {

		samsung,pins = "gpx3-7";

		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
@@ -1238,7 +1271,7 @@ 
	bus-width = <4>;

	cd-gpios = <&gpx3 4 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4>;

	pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sdhci2_cd>;

	pinctrl-names = "default";

	vmmc-supply = <&ldo21_reg>;

	status = "okay";

arch/arm/boot/dts/exynos5.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -169,6 +169,11 @@ 
		pwm: pwm@12dd0000 {

			compatible = "samsung,exynos4210-pwm";

			reg = <0x12DD0000 0x100>;

			interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;

			samsung,pwm-outputs = <0>, <1>, <2>, <3>;

			#pwm-cells = <3>;

		};