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

Commit ca7325a2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-fixes2' of... 

Merge tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into fixes

Fixes: second batch for 4.14:
- one DT phy address fix for the new sama5d27 som1 ek
- two DT ADC patches that were forgotten while moving to
  hardware triggers for sama5d2 (iio changes already applied)

* tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: dts: at91: sama5d2: add ADC hw trigger edge type
  ARM: dts: at91: sama5d2_xplained: enable ADTRG pin
  ARM: dts: at91: at91-sama5d27_som1: fix PHY ID
parents 4cb4261d 27d90f46

arch/arm/boot/dts/at91-sama5d27_som1.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ 
				pinctrl-0 = <&pinctrl_macb0_default>;

				phy-mode = "rmii";



				ethernet-phy@1 {

					reg = <0x1>;

				ethernet-phy@0 {

					reg = <0x0>;

					interrupt-parent = <&pioA>;

					interrupts = <PIN_PD31 IRQ_TYPE_LEVEL_LOW>;

					pinctrl-names = "default";

arch/arm/boot/dts/at91-sama5d2_xplained.dts

+15 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ 
				vddana-supply = <&vdd_3v3_lp_reg>;

				vref-supply = <&vdd_3v3_lp_reg>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_adc_default>;

				pinctrl-0 = <&pinctrl_adc_default &pinctrl_adtrg_default>;

				status = "okay";

			};
@@ -340,6 +340,20 @@ 
					bias-disable;

				};



				/*

				 * The ADTRG pin can work on any edge type.

				 * In here it's being pulled up, so need to

				 * connect it to ground to get an edge e.g.

				 * Trigger can be configured on falling, rise

				 * or any edge, and the pull-up can be changed

				 * to pull-down or left floating according to

				 * needs.

				 */

				pinctrl_adtrg_default: adtrg_default {

					pinmux = <PIN_PD31__ADTRG>;

					bias-pull-up;

				};



				pinctrl_charger_chglev: charger_chglev {

					pinmux = <PIN_PA12__GPIO>;

					bias-disable;

arch/arm/boot/dts/sama5d2.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -1430,6 +1430,7 @@ 
				atmel,min-sample-rate-hz = <200000>;

				atmel,max-sample-rate-hz = <20000000>;

				atmel,startup-time-ms = <4>;

				atmel,trigger-edge-type = <IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};