Merge tag 'v5.11-rockchip-dts32-1' of... (45698302) · Commits · 戴 / test

arch/arm/boot/dts/rk3288-veyron-jaq.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@

		&backlight {
		/* Jaq panel PWM must be >= 3%, so start non-zero brightness at 8 */
		brightness-levels = <0 8 255>;
		brightness-levels = <8 255>;
		num-interpolated-steps = <247>;
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@

		&backlight {
		/* Minnie panel PWM must be >= 1%, so start non-zero brightness at 3 */
		brightness-levels = <0 3 255>;
		brightness-levels = <3 255>;
		num-interpolated-steps = <252>;
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@

		&backlight {
		/* Tiger panel PWM must be >= 1%, so start non-zero brightness at 3 */
		brightness-levels = <0 3 255>;
		brightness-levels = <3 255>;
		num-interpolated-steps = <252>;
		};

+40 −0

Original line number	Diff line number	Diff line
		@@ -231,6 +231,23 @@
		};
		};

		&i2c1 {
		clock-frequency = <400000>;
		status = "okay";

		hym8563: rtc@51 {
		compatible = "haoyu,hym8563";
		reg = <0x51>;
		interrupt-parent = <&gpio5>;
		interrupts = <RK_PC3 IRQ_TYPE_LEVEL_LOW>;
		#clock-cells = <0>;
		clock-frequency = <32768>;
		clock-output-names = "hym8563";
		pinctrl-names = "default";
		pinctrl-0 = <&hym8563_int>;
		};
		};

		&i2c5 {
		status = "okay";
		};
		@@ -241,10 +258,17 @@
		gpio1830-supply = <&vcc_18>;
		gpio30-supply = <&vcc_io>;
		sdcard-supply = <&vccio_sd>;
		wifi-supply = <&vcc_wl>;
		status = "okay";
		};

		&pinctrl {
		hym8563 {
		hym8563_int: hym8563-int {
		rockchip,pins = <5 RK_PC3 RK_FUNC_GPIO &pcfg_pull_up>;
		};
		};

		pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {
		drive-strength = <8>;
		};
		@@ -260,6 +284,12 @@
		};
		};

		sdio-pwrseq {
		wifi_enable_h: wifi-enable-h {
		rockchip,pins = <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
		};
		};

		sdmmc {
		sdmmc_bus4: sdmmc-bus4 {
		rockchip,pins =
		@@ -291,6 +321,16 @@
		};
		};

		&sdio_pwrseq {
		/*
		* On the module itself this is one of these (depending
		* on the actual card populated):
		* - SDIO_RESET_L_WL_REG_ON
		* - PDN (power down when low)
		*/
		reset-gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_LOW>; /* WIFI_REG_ON */
		};

		&usbphy {
		status = "okay";
		};

+21 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,14 @@
		#clock-cells = <0>;
		};

		sdio_pwrseq: sdio-pwrseq {
		compatible = "mmc-pwrseq-simple";
		clocks = <&hym8563>;
		clock-names = "ext_clock";
		pinctrl-names = "default";
		pinctrl-0 = <&wifi_enable_h>;
		};

		vcc12v_dcin: vcc12v-dcin-regulator {
		compatible = "regulator-fixed";
		regulator-name = "vcc12v_dcin";
		@@ -78,6 +86,19 @@
		status = "okay";
		};

		&sdio0 {
		bus-width = <4>;
		cap-sd-highspeed;
		cap-sdio-irq;
		keep-power-in-suspend;
		mmc-pwrseq = <&sdio_pwrseq>;
		non-removable;
		pinctrl-names = "default";
		pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
		sd-uhs-sdr104;
		status = "okay";
		};

		&sdmmc {
		bus-width = <4>;
		cap-mmc-highspeed;