mirror of https://github.com/hak5/openwrt-owl.git
Felix Fietkau
parent
61454a0a8c
commit
2ad995ccfe
|
|
@ -1,574 +0,0 @@
|
|||
# CONFIG_AHCI_SUNXI is not set
|
||||
CONFIG_ALIGNMENT_TRAP=y
|
||||
# CONFIG_ARCH_AXXIA is not set
|
||||
CONFIG_ARCH_CLOCKSOURCE_DATA=y
|
||||
CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
|
||||
CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
|
||||
CONFIG_ARCH_HAS_RESET_CONTROLLER=y
|
||||
CONFIG_ARCH_HAS_SG_CHAIN=y
|
||||
CONFIG_ARCH_HAS_TICK_BROADCAST=y
|
||||
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
|
||||
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
|
||||
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
|
||||
CONFIG_ARCH_MULTIPLATFORM=y
|
||||
# CONFIG_ARCH_MULTI_CPU_AUTO is not set
|
||||
CONFIG_ARCH_MULTI_V6_V7=y
|
||||
CONFIG_ARCH_MULTI_V7=y
|
||||
CONFIG_ARCH_NR_GPIO=416
|
||||
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
|
||||
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
|
||||
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
|
||||
CONFIG_ARCH_SUNXI=y
|
||||
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
|
||||
CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
|
||||
CONFIG_ARCH_SUPPORTS_UPROBES=y
|
||||
CONFIG_ARCH_SUSPEND_POSSIBLE=y
|
||||
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
|
||||
CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
|
||||
CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
|
||||
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ARM_APPENDED_DTB=y
|
||||
CONFIG_ARM_ARCH_TIMER=y
|
||||
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
|
||||
CONFIG_ARM_ATAG_DTB_COMPAT=y
|
||||
# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
|
||||
CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
|
||||
CONFIG_ARM_CPU_SUSPEND=y
|
||||
CONFIG_ARM_ERRATA_643719=y
|
||||
CONFIG_ARM_GIC=y
|
||||
CONFIG_ARM_HAS_SG_CHAIN=y
|
||||
CONFIG_ARM_HEAVY_MB=y
|
||||
CONFIG_ARM_L1_CACHE_SHIFT=6
|
||||
CONFIG_ARM_L1_CACHE_SHIFT_6=y
|
||||
CONFIG_ARM_LPAE=y
|
||||
CONFIG_ARM_PATCH_IDIV=y
|
||||
CONFIG_ARM_PATCH_PHYS_VIRT=y
|
||||
CONFIG_ARM_PMU=y
|
||||
CONFIG_ARM_PSCI=y
|
||||
CONFIG_ARM_PSCI_FW=y
|
||||
CONFIG_ARM_THUMB=y
|
||||
# CONFIG_ARM_THUMBEE is not set
|
||||
CONFIG_ARM_UNWIND=y
|
||||
CONFIG_ARM_VIRT_EXT=y
|
||||
CONFIG_ATA=y
|
||||
CONFIG_ATAGS=y
|
||||
# CONFIG_ATA_SFF is not set
|
||||
CONFIG_AUTO_ZRELADDR=y
|
||||
CONFIG_AXP20X_POWER=y
|
||||
CONFIG_BACKLIGHT_CLASS_DEVICE=y
|
||||
CONFIG_BACKLIGHT_LCD_SUPPORT=y
|
||||
CONFIG_BACKLIGHT_PWM=y
|
||||
CONFIG_BINFMT_MISC=y
|
||||
CONFIG_BLK_DEV_LOOP=y
|
||||
CONFIG_BOUNCE=y
|
||||
# CONFIG_BPF_SYSCALL is not set
|
||||
CONFIG_CACHE_L2X0=y
|
||||
CONFIG_CAN=y
|
||||
CONFIG_CLKDEV_LOOKUP=y
|
||||
CONFIG_CLKSRC_MMIO=y
|
||||
CONFIG_CLKSRC_OF=y
|
||||
CONFIG_CLKSRC_PROBE=y
|
||||
CONFIG_CLONE_BACKWARDS=y
|
||||
CONFIG_COMMON_CLK=y
|
||||
CONFIG_COMPACTION=y
|
||||
CONFIG_CONFIGFS_FS=y
|
||||
CONFIG_CONNECTOR=y
|
||||
CONFIG_CONSOLE_TRANSLATIONS=y
|
||||
CONFIG_COREDUMP=y
|
||||
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
|
||||
CONFIG_CPUFREQ_DT=y
|
||||
CONFIG_CPUFREQ_DT_PLATDEV=y
|
||||
CONFIG_CPU_32v6K=y
|
||||
CONFIG_CPU_32v7=y
|
||||
CONFIG_CPU_ABRT_EV7=y
|
||||
# CONFIG_CPU_BIG_ENDIAN is not set
|
||||
# CONFIG_CPU_BPREDICT_DISABLE is not set
|
||||
CONFIG_CPU_CACHE_V7=y
|
||||
CONFIG_CPU_CACHE_VIPT=y
|
||||
CONFIG_CPU_COPY_V6=y
|
||||
CONFIG_CPU_CP15=y
|
||||
CONFIG_CPU_CP15_MMU=y
|
||||
CONFIG_CPU_FREQ=y
|
||||
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
|
||||
CONFIG_CPU_FREQ_GOV_ATTR_SET=y
|
||||
CONFIG_CPU_FREQ_GOV_COMMON=y
|
||||
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
|
||||
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
|
||||
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
|
||||
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
|
||||
CONFIG_CPU_FREQ_GOV_USERSPACE=y
|
||||
CONFIG_CPU_FREQ_STAT=y
|
||||
CONFIG_CPU_HAS_ASID=y
|
||||
# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
|
||||
# CONFIG_CPU_ICACHE_DISABLE is not set
|
||||
CONFIG_CPU_PABRT_V7=y
|
||||
CONFIG_CPU_PM=y
|
||||
CONFIG_CPU_RMAP=y
|
||||
CONFIG_CPU_THERMAL=y
|
||||
CONFIG_CPU_TLB_V7=y
|
||||
CONFIG_CPU_V7=y
|
||||
CONFIG_CRC16=y
|
||||
CONFIG_CRC_T10DIF=y
|
||||
CONFIG_CRYPTO_AEAD=y
|
||||
CONFIG_CRYPTO_AEAD2=y
|
||||
CONFIG_CRYPTO_CRC32=y
|
||||
CONFIG_CRYPTO_CRC32C=y
|
||||
CONFIG_CRYPTO_CRCT10DIF=y
|
||||
CONFIG_CRYPTO_DES=y
|
||||
CONFIG_CRYPTO_DEV_SUN4I_SS=y
|
||||
CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
|
||||
CONFIG_CRYPTO_HASH=y
|
||||
CONFIG_CRYPTO_HASH2=y
|
||||
CONFIG_CRYPTO_HW=y
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_MANAGER2=y
|
||||
CONFIG_CRYPTO_MD5=y
|
||||
CONFIG_CRYPTO_NULL2=y
|
||||
CONFIG_CRYPTO_RNG=y
|
||||
CONFIG_CRYPTO_RNG2=y
|
||||
CONFIG_CRYPTO_SHA1=y
|
||||
CONFIG_CRYPTO_WORKQUEUE=y
|
||||
CONFIG_DCACHE_WORD_ACCESS=y
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
# CONFIG_DEBUG_UART_8250 is not set
|
||||
# CONFIG_DEBUG_USER is not set
|
||||
CONFIG_DEFAULT_CFQ=y
|
||||
# CONFIG_DEFAULT_DEADLINE is not set
|
||||
CONFIG_DEFAULT_IOSCHED="cfq"
|
||||
CONFIG_DMADEVICES=y
|
||||
CONFIG_DMA_ENGINE=y
|
||||
CONFIG_DMA_OF=y
|
||||
CONFIG_DMA_SUN4I=y
|
||||
CONFIG_DMA_SUN6I=y
|
||||
CONFIG_DMA_VIRTUAL_CHANNELS=y
|
||||
CONFIG_DNOTIFY=y
|
||||
CONFIG_DTC=y
|
||||
CONFIG_DUMMY_CONSOLE=y
|
||||
# CONFIG_DWMAC_DWC_QOS_ETH is not set
|
||||
CONFIG_DWMAC_GENERIC=y
|
||||
# CONFIG_DWMAC_SUN8I is not set
|
||||
CONFIG_DWMAC_SUNXI=y
|
||||
CONFIG_DYNAMIC_DEBUG=y
|
||||
CONFIG_EDAC_ATOMIC_SCRUB=y
|
||||
CONFIG_EDAC_SUPPORT=y
|
||||
CONFIG_ELF_CORE=y
|
||||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_ENABLE_MUST_CHECK=y
|
||||
# CONFIG_ENABLE_WARN_DEPRECATED is not set
|
||||
CONFIG_EXT4_FS=y
|
||||
CONFIG_EXTCON=y
|
||||
# CONFIG_F2FS_CHECK_FS is not set
|
||||
CONFIG_F2FS_FS=y
|
||||
# CONFIG_F2FS_FS_SECURITY is not set
|
||||
CONFIG_F2FS_FS_XATTR=y
|
||||
CONFIG_F2FS_STAT_FS=y
|
||||
CONFIG_FAT_FS=y
|
||||
CONFIG_FB=y
|
||||
CONFIG_FB_CFB_COPYAREA=y
|
||||
CONFIG_FB_CFB_FILLRECT=y
|
||||
CONFIG_FB_CFB_IMAGEBLIT=y
|
||||
CONFIG_FB_CMDLINE=y
|
||||
CONFIG_FB_FOREIGN_ENDIAN=y
|
||||
CONFIG_FB_LITTLE_ENDIAN=y
|
||||
CONFIG_FB_MODE_HELPERS=y
|
||||
CONFIG_FB_SIMPLE=y
|
||||
CONFIG_FB_TILEBLITTING=y
|
||||
CONFIG_FIXED_PHY=y
|
||||
CONFIG_FIX_EARLYCON_MEM=y
|
||||
# CONFIG_FONTS is not set
|
||||
CONFIG_FONT_8x16=y
|
||||
CONFIG_FONT_8x8=y
|
||||
CONFIG_FONT_SUPPORT=y
|
||||
CONFIG_FRAMEBUFFER_CONSOLE=y
|
||||
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
|
||||
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
|
||||
CONFIG_FRAME_WARN=2048
|
||||
CONFIG_FREEZER=y
|
||||
CONFIG_FS_MBCACHE=y
|
||||
CONFIG_FS_POSIX_ACL=y
|
||||
CONFIG_GENERIC_ALLOCATOR=y
|
||||
CONFIG_GENERIC_BUG=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
|
||||
CONFIG_GENERIC_EARLY_IOREMAP=y
|
||||
CONFIG_GENERIC_IDLE_POLL_SETUP=y
|
||||
CONFIG_GENERIC_IO=y
|
||||
CONFIG_GENERIC_IRQ_CHIP=y
|
||||
CONFIG_GENERIC_IRQ_SHOW=y
|
||||
CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
|
||||
CONFIG_GENERIC_PCI_IOMAP=y
|
||||
CONFIG_GENERIC_PHY=y
|
||||
CONFIG_GENERIC_PINCONF=y
|
||||
CONFIG_GENERIC_SCHED_CLOCK=y
|
||||
CONFIG_GENERIC_SMP_IDLE_THREAD=y
|
||||
CONFIG_GENERIC_STRNCPY_FROM_USER=y
|
||||
CONFIG_GENERIC_STRNLEN_USER=y
|
||||
CONFIG_GENERIC_TIME_VSYSCALL=y
|
||||
CONFIG_GLOB=y
|
||||
CONFIG_GPIOLIB=y
|
||||
CONFIG_GPIO_AXP209=y
|
||||
CONFIG_GPIO_SYSFS=y
|
||||
CONFIG_HANDLE_DOMAIN_IRQ=y
|
||||
CONFIG_HARDIRQS_SW_RESEND=y
|
||||
CONFIG_HAS_DMA=y
|
||||
CONFIG_HAS_IOMEM=y
|
||||
CONFIG_HAS_IOPORT_MAP=y
|
||||
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
|
||||
CONFIG_HAVE_ARCH_AUDITSYSCALL=y
|
||||
CONFIG_HAVE_ARCH_BITREVERSE=y
|
||||
CONFIG_HAVE_ARCH_JUMP_LABEL=y
|
||||
CONFIG_HAVE_ARCH_KGDB=y
|
||||
CONFIG_HAVE_ARCH_PFN_VALID=y
|
||||
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
|
||||
CONFIG_HAVE_ARCH_TRACEHOOK=y
|
||||
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
|
||||
CONFIG_HAVE_ARM_ARCH_TIMER=y
|
||||
CONFIG_HAVE_ARM_SMCCC=y
|
||||
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
|
||||
CONFIG_HAVE_CBPF_JIT=y
|
||||
CONFIG_HAVE_CC_STACKPROTECTOR=y
|
||||
CONFIG_HAVE_CLK=y
|
||||
CONFIG_HAVE_CLK_PREPARE=y
|
||||
CONFIG_HAVE_CONTEXT_TRACKING=y
|
||||
CONFIG_HAVE_C_RECORDMCOUNT=y
|
||||
CONFIG_HAVE_DEBUG_KMEMLEAK=y
|
||||
CONFIG_HAVE_DMA_API_DEBUG=y
|
||||
CONFIG_HAVE_DMA_CONTIGUOUS=y
|
||||
CONFIG_HAVE_DYNAMIC_FTRACE=y
|
||||
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
|
||||
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
|
||||
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
|
||||
CONFIG_HAVE_FUNCTION_TRACER=y
|
||||
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
|
||||
CONFIG_HAVE_GENERIC_RCU_GUP=y
|
||||
CONFIG_HAVE_HW_BREAKPOINT=y
|
||||
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
|
||||
CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
|
||||
CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
|
||||
CONFIG_HAVE_KVM_EVENTFD=y
|
||||
CONFIG_HAVE_KVM_IRQCHIP=y
|
||||
CONFIG_HAVE_KVM_IRQFD=y
|
||||
CONFIG_HAVE_KVM_IRQ_ROUTING=y
|
||||
CONFIG_HAVE_MEMBLOCK=y
|
||||
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
CONFIG_HAVE_OPROFILE=y
|
||||
CONFIG_HAVE_OPTPROBES=y
|
||||
CONFIG_HAVE_PERF_EVENTS=y
|
||||
CONFIG_HAVE_PERF_REGS=y
|
||||
CONFIG_HAVE_PERF_USER_STACK_DUMP=y
|
||||
CONFIG_HAVE_PROC_CPU=y
|
||||
CONFIG_HAVE_RCU_TABLE_FREE=y
|
||||
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
|
||||
CONFIG_HAVE_SMP=y
|
||||
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
|
||||
CONFIG_HAVE_UID16=y
|
||||
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
|
||||
CONFIG_HIGHMEM=y
|
||||
CONFIG_HIGHPTE=y
|
||||
CONFIG_HOTPLUG_CPU=y
|
||||
# CONFIG_HUGETLBFS is not set
|
||||
CONFIG_HWMON=y
|
||||
CONFIG_HW_CONSOLE=y
|
||||
CONFIG_HW_RANDOM=y
|
||||
CONFIG_HW_RANDOM_TIMERIOMEM=y
|
||||
CONFIG_HZ_FIXED=0
|
||||
CONFIG_I2C=y
|
||||
CONFIG_I2C_BOARDINFO=y
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_I2C_COMPAT=y
|
||||
CONFIG_I2C_HELPER_AUTO=y
|
||||
CONFIG_I2C_MV64XXX=y
|
||||
CONFIG_I2C_SUN6I_P2WI=y
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
CONFIG_INPUT=y
|
||||
CONFIG_INPUT_AXP20X_PEK=y
|
||||
CONFIG_INPUT_KEYBOARD=y
|
||||
CONFIG_INPUT_MOUSEDEV=y
|
||||
CONFIG_INPUT_MOUSEDEV_PSAUX=y
|
||||
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
|
||||
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
|
||||
CONFIG_INPUT_TOUCHSCREEN=y
|
||||
CONFIG_IOMMU_HELPER=y
|
||||
CONFIG_IOSCHED_CFQ=y
|
||||
CONFIG_IRQCHIP=y
|
||||
CONFIG_IRQ_DOMAIN=y
|
||||
CONFIG_IRQ_DOMAIN_HIERARCHY=y
|
||||
CONFIG_IRQ_FORCED_THREADING=y
|
||||
CONFIG_IRQ_WORK=y
|
||||
CONFIG_JBD2=y
|
||||
CONFIG_KALLSYMS=y
|
||||
# CONFIG_KERNEL_MODE_NEON is not set
|
||||
CONFIG_KEYBOARD_SUN4I_LRADC=y
|
||||
CONFIG_KSM=y
|
||||
CONFIG_KVM=y
|
||||
CONFIG_KVM_ARM_HOST=y
|
||||
CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
|
||||
CONFIG_KVM_MMIO=y
|
||||
CONFIG_KVM_VFIO=y
|
||||
CONFIG_LCD_CLASS_DEVICE=y
|
||||
CONFIG_LCD_PLATFORM=y
|
||||
CONFIG_LEDS_GPIO=y
|
||||
CONFIG_LEGACY_PTYS=y
|
||||
CONFIG_LEGACY_PTY_COUNT=256
|
||||
CONFIG_LIBFDT=y
|
||||
CONFIG_LOCK_SPIN_ON_OWNER=y
|
||||
CONFIG_LOGO=y
|
||||
CONFIG_LOGO_LINUX_CLUT224=y
|
||||
CONFIG_LOGO_LINUX_MONO=y
|
||||
CONFIG_LOGO_LINUX_VGA16=y
|
||||
CONFIG_MACH_SUN4I=y
|
||||
CONFIG_MACH_SUN5I=y
|
||||
CONFIG_MACH_SUN6I=y
|
||||
CONFIG_MACH_SUN7I=y
|
||||
CONFIG_MACH_SUN8I=y
|
||||
CONFIG_MACH_SUN9I=y
|
||||
CONFIG_MAGIC_SYSRQ=y
|
||||
CONFIG_MDIO_BOARDINFO=y
|
||||
CONFIG_MDIO_SUN4I=y
|
||||
CONFIG_MEDIA_SUPPORT=y
|
||||
# CONFIG_MFD_AC100 is not set
|
||||
CONFIG_MFD_AXP20X=y
|
||||
CONFIG_MFD_AXP20X_I2C=y
|
||||
CONFIG_MFD_AXP20X_RSB=y
|
||||
CONFIG_MFD_CORE=y
|
||||
CONFIG_MFD_SUN6I_PRCM=y
|
||||
CONFIG_MFD_SYSCON=y
|
||||
CONFIG_MIGHT_HAVE_CACHE_L2X0=y
|
||||
CONFIG_MIGHT_HAVE_PCI=y
|
||||
CONFIG_MIGRATION=y
|
||||
CONFIG_MMC=y
|
||||
CONFIG_MMC_BLOCK=y
|
||||
# CONFIG_MMC_BLOCK_BOUNCE is not set
|
||||
CONFIG_MMC_SUNXI=y
|
||||
CONFIG_MMU_NOTIFIER=y
|
||||
CONFIG_MODULES_TREE_LOOKUP=y
|
||||
CONFIG_MODULES_USE_ELF_REL=y
|
||||
# CONFIG_MTD is not set
|
||||
CONFIG_MULTI_IRQ_HANDLER=y
|
||||
CONFIG_MUTEX_SPIN_ON_OWNER=y
|
||||
CONFIG_NEED_DMA_MAP_STATE=y
|
||||
CONFIG_NEON=y
|
||||
CONFIG_NET_FLOW_LIMIT=y
|
||||
CONFIG_NET_PTP_CLASSIFY=y
|
||||
CONFIG_NET_VENDOR_ALLWINNER=y
|
||||
CONFIG_NLS=y
|
||||
CONFIG_NLS_CODEPAGE_437=y
|
||||
CONFIG_NLS_ISO8859_1=y
|
||||
CONFIG_NO_BOOTMEM=y
|
||||
CONFIG_NO_HZ=y
|
||||
CONFIG_NO_HZ_COMMON=y
|
||||
CONFIG_NO_HZ_IDLE=y
|
||||
CONFIG_NR_CPUS=8
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_NVMEM_SUNXI_SID=y
|
||||
CONFIG_OF=y
|
||||
CONFIG_OF_ADDRESS=y
|
||||
CONFIG_OF_EARLY_FLATTREE=y
|
||||
CONFIG_OF_FLATTREE=y
|
||||
CONFIG_OF_GPIO=y
|
||||
CONFIG_OF_IRQ=y
|
||||
CONFIG_OF_MDIO=y
|
||||
CONFIG_OF_NET=y
|
||||
CONFIG_OF_RESERVED_MEM=y
|
||||
CONFIG_OLD_SIGACTION=y
|
||||
CONFIG_OLD_SIGSUSPEND3=y
|
||||
CONFIG_OUTER_CACHE=y
|
||||
CONFIG_OUTER_CACHE_SYNC=y
|
||||
CONFIG_PADATA=y
|
||||
CONFIG_PAGE_OFFSET=0xC0000000
|
||||
# CONFIG_PARTITION_ADVANCED is not set
|
||||
# CONFIG_PCI_DOMAINS_GENERIC is not set
|
||||
# CONFIG_PCI_SYSCALL is not set
|
||||
CONFIG_PERF_EVENTS=y
|
||||
CONFIG_PERF_USE_VMALLOC=y
|
||||
CONFIG_PGTABLE_LEVELS=3
|
||||
CONFIG_PHYLIB=y
|
||||
CONFIG_PHYS_ADDR_T_64BIT=y
|
||||
CONFIG_PHY_SUN4I_USB=y
|
||||
CONFIG_PHY_SUN9I_USB=y
|
||||
CONFIG_PINCTRL=y
|
||||
CONFIG_PINCTRL_GR8=y
|
||||
# CONFIG_PINCTRL_SINGLE is not set
|
||||
CONFIG_PINCTRL_SUN4I_A10=y
|
||||
CONFIG_PINCTRL_SUN5I_A10S=y
|
||||
CONFIG_PINCTRL_SUN5I_A13=y
|
||||
CONFIG_PINCTRL_SUN6I_A31=y
|
||||
CONFIG_PINCTRL_SUN6I_A31S=y
|
||||
CONFIG_PINCTRL_SUN6I_A31_R=y
|
||||
CONFIG_PINCTRL_SUN7I_A20=y
|
||||
CONFIG_PINCTRL_SUN8I_A23=y
|
||||
CONFIG_PINCTRL_SUN8I_A23_R=y
|
||||
CONFIG_PINCTRL_SUN8I_A33=y
|
||||
CONFIG_PINCTRL_SUN8I_A83T=y
|
||||
CONFIG_PINCTRL_SUN8I_H3=y
|
||||
CONFIG_PINCTRL_SUN8I_H3_R=y
|
||||
CONFIG_PINCTRL_SUN9I_A80=y
|
||||
CONFIG_PINCTRL_SUN9I_A80_R=y
|
||||
CONFIG_PINCTRL_SUNXI=y
|
||||
# CONFIG_PL310_ERRATA_588369 is not set
|
||||
# CONFIG_PL310_ERRATA_727915 is not set
|
||||
# CONFIG_PL310_ERRATA_753970 is not set
|
||||
# CONFIG_PL310_ERRATA_769419 is not set
|
||||
CONFIG_PM=y
|
||||
CONFIG_PM_CLK=y
|
||||
# CONFIG_PM_DEBUG is not set
|
||||
CONFIG_PM_OPP=y
|
||||
CONFIG_PM_SLEEP=y
|
||||
CONFIG_PM_SLEEP_SMP=y
|
||||
CONFIG_POWER_RESET=y
|
||||
CONFIG_POWER_SUPPLY=y
|
||||
CONFIG_PPS=y
|
||||
CONFIG_PREEMPT=y
|
||||
CONFIG_PREEMPT_COUNT=y
|
||||
# CONFIG_PREEMPT_NONE is not set
|
||||
CONFIG_PREEMPT_NOTIFIERS=y
|
||||
CONFIG_PREEMPT_RCU=y
|
||||
CONFIG_PRINTK_TIME=y
|
||||
CONFIG_PROC_EVENTS=y
|
||||
CONFIG_PTP_1588_CLOCK=y
|
||||
CONFIG_PWM=y
|
||||
CONFIG_PWM_SUN4I=y
|
||||
CONFIG_PWM_SYSFS=y
|
||||
CONFIG_RATIONAL=y
|
||||
# CONFIG_RCU_BOOST is not set
|
||||
CONFIG_RCU_STALL_COMMON=y
|
||||
CONFIG_REGMAP=y
|
||||
CONFIG_REGMAP_I2C=y
|
||||
CONFIG_REGMAP_IRQ=y
|
||||
CONFIG_REGMAP_MMIO=y
|
||||
CONFIG_REGMAP_SPI=y
|
||||
CONFIG_REGULATOR=y
|
||||
CONFIG_REGULATOR_AXP20X=y
|
||||
CONFIG_REGULATOR_FIXED_VOLTAGE=y
|
||||
CONFIG_REGULATOR_GPIO=y
|
||||
CONFIG_RELAY=y
|
||||
CONFIG_RESET_CONTROLLER=y
|
||||
CONFIG_RESET_SUNXI=y
|
||||
CONFIG_RFS_ACCEL=y
|
||||
CONFIG_RPS=y
|
||||
CONFIG_RWSEM_SPIN_ON_OWNER=y
|
||||
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
|
||||
CONFIG_SATA_PMP=y
|
||||
# CONFIG_SCHED_INFO is not set
|
||||
CONFIG_SCSI=y
|
||||
CONFIG_SDIO_UART=y
|
||||
CONFIG_SECURITYFS=y
|
||||
CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
|
||||
CONFIG_SERIAL_8250_DW=y
|
||||
CONFIG_SERIAL_8250_FSL=y
|
||||
CONFIG_SERIAL_8250_NR_UARTS=8
|
||||
CONFIG_SERIAL_8250_RUNTIME_UARTS=8
|
||||
CONFIG_SERIAL_OF_PLATFORM=y
|
||||
CONFIG_SERIO=y
|
||||
CONFIG_SERIO_SERPORT=y
|
||||
CONFIG_SG_POOL=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_SMP_ON_UP=y
|
||||
CONFIG_SND=y
|
||||
CONFIG_SND_COMPRESS_OFFLOAD=y
|
||||
CONFIG_SND_JACK=y
|
||||
CONFIG_SND_JACK_INPUT_DEV=y
|
||||
CONFIG_SND_PCM=y
|
||||
CONFIG_SND_SOC=y
|
||||
CONFIG_SND_SOC_I2C_AND_SPI=y
|
||||
# CONFIG_SND_SUN4I_I2S is not set
|
||||
# CONFIG_SND_SUN4I_SPDIF is not set
|
||||
CONFIG_SOUND=y
|
||||
CONFIG_SPARSE_IRQ=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_MASTER=y
|
||||
CONFIG_SPI_SUN4I=y
|
||||
CONFIG_SPI_SUN6I=y
|
||||
CONFIG_SRCU=y
|
||||
CONFIG_STMMAC_ETH=y
|
||||
CONFIG_STMMAC_PLATFORM=y
|
||||
CONFIG_STRICT_DEVMEM=y
|
||||
# CONFIG_SUN4I_EMAC is not set
|
||||
CONFIG_SUN4I_TIMER=y
|
||||
# CONFIG_SUN50I_A64_CCU is not set
|
||||
CONFIG_SUN5I_HSTIMER=y
|
||||
CONFIG_SUN6I_A31_CCU=y
|
||||
CONFIG_SUN8I_A23_CCU=y
|
||||
CONFIG_SUN8I_A33_CCU=y
|
||||
CONFIG_SUN8I_H3_CCU=y
|
||||
CONFIG_SUNXI_CCU=y
|
||||
CONFIG_SUNXI_CCU_DIV=y
|
||||
CONFIG_SUNXI_CCU_FRAC=y
|
||||
CONFIG_SUNXI_CCU_GATE=y
|
||||
CONFIG_SUNXI_CCU_MP=y
|
||||
CONFIG_SUNXI_CCU_MULT=y
|
||||
CONFIG_SUNXI_CCU_MUX=y
|
||||
CONFIG_SUNXI_CCU_NK=y
|
||||
CONFIG_SUNXI_CCU_NKM=y
|
||||
CONFIG_SUNXI_CCU_NKMP=y
|
||||
CONFIG_SUNXI_CCU_NM=y
|
||||
CONFIG_SUNXI_CCU_PHASE=y
|
||||
CONFIG_SUNXI_RSB=y
|
||||
CONFIG_SUNXI_SRAM=y
|
||||
CONFIG_SUNXI_WATCHDOG=y
|
||||
CONFIG_SUSPEND=y
|
||||
CONFIG_SUSPEND_FREEZER=y
|
||||
CONFIG_SWCONFIG=y
|
||||
CONFIG_SWCONFIG_B53=y
|
||||
# CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
|
||||
CONFIG_SWCONFIG_B53_PHY_DRIVER=y
|
||||
CONFIG_SWCONFIG_B53_PHY_FIXUP=y
|
||||
# CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set
|
||||
CONFIG_SWIOTLB=y
|
||||
CONFIG_SWPHY=y
|
||||
CONFIG_SWP_EMULATE=y
|
||||
CONFIG_SYSFS_SYSCALL=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
CONFIG_SYS_SUPPORTS_HUGETLBFS=y
|
||||
CONFIG_THERMAL=y
|
||||
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
|
||||
CONFIG_THERMAL_GOV_STEP_WISE=y
|
||||
CONFIG_THERMAL_HWMON=y
|
||||
CONFIG_THERMAL_OF=y
|
||||
# CONFIG_THUMB2_KERNEL is not set
|
||||
CONFIG_TICK_CPU_ACCOUNTING=y
|
||||
CONFIG_TMPFS_POSIX_ACL=y
|
||||
CONFIG_TOUCHSCREEN_PROPERTIES=y
|
||||
CONFIG_TOUCHSCREEN_SUN4I=y
|
||||
CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
|
||||
CONFIG_UNINLINE_SPIN_UNLOCK=y
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
|
||||
CONFIG_USB_COMMON=y
|
||||
CONFIG_USB_DWC2=y
|
||||
CONFIG_USB_DWC2_HOST=y
|
||||
# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
|
||||
CONFIG_USB_EHCI_HCD=y
|
||||
CONFIG_USB_EHCI_HCD_PLATFORM=y
|
||||
CONFIG_USB_GADGET=y
|
||||
CONFIG_USB_NET_DRIVERS=y
|
||||
CONFIG_USB_OHCI_HCD=y
|
||||
CONFIG_USB_OHCI_HCD_PLATFORM=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
CONFIG_USB_SUPPORT=y
|
||||
CONFIG_USERIO=y
|
||||
CONFIG_USE_OF=y
|
||||
CONFIG_VDSO=y
|
||||
CONFIG_VECTORS_BASE=0xffff0000
|
||||
CONFIG_VFAT_FS=y
|
||||
CONFIG_VFP=y
|
||||
CONFIG_VFPv3=y
|
||||
CONFIG_VHOST=y
|
||||
CONFIG_VHOST_NET=y
|
||||
CONFIG_VIRTUALIZATION=y
|
||||
CONFIG_VM_EVENT_COUNTERS=y
|
||||
CONFIG_VT=y
|
||||
CONFIG_VT_CONSOLE=y
|
||||
CONFIG_VT_CONSOLE_SLEEP=y
|
||||
CONFIG_VT_HW_CONSOLE_BINDING=y
|
||||
CONFIG_WATCHDOG_CORE=y
|
||||
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
|
||||
CONFIG_XPS=y
|
||||
CONFIG_XZ_DEC_ARM=y
|
||||
CONFIG_XZ_DEC_BCJ=y
|
||||
CONFIG_ZBOOT_ROM_BSS=0
|
||||
CONFIG_ZBOOT_ROM_TEXT=0
|
||||
|
|
@ -1,239 +0,0 @@
|
|||
From a501a14e38cc4d8e9c91bb508cdca7032d53f717 Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Date: Fri, 30 Sep 2016 10:05:32 +0200
|
||||
Subject: clk: sunxi-ng: Rename the internal structures
|
||||
|
||||
Rename the structures meant to be embedded in other structures to make it
|
||||
consistent with the mux structure name
|
||||
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
||||
---
|
||||
drivers/clk/sunxi-ng/ccu_div.h | 6 +++---
|
||||
drivers/clk/sunxi-ng/ccu_frac.c | 12 ++++++------
|
||||
drivers/clk/sunxi-ng/ccu_frac.h | 14 +++++++-------
|
||||
drivers/clk/sunxi-ng/ccu_mp.h | 4 ++--
|
||||
drivers/clk/sunxi-ng/ccu_mult.h | 4 ++--
|
||||
drivers/clk/sunxi-ng/ccu_nk.h | 4 ++--
|
||||
drivers/clk/sunxi-ng/ccu_nkm.h | 6 +++---
|
||||
drivers/clk/sunxi-ng/ccu_nkmp.h | 8 ++++----
|
||||
drivers/clk/sunxi-ng/ccu_nm.h | 6 +++---
|
||||
9 files changed, 32 insertions(+), 32 deletions(-)
|
||||
|
||||
--- a/drivers/clk/sunxi-ng/ccu_div.h
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_div.h
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "ccu_mux.h"
|
||||
|
||||
/**
|
||||
- * struct _ccu_div - Internal divider description
|
||||
+ * struct ccu_div_internal - Internal divider description
|
||||
* @shift: Bit offset of the divider in its register
|
||||
* @width: Width of the divider field in its register
|
||||
* @max: Maximum value allowed for that divider. This is the
|
||||
@@ -36,7 +36,7 @@
|
||||
* It is basically a wrapper around the clk_divider functions
|
||||
* arguments.
|
||||
*/
|
||||
-struct _ccu_div {
|
||||
+struct ccu_div_internal {
|
||||
u8 shift;
|
||||
u8 width;
|
||||
|
||||
@@ -78,7 +78,7 @@ struct _ccu_div {
|
||||
struct ccu_div {
|
||||
u32 enable;
|
||||
|
||||
- struct _ccu_div div;
|
||||
+ struct ccu_div_internal div;
|
||||
struct ccu_mux_internal mux;
|
||||
struct ccu_common common;
|
||||
};
|
||||
--- a/drivers/clk/sunxi-ng/ccu_frac.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_frac.c
|
||||
@@ -14,7 +14,7 @@
|
||||
#include "ccu_frac.h"
|
||||
|
||||
bool ccu_frac_helper_is_enabled(struct ccu_common *common,
|
||||
- struct _ccu_frac *cf)
|
||||
+ struct ccu_frac_internal *cf)
|
||||
{
|
||||
if (!(common->features & CCU_FEATURE_FRACTIONAL))
|
||||
return false;
|
||||
@@ -23,7 +23,7 @@ bool ccu_frac_helper_is_enabled(struct c
|
||||
}
|
||||
|
||||
void ccu_frac_helper_enable(struct ccu_common *common,
|
||||
- struct _ccu_frac *cf)
|
||||
+ struct ccu_frac_internal *cf)
|
||||
{
|
||||
unsigned long flags;
|
||||
u32 reg;
|
||||
@@ -38,7 +38,7 @@ void ccu_frac_helper_enable(struct ccu_c
|
||||
}
|
||||
|
||||
void ccu_frac_helper_disable(struct ccu_common *common,
|
||||
- struct _ccu_frac *cf)
|
||||
+ struct ccu_frac_internal *cf)
|
||||
{
|
||||
unsigned long flags;
|
||||
u32 reg;
|
||||
@@ -53,7 +53,7 @@ void ccu_frac_helper_disable(struct ccu_
|
||||
}
|
||||
|
||||
bool ccu_frac_helper_has_rate(struct ccu_common *common,
|
||||
- struct _ccu_frac *cf,
|
||||
+ struct ccu_frac_internal *cf,
|
||||
unsigned long rate)
|
||||
{
|
||||
if (!(common->features & CCU_FEATURE_FRACTIONAL))
|
||||
@@ -63,7 +63,7 @@ bool ccu_frac_helper_has_rate(struct ccu
|
||||
}
|
||||
|
||||
unsigned long ccu_frac_helper_read_rate(struct ccu_common *common,
|
||||
- struct _ccu_frac *cf)
|
||||
+ struct ccu_frac_internal *cf)
|
||||
{
|
||||
u32 reg;
|
||||
|
||||
@@ -84,7 +84,7 @@ unsigned long ccu_frac_helper_read_rate(
|
||||
}
|
||||
|
||||
int ccu_frac_helper_set_rate(struct ccu_common *common,
|
||||
- struct _ccu_frac *cf,
|
||||
+ struct ccu_frac_internal *cf,
|
||||
unsigned long rate)
|
||||
{
|
||||
unsigned long flags;
|
||||
--- a/drivers/clk/sunxi-ng/ccu_frac.h
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_frac.h
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
#include "ccu_common.h"
|
||||
|
||||
-struct _ccu_frac {
|
||||
+struct ccu_frac_internal {
|
||||
u32 enable;
|
||||
u32 select;
|
||||
|
||||
@@ -33,21 +33,21 @@ struct _ccu_frac {
|
||||
}
|
||||
|
||||
bool ccu_frac_helper_is_enabled(struct ccu_common *common,
|
||||
- struct _ccu_frac *cf);
|
||||
+ struct ccu_frac_internal *cf);
|
||||
void ccu_frac_helper_enable(struct ccu_common *common,
|
||||
- struct _ccu_frac *cf);
|
||||
+ struct ccu_frac_internal *cf);
|
||||
void ccu_frac_helper_disable(struct ccu_common *common,
|
||||
- struct _ccu_frac *cf);
|
||||
+ struct ccu_frac_internal *cf);
|
||||
|
||||
bool ccu_frac_helper_has_rate(struct ccu_common *common,
|
||||
- struct _ccu_frac *cf,
|
||||
+ struct ccu_frac_internal *cf,
|
||||
unsigned long rate);
|
||||
|
||||
unsigned long ccu_frac_helper_read_rate(struct ccu_common *common,
|
||||
- struct _ccu_frac *cf);
|
||||
+ struct ccu_frac_internal *cf);
|
||||
|
||||
int ccu_frac_helper_set_rate(struct ccu_common *common,
|
||||
- struct _ccu_frac *cf,
|
||||
+ struct ccu_frac_internal *cf,
|
||||
unsigned long rate);
|
||||
|
||||
#endif /* _CCU_FRAC_H_ */
|
||||
--- a/drivers/clk/sunxi-ng/ccu_mp.h
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_mp.h
|
||||
@@ -29,8 +29,8 @@
|
||||
struct ccu_mp {
|
||||
u32 enable;
|
||||
|
||||
- struct _ccu_div m;
|
||||
- struct _ccu_div p;
|
||||
+ struct ccu_div_internal m;
|
||||
+ struct ccu_div_internal p;
|
||||
struct ccu_mux_internal mux;
|
||||
struct ccu_common common;
|
||||
};
|
||||
--- a/drivers/clk/sunxi-ng/ccu_mult.h
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_mult.h
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "ccu_common.h"
|
||||
#include "ccu_mux.h"
|
||||
|
||||
-struct _ccu_mult {
|
||||
+struct ccu_mult_internal {
|
||||
u8 shift;
|
||||
u8 width;
|
||||
};
|
||||
@@ -18,7 +18,7 @@ struct _ccu_mult {
|
||||
struct ccu_mult {
|
||||
u32 enable;
|
||||
|
||||
- struct _ccu_mult mult;
|
||||
+ struct ccu_mult_internal mult;
|
||||
struct ccu_mux_internal mux;
|
||||
struct ccu_common common;
|
||||
};
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nk.h
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nk.h
|
||||
@@ -30,8 +30,8 @@ struct ccu_nk {
|
||||
u32 enable;
|
||||
u32 lock;
|
||||
|
||||
- struct _ccu_mult n;
|
||||
- struct _ccu_mult k;
|
||||
+ struct ccu_mult_internal n;
|
||||
+ struct ccu_mult_internal k;
|
||||
|
||||
unsigned int fixed_post_div;
|
||||
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nkm.h
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nkm.h
|
||||
@@ -29,9 +29,9 @@ struct ccu_nkm {
|
||||
u32 enable;
|
||||
u32 lock;
|
||||
|
||||
- struct _ccu_mult n;
|
||||
- struct _ccu_mult k;
|
||||
- struct _ccu_div m;
|
||||
+ struct ccu_mult_internal n;
|
||||
+ struct ccu_mult_internal k;
|
||||
+ struct ccu_div_internal m;
|
||||
struct ccu_mux_internal mux;
|
||||
|
||||
struct ccu_common common;
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nkmp.h
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nkmp.h
|
||||
@@ -29,10 +29,10 @@ struct ccu_nkmp {
|
||||
u32 enable;
|
||||
u32 lock;
|
||||
|
||||
- struct _ccu_mult n;
|
||||
- struct _ccu_mult k;
|
||||
- struct _ccu_div m;
|
||||
- struct _ccu_div p;
|
||||
+ struct ccu_mult_internal n;
|
||||
+ struct ccu_mult_internal k;
|
||||
+ struct ccu_div_internal m;
|
||||
+ struct ccu_div_internal p;
|
||||
|
||||
struct ccu_common common;
|
||||
};
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nm.h
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nm.h
|
||||
@@ -30,9 +30,9 @@ struct ccu_nm {
|
||||
u32 enable;
|
||||
u32 lock;
|
||||
|
||||
- struct _ccu_mult n;
|
||||
- struct _ccu_div m;
|
||||
- struct _ccu_frac frac;
|
||||
+ struct ccu_mult_internal n;
|
||||
+ struct ccu_div_internal m;
|
||||
+ struct ccu_frac_internal frac;
|
||||
|
||||
struct ccu_common common;
|
||||
};
|
||||
|
|
@ -1,239 +0,0 @@
|
|||
From ee28648cb2b4d4ab5c2eb8199ea86675fe19016b Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Date: Thu, 29 Sep 2016 22:53:12 +0200
|
||||
Subject: clk: sunxi-ng: Remove the use of rational computations
|
||||
|
||||
While the rational library works great, it doesn't really allow us to add
|
||||
more constraints, like the minimum.
|
||||
|
||||
Remove that in order to be able to deal with the constraints we'll need.
|
||||
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
||||
---
|
||||
drivers/clk/sunxi-ng/Kconfig | 3 ---
|
||||
drivers/clk/sunxi-ng/ccu_nkm.c | 31 ++++++++++++-----------
|
||||
drivers/clk/sunxi-ng/ccu_nkmp.c | 37 ++++++++++++++--------------
|
||||
drivers/clk/sunxi-ng/ccu_nm.c | 54 +++++++++++++++++++++++++++++++----------
|
||||
4 files changed, 74 insertions(+), 51 deletions(-)
|
||||
|
||||
--- a/drivers/clk/sunxi-ng/Kconfig
|
||||
+++ b/drivers/clk/sunxi-ng/Kconfig
|
||||
@@ -36,17 +36,14 @@ config SUNXI_CCU_NK
|
||||
|
||||
config SUNXI_CCU_NKM
|
||||
bool
|
||||
- select RATIONAL
|
||||
select SUNXI_CCU_GATE
|
||||
|
||||
config SUNXI_CCU_NKMP
|
||||
bool
|
||||
- select RATIONAL
|
||||
select SUNXI_CCU_GATE
|
||||
|
||||
config SUNXI_CCU_NM
|
||||
bool
|
||||
- select RATIONAL
|
||||
select SUNXI_CCU_FRAC
|
||||
select SUNXI_CCU_GATE
|
||||
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nkm.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nkm.c
|
||||
@@ -9,7 +9,6 @@
|
||||
*/
|
||||
|
||||
#include <linux/clk-provider.h>
|
||||
-#include <linux/rational.h>
|
||||
|
||||
#include "ccu_gate.h"
|
||||
#include "ccu_nkm.h"
|
||||
@@ -28,21 +27,21 @@ static void ccu_nkm_find_best(unsigned l
|
||||
unsigned long _n, _k, _m;
|
||||
|
||||
for (_k = 1; _k <= nkm->max_k; _k++) {
|
||||
- unsigned long tmp_rate;
|
||||
-
|
||||
- rational_best_approximation(rate / _k, parent,
|
||||
- nkm->max_n, nkm->max_m, &_n, &_m);
|
||||
-
|
||||
- tmp_rate = parent * _n * _k / _m;
|
||||
-
|
||||
- if (tmp_rate > rate)
|
||||
- continue;
|
||||
-
|
||||
- if ((rate - tmp_rate) < (rate - best_rate)) {
|
||||
- best_rate = tmp_rate;
|
||||
- best_n = _n;
|
||||
- best_k = _k;
|
||||
- best_m = _m;
|
||||
+ for (_n = 1; _n <= nkm->max_n; _n++) {
|
||||
+ for (_m = 1; _n <= nkm->max_m; _m++) {
|
||||
+ unsigned long tmp_rate;
|
||||
+
|
||||
+ tmp_rate = parent * _n * _k / _m;
|
||||
+
|
||||
+ if (tmp_rate > rate)
|
||||
+ continue;
|
||||
+ if ((rate - tmp_rate) < (rate - best_rate)) {
|
||||
+ best_rate = tmp_rate;
|
||||
+ best_n = _n;
|
||||
+ best_k = _k;
|
||||
+ best_m = _m;
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nkmp.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nkmp.c
|
||||
@@ -9,7 +9,6 @@
|
||||
*/
|
||||
|
||||
#include <linux/clk-provider.h>
|
||||
-#include <linux/rational.h>
|
||||
|
||||
#include "ccu_gate.h"
|
||||
#include "ccu_nkmp.h"
|
||||
@@ -29,24 +28,24 @@ static void ccu_nkmp_find_best(unsigned
|
||||
unsigned long _n, _k, _m, _p;
|
||||
|
||||
for (_k = 1; _k <= nkmp->max_k; _k++) {
|
||||
- for (_p = 1; _p <= nkmp->max_p; _p <<= 1) {
|
||||
- unsigned long tmp_rate;
|
||||
-
|
||||
- rational_best_approximation(rate / _k, parent / _p,
|
||||
- nkmp->max_n, nkmp->max_m,
|
||||
- &_n, &_m);
|
||||
-
|
||||
- tmp_rate = parent * _n * _k / (_m * _p);
|
||||
-
|
||||
- if (tmp_rate > rate)
|
||||
- continue;
|
||||
-
|
||||
- if ((rate - tmp_rate) < (rate - best_rate)) {
|
||||
- best_rate = tmp_rate;
|
||||
- best_n = _n;
|
||||
- best_k = _k;
|
||||
- best_m = _m;
|
||||
- best_p = _p;
|
||||
+ for (_n = 1; _n <= nkmp->max_n; _n++) {
|
||||
+ for (_m = 1; _n <= nkmp->max_m; _m++) {
|
||||
+ for (_p = 1; _p <= nkmp->max_p; _p <<= 1) {
|
||||
+ unsigned long tmp_rate;
|
||||
+
|
||||
+ tmp_rate = parent * _n * _k / (_m * _p);
|
||||
+
|
||||
+ if (tmp_rate > rate)
|
||||
+ continue;
|
||||
+
|
||||
+ if ((rate - tmp_rate) < (rate - best_rate)) {
|
||||
+ best_rate = tmp_rate;
|
||||
+ best_n = _n;
|
||||
+ best_k = _k;
|
||||
+ best_m = _m;
|
||||
+ best_p = _p;
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nm.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nm.c
|
||||
@@ -9,12 +9,42 @@
|
||||
*/
|
||||
|
||||
#include <linux/clk-provider.h>
|
||||
-#include <linux/rational.h>
|
||||
|
||||
#include "ccu_frac.h"
|
||||
#include "ccu_gate.h"
|
||||
#include "ccu_nm.h"
|
||||
|
||||
+struct _ccu_nm {
|
||||
+ unsigned long n, max_n;
|
||||
+ unsigned long m, max_m;
|
||||
+};
|
||||
+
|
||||
+static void ccu_nm_find_best(unsigned long parent, unsigned long rate,
|
||||
+ struct _ccu_nm *nm)
|
||||
+{
|
||||
+ unsigned long best_rate = 0;
|
||||
+ unsigned long best_n = 0, best_m = 0;
|
||||
+ unsigned long _n, _m;
|
||||
+
|
||||
+ for (_n = 1; _n <= nm->max_n; _n++) {
|
||||
+ for (_m = 1; _n <= nm->max_m; _m++) {
|
||||
+ unsigned long tmp_rate = parent * _n / _m;
|
||||
+
|
||||
+ if (tmp_rate > rate)
|
||||
+ continue;
|
||||
+
|
||||
+ if ((rate - tmp_rate) < (rate - best_rate)) {
|
||||
+ best_rate = tmp_rate;
|
||||
+ best_n = _n;
|
||||
+ best_m = _m;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ nm->n = best_n;
|
||||
+ nm->m = best_m;
|
||||
+}
|
||||
+
|
||||
static void ccu_nm_disable(struct clk_hw *hw)
|
||||
{
|
||||
struct ccu_nm *nm = hw_to_ccu_nm(hw);
|
||||
@@ -61,24 +91,22 @@ static long ccu_nm_round_rate(struct clk
|
||||
unsigned long *parent_rate)
|
||||
{
|
||||
struct ccu_nm *nm = hw_to_ccu_nm(hw);
|
||||
- unsigned long max_n, max_m;
|
||||
- unsigned long n, m;
|
||||
+ struct _ccu_nm _nm;
|
||||
|
||||
- max_n = 1 << nm->n.width;
|
||||
- max_m = nm->m.max ?: 1 << nm->m.width;
|
||||
+ _nm.max_n = 1 << nm->n.width;
|
||||
+ _nm.max_m = nm->m.max ?: 1 << nm->m.width;
|
||||
|
||||
- rational_best_approximation(rate, *parent_rate, max_n, max_m, &n, &m);
|
||||
+ ccu_nm_find_best(*parent_rate, rate, &_nm);
|
||||
|
||||
- return *parent_rate * n / m;
|
||||
+ return *parent_rate * _nm.n / _nm.m;
|
||||
}
|
||||
|
||||
static int ccu_nm_set_rate(struct clk_hw *hw, unsigned long rate,
|
||||
unsigned long parent_rate)
|
||||
{
|
||||
struct ccu_nm *nm = hw_to_ccu_nm(hw);
|
||||
+ struct _ccu_nm _nm;
|
||||
unsigned long flags;
|
||||
- unsigned long max_n, max_m;
|
||||
- unsigned long n, m;
|
||||
u32 reg;
|
||||
|
||||
if (ccu_frac_helper_has_rate(&nm->common, &nm->frac, rate))
|
||||
@@ -86,10 +114,10 @@ static int ccu_nm_set_rate(struct clk_hw
|
||||
else
|
||||
ccu_frac_helper_disable(&nm->common, &nm->frac);
|
||||
|
||||
- max_n = 1 << nm->n.width;
|
||||
- max_m = nm->m.max ?: 1 << nm->m.width;
|
||||
+ _nm.max_n = 1 << nm->n.width;
|
||||
+ _nm.max_m = nm->m.max ?: 1 << nm->m.width;
|
||||
|
||||
- rational_best_approximation(rate, parent_rate, max_n, max_m, &n, &m);
|
||||
+ ccu_nm_find_best(parent_rate, rate, &_nm);
|
||||
|
||||
spin_lock_irqsave(nm->common.lock, flags);
|
||||
|
||||
@@ -97,7 +125,7 @@ static int ccu_nm_set_rate(struct clk_hw
|
||||
reg &= ~GENMASK(nm->n.width + nm->n.shift - 1, nm->n.shift);
|
||||
reg &= ~GENMASK(nm->m.width + nm->m.shift - 1, nm->m.shift);
|
||||
|
||||
- writel(reg | ((m - 1) << nm->m.shift) | ((n - 1) << nm->n.shift),
|
||||
+ writel(reg | ((_nm.m - 1) << nm->m.shift) | ((_nm.n - 1) << nm->n.shift),
|
||||
nm->common.base + nm->common.reg);
|
||||
|
||||
spin_unlock_irqrestore(nm->common.lock, flags);
|
||||
|
|
@ -1,182 +0,0 @@
|
|||
From b8302c7267dedaeeb1bf38143f099defbf16dce8 Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Date: Thu, 29 Sep 2016 23:50:21 +0200
|
||||
Subject: clk: sunxi-ng: Finish to convert to structures for arguments
|
||||
|
||||
Some clocks still use an explicit list of arguments, which make it a bit
|
||||
more tedious to add new parameters.
|
||||
|
||||
Convert those over to a structure pointer argument to add as many
|
||||
arguments as possible without having to many noise in our patches, or a
|
||||
very long list of arguments.
|
||||
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
||||
---
|
||||
drivers/clk/sunxi-ng/ccu_mult.c | 28 ++++++++++++++++++++--------
|
||||
drivers/clk/sunxi-ng/ccu_nk.c | 39 ++++++++++++++++++++++-----------------
|
||||
2 files changed, 42 insertions(+), 25 deletions(-)
|
||||
|
||||
--- a/drivers/clk/sunxi-ng/ccu_mult.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_mult.c
|
||||
@@ -13,10 +13,20 @@
|
||||
#include "ccu_gate.h"
|
||||
#include "ccu_mult.h"
|
||||
|
||||
+struct _ccu_mult {
|
||||
+ unsigned long mult, max;
|
||||
+};
|
||||
+
|
||||
static void ccu_mult_find_best(unsigned long parent, unsigned long rate,
|
||||
- unsigned int max_n, unsigned int *n)
|
||||
+ struct _ccu_mult *mult)
|
||||
{
|
||||
- *n = rate / parent;
|
||||
+ int _mult;
|
||||
+
|
||||
+ _mult = rate / parent;
|
||||
+ if (_mult > mult->max)
|
||||
+ _mult = mult->max;
|
||||
+
|
||||
+ mult->mult = _mult;
|
||||
}
|
||||
|
||||
static unsigned long ccu_mult_round_rate(struct ccu_mux_internal *mux,
|
||||
@@ -25,11 +35,12 @@ static unsigned long ccu_mult_round_rate
|
||||
void *data)
|
||||
{
|
||||
struct ccu_mult *cm = data;
|
||||
- unsigned int n;
|
||||
+ struct _ccu_mult _cm;
|
||||
|
||||
- ccu_mult_find_best(parent_rate, rate, 1 << cm->mult.width, &n);
|
||||
+ _cm.max = 1 << cm->mult.width;
|
||||
+ ccu_mult_find_best(parent_rate, rate, &_cm);
|
||||
|
||||
- return parent_rate * n;
|
||||
+ return parent_rate * _cm.mult;
|
||||
}
|
||||
|
||||
static void ccu_mult_disable(struct clk_hw *hw)
|
||||
@@ -83,21 +94,22 @@ static int ccu_mult_set_rate(struct clk_
|
||||
unsigned long parent_rate)
|
||||
{
|
||||
struct ccu_mult *cm = hw_to_ccu_mult(hw);
|
||||
+ struct _ccu_mult _cm;
|
||||
unsigned long flags;
|
||||
- unsigned int n;
|
||||
u32 reg;
|
||||
|
||||
ccu_mux_helper_adjust_parent_for_prediv(&cm->common, &cm->mux, -1,
|
||||
&parent_rate);
|
||||
|
||||
- ccu_mult_find_best(parent_rate, rate, 1 << cm->mult.width, &n);
|
||||
+ _cm.max = 1 << cm->mult.width;
|
||||
+ ccu_mult_find_best(parent_rate, rate, &_cm);
|
||||
|
||||
spin_lock_irqsave(cm->common.lock, flags);
|
||||
|
||||
reg = readl(cm->common.base + cm->common.reg);
|
||||
reg &= ~GENMASK(cm->mult.width + cm->mult.shift - 1, cm->mult.shift);
|
||||
|
||||
- writel(reg | ((n - 1) << cm->mult.shift),
|
||||
+ writel(reg | ((_cm.mult - 1) << cm->mult.shift),
|
||||
cm->common.base + cm->common.reg);
|
||||
|
||||
spin_unlock_irqrestore(cm->common.lock, flags);
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nk.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nk.c
|
||||
@@ -9,21 +9,24 @@
|
||||
*/
|
||||
|
||||
#include <linux/clk-provider.h>
|
||||
-#include <linux/rational.h>
|
||||
|
||||
#include "ccu_gate.h"
|
||||
#include "ccu_nk.h"
|
||||
|
||||
+struct _ccu_nk {
|
||||
+ unsigned long n, max_n;
|
||||
+ unsigned long k, max_k;
|
||||
+};
|
||||
+
|
||||
static void ccu_nk_find_best(unsigned long parent, unsigned long rate,
|
||||
- unsigned int max_n, unsigned int max_k,
|
||||
- unsigned int *n, unsigned int *k)
|
||||
+ struct _ccu_nk *nk)
|
||||
{
|
||||
unsigned long best_rate = 0;
|
||||
unsigned int best_k = 0, best_n = 0;
|
||||
unsigned int _k, _n;
|
||||
|
||||
- for (_k = 1; _k <= max_k; _k++) {
|
||||
- for (_n = 1; _n <= max_n; _n++) {
|
||||
+ for (_k = 1; _k <= nk->max_k; _k++) {
|
||||
+ for (_n = 1; _n <= nk->max_n; _n++) {
|
||||
unsigned long tmp_rate = parent * _n * _k;
|
||||
|
||||
if (tmp_rate > rate)
|
||||
@@ -37,8 +40,8 @@ static void ccu_nk_find_best(unsigned lo
|
||||
}
|
||||
}
|
||||
|
||||
- *k = best_k;
|
||||
- *n = best_n;
|
||||
+ nk->k = best_k;
|
||||
+ nk->n = best_n;
|
||||
}
|
||||
|
||||
static void ccu_nk_disable(struct clk_hw *hw)
|
||||
@@ -89,16 +92,17 @@ static long ccu_nk_round_rate(struct clk
|
||||
unsigned long *parent_rate)
|
||||
{
|
||||
struct ccu_nk *nk = hw_to_ccu_nk(hw);
|
||||
- unsigned int n, k;
|
||||
+ struct _ccu_nk _nk;
|
||||
|
||||
if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
|
||||
rate *= nk->fixed_post_div;
|
||||
|
||||
- ccu_nk_find_best(*parent_rate, rate,
|
||||
- 1 << nk->n.width, 1 << nk->k.width,
|
||||
- &n, &k);
|
||||
+ _nk.max_n = 1 << nk->n.width;
|
||||
+ _nk.max_k = 1 << nk->k.width;
|
||||
+
|
||||
+ ccu_nk_find_best(*parent_rate, rate, &_nk);
|
||||
+ rate = *parent_rate * _nk.n * _nk.k;
|
||||
|
||||
- rate = *parent_rate * n * k;
|
||||
if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
|
||||
rate = rate / nk->fixed_post_div;
|
||||
|
||||
@@ -110,15 +114,16 @@ static int ccu_nk_set_rate(struct clk_hw
|
||||
{
|
||||
struct ccu_nk *nk = hw_to_ccu_nk(hw);
|
||||
unsigned long flags;
|
||||
- unsigned int n, k;
|
||||
+ struct _ccu_nk _nk;
|
||||
u32 reg;
|
||||
|
||||
if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
|
||||
rate = rate * nk->fixed_post_div;
|
||||
|
||||
- ccu_nk_find_best(parent_rate, rate,
|
||||
- 1 << nk->n.width, 1 << nk->k.width,
|
||||
- &n, &k);
|
||||
+ _nk.max_n = 1 << nk->n.width;
|
||||
+ _nk.max_k = 1 << nk->k.width;
|
||||
+
|
||||
+ ccu_nk_find_best(parent_rate, rate, &_nk);
|
||||
|
||||
spin_lock_irqsave(nk->common.lock, flags);
|
||||
|
||||
@@ -126,7 +131,7 @@ static int ccu_nk_set_rate(struct clk_hw
|
||||
reg &= ~GENMASK(nk->n.width + nk->n.shift - 1, nk->n.shift);
|
||||
reg &= ~GENMASK(nk->k.width + nk->k.shift - 1, nk->k.shift);
|
||||
|
||||
- writel(reg | ((k - 1) << nk->k.shift) | ((n - 1) << nk->n.shift),
|
||||
+ writel(reg | ((_nk.k - 1) << nk->k.shift) | ((_nk.n - 1) << nk->n.shift),
|
||||
nk->common.base + nk->common.reg);
|
||||
|
||||
spin_unlock_irqrestore(nk->common.lock, flags);
|
||||
|
|
@ -1,256 +0,0 @@
|
|||
From 6e0d50daa97f4bf9706e343b4f71171e88921209 Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Date: Thu, 29 Sep 2016 22:57:26 +0200
|
||||
Subject: clk: sunxi-ng: Add minimums for all the relevant structures and
|
||||
clocks
|
||||
|
||||
Modify the current clocks we have to be able to specify the minimum for
|
||||
each clocks we support, just like we support the max.
|
||||
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
||||
---
|
||||
drivers/clk/sunxi-ng/ccu_mult.c | 7 ++++++-
|
||||
drivers/clk/sunxi-ng/ccu_nk.c | 12 ++++++++----
|
||||
drivers/clk/sunxi-ng/ccu_nkm.c | 18 ++++++++++++------
|
||||
drivers/clk/sunxi-ng/ccu_nkmp.c | 24 ++++++++++++++++--------
|
||||
drivers/clk/sunxi-ng/ccu_nm.c | 12 ++++++++----
|
||||
5 files changed, 50 insertions(+), 23 deletions(-)
|
||||
|
||||
--- a/drivers/clk/sunxi-ng/ccu_mult.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_mult.c
|
||||
@@ -14,7 +14,7 @@
|
||||
#include "ccu_mult.h"
|
||||
|
||||
struct _ccu_mult {
|
||||
- unsigned long mult, max;
|
||||
+ unsigned long mult, min, max;
|
||||
};
|
||||
|
||||
static void ccu_mult_find_best(unsigned long parent, unsigned long rate,
|
||||
@@ -23,6 +23,9 @@ static void ccu_mult_find_best(unsigned
|
||||
int _mult;
|
||||
|
||||
_mult = rate / parent;
|
||||
+ if (_mult < mult->min)
|
||||
+ _mult = mult->min;
|
||||
+
|
||||
if (_mult > mult->max)
|
||||
_mult = mult->max;
|
||||
|
||||
@@ -37,6 +40,7 @@ static unsigned long ccu_mult_round_rate
|
||||
struct ccu_mult *cm = data;
|
||||
struct _ccu_mult _cm;
|
||||
|
||||
+ _cm.min = 1;
|
||||
_cm.max = 1 << cm->mult.width;
|
||||
ccu_mult_find_best(parent_rate, rate, &_cm);
|
||||
|
||||
@@ -101,6 +105,7 @@ static int ccu_mult_set_rate(struct clk_
|
||||
ccu_mux_helper_adjust_parent_for_prediv(&cm->common, &cm->mux, -1,
|
||||
&parent_rate);
|
||||
|
||||
+ _cm.min = 1;
|
||||
_cm.max = 1 << cm->mult.width;
|
||||
ccu_mult_find_best(parent_rate, rate, &_cm);
|
||||
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nk.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nk.c
|
||||
@@ -14,8 +14,8 @@
|
||||
#include "ccu_nk.h"
|
||||
|
||||
struct _ccu_nk {
|
||||
- unsigned long n, max_n;
|
||||
- unsigned long k, max_k;
|
||||
+ unsigned long n, min_n, max_n;
|
||||
+ unsigned long k, min_k, max_k;
|
||||
};
|
||||
|
||||
static void ccu_nk_find_best(unsigned long parent, unsigned long rate,
|
||||
@@ -25,8 +25,8 @@ static void ccu_nk_find_best(unsigned lo
|
||||
unsigned int best_k = 0, best_n = 0;
|
||||
unsigned int _k, _n;
|
||||
|
||||
- for (_k = 1; _k <= nk->max_k; _k++) {
|
||||
- for (_n = 1; _n <= nk->max_n; _n++) {
|
||||
+ for (_k = nk->min_k; _k <= nk->max_k; _k++) {
|
||||
+ for (_n = nk->min_n; _n <= nk->max_n; _n++) {
|
||||
unsigned long tmp_rate = parent * _n * _k;
|
||||
|
||||
if (tmp_rate > rate)
|
||||
@@ -97,7 +97,9 @@ static long ccu_nk_round_rate(struct clk
|
||||
if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
|
||||
rate *= nk->fixed_post_div;
|
||||
|
||||
+ _nk.min_n = 1;
|
||||
_nk.max_n = 1 << nk->n.width;
|
||||
+ _nk.min_k = 1;
|
||||
_nk.max_k = 1 << nk->k.width;
|
||||
|
||||
ccu_nk_find_best(*parent_rate, rate, &_nk);
|
||||
@@ -120,7 +122,9 @@ static int ccu_nk_set_rate(struct clk_hw
|
||||
if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
|
||||
rate = rate * nk->fixed_post_div;
|
||||
|
||||
+ _nk.min_n = 1;
|
||||
_nk.max_n = 1 << nk->n.width;
|
||||
+ _nk.min_k = 1;
|
||||
_nk.max_k = 1 << nk->k.width;
|
||||
|
||||
ccu_nk_find_best(parent_rate, rate, &_nk);
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nkm.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nkm.c
|
||||
@@ -14,9 +14,9 @@
|
||||
#include "ccu_nkm.h"
|
||||
|
||||
struct _ccu_nkm {
|
||||
- unsigned long n, max_n;
|
||||
- unsigned long k, max_k;
|
||||
- unsigned long m, max_m;
|
||||
+ unsigned long n, min_n, max_n;
|
||||
+ unsigned long k, min_k, max_k;
|
||||
+ unsigned long m, min_m, max_m;
|
||||
};
|
||||
|
||||
static void ccu_nkm_find_best(unsigned long parent, unsigned long rate,
|
||||
@@ -26,9 +26,9 @@ static void ccu_nkm_find_best(unsigned l
|
||||
unsigned long best_n = 0, best_k = 0, best_m = 0;
|
||||
unsigned long _n, _k, _m;
|
||||
|
||||
- for (_k = 1; _k <= nkm->max_k; _k++) {
|
||||
- for (_n = 1; _n <= nkm->max_n; _n++) {
|
||||
- for (_m = 1; _n <= nkm->max_m; _m++) {
|
||||
+ for (_k = nkm->min_k; _k <= nkm->max_k; _k++) {
|
||||
+ for (_n = nkm->min_n; _n <= nkm->max_n; _n++) {
|
||||
+ for (_m = nkm->min_m; _m <= nkm->max_m; _m++) {
|
||||
unsigned long tmp_rate;
|
||||
|
||||
tmp_rate = parent * _n * _k / _m;
|
||||
@@ -100,8 +100,11 @@ static unsigned long ccu_nkm_round_rate(
|
||||
struct ccu_nkm *nkm = data;
|
||||
struct _ccu_nkm _nkm;
|
||||
|
||||
+ _nkm.min_n = 1;
|
||||
_nkm.max_n = 1 << nkm->n.width;
|
||||
+ _nkm.min_k = 1;
|
||||
_nkm.max_k = 1 << nkm->k.width;
|
||||
+ _nkm.min_m = 1;
|
||||
_nkm.max_m = nkm->m.max ?: 1 << nkm->m.width;
|
||||
|
||||
ccu_nkm_find_best(parent_rate, rate, &_nkm);
|
||||
@@ -126,8 +129,11 @@ static int ccu_nkm_set_rate(struct clk_h
|
||||
unsigned long flags;
|
||||
u32 reg;
|
||||
|
||||
+ _nkm.min_n = 1;
|
||||
_nkm.max_n = 1 << nkm->n.width;
|
||||
+ _nkm.min_k = 1;
|
||||
_nkm.max_k = 1 << nkm->k.width;
|
||||
+ _nkm.min_m = 1;
|
||||
_nkm.max_m = nkm->m.max ?: 1 << nkm->m.width;
|
||||
|
||||
ccu_nkm_find_best(parent_rate, rate, &_nkm);
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nkmp.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nkmp.c
|
||||
@@ -14,10 +14,10 @@
|
||||
#include "ccu_nkmp.h"
|
||||
|
||||
struct _ccu_nkmp {
|
||||
- unsigned long n, max_n;
|
||||
- unsigned long k, max_k;
|
||||
- unsigned long m, max_m;
|
||||
- unsigned long p, max_p;
|
||||
+ unsigned long n, min_n, max_n;
|
||||
+ unsigned long k, min_k, max_k;
|
||||
+ unsigned long m, min_m, max_m;
|
||||
+ unsigned long p, min_p, max_p;
|
||||
};
|
||||
|
||||
static void ccu_nkmp_find_best(unsigned long parent, unsigned long rate,
|
||||
@@ -27,10 +27,10 @@ static void ccu_nkmp_find_best(unsigned
|
||||
unsigned long best_n = 0, best_k = 0, best_m = 0, best_p = 0;
|
||||
unsigned long _n, _k, _m, _p;
|
||||
|
||||
- for (_k = 1; _k <= nkmp->max_k; _k++) {
|
||||
- for (_n = 1; _n <= nkmp->max_n; _n++) {
|
||||
- for (_m = 1; _n <= nkmp->max_m; _m++) {
|
||||
- for (_p = 1; _p <= nkmp->max_p; _p <<= 1) {
|
||||
+ for (_k = nkmp->min_k; _k <= nkmp->max_k; _k++) {
|
||||
+ for (_n = nkmp->min_n; _n <= nkmp->max_n; _n++) {
|
||||
+ for (_m = nkmp->min_m; _m <= nkmp->max_m; _m++) {
|
||||
+ for (_p = nkmp->min_p; _p <= nkmp->max_p; _p <<= 1) {
|
||||
unsigned long tmp_rate;
|
||||
|
||||
tmp_rate = parent * _n * _k / (_m * _p);
|
||||
@@ -107,9 +107,13 @@ static long ccu_nkmp_round_rate(struct c
|
||||
struct ccu_nkmp *nkmp = hw_to_ccu_nkmp(hw);
|
||||
struct _ccu_nkmp _nkmp;
|
||||
|
||||
+ _nkmp.min_n = 1;
|
||||
_nkmp.max_n = 1 << nkmp->n.width;
|
||||
+ _nkmp.min_k = 1;
|
||||
_nkmp.max_k = 1 << nkmp->k.width;
|
||||
+ _nkmp.min_m = 1;
|
||||
_nkmp.max_m = nkmp->m.max ?: 1 << nkmp->m.width;
|
||||
+ _nkmp.min_p = 1;
|
||||
_nkmp.max_p = nkmp->p.max ?: 1 << ((1 << nkmp->p.width) - 1);
|
||||
|
||||
ccu_nkmp_find_best(*parent_rate, rate, &_nkmp);
|
||||
@@ -125,9 +129,13 @@ static int ccu_nkmp_set_rate(struct clk_
|
||||
unsigned long flags;
|
||||
u32 reg;
|
||||
|
||||
+ _nkmp.min_n = 1;
|
||||
_nkmp.max_n = 1 << nkmp->n.width;
|
||||
+ _nkmp.min_k = 1;
|
||||
_nkmp.max_k = 1 << nkmp->k.width;
|
||||
+ _nkmp.min_m = 1;
|
||||
_nkmp.max_m = nkmp->m.max ?: 1 << nkmp->m.width;
|
||||
+ _nkmp.min_p = 1;
|
||||
_nkmp.max_p = nkmp->p.max ?: 1 << ((1 << nkmp->p.width) - 1);
|
||||
|
||||
ccu_nkmp_find_best(parent_rate, rate, &_nkmp);
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nm.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nm.c
|
||||
@@ -15,8 +15,8 @@
|
||||
#include "ccu_nm.h"
|
||||
|
||||
struct _ccu_nm {
|
||||
- unsigned long n, max_n;
|
||||
- unsigned long m, max_m;
|
||||
+ unsigned long n, min_n, max_n;
|
||||
+ unsigned long m, min_m, max_m;
|
||||
};
|
||||
|
||||
static void ccu_nm_find_best(unsigned long parent, unsigned long rate,
|
||||
@@ -26,8 +26,8 @@ static void ccu_nm_find_best(unsigned lo
|
||||
unsigned long best_n = 0, best_m = 0;
|
||||
unsigned long _n, _m;
|
||||
|
||||
- for (_n = 1; _n <= nm->max_n; _n++) {
|
||||
- for (_m = 1; _n <= nm->max_m; _m++) {
|
||||
+ for (_n = nm->min_n; _n <= nm->max_n; _n++) {
|
||||
+ for (_m = nm->min_m; _m <= nm->max_m; _m++) {
|
||||
unsigned long tmp_rate = parent * _n / _m;
|
||||
|
||||
if (tmp_rate > rate)
|
||||
@@ -93,7 +93,9 @@ static long ccu_nm_round_rate(struct clk
|
||||
struct ccu_nm *nm = hw_to_ccu_nm(hw);
|
||||
struct _ccu_nm _nm;
|
||||
|
||||
+ _nm.min_n = 1;
|
||||
_nm.max_n = 1 << nm->n.width;
|
||||
+ _nm.min_m = 1;
|
||||
_nm.max_m = nm->m.max ?: 1 << nm->m.width;
|
||||
|
||||
ccu_nm_find_best(*parent_rate, rate, &_nm);
|
||||
@@ -114,7 +116,9 @@ static int ccu_nm_set_rate(struct clk_hw
|
||||
else
|
||||
ccu_frac_helper_disable(&nm->common, &nm->frac);
|
||||
|
||||
+ _nm.min_n = 1;
|
||||
_nm.max_n = 1 << nm->n.width;
|
||||
+ _nm.min_m = 1;
|
||||
_nm.max_m = nm->m.max ?: 1 << nm->m.width;
|
||||
|
||||
ccu_nm_find_best(parent_rate, rate, &_nm);
|
||||
|
|
@ -1,132 +0,0 @@
|
|||
From 2beaa601c849e72683a2dd0fe6fd77763f19f051 Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Date: Fri, 30 Sep 2016 22:16:51 +0200
|
||||
Subject: clk: sunxi-ng: Implement minimum for multipliers
|
||||
|
||||
Allow the CCU drivers to specify a multiplier for their clocks.
|
||||
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
||||
---
|
||||
drivers/clk/sunxi-ng/ccu_mult.c | 2 +-
|
||||
drivers/clk/sunxi-ng/ccu_mult.h | 13 +++++++++----
|
||||
drivers/clk/sunxi-ng/ccu_nk.c | 8 ++++----
|
||||
drivers/clk/sunxi-ng/ccu_nkm.c | 8 ++++----
|
||||
drivers/clk/sunxi-ng/ccu_nkmp.c | 4 ++--
|
||||
drivers/clk/sunxi-ng/ccu_nm.c | 2 +-
|
||||
6 files changed, 21 insertions(+), 16 deletions(-)
|
||||
|
||||
--- a/drivers/clk/sunxi-ng/ccu_mult.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_mult.c
|
||||
@@ -105,7 +105,7 @@ static int ccu_mult_set_rate(struct clk_
|
||||
ccu_mux_helper_adjust_parent_for_prediv(&cm->common, &cm->mux, -1,
|
||||
&parent_rate);
|
||||
|
||||
- _cm.min = 1;
|
||||
+ _cm.min = cm->mult.min;
|
||||
_cm.max = 1 << cm->mult.width;
|
||||
ccu_mult_find_best(parent_rate, rate, &_cm);
|
||||
|
||||
--- a/drivers/clk/sunxi-ng/ccu_mult.h
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_mult.h
|
||||
@@ -7,14 +7,19 @@
|
||||
struct ccu_mult_internal {
|
||||
u8 shift;
|
||||
u8 width;
|
||||
+ u8 min;
|
||||
};
|
||||
|
||||
-#define _SUNXI_CCU_MULT(_shift, _width) \
|
||||
- { \
|
||||
- .shift = _shift, \
|
||||
- .width = _width, \
|
||||
+#define _SUNXI_CCU_MULT_MIN(_shift, _width, _min) \
|
||||
+ { \
|
||||
+ .shift = _shift, \
|
||||
+ .width = _width, \
|
||||
+ .min = _min, \
|
||||
}
|
||||
|
||||
+#define _SUNXI_CCU_MULT(_shift, _width) \
|
||||
+ _SUNXI_CCU_MULT_MIN(_shift, _width, 1)
|
||||
+
|
||||
struct ccu_mult {
|
||||
u32 enable;
|
||||
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nk.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nk.c
|
||||
@@ -97,9 +97,9 @@ static long ccu_nk_round_rate(struct clk
|
||||
if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
|
||||
rate *= nk->fixed_post_div;
|
||||
|
||||
- _nk.min_n = 1;
|
||||
+ _nk.min_n = nk->n.min;
|
||||
_nk.max_n = 1 << nk->n.width;
|
||||
- _nk.min_k = 1;
|
||||
+ _nk.min_k = nk->k.min;
|
||||
_nk.max_k = 1 << nk->k.width;
|
||||
|
||||
ccu_nk_find_best(*parent_rate, rate, &_nk);
|
||||
@@ -122,9 +122,9 @@ static int ccu_nk_set_rate(struct clk_hw
|
||||
if (nk->common.features & CCU_FEATURE_FIXED_POSTDIV)
|
||||
rate = rate * nk->fixed_post_div;
|
||||
|
||||
- _nk.min_n = 1;
|
||||
+ _nk.min_n = nk->n.min;
|
||||
_nk.max_n = 1 << nk->n.width;
|
||||
- _nk.min_k = 1;
|
||||
+ _nk.min_k = nk->k.min;
|
||||
_nk.max_k = 1 << nk->k.width;
|
||||
|
||||
ccu_nk_find_best(parent_rate, rate, &_nk);
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nkm.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nkm.c
|
||||
@@ -100,9 +100,9 @@ static unsigned long ccu_nkm_round_rate(
|
||||
struct ccu_nkm *nkm = data;
|
||||
struct _ccu_nkm _nkm;
|
||||
|
||||
- _nkm.min_n = 1;
|
||||
+ _nkm.min_n = nkm->n.min;
|
||||
_nkm.max_n = 1 << nkm->n.width;
|
||||
- _nkm.min_k = 1;
|
||||
+ _nkm.min_k = nkm->k.min;
|
||||
_nkm.max_k = 1 << nkm->k.width;
|
||||
_nkm.min_m = 1;
|
||||
_nkm.max_m = nkm->m.max ?: 1 << nkm->m.width;
|
||||
@@ -129,9 +129,9 @@ static int ccu_nkm_set_rate(struct clk_h
|
||||
unsigned long flags;
|
||||
u32 reg;
|
||||
|
||||
- _nkm.min_n = 1;
|
||||
+ _nkm.min_n = nkm->n.min;
|
||||
_nkm.max_n = 1 << nkm->n.width;
|
||||
- _nkm.min_k = 1;
|
||||
+ _nkm.min_k = nkm->k.min;
|
||||
_nkm.max_k = 1 << nkm->k.width;
|
||||
_nkm.min_m = 1;
|
||||
_nkm.max_m = nkm->m.max ?: 1 << nkm->m.width;
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nkmp.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nkmp.c
|
||||
@@ -107,9 +107,9 @@ static long ccu_nkmp_round_rate(struct c
|
||||
struct ccu_nkmp *nkmp = hw_to_ccu_nkmp(hw);
|
||||
struct _ccu_nkmp _nkmp;
|
||||
|
||||
- _nkmp.min_n = 1;
|
||||
+ _nkmp.min_n = nkmp->n.min;
|
||||
_nkmp.max_n = 1 << nkmp->n.width;
|
||||
- _nkmp.min_k = 1;
|
||||
+ _nkmp.min_k = nkmp->k.min;
|
||||
_nkmp.max_k = 1 << nkmp->k.width;
|
||||
_nkmp.min_m = 1;
|
||||
_nkmp.max_m = nkmp->m.max ?: 1 << nkmp->m.width;
|
||||
--- a/drivers/clk/sunxi-ng/ccu_nm.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu_nm.c
|
||||
@@ -93,7 +93,7 @@ static long ccu_nm_round_rate(struct clk
|
||||
struct ccu_nm *nm = hw_to_ccu_nm(hw);
|
||||
struct _ccu_nm _nm;
|
||||
|
||||
- _nm.min_n = 1;
|
||||
+ _nm.min_n = nm->n.min;
|
||||
_nm.max_n = 1 << nm->n.width;
|
||||
_nm.min_m = 1;
|
||||
_nm.max_m = nm->m.max ?: 1 << nm->m.width;
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,311 +0,0 @@
|
|||
From 6bc37fac30cf01c39feb17834090089304bd1d31 Mon Sep 17 00:00:00 2001
|
||||
From: Andre Przywara <andre.przywara@arm.com>
|
||||
Date: Mon, 18 Jan 2016 10:24:31 +0000
|
||||
Subject: arm64: dts: add Allwinner A64 SoC .dtsi
|
||||
|
||||
The Allwinner A64 SoC is a low-cost chip with 4 ARM Cortex-A53 cores
|
||||
and the typical tablet / TV box peripherals.
|
||||
The SoC is based on the (32-bit) Allwinner H3 chip, sharing most of
|
||||
the peripherals and the memory map.
|
||||
Although the cores are proper 64-bit ones, the whole SoC is actually
|
||||
limited to 4GB (including all the supported DRAM), so we use 32-bit
|
||||
address and size cells. This has the nice feature of us being able to
|
||||
reuse the DT for 32-bit kernels as well.
|
||||
This .dtsi lists the hardware that we support so far.
|
||||
|
||||
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
|
||||
Acked-by: Rob Herring <robh@kernel.org>
|
||||
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
||||
[Maxime: Convert to CCU binding, drop the MMC support for now]
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
Documentation/devicetree/bindings/arm/sunxi.txt | 1 +
|
||||
MAINTAINERS | 1 +
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 263 ++++++++++++++++++++++++
|
||||
3 files changed, 265 insertions(+)
|
||||
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
|
||||
--- a/Documentation/devicetree/bindings/arm/sunxi.txt
|
||||
+++ b/Documentation/devicetree/bindings/arm/sunxi.txt
|
||||
@@ -14,4 +14,5 @@ using one of the following compatible st
|
||||
allwinner,sun8i-a83t
|
||||
allwinner,sun8i-h3
|
||||
allwinner,sun9i-a80
|
||||
+ allwinner,sun50i-a64
|
||||
nextthing,gr8
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -1026,6 +1026,7 @@ L: linux-arm-kernel@lists.infradead.org
|
||||
S: Maintained
|
||||
N: sun[x456789]i
|
||||
F: arch/arm/boot/dts/ntc-gr8*
|
||||
+F: arch/arm64/boot/dts/allwinner/
|
||||
|
||||
ARM/Allwinner SoC Clock Support
|
||||
M: Emilio López <emilio@elopez.com.ar>
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
@@ -0,0 +1,263 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2016 ARM Ltd.
|
||||
+ * based on the Allwinner H3 dtsi:
|
||||
+ * Copyright (C) 2015 Jens Kuske <jenskuske@gmail.com>
|
||||
+ *
|
||||
+ * This file is dual-licensed: you can use it either under the terms
|
||||
+ * of the GPL or the X11 license, at your option. Note that this dual
|
||||
+ * licensing only applies to this file, and not this project as a
|
||||
+ * whole.
|
||||
+ *
|
||||
+ * a) This file is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU General Public License as
|
||||
+ * published by the Free Software Foundation; either version 2 of the
|
||||
+ * License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This file is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * Or, alternatively,
|
||||
+ *
|
||||
+ * b) Permission is hereby granted, free of charge, to any person
|
||||
+ * obtaining a copy of this software and associated documentation
|
||||
+ * files (the "Software"), to deal in the Software without
|
||||
+ * restriction, including without limitation the rights to use,
|
||||
+ * copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
+ * sell copies of the Software, and to permit persons to whom the
|
||||
+ * Software is furnished to do so, subject to the following
|
||||
+ * conditions:
|
||||
+ *
|
||||
+ * The above copyright notice and this permission notice shall be
|
||||
+ * included in all copies or substantial portions of the Software.
|
||||
+ *
|
||||
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
+ * OTHER DEALINGS IN THE SOFTWARE.
|
||||
+ */
|
||||
+
|
||||
+#include <dt-bindings/clock/sun50i-a64-ccu.h>
|
||||
+#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
+#include <dt-bindings/pinctrl/sun4i-a10.h>
|
||||
+#include <dt-bindings/reset/sun50i-a64-ccu.h>
|
||||
+
|
||||
+/ {
|
||||
+ interrupt-parent = <&gic>;
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <1>;
|
||||
+
|
||||
+ cpus {
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+
|
||||
+ cpu0: cpu@0 {
|
||||
+ compatible = "arm,cortex-a53", "arm,armv8";
|
||||
+ device_type = "cpu";
|
||||
+ reg = <0>;
|
||||
+ enable-method = "psci";
|
||||
+ };
|
||||
+
|
||||
+ cpu1: cpu@1 {
|
||||
+ compatible = "arm,cortex-a53", "arm,armv8";
|
||||
+ device_type = "cpu";
|
||||
+ reg = <1>;
|
||||
+ enable-method = "psci";
|
||||
+ };
|
||||
+
|
||||
+ cpu2: cpu@2 {
|
||||
+ compatible = "arm,cortex-a53", "arm,armv8";
|
||||
+ device_type = "cpu";
|
||||
+ reg = <2>;
|
||||
+ enable-method = "psci";
|
||||
+ };
|
||||
+
|
||||
+ cpu3: cpu@3 {
|
||||
+ compatible = "arm,cortex-a53", "arm,armv8";
|
||||
+ device_type = "cpu";
|
||||
+ reg = <3>;
|
||||
+ enable-method = "psci";
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ osc24M: osc24M_clk {
|
||||
+ #clock-cells = <0>;
|
||||
+ compatible = "fixed-clock";
|
||||
+ clock-frequency = <24000000>;
|
||||
+ clock-output-names = "osc24M";
|
||||
+ };
|
||||
+
|
||||
+ osc32k: osc32k_clk {
|
||||
+ #clock-cells = <0>;
|
||||
+ compatible = "fixed-clock";
|
||||
+ clock-frequency = <32768>;
|
||||
+ clock-output-names = "osc32k";
|
||||
+ };
|
||||
+
|
||||
+ psci {
|
||||
+ compatible = "arm,psci-0.2";
|
||||
+ method = "smc";
|
||||
+ };
|
||||
+
|
||||
+ timer {
|
||||
+ compatible = "arm,armv8-timer";
|
||||
+ interrupts = <GIC_PPI 13
|
||||
+ (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
|
||||
+ <GIC_PPI 14
|
||||
+ (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
|
||||
+ <GIC_PPI 11
|
||||
+ (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
|
||||
+ <GIC_PPI 10
|
||||
+ (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
|
||||
+ };
|
||||
+
|
||||
+ soc {
|
||||
+ compatible = "simple-bus";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <1>;
|
||||
+ ranges;
|
||||
+
|
||||
+ ccu: clock@01c20000 {
|
||||
+ compatible = "allwinner,sun50i-a64-ccu";
|
||||
+ reg = <0x01c20000 0x400>;
|
||||
+ clocks = <&osc24M>, <&osc32k>;
|
||||
+ clock-names = "hosc", "losc";
|
||||
+ #clock-cells = <1>;
|
||||
+ #reset-cells = <1>;
|
||||
+ };
|
||||
+
|
||||
+ pio: pinctrl@1c20800 {
|
||||
+ compatible = "allwinner,sun50i-a64-pinctrl";
|
||||
+ reg = <0x01c20800 0x400>;
|
||||
+ interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
|
||||
+ <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
|
||||
+ <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ clocks = <&ccu CLK_BUS_PIO>;
|
||||
+ gpio-controller;
|
||||
+ #gpio-cells = <3>;
|
||||
+ interrupt-controller;
|
||||
+ #interrupt-cells = <3>;
|
||||
+
|
||||
+ i2c1_pins: i2c1_pins {
|
||||
+ pins = "PH2", "PH3";
|
||||
+ function = "i2c1";
|
||||
+ };
|
||||
+
|
||||
+ uart0_pins_a: uart0@0 {
|
||||
+ pins = "PB8", "PB9";
|
||||
+ function = "uart0";
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ uart0: serial@1c28000 {
|
||||
+ compatible = "snps,dw-apb-uart";
|
||||
+ reg = <0x01c28000 0x400>;
|
||||
+ interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ reg-shift = <2>;
|
||||
+ reg-io-width = <4>;
|
||||
+ clocks = <&ccu CLK_BUS_UART0>;
|
||||
+ resets = <&ccu RST_BUS_UART0>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ uart1: serial@1c28400 {
|
||||
+ compatible = "snps,dw-apb-uart";
|
||||
+ reg = <0x01c28400 0x400>;
|
||||
+ interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ reg-shift = <2>;
|
||||
+ reg-io-width = <4>;
|
||||
+ clocks = <&ccu CLK_BUS_UART1>;
|
||||
+ resets = <&ccu RST_BUS_UART1>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ uart2: serial@1c28800 {
|
||||
+ compatible = "snps,dw-apb-uart";
|
||||
+ reg = <0x01c28800 0x400>;
|
||||
+ interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ reg-shift = <2>;
|
||||
+ reg-io-width = <4>;
|
||||
+ clocks = <&ccu CLK_BUS_UART2>;
|
||||
+ resets = <&ccu RST_BUS_UART2>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ uart3: serial@1c28c00 {
|
||||
+ compatible = "snps,dw-apb-uart";
|
||||
+ reg = <0x01c28c00 0x400>;
|
||||
+ interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ reg-shift = <2>;
|
||||
+ reg-io-width = <4>;
|
||||
+ clocks = <&ccu CLK_BUS_UART3>;
|
||||
+ resets = <&ccu RST_BUS_UART3>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ uart4: serial@1c29000 {
|
||||
+ compatible = "snps,dw-apb-uart";
|
||||
+ reg = <0x01c29000 0x400>;
|
||||
+ interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ reg-shift = <2>;
|
||||
+ reg-io-width = <4>;
|
||||
+ clocks = <&ccu CLK_BUS_UART4>;
|
||||
+ resets = <&ccu RST_BUS_UART4>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ i2c0: i2c@1c2ac00 {
|
||||
+ compatible = "allwinner,sun6i-a31-i2c";
|
||||
+ reg = <0x01c2ac00 0x400>;
|
||||
+ interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ clocks = <&ccu CLK_BUS_I2C0>;
|
||||
+ resets = <&ccu RST_BUS_I2C0>;
|
||||
+ status = "disabled";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ };
|
||||
+
|
||||
+ i2c1: i2c@1c2b000 {
|
||||
+ compatible = "allwinner,sun6i-a31-i2c";
|
||||
+ reg = <0x01c2b000 0x400>;
|
||||
+ interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ clocks = <&ccu CLK_BUS_I2C1>;
|
||||
+ resets = <&ccu RST_BUS_I2C1>;
|
||||
+ status = "disabled";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ };
|
||||
+
|
||||
+ i2c2: i2c@1c2b400 {
|
||||
+ compatible = "allwinner,sun6i-a31-i2c";
|
||||
+ reg = <0x01c2b400 0x400>;
|
||||
+ interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ clocks = <&ccu CLK_BUS_I2C2>;
|
||||
+ resets = <&ccu RST_BUS_I2C2>;
|
||||
+ status = "disabled";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ };
|
||||
+
|
||||
+ gic: interrupt-controller@1c81000 {
|
||||
+ compatible = "arm,gic-400";
|
||||
+ reg = <0x01c81000 0x1000>,
|
||||
+ <0x01c82000 0x2000>,
|
||||
+ <0x01c84000 0x2000>,
|
||||
+ <0x01c86000 0x2000>;
|
||||
+ interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
|
||||
+ interrupt-controller;
|
||||
+ #interrupt-cells = <3>;
|
||||
+ };
|
||||
+
|
||||
+ rtc: rtc@1f00000 {
|
||||
+ compatible = "allwinner,sun6i-a31-rtc";
|
||||
+ reg = <0x01f00000 0x54>;
|
||||
+ interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
|
||||
+ <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
|
|
@ -1,176 +0,0 @@
|
|||
From 4e3886081848b7ea16452a92c4324acaab644d49 Mon Sep 17 00:00:00 2001
|
||||
From: Andre Przywara <andre.przywara@arm.com>
|
||||
Date: Tue, 19 Jan 2016 10:36:39 +0000
|
||||
Subject: arm64: dts: add Pine64 support
|
||||
|
||||
The Pine64 is a cost-efficient development board based on the
|
||||
Allwinner A64 SoC.
|
||||
There are three models: the basic version with Fast Ethernet and
|
||||
512 MB of DRAM (Pine64) and two Pine64+ versions, which both
|
||||
feature Gigabit Ethernet and additional connectors for touchscreens
|
||||
and a camera. Or as my son put it: "Those are smaller and these are
|
||||
missing." ;-)
|
||||
The two Pine64+ models just differ in the amount of DRAM
|
||||
(1GB vs. 2GB). Since U-Boot will figure out the right size for us and
|
||||
patches the DT accordingly we just need to provide one DT for the
|
||||
Pine64+.
|
||||
|
||||
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
|
||||
[Maxime: Removed the common DTSI and include directly the pine64 DTS]
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm64/boot/dts/Makefile | 1 +
|
||||
arch/arm64/boot/dts/allwinner/Makefile | 5 ++
|
||||
.../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 50 +++++++++++++++
|
||||
.../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 74 ++++++++++++++++++++++
|
||||
4 files changed, 130 insertions(+)
|
||||
create mode 100644 arch/arm64/boot/dts/allwinner/Makefile
|
||||
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts
|
||||
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
||||
|
||||
--- a/arch/arm64/boot/dts/Makefile
|
||||
+++ b/arch/arm64/boot/dts/Makefile
|
||||
@@ -1,4 +1,5 @@
|
||||
dts-dirs += al
|
||||
+dts-dirs += allwinner
|
||||
dts-dirs += altera
|
||||
dts-dirs += amd
|
||||
dts-dirs += amlogic
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/allwinner/Makefile
|
||||
@@ -0,0 +1,5 @@
|
||||
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pine64-plus.dtb sun50i-a64-pine64.dtb
|
||||
+
|
||||
+always := $(dtb-y)
|
||||
+subdir-y := $(dts-dirs)
|
||||
+clean-files := *.dtb
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts
|
||||
@@ -0,0 +1,50 @@
|
||||
+/*
|
||||
+ * Copyright (c) 2016 ARM Ltd.
|
||||
+ *
|
||||
+ * This file is dual-licensed: you can use it either under the terms
|
||||
+ * of the GPL or the X11 license, at your option. Note that this dual
|
||||
+ * licensing only applies to this file, and not this project as a
|
||||
+ * whole.
|
||||
+ *
|
||||
+ * a) This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU General Public License as
|
||||
+ * published by the Free Software Foundation; either version 2 of the
|
||||
+ * License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * Or, alternatively,
|
||||
+ *
|
||||
+ * b) Permission is hereby granted, free of charge, to any person
|
||||
+ * obtaining a copy of this software and associated documentation
|
||||
+ * files (the "Software"), to deal in the Software without
|
||||
+ * restriction, including without limitation the rights to use,
|
||||
+ * copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
+ * sell copies of the Software, and to permit persons to whom the
|
||||
+ * Software is furnished to do so, subject to the following
|
||||
+ * conditions:
|
||||
+ *
|
||||
+ * The above copyright notice and this permission notice shall be
|
||||
+ * included in all copies or substantial portions of the Software.
|
||||
+ *
|
||||
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
+ * OTHER DEALINGS IN THE SOFTWARE.
|
||||
+ */
|
||||
+
|
||||
+#include "sun50i-a64-pine64.dts"
|
||||
+
|
||||
+/ {
|
||||
+ model = "Pine64+";
|
||||
+ compatible = "pine64,pine64-plus", "allwinner,sun50i-a64";
|
||||
+
|
||||
+ /* TODO: Camera, Ethernet PHY, touchscreen, etc. */
|
||||
+};
|
||||
--- /dev/null
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
||||
@@ -0,0 +1,74 @@
|
||||
+/*
|
||||
+ * Copyright (c) 2016 ARM Ltd.
|
||||
+ *
|
||||
+ * This file is dual-licensed: you can use it either under the terms
|
||||
+ * of the GPL or the X11 license, at your option. Note that this dual
|
||||
+ * licensing only applies to this file, and not this project as a
|
||||
+ * whole.
|
||||
+ *
|
||||
+ * a) This library is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU General Public License as
|
||||
+ * published by the Free Software Foundation; either version 2 of the
|
||||
+ * License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This library is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * Or, alternatively,
|
||||
+ *
|
||||
+ * b) Permission is hereby granted, free of charge, to any person
|
||||
+ * obtaining a copy of this software and associated documentation
|
||||
+ * files (the "Software"), to deal in the Software without
|
||||
+ * restriction, including without limitation the rights to use,
|
||||
+ * copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
+ * sell copies of the Software, and to permit persons to whom the
|
||||
+ * Software is furnished to do so, subject to the following
|
||||
+ * conditions:
|
||||
+ *
|
||||
+ * The above copyright notice and this permission notice shall be
|
||||
+ * included in all copies or substantial portions of the Software.
|
||||
+ *
|
||||
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
+ * OTHER DEALINGS IN THE SOFTWARE.
|
||||
+ */
|
||||
+
|
||||
+/dts-v1/;
|
||||
+
|
||||
+#include "sun50i-a64.dtsi"
|
||||
+
|
||||
+/ {
|
||||
+ model = "Pine64";
|
||||
+ compatible = "pine64,pine64", "allwinner,sun50i-a64";
|
||||
+
|
||||
+ aliases {
|
||||
+ serial0 = &uart0;
|
||||
+ };
|
||||
+
|
||||
+ chosen {
|
||||
+ stdout-path = "serial0:115200n8";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&uart0 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&uart0_pins_a>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&i2c1 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&i2c1_pins>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&i2c1_pins {
|
||||
+ bias-pull-up;
|
||||
+};
|
||||
|
|
@ -1,134 +0,0 @@
|
|||
From f98121f3ef3d36f4d040b11ab38f15387f6eefa2 Mon Sep 17 00:00:00 2001
|
||||
From: Arnd Bergmann <arnd@arndb.de>
|
||||
Date: Wed, 30 Nov 2016 15:08:55 +0100
|
||||
Subject: arm64: dts: fix build errors from missing dependencies
|
||||
|
||||
Two branches were incorrectly sent without having the necessary
|
||||
header file changes. Rather than back those out now, I'm replacing
|
||||
the symbolic names for the clks and resets with the numeric
|
||||
values to get 'make allmodconfig dtbs' back to work.
|
||||
|
||||
After the header file changes are merged, we can revert this
|
||||
patch.
|
||||
|
||||
Fixes: 6bc37fa ("arm64: dts: add Allwinner A64 SoC .dtsi")
|
||||
Fixes: 50784e6 ("dts: arm64: db820c: add pmic pins specific dts file")
|
||||
Acked-by: Andre Przywara <andre.przywara@arm.com>
|
||||
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 36 ++++++++++------------
|
||||
.../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 2 +-
|
||||
2 files changed, 18 insertions(+), 20 deletions(-)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
@@ -42,10 +42,8 @@
|
||||
* OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
-#include <dt-bindings/clock/sun50i-a64-ccu.h>
|
||||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
#include <dt-bindings/pinctrl/sun4i-a10.h>
|
||||
-#include <dt-bindings/reset/sun50i-a64-ccu.h>
|
||||
|
||||
/ {
|
||||
interrupt-parent = <&gic>;
|
||||
@@ -137,7 +135,7 @@
|
||||
interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
|
||||
- clocks = <&ccu CLK_BUS_PIO>;
|
||||
+ clocks = <&ccu 58>;
|
||||
gpio-controller;
|
||||
#gpio-cells = <3>;
|
||||
interrupt-controller;
|
||||
@@ -160,8 +158,8 @@
|
||||
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
|
||||
reg-shift = <2>;
|
||||
reg-io-width = <4>;
|
||||
- clocks = <&ccu CLK_BUS_UART0>;
|
||||
- resets = <&ccu RST_BUS_UART0>;
|
||||
+ clocks = <&ccu 67>;
|
||||
+ resets = <&ccu 46>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -171,8 +169,8 @@
|
||||
interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
|
||||
reg-shift = <2>;
|
||||
reg-io-width = <4>;
|
||||
- clocks = <&ccu CLK_BUS_UART1>;
|
||||
- resets = <&ccu RST_BUS_UART1>;
|
||||
+ clocks = <&ccu 68>;
|
||||
+ resets = <&ccu 47>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -182,8 +180,8 @@
|
||||
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
|
||||
reg-shift = <2>;
|
||||
reg-io-width = <4>;
|
||||
- clocks = <&ccu CLK_BUS_UART2>;
|
||||
- resets = <&ccu RST_BUS_UART2>;
|
||||
+ clocks = <&ccu 69>;
|
||||
+ resets = <&ccu 48>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -193,8 +191,8 @@
|
||||
interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
|
||||
reg-shift = <2>;
|
||||
reg-io-width = <4>;
|
||||
- clocks = <&ccu CLK_BUS_UART3>;
|
||||
- resets = <&ccu RST_BUS_UART3>;
|
||||
+ clocks = <&ccu 70>;
|
||||
+ resets = <&ccu 49>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -204,8 +202,8 @@
|
||||
interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
|
||||
reg-shift = <2>;
|
||||
reg-io-width = <4>;
|
||||
- clocks = <&ccu CLK_BUS_UART4>;
|
||||
- resets = <&ccu RST_BUS_UART4>;
|
||||
+ clocks = <&ccu 71>;
|
||||
+ resets = <&ccu 50>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
@@ -213,8 +211,8 @@
|
||||
compatible = "allwinner,sun6i-a31-i2c";
|
||||
reg = <0x01c2ac00 0x400>;
|
||||
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
|
||||
- clocks = <&ccu CLK_BUS_I2C0>;
|
||||
- resets = <&ccu RST_BUS_I2C0>;
|
||||
+ clocks = <&ccu 63>;
|
||||
+ resets = <&ccu 42>;
|
||||
status = "disabled";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
@@ -224,8 +222,8 @@
|
||||
compatible = "allwinner,sun6i-a31-i2c";
|
||||
reg = <0x01c2b000 0x400>;
|
||||
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
|
||||
- clocks = <&ccu CLK_BUS_I2C1>;
|
||||
- resets = <&ccu RST_BUS_I2C1>;
|
||||
+ clocks = <&ccu 64>;
|
||||
+ resets = <&ccu 43>;
|
||||
status = "disabled";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
@@ -235,8 +233,8 @@
|
||||
compatible = "allwinner,sun6i-a31-i2c";
|
||||
reg = <0x01c2b400 0x400>;
|
||||
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
|
||||
- clocks = <&ccu CLK_BUS_I2C2>;
|
||||
- resets = <&ccu RST_BUS_I2C2>;
|
||||
+ clocks = <&ccu 65>;
|
||||
+ resets = <&ccu 44>;
|
||||
status = "disabled";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
|
@ -1,84 +0,0 @@
|
|||
From a004ee350177ece3c059831ea49293d62aea7ca6 Mon Sep 17 00:00:00 2001
|
||||
From: Icenowy Zheng <icenowy@aosc.xyz>
|
||||
Date: Tue, 22 Nov 2016 23:58:29 +0800
|
||||
Subject: arm64: dts: allwinner: add USB1-related nodes of Allwinner A64
|
||||
|
||||
Allwinner A64 have two HCI USB controllers, a OTG controller and a USB
|
||||
PHY device which have two ports. One of the port is wired to both a HCI
|
||||
USB controller and the OTG controller, which is currently not supported.
|
||||
The another one is only wired to a HCI controller, and the device node of
|
||||
OHCI/EHCI controller of the port can be added now.
|
||||
|
||||
Also the A64 USB PHY device node is also added for the HCI controllers to
|
||||
work.
|
||||
|
||||
Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 46 +++++++++++++++++++++++++++
|
||||
1 file changed, 46 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
@@ -42,8 +42,10 @@
|
||||
* OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
+#include <dt-bindings/clock/sun50i-a64-ccu.h>
|
||||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
#include <dt-bindings/pinctrl/sun4i-a10.h>
|
||||
+#include <dt-bindings/reset/sun50i-a64-ccu.h>
|
||||
|
||||
/ {
|
||||
interrupt-parent = <&gic>;
|
||||
@@ -120,6 +122,50 @@
|
||||
#size-cells = <1>;
|
||||
ranges;
|
||||
|
||||
+ usbphy: phy@01c19400 {
|
||||
+ compatible = "allwinner,sun50i-a64-usb-phy";
|
||||
+ reg = <0x01c19400 0x14>,
|
||||
+ <0x01c1b800 0x4>;
|
||||
+ reg-names = "phy_ctrl",
|
||||
+ "pmu1";
|
||||
+ clocks = <&ccu CLK_USB_PHY0>,
|
||||
+ <&ccu CLK_USB_PHY1>;
|
||||
+ clock-names = "usb0_phy",
|
||||
+ "usb1_phy";
|
||||
+ resets = <&ccu RST_USB_PHY0>,
|
||||
+ <&ccu RST_USB_PHY1>;
|
||||
+ reset-names = "usb0_reset",
|
||||
+ "usb1_reset";
|
||||
+ status = "disabled";
|
||||
+ #phy-cells = <1>;
|
||||
+ };
|
||||
+
|
||||
+ ehci1: usb@01c1b000 {
|
||||
+ compatible = "allwinner,sun50i-a64-ehci", "generic-ehci";
|
||||
+ reg = <0x01c1b000 0x100>;
|
||||
+ interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ clocks = <&ccu CLK_BUS_OHCI1>,
|
||||
+ <&ccu CLK_BUS_EHCI1>,
|
||||
+ <&ccu CLK_USB_OHCI1>;
|
||||
+ resets = <&ccu RST_BUS_OHCI1>,
|
||||
+ <&ccu RST_BUS_EHCI1>;
|
||||
+ phys = <&usbphy 1>;
|
||||
+ phy-names = "usb";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
+ ohci1: usb@01c1b400 {
|
||||
+ compatible = "allwinner,sun50i-a64-ohci", "generic-ohci";
|
||||
+ reg = <0x01c1b400 0x100>;
|
||||
+ interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ clocks = <&ccu CLK_BUS_OHCI1>,
|
||||
+ <&ccu CLK_USB_OHCI1>;
|
||||
+ resets = <&ccu RST_BUS_OHCI1>;
|
||||
+ phys = <&usbphy 1>;
|
||||
+ phy-names = "usb";
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
ccu: clock@01c20000 {
|
||||
compatible = "allwinner,sun50i-a64-ccu";
|
||||
reg = <0x01c20000 0x400>;
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
From ac93c09cdbaf1229c21f67a5db1c3c6df7d503e5 Mon Sep 17 00:00:00 2001
|
||||
From: Icenowy Zheng <icenowy@aosc.xyz>
|
||||
Date: Tue, 22 Nov 2016 23:58:30 +0800
|
||||
Subject: arm64: dts: allwinner: sort the nodes in sun50i-a64-pine64.dts
|
||||
|
||||
In this dts file, uart0 node is put before i2c1.
|
||||
|
||||
Move the uart0 node to the end to satisfy alphebetical order.
|
||||
|
||||
Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
||||
@@ -57,12 +57,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
-&uart0 {
|
||||
- pinctrl-names = "default";
|
||||
- pinctrl-0 = <&uart0_pins_a>;
|
||||
- status = "okay";
|
||||
-};
|
||||
-
|
||||
&i2c1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&i2c1_pins>;
|
||||
@@ -72,3 +66,9 @@
|
||||
&i2c1_pins {
|
||||
bias-pull-up;
|
||||
};
|
||||
+
|
||||
+&uart0 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&uart0_pins_a>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
From d49f9dbc8f0c4521fa56477d051a3bd1158f2595 Mon Sep 17 00:00:00 2001
|
||||
From: Icenowy Zheng <icenowy@aosc.xyz>
|
||||
Date: Tue, 22 Nov 2016 23:58:31 +0800
|
||||
Subject: arm64: dts: allwinner: enable EHCI1, OHCI1 and USB PHY nodes in
|
||||
Pine64
|
||||
|
||||
Pine64 have two USB Type-A ports, which are wired to the two ports of
|
||||
A64 USB PHY, and the lower port is the EHCI/OHCI1 port.
|
||||
|
||||
Enable the necessary nodes to enable the lower USB port to work.
|
||||
|
||||
Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
||||
@@ -57,6 +57,10 @@
|
||||
};
|
||||
};
|
||||
|
||||
+&ehci1 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&i2c1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&i2c1_pins>;
|
||||
@@ -67,8 +71,16 @@
|
||||
bias-pull-up;
|
||||
};
|
||||
|
||||
+&ohci1 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&uart0_pins_a>;
|
||||
status = "okay";
|
||||
};
|
||||
+
|
||||
+&usbphy {
|
||||
+ status = "okay";
|
||||
+};
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
From 972a3ecdf27f3ebdd1ce0dccd1b548ef3c04b8ed Mon Sep 17 00:00:00 2001
|
||||
From: Icenowy Zheng <icenowy@aosc.xyz>
|
||||
Date: Wed, 23 Nov 2016 00:59:01 +0800
|
||||
Subject: arm64: dts: add MUSB node to Allwinner A64 dtsi
|
||||
|
||||
Allwinner A64 SoC has a MUSB controller like the one in A33, so add
|
||||
a node for it, just use the compatible of A33 MUSB.
|
||||
|
||||
Host mode is tested to work properly on Pine64 and will be added into
|
||||
the device tree of Pine64 in next patch.
|
||||
|
||||
Peripheral mode is also tested on Pine64, by changing dr_mode property
|
||||
of usb_otg node and use a non-standard USB Type-A to Type-A cable.
|
||||
|
||||
Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
@@ -122,6 +122,19 @@
|
||||
#size-cells = <1>;
|
||||
ranges;
|
||||
|
||||
+ usb_otg: usb@01c19000 {
|
||||
+ compatible = "allwinner,sun8i-a33-musb";
|
||||
+ reg = <0x01c19000 0x0400>;
|
||||
+ clocks = <&ccu CLK_BUS_OTG>;
|
||||
+ resets = <&ccu RST_BUS_OTG>;
|
||||
+ interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ interrupt-names = "mc";
|
||||
+ phys = <&usbphy 0>;
|
||||
+ phy-names = "usb";
|
||||
+ extcon = <&usbphy 0>;
|
||||
+ status = "disabled";
|
||||
+ };
|
||||
+
|
||||
usbphy: phy@01c19400 {
|
||||
compatible = "allwinner,sun50i-a64-usb-phy";
|
||||
reg = <0x01c19400 0x14>,
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From f57e8384c5d2417fd8707c577d8e622fc1570b6c Mon Sep 17 00:00:00 2001
|
||||
From: Icenowy Zheng <icenowy@aosc.xyz>
|
||||
Date: Wed, 23 Nov 2016 00:59:02 +0800
|
||||
Subject: arm64: dts: enable the MUSB controller of Pine64 in host-only mode
|
||||
|
||||
A64 has a MUSB controller wired to the USB PHY 0, which is connected
|
||||
to the upper USB Type-A port of Pine64.
|
||||
|
||||
As the port is a Type-A female port, enable it in host-only mode in the
|
||||
device tree, which makes devices with USB Type-A male port can work on
|
||||
this port (which is originally designed by Pine64 team).
|
||||
|
||||
Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
||||
@@ -81,6 +81,11 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&usb_otg {
|
||||
+ dr_mode = "host";
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&usbphy {
|
||||
status = "okay";
|
||||
};
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From 4f9758302ccaf753cd4ba6a5eb740392a4d24773 Mon Sep 17 00:00:00 2001
|
||||
From: Chen-Yu Tsai <wens@csie.org>
|
||||
Date: Tue, 24 Jan 2017 10:32:29 +0800
|
||||
Subject: arm64: dts: allwinner: Remove no longer used pinctrl/sun4i-a10.h
|
||||
header
|
||||
|
||||
All dts files for the sunxi platform have been switched to the generic
|
||||
pinconf bindings. As a result, the sunxi specific pinctrl macros are
|
||||
no longer used.
|
||||
|
||||
Remove the #include entry with the following command:
|
||||
|
||||
sed -i -e '/pinctrl\/sun4i-a10.h/D' \
|
||||
arch/arm64/boot/dts/allwinner/*.dts?
|
||||
|
||||
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
@@ -44,7 +44,6 @@
|
||||
|
||||
#include <dt-bindings/clock/sun50i-a64-ccu.h>
|
||||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
-#include <dt-bindings/pinctrl/sun4i-a10.h>
|
||||
#include <dt-bindings/reset/sun50i-a64-ccu.h>
|
||||
|
||||
/ {
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
From f3dff3478a8a7b09f9a92023955a151584658893 Mon Sep 17 00:00:00 2001
|
||||
From: Andre Przywara <andre.przywara@arm.com>
|
||||
Date: Thu, 6 Oct 2016 02:25:22 +0100
|
||||
Subject: arm64: allwinner: a64: Add MMC nodes
|
||||
|
||||
The A64 has 3 MMC controllers, one of them being especially targeted to
|
||||
eMMC. Among other things, it has a data strobe signal and a 8 bits data
|
||||
width.
|
||||
|
||||
The two other are more usual controllers that will have a 4 bits width at
|
||||
most and no data strobe signal, which limits it to more usual SD or MMC
|
||||
peripherals.
|
||||
|
||||
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Tested-by: Florian Vaussard <florian.vaussard@heig-vd.ch>
|
||||
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 39 +++++++++++++++++++++++++++
|
||||
1 file changed, 39 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
@@ -121,6 +121,45 @@
|
||||
#size-cells = <1>;
|
||||
ranges;
|
||||
|
||||
+ mmc0: mmc@1c0f000 {
|
||||
+ compatible = "allwinner,sun50i-a64-mmc";
|
||||
+ reg = <0x01c0f000 0x1000>;
|
||||
+ clocks = <&ccu CLK_BUS_MMC0>, <&ccu CLK_MMC0>;
|
||||
+ clock-names = "ahb", "mmc";
|
||||
+ resets = <&ccu RST_BUS_MMC0>;
|
||||
+ reset-names = "ahb";
|
||||
+ interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ status = "disabled";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ };
|
||||
+
|
||||
+ mmc1: mmc@1c10000 {
|
||||
+ compatible = "allwinner,sun50i-a64-mmc";
|
||||
+ reg = <0x01c10000 0x1000>;
|
||||
+ clocks = <&ccu CLK_BUS_MMC1>, <&ccu CLK_MMC1>;
|
||||
+ clock-names = "ahb", "mmc";
|
||||
+ resets = <&ccu RST_BUS_MMC1>;
|
||||
+ reset-names = "ahb";
|
||||
+ interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ status = "disabled";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ };
|
||||
+
|
||||
+ mmc2: mmc@1c11000 {
|
||||
+ compatible = "allwinner,sun50i-a64-emmc";
|
||||
+ reg = <0x01c11000 0x1000>;
|
||||
+ clocks = <&ccu CLK_BUS_MMC2>, <&ccu CLK_MMC2>;
|
||||
+ clock-names = "ahb", "mmc";
|
||||
+ resets = <&ccu RST_BUS_MMC2>;
|
||||
+ reset-names = "ahb";
|
||||
+ interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ status = "disabled";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ };
|
||||
+
|
||||
usb_otg: usb@01c19000 {
|
||||
compatible = "allwinner,sun8i-a33-musb";
|
||||
reg = <0x01c19000 0x0400>;
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
From a3e8f4926248b3c12933aacec4432e9b6de004bb Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Date: Mon, 9 Jan 2017 16:39:15 +0100
|
||||
Subject: arm64: allwinner: a64: Add MMC pinctrl nodes
|
||||
|
||||
The A64 only has a single set of pins for each MMC controller. Since we
|
||||
already have boards that require all of them, let's add them to the DTSI.
|
||||
|
||||
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Tested-by: Florian Vaussard <florian.vaussard@heig-vd.ch>
|
||||
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 25 +++++++++++++++++++++++++
|
||||
1 file changed, 25 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
@@ -243,6 +243,31 @@
|
||||
function = "i2c1";
|
||||
};
|
||||
|
||||
+ mmc0_pins: mmc0-pins {
|
||||
+ pins = "PF0", "PF1", "PF2", "PF3",
|
||||
+ "PF4", "PF5";
|
||||
+ function = "mmc0";
|
||||
+ drive-strength = <30>;
|
||||
+ bias-pull-up;
|
||||
+ };
|
||||
+
|
||||
+ mmc1_pins: mmc1-pins {
|
||||
+ pins = "PG0", "PG1", "PG2", "PG3",
|
||||
+ "PG4", "PG5";
|
||||
+ function = "mmc1";
|
||||
+ drive-strength = <30>;
|
||||
+ bias-pull-up;
|
||||
+ };
|
||||
+
|
||||
+ mmc2_pins: mmc2-pins {
|
||||
+ pins = "PC1", "PC5", "PC6", "PC8", "PC9",
|
||||
+ "PC10","PC11", "PC12", "PC13",
|
||||
+ "PC14", "PC15", "PC16";
|
||||
+ function = "mmc2";
|
||||
+ drive-strength = <30>;
|
||||
+ bias-pull-up;
|
||||
+ };
|
||||
+
|
||||
uart0_pins_a: uart0@0 {
|
||||
pins = "PB8", "PB9";
|
||||
function = "uart0";
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
From ebe3ae29c6314217edf40d9ee23c36d610ff0fb8 Mon Sep 17 00:00:00 2001
|
||||
From: Andre Przywara <andre.przywara@arm.com>
|
||||
Date: Tue, 10 Jan 2017 01:22:31 +0000
|
||||
Subject: arm64: allwinner: pine64: add MMC support
|
||||
|
||||
All Pine64 boards connect an micro-SD card slot to the first MMC
|
||||
controller.
|
||||
Enable the respective DT node and specify the (always-on) regulator
|
||||
and card-detect pin.
|
||||
As a micro-SD slot does not feature a write-protect switch, we disable
|
||||
this feature.
|
||||
|
||||
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 20 ++++++++++++++++++++
|
||||
1 file changed, 20 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
||||
@@ -44,6 +44,8 @@
|
||||
|
||||
#include "sun50i-a64.dtsi"
|
||||
|
||||
+#include <dt-bindings/gpio/gpio.h>
|
||||
+
|
||||
/ {
|
||||
model = "Pine64";
|
||||
compatible = "pine64,pine64", "allwinner,sun50i-a64";
|
||||
@@ -55,6 +57,13 @@
|
||||
chosen {
|
||||
stdout-path = "serial0:115200n8";
|
||||
};
|
||||
+
|
||||
+ reg_vcc3v3: vcc3v3 {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "vcc3v3";
|
||||
+ regulator-min-microvolt = <3300000>;
|
||||
+ regulator-max-microvolt = <3300000>;
|
||||
+ };
|
||||
};
|
||||
|
||||
&ehci1 {
|
||||
@@ -71,6 +80,17 @@
|
||||
bias-pull-up;
|
||||
};
|
||||
|
||||
+&mmc0 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&mmc0_pins>;
|
||||
+ vmmc-supply = <®_vcc3v3>;
|
||||
+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
|
||||
+ cd-inverted;
|
||||
+ disable-wp;
|
||||
+ bus-width = <4>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&ohci1 {
|
||||
status = "okay";
|
||||
};
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From e7ba733d32cc9487b62b07219ad911c77764a681 Mon Sep 17 00:00:00 2001
|
||||
From: Andre Przywara <andre.przywara@arm.com>
|
||||
Date: Tue, 10 Jan 2017 01:22:32 +0000
|
||||
Subject: arm64: allwinner: a64: add UART1 pin nodes
|
||||
|
||||
On many boards UART1 connects to a Bluetooth chip, so add the pinctrl
|
||||
nodes for the only pins providing access to that UART. That includes
|
||||
those pins for hardware flow control (RTS/CTS).
|
||||
|
||||
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
@@ -272,6 +272,16 @@
|
||||
pins = "PB8", "PB9";
|
||||
function = "uart0";
|
||||
};
|
||||
+
|
||||
+ uart1_pins: uart1_pins {
|
||||
+ pins = "PG6", "PG7";
|
||||
+ function = "uart1";
|
||||
+ };
|
||||
+
|
||||
+ uart1_rts_cts_pins: uart1_rts_cts_pins {
|
||||
+ pins = "PG8", "PG9";
|
||||
+ function = "uart1";
|
||||
+ };
|
||||
};
|
||||
|
||||
uart0: serial@1c28000 {
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
From 791a9e001d3ba3b552888b0bf3c592a50b71f57e Mon Sep 17 00:00:00 2001
|
||||
From: Icenowy Zheng <icenowy@aosc.xyz>
|
||||
Date: Tue, 4 Apr 2017 17:50:58 +0800
|
||||
Subject: arm64: allwinner: a64: add r_ccu node
|
||||
|
||||
A64 SoC have a CCU (r_ccu) in PRCM block.
|
||||
|
||||
Add the device node for it.
|
||||
|
||||
The mux 3 of R_CCU is an internal oscillator, which is 16MHz according
|
||||
to the user manual, and has only 30% accuracy based on our experience
|
||||
on older SoCs. The real mesaured value of it on two Pine64 boards is
|
||||
around 11MHz, which is around 70% of 16MHz.
|
||||
|
||||
Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 17 +++++++++++++++++
|
||||
1 file changed, 17 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
@@ -98,6 +98,14 @@
|
||||
clock-output-names = "osc32k";
|
||||
};
|
||||
|
||||
+ iosc: internal-osc-clk {
|
||||
+ #clock-cells = <0>;
|
||||
+ compatible = "fixed-clock";
|
||||
+ clock-frequency = <16000000>;
|
||||
+ clock-accuracy = <300000000>;
|
||||
+ clock-output-names = "iosc";
|
||||
+ };
|
||||
+
|
||||
psci {
|
||||
compatible = "arm,psci-0.2";
|
||||
method = "smc";
|
||||
@@ -389,5 +397,14 @@
|
||||
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
|
||||
};
|
||||
+
|
||||
+ r_ccu: clock@1f01400 {
|
||||
+ compatible = "allwinner,sun50i-a64-r-ccu";
|
||||
+ reg = <0x01f01400 0x100>;
|
||||
+ clocks = <&osc24M>, <&osc32k>, <&iosc>;
|
||||
+ clock-names = "hosc", "losc", "iosc";
|
||||
+ #clock-cells = <1>;
|
||||
+ #reset-cells = <1>;
|
||||
+ };
|
||||
};
|
||||
};
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From ec4279053a6434f685246e022be95d2a62f8c608 Mon Sep 17 00:00:00 2001
|
||||
From: Icenowy Zheng <icenowy@aosc.xyz>
|
||||
Date: Tue, 4 Apr 2017 17:51:00 +0800
|
||||
Subject: arm64: allwinner: a64: add R_PIO pinctrl node
|
||||
|
||||
Allwinner A64 have a dedicated pin controller to manage the PL pin bank.
|
||||
As the driver and the required clock support are added, add the device
|
||||
node for it.
|
||||
|
||||
Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
@@ -406,5 +406,17 @@
|
||||
#clock-cells = <1>;
|
||||
#reset-cells = <1>;
|
||||
};
|
||||
+
|
||||
+ r_pio: pinctrl@01f02c00 {
|
||||
+ compatible = "allwinner,sun50i-a64-r-pinctrl";
|
||||
+ reg = <0x01f02c00 0x400>;
|
||||
+ interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ clocks = <&r_ccu 3>, <&osc24M>, <&osc32k>;
|
||||
+ clock-names = "apb", "hosc", "losc";
|
||||
+ gpio-controller;
|
||||
+ #gpio-cells = <3>;
|
||||
+ interrupt-controller;
|
||||
+ #interrupt-cells = <3>;
|
||||
+ };
|
||||
};
|
||||
};
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From 0d98479738b950e30bb4f782d60099d44076ad67 Mon Sep 17 00:00:00 2001
|
||||
From: Icenowy Zheng <icenowy@aosc.io>
|
||||
Date: Wed, 5 Apr 2017 22:30:34 +0800
|
||||
Subject: arm64: allwinner: a64: add pmu0 regs for USB PHY
|
||||
|
||||
The USB PHY in A64 has a "pmu0" region, which controls the EHCI/OHCI
|
||||
controller pair that can be connected to the PHY0.
|
||||
|
||||
Add the MMIO region for PHY node.
|
||||
|
||||
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
@@ -184,8 +184,10 @@
|
||||
usbphy: phy@01c19400 {
|
||||
compatible = "allwinner,sun50i-a64-usb-phy";
|
||||
reg = <0x01c19400 0x14>,
|
||||
+ <0x01c1a800 0x4>,
|
||||
<0x01c1b800 0x4>;
|
||||
reg-names = "phy_ctrl",
|
||||
+ "pmu0",
|
||||
"pmu1";
|
||||
clocks = <&ccu CLK_USB_PHY0>,
|
||||
<&ccu CLK_USB_PHY1>;
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From f74994a94063bc85ac1d6ad677ed06b5279c101f Mon Sep 17 00:00:00 2001
|
||||
From: Chen-Yu Tsai <wens@csie.org>
|
||||
Date: Wed, 31 May 2017 15:58:24 +0800
|
||||
Subject: arm64: allwinner: a64: Add PLL_PERIPH0 clock to the R_CCU
|
||||
|
||||
The AR100 clock within the R_CCU (PRCM) has the PLL_PERIPH0 as one of
|
||||
its parents.
|
||||
|
||||
This adds the reference in the device tree describing this relationship.
|
||||
This patch uses a raw number for the clock index to ease merging by
|
||||
avoiding cross tree dependencies.
|
||||
|
||||
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
@@ -403,8 +403,9 @@
|
||||
r_ccu: clock@1f01400 {
|
||||
compatible = "allwinner,sun50i-a64-r-ccu";
|
||||
reg = <0x01f01400 0x100>;
|
||||
- clocks = <&osc24M>, <&osc32k>, <&iosc>;
|
||||
- clock-names = "hosc", "losc", "iosc";
|
||||
+ clocks = <&osc24M>, <&osc32k>, <&iosc>,
|
||||
+ <&ccu 11>;
|
||||
+ clock-names = "hosc", "losc", "iosc", "pll-periph";
|
||||
#clock-cells = <1>;
|
||||
#reset-cells = <1>;
|
||||
};
|
||||
|
|
@ -1,251 +0,0 @@
|
|||
From f233dbca6227703eaae2f67d6d9c79819773f16b Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Date: Tue, 11 Oct 2016 17:45:59 +0200
|
||||
Subject: pinctrl: sunxi: Rework the pin config building code
|
||||
|
||||
In order to support more easily the generic pinctrl properties, rework the
|
||||
pinctrl maps configuration and split it into several sub-functions.
|
||||
|
||||
One of the side-effects from that rework is that we only parse the pin
|
||||
configuration once, since it's going to be common to every pin, instead of
|
||||
having to parsing once for each pin.
|
||||
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 178 +++++++++++++++++++++++++---------
|
||||
1 file changed, 130 insertions(+), 48 deletions(-)
|
||||
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
@@ -145,6 +145,110 @@ static int sunxi_pctrl_get_group_pins(st
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static bool sunxi_pctrl_has_bias_prop(struct device_node *node)
|
||||
+{
|
||||
+ return of_find_property(node, "allwinner,pull", NULL);
|
||||
+}
|
||||
+
|
||||
+static bool sunxi_pctrl_has_drive_prop(struct device_node *node)
|
||||
+{
|
||||
+ return of_find_property(node, "allwinner,drive", NULL);
|
||||
+}
|
||||
+
|
||||
+static int sunxi_pctrl_parse_bias_prop(struct device_node *node)
|
||||
+{
|
||||
+ u32 val;
|
||||
+
|
||||
+ if (of_property_read_u32(node, "allwinner,pull", &val))
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ switch (val) {
|
||||
+ case 1:
|
||||
+ return PIN_CONFIG_BIAS_PULL_UP;
|
||||
+ case 2:
|
||||
+ return PIN_CONFIG_BIAS_PULL_DOWN;
|
||||
+ }
|
||||
+
|
||||
+ return -EINVAL;
|
||||
+}
|
||||
+
|
||||
+static int sunxi_pctrl_parse_drive_prop(struct device_node *node)
|
||||
+{
|
||||
+ u32 val;
|
||||
+
|
||||
+ if (of_property_read_u32(node, "allwinner,drive", &val))
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ return (val + 1) * 10;
|
||||
+}
|
||||
+
|
||||
+static const char *sunxi_pctrl_parse_function_prop(struct device_node *node)
|
||||
+{
|
||||
+ const char *function;
|
||||
+ int ret;
|
||||
+
|
||||
+ ret = of_property_read_string(node, "allwinner,function", &function);
|
||||
+ if (!ret)
|
||||
+ return function;
|
||||
+
|
||||
+ return NULL;
|
||||
+}
|
||||
+
|
||||
+static const char *sunxi_pctrl_find_pins_prop(struct device_node *node,
|
||||
+ int *npins)
|
||||
+{
|
||||
+ int count;
|
||||
+
|
||||
+ count = of_property_count_strings(node, "allwinner,pins");
|
||||
+ if (count > 0) {
|
||||
+ *npins = count;
|
||||
+ return "allwinner,pins";
|
||||
+ }
|
||||
+
|
||||
+ return NULL;
|
||||
+}
|
||||
+
|
||||
+static unsigned long *sunxi_pctrl_build_pin_config(struct device_node *node,
|
||||
+ unsigned int *len)
|
||||
+{
|
||||
+ unsigned long *pinconfig;
|
||||
+ unsigned int configlen = 0, idx = 0;
|
||||
+
|
||||
+ if (sunxi_pctrl_has_drive_prop(node))
|
||||
+ configlen++;
|
||||
+ if (sunxi_pctrl_has_bias_prop(node))
|
||||
+ configlen++;
|
||||
+
|
||||
+ pinconfig = kzalloc(configlen * sizeof(*pinconfig), GFP_KERNEL);
|
||||
+ if (!pinconfig)
|
||||
+ return NULL;
|
||||
+
|
||||
+ if (sunxi_pctrl_has_drive_prop(node)) {
|
||||
+ int drive = sunxi_pctrl_parse_drive_prop(node);
|
||||
+ if (drive < 0)
|
||||
+ goto err_free;
|
||||
+
|
||||
+ pinconfig[idx++] = pinconf_to_config_packed(PIN_CONFIG_DRIVE_STRENGTH,
|
||||
+ drive);
|
||||
+ }
|
||||
+
|
||||
+ if (sunxi_pctrl_has_bias_prop(node)) {
|
||||
+ int pull = sunxi_pctrl_parse_bias_prop(node);
|
||||
+ if (pull < 0)
|
||||
+ goto err_free;
|
||||
+
|
||||
+ pinconfig[idx++] = pinconf_to_config_packed(pull, 0);
|
||||
+ }
|
||||
+
|
||||
+
|
||||
+ *len = configlen;
|
||||
+ return pinconfig;
|
||||
+
|
||||
+err_free:
|
||||
+ kfree(pinconfig);
|
||||
+ return NULL;
|
||||
+}
|
||||
+
|
||||
static int sunxi_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
|
||||
struct device_node *node,
|
||||
struct pinctrl_map **map,
|
||||
@@ -153,38 +257,45 @@ static int sunxi_pctrl_dt_node_to_map(st
|
||||
struct sunxi_pinctrl *pctl = pinctrl_dev_get_drvdata(pctldev);
|
||||
unsigned long *pinconfig;
|
||||
struct property *prop;
|
||||
- const char *function;
|
||||
+ const char *function, *pin_prop;
|
||||
const char *group;
|
||||
- int ret, nmaps, i = 0;
|
||||
- u32 val;
|
||||
+ int ret, npins, nmaps, configlen = 0, i = 0;
|
||||
|
||||
*map = NULL;
|
||||
*num_maps = 0;
|
||||
|
||||
- ret = of_property_read_string(node, "allwinner,function", &function);
|
||||
- if (ret) {
|
||||
- dev_err(pctl->dev,
|
||||
- "missing allwinner,function property in node %s\n",
|
||||
+ function = sunxi_pctrl_parse_function_prop(node);
|
||||
+ if (!function) {
|
||||
+ dev_err(pctl->dev, "missing function property in node %s\n",
|
||||
node->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
- nmaps = of_property_count_strings(node, "allwinner,pins") * 2;
|
||||
- if (nmaps < 0) {
|
||||
- dev_err(pctl->dev,
|
||||
- "missing allwinner,pins property in node %s\n",
|
||||
+ pin_prop = sunxi_pctrl_find_pins_prop(node, &npins);
|
||||
+ if (!pin_prop) {
|
||||
+ dev_err(pctl->dev, "missing pins property in node %s\n",
|
||||
node->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
+ /*
|
||||
+ * We have two maps for each pin: one for the function, one
|
||||
+ * for the configuration (bias, strength, etc)
|
||||
+ */
|
||||
+ nmaps = npins * 2;
|
||||
*map = kmalloc(nmaps * sizeof(struct pinctrl_map), GFP_KERNEL);
|
||||
if (!*map)
|
||||
return -ENOMEM;
|
||||
|
||||
- of_property_for_each_string(node, "allwinner,pins", prop, group) {
|
||||
+ pinconfig = sunxi_pctrl_build_pin_config(node, &configlen);
|
||||
+ if (!pinconfig) {
|
||||
+ ret = -EINVAL;
|
||||
+ goto err_free_map;
|
||||
+ }
|
||||
+
|
||||
+ of_property_for_each_string(node, pin_prop, prop, group) {
|
||||
struct sunxi_pinctrl_group *grp =
|
||||
sunxi_pinctrl_find_group_by_name(pctl, group);
|
||||
- int j = 0, configlen = 0;
|
||||
|
||||
if (!grp) {
|
||||
dev_err(pctl->dev, "unknown pin %s", group);
|
||||
@@ -207,34 +318,6 @@ static int sunxi_pctrl_dt_node_to_map(st
|
||||
|
||||
(*map)[i].type = PIN_MAP_TYPE_CONFIGS_GROUP;
|
||||
(*map)[i].data.configs.group_or_pin = group;
|
||||
-
|
||||
- if (of_find_property(node, "allwinner,drive", NULL))
|
||||
- configlen++;
|
||||
- if (of_find_property(node, "allwinner,pull", NULL))
|
||||
- configlen++;
|
||||
-
|
||||
- pinconfig = kzalloc(configlen * sizeof(*pinconfig), GFP_KERNEL);
|
||||
- if (!pinconfig) {
|
||||
- kfree(*map);
|
||||
- return -ENOMEM;
|
||||
- }
|
||||
-
|
||||
- if (!of_property_read_u32(node, "allwinner,drive", &val)) {
|
||||
- u16 strength = (val + 1) * 10;
|
||||
- pinconfig[j++] =
|
||||
- pinconf_to_config_packed(PIN_CONFIG_DRIVE_STRENGTH,
|
||||
- strength);
|
||||
- }
|
||||
-
|
||||
- if (!of_property_read_u32(node, "allwinner,pull", &val)) {
|
||||
- enum pin_config_param pull = PIN_CONFIG_END;
|
||||
- if (val == 1)
|
||||
- pull = PIN_CONFIG_BIAS_PULL_UP;
|
||||
- else if (val == 2)
|
||||
- pull = PIN_CONFIG_BIAS_PULL_DOWN;
|
||||
- pinconfig[j++] = pinconf_to_config_packed(pull, 0);
|
||||
- }
|
||||
-
|
||||
(*map)[i].data.configs.configs = pinconfig;
|
||||
(*map)[i].data.configs.num_configs = configlen;
|
||||
|
||||
@@ -244,19 +327,18 @@ static int sunxi_pctrl_dt_node_to_map(st
|
||||
*num_maps = nmaps;
|
||||
|
||||
return 0;
|
||||
+
|
||||
+err_free_map:
|
||||
+ kfree(map);
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
static void sunxi_pctrl_dt_free_map(struct pinctrl_dev *pctldev,
|
||||
struct pinctrl_map *map,
|
||||
unsigned num_maps)
|
||||
{
|
||||
- int i;
|
||||
-
|
||||
- for (i = 0; i < num_maps; i++) {
|
||||
- if (map[i].type == PIN_MAP_TYPE_CONFIGS_GROUP)
|
||||
- kfree(map[i].data.configs.configs);
|
||||
- }
|
||||
-
|
||||
+ /* All the maps have the same pin config, free only the first one */
|
||||
+ kfree(map[0].data.configs.configs);
|
||||
kfree(map);
|
||||
}
|
||||
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
From 42676fa4aa87eda4fc762df495d4bde2ddc4bfce Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Date: Tue, 11 Oct 2016 17:46:00 +0200
|
||||
Subject: pinctrl: sunxi: Use macros from bindings header file for DT parsing
|
||||
|
||||
Since we have some bindings header for our hardcoded flags, let's use them
|
||||
when we can.
|
||||
|
||||
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
@@ -28,6 +28,8 @@
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
+#include <dt-bindings/pinctrl/sun4i-a10.h>
|
||||
+
|
||||
#include "../core.h"
|
||||
#include "pinctrl-sunxi.h"
|
||||
|
||||
@@ -163,9 +165,9 @@ static int sunxi_pctrl_parse_bias_prop(s
|
||||
return -EINVAL;
|
||||
|
||||
switch (val) {
|
||||
- case 1:
|
||||
+ case SUN4I_PINCTRL_PULL_UP:
|
||||
return PIN_CONFIG_BIAS_PULL_UP;
|
||||
- case 2:
|
||||
+ case SUN4I_PINCTRL_PULL_DOWN:
|
||||
return PIN_CONFIG_BIAS_PULL_DOWN;
|
||||
}
|
||||
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
From 07fe64ba213f36ca8f6ffd8c4d5893f022744fdb Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Date: Tue, 11 Oct 2016 17:46:01 +0200
|
||||
Subject: pinctrl: sunxi: Handle bias disable
|
||||
|
||||
So far, putting NO_PULL in allwinner,pull was ignored, behaving like if
|
||||
that property was not there at all.
|
||||
|
||||
Obviously, this is not the right thing to do, and in that case, we really
|
||||
need to just disable the bias.
|
||||
|
||||
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
@@ -165,6 +165,8 @@ static int sunxi_pctrl_parse_bias_prop(s
|
||||
return -EINVAL;
|
||||
|
||||
switch (val) {
|
||||
+ case SUN4I_PINCTRL_NO_PULL:
|
||||
+ return PIN_CONFIG_BIAS_DISABLE;
|
||||
case SUN4I_PINCTRL_PULL_UP:
|
||||
return PIN_CONFIG_BIAS_PULL_UP;
|
||||
case SUN4I_PINCTRL_PULL_DOWN:
|
||||
@@ -401,6 +403,12 @@ static int sunxi_pconf_group_set(struct
|
||||
| dlevel << sunxi_dlevel_offset(pin),
|
||||
pctl->membase + sunxi_dlevel_reg(pin));
|
||||
break;
|
||||
+ case PIN_CONFIG_BIAS_DISABLE:
|
||||
+ val = readl(pctl->membase + sunxi_pull_reg(pin));
|
||||
+ mask = PULL_PINS_MASK << sunxi_pull_offset(pin);
|
||||
+ writel((val & ~mask),
|
||||
+ pctl->membase + sunxi_pull_reg(pin));
|
||||
+ break;
|
||||
case PIN_CONFIG_BIAS_PULL_UP:
|
||||
val = readl(pctl->membase + sunxi_pull_reg(pin));
|
||||
mask = PULL_PINS_MASK << sunxi_pull_offset(pin);
|
||||
|
|
@ -1,106 +0,0 @@
|
|||
From cefbf1a1b29531a970bc2908a50a75d6474fcc38 Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Date: Thu, 20 Oct 2016 15:49:03 +0200
|
||||
Subject: pinctrl: sunxi: Support generic binding
|
||||
|
||||
Our bindings are mostly irrelevant now that we have generic pinctrl
|
||||
bindings that cover exactly the same uses cases.
|
||||
|
||||
Add support for the new ones, and obviously keep our old binding support in
|
||||
order to keep the ABI stable.
|
||||
|
||||
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 48 +++++++++++++++++++++++++++++++++--
|
||||
1 file changed, 46 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
@@ -149,18 +149,33 @@ static int sunxi_pctrl_get_group_pins(st
|
||||
|
||||
static bool sunxi_pctrl_has_bias_prop(struct device_node *node)
|
||||
{
|
||||
- return of_find_property(node, "allwinner,pull", NULL);
|
||||
+ return of_find_property(node, "bias-pull-up", NULL) ||
|
||||
+ of_find_property(node, "bias-pull-down", NULL) ||
|
||||
+ of_find_property(node, "bias-disable", NULL) ||
|
||||
+ of_find_property(node, "allwinner,pull", NULL);
|
||||
}
|
||||
|
||||
static bool sunxi_pctrl_has_drive_prop(struct device_node *node)
|
||||
{
|
||||
- return of_find_property(node, "allwinner,drive", NULL);
|
||||
+ return of_find_property(node, "drive-strength", NULL) ||
|
||||
+ of_find_property(node, "allwinner,drive", NULL);
|
||||
}
|
||||
|
||||
static int sunxi_pctrl_parse_bias_prop(struct device_node *node)
|
||||
{
|
||||
u32 val;
|
||||
|
||||
+ /* Try the new style binding */
|
||||
+ if (of_find_property(node, "bias-pull-up", NULL))
|
||||
+ return PIN_CONFIG_BIAS_PULL_UP;
|
||||
+
|
||||
+ if (of_find_property(node, "bias-pull-down", NULL))
|
||||
+ return PIN_CONFIG_BIAS_PULL_DOWN;
|
||||
+
|
||||
+ if (of_find_property(node, "bias-disable", NULL))
|
||||
+ return PIN_CONFIG_BIAS_DISABLE;
|
||||
+
|
||||
+ /* And fall back to the old binding */
|
||||
if (of_property_read_u32(node, "allwinner,pull", &val))
|
||||
return -EINVAL;
|
||||
|
||||
@@ -180,6 +195,21 @@ static int sunxi_pctrl_parse_drive_prop(
|
||||
{
|
||||
u32 val;
|
||||
|
||||
+ /* Try the new style binding */
|
||||
+ if (!of_property_read_u32(node, "drive-strength", &val)) {
|
||||
+ /* We can't go below 10mA ... */
|
||||
+ if (val < 10)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ /* ... and only up to 40 mA ... */
|
||||
+ if (val > 40)
|
||||
+ val = 40;
|
||||
+
|
||||
+ /* by steps of 10 mA */
|
||||
+ return rounddown(val, 10);
|
||||
+ }
|
||||
+
|
||||
+ /* And then fall back to the old binding */
|
||||
if (of_property_read_u32(node, "allwinner,drive", &val))
|
||||
return -EINVAL;
|
||||
|
||||
@@ -191,6 +221,12 @@ static const char *sunxi_pctrl_parse_fun
|
||||
const char *function;
|
||||
int ret;
|
||||
|
||||
+ /* Try the generic binding */
|
||||
+ ret = of_property_read_string(node, "function", &function);
|
||||
+ if (!ret)
|
||||
+ return function;
|
||||
+
|
||||
+ /* And fall back to our legacy one */
|
||||
ret = of_property_read_string(node, "allwinner,function", &function);
|
||||
if (!ret)
|
||||
return function;
|
||||
@@ -203,6 +239,14 @@ static const char *sunxi_pctrl_find_pins
|
||||
{
|
||||
int count;
|
||||
|
||||
+ /* Try the generic binding */
|
||||
+ count = of_property_count_strings(node, "pins");
|
||||
+ if (count > 0) {
|
||||
+ *npins = count;
|
||||
+ return "pins";
|
||||
+ }
|
||||
+
|
||||
+ /* And fall back to our legacy one */
|
||||
count = of_property_count_strings(node, "allwinner,pins");
|
||||
if (count > 0) {
|
||||
*npins = count;
|
||||
|
|
@ -1,128 +0,0 @@
|
|||
From e11dee2e98f8abc99ad5336796576a827853ccfa Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Date: Thu, 20 Oct 2016 15:49:02 +0200
|
||||
Subject: pinctrl: sunxi: Deal with configless pins
|
||||
|
||||
Even though the our binding had the assumption that the allwinner,pull and
|
||||
allwinner,drive properties were optional, the code never took that into
|
||||
account.
|
||||
|
||||
Fix that.
|
||||
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 51 +++++++++++++++++++++++++----------
|
||||
1 file changed, 37 insertions(+), 14 deletions(-)
|
||||
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
@@ -261,20 +261,29 @@ static unsigned long *sunxi_pctrl_build_
|
||||
{
|
||||
unsigned long *pinconfig;
|
||||
unsigned int configlen = 0, idx = 0;
|
||||
+ int ret;
|
||||
|
||||
if (sunxi_pctrl_has_drive_prop(node))
|
||||
configlen++;
|
||||
if (sunxi_pctrl_has_bias_prop(node))
|
||||
configlen++;
|
||||
|
||||
+ /*
|
||||
+ * If we don't have any configuration, bail out
|
||||
+ */
|
||||
+ if (!configlen)
|
||||
+ return NULL;
|
||||
+
|
||||
pinconfig = kzalloc(configlen * sizeof(*pinconfig), GFP_KERNEL);
|
||||
if (!pinconfig)
|
||||
- return NULL;
|
||||
+ return ERR_PTR(-ENOMEM);
|
||||
|
||||
if (sunxi_pctrl_has_drive_prop(node)) {
|
||||
int drive = sunxi_pctrl_parse_drive_prop(node);
|
||||
- if (drive < 0)
|
||||
+ if (drive < 0) {
|
||||
+ ret = drive;
|
||||
goto err_free;
|
||||
+ }
|
||||
|
||||
pinconfig[idx++] = pinconf_to_config_packed(PIN_CONFIG_DRIVE_STRENGTH,
|
||||
drive);
|
||||
@@ -282,8 +291,10 @@ static unsigned long *sunxi_pctrl_build_
|
||||
|
||||
if (sunxi_pctrl_has_bias_prop(node)) {
|
||||
int pull = sunxi_pctrl_parse_bias_prop(node);
|
||||
- if (pull < 0)
|
||||
+ if (pull < 0) {
|
||||
+ ret = pull;
|
||||
goto err_free;
|
||||
+ }
|
||||
|
||||
pinconfig[idx++] = pinconf_to_config_packed(pull, 0);
|
||||
}
|
||||
@@ -294,7 +305,7 @@ static unsigned long *sunxi_pctrl_build_
|
||||
|
||||
err_free:
|
||||
kfree(pinconfig);
|
||||
- return NULL;
|
||||
+ return ERR_PTR(ret);
|
||||
}
|
||||
|
||||
static int sunxi_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
|
||||
@@ -328,7 +339,10 @@ static int sunxi_pctrl_dt_node_to_map(st
|
||||
|
||||
/*
|
||||
* We have two maps for each pin: one for the function, one
|
||||
- * for the configuration (bias, strength, etc)
|
||||
+ * for the configuration (bias, strength, etc).
|
||||
+ *
|
||||
+ * We might be slightly overshooting, since we might not have
|
||||
+ * any configuration.
|
||||
*/
|
||||
nmaps = npins * 2;
|
||||
*map = kmalloc(nmaps * sizeof(struct pinctrl_map), GFP_KERNEL);
|
||||
@@ -336,8 +350,8 @@ static int sunxi_pctrl_dt_node_to_map(st
|
||||
return -ENOMEM;
|
||||
|
||||
pinconfig = sunxi_pctrl_build_pin_config(node, &configlen);
|
||||
- if (!pinconfig) {
|
||||
- ret = -EINVAL;
|
||||
+ if (IS_ERR(pinconfig)) {
|
||||
+ ret = PTR_ERR(pinconfig);
|
||||
goto err_free_map;
|
||||
}
|
||||
|
||||
@@ -364,15 +378,24 @@ static int sunxi_pctrl_dt_node_to_map(st
|
||||
|
||||
i++;
|
||||
|
||||
- (*map)[i].type = PIN_MAP_TYPE_CONFIGS_GROUP;
|
||||
- (*map)[i].data.configs.group_or_pin = group;
|
||||
- (*map)[i].data.configs.configs = pinconfig;
|
||||
- (*map)[i].data.configs.num_configs = configlen;
|
||||
-
|
||||
- i++;
|
||||
+ if (pinconfig) {
|
||||
+ (*map)[i].type = PIN_MAP_TYPE_CONFIGS_GROUP;
|
||||
+ (*map)[i].data.configs.group_or_pin = group;
|
||||
+ (*map)[i].data.configs.configs = pinconfig;
|
||||
+ (*map)[i].data.configs.num_configs = configlen;
|
||||
+ i++;
|
||||
+ }
|
||||
}
|
||||
|
||||
- *num_maps = nmaps;
|
||||
+ *num_maps = i;
|
||||
+
|
||||
+ /*
|
||||
+ * We know have the number of maps we need, we can resize our
|
||||
+ * map array
|
||||
+ */
|
||||
+ *map = krealloc(*map, i * sizeof(struct pinctrl_map), GFP_KERNEL);
|
||||
+ if (!map)
|
||||
+ return -ENOMEM;
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
@ -1,437 +0,0 @@
|
|||
From 0c8c6ba00cbf2c0a6164aa41d43d017d65caf321 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Gortmaker <paul.gortmaker@windriver.com>
|
||||
Date: Sat, 29 Oct 2016 20:00:30 -0400
|
||||
Subject: pinctrl: sunxi: make bool drivers explicitly non-modular
|
||||
|
||||
None of the Kconfigs for any of these drivers are tristate,
|
||||
meaning that they currently are not being built as a module by anyone.
|
||||
|
||||
Lets remove the modular code that is essentially orphaned, so that
|
||||
when reading the drivers there is no doubt they are builtin-only. All
|
||||
drivers get essentially the same change, so they are handled in batch.
|
||||
|
||||
Changes are (1) use builtin_platform_driver, (2) use init.h header
|
||||
(3) delete module_exit related code, (4) delete MODULE_DEVICE_TABLE,
|
||||
and (5) delete MODULE_LICENCE/MODULE_AUTHOR and associated tags.
|
||||
|
||||
Since module_platform_driver() uses the same init level priority as
|
||||
builtin_platform_driver() the init ordering remains unchanged with
|
||||
this commit.
|
||||
|
||||
Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code.
|
||||
|
||||
We do delete the MODULE_LICENSE etc. tags since all that information
|
||||
is already contained at the top of each file in the comments.
|
||||
|
||||
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
|
||||
Cc: Chen-Yu Tsai <wens@csie.org>
|
||||
Cc: Hans de Goede <hdegoede@redhat.com>
|
||||
Cc: Linus Walleij <linus.walleij@linaro.org>
|
||||
Cc: Patrice Chotard <patrice.chotard@st.com>
|
||||
Cc: Hongzhou Yang <hongzhou.yang@mediatek.com>
|
||||
Cc: Fabian Frederick <fabf@skynet.be>
|
||||
Cc: Maxime Coquelin <maxime.coquelin@st.com>
|
||||
Cc: Vishnu Patekar <vishnupatekar0510@gmail.com>
|
||||
Cc: Mylene Josserand <mylene.josserand@free-electrons.com>
|
||||
Cc: linux-gpio@vger.kernel.org
|
||||
Cc: linux-arm-kernel@lists.infradead.org
|
||||
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
||||
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/sunxi/pinctrl-gr8.c | 9 ++-------
|
||||
drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 9 ++-------
|
||||
drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c | 9 ++-------
|
||||
drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c | 9 ++-------
|
||||
drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 10 ++--------
|
||||
drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 9 ++-------
|
||||
drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c | 9 ++-------
|
||||
drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c | 9 ++-------
|
||||
drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 11 ++---------
|
||||
drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c | 10 ++--------
|
||||
drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c | 9 ++-------
|
||||
drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c | 9 ++-------
|
||||
drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c | 9 ++-------
|
||||
13 files changed, 26 insertions(+), 95 deletions(-)
|
||||
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-gr8.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-gr8.c
|
||||
@@ -12,7 +12,7 @@
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
-#include <linux/module.h>
|
||||
+#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
@@ -525,7 +525,6 @@ static const struct of_device_id sun5i_g
|
||||
{ .compatible = "nextthing,gr8-pinctrl", },
|
||||
{}
|
||||
};
|
||||
-MODULE_DEVICE_TABLE(of, sun5i_gr8_pinctrl_match);
|
||||
|
||||
static struct platform_driver sun5i_gr8_pinctrl_driver = {
|
||||
.probe = sun5i_gr8_pinctrl_probe,
|
||||
@@ -534,8 +533,4 @@ static struct platform_driver sun5i_gr8_
|
||||
.of_match_table = sun5i_gr8_pinctrl_match,
|
||||
},
|
||||
};
|
||||
-module_platform_driver(sun5i_gr8_pinctrl_driver);
|
||||
-
|
||||
-MODULE_AUTHOR("Mylene Josserand <mylene.josserand@free-electrons.com");
|
||||
-MODULE_DESCRIPTION("NextThing GR8 pinctrl driver");
|
||||
-MODULE_LICENSE("GPL");
|
||||
+builtin_platform_driver(sun5i_gr8_pinctrl_driver);
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
|
||||
@@ -10,7 +10,7 @@
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
-#include <linux/module.h>
|
||||
+#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
@@ -1036,7 +1036,6 @@ static const struct of_device_id sun4i_a
|
||||
{ .compatible = "allwinner,sun4i-a10-pinctrl", },
|
||||
{}
|
||||
};
|
||||
-MODULE_DEVICE_TABLE(of, sun4i_a10_pinctrl_match);
|
||||
|
||||
static struct platform_driver sun4i_a10_pinctrl_driver = {
|
||||
.probe = sun4i_a10_pinctrl_probe,
|
||||
@@ -1045,8 +1044,4 @@ static struct platform_driver sun4i_a10_
|
||||
.of_match_table = sun4i_a10_pinctrl_match,
|
||||
},
|
||||
};
|
||||
-module_platform_driver(sun4i_a10_pinctrl_driver);
|
||||
-
|
||||
-MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
|
||||
-MODULE_DESCRIPTION("Allwinner A10 pinctrl driver");
|
||||
-MODULE_LICENSE("GPL");
|
||||
+builtin_platform_driver(sun4i_a10_pinctrl_driver);
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c
|
||||
@@ -10,7 +10,7 @@
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
-#include <linux/module.h>
|
||||
+#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
@@ -674,7 +674,6 @@ static const struct of_device_id sun5i_a
|
||||
{ .compatible = "allwinner,sun5i-a10s-pinctrl", },
|
||||
{}
|
||||
};
|
||||
-MODULE_DEVICE_TABLE(of, sun5i_a10s_pinctrl_match);
|
||||
|
||||
static struct platform_driver sun5i_a10s_pinctrl_driver = {
|
||||
.probe = sun5i_a10s_pinctrl_probe,
|
||||
@@ -683,8 +682,4 @@ static struct platform_driver sun5i_a10s
|
||||
.of_match_table = sun5i_a10s_pinctrl_match,
|
||||
},
|
||||
};
|
||||
-module_platform_driver(sun5i_a10s_pinctrl_driver);
|
||||
-
|
||||
-MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
|
||||
-MODULE_DESCRIPTION("Allwinner A10s pinctrl driver");
|
||||
-MODULE_LICENSE("GPL");
|
||||
+builtin_platform_driver(sun5i_a10s_pinctrl_driver);
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
|
||||
@@ -10,7 +10,7 @@
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
-#include <linux/module.h>
|
||||
+#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
@@ -392,7 +392,6 @@ static const struct of_device_id sun5i_a
|
||||
{ .compatible = "allwinner,sun5i-a13-pinctrl", },
|
||||
{}
|
||||
};
|
||||
-MODULE_DEVICE_TABLE(of, sun5i_a13_pinctrl_match);
|
||||
|
||||
static struct platform_driver sun5i_a13_pinctrl_driver = {
|
||||
.probe = sun5i_a13_pinctrl_probe,
|
||||
@@ -401,8 +400,4 @@ static struct platform_driver sun5i_a13_
|
||||
.of_match_table = sun5i_a13_pinctrl_match,
|
||||
},
|
||||
};
|
||||
-module_platform_driver(sun5i_a13_pinctrl_driver);
|
||||
-
|
||||
-MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
|
||||
-MODULE_DESCRIPTION("Allwinner A13 pinctrl driver");
|
||||
-MODULE_LICENSE("GPL");
|
||||
+builtin_platform_driver(sun5i_a13_pinctrl_driver);
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c
|
||||
@@ -12,7 +12,7 @@
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
-#include <linux/module.h>
|
||||
+#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
@@ -136,7 +136,6 @@ static const struct of_device_id sun6i_a
|
||||
{ .compatible = "allwinner,sun6i-a31-r-pinctrl", },
|
||||
{}
|
||||
};
|
||||
-MODULE_DEVICE_TABLE(of, sun6i_a31_r_pinctrl_match);
|
||||
|
||||
static struct platform_driver sun6i_a31_r_pinctrl_driver = {
|
||||
.probe = sun6i_a31_r_pinctrl_probe,
|
||||
@@ -145,9 +144,4 @@ static struct platform_driver sun6i_a31_
|
||||
.of_match_table = sun6i_a31_r_pinctrl_match,
|
||||
},
|
||||
};
|
||||
-module_platform_driver(sun6i_a31_r_pinctrl_driver);
|
||||
-
|
||||
-MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com");
|
||||
-MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
|
||||
-MODULE_DESCRIPTION("Allwinner A31 R_PIO pinctrl driver");
|
||||
-MODULE_LICENSE("GPL");
|
||||
+builtin_platform_driver(sun6i_a31_r_pinctrl_driver);
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c
|
||||
@@ -10,7 +10,7 @@
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
-#include <linux/module.h>
|
||||
+#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
@@ -934,7 +934,6 @@ static const struct of_device_id sun6i_a
|
||||
{ .compatible = "allwinner,sun6i-a31-pinctrl", },
|
||||
{}
|
||||
};
|
||||
-MODULE_DEVICE_TABLE(of, sun6i_a31_pinctrl_match);
|
||||
|
||||
static struct platform_driver sun6i_a31_pinctrl_driver = {
|
||||
.probe = sun6i_a31_pinctrl_probe,
|
||||
@@ -943,8 +942,4 @@ static struct platform_driver sun6i_a31_
|
||||
.of_match_table = sun6i_a31_pinctrl_match,
|
||||
},
|
||||
};
|
||||
-module_platform_driver(sun6i_a31_pinctrl_driver);
|
||||
-
|
||||
-MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
|
||||
-MODULE_DESCRIPTION("Allwinner A31 pinctrl driver");
|
||||
-MODULE_LICENSE("GPL");
|
||||
+builtin_platform_driver(sun6i_a31_pinctrl_driver);
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c
|
||||
@@ -11,7 +11,7 @@
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
-#include <linux/module.h>
|
||||
+#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
@@ -798,7 +798,6 @@ static const struct of_device_id sun6i_a
|
||||
{ .compatible = "allwinner,sun6i-a31s-pinctrl", },
|
||||
{}
|
||||
};
|
||||
-MODULE_DEVICE_TABLE(of, sun6i_a31s_pinctrl_match);
|
||||
|
||||
static struct platform_driver sun6i_a31s_pinctrl_driver = {
|
||||
.probe = sun6i_a31s_pinctrl_probe,
|
||||
@@ -807,8 +806,4 @@ static struct platform_driver sun6i_a31s
|
||||
.of_match_table = sun6i_a31s_pinctrl_match,
|
||||
},
|
||||
};
|
||||
-module_platform_driver(sun6i_a31s_pinctrl_driver);
|
||||
-
|
||||
-MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
|
||||
-MODULE_DESCRIPTION("Allwinner A31s pinctrl driver");
|
||||
-MODULE_LICENSE("GPL");
|
||||
+builtin_platform_driver(sun6i_a31s_pinctrl_driver);
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c
|
||||
@@ -10,7 +10,7 @@
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
-#include <linux/module.h>
|
||||
+#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
@@ -1045,7 +1045,6 @@ static const struct of_device_id sun7i_a
|
||||
{ .compatible = "allwinner,sun7i-a20-pinctrl", },
|
||||
{}
|
||||
};
|
||||
-MODULE_DEVICE_TABLE(of, sun7i_a20_pinctrl_match);
|
||||
|
||||
static struct platform_driver sun7i_a20_pinctrl_driver = {
|
||||
.probe = sun7i_a20_pinctrl_probe,
|
||||
@@ -1054,8 +1053,4 @@ static struct platform_driver sun7i_a20_
|
||||
.of_match_table = sun7i_a20_pinctrl_match,
|
||||
},
|
||||
};
|
||||
-module_platform_driver(sun7i_a20_pinctrl_driver);
|
||||
-
|
||||
-MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
|
||||
-MODULE_DESCRIPTION("Allwinner A20 pinctrl driver");
|
||||
-MODULE_LICENSE("GPL");
|
||||
+builtin_platform_driver(sun7i_a20_pinctrl_driver);
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c
|
||||
@@ -15,7 +15,7 @@
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
-#include <linux/module.h>
|
||||
+#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
@@ -123,7 +123,6 @@ static const struct of_device_id sun8i_a
|
||||
{ .compatible = "allwinner,sun8i-a23-r-pinctrl", },
|
||||
{}
|
||||
};
|
||||
-MODULE_DEVICE_TABLE(of, sun8i_a23_r_pinctrl_match);
|
||||
|
||||
static struct platform_driver sun8i_a23_r_pinctrl_driver = {
|
||||
.probe = sun8i_a23_r_pinctrl_probe,
|
||||
@@ -132,10 +131,4 @@ static struct platform_driver sun8i_a23_
|
||||
.of_match_table = sun8i_a23_r_pinctrl_match,
|
||||
},
|
||||
};
|
||||
-module_platform_driver(sun8i_a23_r_pinctrl_driver);
|
||||
-
|
||||
-MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
|
||||
-MODULE_AUTHOR("Boris Brezillon <boris.brezillon@free-electrons.com");
|
||||
-MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
|
||||
-MODULE_DESCRIPTION("Allwinner A23 R_PIO pinctrl driver");
|
||||
-MODULE_LICENSE("GPL");
|
||||
+builtin_platform_driver(sun8i_a23_r_pinctrl_driver);
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c
|
||||
@@ -14,7 +14,7 @@
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
-#include <linux/module.h>
|
||||
+#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
@@ -575,7 +575,6 @@ static const struct of_device_id sun8i_a
|
||||
{ .compatible = "allwinner,sun8i-a23-pinctrl", },
|
||||
{}
|
||||
};
|
||||
-MODULE_DEVICE_TABLE(of, sun8i_a23_pinctrl_match);
|
||||
|
||||
static struct platform_driver sun8i_a23_pinctrl_driver = {
|
||||
.probe = sun8i_a23_pinctrl_probe,
|
||||
@@ -584,9 +583,4 @@ static struct platform_driver sun8i_a23_
|
||||
.of_match_table = sun8i_a23_pinctrl_match,
|
||||
},
|
||||
};
|
||||
-module_platform_driver(sun8i_a23_pinctrl_driver);
|
||||
-
|
||||
-MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
|
||||
-MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com");
|
||||
-MODULE_DESCRIPTION("Allwinner A23 pinctrl driver");
|
||||
-MODULE_LICENSE("GPL");
|
||||
+builtin_platform_driver(sun8i_a23_pinctrl_driver);
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c
|
||||
@@ -12,7 +12,7 @@
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
-#include <linux/module.h>
|
||||
+#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
@@ -498,7 +498,6 @@ static const struct of_device_id sun8i_a
|
||||
{ .compatible = "allwinner,sun8i-a33-pinctrl", },
|
||||
{}
|
||||
};
|
||||
-MODULE_DEVICE_TABLE(of, sun8i_a33_pinctrl_match);
|
||||
|
||||
static struct platform_driver sun8i_a33_pinctrl_driver = {
|
||||
.probe = sun8i_a33_pinctrl_probe,
|
||||
@@ -507,8 +506,4 @@ static struct platform_driver sun8i_a33_
|
||||
.of_match_table = sun8i_a33_pinctrl_match,
|
||||
},
|
||||
};
|
||||
-module_platform_driver(sun8i_a33_pinctrl_driver);
|
||||
-
|
||||
-MODULE_AUTHOR("Vishnu Patekar <vishnupatekar0510@gmail.com>");
|
||||
-MODULE_DESCRIPTION("Allwinner a33 pinctrl driver");
|
||||
-MODULE_LICENSE("GPL");
|
||||
+builtin_platform_driver(sun8i_a33_pinctrl_driver);
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c
|
||||
@@ -12,7 +12,7 @@
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
-#include <linux/module.h>
|
||||
+#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
@@ -587,7 +587,6 @@ static const struct of_device_id sun8i_a
|
||||
{ .compatible = "allwinner,sun8i-a83t-pinctrl", },
|
||||
{}
|
||||
};
|
||||
-MODULE_DEVICE_TABLE(of, sun8i_a83t_pinctrl_match);
|
||||
|
||||
static struct platform_driver sun8i_a83t_pinctrl_driver = {
|
||||
.probe = sun8i_a83t_pinctrl_probe,
|
||||
@@ -596,8 +595,4 @@ static struct platform_driver sun8i_a83t
|
||||
.of_match_table = sun8i_a83t_pinctrl_match,
|
||||
},
|
||||
};
|
||||
-module_platform_driver(sun8i_a83t_pinctrl_driver);
|
||||
-
|
||||
-MODULE_AUTHOR("Vishnu Patekar <vishnupatekar0510@gmail.com>");
|
||||
-MODULE_DESCRIPTION("Allwinner a83t pinctrl driver");
|
||||
-MODULE_LICENSE("GPL");
|
||||
+builtin_platform_driver(sun8i_a83t_pinctrl_driver);
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c
|
||||
@@ -10,7 +10,7 @@
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
-#include <linux/module.h>
|
||||
+#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
@@ -733,7 +733,6 @@ static const struct of_device_id sun9i_a
|
||||
{ .compatible = "allwinner,sun9i-a80-pinctrl", },
|
||||
{}
|
||||
};
|
||||
-MODULE_DEVICE_TABLE(of, sun9i_a80_pinctrl_match);
|
||||
|
||||
static struct platform_driver sun9i_a80_pinctrl_driver = {
|
||||
.probe = sun9i_a80_pinctrl_probe,
|
||||
@@ -742,8 +741,4 @@ static struct platform_driver sun9i_a80_
|
||||
.of_match_table = sun9i_a80_pinctrl_match,
|
||||
},
|
||||
};
|
||||
-module_platform_driver(sun9i_a80_pinctrl_driver);
|
||||
-
|
||||
-MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>");
|
||||
-MODULE_DESCRIPTION("Allwinner A80 pinctrl driver");
|
||||
-MODULE_LICENSE("GPL");
|
||||
+builtin_platform_driver(sun9i_a80_pinctrl_driver);
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
From 88f01a1bd0e0dbd01b65907023dbe53cf524ea2a Mon Sep 17 00:00:00 2001
|
||||
From: Chen-Yu Tsai <wens@csie.org>
|
||||
Date: Fri, 11 Nov 2016 10:35:10 +0800
|
||||
Subject: pinctrl: sunxi: Free configs in pinctrl_map only if it is a config
|
||||
map
|
||||
|
||||
In the recently refactored sunxi pinctrl library, we are only allocating
|
||||
one set of pin configs for each pinmux setting node. When the pinctrl_map
|
||||
structure is freed, the pin configs should also be freed. However the
|
||||
code assumed the first map would contain the configs, which actually
|
||||
never happens, as the mux function map gets added first.
|
||||
|
||||
The proper way to do this is to look through all the maps and free the
|
||||
first one whose type is actually PIN_MAP_TYPE_CONFIGS_GROUP.
|
||||
|
||||
Also slightly expand the comment explaining this.
|
||||
|
||||
Fixes: f233dbca6227 ("pinctrl: sunxi: Rework the pin config building code")
|
||||
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
|
||||
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 17 +++++++++++++++--
|
||||
1 file changed, 15 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
@@ -408,8 +408,21 @@ static void sunxi_pctrl_dt_free_map(stru
|
||||
struct pinctrl_map *map,
|
||||
unsigned num_maps)
|
||||
{
|
||||
- /* All the maps have the same pin config, free only the first one */
|
||||
- kfree(map[0].data.configs.configs);
|
||||
+ int i;
|
||||
+
|
||||
+ /* pin config is never in the first map */
|
||||
+ for (i = 1; i < num_maps; i++) {
|
||||
+ if (map[i].type != PIN_MAP_TYPE_CONFIGS_GROUP)
|
||||
+ continue;
|
||||
+
|
||||
+ /*
|
||||
+ * All the maps share the same pin config,
|
||||
+ * free only the first one we find.
|
||||
+ */
|
||||
+ kfree(map[i].data.configs.configs);
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
kfree(map);
|
||||
}
|
||||
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
From 223dba00b4072efc590c7d648f230db1b44186b9 Mon Sep 17 00:00:00 2001
|
||||
From: Chen-Yu Tsai <wens@csie.org>
|
||||
Date: Fri, 11 Nov 2016 17:50:34 +0800
|
||||
Subject: pinctrl: sunxi: Fix PIN_CONFIG_BIAS_PULL_{DOWN,UP} argument
|
||||
|
||||
According to pinconf-generic.h, the argument for
|
||||
PIN_CONFIG_BIAS_PULL_{DOWN,UP} is non-zero if the bias is enabled
|
||||
with a pull up/down resistor, zero if it is directly connected
|
||||
to VDD or ground.
|
||||
|
||||
Since Allwinner hardware uses a weak pull resistor internally,
|
||||
the argument should be 1.
|
||||
|
||||
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
|
||||
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
@@ -291,12 +291,16 @@ static unsigned long *sunxi_pctrl_build_
|
||||
|
||||
if (sunxi_pctrl_has_bias_prop(node)) {
|
||||
int pull = sunxi_pctrl_parse_bias_prop(node);
|
||||
+ int arg = 0;
|
||||
if (pull < 0) {
|
||||
ret = pull;
|
||||
goto err_free;
|
||||
}
|
||||
|
||||
- pinconfig[idx++] = pinconf_to_config_packed(pull, 0);
|
||||
+ if (pull != PIN_CONFIG_BIAS_DISABLE)
|
||||
+ arg = 1; /* hardware uses weak pull resistors */
|
||||
+
|
||||
+ pinconfig[idx++] = pinconf_to_config_packed(pull, arg);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,158 +0,0 @@
|
|||
From c5fda170e87a4bdaeb278f7e50f7a1f654e94eb5 Mon Sep 17 00:00:00 2001
|
||||
From: Chen-Yu Tsai <wens@csie.org>
|
||||
Date: Fri, 11 Nov 2016 17:50:35 +0800
|
||||
Subject: pinctrl: sunxi: Add support for fetching pinconf settings from
|
||||
hardware
|
||||
|
||||
The sunxi pinctrl driver only caches whatever pinconf setting was last
|
||||
set on a given pingroup. This is not particularly helpful, nor is it
|
||||
correct.
|
||||
|
||||
Fix this by actually reading the hardware registers and returning
|
||||
the correct results or error codes. Also filter out unsupported
|
||||
pinconf settings. Since this driver has a peculiar setup of 1 pin
|
||||
per group, we can support both pin and pingroup pinconf setting
|
||||
read back with the same code. The sunxi_pconf_reg helper and code
|
||||
structure is inspired by pinctrl-msm.
|
||||
|
||||
With this done we can also claim to support generic pinconf, by
|
||||
setting .is_generic = true in pinconf_ops.
|
||||
|
||||
Also remove the cached config value. The behavior of this was never
|
||||
correct, as it only cached 1 setting instead of all of them. Since
|
||||
we can now read back settings directly from the hardware, it is no
|
||||
longer required.
|
||||
|
||||
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
|
||||
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 86 +++++++++++++++++++++++++++++++++--
|
||||
drivers/pinctrl/sunxi/pinctrl-sunxi.h | 1 -
|
||||
2 files changed, 81 insertions(+), 6 deletions(-)
|
||||
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
@@ -438,15 +438,91 @@ static const struct pinctrl_ops sunxi_pc
|
||||
.get_group_pins = sunxi_pctrl_get_group_pins,
|
||||
};
|
||||
|
||||
+static int sunxi_pconf_reg(unsigned pin, enum pin_config_param param,
|
||||
+ u32 *offset, u32 *shift, u32 *mask)
|
||||
+{
|
||||
+ switch (param) {
|
||||
+ case PIN_CONFIG_DRIVE_STRENGTH:
|
||||
+ *offset = sunxi_dlevel_reg(pin);
|
||||
+ *shift = sunxi_dlevel_offset(pin);
|
||||
+ *mask = DLEVEL_PINS_MASK;
|
||||
+ break;
|
||||
+
|
||||
+ case PIN_CONFIG_BIAS_PULL_UP:
|
||||
+ case PIN_CONFIG_BIAS_PULL_DOWN:
|
||||
+ case PIN_CONFIG_BIAS_DISABLE:
|
||||
+ *offset = sunxi_pull_reg(pin);
|
||||
+ *shift = sunxi_pull_offset(pin);
|
||||
+ *mask = PULL_PINS_MASK;
|
||||
+ break;
|
||||
+
|
||||
+ default:
|
||||
+ return -ENOTSUPP;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int sunxi_pconf_get(struct pinctrl_dev *pctldev, unsigned pin,
|
||||
+ unsigned long *config)
|
||||
+{
|
||||
+ struct sunxi_pinctrl *pctl = pinctrl_dev_get_drvdata(pctldev);
|
||||
+ enum pin_config_param param = pinconf_to_config_param(*config);
|
||||
+ u32 offset, shift, mask, val;
|
||||
+ u16 arg;
|
||||
+ int ret;
|
||||
+
|
||||
+ pin -= pctl->desc->pin_base;
|
||||
+
|
||||
+ ret = sunxi_pconf_reg(pin, param, &offset, &shift, &mask);
|
||||
+ if (ret < 0)
|
||||
+ return ret;
|
||||
+
|
||||
+ val = (readl(pctl->membase + offset) >> shift) & mask;
|
||||
+
|
||||
+ switch (pinconf_to_config_param(*config)) {
|
||||
+ case PIN_CONFIG_DRIVE_STRENGTH:
|
||||
+ arg = (val + 1) * 10;
|
||||
+ break;
|
||||
+
|
||||
+ case PIN_CONFIG_BIAS_PULL_UP:
|
||||
+ if (val != SUN4I_PINCTRL_PULL_UP)
|
||||
+ return -EINVAL;
|
||||
+ arg = 1; /* hardware is weak pull-up */
|
||||
+ break;
|
||||
+
|
||||
+ case PIN_CONFIG_BIAS_PULL_DOWN:
|
||||
+ if (val != SUN4I_PINCTRL_PULL_DOWN)
|
||||
+ return -EINVAL;
|
||||
+ arg = 1; /* hardware is weak pull-down */
|
||||
+ break;
|
||||
+
|
||||
+ case PIN_CONFIG_BIAS_DISABLE:
|
||||
+ if (val != SUN4I_PINCTRL_NO_PULL)
|
||||
+ return -EINVAL;
|
||||
+ arg = 0;
|
||||
+ break;
|
||||
+
|
||||
+ default:
|
||||
+ /* sunxi_pconf_reg should catch anything unsupported */
|
||||
+ WARN_ON(1);
|
||||
+ return -ENOTSUPP;
|
||||
+ }
|
||||
+
|
||||
+ *config = pinconf_to_config_packed(param, arg);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
static int sunxi_pconf_group_get(struct pinctrl_dev *pctldev,
|
||||
unsigned group,
|
||||
unsigned long *config)
|
||||
{
|
||||
struct sunxi_pinctrl *pctl = pinctrl_dev_get_drvdata(pctldev);
|
||||
+ struct sunxi_pinctrl_group *g = &pctl->groups[group];
|
||||
|
||||
- *config = pctl->groups[group].config;
|
||||
-
|
||||
- return 0;
|
||||
+ /* We only support 1 pin per group. Chain it to the pin callback */
|
||||
+ return sunxi_pconf_get(pctldev, g->pin, config);
|
||||
}
|
||||
|
||||
static int sunxi_pconf_group_set(struct pinctrl_dev *pctldev,
|
||||
@@ -508,8 +584,6 @@ static int sunxi_pconf_group_set(struct
|
||||
default:
|
||||
break;
|
||||
}
|
||||
- /* cache the config value */
|
||||
- g->config = configs[i];
|
||||
} /* for each config */
|
||||
|
||||
spin_unlock_irqrestore(&pctl->lock, flags);
|
||||
@@ -518,6 +592,8 @@ static int sunxi_pconf_group_set(struct
|
||||
}
|
||||
|
||||
static const struct pinconf_ops sunxi_pconf_ops = {
|
||||
+ .is_generic = true,
|
||||
+ .pin_config_get = sunxi_pconf_get,
|
||||
.pin_config_group_get = sunxi_pconf_group_get,
|
||||
.pin_config_group_set = sunxi_pconf_group_set,
|
||||
};
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.h
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.h
|
||||
@@ -109,7 +109,6 @@ struct sunxi_pinctrl_function {
|
||||
|
||||
struct sunxi_pinctrl_group {
|
||||
const char *name;
|
||||
- unsigned long config;
|
||||
unsigned pin;
|
||||
};
|
||||
|
||||
|
|
@ -1,122 +0,0 @@
|
|||
From 51814827190214986c452a166718bf12d32211c7 Mon Sep 17 00:00:00 2001
|
||||
From: Chen-Yu Tsai <wens@csie.org>
|
||||
Date: Fri, 11 Nov 2016 17:50:36 +0800
|
||||
Subject: pinctrl: sunxi: Make sunxi_pconf_group_set use sunxi_pconf_reg helper
|
||||
|
||||
The sunxi_pconf_reg helper introduced in the last patch gives us the
|
||||
chance to rework sunxi_pconf_group_set to have it match the structure
|
||||
of sunxi_pconf_(group_)get and make it easier to understand.
|
||||
|
||||
For each config to set, it:
|
||||
|
||||
1. checks if the parameter is supported.
|
||||
2. checks if the argument is within limits.
|
||||
3. converts argument to the register value.
|
||||
4. writes to the register with spinlock held.
|
||||
|
||||
As a result the function now blocks unsupported config parameters,
|
||||
instead of silently ignoring them.
|
||||
|
||||
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
|
||||
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 64 +++++++++++++++++------------------
|
||||
1 file changed, 32 insertions(+), 32 deletions(-)
|
||||
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
@@ -532,23 +532,27 @@ static int sunxi_pconf_group_set(struct
|
||||
{
|
||||
struct sunxi_pinctrl *pctl = pinctrl_dev_get_drvdata(pctldev);
|
||||
struct sunxi_pinctrl_group *g = &pctl->groups[group];
|
||||
- unsigned long flags;
|
||||
unsigned pin = g->pin - pctl->desc->pin_base;
|
||||
- u32 val, mask;
|
||||
- u16 strength;
|
||||
- u8 dlevel;
|
||||
int i;
|
||||
|
||||
- spin_lock_irqsave(&pctl->lock, flags);
|
||||
-
|
||||
for (i = 0; i < num_configs; i++) {
|
||||
- switch (pinconf_to_config_param(configs[i])) {
|
||||
+ enum pin_config_param param;
|
||||
+ unsigned long flags;
|
||||
+ u32 offset, shift, mask, reg;
|
||||
+ u16 arg, val;
|
||||
+ int ret;
|
||||
+
|
||||
+ param = pinconf_to_config_param(configs[i]);
|
||||
+ arg = pinconf_to_config_argument(configs[i]);
|
||||
+
|
||||
+ ret = sunxi_pconf_reg(pin, param, &offset, &shift, &mask);
|
||||
+ if (ret < 0)
|
||||
+ return ret;
|
||||
+
|
||||
+ switch (param) {
|
||||
case PIN_CONFIG_DRIVE_STRENGTH:
|
||||
- strength = pinconf_to_config_argument(configs[i]);
|
||||
- if (strength > 40) {
|
||||
- spin_unlock_irqrestore(&pctl->lock, flags);
|
||||
+ if (arg < 10 || arg > 40)
|
||||
return -EINVAL;
|
||||
- }
|
||||
/*
|
||||
* We convert from mA to what the register expects:
|
||||
* 0: 10mA
|
||||
@@ -556,37 +560,33 @@ static int sunxi_pconf_group_set(struct
|
||||
* 2: 30mA
|
||||
* 3: 40mA
|
||||
*/
|
||||
- dlevel = strength / 10 - 1;
|
||||
- val = readl(pctl->membase + sunxi_dlevel_reg(pin));
|
||||
- mask = DLEVEL_PINS_MASK << sunxi_dlevel_offset(pin);
|
||||
- writel((val & ~mask)
|
||||
- | dlevel << sunxi_dlevel_offset(pin),
|
||||
- pctl->membase + sunxi_dlevel_reg(pin));
|
||||
+ val = arg / 10 - 1;
|
||||
break;
|
||||
case PIN_CONFIG_BIAS_DISABLE:
|
||||
- val = readl(pctl->membase + sunxi_pull_reg(pin));
|
||||
- mask = PULL_PINS_MASK << sunxi_pull_offset(pin);
|
||||
- writel((val & ~mask),
|
||||
- pctl->membase + sunxi_pull_reg(pin));
|
||||
+ val = 0;
|
||||
break;
|
||||
case PIN_CONFIG_BIAS_PULL_UP:
|
||||
- val = readl(pctl->membase + sunxi_pull_reg(pin));
|
||||
- mask = PULL_PINS_MASK << sunxi_pull_offset(pin);
|
||||
- writel((val & ~mask) | 1 << sunxi_pull_offset(pin),
|
||||
- pctl->membase + sunxi_pull_reg(pin));
|
||||
+ if (arg == 0)
|
||||
+ return -EINVAL;
|
||||
+ val = 1;
|
||||
break;
|
||||
case PIN_CONFIG_BIAS_PULL_DOWN:
|
||||
- val = readl(pctl->membase + sunxi_pull_reg(pin));
|
||||
- mask = PULL_PINS_MASK << sunxi_pull_offset(pin);
|
||||
- writel((val & ~mask) | 2 << sunxi_pull_offset(pin),
|
||||
- pctl->membase + sunxi_pull_reg(pin));
|
||||
+ if (arg == 0)
|
||||
+ return -EINVAL;
|
||||
+ val = 2;
|
||||
break;
|
||||
default:
|
||||
- break;
|
||||
+ /* sunxi_pconf_reg should catch anything unsupported */
|
||||
+ WARN_ON(1);
|
||||
+ return -ENOTSUPP;
|
||||
}
|
||||
- } /* for each config */
|
||||
|
||||
- spin_unlock_irqrestore(&pctl->lock, flags);
|
||||
+ spin_lock_irqsave(&pctl->lock, flags);
|
||||
+ reg = readl(pctl->membase + offset);
|
||||
+ reg &= ~(mask << shift);
|
||||
+ writel(reg | val << shift, pctl->membase + offset);
|
||||
+ spin_unlock_irqrestore(&pctl->lock, flags);
|
||||
+ } /* for each config */
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1,171 +0,0 @@
|
|||
From 7c926492d38a3feef4b4b29c91b7c03eb1b8b546 Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Date: Mon, 14 Nov 2016 21:53:03 +0100
|
||||
Subject: pinctrl: sunxi: Add support for interrupt debouncing
|
||||
|
||||
The pin controller found in the Allwinner SoCs has support for interrupts
|
||||
debouncing.
|
||||
|
||||
However, this is not done per-pin, preventing us from using the generic
|
||||
pinconf binding for that, but per irq bank, which, depending on the SoC,
|
||||
ranges from one to five.
|
||||
|
||||
Introduce a device-wide property to deal with this using a microsecond
|
||||
resolution. We can re-use the per-pin input-debounce property for that, so
|
||||
let's do it!
|
||||
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Acked-by: Rob Herring <robh@kernel.org>
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
.../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 14 ++++
|
||||
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 84 ++++++++++++++++++++++
|
||||
drivers/pinctrl/sunxi/pinctrl-sunxi.h | 7 ++
|
||||
3 files changed, 105 insertions(+)
|
||||
|
||||
--- a/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
|
||||
+++ b/Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt
|
||||
@@ -28,6 +28,20 @@ Required properties:
|
||||
- reg: Should contain the register physical address and length for the
|
||||
pin controller.
|
||||
|
||||
+- clocks: phandle to the clocks feeding the pin controller:
|
||||
+ - "apb": the gated APB parent clock
|
||||
+ - "hosc": the high frequency oscillator in the system
|
||||
+ - "losc": the low frequency oscillator in the system
|
||||
+
|
||||
+Note: For backward compatibility reasons, the hosc and losc clocks are only
|
||||
+required if you need to use the optional input-debounce property. Any new
|
||||
+device tree should set them.
|
||||
+
|
||||
+Optional properties:
|
||||
+ - input-debounce: Array of debouncing periods in microseconds. One period per
|
||||
+ irq bank found in the controller. 0 if no setup required.
|
||||
+
|
||||
+
|
||||
Please refer to pinctrl-bindings.txt in this directory for details of the
|
||||
common pinctrl bindings used by client devices.
|
||||
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
@@ -1122,6 +1122,88 @@ static int sunxi_pinctrl_build_state(str
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static int sunxi_pinctrl_get_debounce_div(struct clk *clk, int freq, int *diff)
|
||||
+{
|
||||
+ unsigned long clock = clk_get_rate(clk);
|
||||
+ unsigned int best_diff = ~0, best_div;
|
||||
+ int i;
|
||||
+
|
||||
+ for (i = 0; i < 8; i++) {
|
||||
+ int cur_diff = abs(freq - (clock >> i));
|
||||
+
|
||||
+ if (cur_diff < best_diff) {
|
||||
+ best_diff = cur_diff;
|
||||
+ best_div = i;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ *diff = best_diff;
|
||||
+ return best_div;
|
||||
+}
|
||||
+
|
||||
+static int sunxi_pinctrl_setup_debounce(struct sunxi_pinctrl *pctl,
|
||||
+ struct device_node *node)
|
||||
+{
|
||||
+ unsigned int hosc_diff, losc_diff;
|
||||
+ unsigned int hosc_div, losc_div;
|
||||
+ struct clk *hosc, *losc;
|
||||
+ u8 div, src;
|
||||
+ int i, ret;
|
||||
+
|
||||
+ /* Deal with old DTs that didn't have the oscillators */
|
||||
+ if (of_count_phandle_with_args(node, "clocks", "#clock-cells") != 3)
|
||||
+ return 0;
|
||||
+
|
||||
+ /* If we don't have any setup, bail out */
|
||||
+ if (!of_find_property(node, "input-debounce", NULL))
|
||||
+ return 0;
|
||||
+
|
||||
+ losc = devm_clk_get(pctl->dev, "losc");
|
||||
+ if (IS_ERR(losc))
|
||||
+ return PTR_ERR(losc);
|
||||
+
|
||||
+ hosc = devm_clk_get(pctl->dev, "hosc");
|
||||
+ if (IS_ERR(hosc))
|
||||
+ return PTR_ERR(hosc);
|
||||
+
|
||||
+ for (i = 0; i < pctl->desc->irq_banks; i++) {
|
||||
+ unsigned long debounce_freq;
|
||||
+ u32 debounce;
|
||||
+
|
||||
+ ret = of_property_read_u32_index(node, "input-debounce",
|
||||
+ i, &debounce);
|
||||
+ if (ret)
|
||||
+ return ret;
|
||||
+
|
||||
+ if (!debounce)
|
||||
+ continue;
|
||||
+
|
||||
+ debounce_freq = DIV_ROUND_CLOSEST(USEC_PER_SEC, debounce);
|
||||
+ losc_div = sunxi_pinctrl_get_debounce_div(losc,
|
||||
+ debounce_freq,
|
||||
+ &losc_diff);
|
||||
+
|
||||
+ hosc_div = sunxi_pinctrl_get_debounce_div(hosc,
|
||||
+ debounce_freq,
|
||||
+ &hosc_diff);
|
||||
+
|
||||
+ if (hosc_diff < losc_diff) {
|
||||
+ div = hosc_div;
|
||||
+ src = 1;
|
||||
+ } else {
|
||||
+ div = losc_div;
|
||||
+ src = 0;
|
||||
+ }
|
||||
+
|
||||
+ writel(src | div << 4,
|
||||
+ pctl->membase +
|
||||
+ sunxi_irq_debounce_reg_from_bank(i,
|
||||
+ pctl->desc->irq_bank_base));
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
int sunxi_pinctrl_init(struct platform_device *pdev,
|
||||
const struct sunxi_pinctrl_desc *desc)
|
||||
{
|
||||
@@ -1284,6 +1366,8 @@ int sunxi_pinctrl_init(struct platform_d
|
||||
pctl);
|
||||
}
|
||||
|
||||
+ sunxi_pinctrl_setup_debounce(pctl, node);
|
||||
+
|
||||
dev_info(&pdev->dev, "initialized sunXi PIO driver\n");
|
||||
|
||||
return 0;
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.h
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.h
|
||||
@@ -69,6 +69,8 @@
|
||||
#define IRQ_STATUS_IRQ_BITS 1
|
||||
#define IRQ_STATUS_IRQ_MASK ((1 << IRQ_STATUS_IRQ_BITS) - 1)
|
||||
|
||||
+#define IRQ_DEBOUNCE_REG 0x218
|
||||
+
|
||||
#define IRQ_MEM_SIZE 0x20
|
||||
|
||||
#define IRQ_EDGE_RISING 0x00
|
||||
@@ -265,6 +267,11 @@ static inline u32 sunxi_irq_ctrl_offset(
|
||||
return irq_num * IRQ_CTRL_IRQ_BITS;
|
||||
}
|
||||
|
||||
+static inline u32 sunxi_irq_debounce_reg_from_bank(u8 bank, unsigned bank_base)
|
||||
+{
|
||||
+ return IRQ_DEBOUNCE_REG + (bank_base + bank) * IRQ_MEM_SIZE;
|
||||
+}
|
||||
+
|
||||
static inline u32 sunxi_irq_status_reg_from_bank(u8 bank, unsigned bank_base)
|
||||
{
|
||||
return IRQ_STATUS_REG + (bank_base + bank) * IRQ_MEM_SIZE;
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
From d8a22212737314cc02692cc90eda7d844fa20257 Mon Sep 17 00:00:00 2001
|
||||
From: Arnd Bergmann <arnd@arndb.de>
|
||||
Date: Wed, 16 Nov 2016 15:18:18 +0100
|
||||
Subject: pinctrl: sunxi: fix theoretical uninitialized variable access
|
||||
|
||||
gcc warns about a way that it could use an uninitialized variable:
|
||||
|
||||
drivers/pinctrl/sunxi/pinctrl-sunxi.c: In function 'sunxi_pinctrl_init':
|
||||
drivers/pinctrl/sunxi/pinctrl-sunxi.c:1191:8: error: 'best_div' may be used uninitialized in this function [-Werror=maybe-uninitialized]
|
||||
|
||||
This cannot really happen except if 'freq' is UINT_MAX and 'clock' is
|
||||
zero, and both of these are forbidden. To shut up the warning anyway,
|
||||
this changes the logic to initialize the return code to the first
|
||||
divider value before looking at the others.
|
||||
|
||||
Fixes: 7c926492d38a ("pinctrl: sunxi: Add support for interrupt debouncing")
|
||||
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
@@ -1125,10 +1125,13 @@ static int sunxi_pinctrl_build_state(str
|
||||
static int sunxi_pinctrl_get_debounce_div(struct clk *clk, int freq, int *diff)
|
||||
{
|
||||
unsigned long clock = clk_get_rate(clk);
|
||||
- unsigned int best_diff = ~0, best_div;
|
||||
+ unsigned int best_diff, best_div;
|
||||
int i;
|
||||
|
||||
- for (i = 0; i < 8; i++) {
|
||||
+ best_diff = abs(freq - clock);
|
||||
+ best_div = 0;
|
||||
+
|
||||
+ for (i = 1; i < 8; i++) {
|
||||
int cur_diff = abs(freq - (clock >> i));
|
||||
|
||||
if (cur_diff < best_diff) {
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From b3cde198b17f504643cc1eeffc4623f03326f436 Mon Sep 17 00:00:00 2001
|
||||
From: Dan Carpenter <dan.carpenter@oracle.com>
|
||||
Date: Fri, 18 Nov 2016 14:35:57 +0300
|
||||
Subject: pinctrl: sunxi: Testing the wrong variable
|
||||
|
||||
Smatch complains that we dereference "map" before testing it for NULL
|
||||
which is true. We should be testing "*map" instead. Also on the error
|
||||
path, we should free *map and set it to NULL.
|
||||
|
||||
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
|
||||
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
@@ -398,13 +398,14 @@ static int sunxi_pctrl_dt_node_to_map(st
|
||||
* map array
|
||||
*/
|
||||
*map = krealloc(*map, i * sizeof(struct pinctrl_map), GFP_KERNEL);
|
||||
- if (!map)
|
||||
+ if (!*map)
|
||||
return -ENOMEM;
|
||||
|
||||
return 0;
|
||||
|
||||
err_free_map:
|
||||
- kfree(map);
|
||||
+ kfree(*map);
|
||||
+ *map = NULL;
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
From 2154d94b40ea2a5de05245521371d0461bb0d669 Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Date: Mon, 23 Jan 2017 09:21:30 +0100
|
||||
Subject: pinctrl: sunxi: Don't enforce bias disable (for now)
|
||||
|
||||
Commit 07fe64ba213f ("pinctrl: sunxi: Handle bias disable") actually
|
||||
enforced enforced the disabling of the pull up/down resistors instead of
|
||||
ignoring it like it was done before.
|
||||
|
||||
This was part of a wider rework to switch to the generic pinconf bindings,
|
||||
and was meant to be merged together with DT patches that were switching to
|
||||
it, and removing what was considered default values by both the binding and
|
||||
the boards. This included no bias on a pin.
|
||||
|
||||
However, those DT patches were delayed to 4.11, which would be fine only
|
||||
for a significant number boards having the bias setup wrong, which in turns
|
||||
break the MMC on those boards (and possibly other devices too).
|
||||
|
||||
In order to avoid conflicts as much as possible, bring back the old
|
||||
behaviour for 4.10, and we'll revert that commit once all the DT bits will
|
||||
have landed.
|
||||
|
||||
Tested-by: Priit Laes <plaes@plaes.org>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Acked-by: Chen-Yu Tsai <wens@csie.org>
|
||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
|
||||
@@ -564,8 +564,7 @@ static int sunxi_pconf_group_set(struct
|
||||
val = arg / 10 - 1;
|
||||
break;
|
||||
case PIN_CONFIG_BIAS_DISABLE:
|
||||
- val = 0;
|
||||
- break;
|
||||
+ continue;
|
||||
case PIN_CONFIG_BIAS_PULL_UP:
|
||||
if (arg == 0)
|
||||
return -EINVAL;
|
||||
|
|
@ -1,160 +0,0 @@
|
|||
From 49f01c9e14b3476cbdf9623c4812c43f6485830b Mon Sep 17 00:00:00 2001
|
||||
From: Milo Kim <woogyom.kim@gmail.com>
|
||||
Date: Fri, 28 Oct 2016 15:59:01 +0900
|
||||
Subject: ARM: dts: sun8i: Add common dtsi file for NanoPi SBCs
|
||||
|
||||
(backported from kernel 4.13)
|
||||
|
||||
This patch provides a common file for NanoPi M1 and Neo SBC.
|
||||
|
||||
Those have common features below.
|
||||
* UART0
|
||||
* 2 LEDs
|
||||
* USB host (EHCI3, OHCI3) and PHY
|
||||
* MicroSD
|
||||
* GPIO key switch
|
||||
|
||||
Cc: James Pettigrew <james@innovum.com.au>
|
||||
Signed-off-by: Milo Kim <woogyom.kim@gmail.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
|
||||
@@ -0,0 +1,137 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2016 James Pettigrew <james@innovum.com.au>
|
||||
+ * Copyright (C) 2016 Milo Kim <woogyom.kim@gmail.com>
|
||||
+ *
|
||||
+ * This file is dual-licensed: you can use it either under the terms
|
||||
+ * of the GPL or the X11 license, at your option. Note that this dual
|
||||
+ * licensing only applies to this file, and not this project as a
|
||||
+ * whole.
|
||||
+ *
|
||||
+ * a) This file is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU General Public License as
|
||||
+ * published by the Free Software Foundation; either version 2 of the
|
||||
+ * License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This file is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * Or, alternatively,
|
||||
+ *
|
||||
+ * b) Permission is hereby granted, free of charge, to any person
|
||||
+ * obtaining a copy of this software and associated documentation
|
||||
+ * files (the "Software"), to deal in the Software without
|
||||
+ * restriction, including without limitation the rights to use,
|
||||
+ * copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
+ * sell copies of the Software, and to permit persons to whom the
|
||||
+ * Software is furnished to do so, subject to the following
|
||||
+ * conditions:
|
||||
+ *
|
||||
+ * The above copyright notice and this permission notice shall be
|
||||
+ * included in all copies or substantial portions of the Software.
|
||||
+ *
|
||||
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
+ * OTHER DEALINGS IN THE SOFTWARE.
|
||||
+ */
|
||||
+
|
||||
+/dts-v1/;
|
||||
+#include "sun8i-h3.dtsi"
|
||||
+#include "sunxi-common-regulators.dtsi"
|
||||
+
|
||||
+#include <dt-bindings/gpio/gpio.h>
|
||||
+#include <dt-bindings/input/input.h>
|
||||
+
|
||||
+/ {
|
||||
+ aliases {
|
||||
+ serial0 = &uart0;
|
||||
+ };
|
||||
+
|
||||
+ chosen {
|
||||
+ stdout-path = "serial0:115200n8";
|
||||
+ };
|
||||
+
|
||||
+ leds {
|
||||
+ compatible = "gpio-leds";
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&leds_npi>, <&leds_r_npi>;
|
||||
+
|
||||
+ status {
|
||||
+ label = "nanopi:blue:status";
|
||||
+ gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>;
|
||||
+ linux,default-trigger = "heartbeat";
|
||||
+ };
|
||||
+
|
||||
+ pwr {
|
||||
+ label = "nanopi:green:pwr";
|
||||
+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;
|
||||
+ default-state = "on";
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ r_gpio_keys {
|
||||
+ compatible = "gpio-keys";
|
||||
+ input-name = "k1";
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&sw_r_npi>;
|
||||
+
|
||||
+ k1@0 {
|
||||
+ label = "k1";
|
||||
+ linux,code = <KEY_POWER>;
|
||||
+ gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&ehci3 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&mmc0 {
|
||||
+ bus-width = <4>;
|
||||
+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
|
||||
+ cd-inverted;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
|
||||
+ status = "okay";
|
||||
+ vmmc-supply = <®_vcc3v3>;
|
||||
+};
|
||||
+
|
||||
+&ohci3 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&pio {
|
||||
+ leds_npi: led_pins@0 {
|
||||
+ pins = "PA10";
|
||||
+ function = "gpio_out";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&r_pio {
|
||||
+ leds_r_npi: led_pins@0 {
|
||||
+ pins = "PL10";
|
||||
+ function = "gpio_out";
|
||||
+ };
|
||||
+
|
||||
+ sw_r_npi: key_pins@0 {
|
||||
+ pins = "PL3";
|
||||
+ function = "gpio_in";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&uart0 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&uart0_pins_a>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&usbphy {
|
||||
+ status = "okay";
|
||||
+};
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,206 +0,0 @@
|
|||
From b8ae5c7387ad075ee61e8c8774ce2bca46bc9236 Mon Sep 17 00:00:00 2001
|
||||
From: Corentin LABBE <clabbe.montjoie@gmail.com>
|
||||
Date: Mon, 3 Jul 2017 20:48:48 +0200
|
||||
Subject: crypto: sun4i-ss - support the Security System PRNG
|
||||
|
||||
The Security System has a PRNG, this patch adds support for it via
|
||||
crypto_rng.
|
||||
|
||||
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
||||
---
|
||||
drivers/crypto/Kconfig | 8 +++++
|
||||
drivers/crypto/sunxi-ss/Makefile | 1 +
|
||||
drivers/crypto/sunxi-ss/sun4i-ss-core.c | 30 ++++++++++++++++++
|
||||
drivers/crypto/sunxi-ss/sun4i-ss-prng.c | 56 +++++++++++++++++++++++++++++++++
|
||||
drivers/crypto/sunxi-ss/sun4i-ss.h | 11 +++++++
|
||||
5 files changed, 106 insertions(+)
|
||||
create mode 100644 drivers/crypto/sunxi-ss/sun4i-ss-prng.c
|
||||
|
||||
--- a/drivers/crypto/Kconfig
|
||||
+++ b/drivers/crypto/Kconfig
|
||||
@@ -538,6 +538,14 @@ config CRYPTO_DEV_SUN4I_SS
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called sun4i-ss.
|
||||
|
||||
+config CRYPTO_DEV_SUN4I_SS_PRNG
|
||||
+ bool "Support for Allwinner Security System PRNG"
|
||||
+ depends on CRYPTO_DEV_SUN4I_SS
|
||||
+ select CRYPTO_RNG
|
||||
+ help
|
||||
+ Select this option if you want to provide kernel-side support for
|
||||
+ the Pseudo-Random Number Generator found in the Security System.
|
||||
+
|
||||
config CRYPTO_DEV_ROCKCHIP
|
||||
tristate "Rockchip's Cryptographic Engine driver"
|
||||
depends on OF && ARCH_ROCKCHIP
|
||||
--- a/drivers/crypto/sunxi-ss/Makefile
|
||||
+++ b/drivers/crypto/sunxi-ss/Makefile
|
||||
@@ -1,2 +1,3 @@
|
||||
obj-$(CONFIG_CRYPTO_DEV_SUN4I_SS) += sun4i-ss.o
|
||||
sun4i-ss-y += sun4i-ss-core.o sun4i-ss-hash.o sun4i-ss-cipher.o
|
||||
+sun4i-ss-$(CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG) += sun4i-ss-prng.o
|
||||
--- a/drivers/crypto/sunxi-ss/sun4i-ss-core.c
|
||||
+++ b/drivers/crypto/sunxi-ss/sun4i-ss-core.c
|
||||
@@ -214,6 +214,23 @@ static struct sun4i_ss_alg_template ss_a
|
||||
}
|
||||
}
|
||||
},
|
||||
+#ifdef CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG
|
||||
+{
|
||||
+ .type = CRYPTO_ALG_TYPE_RNG,
|
||||
+ .alg.rng = {
|
||||
+ .base = {
|
||||
+ .cra_name = "stdrng",
|
||||
+ .cra_driver_name = "sun4i_ss_rng",
|
||||
+ .cra_priority = 300,
|
||||
+ .cra_ctxsize = 0,
|
||||
+ .cra_module = THIS_MODULE,
|
||||
+ },
|
||||
+ .generate = sun4i_ss_prng_generate,
|
||||
+ .seed = sun4i_ss_prng_seed,
|
||||
+ .seedsize = SS_SEED_LEN / BITS_PER_BYTE,
|
||||
+ }
|
||||
+},
|
||||
+#endif
|
||||
};
|
||||
|
||||
static int sun4i_ss_probe(struct platform_device *pdev)
|
||||
@@ -356,6 +373,13 @@ static int sun4i_ss_probe(struct platfor
|
||||
goto error_alg;
|
||||
}
|
||||
break;
|
||||
+ case CRYPTO_ALG_TYPE_RNG:
|
||||
+ err = crypto_register_rng(&ss_algs[i].alg.rng);
|
||||
+ if (err) {
|
||||
+ dev_err(ss->dev, "Fail to register %s\n",
|
||||
+ ss_algs[i].alg.rng.base.cra_name);
|
||||
+ }
|
||||
+ break;
|
||||
}
|
||||
}
|
||||
platform_set_drvdata(pdev, ss);
|
||||
@@ -370,6 +394,9 @@ error_alg:
|
||||
case CRYPTO_ALG_TYPE_AHASH:
|
||||
crypto_unregister_ahash(&ss_algs[i].alg.hash);
|
||||
break;
|
||||
+ case CRYPTO_ALG_TYPE_RNG:
|
||||
+ crypto_unregister_rng(&ss_algs[i].alg.rng);
|
||||
+ break;
|
||||
}
|
||||
}
|
||||
if (ss->reset)
|
||||
@@ -394,6 +421,9 @@ static int sun4i_ss_remove(struct platfo
|
||||
case CRYPTO_ALG_TYPE_AHASH:
|
||||
crypto_unregister_ahash(&ss_algs[i].alg.hash);
|
||||
break;
|
||||
+ case CRYPTO_ALG_TYPE_RNG:
|
||||
+ crypto_unregister_rng(&ss_algs[i].alg.rng);
|
||||
+ break;
|
||||
}
|
||||
}
|
||||
|
||||
--- /dev/null
|
||||
+++ b/drivers/crypto/sunxi-ss/sun4i-ss-prng.c
|
||||
@@ -0,0 +1,56 @@
|
||||
+#include "sun4i-ss.h"
|
||||
+
|
||||
+int sun4i_ss_prng_seed(struct crypto_rng *tfm, const u8 *seed,
|
||||
+ unsigned int slen)
|
||||
+{
|
||||
+ struct sun4i_ss_alg_template *algt;
|
||||
+ struct rng_alg *alg = crypto_rng_alg(tfm);
|
||||
+
|
||||
+ algt = container_of(alg, struct sun4i_ss_alg_template, alg.rng);
|
||||
+ memcpy(algt->ss->seed, seed, slen);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+int sun4i_ss_prng_generate(struct crypto_rng *tfm, const u8 *src,
|
||||
+ unsigned int slen, u8 *dst, unsigned int dlen)
|
||||
+{
|
||||
+ struct sun4i_ss_alg_template *algt;
|
||||
+ struct rng_alg *alg = crypto_rng_alg(tfm);
|
||||
+ int i;
|
||||
+ u32 v;
|
||||
+ u32 *data = (u32 *)dst;
|
||||
+ const u32 mode = SS_OP_PRNG | SS_PRNG_CONTINUE | SS_ENABLED;
|
||||
+ size_t len;
|
||||
+ struct sun4i_ss_ctx *ss;
|
||||
+ unsigned int todo = (dlen / 4) * 4;
|
||||
+
|
||||
+ algt = container_of(alg, struct sun4i_ss_alg_template, alg.rng);
|
||||
+ ss = algt->ss;
|
||||
+
|
||||
+ spin_lock(&ss->slock);
|
||||
+
|
||||
+ writel(mode, ss->base + SS_CTL);
|
||||
+
|
||||
+ while (todo > 0) {
|
||||
+ /* write the seed */
|
||||
+ for (i = 0; i < SS_SEED_LEN / BITS_PER_LONG; i++)
|
||||
+ writel(ss->seed[i], ss->base + SS_KEY0 + i * 4);
|
||||
+
|
||||
+ /* Read the random data */
|
||||
+ len = min_t(size_t, SS_DATA_LEN / BITS_PER_BYTE, todo);
|
||||
+ readsl(ss->base + SS_TXFIFO, data, len / 4);
|
||||
+ data += len / 4;
|
||||
+ todo -= len;
|
||||
+
|
||||
+ /* Update the seed */
|
||||
+ for (i = 0; i < SS_SEED_LEN / BITS_PER_LONG; i++) {
|
||||
+ v = readl(ss->base + SS_KEY0 + i * 4);
|
||||
+ ss->seed[i] = v;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ writel(0, ss->base + SS_CTL);
|
||||
+ spin_unlock(&ss->slock);
|
||||
+ return dlen;
|
||||
+}
|
||||
--- a/drivers/crypto/sunxi-ss/sun4i-ss.h
|
||||
+++ b/drivers/crypto/sunxi-ss/sun4i-ss.h
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <crypto/aes.h>
|
||||
#include <crypto/des.h>
|
||||
#include <crypto/internal/rng.h>
|
||||
+#include <crypto/rng.h>
|
||||
|
||||
#define SS_CTL 0x00
|
||||
#define SS_KEY0 0x04
|
||||
@@ -125,6 +126,9 @@
|
||||
#define SS_RXFIFO_EMP_INT_ENABLE (1 << 2)
|
||||
#define SS_TXFIFO_AVA_INT_ENABLE (1 << 0)
|
||||
|
||||
+#define SS_SEED_LEN 192
|
||||
+#define SS_DATA_LEN 160
|
||||
+
|
||||
struct sun4i_ss_ctx {
|
||||
void __iomem *base;
|
||||
int irq;
|
||||
@@ -134,6 +138,9 @@ struct sun4i_ss_ctx {
|
||||
struct device *dev;
|
||||
struct resource *res;
|
||||
spinlock_t slock; /* control the use of the device */
|
||||
+#ifdef CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG
|
||||
+ u32 seed[SS_SEED_LEN / BITS_PER_LONG];
|
||||
+#endif
|
||||
};
|
||||
|
||||
struct sun4i_ss_alg_template {
|
||||
@@ -142,6 +149,7 @@ struct sun4i_ss_alg_template {
|
||||
union {
|
||||
struct crypto_alg crypto;
|
||||
struct ahash_alg hash;
|
||||
+ struct rng_alg rng;
|
||||
} alg;
|
||||
struct sun4i_ss_ctx *ss;
|
||||
};
|
||||
@@ -199,3 +207,6 @@ int sun4i_ss_des_setkey(struct crypto_ab
|
||||
unsigned int keylen);
|
||||
int sun4i_ss_des3_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
|
||||
unsigned int keylen);
|
||||
+int sun4i_ss_prng_generate(struct crypto_rng *tfm, const u8 *src,
|
||||
+ unsigned int slen, u8 *dst, unsigned int dlen);
|
||||
+int sun4i_ss_prng_seed(struct crypto_rng *tfm, const u8 *seed, unsigned int slen);
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
From 79b953605ded6a9a995040a1c8cc665127a6411a Mon Sep 17 00:00:00 2001
|
||||
From: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Date: Wed, 31 May 2017 09:18:45 +0200
|
||||
Subject: arm64: allwinner: sun50i-a64: Add dt node for the syscon control
|
||||
module
|
||||
|
||||
This patch add the dt node for the syscon register present on the
|
||||
Allwinner A64.
|
||||
|
||||
Only two register are present in this syscon and the only one useful is
|
||||
the one dedicated to EMAC clock.
|
||||
|
||||
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
@@ -129,6 +129,12 @@
|
||||
#size-cells = <1>;
|
||||
ranges;
|
||||
|
||||
+ syscon: syscon@1c00000 {
|
||||
+ compatible = "allwinner,sun50i-a64-system-controller",
|
||||
+ "syscon";
|
||||
+ reg = <0x01c00000 0x1000>;
|
||||
+ };
|
||||
+
|
||||
mmc0: mmc@1c0f000 {
|
||||
compatible = "allwinner,sun50i-a64-mmc";
|
||||
reg = <0x01c0f000 0x1000>;
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
From e53f67e981bcc5547857475241b3a4a066955f8c Mon Sep 17 00:00:00 2001
|
||||
From: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Date: Wed, 31 May 2017 09:18:46 +0200
|
||||
Subject: arm64: allwinner: sun50i-a64: add dwmac-sun8i Ethernet driver
|
||||
|
||||
The dwmac-sun8i is an Ethernet MAC that supports 10/100/1000 Mbit
|
||||
connections. It is very similar to the device found in the Allwinner
|
||||
H3, but lacks the internal 100 Mbit PHY and its associated control
|
||||
bits.
|
||||
This adds the necessary bits to the Allwinner A64 SoC .dtsi, but keeps
|
||||
it disabled at this level.
|
||||
|
||||
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 35 +++++++++++++++++++++++++++
|
||||
1 file changed, 35 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
@@ -284,6 +284,21 @@
|
||||
bias-pull-up;
|
||||
};
|
||||
|
||||
+ rmii_pins: rmii_pins {
|
||||
+ pins = "PD10", "PD11", "PD13", "PD14", "PD17",
|
||||
+ "PD18", "PD19", "PD20", "PD22", "PD23";
|
||||
+ function = "emac";
|
||||
+ drive-strength = <40>;
|
||||
+ };
|
||||
+
|
||||
+ rgmii_pins: rgmii_pins {
|
||||
+ pins = "PD8", "PD9", "PD10", "PD11", "PD12",
|
||||
+ "PD13", "PD15", "PD16", "PD17", "PD18",
|
||||
+ "PD19", "PD20", "PD21", "PD22", "PD23";
|
||||
+ function = "emac";
|
||||
+ drive-strength = <40>;
|
||||
+ };
|
||||
+
|
||||
uart0_pins_a: uart0@0 {
|
||||
pins = "PB8", "PB9";
|
||||
function = "uart0";
|
||||
@@ -388,6 +403,26 @@
|
||||
#size-cells = <0>;
|
||||
};
|
||||
|
||||
+ emac: ethernet@1c30000 {
|
||||
+ compatible = "allwinner,sun50i-a64-emac";
|
||||
+ syscon = <&syscon>;
|
||||
+ reg = <0x01c30000 0x100>;
|
||||
+ interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ interrupt-names = "macirq";
|
||||
+ resets = <&ccu RST_BUS_EMAC>;
|
||||
+ reset-names = "stmmaceth";
|
||||
+ clocks = <&ccu CLK_BUS_EMAC>;
|
||||
+ clock-names = "stmmaceth";
|
||||
+ status = "disabled";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+
|
||||
+ mdio: mdio {
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
gic: interrupt-controller@1c81000 {
|
||||
compatible = "arm,gic-400";
|
||||
reg = <0x01c81000 0x1000>,
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
From 97023943749367111b9a88e09d1b9bd157dd3326 Mon Sep 17 00:00:00 2001
|
||||
From: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Date: Wed, 31 May 2017 09:18:47 +0200
|
||||
Subject: arm64: allwinner: pine64: Enable dwmac-sun8i
|
||||
|
||||
The dwmac-sun8i hardware is present on the pine64
|
||||
It uses an external PHY via RMII.
|
||||
|
||||
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 16 ++++++++++++++++
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
||||
@@ -70,6 +70,15 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&emac {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&rmii_pins>;
|
||||
+ phy-mode = "rmii";
|
||||
+ phy-handle = <&ext_rmii_phy1>;
|
||||
+ status = "okay";
|
||||
+
|
||||
+};
|
||||
+
|
||||
&i2c1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&i2c1_pins>;
|
||||
@@ -80,6 +89,13 @@
|
||||
bias-pull-up;
|
||||
};
|
||||
|
||||
+&mdio {
|
||||
+ ext_rmii_phy1: ethernet-phy@1 {
|
||||
+ compatible = "ethernet-phy-ieee802.3-c22";
|
||||
+ reg = <1>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
&mmc0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&mmc0_pins>;
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
From 94dcfdc77fc55ed1956011ceea341911c6e760a0 Mon Sep 17 00:00:00 2001
|
||||
From: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Date: Wed, 31 May 2017 09:18:48 +0200
|
||||
Subject: arm64: allwinner: pine64-plus: Enable dwmac-sun8i
|
||||
|
||||
The dwmac-sun8i hardware is present on the pine64 plus.
|
||||
It uses an external PHY rtl8211e via RGMII.
|
||||
|
||||
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
.../arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 17 ++++++++++++++++-
|
||||
1 file changed, 16 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts
|
||||
@@ -46,5 +46,20 @@
|
||||
model = "Pine64+";
|
||||
compatible = "pine64,pine64-plus", "allwinner,sun50i-a64";
|
||||
|
||||
- /* TODO: Camera, Ethernet PHY, touchscreen, etc. */
|
||||
+ /* TODO: Camera, touchscreen, etc. */
|
||||
+};
|
||||
+
|
||||
+&emac {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&rgmii_pins>;
|
||||
+ phy-mode = "rgmii";
|
||||
+ phy-handle = <&ext_rgmii_phy>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&mdio {
|
||||
+ ext_rgmii_phy: ethernet-phy@1 {
|
||||
+ compatible = "ethernet-phy-ieee802.3-c22";
|
||||
+ reg = <1>;
|
||||
+ };
|
||||
};
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From 3a4bae5fd44aa1cf49780dd25b3a89e6a39e8560 Mon Sep 17 00:00:00 2001
|
||||
From: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Date: Mon, 10 Jul 2017 20:44:40 +0200
|
||||
Subject: arm64: allwinner: sun50i-a64: Correct emac register size
|
||||
|
||||
The datasheet said that emac register size is 0x10000 not 0x100
|
||||
|
||||
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
[wens@csie.org: Fixed commit subject prefix]
|
||||
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
||||
@@ -406,7 +406,7 @@
|
||||
emac: ethernet@1c30000 {
|
||||
compatible = "allwinner,sun50i-a64-emac";
|
||||
syscon = <&syscon>;
|
||||
- reg = <0x01c30000 0x100>;
|
||||
+ reg = <0x01c30000 0x10000>;
|
||||
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "macirq";
|
||||
resets = <&ccu RST_BUS_EMAC>;
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From dff751c68904cf587d918cfb6b2f5b0112f73bc9 Mon Sep 17 00:00:00 2001
|
||||
From: Icenowy Zheng <icenowy@aosc.io>
|
||||
Date: Sat, 22 Jul 2017 10:28:51 +0800
|
||||
Subject: arm64: allwinner: a64: pine64: add missing ethernet0 alias
|
||||
|
||||
The EMAC Ethernet controller was enabled, but an accompanying alias
|
||||
was not added. This results in unstable numbering if other Ethernet
|
||||
devices, such as a USB dongle, are present. Also, the bootloader uses
|
||||
the alias to assign a generated stable MAC address to the device node.
|
||||
|
||||
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
Fixes: 970239437493 ("arm64: allwinner: pine64: Enable dwmac-sun8i")
|
||||
[wens@csie.org: Rewrite commit log as fixing a previous patch with Fixes]
|
||||
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
|
||||
---
|
||||
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
|
||||
@@ -51,6 +51,7 @@
|
||||
compatible = "pine64,pine64", "allwinner,sun50i-a64";
|
||||
|
||||
aliases {
|
||||
+ ethernet0 = &emac;
|
||||
serial0 = &uart0;
|
||||
};
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From d91d3daf5de90e0118227d8ddcb7bb4ff40c1b91 Mon Sep 17 00:00:00 2001
|
||||
From: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Date: Wed, 31 May 2017 09:18:37 +0200
|
||||
Subject: arm: sun8i: sunxi-h3-h5: Add dt node for the syscon control module
|
||||
|
||||
This patch add the dt node for the syscon register present on the
|
||||
Allwinner H3/H5
|
||||
|
||||
Only two register are present in this syscon and the only one useful is
|
||||
the one dedicated to EMAC clock..
|
||||
|
||||
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm/boot/dts/sunxi-h3-h5.dtsi | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
|
||||
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
|
||||
@@ -140,6 +140,12 @@
|
||||
#size-cells = <1>;
|
||||
ranges;
|
||||
|
||||
+ syscon: syscon@1c00000 {
|
||||
+ compatible = "allwinner,sun8i-h3-system-controller",
|
||||
+ "syscon";
|
||||
+ reg = <0x01c00000 0x1000>;
|
||||
+ };
|
||||
+
|
||||
dma: dma-controller@01c02000 {
|
||||
compatible = "allwinner,sun8i-h3-dma";
|
||||
reg = <0x01c02000 0x1000>;
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
From 0eba511a3cac29d6338b22b5b727f40cf8d163df Mon Sep 17 00:00:00 2001
|
||||
From: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Date: Wed, 31 May 2017 09:18:38 +0200
|
||||
Subject: arm: sun8i: sunxi-h3-h5: add dwmac-sun8i ethernet driver
|
||||
|
||||
The dwmac-sun8i is an ethernet MAC hardware that support 10/100/1000
|
||||
speed.
|
||||
|
||||
This patch enable the dwmac-sun8i on Allwinner H3/H5 SoC Device-tree.
|
||||
SoC H3/H5 have an internal PHY, so optionals syscon and ephy are set.
|
||||
|
||||
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm/boot/dts/sunxi-h3-h5.dtsi | 34 ++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 34 insertions(+)
|
||||
|
||||
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
|
||||
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
|
||||
@@ -333,6 +333,14 @@
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <3>;
|
||||
|
||||
+ emac_rgmii_pins: emac0 {
|
||||
+ pins = "PD0", "PD1", "PD2", "PD3", "PD4",
|
||||
+ "PD5", "PD7", "PD8", "PD9", "PD10",
|
||||
+ "PD12", "PD13", "PD15", "PD16", "PD17";
|
||||
+ function = "emac";
|
||||
+ drive-strength = <40>;
|
||||
+ };
|
||||
+
|
||||
i2c0_pins: i2c0 {
|
||||
allwinner,pins = "PA11", "PA12";
|
||||
allwinner,function = "i2c0";
|
||||
@@ -431,6 +439,32 @@
|
||||
clocks = <&osc24M>;
|
||||
};
|
||||
|
||||
+ emac: ethernet@1c30000 {
|
||||
+ compatible = "allwinner,sun8i-h3-emac";
|
||||
+ syscon = <&syscon>;
|
||||
+ reg = <0x01c30000 0x104>;
|
||||
+ interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
|
||||
+ interrupt-names = "macirq";
|
||||
+ resets = <&ccu RST_BUS_EMAC>;
|
||||
+ reset-names = "stmmaceth";
|
||||
+ clocks = <&ccu CLK_BUS_EMAC>;
|
||||
+ clock-names = "stmmaceth";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ status = "disabled";
|
||||
+
|
||||
+ mdio: mdio {
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ int_mii_phy: ethernet-phy@1 {
|
||||
+ compatible = "ethernet-phy-ieee802.3-c22";
|
||||
+ reg = <1>;
|
||||
+ clocks = <&ccu CLK_BUS_EPHY>;
|
||||
+ resets = <&ccu RST_BUS_EPHY>;
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
wdt0: watchdog@01c20ca0 {
|
||||
compatible = "allwinner,sun6i-a31-wdt";
|
||||
reg = <0x01c20ca0 0x20>;
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
From a9992f2dd1890112643a93d621ff5a4c97c55d53 Mon Sep 17 00:00:00 2001
|
||||
From: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Date: Wed, 31 May 2017 09:18:42 +0200
|
||||
Subject: arm: sun8i: orangepi-2: Enable dwmac-sun8i
|
||||
|
||||
The dwmac-sun8i hardware is present on the Orange PI 2.
|
||||
It uses the internal PHY.
|
||||
|
||||
This patch create the needed emac node.
|
||||
|
||||
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
|
||||
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
|
||||
@@ -55,6 +55,7 @@
|
||||
aliases {
|
||||
serial0 = &uart0;
|
||||
/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
|
||||
+ ethernet0 = &emac;
|
||||
ethernet1 = &rtl8189;
|
||||
};
|
||||
|
||||
@@ -109,6 +110,13 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&emac {
|
||||
+ phy-handle = <&int_mii_phy>;
|
||||
+ phy-mode = "mii";
|
||||
+ allwinner,leds-active-low;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&ir {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&ir_pins_a>;
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
From 1dcd0095019aca7533eaeed9475d995a4eb30137 Mon Sep 17 00:00:00 2001
|
||||
From: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Date: Mon, 5 Jun 2017 21:21:26 +0200
|
||||
Subject: ARM: sun8i: orangepi-plus: Enable dwmac-sun8i
|
||||
|
||||
The dwmac-sun8i hardware is present on the Orange PI plus.
|
||||
It uses an external PHY rtl8211e via RGMII.
|
||||
|
||||
This patch create the needed regulator, emac and phy nodes.
|
||||
|
||||
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
---
|
||||
arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 32 ++++++++++++++++++++++++++++
|
||||
1 file changed, 32 insertions(+)
|
||||
|
||||
--- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
|
||||
+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
|
||||
@@ -47,6 +47,20 @@
|
||||
model = "Xunlong Orange Pi Plus / Plus 2";
|
||||
compatible = "xunlong,orangepi-plus", "allwinner,sun8i-h3";
|
||||
|
||||
+ aliases {
|
||||
+ ethernet0 = &emac;
|
||||
+ };
|
||||
+
|
||||
+ reg_gmac_3v3: gmac-3v3 {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "gmac-3v3";
|
||||
+ regulator-min-microvolt = <3300000>;
|
||||
+ regulator-max-microvolt = <3300000>;
|
||||
+ startup-delay-us = <100000>;
|
||||
+ enable-active-high;
|
||||
+ gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+
|
||||
reg_usb3_vbus: usb3-vbus {
|
||||
compatible = "regulator-fixed";
|
||||
pinctrl-names = "default";
|
||||
@@ -64,6 +78,24 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&emac {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&emac_rgmii_pins>;
|
||||
+ phy-supply = <®_gmac_3v3>;
|
||||
+ phy-handle = <&ext_rgmii_phy>;
|
||||
+ phy-mode = "rgmii";
|
||||
+
|
||||
+ allwinner,leds-active-low;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&mdio {
|
||||
+ ext_rgmii_phy: ethernet-phy@1 {
|
||||
+ compatible = "ethernet-phy-ieee802.3-c22";
|
||||
+ reg = <0>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
&mmc2 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&mmc2_8bit_pins>;
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From 072b6e3692532b6281bf781ded1c7a986ac17471 Mon Sep 17 00:00:00 2001
|
||||
From: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Date: Thu, 6 Jul 2017 10:53:34 +0200
|
||||
Subject: ARM: dts: sunxi: h3/h5: Correct emac register size
|
||||
|
||||
The datasheet said that emac register size is 0x10000 not 0x104
|
||||
|
||||
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
[wens@csie.org: Fixed commit subject prefix]
|
||||
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
|
||||
---
|
||||
arch/arm/boot/dts/sunxi-h3-h5.dtsi | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
|
||||
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
|
||||
@@ -442,7 +442,7 @@
|
||||
emac: ethernet@1c30000 {
|
||||
compatible = "allwinner,sun8i-h3-emac";
|
||||
syscon = <&syscon>;
|
||||
- reg = <0x01c30000 0x104>;
|
||||
+ reg = <0x01c30000 0x10000>;
|
||||
interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "macirq";
|
||||
resets = <&ccu RST_BUS_EMAC>;
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
|
||||
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
|
||||
@@ -53,6 +53,7 @@
|
||||
|
||||
aliases {
|
||||
serial0 = &uart0;
|
||||
+ ethernet0 = &emac;
|
||||
};
|
||||
|
||||
chosen {
|
||||
@@ -81,6 +82,13 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&emac {
|
||||
+ phy-handle = <&int_mii_phy>;
|
||||
+ phy-mode = "mii";
|
||||
+ allwinner,leds-active-low;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&mmc0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
From e036def69972b9db9d2695f45cbf4e84c707b3c5 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Golle <daniel@makrotopia.org>
|
||||
Date: Fri, 23 Dec 2016 07:28:51 +0100
|
||||
Subject: [PATCH] ARM: dts: sun8i: nanopi-neo: enable UART, USB and I2C pins
|
||||
|
||||
---
|
||||
arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 43 ++++++++++++++++++++++++++++---
|
||||
1 file changed, 40 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
|
||||
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts
|
||||
@@ -78,10 +78,30 @@
|
||||
};
|
||||
};
|
||||
|
||||
+&ehci1 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&ohci1 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&ehci2 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&ohci2 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&ehci3 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&ohci3 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&emac {
|
||||
phy-handle = <&int_mii_phy>;
|
||||
phy-mode = "mii";
|
||||
@@ -99,9 +119,6 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
-&ohci3 {
|
||||
- status = "okay";
|
||||
-};
|
||||
|
||||
&pio {
|
||||
leds_opc: led-pins {
|
||||
@@ -127,7 +144,27 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&uart1 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&uart1_pins>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&uart2 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&uart2_pins>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&usbphy {
|
||||
/* USB VBUS is always on */
|
||||
status = "okay";
|
||||
};
|
||||
+
|
||||
+&i2c0 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&i2c1 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
|
|
@ -1,288 +0,0 @@
|
|||
--- a/Documentation/devicetree/bindings/mmc/sunxi-mmc.txt
|
||||
+++ b/Documentation/devicetree/bindings/mmc/sunxi-mmc.txt
|
||||
@@ -13,6 +13,7 @@ Required properties:
|
||||
* "allwinner,sun5i-a13-mmc"
|
||||
* "allwinner,sun7i-a20-mmc"
|
||||
* "allwinner,sun9i-a80-mmc"
|
||||
+ * "allwinner,sun50i-a64-emmc"
|
||||
* "allwinner,sun50i-a64-mmc"
|
||||
- reg : mmc controller base registers
|
||||
- clocks : a list with 4 phandle + clock specifier pairs
|
||||
--- a/drivers/mmc/host/sunxi-mmc.c
|
||||
+++ b/drivers/mmc/host/sunxi-mmc.c
|
||||
@@ -5,6 +5,7 @@
|
||||
* (C) Copyright 2013-2014 O2S GmbH <www.o2s.ch>
|
||||
* (C) Copyright 2013-2014 David Lanzend<6E>rfer <david.lanzendoerfer@o2s.ch>
|
||||
* (C) Copyright 2013-2014 Hans de Goede <hdegoede@redhat.com>
|
||||
+ * (C) Copyright 2017 Sootech SA
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
@@ -101,6 +102,7 @@
|
||||
(SDXC_SOFT_RESET | SDXC_FIFO_RESET | SDXC_DMA_RESET)
|
||||
|
||||
/* clock control bits */
|
||||
+#define SDXC_MASK_DATA0 BIT(31)
|
||||
#define SDXC_CARD_CLOCK_ON BIT(16)
|
||||
#define SDXC_LOW_POWER_ON BIT(17)
|
||||
|
||||
@@ -253,6 +255,11 @@ struct sunxi_mmc_cfg {
|
||||
|
||||
/* does the IP block support autocalibration? */
|
||||
bool can_calibrate;
|
||||
+
|
||||
+ /* Does DATA0 needs to be masked while the clock is updated */
|
||||
+ bool mask_data0;
|
||||
+
|
||||
+ bool needs_new_timings;
|
||||
};
|
||||
|
||||
struct sunxi_mmc_host {
|
||||
@@ -482,7 +489,7 @@ static void sunxi_mmc_dump_errinfo(struc
|
||||
cmd->opcode == SD_IO_RW_DIRECT))
|
||||
return;
|
||||
|
||||
- dev_err(mmc_dev(host->mmc),
|
||||
+ dev_dbg(mmc_dev(host->mmc),
|
||||
"smc %d err, cmd %d,%s%s%s%s%s%s%s%s%s%s !!\n",
|
||||
host->mmc->index, cmd->opcode,
|
||||
data ? (data->flags & MMC_DATA_WRITE ? " WR" : " RD") : "",
|
||||
@@ -654,11 +661,16 @@ static int sunxi_mmc_oclk_onoff(struct s
|
||||
unsigned long expire = jiffies + msecs_to_jiffies(750);
|
||||
u32 rval;
|
||||
|
||||
+ dev_dbg(mmc_dev(host->mmc), "%sabling the clock\n",
|
||||
+ oclk_en ? "en" : "dis");
|
||||
+
|
||||
rval = mmc_readl(host, REG_CLKCR);
|
||||
- rval &= ~(SDXC_CARD_CLOCK_ON | SDXC_LOW_POWER_ON);
|
||||
+ rval &= ~(SDXC_CARD_CLOCK_ON | SDXC_LOW_POWER_ON | SDXC_MASK_DATA0);
|
||||
|
||||
if (oclk_en)
|
||||
rval |= SDXC_CARD_CLOCK_ON;
|
||||
+ if (host->cfg->mask_data0)
|
||||
+ rval |= SDXC_MASK_DATA0;
|
||||
|
||||
mmc_writel(host, REG_CLKCR, rval);
|
||||
|
||||
@@ -678,46 +690,29 @@ static int sunxi_mmc_oclk_onoff(struct s
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
+ if (host->cfg->mask_data0) {
|
||||
+ rval = mmc_readl(host, REG_CLKCR);
|
||||
+ mmc_writel(host, REG_CLKCR, rval & ~SDXC_MASK_DATA0);
|
||||
+ }
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sunxi_mmc_calibrate(struct sunxi_mmc_host *host, int reg_off)
|
||||
{
|
||||
- u32 reg = readl(host->reg_base + reg_off);
|
||||
- u32 delay;
|
||||
- unsigned long timeout;
|
||||
-
|
||||
if (!host->cfg->can_calibrate)
|
||||
return 0;
|
||||
|
||||
- reg &= ~(SDXC_CAL_DL_MASK << SDXC_CAL_DL_SW_SHIFT);
|
||||
- reg &= ~SDXC_CAL_DL_SW_EN;
|
||||
-
|
||||
- writel(reg | SDXC_CAL_START, host->reg_base + reg_off);
|
||||
-
|
||||
- dev_dbg(mmc_dev(host->mmc), "calibration started\n");
|
||||
-
|
||||
- timeout = jiffies + HZ * SDXC_CAL_TIMEOUT;
|
||||
-
|
||||
- while (!((reg = readl(host->reg_base + reg_off)) & SDXC_CAL_DONE)) {
|
||||
- if (time_before(jiffies, timeout))
|
||||
- cpu_relax();
|
||||
- else {
|
||||
- reg &= ~SDXC_CAL_START;
|
||||
- writel(reg, host->reg_base + reg_off);
|
||||
-
|
||||
- return -ETIMEDOUT;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- delay = (reg >> SDXC_CAL_DL_SHIFT) & SDXC_CAL_DL_MASK;
|
||||
-
|
||||
- reg &= ~SDXC_CAL_START;
|
||||
- reg |= (delay << SDXC_CAL_DL_SW_SHIFT) | SDXC_CAL_DL_SW_EN;
|
||||
-
|
||||
- writel(reg, host->reg_base + reg_off);
|
||||
-
|
||||
- dev_dbg(mmc_dev(host->mmc), "calibration ended, reg is 0x%x\n", reg);
|
||||
+ /*
|
||||
+ * FIXME:
|
||||
+ * This is not clear how the calibration is supposed to work
|
||||
+ * yet. The best rate have been obtained by simply setting the
|
||||
+ * delay to 0, as Allwinner does in its BSP.
|
||||
+ *
|
||||
+ * The only mode that doesn't have such a delay is HS400, that
|
||||
+ * is in itself a TODO.
|
||||
+ */
|
||||
+ writel(SDXC_CAL_DL_SW_EN, host->reg_base + reg_off);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -745,6 +740,7 @@ static int sunxi_mmc_clk_set_phase(struc
|
||||
index = SDXC_CLK_50M_DDR;
|
||||
}
|
||||
} else {
|
||||
+ dev_dbg(mmc_dev(host->mmc), "Invalid clock... returning\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -757,10 +753,21 @@ static int sunxi_mmc_clk_set_phase(struc
|
||||
static int sunxi_mmc_clk_set_rate(struct sunxi_mmc_host *host,
|
||||
struct mmc_ios *ios)
|
||||
{
|
||||
+ struct mmc_host *mmc = host->mmc;
|
||||
long rate;
|
||||
u32 rval, clock = ios->clock;
|
||||
int ret;
|
||||
|
||||
+ ret = sunxi_mmc_oclk_onoff(host, 0);
|
||||
+ if (ret)
|
||||
+ return ret;
|
||||
+
|
||||
+ /* Our clock is gated now */
|
||||
+ mmc->actual_clock = 0;
|
||||
+
|
||||
+ if (!ios->clock)
|
||||
+ return 0;
|
||||
+
|
||||
/* 8 bit DDR requires a higher module clock */
|
||||
if (ios->timing == MMC_TIMING_MMC_DDR52 &&
|
||||
ios->bus_width == MMC_BUS_WIDTH_8)
|
||||
@@ -768,25 +775,21 @@ static int sunxi_mmc_clk_set_rate(struct
|
||||
|
||||
rate = clk_round_rate(host->clk_mmc, clock);
|
||||
if (rate < 0) {
|
||||
- dev_err(mmc_dev(host->mmc), "error rounding clk to %d: %ld\n",
|
||||
+ dev_err(mmc_dev(mmc), "error rounding clk to %d: %ld\n",
|
||||
clock, rate);
|
||||
return rate;
|
||||
}
|
||||
- dev_dbg(mmc_dev(host->mmc), "setting clk to %d, rounded %ld\n",
|
||||
+ dev_dbg(mmc_dev(mmc), "setting clk to %d, rounded %ld\n",
|
||||
clock, rate);
|
||||
|
||||
/* setting clock rate */
|
||||
ret = clk_set_rate(host->clk_mmc, rate);
|
||||
if (ret) {
|
||||
- dev_err(mmc_dev(host->mmc), "error setting clk to %ld: %d\n",
|
||||
+ dev_err(mmc_dev(mmc), "error setting clk to %ld: %d\n",
|
||||
rate, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
- ret = sunxi_mmc_oclk_onoff(host, 0);
|
||||
- if (ret)
|
||||
- return ret;
|
||||
-
|
||||
/* clear internal divider */
|
||||
rval = mmc_readl(host, REG_CLKCR);
|
||||
rval &= ~0xff;
|
||||
@@ -798,6 +801,13 @@ static int sunxi_mmc_clk_set_rate(struct
|
||||
}
|
||||
mmc_writel(host, REG_CLKCR, rval);
|
||||
|
||||
+ if (host->cfg->needs_new_timings) {
|
||||
+ /* Don't touch the delay bits */
|
||||
+ rval = mmc_readl(host, REG_SD_NTSR);
|
||||
+ rval |= SDXC_2X_TIMING_MODE;
|
||||
+ mmc_writel(host, REG_SD_NTSR, rval);
|
||||
+ }
|
||||
+
|
||||
ret = sunxi_mmc_clk_set_phase(host, ios, rate);
|
||||
if (ret)
|
||||
return ret;
|
||||
@@ -806,9 +816,22 @@ static int sunxi_mmc_clk_set_rate(struct
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
- /* TODO: enable calibrate on sdc2 SDXC_REG_DS_DL_REG of A64 */
|
||||
+ /*
|
||||
+ * FIXME:
|
||||
+ *
|
||||
+ * In HS400 we'll also need to calibrate the data strobe
|
||||
+ * signal. This should only happen on the MMC2 controller (at
|
||||
+ * least on the A64).
|
||||
+ */
|
||||
+
|
||||
+ ret = sunxi_mmc_oclk_onoff(host, 1);
|
||||
+ if (ret)
|
||||
+ return ret;
|
||||
|
||||
- return sunxi_mmc_oclk_onoff(host, 1);
|
||||
+ /* And we just enabled our clock back */
|
||||
+ mmc->actual_clock = rate;
|
||||
+
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static void sunxi_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
|
||||
@@ -822,10 +845,13 @@ static void sunxi_mmc_set_ios(struct mmc
|
||||
break;
|
||||
|
||||
case MMC_POWER_UP:
|
||||
- host->ferror = mmc_regulator_set_ocr(mmc, mmc->supply.vmmc,
|
||||
- ios->vdd);
|
||||
- if (host->ferror)
|
||||
- return;
|
||||
+ if (!IS_ERR(mmc->supply.vmmc)) {
|
||||
+ host->ferror = mmc_regulator_set_ocr(mmc,
|
||||
+ mmc->supply.vmmc,
|
||||
+ ios->vdd);
|
||||
+ if (host->ferror)
|
||||
+ return;
|
||||
+ }
|
||||
|
||||
if (!IS_ERR(mmc->supply.vqmmc)) {
|
||||
host->ferror = regulator_enable(mmc->supply.vqmmc);
|
||||
@@ -847,7 +873,9 @@ static void sunxi_mmc_set_ios(struct mmc
|
||||
case MMC_POWER_OFF:
|
||||
dev_dbg(mmc_dev(mmc), "power off!\n");
|
||||
sunxi_mmc_reset_host(host);
|
||||
- mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);
|
||||
+ if (!IS_ERR(mmc->supply.vmmc))
|
||||
+ mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);
|
||||
+
|
||||
if (!IS_ERR(mmc->supply.vqmmc) && host->vqmmc_enabled)
|
||||
regulator_disable(mmc->supply.vqmmc);
|
||||
host->vqmmc_enabled = false;
|
||||
@@ -877,7 +905,7 @@ static void sunxi_mmc_set_ios(struct mmc
|
||||
mmc_writel(host, REG_GCTRL, rval);
|
||||
|
||||
/* set up clock */
|
||||
- if (ios->clock && ios->power_mode) {
|
||||
+ if (ios->power_mode) {
|
||||
host->ferror = sunxi_mmc_clk_set_rate(host, ios);
|
||||
/* Android code had a usleep_range(50000, 55000); here */
|
||||
}
|
||||
@@ -1084,6 +1112,14 @@ static const struct sunxi_mmc_cfg sun50i
|
||||
.idma_des_size_bits = 16,
|
||||
.clk_delays = NULL,
|
||||
.can_calibrate = true,
|
||||
+ .mask_data0 = true,
|
||||
+ .needs_new_timings = true,
|
||||
+};
|
||||
+
|
||||
+static const struct sunxi_mmc_cfg sun50i_a64_emmc_cfg = {
|
||||
+ .idma_des_size_bits = 13,
|
||||
+ .clk_delays = NULL,
|
||||
+ .can_calibrate = true,
|
||||
};
|
||||
|
||||
static const struct of_device_id sunxi_mmc_of_match[] = {
|
||||
@@ -1092,6 +1128,7 @@ static const struct of_device_id sunxi_m
|
||||
{ .compatible = "allwinner,sun7i-a20-mmc", .data = &sun7i_a20_cfg },
|
||||
{ .compatible = "allwinner,sun9i-a80-mmc", .data = &sun9i_a80_cfg },
|
||||
{ .compatible = "allwinner,sun50i-a64-mmc", .data = &sun50i_a64_cfg },
|
||||
+ { .compatible = "allwinner,sun50i-a64-emmc", .data = &sun50i_a64_emmc_cfg },
|
||||
{ /* sentinel */ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, sunxi_mmc_of_match);
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From fce20ac5d8c98f1a8ea5298051d9fa669e455f04 Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Tue, 4 Aug 2015 23:22:45 +0200
|
||||
Subject: [PATCH] musb: sunxi: Ignore VBus errors in host-only mode
|
||||
|
||||
For some unclear reason sometimes we get VBus errors in host-only mode,
|
||||
even though we do not have any vbus-detection then. Ignore these.
|
||||
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
---
|
||||
drivers/usb/musb/sunxi.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
--- a/drivers/usb/musb/sunxi.c
|
||||
+++ b/drivers/usb/musb/sunxi.c
|
||||
@@ -202,6 +202,10 @@ static irqreturn_t sunxi_musb_interrupt(
|
||||
musb_writeb(musb->mregs, MUSB_FADDR, 0);
|
||||
}
|
||||
|
||||
+ /* Ignore Vbus errors when in host only mode */
|
||||
+ if (musb->port_mode == MUSB_PORT_MODE_HOST)
|
||||
+ musb->int_usb &= ~MUSB_INTR_VBUSERROR;
|
||||
+
|
||||
musb->int_tx = readw(musb->mregs + SUNXI_MUSB_INTRTX);
|
||||
if (musb->int_tx)
|
||||
writew(musb->int_tx, musb->mregs + SUNXI_MUSB_INTRTX);
|
||||
|
|
@ -1,92 +0,0 @@
|
|||
From 5f0bb9d0bc545ef53a83f7bd176fdc0736eed8e5 Mon Sep 17 00:00:00 2001
|
||||
From: Jens Kuske <jenskuske@gmail.com>
|
||||
Date: Tue, 27 Oct 2015 17:50:24 +0100
|
||||
Subject: [PATCH] reset: sunxi: Add Allwinner H3 bus resets
|
||||
|
||||
The H3 bus resets have some holes between the registers, so we add
|
||||
an of_xlate() function to skip them according to the datasheet.
|
||||
|
||||
Signed-off-by: Jens Kuske <jenskuske@gmail.com>
|
||||
---
|
||||
.../bindings/reset/allwinner,sunxi-clock-reset.txt | 1 +
|
||||
drivers/reset/reset-sunxi.c | 30 +++++++++++++++++++---
|
||||
2 files changed, 28 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/Documentation/devicetree/bindings/reset/allwinner,sunxi-clock-reset.txt
|
||||
+++ b/Documentation/devicetree/bindings/reset/allwinner,sunxi-clock-reset.txt
|
||||
@@ -8,6 +8,7 @@ Required properties:
|
||||
- compatible: Should be one of the following:
|
||||
"allwinner,sun6i-a31-ahb1-reset"
|
||||
"allwinner,sun6i-a31-clock-reset"
|
||||
+ "allwinner,sun8i-h3-bus-reset"
|
||||
- reg: should be register base and length as documented in the
|
||||
datasheet
|
||||
- #reset-cells: 1, see below
|
||||
--- a/drivers/reset/reset-sunxi.c
|
||||
+++ b/drivers/reset/reset-sunxi.c
|
||||
@@ -75,7 +75,9 @@ static const struct reset_control_ops su
|
||||
.deassert = sunxi_reset_deassert,
|
||||
};
|
||||
|
||||
-static int sunxi_reset_init(struct device_node *np)
|
||||
+static int sunxi_reset_init(struct device_node *np,
|
||||
+ int (*of_xlate)(struct reset_controller_dev *rcdev,
|
||||
+ const struct of_phandle_args *reset_spec))
|
||||
{
|
||||
struct sunxi_reset_data *data;
|
||||
struct resource res;
|
||||
@@ -108,6 +110,7 @@ static int sunxi_reset_init(struct devic
|
||||
data->rcdev.nr_resets = size * 32;
|
||||
data->rcdev.ops = &sunxi_reset_ops;
|
||||
data->rcdev.of_node = np;
|
||||
+ data->rcdev.of_xlate = of_xlate;
|
||||
|
||||
return reset_controller_register(&data->rcdev);
|
||||
|
||||
@@ -116,6 +119,21 @@ err_alloc:
|
||||
return ret;
|
||||
};
|
||||
|
||||
+static int sun8i_h3_bus_reset_xlate(struct reset_controller_dev *rcdev,
|
||||
+ const struct of_phandle_args *reset_spec)
|
||||
+{
|
||||
+ unsigned int index = reset_spec->args[0];
|
||||
+
|
||||
+ if (index < 96)
|
||||
+ return index;
|
||||
+ else if (index < 128)
|
||||
+ return index + 32;
|
||||
+ else if (index < 160)
|
||||
+ return index + 64;
|
||||
+ else
|
||||
+ return -EINVAL;
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* These are the reset controller we need to initialize early on in
|
||||
* our system, before we can even think of using a regular device
|
||||
@@ -123,15 +141,21 @@ err_alloc:
|
||||
*/
|
||||
static const struct of_device_id sunxi_early_reset_dt_ids[] __initconst = {
|
||||
{ .compatible = "allwinner,sun6i-a31-ahb1-reset", },
|
||||
+ { .compatible = "allwinner,sun8i-h3-bus-reset", .data = sun8i_h3_bus_reset_xlate, },
|
||||
{ /* sentinel */ },
|
||||
};
|
||||
|
||||
void __init sun6i_reset_init(void)
|
||||
{
|
||||
struct device_node *np;
|
||||
-
|
||||
- for_each_matching_node(np, sunxi_early_reset_dt_ids)
|
||||
- sunxi_reset_init(np);
|
||||
+ const struct of_device_id *match;
|
||||
+ int (*of_xlate)(struct reset_controller_dev *rcdev,
|
||||
+ const struct of_phandle_args *reset_spec);
|
||||
+
|
||||
+ for_each_matching_node_and_match(np, sunxi_early_reset_dt_ids, &match) {
|
||||
+ of_xlate = match->data;
|
||||
+ sunxi_reset_init(np, of_xlate);
|
||||
+ }
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1,196 +0,0 @@
|
|||
From daf75255fb67bf44db178e4c95a803b7972ed670 Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Tue, 26 Sep 2017 22:29:06 +0200
|
||||
Subject: ARM: dts: sunxi: add support for Orange Pi R1 board
|
||||
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
arch/arm/boot/dts/Makefile | 1 +
|
||||
arch/arm/boot/dts/sun8i-h2-plus-orangepi-r1.dts | 171 ++++++++++++++++++++++++
|
||||
2 files changed, 172 insertions(+)
|
||||
create mode 100644 arch/arm/boot/dts/sun8i-h2-plus-orangepi-r1.dts
|
||||
|
||||
--- a/arch/arm/boot/dts/Makefile
|
||||
+++ b/arch/arm/boot/dts/Makefile
|
||||
@@ -819,6 +819,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
|
||||
sun8i-a33-sinlinx-sina33.dtb \
|
||||
sun8i-a83t-allwinner-h8homlet-v2.dtb \
|
||||
sun8i-a83t-cubietruck-plus.dtb \
|
||||
+ sun8i-h2-plus-orangepi-r1.dtb \
|
||||
sun8i-h3-bananapi-m2-plus.dtb \
|
||||
sun8i-h3-nanopi-neo.dtb \
|
||||
sun8i-h3-orangepi-2.dtb \
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-r1.dts
|
||||
@@ -0,0 +1,171 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2017 Hauke Mehrtens <hauke@hauke-m.de>
|
||||
+ *
|
||||
+ * Based on sun8i-h2-plus-orangepi-zero.dts, which is:
|
||||
+ * Copyright (C) 2016 Icenowy Zheng <icenowy@aosc.xyz>
|
||||
+ *
|
||||
+ * Based on sun8i-h3-orangepi-one.dts, which is:
|
||||
+ * Copyright (C) 2016 Hans de Goede <hdegoede@redhat.com>
|
||||
+ *
|
||||
+ * This file is dual-licensed: you can use it either under the terms
|
||||
+ * of the GPL or the X11 license, at your option. Note that this dual
|
||||
+ * licensing only applies to this file, and not this project as a
|
||||
+ * whole.
|
||||
+ *
|
||||
+ * a) This file is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU General Public License as
|
||||
+ * published by the Free Software Foundation; either version 2 of the
|
||||
+ * License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This file is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * Or, alternatively,
|
||||
+ *
|
||||
+ * b) Permission is hereby granted, free of charge, to any person
|
||||
+ * obtaining a copy of this software and associated documentation
|
||||
+ * files (the "Software"), to deal in the Software without
|
||||
+ * restriction, including without limitation the rights to use,
|
||||
+ * copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
+ * sell copies of the Software, and to permit persons to whom the
|
||||
+ * Software is furnished to do so, subject to the following
|
||||
+ * conditions:
|
||||
+ *
|
||||
+ * The above copyright notice and this permission notice shall be
|
||||
+ * included in all copies or substantial portions of the Software.
|
||||
+ *
|
||||
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
+ * OTHER DEALINGS IN THE SOFTWARE.
|
||||
+ */
|
||||
+
|
||||
+/dts-v1/;
|
||||
+#include "sun8i-h3.dtsi"
|
||||
+#include "sunxi-common-regulators.dtsi"
|
||||
+
|
||||
+#include <dt-bindings/gpio/gpio.h>
|
||||
+#include <dt-bindings/input/input.h>
|
||||
+#include <dt-bindings/pinctrl/sun4i-a10.h>
|
||||
+
|
||||
+/ {
|
||||
+ model = "Xunlong Orange Pi R1";
|
||||
+ compatible = "xunlong,orangepi-r1", "allwinner,sun8i-h2-plus";
|
||||
+
|
||||
+ aliases {
|
||||
+ serial0 = &uart0;
|
||||
+ /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
|
||||
+ ethernet0 = &emac;
|
||||
+ ethernet1 = &xr819;
|
||||
+ };
|
||||
+
|
||||
+ chosen {
|
||||
+ stdout-path = "serial0:115200n8";
|
||||
+ };
|
||||
+
|
||||
+ leds {
|
||||
+ compatible = "gpio-leds";
|
||||
+
|
||||
+ pwr_led {
|
||||
+ label = "orangepi:green:pwr";
|
||||
+ gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>;
|
||||
+ default-state = "on";
|
||||
+ };
|
||||
+
|
||||
+ status_led {
|
||||
+ label = "orangepi:red:status";
|
||||
+ gpios = <&pio 0 17 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ reg_vcc_wifi: reg_vcc_wifi {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-min-microvolt = <3300000>;
|
||||
+ regulator-max-microvolt = <3300000>;
|
||||
+ regulator-name = "vcc-wifi";
|
||||
+ enable-active-high;
|
||||
+ gpio = <&pio 0 20 GPIO_ACTIVE_HIGH>;
|
||||
+ };
|
||||
+
|
||||
+ wifi_pwrseq: wifi_pwrseq {
|
||||
+ compatible = "mmc-pwrseq-simple";
|
||||
+ reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>;
|
||||
+ post-power-on-delay-ms = <200>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&ehci1 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&emac {
|
||||
+ phy-handle = <&int_mii_phy>;
|
||||
+ phy-mode = "mii";
|
||||
+ allwinner,leds-active-low;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&mmc0 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&mmc0_pins_a>;
|
||||
+ vmmc-supply = <®_vcc3v3>;
|
||||
+ bus-width = <4>;
|
||||
+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
|
||||
+ cd-inverted;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&mmc1 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&mmc1_pins_a>;
|
||||
+ vmmc-supply = <®_vcc_wifi>;
|
||||
+ mmc-pwrseq = <&wifi_pwrseq>;
|
||||
+ bus-width = <4>;
|
||||
+ non-removable;
|
||||
+ status = "okay";
|
||||
+
|
||||
+ /*
|
||||
+ * Explicitly define the sdio device, so that we can add an ethernet
|
||||
+ * alias for it (which e.g. makes u-boot set a mac-address).
|
||||
+ */
|
||||
+ xr819: sdio_wifi@1 {
|
||||
+ reg = <1>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&mmc1_pins_a {
|
||||
+ bias-pull-up;
|
||||
+};
|
||||
+
|
||||
+&ohci1 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&uart0 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&uart0_pins_a>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&uart1 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&uart1_pins>;
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&uart2 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&uart2_pins>;
|
||||
+ status = "disabled";
|
||||
+};
|
||||
+
|
||||
+&usbphy {
|
||||
+ /* USB VBUS is always on */
|
||||
+ status = "okay";
|
||||
+};
|
||||
|
|
@ -1,168 +0,0 @@
|
|||
From 2ed2388bc0c5b7d04c7b079d673ce61a0333c818 Mon Sep 17 00:00:00 2001
|
||||
From: Jagan Teki <jagan@amarulasolutions.com>
|
||||
Date: Tue, 30 May 2017 17:42:50 +0000
|
||||
Subject: ARM: dts: sun8i: h3: Add initial NanoPi M1 Plus support
|
||||
|
||||
Backported support from kernel 4.13 with the following changes:
|
||||
- Added WiFi node
|
||||
- Added Ethernet node
|
||||
- Added eMMC node
|
||||
|
||||
Original commit message:
|
||||
NanoPi M1 Plus is designed and developed by FriendlyElec
|
||||
for professionals, enterprise users, makers and hobbyists
|
||||
using the Allwinner H3 SOC.
|
||||
|
||||
NanoPi M1 Plus key features
|
||||
- Allwinner H3, Quad-core Cortex-A7@1.2GHz
|
||||
- 1GB DDR3 RAM
|
||||
- 8GB eMMC
|
||||
- microSD slot
|
||||
- 10/100/1000M Ethernet
|
||||
- Serial Debug Port
|
||||
- 5V 2A DC power-supply
|
||||
|
||||
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
|
||||
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
--- a/arch/arm/boot/dts/Makefile
|
||||
+++ b/arch/arm/boot/dts/Makefile
|
||||
@@ -821,6 +821,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
|
||||
sun8i-a83t-cubietruck-plus.dtb \
|
||||
sun8i-h2-plus-orangepi-r1.dtb \
|
||||
sun8i-h3-bananapi-m2-plus.dtb \
|
||||
+ sun8i-h3-nanopi-m1-plus.dtb \
|
||||
sun8i-h3-nanopi-neo.dtb \
|
||||
sun8i-h3-orangepi-2.dtb \
|
||||
sun8i-h3-orangepi-lite.dtb \
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
|
||||
@@ -0,0 +1,129 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2017 Jagan Teki <jteki@openedev.com>
|
||||
+ *
|
||||
+ * This file is dual-licensed: you can use it either under the terms
|
||||
+ * of the GPL or the X11 license, at your option. Note that this dual
|
||||
+ * licensing only applies to this file, and not this project as a
|
||||
+ * whole.
|
||||
+ *
|
||||
+ * a) This file is free software; you can redistribute it and/or
|
||||
+ * modify it under the terms of the GNU General Public License as
|
||||
+ * published by the Free Software Foundation; either version 2 of the
|
||||
+ * License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * This file is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * Or, alternatively,
|
||||
+ *
|
||||
+ * b) Permission is hereby granted, free of charge, to any person
|
||||
+ * obtaining a copy of this software and associated documentation
|
||||
+ * files (the "Software"), to deal in the Software without
|
||||
+ * restriction, including without limitation the rights to use,
|
||||
+ * copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
+ * sell copies of the Software, and to permit persons to whom the
|
||||
+ * Software is furnished to do so, subject to the following
|
||||
+ * conditions:
|
||||
+ *
|
||||
+ * The above copyright notice and this permission notice shall be
|
||||
+ * included in all copies or substantial portions of the Software.
|
||||
+ *
|
||||
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
+ * OTHER DEALINGS IN THE SOFTWARE.
|
||||
+ */
|
||||
+
|
||||
+#include "sun8i-h3-nanopi.dtsi"
|
||||
+
|
||||
+/ {
|
||||
+ model = "FriendlyArm NanoPi M1 Plus";
|
||||
+ compatible = "friendlyarm,nanopi-m1-plus", "allwinner,sun8i-h3";
|
||||
+
|
||||
+ aliases {
|
||||
+ ethernet0 = &emac;
|
||||
+ };
|
||||
+
|
||||
+ pwrseq_wifi: pwrseq0 {
|
||||
+ compatible = "mmc-pwrseq-simple";
|
||||
+ pinctrl-names = "default";
|
||||
+ reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
|
||||
+ };
|
||||
+
|
||||
+ reg_gmac_3v3: gmac-3v3 {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "gmac-3v3";
|
||||
+ regulator-min-microvolt = <3300000>;
|
||||
+ regulator-max-microvolt = <3300000>;
|
||||
+ startup-delay-us = <100000>;
|
||||
+ enable-active-high;
|
||||
+ gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&ehci1 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&ehci2 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&emac {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&emac_rgmii_pins>;
|
||||
+ phy-supply = <®_gmac_3v3>;
|
||||
+ phy-handle = <&ext_rgmii_phy>;
|
||||
+ phy-mode = "rgmii";
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&mdio {
|
||||
+ ext_rgmii_phy: ethernet-phy@7 {
|
||||
+ compatible = "ethernet-phy-ieee802.3-c22";
|
||||
+ reg = <7>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&mmc1 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&mmc1_pins_a>;
|
||||
+ vmmc-supply = <®_vcc3v3>;
|
||||
+ vqmmc-supply = <®_vcc3v3>;
|
||||
+ mmc-pwrseq = <&pwrseq_wifi>;
|
||||
+ bus-width = <4>;
|
||||
+ non-removable;
|
||||
+ status = "okay";
|
||||
+
|
||||
+ brcmf: wifi@1 {
|
||||
+ reg = <1>;
|
||||
+ compatible = "brcm,bcm4329-fmac";
|
||||
+ interrupt-parent = <&pio>;
|
||||
+ interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */
|
||||
+ interrupt-names = "host-wake";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&mmc2 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&mmc2_8bit_pins>;
|
||||
+ vmmc-supply = <®_vcc3v3>;
|
||||
+ vqmmc-supply = <®_vcc3v3>;
|
||||
+ bus-width = <8>;
|
||||
+ non-removable;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&ohci1 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&ohci2 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
Loading…
Reference in New Issue