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

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

Merge tag 'v4.16-rockchip-dts64fixes-2' of... 

Merge tag 'v4.16-rockchip-dts64fixes-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes

Pull "Rockchip dts64 fixes for 4.16" from Heiko Stübner:

Pinctrl got a fix in 4.16-rc1, that exposed an issue with wifi-related
pinctrl hogs on rk3399-gru-kevin that broke suspend. This gets fixed
by moving the wifi pinctrl to the correct node.
Also revert the usb3 phy-port enablement, as a missing feature in the
type-c phy breaks usb on all non-gru rk3399 boards.

* tag 'v4.16-rockchip-dts64fixes-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  Revert "arm64: dts: rockchip: add usb3-phy otg-port support for rk3399"
  arm64: dts: rockchip: Fix rk3399-gru-* s2r (pinctrl hogs, wifi reset)
parents 0b187e5e 835a1d5c

arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi

+3 −13
Original line number Diff line number Diff line
@@ -406,8 +406,9 @@ 
	wlan_pd_n: wlan-pd-n {

		compatible = "regulator-fixed";

		regulator-name = "wlan_pd_n";

		pinctrl-names = "default";

		pinctrl-0 = <&wlan_module_reset_l>;



		/* Note the wlan_module_reset_l pinctrl */

		enable-active-high;

		gpio = <&gpio1 11 GPIO_ACTIVE_HIGH>;
@@ -983,12 +984,6 @@ ap_i2c_audio: &i2c8 { 
	pinctrl-0 = <

		&ap_pwroff	/* AP will auto-assert this when in S3 */

		&clk_32k	/* This pin is always 32k on gru boards */



		/*

		 * We want this driven low ASAP; firmware should help us, but

		 * we can help ourselves too.

		 */

		&wlan_module_reset_l

	>;



	pcfg_output_low: pcfg-output-low {
@@ -1168,12 +1163,7 @@ ap_i2c_audio: &i2c8 { 
		};



		wlan_module_reset_l: wlan-module-reset-l {

			/*

			 * We want this driven low ASAP (As {Soon,Strongly} As

			 * Possible), to avoid leakage through the powered-down

			 * WiFi.

			 */

			rockchip,pins = <1 11 RK_FUNC_GPIO &pcfg_output_low>;

			rockchip,pins = <1 11 RK_FUNC_GPIO &pcfg_pull_none>;

		};



		bt_host_wake_l: bt-host-wake-l {

arch/arm64/boot/dts/rockchip/rk3399.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -411,8 +411,8 @@ 
			reg = <0x0 0xfe800000 0x0 0x100000>;

			interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH 0>;

			dr_mode = "otg";

			phys = <&u2phy0_otg>, <&tcphy0_usb3>;

			phy-names = "usb2-phy", "usb3-phy";

			phys = <&u2phy0_otg>;

			phy-names = "usb2-phy";

			phy_type = "utmi_wide";

			snps,dis_enblslpm_quirk;

			snps,dis-u2-freeclk-exists-quirk;
@@ -444,8 +444,8 @@ 
			reg = <0x0 0xfe900000 0x0 0x100000>;

			interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH 0>;

			dr_mode = "otg";

			phys = <&u2phy1_otg>, <&tcphy1_usb3>;

			phy-names = "usb2-phy", "usb3-phy";

			phys = <&u2phy1_otg>;

			phy-names = "usb2-phy";

			phy_type = "utmi_wide";

			snps,dis_enblslpm_quirk;

			snps,dis-u2-freeclk-exists-quirk;