mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/pinctrl/tegra/pinctrl-tegra114.c
..
..
@@ -1,18 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Pinctrl data for the NVIDIA Tegra114 pinmux
3
4
  *
4
5
  * Author: Pritesh Raithatha <praithatha@nvidia.com>
5
6
  *
6
7
  * Copyright (c) 2012-2013, NVIDIA CORPORATION.  All rights reserved.
7
- *
8
- * This program is free software; you can redistribute it and/or modify it
9
- * under the terms and conditions of the GNU General Public License,
10
- * version 2, as published by the Free Software Foundation.
11
- *
12
- * This program is distributed in the hope it will be useful, but WITHOUT
13
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
15
- * more details.
16
8
  */
17
9
 
18
10
 #include <linux/init.h>
..
..
@@ -1580,8 +1572,8 @@
1580
1572
 		.lock_bit = 7,						\
1581
1573
 		.ioreset_bit = PINGROUP_BIT_##ior(8),			\
1582
1574
 		.rcv_sel_bit = PINGROUP_BIT_##rcv_sel(9),		\
1583
-		.parked_bit = -1,					\
1584
1575
 		.drv_reg = -1,						\
1576
+		.parked_bitmask = 0,					\
1585
1577
 	}
1586
1578
 
1587
1579
 #define DRV_PINGROUP(pg_name, r, hsm_b, schmitt_b, lpmd_b, drvdn_b,	\
..
..
@@ -1601,7 +1593,6 @@
1601
1593
 		.rcv_sel_bit = -1,					\
1602
1594
 		.drv_reg = DRV_PINGROUP_REG(r),				\
1603
1595
 		.drv_bank = 0,						\
1604
-		.parked_bit = -1,					\
1605
1596
 		.hsm_bit = hsm_b,					\
1606
1597
 		.schmitt_bit = schmitt_b,				\
1607
1598
 		.lpmd_bit = lpmd_b,					\
..
..
@@ -1614,6 +1605,7 @@
1614
1605
 		.slwf_bit = slwf_b,					\
1615
1606
 		.slwf_width = slwf_w,					\
1616
1607
 		.drvtype_bit = PINGROUP_BIT_##drvtype(6),		\
1608
+		.parked_bitmask = 0,					\
1617
1609
 	}
1618
1610
 
1619
1611
 static const struct tegra_pingroup tegra114_groups[] = {
..
..
@@ -1839,7 +1831,7 @@
1839
1831
 
1840
1832
 static const struct tegra_pinctrl_soc_data tegra114_pinctrl = {
1841
1833
 	.ngpios = NUM_GPIOS,
1842
-	.gpio_compatible = "nvidia,tegra30-gpio",
1834
+	.gpio_compatible = "nvidia,tegra114-gpio",
1843
1835
 	.pins = tegra114_pins,
1844
1836
 	.npins = ARRAY_SIZE(tegra114_pins),
1845
1837
 	.functions = tegra114_functions,