Skip to content

L
linux
Commit 6252eb0a authored by Kukjin Kim's avatar Kukjin Kim
Browse files
Options

Merge tag 'samsung-dt-4.4-2' of http://github.com/krzk/linux into v4.4-next/dt-samsung 

Device Tree improvements for Exynos based boards (updated pull request):
1. Enable DMA on Exynos4 serial ports. This old patch uncovered
   a number of other issues in dmaengine and samsung serial driver.
   All of known issues are resolved so finally enable the DMA for UART.
2. Fix incorrect location of display-timings node (FIMD->DP node)
   on Arndale, SMDK5250 and SMDK5240 boards.
3. Minor cleanups.
parents 6c6000c2 c21dbcfe
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 96 deletions
arch/arm/boot/dts/exynos4.dtsi
View file @ 6252eb0a
......@@ -431,6 +431,8 @@ serial_0: serial@13800000 {
interrupts = <0 52 0>;
clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>;
clock-names = "uart", "clk_uart_baud0";
dmas = <&pdma0 15>, <&pdma0 16>;
dma-names = "rx", "tx";
status = "disabled";
};
......@@ -440,6 +442,8 @@ serial_1: serial@13810000 {
interrupts = <0 53 0>;
clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>;
clock-names = "uart", "clk_uart_baud0";
dmas = <&pdma1 15>, <&pdma1 16>;
dma-names = "rx", "tx";
status = "disabled";
};
......@@ -449,6 +453,8 @@ serial_2: serial@13820000 {
interrupts = <0 54 0>;
clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>;
clock-names = "uart", "clk_uart_baud0";
dmas = <&pdma0 17>, <&pdma0 18>;
dma-names = "rx", "tx";
status = "disabled";
};
......@@ -458,6 +464,8 @@ serial_3: serial@13830000 {
interrupts = <0 55 0>;
clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>;
clock-names = "uart", "clk_uart_baud0";
dmas = <&pdma1 17>, <&pdma1 18>;
dma-names = "rx", "tx";
status = "disabled";
};
......
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
View file @ 6252eb0a
......@@ -199,8 +199,6 @@ &hsotg {
};
&i2c_0 {
pinctrl-0 = <&i2c0_bus>;
pinctrl-names = "default";
samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <400000>;
status = "okay";
......@@ -276,15 +274,13 @@ ldo7_reg: LDO7 {
regulator-always-on;
};
ldo8_reg: ldo@8 {
regulator-compatible = "LDO8";
ldo8_reg: LDO8 {
regulator-name = "VDD10_HDMI_1.0V";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
};
ldo10_reg: ldo@10 {
regulator-compatible = "LDO10";
ldo10_reg: LDO10 {
regulator-name = "VDDQ_MIPIHSI_1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
......@@ -424,8 +420,6 @@ buck8_reg: BUCK8 {
};
&i2c_1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_bus>;
status = "okay";
max98090: max98090@10 {
compatible = "maxim,max98090";
......@@ -440,8 +434,6 @@ max98090: max98090@10 {
&i2c_2 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&i2c2_bus>;
};
&i2c_8 {
......
arch/arm/boot/dts/exynos4412-trats2.dts
View file @ 6252eb0a
......@@ -564,16 +564,14 @@ max77686: max77686_pmic@09 {
#clock-cells = <1>;
voltage-regulators {
ldo1_reg: ldo1 {
regulator-compatible = "LDO1";
ldo1_reg: LDO1 {
regulator-name = "VALIVE_1.0V_AP";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
regulator-always-on;
};
ldo2_reg: ldo2 {
regulator-compatible = "LDO2";
ldo2_reg: LDO2 {
regulator-name = "VM1M2_1.2V_AP";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
......@@ -583,32 +581,28 @@ regulator-state-mem {
};
};
ldo3_reg: ldo3 {
regulator-compatible = "LDO3";
ldo3_reg: LDO3 {
regulator-name = "VCC_1.8V_AP";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};
ldo4_reg: ldo4 {
regulator-compatible = "LDO4";
ldo4_reg: LDO4 {
regulator-name = "VCC_2.8V_AP";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
regulator-always-on;
};
ldo5_reg: ldo5 {
regulator-compatible = "LDO5";
ldo5_reg: LDO5 {
regulator-name = "VCC_1.8V_IO";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
};
ldo6_reg: ldo6 {
regulator-compatible = "LDO6";
ldo6_reg: LDO6 {
regulator-name = "VMPLL_1.0V_AP";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
......@@ -618,8 +612,7 @@ regulator-state-mem {
};
};
ldo7_reg: ldo7 {
regulator-compatible = "LDO7";
ldo7_reg: LDO7 {
regulator-name = "VPLL_1.0V_AP";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
......@@ -629,8 +622,7 @@ regulator-state-mem {
};
};
ldo8_reg: ldo8 {
regulator-compatible = "LDO8";
ldo8_reg: LDO8 {
regulator-name = "VMIPI_1.0V";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
......@@ -639,15 +631,13 @@ regulator-state-mem {
};
};
ldo9_reg: ldo9 {
regulator-compatible = "LDO9";
ldo9_reg: LDO9 {
regulator-name = "CAM_ISP_MIPI_1.2V";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
ldo10_reg: ldo10 {
regulator-compatible = "LDO10";
ldo10_reg: LDO10 {
regulator-name = "VMIPI_1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
......@@ -656,8 +646,7 @@ regulator-state-mem {
};
};
ldo11_reg: ldo11 {
regulator-compatible = "LDO11";
ldo11_reg: LDO11 {
regulator-name = "VABB1_1.95V";
regulator-min-microvolt = <1950000>;
regulator-max-microvolt = <1950000>;
......@@ -667,8 +656,7 @@ regulator-state-mem {
};
};
ldo12_reg: ldo12 {
regulator-compatible = "LDO12";
ldo12_reg: LDO12 {
regulator-name = "VUOTG_3.0V";
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
......@@ -677,15 +665,13 @@ regulator-state-mem {
};
};
ldo13_reg: ldo13 {
regulator-compatible = "LDO13";
ldo13_reg: LDO13 {
regulator-name = "NFC_AVDD_1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
ldo14_reg: ldo14 {
regulator-compatible = "LDO14";
ldo14_reg: LDO14 {
regulator-name = "VABB2_1.95V";
regulator-min-microvolt = <1950000>;
regulator-max-microvolt = <1950000>;
......@@ -695,8 +681,7 @@ regulator-state-mem {
};
};
ldo15_reg: ldo15 {
regulator-compatible = "LDO15";
ldo15_reg: LDO15 {
regulator-name = "VHSIC_1.0V";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
......@@ -705,8 +690,7 @@ regulator-state-mem {
};
};
ldo16_reg: ldo16 {
regulator-compatible = "LDO16";
ldo16_reg: LDO16 {
regulator-name = "VHSIC_1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
......@@ -715,80 +699,69 @@ regulator-state-mem {
};
};
ldo17_reg: ldo17 {
regulator-compatible = "LDO17";
ldo17_reg: LDO17 {
regulator-name = "CAM_SENSOR_CORE_1.2V";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
ldo18_reg: ldo18 {
regulator-compatible = "LDO18";
ldo18_reg: LDO18 {
regulator-name = "CAM_ISP_SEN_IO_1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
ldo19_reg: ldo19 {
regulator-compatible = "LDO19";
ldo19_reg: LDO19 {
regulator-name = "VT_CAM_1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
ldo20_reg: ldo20 {
regulator-compatible = "LDO20";
ldo20_reg: LDO20 {
regulator-name = "VDDQ_PRE_1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
ldo21_reg: ldo21 {
regulator-compatible = "LDO21";
ldo21_reg: LDO21 {
regulator-name = "VTF_2.8V";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
maxim,ena-gpios = <&gpy2 0 GPIO_ACTIVE_HIGH>;
};
ldo22_reg: ldo22 {
regulator-compatible = "LDO22";
ldo22_reg: LDO22 {
regulator-name = "VMEM_VDD_2.8V";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
maxim,ena-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>;
};
ldo23_reg: ldo23 {
regulator-compatible = "LDO23";
ldo23_reg: LDO23 {
regulator-name = "TSP_AVDD_3.3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
ldo24_reg: ldo24 {
regulator-compatible = "LDO24";
ldo24_reg: LDO24 {
regulator-name = "TSP_VDD_1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
ldo25_reg: ldo25 {
regulator-compatible = "LDO25";
ldo25_reg: LDO25 {
regulator-name = "LCD_VCC_3.3V";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
};
ldo26_reg: ldo26 {
regulator-compatible = "LDO26";
ldo26_reg: LDO26 {
regulator-name = "MOTOR_VCC_3.0V";
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
};
buck1_reg: buck1 {
regulator-compatible = "BUCK1";
buck1_reg: BUCK1 {
regulator-name = "vdd_mif";
regulator-min-microvolt = <850000>;
regulator-max-microvolt = <1100000>;
......@@ -799,8 +772,7 @@ regulator-state-mem {
};
};
buck2_reg: buck2 {
regulator-compatible = "BUCK2";
buck2_reg: BUCK2 {
regulator-name = "vdd_arm";
regulator-min-microvolt = <850000>;
regulator-max-microvolt = <1500000>;
......@@ -811,8 +783,7 @@ regulator-state-mem {
};
};
buck3_reg: buck3 {
regulator-compatible = "BUCK3";
buck3_reg: BUCK3 {
regulator-name = "vdd_int";
regulator-min-microvolt = <850000>;
regulator-max-microvolt = <1150000>;
......@@ -823,8 +794,7 @@ regulator-state-mem {
};
};
buck4_reg: buck4 {
regulator-compatible = "BUCK4";
buck4_reg: BUCK4 {
regulator-name = "vdd_g3d";
regulator-min-microvolt = <850000>;
regulator-max-microvolt = <1150000>;
......@@ -834,40 +804,35 @@ regulator-state-mem {
};
};
buck5_reg: buck5 {
regulator-compatible = "BUCK5";
buck5_reg: BUCK5 {
regulator-name = "VMEM_1.2V_AP";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-always-on;
};
buck6_reg: buck6 {
regulator-compatible = "BUCK6";
buck6_reg: BUCK6 {
regulator-name = "VCC_SUB_1.35V";
regulator-min-microvolt = <1350000>;
regulator-max-microvolt = <1350000>;
regulator-always-on;
};
buck7_reg: buck7 {
regulator-compatible = "BUCK7";
buck7_reg: BUCK7 {
regulator-name = "VCC_SUB_2.0V";
regulator-min-microvolt = <2000000>;
regulator-max-microvolt = <2000000>;
regulator-always-on;
};
buck8_reg: buck8 {
regulator-compatible = "BUCK8";
buck8_reg: BUCK8 {
regulator-name = "VMEM_VDDF_3.0V";
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
maxim,ena-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>;
};
buck9_reg: buck9 {
regulator-compatible = "BUCK9";
buck9_reg: BUCK9 {
regulator-name = "CAM_ISP_CORE_1.2V";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1200000>;
......
arch/arm/boot/dts/exynos5250-arndale.dts
View file @ 6252eb0a
......@@ -129,10 +129,6 @@ &dp {
samsung,color-depth = <1>;
samsung,link-rate = <0x0a>;
samsung,lane-count = <4>;
};
&fimd {
status = "okay";
display-timings {
native-mode = <&timing0>;
......@@ -152,6 +148,10 @@ timing0: timing@0 {
};
};
&fimd {
status = "okay";
};
&hdmi {
hpd-gpio = <&gpx3 7 GPIO_ACTIVE_LOW>;
vdd_osc-supply = <&ldo10_reg>;
......
arch/arm/boot/dts/exynos5250-smdk5250.dts
View file @ 6252eb0a
......@@ -89,14 +89,6 @@ &dp {
pinctrl-names = "default";
pinctrl-0 = <&dp_hpd>;
status = "okay";
};
&ehci {
samsung,vbus-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>;
};
&fimd {
status = "okay";
display-timings {
native-mode = <&timing0>;
......@@ -116,6 +108,14 @@ timing0: timing@0 {
};
};
&ehci {
samsung,vbus-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>;
};
&fimd {
status = "okay";
};
&hdmi {
hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
};
......
arch/arm/boot/dts/exynos5420-smdk5420.dts
View file @ 6252eb0a
......@@ -98,10 +98,7 @@ &dp {
samsung,link-rate = <0x0a>;
samsung,lane-count = <4>;
status = "okay";
};
&fimd {
status = "okay";
display-timings {
native-mode = <&timing0>;
timing0: timing@0 {
......@@ -118,6 +115,10 @@ timing0: timing@0 {
};
};
&fimd {
status = "okay";
};
&hdmi {
status = "okay";
hpd-gpio = <&gpx3 7 0>;
......
arch/arm/boot/dts/s3c2416.dtsi
View file @ 6252eb0a
......@@ -25,7 +25,7 @@ cpus {
#size-cells = <0>;
cpu {
compatible = "arm,arm926ejs";
compatible = "arm,arm926ej-s";
};
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7