[9610] drivers: muic: Support CP UART

Change-Id: I3ecd6d0cfd6d52ed6db78f4f5d04323304b4c95d
Signed-off-by: Jiyoung Jeong <ji_0.jeong@samsung.com>

diff --git a/arch/arm64/boot/dts/exynos/exynos9610-erd9610.dts b/arch/arm64/boot/dts/exynos/exynos9610-erd9610.dts
index d062c5a8ca7b7468a9838ae6c8731176fea75f0b..beff6929dad3107e3b464ec35fbc0da45822727f 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos9610-erd9610.dts
+++ b/arch/arm64/boot/dts/exynos/exynos9610-erd9610.dts
@@ -36,7 +36,7 @@
                        };
 
                        chosen {
-                               bootargs = "console=ram skip_initramfs rootwait ro init=/init clk_ignore_unused bcm_setup=0xffffff80f8e00000 androidboot.hardware=exynos9610 androidboot.selinux=permissive androidboot.debug_level=0x4948 firmware_class.path=/vendor/firmware ecd_setup=disable reserve-fimc=0xffffff80f9fe0000 pmic_info=0x3";
+                               bootargs = "console=ram skip_initramfs rootwait ro init=/init clk_ignore_unused bcm_setup=0xffffff80f8e00000 androidboot.hardware=exynos9610 androidboot.selinux=permissive androidboot.debug_level=0x4948 firmware_class.path=/vendor/firmware ecd_setup=disable reserve-fimc=0xffffff80f9fe0000 pmic_info=0x3 ccic_info=0x1";
                                linux,initrd-start = <0x84000000>;
                                linux,initrd-end = <0x841FFFFF>;
                        };

diff --git a/drivers/muic/s2mu004-muic-sysfs.c b/drivers/muic/s2mu004-muic-sysfs.c
index 24eddb66640ad79880a3e55c18a58ac09f92b816..995727af783a7dff6a5254cd5d627d0a5fc4ad1a 100644 (file)
--- a/drivers/muic/s2mu004-muic-sysfs.c
+++ b/drivers/muic/s2mu004-muic-sysfs.c
@@ -29,6 +29,8 @@
 #include <linux/muic/s2mu004-muic.h>
 #include <linux/sec_sysfs.h>
 
+struct device *switch_device;
+
 static ssize_t s2mu004_muic_show_uart_en(struct device *dev,
        struct device_attribute *attr, char *buf)
 {
@@ -66,6 +68,7 @@ static ssize_t s2mu004_muic_set_uart_en(struct device *dev,
        return count;
 }
 
+#ifndef CONFIG_UART_SWITCH
 static ssize_t s2mu004_muic_show_uart_sel(struct device *dev,
        struct device_attribute *attr, char *buf)
 {
@@ -120,6 +123,7 @@ static ssize_t s2mu004_muic_set_usb_sel(struct device *dev,
 {
        return count;
 }
+#endif
 
 static ssize_t s2mu004_muic_show_usb_en(struct device *dev,
        struct device_attribute *attr, char *buf)
@@ -614,10 +618,12 @@ static ssize_t muic_store_afc_set_voltage(struct device *dev,
 
 static DEVICE_ATTR(uart_en, 0664, s2mu004_muic_show_uart_en,
                                        s2mu004_muic_set_uart_en);
+#ifndef CONFIG_UART_SWITCH
 static DEVICE_ATTR(uart_sel, 0664, s2mu004_muic_show_uart_sel,
                                        s2mu004_muic_set_uart_sel);
 static DEVICE_ATTR(usb_sel, 0664, s2mu004_muic_show_usb_sel,
                                        s2mu004_muic_set_usb_sel);
+#endif
 static DEVICE_ATTR(adc, 0664, s2mu004_muic_show_adc, NULL);
 #if IS_ENABLED(DEBUG_MUIC)
 static DEVICE_ATTR(mansw, 0664, s2mu004_muic_show_mansw, NULL);
@@ -650,8 +656,10 @@ static DEVICE_ATTR(afc_set_voltage, 0220,
 
 static struct attribute *s2mu004_muic_attributes[] = {
        &dev_attr_uart_en.attr,
+#ifndef CONFIG_UART_SWITCH
        &dev_attr_uart_sel.attr,
        &dev_attr_usb_sel.attr,
+#endif
        &dev_attr_adc.attr,
 #if IS_ENABLED(DEBUG_MUIC)
        &dev_attr_mansw.attr,
@@ -685,29 +693,28 @@ int s2mu004_muic_init_sysfs(struct s2mu004_muic_data *muic_data)
        int ret;
        /* create sysfs group */
 #if IS_ENABLED(CONFIG_SEC_FACTORY)
-       muic_data->switch_device = sec_device_find("switch");
+       switch_device = sec_device_find("switch");
+#else
+       switch_device = sec_device_create(NULL, "switch");
 #endif
 
-       if (muic_data->switch_device == NULL)
-               muic_data->switch_device = sec_device_create(NULL, "switch");
-
-       if (IS_ERR(muic_data->switch_device)) {
+       if (IS_ERR(switch_device)) {
                pr_err("%s Failed to create device(switch)!\n", __func__);
                ret = -ENODEV;
                return ret;
        }
 
-       ret = sysfs_create_group(&muic_data->switch_device->kobj, &s2mu004_muic_group);
+       ret = sysfs_create_group(&switch_device->kobj, &s2mu004_muic_group);
        if (ret) {
                pr_err("failed to create sysfs\n");
                return ret;
        }
-       dev_set_drvdata(muic_data->switch_device, muic_data);
+
        return ret;
 }
 
 void s2mu004_muic_deinit_sysfs(struct s2mu004_muic_data *muic_data)
 {
-       if (muic_data->switch_device)
-               sysfs_remove_group(&muic_data->switch_device->kobj, &s2mu004_muic_group);
+       if (switch_device)
+               sysfs_remove_group(&switch_device->kobj, &s2mu004_muic_group);
 }