Skip to content

Commit 08084d5

Browse files
hmauadihmauadi
authored
Merge pull request #2 from davidgibsonadi/develop/g-xp-merge
Develop/g xp merge
2 parents f057990 + a615017 commit 08084d5

File tree

11 files changed

+1292
-56
lines changed

11 files changed

+1292
-56
lines changed

‎arch/arm/boot/dts/sc594-som-ezkit.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@
339339
snps,reset-active-low;
340340
snps,reset-delays-us = <0 200 500>;
341341
phy-handle = <&dp83867>;
342-
phy-mode = "rgmii";
342+
phy-mode = "rgmii-id";
343343
pinctrl-names = "default";
344344
pinctrl-0 = <&eth0_default>;
345345
status = "okay";

‎arch/arm/configs/sc594-som-ezkit_defconfig‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,17 @@ CONFIG_HIGH_RES_TIMERS=y
88
CONFIG_PREEMPT_VOLUNTARY=y
99
CONFIG_IKCONFIG=y
1010
CONFIG_LOG_BUF_SHIFT=14
11-
CONFIG_BLK_DEV_INITRD=y
1211
CONFIG_CGROUPS=y
13-
CONFIG_SIGNALFD=y
14-
CONFIG_TIMERFD=y
15-
CONFIG_FSNOTIFY=y
16-
CONFIG_FHANDLE=y
17-
CONFIG_AUTOFS4_FS=y
12+
CONFIG_BLK_DEV_INITRD=y
1813
# CONFIG_EVENTFD is not set
1914
# CONFIG_AIO is not set
15+
CONFIG_BPF_SYSCALL=y
2016
CONFIG_EMBEDDED=y
2117
# CONFIG_VM_EVENT_COUNTERS is not set
2218
CONFIG_SLAB=y
2319
CONFIG_PROFILING=y
2420
CONFIG_ARCH_SC59X=y
2521
CONFIG_ARM_THUMBEE=y
26-
CONFIG_PCI=y
27-
CONFIG_PCI_MSI=y
2822
CONFIG_HZ_250=y
2923
CONFIG_CPU_FREQ=y
3024
CONFIG_CPU_FREQ_STAT=y
@@ -34,10 +28,7 @@ CONFIG_CPUFREQ_DT=y
3428
CONFIG_OPROFILE=m
3529
CONFIG_MODULES=y
3630
CONFIG_MODULE_UNLOAD=y
37-
# CONFIG_LBDAF is not set
3831
# CONFIG_BLK_DEV_BSG is not set
39-
# CONFIG_IOSCHED_DEADLINE is not set
40-
# CONFIG_IOSCHED_CFQ is not set
4132
# CONFIG_COREDUMP is not set
4233
# CONFIG_COMPACTION is not set
4334
CONFIG_NET=y
@@ -55,13 +46,11 @@ CONFIG_CAN=y
5546
CONFIG_CFG80211=y
5647
CONFIG_CFG80211_WEXT=y
5748
CONFIG_MAC80211=y
58-
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
5949
CONFIG_DEVTMPFS=y
6050
CONFIG_DEVTMPFS_MOUNT=y
6151
CONFIG_MTD=y
6252
CONFIG_MTD_CMDLINE_PARTS=y
6353
CONFIG_MTD_BLOCK=y
64-
CONFIG_MTD_M25P80=y
6554
CONFIG_MTD_SPI_NOR=y
6655
CONFIG_SPI_CADENCE_QUADSPI=y
6756
CONFIG_MTD_UBI=y
@@ -96,7 +85,6 @@ CONFIG_GPIO_SYSFS=y
9685
# CONFIG_HWMON is not set
9786
CONFIG_WATCHDOG=y
9887
CONFIG_ADI_WATCHDOG=y
99-
# CONFIG_VGA_ARB is not set
10088
CONFIG_FB=m
10189
CONFIG_SOUND=y
10290
CONFIG_SND=y
@@ -129,7 +117,7 @@ CONFIG_RPMSG_CHAR=y
129117
CONFIG_RPMSG_VIRTIO=y
130118
CONFIG_EXT4_FS=y
131119
# CONFIG_DNOTIFY is not set
132-
CONFIG_INOTIFY_USER=y
120+
CONFIG_AUTOFS4_FS=y
133121
CONFIG_VFAT_FS=y
134122
CONFIG_TMPFS=y
135123
CONFIG_JFFS2_FS=y
@@ -149,9 +137,17 @@ CONFIG_CRYPTO_ANSI_CPRNG=y
149137
CONFIG_CRYPTO_DEV_ADI_CRC=y
150138
CONFIG_CRC_CCITT=y
151139
CONFIG_DEBUG_INFO=y
152-
CONFIG_DEBUG_FS=y
153140
CONFIG_DEBUG_PAGEALLOC=y
154141
# CONFIG_SCHED_DEBUG is not set
155-
# CONFIG_FTRACE is not set
142+
CONFIG_PREEMPTIRQ_EVENTS=y
143+
CONFIG_IRQSOFF_TRACER=y
144+
CONFIG_SCHED_TRACER=y
145+
CONFIG_HWLAT_TRACER=y
146+
CONFIG_FTRACE_SYSCALLS=y
147+
CONFIG_STACK_TRACER=y
148+
CONFIG_BLK_DEV_IO_TRACE=y
149+
CONFIG_FUNCTION_PROFILER=y
150+
CONFIG_TRACEPOINT_BENCHMARK=y
151+
CONFIG_TRACE_EVAL_MAP_FILE=y
156152
CONFIG_DEBUG_LL=y
157153
CONFIG_EARLY_PRINTK=y

