From e1ccb2c34c9fe5b2c9fabbff590b9722431edb24 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 14 Jun 2018 13:32:10 +0200 Subject: dts: gpio: Sync header with Linux 4.17 Sync the gpio.h header with Linux 4.17, which contains new macros. Signed-off-by: Marek Vasut Cc: Tom Rini --- include/dt-bindings/gpio/gpio.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'include') diff --git a/include/dt-bindings/gpio/gpio.h b/include/dt-bindings/gpio/gpio.h index e6b1e0a808a..2cc10ae4bbb 100644 --- a/include/dt-bindings/gpio/gpio.h +++ b/include/dt-bindings/gpio/gpio.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * This header provides constants for most GPIO bindings. * @@ -9,7 +10,27 @@ #ifndef _DT_BINDINGS_GPIO_GPIO_H #define _DT_BINDINGS_GPIO_GPIO_H +/* Bit 0 express polarity */ #define GPIO_ACTIVE_HIGH 0 #define GPIO_ACTIVE_LOW 1 +/* Bit 1 express single-endedness */ +#define GPIO_PUSH_PULL 0 +#define GPIO_SINGLE_ENDED 2 + +/* Bit 2 express Open drain or open source */ +#define GPIO_LINE_OPEN_SOURCE 0 +#define GPIO_LINE_OPEN_DRAIN 4 + +/* + * Open Drain/Collector is the combination of single-ended open drain interface. + * Open Source/Emitter is the combination of single-ended open source interface. + */ +#define GPIO_OPEN_DRAIN (GPIO_SINGLE_ENDED | GPIO_LINE_OPEN_DRAIN) +#define GPIO_OPEN_SOURCE (GPIO_SINGLE_ENDED | GPIO_LINE_OPEN_SOURCE) + +/* Bit 3 express GPIO suspend/resume and reset persistence */ +#define GPIO_PERSISTENT 0 +#define GPIO_TRANSITORY 8 + #endif -- cgit v1.3.1 From c29d2a2432b92ec249385ce600ff912d929715f2 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Tue, 5 Jun 2018 20:21:30 +0200 Subject: ARM: rmobile: Zap CONFIG_SYS_CLK_FREQ where applicable The CONFIG_SYS_CLK_FREQ is not used on some of the Gen3 boards, remove it. Moreover, on Ebisu this actually didn't match the comment in the config file at all, but since it was not used, there was no real problem. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- include/configs/draak.h | 4 ---- include/configs/ebisu.h | 4 ---- include/configs/salvator-x.h | 4 ---- include/configs/ulcb.h | 4 ---- 4 files changed, 16 deletions(-) (limited to 'include') diff --git a/include/configs/draak.h b/include/configs/draak.h index e0a5344fbe7..7aabf1178b6 100644 --- a/include/configs/draak.h +++ b/include/configs/draak.h @@ -15,10 +15,6 @@ #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI -/* Board Clock */ -/* XTAL_CLK : 33.33MHz */ -#define CONFIG_SYS_CLK_FREQ 33333333u - /* Generic Timer Definitions (use in assembler source) */ #define COUNTER_FREQUENCY 0xFE502A /* 16.66MHz from CPclk */ diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h index 560fe5c45e0..2e4974acb2f 100644 --- a/include/configs/ebisu.h +++ b/include/configs/ebisu.h @@ -18,10 +18,6 @@ #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI -/* Board Clock */ -/* XTAL_CLK : 33.33MHz */ -#define CONFIG_SYS_CLK_FREQ 48000000u - /* Generic Timer Definitions (use in assembler source) */ #define COUNTER_FREQUENCY 0xFE502A /* 16.66MHz from CPclk */ diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index ecc6c5d80dc..1bf22349188 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -15,10 +15,6 @@ #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI -/* Board Clock */ -/* XTAL_CLK : 33.33MHz */ -#define CONFIG_SYS_CLK_FREQ 33333333u - /* Generic Timer Definitions (use in assembler source) */ #define COUNTER_FREQUENCY 0xFE502A /* 16.66MHz from CPclk */ diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h index 86c6ed3a36a..6f2a0cc56dc 100644 --- a/include/configs/ulcb.h +++ b/include/configs/ulcb.h @@ -15,10 +15,6 @@ #define CONFIG_BITBANGMII #define CONFIG_BITBANGMII_MULTI -/* Board Clock */ -/* XTAL_CLK : 33.33MHz */ -#define CONFIG_SYS_CLK_FREQ 33333333u - /* Generic Timer Definitions (use in assembler source) */ #define COUNTER_FREQUENCY 0xFE502A /* 16.66MHz from CPclk */ -- cgit v1.3.1 From 910db6c3a1f5802c3a11c921d724788ab22ab88d Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 31 May 2018 15:12:53 +0200 Subject: ARM: rmobile: Point load address to more sane area on Gen2 Point the $loadaddr variable and default load address to a more sane area, 256 MiB from the start of RAM. While it is convenient to use uImage without copying, which is why the previous load address was set the way it was, uImage is now legacy. This behavior could still be easily retained by "setenv loadaddr 0x40007fc0" . The new setup allows us to use for example modern fitImage with kernel_noload, so use this as a new preferred default. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- include/configs/rcar-gen2-common.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 231c4ecea45..e1b2fa28e1e 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -33,7 +33,8 @@ #define CONFIG_SYS_SDRAM_BASE (RCAR_GEN2_SDRAM_BASE) #define CONFIG_SYS_SDRAM_SIZE (RCAR_GEN2_UBOOT_SDRAM_SIZE) -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fc0) +#define CONFIG_SYS_LOAD_ADDR 0x50000000 +#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_MONITOR_BASE 0x00000000 -- cgit v1.3.1 From 4b334b6054114008fa41ca3532bfe7d056afeff6 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 31 May 2018 15:18:18 +0200 Subject: ARM: rmobile: Point load address to more sane area on Gen3 Point the $loadaddr variable and default load address to a more sane area, 384 MiB from the start of RAM. This is to avoid all the reserved memory at the beginning of RAM. The old behavior could still be easily retained by "setenv loadaddr 0x48080000" . The new setup allows us to use for example modern fitImage with kernel_noload, so use this as a new preferred default. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- include/configs/rcar-gen3-common.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index af7b196dc16..07f08db4fe7 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -42,7 +42,8 @@ #define CONFIG_NR_DRAM_BANKS 4 #define CONFIG_SYS_SDRAM_BASE (0x40000000 + DRAM_RSV_SIZE) #define CONFIG_SYS_SDRAM_SIZE (0x80000000u - DRAM_RSV_SIZE) -#define CONFIG_SYS_LOAD_ADDR 0x48080000 +#define CONFIG_SYS_LOAD_ADDR 0x58000000 +#define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_VERY_BIG_RAM #define CONFIG_MAX_MEM_MAPPED (0x80000000u - DRAM_RSV_SIZE) -- cgit v1.3.1 From b08a704ddcede36974ab0ae641a78614db843793 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 10 Jun 2018 16:19:01 +0200 Subject: ARM: rmobile: Fix environment placement on Draak The environment on Draak is in the eMMC, card 0, place it so. Signed-off-by: Marek Vasut --- include/configs/draak.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/draak.h b/include/configs/draak.h index 7aabf1178b6..e1b9bf18850 100644 --- a/include/configs/draak.h +++ b/include/configs/draak.h @@ -20,7 +20,7 @@ /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) -#define CONFIG_SYS_MMC_ENV_DEV 1 +#define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS -- cgit v1.3.1