On Wed, Jan 17, 2018 at 11:58:43PM +1100, Simon Shields wrote: > The midas boards share a lot with trats2. Split the common parts > out of trats2 into a common midas dtsi and a common "galaxy s3" dts. > > Signed-off-by: Simon Shields <simon@xxxxxxxxxxxxx> > --- > arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 141 ++ > ...exynos4412-trats2.dts => exynos4412-midas.dtsi} | 119 +- > arch/arm/boot/dts/exynos4412-trats2.dts | 1441 +------------------- > 3 files changed, 174 insertions(+), 1527 deletions(-) > create mode 100644 arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi > copy arch/arm/boot/dts/{exynos4412-trats2.dts => exynos4412-midas.dtsi} (91%) > rewrite arch/arm/boot/dts/exynos4412-trats2.dts (98%) > > diff --git a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi > new file mode 100644 > index 000000000000..b87ea2176978 > --- /dev/null > +++ b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi > @@ -0,0 +1,141 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Samsung's Exynos4412 based Galaxy S3 board device tree source > + * > + * Copyright (c) 2013 Samsung Electronics Co., Ltd. > + * http://www.samsung.com > + */ > + > +/dts-v1/; > +#include "exynos4412-midas.dtsi" > + > +/ { > + aliases { > + i2c9 = &i2c_ak8975; > + i2c10 = &i2c_cm36651; > + }; > + > + regulators { > + lcd_vdd3_reg: voltage-regulator-2 { > + compatible = "regulator-fixed"; > + regulator-name = "LCD_VDD_2.2V"; > + regulator-min-microvolt = <2200000>; > + regulator-max-microvolt = <2200000>; > + gpio = <&gpc0 1 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + }; > + > + ps_als_reg: voltage-regulator-5 { > + compatible = "regulator-fixed"; > + regulator-name = "LED_A_3.0V"; > + regulator-min-microvolt = <3000000>; > + regulator-max-microvolt = <3000000>; > + gpio = <&gpj0 5 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + }; > + }; > + > + i2c_ak8975: i2c-gpio-0 { > + compatible = "i2c-gpio"; > + gpios = <&gpy2 4 GPIO_ACTIVE_HIGH>, <&gpy2 5 GPIO_ACTIVE_HIGH>; > + i2c-gpio,delay-us = <2>; > + #address-cells = <1>; > + #size-cells = <0>; > + status = "okay"; > + > + ak8975@c { > + compatible = "asahi-kasei,ak8975"; > + reg = <0x0c>; > + gpios = <&gpj0 7 GPIO_ACTIVE_HIGH>; > + }; > + }; > + > + i2c_cm36651: i2c-gpio-2 { > + compatible = "i2c-gpio"; > + gpios = <&gpf0 0 GPIO_ACTIVE_LOW>, <&gpf0 1 GPIO_ACTIVE_LOW>; > + i2c-gpio,delay-us = <2>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + cm36651@18 { > + compatible = "capella,cm36651"; > + reg = <0x18>; > + interrupt-parent = <&gpx0>; > + interrupts = <2 IRQ_TYPE_EDGE_FALLING>; > + vled-supply = <&ps_als_reg>; > + }; > + }; > +}; > + > +&buck9_reg { > + maxim,ena-gpios = <&gpm0 3 GPIO_ACTIVE_HIGH>; > +}; > + > +&cam_af_reg { > + gpio = <&gpm0 4 GPIO_ACTIVE_HIGH>; > + status = "okay"; > +}; > + > +&cam_io_reg { > + gpio = <&gpm0 2 GPIO_ACTIVE_HIGH>; > + status = "okay"; > +}; > + > +&dsi_0 { > + status = "okay"; > + > + panel@0 { > + compatible = "samsung,s6e8aa0"; > + reg = <0>; > + vdd3-supply = <&lcd_vdd3_reg>; > + vci-supply = <&ldo25_reg>; > + reset-gpios = <&gpf2 1 GPIO_ACTIVE_HIGH>; > + power-on-delay= <50>; > + reset-delay = <100>; > + init-delay = <100>; > + flip-horizontal; > + flip-vertical; > + panel-width-mm = <58>; > + panel-height-mm = <103>; > + > + display-timings { > + timing-0 { > + clock-frequency = <57153600>; > + hactive = <720>; > + vactive = <1280>; > + hfront-porch = <5>; > + hback-porch = <5>; > + hsync-len = <5>; > + vfront-porch = <13>; > + vback-porch = <1>; > + vsync-len = <2>; > + }; > + }; > + }; > +}; > + > +&i2c_3 { > + mms114-touchscreen@48 { > + compatible = "melfas,mms114"; > + reg = <0x48>; > + interrupt-parent = <&gpm2>; > + interrupts = <3 IRQ_TYPE_EDGE_FALLING>; > + x-size = <720>; > + y-size = <1280>; > + avdd-supply = <&ldo23_reg>; > + vdd-supply = <&ldo24_reg>; > + }; > +}; > + > +&ldo25_reg { > + regulator-name = "LCD_VCC_3.3V"; > + regulator-min-microvolt = <2800000>; > + regulator-max-microvolt = <2800000>; > + status = "okay"; The pmic regulator should not have status okay. It is not disabled. Rest looks good, thanks for resubmit! Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html