‎arch/arm/mach-sc59x/core.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,10 +444,10 @@ void __init sc59x_init(void)
444444
#endif
445445

446446
pr_info("%s: registering device resources\n", __func__);
447-
/*
447+
448448
sec_init(__io_address(SEC_COMMON_BASE), __io_address(SEC_SCI_BASE),
449449
__io_address(SEC_SSI_BASE));
450-
*/
450+
451451
#ifdef CONFIG_OF
452452
of_platform_populate(NULL, sc59x_of_bus_ids,
453453
sc59x_auxdata_lookup, NULL);

‎arch/arm/mach-sc59x/include/mach/portmux-sc59x.h‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -47,31 +47,28 @@
4747
#define P_UART2_CTS (P_DEFINED | P_IDENT(GPIO_PE13) | P_FUNCT(1))
4848

4949
/* SPI Port Mux */
50-
#define P_SPI0_SCK (P_DEFINED | P_IDENT(GPIO_PC9) | P_FUNCT(0))
51-
#define P_SPI0_MISO (P_DEFINED | P_IDENT(GPIO_PC10) | P_FUNCT(0))
52-
#define P_SPI0_MOSI (P_DEFINED | P_IDENT(GPIO_PC11) | P_FUNCT(0))
53-
#define P_SPI0_RDY (P_DEFINED | P_IDENT(GPIO_PC12) | P_FUNCT(1))
54-
55-
#define P_SPI0_SSEL1 (P_DEFINED | P_IDENT(GPIO_PC7) | P_FUNCT(1))
56-
#define P_SPI0_SSEL2 (P_DEFINED | P_IDENT(GPIO_PD1) | P_FUNCT(0))
57-
#define P_SPI0_SSEL3 (P_DEFINED | P_IDENT(GPIO_PC12) | P_FUNCT(0))
58-
#define P_SPI0_SSEL4 (P_DEFINED | P_IDENT(GPIO_PC0) | P_FUNCT(2))
59-
#define P_SPI0_SSEL5 (P_DEFINED | P_IDENT(GPIO_PE1) | P_FUNCT(1))
60-
#define P_SPI0_SSEL6 (P_DEFINED | P_IDENT(GPIO_PE2) | P_FUNCT(1))
61-
#define P_SPI0_SSEL7 (P_DEFINED | P_IDENT(GPIO_PE3) | P_FUNCT(1))
62-
63-
#define P_SPI1_SCK (P_DEFINED | P_IDENT(GPIO_PE13) | P_FUNCT(0))
64-
#define P_SPI1_MISO (P_DEFINED | P_IDENT(GPIO_PE14) | P_FUNCT(0))
65-
#define P_SPI1_MOSI (P_DEFINED | P_IDENT(GPIO_PE15) | P_FUNCT(0))
66-
#define P_SPI1_RDY (P_DEFINED | P_IDENT(GPIO_PE8) | P_FUNCT(2))
67-
68-
#define P_SPI1_SSEL1 (P_DEFINED | P_IDENT(GPIO_PC13) | P_FUNCT(1))
69-
#define P_SPI1_SSEL2 (P_DEFINED | P_IDENT(GPIO_PE7) | P_FUNCT(2))
70-
#define P_SPI1_SSEL3 (P_DEFINED | P_IDENT(GPIO_PE11) | P_FUNCT(1))
71-
#define P_SPI1_SSEL4 (P_DEFINED | P_IDENT(GPIO_PE12) | P_FUNCT(1))
72-
#define P_SPI1_SSEL5 (P_DEFINED | P_IDENT(GPIO_PE8) | P_FUNCT(1))
73-
#define P_SPI1_SSEL6 (P_DEFINED | P_IDENT(GPIO_PF0) | P_FUNCT(1))
74-
#define P_SPI1_SSEL7 (P_DEFINED | P_IDENT(GPIO_PF1) | P_FUNCT(1))
50+
#define P_SPI0_SCK (P_DEFINED | P_IDENT(GPIO_PA6) | P_FUNCT(0))
51+
#define P_SPI0_MISO (P_DEFINED | P_IDENT(GPIO_PA7) | P_FUNCT(0))
52+
#define P_SPI0_MOSI (P_DEFINED | P_IDENT(GPIO_PA8) | P_FUNCT(0))
53+
#define P_SPI0_RDY (P_DEFINED | P_IDENT(GPIO_PB11) | P_FUNCT(1))
54+
55+
#define P_SPI0_SSEL1 (P_DEFINED | P_IDENT(GPIO_PA9) | P_FUNCT(0))
56+
#define P_SPI0_SSEL2 (P_DEFINED | P_IDENT(GPIO_PB5) | P_FUNCT(2))
57+
#define P_SPI0_SSEL3 (P_DEFINED | P_IDENT(GPIO_PB14) | P_FUNCT(1))
58+
#define P_SPI0_SSEL4 (P_DEFINED | P_IDENT(GPIO_PB15) | P_FUNCT(1))
59+
60+
#define P_SPI1_SCK (P_DEFINED | P_IDENT(GPIO_PA10) | P_FUNCT(1))
61+
#define P_SPI1_MISO (P_DEFINED | P_IDENT(GPIO_PA11) | P_FUNCT(1))
62+
#define P_SPI1_MOSI (P_DEFINED | P_IDENT(GPIO_PA12) | P_FUNCT(1))
63+
#define P_SPI1_RDY (P_DEFINED | P_IDENT(GPIO_PC6) | P_FUNCT(1))
64+
65+
#define P_SPI1_SSEL1 (P_DEFINED | P_IDENT(GPIO_PA13) | P_FUNCT(1))
66+
#define P_SPI1_SSEL2 (P_DEFINED | P_IDENT(GPIO_PB10) | P_FUNCT(1))
67+
#define P_SPI1_SSEL3 (P_DEFINED | P_IDENT(GPIO_PB13) | P_FUNCT(1))
68+
#define P_SPI1_SSEL4 (P_DEFINED | P_IDENT(GPIO_PC0) | P_FUNCT(3))
69+
#define P_SPI1_SSEL5 (P_DEFINED | P_IDENT(GPIO_PB6) | P_FUNCT(1))
70+
#define P_SPI1_SSEL6 (P_DEFINED | P_IDENT(GPIO_PC2) | P_FUNCT(3))
71+
#define P_SPI1_SSEL7 (P_DEFINED | P_IDENT(GPIO_PB8) | P_FUNCT(1))
7572

