On Wed, Dec 20, 2017 at 4:27 PM, Simon Shields <simon@xxxxxxxxxxxxx> wrote: (...) >> > @@ -68,17 +60,8 @@ >> > regulator-name = "CAM_SENSOR_A"; >> > regulator-min-microvolt = <2800000>; >> > regulator-max-microvolt = <2800000>; >> > - gpio = <&gpm0 2 GPIO_ACTIVE_HIGH>; >> > - enable-active-high; >> > - }; >> > - >> > - 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; >> > + status = "disabled"; >> >> Why disabled? > > The GPIO which controls CAM_SENSOR_A differs between boards (gpm0-2 on > s3, gpm0-7 on t0). Hmm, okay, makes sense then. > >> >> > }; >> > >> > cam_af_reg: voltage-regulator-3 { >> > @@ -86,17 +69,8 @@ >> > regulator-name = "CAM_AF"; >> > regulator-min-microvolt = <2800000>; >> > regulator-max-microvolt = <2800000>; >> > - gpio = <&gpm0 4 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; >> > + status = "disabled"; >> >> Why disabled? > > Same as above. gpm0-4 on s3, gpm1-1 on t0. >> >> > }; >> > >> > vsil12: voltage-regulator-6 { >> > @@ -227,37 +201,6 @@ >> > }; >> > }; >> > >> > - 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>; >> > - }; >> > - }; >> > - >> > i2c-mhl { >> > compatible = "i2c-gpio"; >> > gpios = <&gpf0 4 GPIO_ACTIVE_HIGH>, <&gpf0 6 GPIO_ACTIVE_HIGH>; >> > @@ -296,8 +239,6 @@ >> > <&clock CLK_MOUT_CAM1>; >> > assigned-clock-parents = <&clock CLK_XUSBXTI>, >> > <&clock CLK_XUSBXTI>; >> > - >> > - >> > }; >> > >> > wlan_pwrseq: sdhci3-pwrseq { >> > @@ -454,36 +395,7 @@ >> > samsung,burst-clock-frequency = <500000000>; >> > samsung,esc-clock-frequency = <20000000>; >> > samsung,pll-clock-frequency = <24000000>; >> > - 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>; >> > - }; >> > - }; >> > - }; >> > + status = "disabled"; >> >> It is already disabled by exynos4.dtsi, no need to duplicate properties. >> >> > }; >> > >> > &exynos_usbphy { >> > @@ -603,7 +515,7 @@ >> > samsung,i2c-max-bus-freq = <400000>; >> > pinctrl-0 = <&i2c0_bus>; >> > pinctrl-names = "default"; >> > - status = "okay"; >> > + status = "disabled"; >> >> I do not get this node. It sits in midas.dtsi and s3.dtsi just enables >> it. Why not enabling it here? > Initially, I thought that T0 had some extra regulator that needed to be enabled, > but in reality it's just a different vdda supply - so vdda should be > moved down to galaxy-s3 Yes, please and then only for s5c73m3@3c. The i2c node should stay enabled, I think. > >> >> > s5c73m3@3c { >> > compatible = "samsung,s5c73m3"; >> > @@ -635,18 +547,7 @@ >> > samsung,i2c-max-bus-freq = <400000>; >> > pinctrl-0 = <&i2c3_bus>; >> > pinctrl-names = "default"; >> > - status = "okay"; >> > - >> > - 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>; >> > - }; >> > + status = "disabled"; >> > }; >> > >> > &i2c_4 { >> > @@ -827,6 +728,7 @@ >> > regulator-name = "CAM_SENSOR_CORE_1.2V"; >> > regulator-min-microvolt = <1200000>; >> > regulator-max-microvolt = <1200000>; >> > + status = "okay"; >> >> Regulator should not be disabled or enabled. It is not a device. I do >> not get the logic behind... >> >> The ''status = disabled" usually is added in DTSI files to nodes which >> are not fully configured at this point, e.g. they require external >> resources (clocks, regulators). These external resources will be >> provided when extending in DTS (or further DTSI) while enabling it. >> However regulator has always all necessary resources. >> > > Ack. This one shouldn't be here. > >> > }; >> > >> > ldo18_reg: LDO18 { >> > @@ -874,9 +776,7 @@ >> > }; >> > >> > ldo25_reg: LDO25 { >> > - regulator-name = "LCD_VCC_3.3V"; >> > - regulator-min-microvolt = <2800000>; >> > - regulator-max-microvolt = <2800000>; >> > + status = "disabled"; >> >> Ditto. > > In this case, s3 and t0 have different regulator voltages/names > (3.0V vs 2.8V), but it doesn't really seem to make sense to me > to leave ldo25 out of the common dts altogether, since it's there on all > boards. If you would prefer, I can remove ldo25 and leave it completely > in the t0/s3 config files So leave empty ldo25, like: ldo25_reg: LDO25 { regulator-name = "LDO25"; }; Something like buck8_reg in arch/arm/boot/dts/exynos4412-odroid-common.dtsi. The point is to provide entire description of max77686 regulators in basic DTSI. The driver anyway knows the constraints (min/max voltages) so in case of missing entries in DTS, default will be applied. Then in child-DTS you can customize the voltage and/or name to necessary value. Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html