forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-10-12 a5969cabbb4660eab42b6ef0412cbbd1200cf14d 
 kernel/drivers/i2c/busses/i2c-nomadik.c
....@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23  * Copyright (C) 2009 ST-Ericsson SA
34  * Copyright (C) 2009 STMicroelectronics
....@@ -7,10 +8,6 @@
78  *
89  * Author: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
910  * Author: Sachin Verma <sachin.verma@st.com>
10
- *
11
- * This program is free software; you can redistribute it and/or modify
12
- * it under the terms of the GNU General Public License version 2, as
13
- * published by the Free Software Foundation.
1411  */
1512 #include <linux/init.h>
1613 #include <linux/module.h>
....@@ -399,7 +396,7 @@
399396 	 * 2 whereas it is 3 for fast and fastplus mode of
400397 	 * operation. TODO - high speed support.
401398 	 */
402
-	div = (dev->clk_freq > 100000) ? 3 : 2;
399
+	div = (dev->clk_freq > I2C_MAX_STANDARD_MODE_FREQ) ? 3 : 2;
403400 
404401 	/*
405402 	 * generate the mask for baud rate counters. The controller
....@@ -423,7 +420,7 @@
423420 	if (dev->sm > I2C_FREQ_MODE_FAST) {
424421 		dev_err(&dev->adev->dev,
425422 			"do not support this mode defaulting to std. mode\n");
426
-		brcr2 = i2c_clk/(100000 * 2) & 0xffff;
423
+		brcr2 = i2c_clk / (I2C_MAX_STANDARD_MODE_FREQ * 2) & 0xffff;
427424 		writel((brcr1 | brcr2), dev->virtbase + I2C_BRCR);
428425 		writel(I2C_FREQ_MODE_STANDARD << 4,
429426 				dev->virtbase + I2C_CR);
....@@ -952,10 +949,10 @@
952949 {
953950 	/* Default to 100 kHz if no frequency is given in the node */
954951 	if (of_property_read_u32(np, "clock-frequency", &nmk->clk_freq))
955
-		nmk->clk_freq = 100000;
952
+		nmk->clk_freq = I2C_MAX_STANDARD_MODE_FREQ;
956953 
957954 	/* This driver only supports 'standard' and 'fast' modes of operation. */
958
-	if (nmk->clk_freq <= 100000)
955
+	if (nmk->clk_freq <= I2C_MAX_STANDARD_MODE_FREQ)
959956 		nmk->sm = I2C_FREQ_MODE_STANDARD;
960957 	else
961958 		nmk->sm = I2C_FREQ_MODE_FAST;
....@@ -973,12 +970,10 @@
973970 	struct i2c_vendor_data *vendor = id->data;
974971 	u32 max_fifo_threshold = (vendor->fifodepth / 2) - 1;
975972 
976
-	dev = devm_kzalloc(&adev->dev, sizeof(struct nmk_i2c_dev), GFP_KERNEL);
977
-	if (!dev) {
978
-		dev_err(&adev->dev, "cannot allocate memory\n");
979
-		ret = -ENOMEM;
980
-		goto err_no_mem;
981
-	}
973
+	dev = devm_kzalloc(&adev->dev, sizeof(*dev), GFP_KERNEL);
974
+	if (!dev)
975
+		return -ENOMEM;
976
+
982977 	dev->vendor = vendor;
983978 	dev->adev = adev;
984979 	nmk_i2c_of_probe(np, dev);
....@@ -999,30 +994,21 @@
999994 
1000995 	dev->virtbase = devm_ioremap(&adev->dev, adev->res.start,
1001996 				resource_size(&adev->res));
1002
-	if (!dev->virtbase) {
1003
-		ret = -ENOMEM;
1004
-		goto err_no_mem;
1005
-	}
997
+	if (!dev->virtbase)
998
+		return -ENOMEM;
1006999 
10071000 	dev->irq = adev->irq[0];
10081001 	ret = devm_request_irq(&adev->dev, dev->irq, i2c_irq_handler, 0,
10091002 				DRIVER_NAME, dev);
10101003 	if (ret) {
10111004 		dev_err(&adev->dev, "cannot claim the irq %d\n", dev->irq);
1012
-		goto err_no_mem;
1005
+		return ret;
10131006 	}
10141007 
1015
-	dev->clk = devm_clk_get(&adev->dev, NULL);
1008
+	dev->clk = devm_clk_get_enabled(&adev->dev, NULL);
10161009 	if (IS_ERR(dev->clk)) {
1017
-		dev_err(&adev->dev, "could not get i2c clock\n");
1018
-		ret = PTR_ERR(dev->clk);
1019
-		goto err_no_mem;
1020
-	}
1021
-
1022
-	ret = clk_prepare_enable(dev->clk);
1023
-	if (ret) {
1024
-		dev_err(&adev->dev, "can't prepare_enable clock\n");
1025
-		goto err_no_mem;
1010
+		dev_err(&adev->dev, "could enable i2c clock\n");
1011
+		return PTR_ERR(dev->clk);
10261012 	}
10271013 
10281014 	init_hw(dev);
....@@ -1045,22 +1031,15 @@
10451031 
10461032 	ret = i2c_add_adapter(adap);
10471033 	if (ret)
1048
-		goto err_no_adap;
1034
+		return ret;
10491035 
10501036 	pm_runtime_put(&adev->dev);
10511037 
10521038 	return 0;
1053
-
1054
- err_no_adap:
1055
-	clk_disable_unprepare(dev->clk);
1056
- err_no_mem:
1057
-
1058
-	return ret;
10591039 }
10601040 
1061
-static int nmk_i2c_remove(struct amba_device *adev)
1041
+static void nmk_i2c_remove(struct amba_device *adev)
10621042 {
1063
-	struct resource *res = &adev->res;
10641043 	struct nmk_i2c_dev *dev = amba_get_drvdata(adev);
10651044 
10661045 	i2c_del_adapter(&dev->adap);
....@@ -1069,11 +1048,6 @@
10691048 	clear_all_interrupts(dev);
10701049 	/* disable the controller */
10711050 	i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE);
1072
-	clk_disable_unprepare(dev->clk);
1073
-	if (res)
1074
-		release_mem_region(res->start, resource_size(res));
1075
-
1076
-	return 0;
10771051 }
10781052 
10791053 static struct i2c_vendor_data vendor_stn8815 = {
....@@ -1126,6 +1100,7 @@
11261100 subsys_initcall(nmk_i2c_init);
11271101 module_exit(nmk_i2c_exit);
11281102 
1129
-MODULE_AUTHOR("Sachin Verma, Srinidhi KASAGAR");
1103
+MODULE_AUTHOR("Sachin Verma");
1104
+MODULE_AUTHOR("Srinidhi KASAGAR");
11301105 MODULE_DESCRIPTION("Nomadik/Ux500 I2C driver");
11311106 MODULE_LICENSE("GPL");