Commit 571a9cf1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.9-rockchip-dts64-1' of... 

Merge tag 'v5.9-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

Fuel gauge for Pinebook Pro, the newly added periph-burst flag for pl330s,
first tiny part of the rk3399 camera infrastructure and cleanups + making
dt-binding-check even happier.

* tag 'v5.9-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: Add 'arm,pl330-periph-burst' for dmac
  arm64: dts: rockchip: remove bus-width from mmc nodes in px30 dts files
  arm64: dts: rockchip: add rx0 mipi-phy for rk3399
  arm64: dts: rockchip: rename and label gpio-led subnodes part 2
  arm64: dts: rockchip: rename label and nodename pinctrl subnodes that end with gpio
  arm64: dts: rockchip: fix rk3399-puma gmac reset gpio
  arm64: dts: rockchip: fix rk3399-puma vcc5v0-host gpio
  arm64: dts: rockchip: fix rk3368-lion gmac reset gpio
  arm64: dts: rockchip: set rockpro64 usbc dr_mode as host
  arm64: dts: rockchip: add fuel gauge to Pinebook Pro dts

Link: https://lore.kernel.org/r/2221560.KYr1Tee2JR@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 67598a47 505af918

arch/arm64/boot/dts/rockchip/px30-evb.dts

+0 −3
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ 
};



&emmc {

	bus-width = <8>;

	cap-mmc-highspeed;

	mmc-hs200-1_8v;

	non-removable;
@@ -499,7 +498,6 @@ 
};



&sdmmc {

	bus-width = <4>;

	cap-mmc-highspeed;

	cap-sd-highspeed;

	card-detect-delay = <800>;
@@ -513,7 +511,6 @@ 
};



&sdio {

	bus-width = <4>;

	cap-sd-highspeed;

	keep-power-in-suspend;

	non-removable;

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

+4 −3
Original line number Diff line number Diff line
@@ -714,6 +714,7 @@ 
			reg = <0x0 0xff240000 0x0 0x4000>;

			interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;

			arm,pl330-periph-burst;

			clocks = <&cru ACLK_DMAC>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;
@@ -733,9 +734,9 @@ 
		rockchip,grf = <&grf>;

		rockchip,hw-tshut-temp = <120000>;

		pinctrl-names = "init", "default", "sleep";

		pinctrl-0 = <&tsadc_otp_gpio>;

		pinctrl-0 = <&tsadc_otp_pin>;

		pinctrl-1 = <&tsadc_otp_out>;

		pinctrl-2 = <&tsadc_otp_gpio>;

		pinctrl-2 = <&tsadc_otp_pin>;

		#thermal-sensor-cells = <1>;

		status = "disabled";

	};
@@ -1373,7 +1374,7 @@ 
		};



		tsadc {

			tsadc_otp_gpio: tsadc-otp-gpio {

			tsadc_otp_pin: tsadc-otp-pin {

				rockchip,pins =

					<0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;

			};

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

+5 −3
Original line number Diff line number Diff line
@@ -524,6 +524,7 @@ 
			reg = <0x0 0xff2c0000 0x0 0x4000>;

			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;

			arm,pl330-periph-burst;

			clocks = <&cru ACLK_DMAC0>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;
@@ -534,6 +535,7 @@ 
			reg = <0x0 0xff2d0000 0x0 0x4000>;

			interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;

			arm,pl330-periph-burst;

			clocks = <&cru ACLK_DMAC1>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;
@@ -1629,7 +1631,7 @@ 
		};



		tsadc {

			tsadc_otp_gpio: tsadc-otp-gpio {

			tsadc_otp_pin: tsadc-otp-pin {

				rockchip,pins =

					<0 RK_PB2 0 &pcfg_pull_none>;

			};
@@ -1657,7 +1659,7 @@ 
					<2 RK_PA3 1 &pcfg_pull_none>;

			};



			uart0_rts_gpio: uart0-rts-gpio {

			uart0_rts_pin: uart0-rts-pin {

				rockchip,pins =

					<2 RK_PA3 0 &pcfg_pull_none>;

			};
@@ -1730,7 +1732,7 @@ 
					<4 RK_PA7 1 &pcfg_pull_none>;

			};



			uart4_rts_gpio: uart4-rts-gpio {

			uart4_rts_pin: uart4-rts-pin {

				rockchip,pins =

					<4 RK_PA7 0 &pcfg_pull_none>;

			};

arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts

+0 −1
Original line number Diff line number Diff line
@@ -445,7 +445,6 @@ 
};



&sdmmc {

	bus-width = <4>;

	cap-sd-highspeed;

	card-detect-delay = <200>;

	cd-gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_LOW>; /*[> CD GPIO <]*/

arch/arm64/boot/dts/rockchip/rk3328-evb.dts

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
		compatible = "regulator-fixed";

		gpio = <&gpio0 30 GPIO_ACTIVE_LOW>;

		pinctrl-names = "default";

		pinctrl-0 = <&sdmmc0m1_gpio>;

		pinctrl-0 = <&sdmmc0m1_pin>;

		regulator-name = "vcc_sd";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE