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

Merge tag 'v5.6-rockchip-dts32-2' of... 

Merge tag 'v5.6-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

Removal of the simple-panel compatible and some minor
additional cleanups.

* tag 'v5.6-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: Kill off "simple-panel" compatibles
  ARM: dts: rockchip: rename dwmmc node names to mmc
  ARM: dts: rockchip: add reg property to brcmf sub node for rk3188-bqedison2qc

Link: https://lore.kernel.org/r/3473489.DgqFdXXe5V@phil


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents faaa9f6e 8039c828

arch/arm/boot/dts/rk3036.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ emac: ethernet@10200000 { 
		status = "disabled";

	};



	sdmmc: dwmmc@10214000 {

	sdmmc: mmc@10214000 {

		compatible = "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x10214000 0x4000>;

		clock-frequency = <37500000>;
@@ -238,7 +238,7 @@ sdmmc: dwmmc@10214000 { 
		status = "disabled";

	};



	sdio: dwmmc@10218000 {

	sdio: mmc@10218000 {

		compatible = "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x10218000 0x4000>;

		max-frequency = <37500000>;
@@ -252,7 +252,7 @@ sdio: dwmmc@10218000 { 
		status = "disabled";

	};



	emmc: dwmmc@1021c000 {

	emmc: mmc@1021c000 {

		compatible = "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x1021c000 0x4000>;

		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/rk3188-bqedison2qc.dts

+3 −0
Original line number Diff line number Diff line
@@ -466,9 +466,12 @@ &mmc1 { 
	pinctrl-names = "default";

	pinctrl-0 = <&sd1_clk>, <&sd1_cmd>, <&sd1_bus4>;

	vmmcq-supply = <&vccio_wl>;

	#address-cells = <1>;

	#size-cells = <0>;

	status = "okay";



	brcmf: wifi@1 {

		reg = <1>;

		compatible = "brcm,bcm4329-fmac";

		interrupt-parent = <&gpio3>;

		interrupts = <RK_PD2 GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/rk322x.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ hdmi_in_vop: endpoint@0 { 
		};

	};



	sdmmc: dwmmc@30000000 {

	sdmmc: mmc@30000000 {

		compatible = "rockchip,rk3228-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x30000000 0x4000>;

		interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
@@ -675,7 +675,7 @@ sdmmc: dwmmc@30000000 { 
		status = "disabled";

	};



	sdio: dwmmc@30010000 {

	sdio: mmc@30010000 {

		compatible = "rockchip,rk3228-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x30010000 0x4000>;

		interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
@@ -688,7 +688,7 @@ sdio: dwmmc@30010000 { 
		status = "disabled";

	};



	emmc: dwmmc@30020000 {

	emmc: mmc@30020000 {

		compatible = "rockchip,rk3228-dw-mshc", "rockchip,rk3288-dw-mshc";

		reg = <0x30020000 0x4000>;

		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/rk3288-evb.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ ext_gmac: external-gmac-clock { 
	};



	panel: panel {

		compatible = "lg,lp079qx1-sp0v", "simple-panel";

		compatible = "lg,lp079qx1-sp0v";

		backlight = <&backlight>;

		enable-gpios = <&gpio7 RK_PA4 GPIO_ACTIVE_HIGH>;

		pinctrl-0 = <&lcd_cs>;

arch/arm/boot/dts/rk3288-veyron-edp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ backlight: backlight { 
	};



	panel: panel {

		compatible = "innolux,n116bge", "simple-panel";

		compatible = "innolux,n116bge";

		status = "okay";

		power-supply = <&panel_regulator>;

		backlight = <&backlight>;