Merge branch 'fixes' into omap-for-v5.10/dt (513f8297) · Commits · 戴 / test

arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi

+7 −22

Original line number	Diff line number	Diff line
		@@ -51,6 +51,8 @@

		&mcbsp2 {
		status = "okay";
		pinctrl-names = "default";
		pinctrl-0 = <&mcbsp2_pins>;
		};

		&charger {
		@@ -102,35 +104,18 @@
		regulator-max-microvolt = <3300000>;
		};

		lcd0: display@0 {
		compatible = "panel-dpi";
		label = "28";
		status = "okay";
		/* default-on; */
		lcd0: display {
		/* This isn't the exact LCD, but the timings meet spec */
		compatible = "logicpd,type28";
		pinctrl-names = "default";
		pinctrl-0 = <&lcd_enable_pin>;
		enable-gpios = <&gpio5 27 GPIO_ACTIVE_HIGH>; /* gpio155, lcd INI */
		backlight = <&bl>;
		enable-gpios = <&gpio5 27 GPIO_ACTIVE_HIGH>;
		port {
		lcd_in: endpoint {
		remote-endpoint = <&dpi_out>;
		};
		};

		panel-timing {
		clock-frequency = <9000000>;
		hactive = <480>;
		vactive = <272>;
		hfront-porch = <3>;
		hback-porch = <2>;
		hsync-len = <42>;
		vback-porch = <3>;
		vfront-porch = <2>;
		vsync-len = <11>;
		hsync-active = <1>;
		vsync-active = <1>;
		de-active = <1>;
		pixelclk-active = <0>;
		};
		};

		bl: backlight {

+2 −0

+17 −15

Original line number	Diff line number	Diff line
		@@ -488,11 +488,11 @@
		};
		};

		target-module@5000 {
		target-module@4000 {
		compatible = "ti,sysc-omap2", "ti,sysc";
		reg = <0x5000 0x4>,
		<0x5010 0x4>,
		<0x5014 0x4>;
		reg = <0x4000 0x4>,
		<0x4010 0x4>,
		<0x4014 0x4>;
		reg-names = "rev", "sysc", "syss";
		ti,sysc-sidle = <SYSC_IDLE_FORCE>,
		<SYSC_IDLE_NO>,
		@@ -504,7 +504,7 @@
		ti,syss-mask = <1>;
		#address-cells = <1>;
		#size-cells = <1>;
		ranges = <0 0x5000 0x1000>;
		ranges = <0 0x4000 0x1000>;

		dsi1: encoder@0 {
		compatible = "ti,omap5-dsi";
		@@ -514,11 +514,9 @@
		reg-names = "proto", "phy", "pll";
		interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
		status = "disabled";
		clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>;
		clock-names = "fck";

		#address-cells = <1>;
		#size-cells = <0>;
		clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>,
		<&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 10>;
		clock-names = "fck", "sys_clk";
		};
		};

		@@ -548,11 +546,9 @@
		reg-names = "proto", "phy", "pll";
		interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
		status = "disabled";
		clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>;
		clock-names = "fck";

		#address-cells = <1>;
		#size-cells = <0>;
		clocks = <&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 8>,
		<&dss_clkctrl OMAP5_DSS_CORE_CLKCTRL 10>;
		clock-names = "fck", "sys_clk";
		};
		};

		@@ -680,6 +676,12 @@
		#reset-cells = <1>;
		};

		prm_abe: prm@500 {
		compatible = "ti,omap5-prm-inst", "ti,omap-prm-inst";
		reg = <0x500 0x100>;
		#power-domain-cells = <0>;
		};

		prm_core: prm@700 {
		compatible = "ti,omap5-prm-inst", "ti,omap-prm-inst";
		reg = <0x700 0x100>;

+1 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ static struct powerdomain _get_pwrdm(struct device dev)
		return pwrdm;

		clk = of_clk_get(dev->of_node->parent, 0);
		if (!clk) {
		if (IS_ERR(clk)) {
		dev_err(dev, "no fck found\n");
		return NULL;
		}