05ff1e3fb8
Commit d4ec0cb05064 ("ARM: dts: exynos: Add support for the touch-sensitive buttons on Midas family") added a new fixed regulator ("voltage-regulator-6") to base "midas" .dtsi, but it didn't update the clients of that .dtsi, which define their own fixed regulators starting from the "voltage-regulator-6". This results in aliasing of the regulator dt nodes and breaks operation of OLED panel due to lack of power supply. Fix this by increasing the numbers in the fixed regulator names for those boards. Link: https://lore.kernel.org/r/20200316173710.3144-1-krzk@kernel.org Fixes: d4ec0cb05064 ("ARM: dts: exynos: Add support for the touch-sensitive buttons on Midas family") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
81 lines
1.6 KiB
Plaintext
81 lines
1.6 KiB
Plaintext
// SPDX-License-Identifier: GPL-2.0
|
|
/dts-v1/;
|
|
#include "exynos4412-midas.dtsi"
|
|
|
|
/ {
|
|
compatible = "samsung,n710x", "samsung,midas", "samsung,exynos4412", "samsung,exynos4";
|
|
model = "Samsung Galaxy Note 2 (GT-N7100, GT-N7105) based on Exynos4412";
|
|
|
|
memory@40000000 {
|
|
device_type = "memory";
|
|
reg = <0x40000000 0x80000000>;
|
|
};
|
|
|
|
/* bootargs are passed in by bootloader */
|
|
|
|
cam_vdda_reg: voltage-regulator-7 {
|
|
compatible = "regulator-fixed";
|
|
regulator-name = "CAM_SENSOR_CORE_1.2V";
|
|
regulator-min-microvolt = <1200000>;
|
|
regulator-max-microvolt = <1200000>;
|
|
gpio = <&gpm4 1 GPIO_ACTIVE_HIGH>;
|
|
enable-active-high;
|
|
};
|
|
};
|
|
|
|
&buck9_reg {
|
|
maxim,ena-gpios = <&gpm1 0 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
&cam_af_reg {
|
|
gpio = <&gpm1 1 GPIO_ACTIVE_HIGH>;
|
|
status = "okay";
|
|
};
|
|
|
|
&cam_io_reg {
|
|
gpio = <&gpm0 7 GPIO_ACTIVE_HIGH>;
|
|
status = "okay";
|
|
};
|
|
|
|
&i2c_3 {
|
|
samsung,i2c-sda-delay = <100>;
|
|
samsung,i2c-slave-addr = <0x10>;
|
|
samsung,i2c-max-bus-freq = <400000>;
|
|
pinctrl-0 = <&i2c3_bus>;
|
|
pinctrl-names = "default";
|
|
status = "okay";
|
|
|
|
mms152-touchscreen@48 {
|
|
compatible = "melfas,mms152";
|
|
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>;
|
|
};
|
|
};
|
|
|
|
&ldo13_reg {
|
|
regulator-name = "VCC_1.8V_LCD";
|
|
regulator-always-on;
|
|
};
|
|
|
|
&ldo25_reg {
|
|
regulator-name = "VCI_3.0V_LCD";
|
|
regulator-min-microvolt = <3000000>;
|
|
regulator-max-microvolt = <3000000>;
|
|
};
|
|
|
|
&s5c73m3 {
|
|
standby-gpios = <&gpm0 6 GPIO_ACTIVE_LOW>; /* ISP_STANDBY */
|
|
vdda-supply = <&cam_vdda_reg>;
|
|
status = "okay";
|
|
};
|
|
|
|
&touchkey_reg {
|
|
gpio = <&gpm0 5 GPIO_ACTIVE_HIGH>;
|
|
status = "okay";
|
|
};
|