7673
#define P_OSPI0_CLK (P_DEFINED | P_IDENT(GPIO_PC8) | P_FUNCT(0))
7774
#define P_OSPI0_D2 (P_DEFINED | P_IDENT(GPIO_PC10) | P_FUNCT(0))

‎arch/arm/mach-sc59x/sc59x-ezkit.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,8 +562,8 @@ static int __init sc59x_softconfig_init(void)
562562
if (!np)
563563
return -ENODEV;
564564
printk("%s %p\n", __func__, np);
565-
//ret = softconfig_of_set_group_active_pins_output(
566-
// NULL, np, "boot-pins", false);
565+
ret = softconfig_of_set_group_active_pins_output(
566+
NULL, np, "boot-pins", false);
567567
of_node_put(np);
568568

569569
return ret;

‎arch/arm/mach-sc59x/sec.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ void sec_set_ssi_coreid(unsigned int sid, unsigned int coreid)
141141

142142
reg_sctl = readl(sec->ssi_base + 8 * sid);
143143
reg_sctl &= ((uint32_t)~SEC_SCTL_CTG);
144-
reg_sctl |= ((coreid << 24) & SEC_SCTL_CTG),
144+
reg_sctl |= ((coreid << 24) & SEC_SCTL_CTG);
145145
writel(reg_sctl, sec->ssi_base + 8 * sid);
146146

