Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / arm / boot / dts / ste-ux500-samsung-golden.dts

diff --git a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
index 60fe618..40df7c6 100644 (file)
--- a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
@@ -5,6 +5,7 @@
 #include "ste-ab8505.dtsi"
 #include "ste-dbx5x0-pinctrl.dtsi"
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 
@@ -72,7 +73,7 @@
 
        soc {
                /* External Micro SD card slot */
-               sdi0_per1@80126000 {
+               mmc@80126000 {
                        status = "okay";
 
                        arm,primecell-periphid = <0x10480180>;
@@ -100,7 +101,7 @@
                };
 
                /* WLAN SDIO */
-               sdi1_per2@80118000 {
+               mmc@80118000 {
                        status = "okay";
 
                        arm,primecell-periphid = <0x10480180>;
@@ -120,7 +121,7 @@
                        #size-cells = <0>;
 
                        wifi@1 {
-                               compatible = "brcm,bcm4329-fmac";
+                               compatible = "brcm,bcm4334-fmac", "brcm,bcm4329-fmac";
                                reg = <1>;
 
                                /* GPIO216 (WLAN_HOST_WAKE) */
@@ -134,7 +135,7 @@
                };
 
                /* eMMC */
-               sdi2_per3@80005000 {
+               mmc@80005000 {
                        status = "okay";
 
                        arm,primecell-periphid = <0x10480180>;
@@ -161,6 +162,7 @@
                        pinctrl-1 = <&u0_a_1_sleep>;
 
                        bluetooth {
+                               /* BCM4334B0 actually */
                                compatible = "brcm,bcm4330-bt";
                                /* GPIO222 (BT_VREG_ON) */
                                shutdown-gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>;
@@ -374,6 +376,32 @@
                };
        };
 
+       /* Richtek RT8515GQW Flash LED Driver IC */
+       flash {
+               compatible = "richtek,rt8515";
+               /* GPIO 140 */
+               enf-gpios = <&gpio4 12 GPIO_ACTIVE_HIGH>;
+               /* GPIO 141 */
+               ent-gpios = <&gpio4 13 GPIO_ACTIVE_HIGH>;
+               /*
+                * RFS is 16 kOhm and RTS is 100 kOhm giving
+                * the flash max current 343mA and torch max
+                * current 55 mA.
+                */
+               richtek,rfs-ohms = <16000>;
+               richtek,rts-ohms = <100000>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&gpio_flash_default_mode>;
+
+               led {
+                       function = LED_FUNCTION_FLASH;
+                       color = <LED_COLOR_ID_WHITE>;
+                       flash-max-timeout-us = <250000>;
+                       flash-max-microamp = <343750>;
+                       led-max-microamp = <55000>;
+               };
+       };
+
        vibrator {
                compatible = "gpio-vibrator";
                /* GPIO195 (MOT_EN) */
@@ -499,6 +527,15 @@
                };
        };
 
+       flash {
+               gpio_flash_default_mode: flash_default {
+                       golden_cfg1 {
+                               pins = "GPIO140_B11", "GPIO141_C12";
+                               ste,config = <&gpio_out_lo>;
+                       };
+               };
+       };
+
        i2c-gpio-1 {
                i2c_gpio_1_default: i2c_gpio_1 {
                        golden_cfg1 {