147147
spin_unlock_irqrestore(&lock, flags);

‎drivers/pinctrl/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ obj-$(CONFIG_PINMUX) += pinmux.o
88
obj-$(CONFIG_PINCONF) += pinconf.o
99
obj-$(CONFIG_OF) += devicetree.o
1010
obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o
11+
obj-$(CONFIG_PINCTRL_ADI2) += pinctrl-adi2.o
1112
obj-$(CONFIG_PINCTRL_ARTPEC6) += pinctrl-artpec6.o
1213
obj-$(CONFIG_PINCTRL_AS3722) += pinctrl-as3722.o
1314
obj-$(CONFIG_PINCTRL_AXP209) += pinctrl-axp209.o

‎drivers/pinctrl/pinctrl-adi2-sc59x.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,9 @@ static const unsigned eth0_pins[] = {
192192
};
193193

194194
static const unsigned eth0_ptp_pins[] = {
195-
GPIO_PH3, GPIO_PH4, GPIO_PH5, GPIO_PH6, GPIO_PH7, GPIO_PH8,
196-
GPIO_PH9, GPIO_PH10, GPIO_PH11, GPIO_PH12, GPIO_PH13, GPIO_PH14,
197-
GPIO_PH15, GPIO_PI0,
195+
GPIO_PH3, GPIO_PH4, GPIO_PH5, GPIO_PH6, GPIO_PH7, GPIO_PH8,
196+
GPIO_PH9, GPIO_PH10, GPIO_PH11, GPIO_PH12, GPIO_PH13, GPIO_PH14,
197+
GPIO_PH15, GPIO_PI0,
198198
};
199199

200200
static const unsigned eth1_pins[] = {
@@ -203,15 +203,15 @@ static const unsigned eth1_pins[] = {
203203
};
204204

205205
static const unsigned spi0_pins[] = {
206-
GPIO_PC9, GPIO_PC10, GPIO_PC11,
206+
GPIO_PA6, GPIO_PA7, GPIO_PA8,
207207
};
208208

209209
static const unsigned spi1_pins[] = {
210-
GPIO_PE13, GPIO_PE14, GPIO_PE15,
210+
GPIO_PA10, GPIO_PA11, GPIO_PA12,
211211
};
212212

213213
static const unsigned ospi_pins[] = {
214-
GPIO_PC8, GPIO_PC10, GPIO_PC9, GPIO_PD0, GPIO_PC15,
214+
GPIO_PC8, GPIO_PC10, GPIO_PC9, GPIO_PD0, GPIO_PC15,
215215
GPIO_PC14, GPIO_PC13, GPIO_PD4, GPIO_PC12, GPIO_PC11,
216216
GPIO_PD1
217217
};

0 commit comments

Comments
 (0)